diff --git a/.travis.yml b/.travis.yml
index bed82810d46..2bd784ed30a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,14 @@
language: nix
+sudo: true
+# 'sudo: false' == containers that start fast, but only get 4G ram;
+# 'sudo: true' == VMs that start slow, but with 8G
+# ..as per: https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
+# Nixpkgs PR tests OOM with 4G: https://github.com/NixOS/nixpkgs/issues/24200
+
matrix:
include:
- os: linux
- sudo: false
+ sudo: required
script:
- ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable
- ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual
diff --git a/README.md b/README.md
index 002caa3a171..1d5fbd218e2 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +13,12 @@ build daemon as so-called channels. To get channel information via git, add
```
For stability and maximum binary package support, it is recommended to maintain
-custom changes on top of one of the channels, e.g. `nixos-16.09` for the latest
+custom changes on top of one of the channels, e.g. `nixos-17.03` for the latest
release and `nixos-unstable` for the latest successful build of master:
```
% git remote update channels
-% git rebase channels/nixos-16.09
+% git rebase channels/nixos-17.03
```
For pull-requests, please rebase onto nixpkgs `master`.
@@ -32,9 +32,9 @@ For pull-requests, please rebase onto nixpkgs `master`.
* [Manual (NixOS)](https://nixos.org/nixos/manual/)
* [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22))
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
-* [Continuous package builds for 16.09 release](https://hydra.nixos.org/jobset/nixos/release-16.09)
+* [Continuous package builds for 17.03 release](https://hydra.nixos.org/jobset/nixos/release-17.03)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
-* [Tests for 16.09 release](https://hydra.nixos.org/job/nixos/release-16.09/tested#tabs-constituents)
+* [Tests for 17.03 release](https://hydra.nixos.org/job/nixos/release-17.03/tested#tabs-constituents)
Communication:
diff --git a/doc/functions.xml b/doc/functions.xml
index efe2590ddfb..4e7159638ca 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -529,7 +529,7 @@
If you see errors similar to getProtocolByName: does not exist (no such protocol name: tcp)
- you may need to add pkgs.iana_etc to contents.
+ you may need to add pkgs.iana-etc to contents.
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index c1bd764c70d..f9e6b7495fc 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -1,12 +1,12 @@
# Operations on attribute sets.
-with {
+let
inherit (builtins) head tail length;
inherit (import ./trivial.nix) or;
inherit (import ./default.nix) fold;
inherit (import ./strings.nix) concatStringsSep;
inherit (import ./lists.nix) concatMap concatLists all deepSeqList;
-};
+in
rec {
inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr;
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8253caa808c..4f5ee4b0801 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -316,6 +316,7 @@
michalrus = "Michal Rus ";
michelk = "Michel Kuhlmann ";
mikefaille = "Michaël Faille ";
+ miltador = "Vasiliy Solovey ";
mimadrid = "Miguel Madrid ";
mingchuan = "Ming Chuan ";
mirdhyn = "Merlin Gaillard ";
@@ -398,6 +399,7 @@
pjones = "Peter Jones ";
pkmx = "Chih-Mao Chen ";
plcplc = "Philip Lykke Carlsen ";
+ plumps = "Maksim Bronsky channels refers to a read-only repository that
tracks the Nixpkgs/NixOS channels (see
for more information about channels). Thus, the Git branch
-channels/nixos-14.12 will contain the latest built
-and tested version available in the nixos-14.12
+channels/nixos-17.03 will contain the latest built
+and tested version available in the nixos-17.03
channel.
It’s often inconvenient to develop directly on the master
@@ -39,9 +39,9 @@ branch based on your current NixOS version:
$ nixos-version
-14.04.273.ea1952b (Baboon)
+17.09pre104379.6e0b727 (Hummingbird)
-$ git checkout -b local ea1952b
+$ git checkout -b local e3938c8
Or, to base your local branch on the latest version available in a
@@ -49,17 +49,17 @@ NixOS channel:
$ git remote update channels
-$ git checkout -b local channels/nixos-14.12
+$ git checkout -b local channels/nixos-17.03
-(Replace nixos-14.12 with the name of the channel
+(Replace nixos-17.03 with the name of the channel
you want to use.) You can use git merge or
git rebase to keep your local branch in sync with
the channel, e.g.
$ git remote update channels
-$ git merge channels/nixos-14.12
+$ git merge channels/nixos-17.03
You can use git cherry-pick to copy commits from
diff --git a/nixos/doc/manual/installation/installing-uefi.xml b/nixos/doc/manual/installation/installing-uefi.xml
index 927648febc5..0d3eaa8bb1f 100644
--- a/nixos/doc/manual/installation/installing-uefi.xml
+++ b/nixos/doc/manual/installation/installing-uefi.xml
@@ -26,7 +26,8 @@ changes:
vfat filesystem.
- You must set to
+ Instead of ,
+ you must set to
true. nixos-generate-config
should do this automatically for new configurations when booted in
UEFI mode.
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index c974523f886..aee6523345c 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -15,12 +15,12 @@ been built. These channels are:
Stable channels, such as nixos-14.12.
+ xlink:href="https://nixos.org/channels/nixos-17.03">nixos-17.03.
These only get conservative bug fixes and package upgrades. For
instance, a channel update may cause the Linux kernel on your
- system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but
- not from 3.4.x to
- 3.11.x (a major change that has the
+ system to be upgraded from 4.9.16 to 4.9.17 (a minor bug fix), but
+ not from 4.9.x to
+ 4.11.x (a major change that has the
potential to break things). Stable channels are generally
maintained until the next stable branch is created.
@@ -34,7 +34,7 @@ been built. These channels are:
Small channels, such as nixos-14.12-small
+ xlink:href="https://nixos.org/channels/nixos-17.03-small">nixos-17.03-small
or nixos-unstable-small. These
are identical to the stable and unstable channels described above,
@@ -55,8 +55,8 @@ appliances.)
When you first install NixOS, you’re automatically subscribed to
the NixOS channel that corresponds to your installation source. For
-instance, if you installed from a 14.12 ISO, you will be subscribed to
-the nixos-14.12 channel. To see which NixOS
+instance, if you installed from a 17.03 ISO, you will be subscribed to
+the nixos-17.03 channel. To see which NixOS
channel you’re subscribed to, run the following as root:
@@ -71,16 +71,16 @@ To switch to a different NixOS channel, do
(Be sure to include the nixos parameter at the
-end.) For instance, to use the NixOS 14.12 stable channel:
+end.) For instance, to use the NixOS 17.03 stable channel:
-# nix-channel --add https://nixos.org/channels/nixos-14.12 nixos
+# nix-channel --add https://nixos.org/channels/nixos-17.03 nixos
If you have a server, you may want to use the “small” channel instead:
-# nix-channel --add https://nixos.org/channels/nixos-14.12-small nixos
+# nix-channel --add https://nixos.org/channels/nixos-17.03-small nixos
And if you want to live on the bleeding edge:
@@ -130,7 +130,7 @@ runs, see systemctl list-timers.) You can also
specify a channel explicitly, e.g.
-system.autoUpgrade.channel = https://nixos.org/channels/nixos-15.09;
+system.autoUpgrade.channel = https://nixos.org/channels/nixos-17.03;
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index cae46258b80..e0c7d0c25e2 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -247,6 +247,17 @@ following incompatible changes:
+
+
+ The dnscrypt-proxy module interface has been streamlined around the
+ option. Where possible, legacy option
+ declarations are mapped to but will emit
+ warnings. The has been outright
+ removed: to use an unlisted resolver, use the
+ option.
+
+
+
@@ -305,6 +316,15 @@ following incompatible changes:
+
+
+ The dnscrypt-proxy service supports synchronizing the list of public
+ resolvers without working DNS resolution. This fixes issues caused by the
+ resolver list becoming outdated. It also improves the viability of
+ DNSCrypt only configurations.
+
+
+
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 4431dfb4085..ae30a710bf6 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -178,10 +178,10 @@ in
environment.etc =
{ # /etc/services: TCP/UDP port assignments.
- "services".source = pkgs.iana_etc + "/etc/services";
+ "services".source = pkgs.iana-etc + "/etc/services";
# /etc/protocols: IP protocol numbers.
- "protocols".source = pkgs.iana_etc + "/etc/protocols";
+ "protocols".source = pkgs.iana-etc + "/etc/protocols";
# /etc/rpc: RPC program numbers.
"rpc".source = pkgs.glibc.out + "/etc/rpc";
diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
index 4ca8a83554a..ef5e6346f02 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixos/modules/config/update-users-groups.pl
@@ -6,6 +6,21 @@ use JSON;
make_path("/var/lib/nixos", { mode => 0755 });
+# Keep track of deleted uids and gids.
+my $uidMapFile = "/var/lib/nixos/uid-map";
+my $uidMap = -e $uidMapFile ? decode_json(read_file($uidMapFile)) : {};
+
+my $gidMapFile = "/var/lib/nixos/gid-map";
+my $gidMap = -e $gidMapFile ? decode_json(read_file($gidMapFile)) : {};
+
+
+sub updateFile {
+ my ($path, $contents, $perms) = @_;
+ write_file("$path.tmp", { binmode => ':utf8', perms => $perms // 0644 }, $contents);
+ rename("$path.tmp", $path) or die;
+}
+
+
sub hashPassword {
my ($password) = @_;
my $salt = "";
@@ -18,10 +33,10 @@ sub hashPassword {
# Functions for allocating free GIDs/UIDs. FIXME: respect ID ranges in
# /etc/login.defs.
sub allocId {
- my ($used, $idMin, $idMax, $up, $getid) = @_;
+ my ($used, $prevUsed, $idMin, $idMax, $up, $getid) = @_;
my $id = $up ? $idMin : $idMax;
while ($id >= $idMin && $id <= $idMax) {
- if (!$used->{$id} && !defined &$getid($id)) {
+ if (!$used->{$id} && !$prevUsed->{$id} && !defined &$getid($id)) {
$used->{$id} = 1;
return $id;
}
@@ -31,23 +46,36 @@ sub allocId {
die "$0: out of free UIDs or GIDs\n";
}
-my (%gidsUsed, %uidsUsed);
+my (%gidsUsed, %uidsUsed, %gidsPrevUsed, %uidsPrevUsed);
sub allocGid {
- return allocId(\%gidsUsed, 400, 499, 0, sub { my ($gid) = @_; getgrgid($gid) });
+ my ($name) = @_;
+ my $prevGid = $gidMap->{$name};
+ if (defined $prevGid && !defined $gidsUsed{$prevGid}) {
+ print STDERR "reviving group '$name' with GID $prevGid\n";
+ $gidsUsed{$prevGid} = 1;
+ return $prevGid;
+ }
+ return allocId(\%gidsUsed, \%gidsPrevUsed, 400, 499, 0, sub { my ($gid) = @_; getgrgid($gid) });
}
sub allocUid {
- my ($isSystemUser) = @_;
+ my ($name, $isSystemUser) = @_;
my ($min, $max, $up) = $isSystemUser ? (400, 499, 0) : (1000, 29999, 1);
- return allocId(\%uidsUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) });
+ my $prevUid = $uidMap->{$name};
+ if (defined $prevUid && $prevUid >= $min && $prevUid <= $max && !defined $uidsUsed{$prevUid}) {
+ print STDERR "reviving user '$name' with UID $prevUid\n";
+ $uidsUsed{$prevUid} = 1;
+ return $prevUid;
+ }
+ return allocId(\%uidsUsed, \%uidsPrevUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) });
}
# Read the declared users/groups.
my $spec = decode_json(read_file($ARGV[0]));
-# Don't allocate UIDs/GIDs that are already in use.
+# Don't allocate UIDs/GIDs that are manually assigned.
foreach my $g (@{$spec->{groups}}) {
$gidsUsed{$g->{gid}} = 1 if defined $g->{gid};
}
@@ -56,6 +84,11 @@ foreach my $u (@{$spec->{users}}) {
$uidsUsed{$u->{uid}} = 1 if defined $u->{uid};
}
+# Likewise for previously used but deleted UIDs/GIDs.
+$uidsPrevUsed{$_} = 1 foreach values %{$uidMap};
+$gidsPrevUsed{$_} = 1 foreach values %{$gidMap};
+
+
# Read the current /etc/group.
sub parseGroup {
chomp;
@@ -114,16 +147,18 @@ foreach my $g (@{$spec->{groups}}) {
}
}
} else {
- $g->{gid} = allocGid if !defined $g->{gid};
+ $g->{gid} = allocGid($name) if !defined $g->{gid};
$g->{password} = "x";
}
$g->{members} = join ",", sort(keys(%members));
$groupsOut{$name} = $g;
+
+ $gidMap->{$name} = $g->{gid};
}
# Update the persistent list of declarative groups.
-write_file($declGroupsFile, { binmode => ':utf8' }, join(" ", sort(keys %groupsOut)));
+updateFile($declGroupsFile, join(" ", sort(keys %groupsOut)));
# Merge in the existing /etc/group.
foreach my $name (keys %groupsCur) {
@@ -140,8 +175,8 @@ foreach my $name (keys %groupsCur) {
# Rewrite /etc/group. FIXME: acquire lock.
my @lines = map { join(":", $_->{name}, $_->{password}, $_->{gid}, $_->{members}) . "\n" }
(sort { $a->{gid} <=> $b->{gid} } values(%groupsOut));
-write_file("/etc/group.tmp", { binmode => ':utf8' }, @lines);
-rename("/etc/group.tmp", "/etc/group") or die;
+updateFile($gidMapFile, encode_json($gidMap));
+updateFile("/etc/group", \@lines);
system("nscd --invalidate group");
# Generate a new /etc/passwd containing the declared users.
@@ -167,7 +202,7 @@ foreach my $u (@{$spec->{users}}) {
$u->{uid} = $existing->{uid};
}
} else {
- $u->{uid} = allocUid($u->{isSystemUser}) if !defined $u->{uid};
+ $u->{uid} = allocUid($name, $u->{isSystemUser}) if !defined $u->{uid};
if (defined $u->{initialPassword}) {
$u->{hashedPassword} = hashPassword($u->{initialPassword});
@@ -195,10 +230,12 @@ foreach my $u (@{$spec->{users}}) {
$u->{fakePassword} = $existing->{fakePassword} // "x";
$usersOut{$name} = $u;
+
+ $uidMap->{$name} = $u->{uid};
}
# Update the persistent list of declarative users.
-write_file($declUsersFile, { binmode => ':utf8' }, join(" ", sort(keys %usersOut)));
+updateFile($declUsersFile, join(" ", sort(keys %usersOut)));
# Merge in the existing /etc/passwd.
foreach my $name (keys %usersCur) {
@@ -214,8 +251,8 @@ foreach my $name (keys %usersCur) {
# Rewrite /etc/passwd. FIXME: acquire lock.
@lines = map { join(":", $_->{name}, $_->{fakePassword}, $_->{uid}, $_->{gid}, $_->{description}, $_->{home}, $_->{shell}) . "\n" }
(sort { $a->{uid} <=> $b->{uid} } (values %usersOut));
-write_file("/etc/passwd.tmp", { binmode => ':utf8' }, @lines);
-rename("/etc/passwd.tmp", "/etc/passwd") or die;
+updateFile($uidMapFile, encode_json($uidMap));
+updateFile("/etc/passwd", \@lines);
system("nscd --invalidate passwd");
@@ -242,5 +279,4 @@ foreach my $u (values %usersOut) {
push @shadowNew, join(":", $u->{name}, $hashedPassword, "1::::::") . "\n";
}
-write_file("/etc/shadow.tmp", { binmode => ':utf8', perms => 0600 }, @shadowNew);
-rename("/etc/shadow.tmp", "/etc/shadow") or die;
+updateFile("/etc/shadow", \@shadowNew, 0600);
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index cd6e72755de..663ff24c81f 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -6,6 +6,16 @@
with lib;
let
+ # Do not include these things:
+ # - The '.git' directory
+ # - Result symlinks from nix-build ('result', 'result-2', 'result-bin', ...)
+ # - VIM/Emacs swap/backup files ('.swp', '.swo', '.foo.swp', 'foo~', ...)
+ filterFn = path: type: let basename = baseNameOf (toString path); in
+ if type == "directory" then basename != ".git"
+ else if type == "symlink" then builtins.match "^result(|-.*)$" basename == null
+ else builtins.match "^((|\..*)\.sw[a-z]|.*~)$" basename == null;
+
+ nixpkgs = builtins.filterSource filterFn pkgs.path;
# We need a copy of the Nix expressions for Nixpkgs and NixOS on the
# CD. These are installed into the "nixos" channel of the root
@@ -15,12 +25,11 @@ let
{ }
''
mkdir -p $out
- cp -prd ${pkgs.path} $out/nixos
+ cp -prd ${nixpkgs} $out/nixos
chmod -R u+w $out/nixos
if [ ! -e $out/nixos/nixpkgs ]; then
ln -s . $out/nixos/nixpkgs
fi
- rm -rf $out/nixos/.git
echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix
'';
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 610c2a2b758..0035368273c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -138,7 +138,6 @@
./services/backup/mysql-backup.nix
./services/backup/postgresql-backup.nix
./services/backup/rsnapshot.nix
- ./services/backup/sitecopy-backup.nix
./services/backup/tarsnap.nix
./services/backup/znapzend.nix
./services/cluster/fleet.nix
@@ -275,6 +274,7 @@
./services/misc/gpsd.nix
#./services/misc/ihaskell.nix
./services/misc/irkerd.nix
+ ./services/misc/jackett.nix
./services/misc/leaps.nix
./services/misc/mantisbt.nix
./services/misc/mathics.nix
@@ -295,6 +295,7 @@
./services/misc/parsoid.nix
./services/misc/phd.nix
./services/misc/plex.nix
+ ./services/misc/radarr.nix
./services/misc/redmine.nix
./services/misc/rippled.nix
./services/misc/ripple-rest.nix
@@ -454,7 +455,7 @@
./services/networking/prayer.nix
./services/networking/privoxy.nix
./services/networking/prosody.nix
- ./services/networking/quagga.nix
+ # ./services/networking/quagga.nix
./services/networking/quassel.nix
./services/networking/racoon.nix
./services/networking/radicale.nix
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 0aca39fd6be..c051b7d49e3 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -177,6 +177,35 @@ in
# programs to be wrapped.
WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
+ # Remove the old /var/setuid-wrappers path from the system...
+ #
+ # TODO: this is only necessary for upgrades 16.09 => 17.x;
+ # this conditional removal block needs to be removed after
+ # the release.
+ if [ -d /var/setuid-wrappers ]; then
+ rm -rf /var/setuid-wrappers
+ ln -s /run/wrappers/bin /var/setuid-wrappers
+ fi
+
+ # Remove the old /run/setuid-wrappers-dir path from the
+ # system as well...
+ #
+ # TODO: this is only necessary for upgrades 16.09 => 17.x;
+ # this conditional removal block needs to be removed after
+ # the release.
+ if [ -d /run/setuid-wrapper-dirs ]; then
+ rm -rf /run/setuid-wrapper-dirs
+ ln -s /run/wrappers/bin /run/setuid-wrapper-dirs
+ fi
+
+ # TODO: this is only necessary for upgrades 16.09 => 17.x;
+ # this conditional removal block needs to be removed after
+ # the release.
+ if readlink -f /run/booted-system | grep nixos-17 > /dev/null; then
+ rm -rf /run/setuid-wrapper-dirs
+ rm -rf /var/setuid-wrappers
+ fi
+
# We want to place the tmpdirs for the wrappers to the parent dir.
wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
chmod a+rx $wrapperDir
diff --git a/nixos/modules/services/backup/sitecopy-backup.nix b/nixos/modules/services/backup/sitecopy-backup.nix
deleted file mode 100644
index 6e4721ded68..00000000000
--- a/nixos/modules/services/backup/sitecopy-backup.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- inherit (pkgs) sitecopy;
-
- stateDir = "/var/spool/sitecopy";
-
- sitecopyCron = backup : ''
- ${if backup ? period then backup.period else config.services.sitecopy.period} root ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${backup.name}.conf --update ${backup.name} >> /var/log/sitecopy.log 2>&1
- '';
-in
-
-{
-
- options = {
-
- services.sitecopy = {
-
- enable = mkOption {
- default = false;
- description = ''
- Whether to enable sitecopy backups of specified
- directories.
- '';
- };
-
- period = mkOption {
- default = "15 04 * * *";
- description = ''
- This option defines (in the format used by cron)
- when the sitecopy backups are to be run.
- The default is to update at 04:15 (at night) every day.
- '';
- };
-
- backups = mkOption {
- example = [
- { name = "test";
- local = "/tmp/backup";
- remote = "/staff-groups/ewi/st/strategoxt/backup/test";
- server = "webdata.tudelft.nl";
- protocol = "webdav";
- https = true ;
- symlinks = "maintain" ;
- }
- ];
- default = [];
- description = ''
- List of attribute sets describing the backups.
-
- Username/password are extracted from
- ${stateDir}/sitecopy.secrets at activation
- time. The secrets file lines should have the following structure:
-
- server username password
-
- '';
- };
-
- };
-
- };
-
- config = mkIf config.services.sitecopy.enable {
- environment.systemPackages = [ sitecopy ];
-
- services.cron.systemCronJobs = map sitecopyCron config.services.sitecopy.backups;
-
- system.activationScripts.sitecopyBackup = stringAfter [ "stdio" "users" ]
- ''
- mkdir -m 0700 -p ${stateDir}
- chown root ${stateDir}
- touch ${stateDir}/sitecopy.secrets
- chown root ${stateDir}/sitecopy.secrets
-
- ${lib.concatStrings (map ( b: ''
- unset secrets
- unset secret
- secrets=`grep '^${b.server}' ${stateDir}/sitecopy.secrets | head -1`
- secret=($secrets)
- cat > ${stateDir}/${b.name}.conf << EOF
- site ${b.name}
- server ${b.server}
- protocol ${b.protocol}
- username ''${secret[1]}
- password ''${secret[2]}
- local ${b.local}
- remote ${b.remote}
- symlinks ${b.symlinks}
- ${if b.https then "http secure" else ""}
- EOF
- chmod 0600 ${stateDir}/${b.name}.conf
- if ! test -e ${stateDir}/${b.name} ; then
- echo " * Initializing sitecopy '${b.name}'"
- ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${b.name}.conf --initialize ${b.name}
- else
- echo " * Sitecopy '${b.name}' already initialized"
- fi
- '' ) config.services.sitecopy.backups
- )}
- '';
- };
-
-}
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index 1fe4d28f9f3..ba90b1b1a2c 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -20,6 +20,14 @@ in
description = "The working directory used";
};
+ package = mkOption {
+ description = "Gitlab Runner package to use";
+ default = pkgs.gitlab-runner;
+ defaultText = "pkgs.gitlab-runner";
+ type = types.package;
+ example = literalExample "pkgs.gitlab-runner_1_11";
+ };
+
};
config = mkIf cfg.enable {
@@ -29,7 +37,7 @@ in
requires = [ "docker.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
- ExecStart = ''${pkgs.gitlab-runner.bin}/bin/gitlab-runner run \
+ ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \
--working-directory ${cfg.workDir} \
--config ${configFile} \
--service gitlab-runner \
@@ -38,6 +46,9 @@ in
};
};
+ # Make the gitlab-runner command availabe so users can query the runner
+ environment.systemPackages = [ cfg.package ];
+
users.extraUsers.gitlab-runner = {
group = "gitlab-runner";
extraGroups = [ "docker" ];
diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix
new file mode 100644
index 00000000000..e467e7ee85b
--- /dev/null
+++ b/nixos/modules/services/misc/jackett.nix
@@ -0,0 +1,44 @@
+{ config, pkgs, lib, mono, ... }:
+
+with lib;
+
+let
+ cfg = config.services.jackett;
+in
+{
+ options = {
+ services.jackett = {
+ enable = mkEnableOption "Jackett";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.jackett = {
+ description = "Jackett";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ preStart = ''
+ test -d /var/lib/jackett/ || {
+ echo "Creating jackett data directory in /var/lib/jackett/"
+ mkdir -p /var/lib/jackett/
+ }
+ chown -R jackett /var/lib/jackett/
+ chmod 0700 /var/lib/jackett/
+ '';
+
+ serviceConfig = {
+ Type = "simple";
+ User = "jackett";
+ Group = "nogroup";
+ PermissionsStartOnly = "true";
+ ExecStart = "${pkgs.jackett}/bin/Jackett";
+ Restart = "on-failure";
+ };
+ };
+
+ users.extraUsers.jackett = {
+ home = "/var/lib/jackett";
+ };
+
+ };
+}
diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix
new file mode 100644
index 00000000000..cc5efffca44
--- /dev/null
+++ b/nixos/modules/services/misc/radarr.nix
@@ -0,0 +1,44 @@
+{ config, pkgs, lib, mono, ... }:
+
+with lib;
+
+let
+ cfg = config.services.radarr;
+in
+{
+ options = {
+ services.radarr = {
+ enable = mkEnableOption "Radarr";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.radarr = {
+ description = "Radarr";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ preStart = ''
+ test -d /var/lib/radarr/ || {
+ echo "Creating radarr data directory in /var/lib/radarr/"
+ mkdir -p /var/lib/radarr/
+ }
+ chown -R radarr /var/lib/radarr/
+ chmod 0700 /var/lib/radarr/
+ '';
+
+ serviceConfig = {
+ Type = "simple";
+ User = "radarr";
+ Group = "nogroup";
+ PermissionsStartOnly = "true";
+ ExecStart = "${pkgs.radarr}/bin/Radarr";
+ Restart = "on-failure";
+ };
+ };
+
+ users.extraUsers.radarr = {
+ home = "/var/lib/radarr";
+ };
+
+ };
+}
diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix
index 6f51e287910..f7c58c92863 100644
--- a/nixos/modules/services/network-filesystems/openafs-client/default.nix
+++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix
@@ -76,6 +76,7 @@ in
description = "AFS client";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
+ serviceConfig = { RemainAfterExit = true; };
preStart = ''
mkdir -p -m 0755 /afs
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index d382fa8c9cb..077aeca457e 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -220,6 +220,8 @@ in
${getLib pkgs.attr}/lib/libattr.so.* mr, # */
${resolverList} r,
+
+ /run/systemd/notify rw,
}
'');
})
diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix
index 029c3df8993..56b94205414 100644
--- a/nixos/modules/services/networking/nftables.nix
+++ b/nixos/modules/services/networking/nftables.nix
@@ -17,6 +17,17 @@ in
This conflicts with the standard networking firewall, so make sure to
disable it before using nftables.
+
+ Note that if you have Docker enabled you will not be able to use
+ nftables without intervention. Docker uses iptables internally to
+ setup NAT for containers. This module disables the ip_tables kernel
+ module, however Docker automatically loads the module. Please see [1]
+ for more information.
+
+ There are other programs that use iptables internally too, such as
+ libvirt.
+
+ [1]: https://github.com/NixOS/nixpkgs/issues/24318#issuecomment-289216273
'';
};
networking.nftables.ruleset = mkOption {
diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index b94ec14308b..c6f4bcd0f66 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -9,7 +9,7 @@ let
+ '';
+ };
tablePrefix = mkOption {
default = "wp_";
description = ''
@@ -251,7 +276,7 @@ in
sleep 1
done
${pkgs.mysql}/bin/mysql -e 'CREATE DATABASE ${config.dbName};'
- ${pkgs.mysql}/bin/mysql -e 'GRANT ALL ON ${config.dbName}.* TO ${config.dbUser}@localhost IDENTIFIED BY "${config.dbPassword}";'
+ ${pkgs.mysql}/bin/mysql -e "GRANT ALL ON ${config.dbName}.* TO ${config.dbUser}@localhost IDENTIFIED BY \"$(cat ${config.dbPasswordFile})\";"
else
echo "Good, no need to do anything database related."
fi
diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index efb721c5773..26f54602203 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -147,7 +147,6 @@ in {
cfgFile = fpmCfgFile pool poolConfig;
in {
Slice = "phpfpm.slice";
- PrivateTmp = true;
PrivateDevices = true;
ProtectSystem = "full";
ProtectHome = true;
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 38e24e9b709..b02eaf861a0 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -64,7 +64,7 @@ in
security.wrappers.e_freqset.source = "${e.enlightenment.out}/bin/e_freqset";
environment.etc = singleton
- { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+ { source = xcfg.xkbDir;
target = "X11/xkb";
};
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 918841e8f16..d981cd5328e 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -176,7 +176,7 @@ in
environment.pathsToLink = [ "/share" ];
environment.etc = singleton {
- source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+ source = xcfg.xkbDir;
target = "X11/xkb";
};
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 3571e00d04e..f30906b84a2 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -239,6 +239,10 @@ let
ip link set "${i}" master "${n}"
ip link set "${i}" up
'')}
+ # Save list of enslaved interfaces
+ echo "${flip concatMapStrings v.interfaces (i: ''
+ ${i}
+ '')}" > /run/${n}.interfaces
# Enable stp on the interface
${optionalString v.rstp ''
@@ -250,7 +254,28 @@ let
postStop = ''
ip link set "${n}" down || true
ip link del "${n}" || true
+ rm -f /run/${n}.interfaces
'';
+ reload = ''
+ # Un-enslave child interfaces (old list of interfaces)
+ for interface in `cat /run/${n}.interfaces`; do
+ ip link set "$interface" nomaster up
+ done
+
+ # Enslave child interfaces (new list of interfaces)
+ ${flip concatMapStrings v.interfaces (i: ''
+ ip link set "${i}" master "${n}"
+ ip link set "${i}" up
+ '')}
+ # Save list of enslaved interfaces
+ echo "${flip concatMapStrings v.interfaces (i: ''
+ ${i}
+ '')}" > /run/${n}.interfaces
+
+ # (Un-)set stp on the bridge
+ echo ${if v.rstp then "2" else "0"} > /sys/class/net/${n}/bridge/stp_state
+ '';
+ reloadIfChanged = true;
});
createVswitchDevice = n: v: nameValuePair "${n}-netdev"
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 8b85ff0057f..a365a01bfb1 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -59,15 +59,16 @@ in
systemd.network =
let
domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain);
- genericNetwork = override: {
- DHCP = override (dhcpStr cfg.useDHCP);
- } // optionalAttrs (cfg.defaultGateway != null) {
- gateway = override [ cfg.defaultGateway.address ];
- } // optionalAttrs (cfg.defaultGateway6 != null) {
- gateway = override [ cfg.defaultGateway6.address ];
- } // optionalAttrs (domains != [ ]) {
- domains = override domains;
- };
+ genericNetwork = override:
+ let gateway = optional (cfg.defaultGateway != null) cfg.defaultGateway.address
+ ++ optional (cfg.defaultGateway6 != null) cfg.defaultGateway6.address;
+ in {
+ DHCP = override (dhcpStr cfg.useDHCP);
+ } // optionalAttrs (gateway != [ ]) {
+ gateway = override gateway;
+ } // optionalAttrs (domains != [ ]) {
+ domains = override domains;
+ };
in mkMerge [ {
enable = true;
networks."99-main" = genericNetwork mkDefault;
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 556454c6b5f..a3dd3bd55d1 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -62,7 +62,7 @@ in
mkdir -p /mnt/nix/store
echo "copying everything (will take a while)..."
- cp -prd $storePaths /mnt/nix/store/
+ ${pkgs.rsync}/bin/rsync -a $storePaths /mnt/nix/store/
# Register the paths in the Nix database.
printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
@@ -261,7 +261,7 @@ in
"kernel.kptr_restrict" = mkDefault "1";
# set ptrace protections
- "kernel.yama.ptrace_scope" = mkDefault "1";
+ "kernel.yama.ptrace_scope" = mkOverride 500 "1";
# set perf only available to root
"kernel.perf_event_paranoid" = mkDefault "2";
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 101ea9a4f51..c0cebaddec8 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -90,14 +90,16 @@ in {
config = mkIf cfg.enable {
- environment.systemPackages =
- [ pkgs.libvirt pkgs.netcat-openbsd ]
- ++ optional cfg.enableKVM pkgs.qemu_kvm;
+ environment.systemPackages = with pkgs;
+ [ libvirt netcat-openbsd ]
+ ++ optional cfg.enableKVM qemu_kvm;
boot.kernelModules = [ "tun" ];
users.extraGroups.libvirtd.gid = config.ids.gids.libvirtd;
+ systemd.packages = [ pkgs.libvirt ];
+
systemd.services.libvirtd = {
description = "Libvirt Virtual Machine Management Daemon";
@@ -105,13 +107,17 @@ in {
after = [ "systemd-udev-settle.service" ]
++ optional vswitch.enable "vswitchd.service";
- path = [
- pkgs.bridge-utils
- pkgs.dmidecode
- pkgs.dnsmasq
- pkgs.ebtables
+ environment = {
+ LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
+ };
+
+ path = with pkgs; [
+ bridge-utils
+ dmidecode
+ dnsmasq
+ ebtables
]
- ++ optional cfg.enableKVM pkgs.qemu_kvm
+ ++ optional cfg.enableKVM qemu_kvm
++ optional vswitch.enable vswitch.package;
preStart = ''
@@ -153,13 +159,17 @@ in {
''; # */
serviceConfig = {
- ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
Type = "notify";
KillMode = "process"; # when stopping, leave the VMs alone
Restart = "on-failure";
};
};
+ systemd.services.libvirt-guests = {
+ wantedBy = [ "multi-user.target" ];
+ path = with pkgs; [ coreutils libvirt gawk ];
+ };
+
systemd.sockets.virtlogd = {
description = "Virtual machine log manager socket";
wantedBy = [ "sockets.target" ];
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 57487f70451..1f5b6bd1d80 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -29,7 +29,6 @@ in
virtualisation.xen.package = mkOption {
type = types.package;
- default = pkgs.xen;
defaultText = "pkgs.xen";
example = literalExample "pkgs.xen-light";
description = ''
@@ -39,7 +38,6 @@ in
virtualisation.xen.qemu = mkOption {
type = types.path;
- default = "${pkgs.xen}/lib/xen/bin/qemu-system-i386";
defaultText = "\${pkgs.xen}/lib/xen/bin/qemu-system-i386";
example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386";
description = ''
@@ -49,7 +47,6 @@ in
virtualisation.xen.qemu-package = mkOption {
type = types.package;
- default = pkgs.xen;
defaultText = "pkgs.xen";
example = literalExample "pkgs.qemu_xen-light";
description = ''
@@ -136,6 +133,9 @@ in
message = "Xen currently does not support EFI boot";
} ];
+ virtualisation.xen.package = mkDefault pkgs.xen;
+ virtualisation.xen.qemu = mkDefault "${pkgs.xen}/lib/xen/bin/qemu-system-i386";
+ virtualisation.xen.qemu-package = mkDefault pkgs.xen;
virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored";
environment.systemPackages = [ cfg.package ];
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 63ca39a9b60..5c1112a1c6d 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -92,7 +92,7 @@ in rec {
(all nixos.tests.openssh)
(all nixos.tests.printing)
(all nixos.tests.proxy)
- (all nixos.tests.sddm)
+ (all nixos.tests.sddm.default)
(all nixos.tests.simple)
(all nixos.tests.udisks2)
(all nixos.tests.xfce)
diff --git a/nixos/release.nix b/nixos/release.nix
index cf7f0a63f4b..5f9a5b0e064 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -228,6 +228,7 @@ in rec {
tests.containers-imperative = callTest tests/containers-imperative.nix {};
tests.containers-extra_veth = callTest tests/containers-extra_veth.nix {};
tests.containers-physical_interfaces = callTest tests/containers-physical_interfaces.nix {};
+ tests.containers-restart_networking = callTest tests/containers-restart_networking.nix {};
tests.containers-tmpfs = callTest tests/containers-tmpfs.nix {};
tests.containers-hosts = callTest tests/containers-hosts.nix {};
tests.containers-macvlans = callTest tests/containers-macvlans.nix {};
@@ -292,11 +293,11 @@ in rec {
tests.printing = callTest tests/printing.nix {};
tests.proxy = callTest tests/proxy.nix {};
tests.pumpio = callTest tests/pump.io.nix {};
- tests.quagga = callTest tests/quagga.nix {};
+ # tests.quagga = callTest tests/quagga.nix {};
tests.quake3 = callTest tests/quake3.nix {};
tests.runInMachine = callTest tests/run-in-machine.nix {};
tests.samba = callTest tests/samba.nix {};
- tests.sddm = callTest tests/sddm.nix {};
+ tests.sddm = callSubTests tests/sddm.nix {};
tests.simple = callTest tests/simple.nix {};
tests.smokeping = callTest tests/smokeping.nix {};
tests.taskserver = callTest tests/taskserver.nix {};
diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix
new file mode 100644
index 00000000000..086d056c51c
--- /dev/null
+++ b/nixos/tests/containers-restart_networking.nix
@@ -0,0 +1,114 @@
+# Test for NixOS' container support.
+
+let
+ client_base = rec {
+ networking.firewall.enable = false;
+
+ containers.webserver = {
+ autoStart = true;
+ privateNetwork = true;
+ hostBridge = "br0";
+ config = {
+ networking.firewall.enable = false;
+ networking.firewall.allowPing = true;
+ networking.interfaces.eth0.ip4 = [
+ { address = "192.168.1.122"; prefixLength = 24; }
+ ];
+ };
+ };
+ };
+in import ./make-test.nix ({ pkgs, lib, ...} :
+{
+ name = "containers-restart_networking";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ kampfschlaefer ];
+ };
+
+ nodes = {
+ client = { lib, pkgs, ... }: client_base // {
+ virtualisation.vlans = [ 1 ];
+
+ networking.bridges.br0 = {
+ interfaces = [];
+ rstp = false;
+ };
+ networking.interfaces = {
+ eth1.ip4 = lib.mkOverride 0 [ ];
+ br0.ip4 = [{ address = "192.168.1.1"; prefixLength = 24; }];
+ };
+
+ };
+ client_eth1 = { lib, pkgs, ... }: client_base // {
+ networking.bridges.br0 = {
+ interfaces = [ "eth1" ];
+ rstp = false;
+ };
+ networking.interfaces = {
+ eth1.ip4 = lib.mkOverride 0 [ ];
+ br0.ip4 = [{ address = "192.168.1.2"; prefixLength = 24; }];
+ };
+ };
+ client_eth1_rstp = { lib, pkgs, ... }: client_base // {
+ networking.bridges.br0 = {
+ interfaces = [ "eth1" ];
+ rstp = true;
+ };
+ networking.interfaces = {
+ eth1.ip4 = lib.mkOverride 0 [ ];
+ br0.ip4 = [{ address = "192.168.1.2"; prefixLength = 24; }];
+ };
+ };
+ };
+
+ testScript = {nodes, ...}: let
+ originalSystem = nodes.client.config.system.build.toplevel;
+ eth1_bridged = nodes.client_eth1.config.system.build.toplevel;
+ eth1_rstp = nodes.client_eth1_rstp.config.system.build.toplevel;
+ in ''
+ $client->start();
+
+ $client->waitForUnit("default.target");
+
+ subtest "initial state", sub {
+ $client->succeed("ping 192.168.1.122 -c 1 -n >&2");
+ $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.1 >&2");
+
+ $client->fail("ip l show eth1 |grep \"master br0\" >&2");
+ $client->fail("grep eth1 /run/br0.interfaces >&2");
+ };
+
+ subtest "interfaces without stp", sub {
+ $client->succeed("${eth1_bridged}/bin/switch-to-configuration test >&2");
+
+ $client->succeed("ping 192.168.1.122 -c 1 -n >&2");
+ $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2");
+
+ $client->succeed("ip l show eth1 |grep \"master br0\" >&2");
+ $client->succeed("grep eth1 /run/br0.interfaces >&2");
+ };
+
+ # activating rstp needs another service, therefor the bridge will restart and the container will loose its connectivity
+ #subtest "interfaces with rstp", sub {
+ # $client->succeed("${eth1_rstp}/bin/switch-to-configuration test >&2");
+ # $client->execute("ip -4 a >&2");
+ # $client->execute("ip l >&2");
+ #
+ # $client->succeed("ping 192.168.1.122 -c 1 -n >&2");
+ # $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2");
+ #
+ # $client->succeed("ip l show eth1 |grep \"master br0\" >&2");
+ # $client->succeed("grep eth1 /run/br0.interfaces >&2");
+ #};
+
+ subtest "back to no interfaces and no stp", sub {
+ $client->succeed("${originalSystem}/bin/switch-to-configuration test >&2");
+
+ $client->succeed("ping 192.168.1.122 -c 1 -n >&2");
+ $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.1 >&2");
+
+ $client->fail("ip l show eth1 |grep \"master br0\" >&2");
+ $client->fail("grep eth1 /run/br0.interfaces >&2");
+ };
+ '';
+
+})
diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix
index 26409949ec6..84562336825 100644
--- a/nixos/tests/dnscrypt-proxy.nix
+++ b/nixos/tests/dnscrypt-proxy.nix
@@ -15,6 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: {
services.dnscrypt-proxy.enable = true;
services.dnscrypt-proxy.localPort = localProxyPort;
+ services.dnscrypt-proxy.extraArgs = [ "-X libdcplugin_example.so" ];
services.dnsmasq.enable = true;
services.dnsmasq.servers = [ "127.0.0.1#${toString localProxyPort}" ];
diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix
index 42425b57ba3..2c9c745021a 100644
--- a/nixos/tests/gnome3-gdm.nix
+++ b/nixos/tests/gnome3-gdm.nix
@@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
services.xserver.enable = true;
+ services.xserver.displayManager.slim.enable = false;
services.xserver.displayManager.gdm = {
enable = true;
autoLogin = {
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index ca787e9c7b9..f561fc8c3c4 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -8,25 +8,27 @@ import ./make-test.nix ({ pkgs, ...} :
machine = { lib, ... }: {
imports = [ ./common/user-account.nix ];
- virtualisation.memorySize = 1024;
services.xserver.enable = true;
- services.xserver.displayManager.sddm = {
- enable = true;
- autoLogin = {
- enable = true;
- user = "alice";
- };
- };
+ services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
services.xserver.desktopManager.default = "plasma5";
- virtualisation.writableStore = false; # FIXME
+ virtualisation.memorySize = 1024;
};
- testScript = { nodes, ... }:
- let xdo = "${pkgs.xdotool}/bin/xdotool"; in
- ''
+ enableOCR = true;
+
+ testScript = { nodes, ... }: let
+ user = nodes.machine.config.users.extraUsers.alice;
+ xdo = "${pkgs.xdotool}/bin/xdotool";
+ in ''
startAll;
+ # Wait for display manager to start
+ $machine->waitForText(qr/${user.description}/);
+ $machine->screenshot("sddm");
+
+ # Log in
+ $machine->sendChars("${user.password}\n");
$machine->waitForFile("/home/alice/.Xauthority");
$machine->succeed("xauth merge ~alice/.Xauthority");
diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index 041d88fbeae..82be9bc1d72 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -1,28 +1,66 @@
-import ./make-test.nix ({ pkgs, ...} : {
- name = "sddm";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ ttuegel ];
- };
+{ system ? builtins.currentSystem }:
- machine = { lib, ... }: {
- imports = [ ./common/user-account.nix ];
- services.xserver.enable = true;
- services.xserver.displayManager.sddm = {
- enable = true;
- autoLogin = {
- enable = true;
- user = "alice";
+with import ../lib/testing.nix { inherit system; };
+
+let
+ inherit (pkgs) lib;
+
+ tests = {
+ default = {
+ name = "sddm";
+
+ machine = { lib, ... }: {
+ imports = [ ./common/user-account.nix ];
+ services.xserver.enable = true;
+ services.xserver.displayManager.sddm.enable = true;
+ services.xserver.windowManager.default = "icewm";
+ services.xserver.windowManager.icewm.enable = true;
+ services.xserver.desktopManager.default = "none";
};
- };
- services.xserver.windowManager.default = "icewm";
- services.xserver.windowManager.icewm.enable = true;
- services.xserver.desktopManager.default = "none";
- };
- testScript = { nodes, ... }: ''
- startAll;
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
- $machine->waitForWindow("^IceWM ");
- '';
-})
+ enableOCR = true;
+
+ testScript = { nodes, ... }: let
+ user = nodes.machine.config.users.extraUsers.alice;
+ in ''
+ startAll;
+ $machine->waitForText(qr/ALICE/);
+ $machine->screenshot("sddm");
+ $machine->sendChars("${user.password}\n");
+ $machine->waitForFile("/home/alice/.Xauthority");
+ $machine->succeed("xauth merge ~alice/.Xauthority");
+ $machine->waitForWindow("^IceWM ");
+ '';
+ };
+
+ autoLogin = {
+ name = "sddm-autologin";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ ttuegel ];
+ };
+
+ machine = { lib, ... }: {
+ imports = [ ./common/user-account.nix ];
+ services.xserver.enable = true;
+ services.xserver.displayManager.sddm = {
+ enable = true;
+ autoLogin = {
+ enable = true;
+ user = "alice";
+ };
+ };
+ services.xserver.windowManager.default = "icewm";
+ services.xserver.windowManager.icewm.enable = true;
+ services.xserver.desktopManager.default = "none";
+ };
+
+ testScript = { nodes, ... }: ''
+ startAll;
+ $machine->waitForFile("/home/alice/.Xauthority");
+ $machine->succeed("xauth merge ~alice/.Xauthority");
+ $machine->waitForWindow("^IceWM ");
+ '';
+ };
+ };
+in
+ lib.mapAttrs (lib.const makeTest) tests
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 376c4f21dc0..4f7cb176d96 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -65,7 +65,7 @@ let
touch /mnt-root/boot-done
hostname "${vmName}"
mkdir -p /nix/store
- unshare -m "@shell@" -c '
+ unshare -m ${escapeShellArg pkgs.stdenv.shell} -c '
mount -t vboxsf nixstore /nix/store
exec "$stage2Init"
'
diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index 0c875308502..50a011e0057 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
, withGui }:
with stdenv.lib;
+
stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version;
- version = "0.11.2.cl1.b1";
+ version = "1.2.3";
- src = fetchurl {
- url = "https://github.com/bitcoinclassic/bitcoinclassic/archive/v${version}.tar.gz";
- sha256 = "1szsnx5aijk3hx7qkqzbqsr0basg8ydwp20mh3bhnf4ljryy2049";
+ src = fetchFromGitHub {
+ owner = "bitcoinclassic";
+ repo = "bitcoinclassic";
+ rev = "v${version}";
+ sha256 = "0y99c8zv42ps3pxp46p3fqj9sir580v7s5qyi3cxva12mq2z0cql";
};
- buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
- miniupnpc utillinux protobuf ]
+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
+ buildInputs = [ openssl db48 boost zlib
+ miniupnpc utillinux protobuf libevent ]
++ optionals withGui [ qt4 qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
@@ -35,7 +39,7 @@ stdenv.mkDerivation rec {
continue to release updates that are in line with Satoshi’s whitepaper &
vision, and are agreed upon by the community.
'';
- homepage = "https://bitcoinclassic.com/";
+ homepage = https://bitcoinclassic.com/;
maintainers = with maintainers; [ jefdaj ];
license = licenses.mit;
platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 1d9b897188d..d304019953a 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -16,6 +16,7 @@ rec {
dogecoin = callPackage ./dogecoin.nix { withGui = true; };
dogecoind = callPackage ./dogecoin.nix { withGui = false; };
+ freicoin = callPackage ./freicoin.nix { boost = pkgs.boost155; };
go-ethereum = callPackage ./go-ethereum.nix { };
litecoin = callPackage ./litecoin.nix { withGui = true; };
@@ -33,5 +34,4 @@ rec {
primecoind = callPackage ./primecoin.nix { withGui = false; };
stellar-core = callPackage ./stellar-core.nix { };
-
}
diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix
new file mode 100644
index 00000000000..f7cd04f1be4
--- /dev/null
+++ b/pkgs/applications/altcoins/freicoin.nix
@@ -0,0 +1,32 @@
+{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, qmake4Hook, unzip }:
+
+stdenv.mkDerivation rec {
+ version = "0.8.6-2";
+ name = "freicoin-${version}";
+
+ src = fetchFromGitHub {
+ owner = "freicoin";
+ repo = "freicoin";
+ rev = "v${version}";
+ sha256 = "1m5pcnfhwhcj7q00p2sy3h73rkdm3w6grmljgiq53gshcj08cq1z";
+ };
+
+ # I think that openssl and zlib are required, but come through other
+ # packages
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp freicoin-qt $out/bin
+ '';
+
+ nativeBuildInputs = [ qmake4Hook ];
+ buildInputs = [ db boost gmp mpfr miniupnpc qt4 ];
+
+ meta = with stdenv.lib; {
+ description = "Peer-to-peer currency with demurrage fee";
+ homepage = http://freicoi.in/;
+ license = licenses.mit;
+ maintainers = [ maintainers.viric ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index eaf02bd2689..a52301c34d7 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
- version = "0.9.11";
+ version = "0.9.12";
name = "drumgizmo-${version}";
src = fetchurl {
url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
- sha256 = "04hf3nhccwr98n2081rrvfccz50nly6k3gbk9zxccp1522qz5xvf";
+ sha256 = "0kqrss9v3vpznmh4jgi3783wmprr645s3i485jlvdscpysjfkh6z";
};
configureFlags = [ "--enable-lv2" ];
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 0a2e293d90b..064feeb02a3 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
- version = "0.8.0";
+ version = "0.8.1";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
- sha256 = "1n2kd468kn71yp2asmamprvblmdlvh0zd8lsh3598dwi4b7aa3ga";
+ sha256 = "0l6kjb1q9vslwy56836a0c65mf8z8ycam5vzz3k4qvd8g74bs1zq";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index c719080c742..463bd64495d 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -56,5 +56,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = [ maintainers.vandenoever ];
repositories.git = https://github.com/musescore/MuseScore;
+ broken = true;
};
}
diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index a7252b9e28a..f4e5998c037 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
name = "non-${version}";
- version = "2016-12-07";
+ version = "2017-03-29";
src = fetchFromGitHub {
owner = "original-male";
repo = "non";
- rev = "754d113b0e3144a145d50bde8370ff2cae98169c";
- sha256 = "04h67vy966vys6krgjsxd7dph4z46r8c6maw1hascxlasy3bhhk0";
+ rev = "10c31e57291b6e42be53371567a722b62b32d220";
+ sha256 = "080rha4ffp7qycyg1mqcf4vj0s7z8qfvz6bxm0w29xgg2kkmb3fx";
};
buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 6b4d8e33b50..1d1d0d6a6f0 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -8,7 +8,7 @@ let
# Please update the stable branch!
# Latest version number can be found at:
# http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
- version = "1.0.49.125.g72ee7853-111";
+ version = "1.0.52.717.g2f08534a-47";
deps = [
alsaLib
@@ -42,6 +42,7 @@ let
xorg.libXrender
xorg.libXScrnSaver
xorg.libXtst
+ xorg.libxcb
zlib
];
@@ -53,7 +54,7 @@ stdenv.mkDerivation {
src =
fetchurl {
url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
- sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x";
+ sha256 = "1xqd4pjb69zmbac5fq3pckgr4khlkzfkx8b029qzjc2hi52zfnj7";
};
buildInputs = [ dpkg makeWrapper ];
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 019d3e97a6f..f675febafb5 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -29,10 +29,9 @@ let
buildInputs = [
libxcb libpthreadstubs libXdmcp libXau pam systemd
- qtbase qtdeclarative
];
- propagatedUserEnvPkgs = builtins.map lib.getBin [
+ propagatedBuildInputs = [
qtbase qtdeclarative
];
@@ -98,6 +97,7 @@ stdenv.mkDerivation {
addToSearchPath RUNTIME_XDG_CONFIG_DIRS "$pkg/etc/xdg"
done
+ mkdir -p "$out/bin"
makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm"
mkdir -p "$out/share/sddm"
diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix
index 9cab87e9ed2..20c2623e034 100644
--- a/pkgs/applications/editors/codeblocks/default.nix
+++ b/pkgs/applications/editors/codeblocks/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk2
+{ stdenv, fetchurl, autoreconfHook, libtool, pkgconfig, file, zip, wxGTK, gtk2
, contribPlugins ? false, hunspell, gamin, boost
}:
-with { inherit (stdenv.lib) optionalString optional optionals; };
+with stdenv.lib;
stdenv.mkDerivation rec {
name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}";
- version = "13.12";
+ version = "16.01";
pname = "codeblocks";
src = fetchurl {
- url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}-1.tar.gz";
- sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p";
+ url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.gz";
+ sha256 = "00sskm91r20ywydwqwx6v7z3nwn9lyh5297c5wp3razldlh9vyrh";
};
- buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk2 ]
+ nativeBuildInputs = [ autoreconfHook pkgconfig libtool file zip ];
+ buildInputs = [ wxGTK gtk2 ]
++ optionals contribPlugins [ hunspell gamin boost ];
enableParallelBuilding = true;
patches = [ ./writable-projects.patch ];
@@ -25,9 +26,9 @@ stdenv.mkDerivation rec {
# Fix boost 1.59 compat
# Try removing in the next version
- CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
+ #CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
- meta = with stdenv.lib; {
+ meta = {
maintainers = [ maintainers.linquize ];
platforms = platforms.all;
description = "The open source, cross platform, free C, C++ and Fortran IDE";
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index e80e8db08f0..868f9619ce2 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -358,15 +358,14 @@
license = lib.licenses.free;
};
}) {};
- company = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
- elpaBuild {
+ company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "company";
- version = "0.9.2";
+ version = "0.9.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/company-0.9.2.tar";
- sha256 = "10divixs06gq9nm8s8x0q12ir07y27d06l52ix2dn84zvj853z4z";
+ url = "https://elpa.gnu.org/packages/company-0.9.3.tar";
+ sha256 = "1b38najmah4s2smxslik6wbdvb0x77rm6fv45pcq5x5aaiplh5ap";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/company.html";
license = lib.licenses.free;
@@ -821,10 +820,10 @@
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "gnorb";
- version = "1.1.5";
+ version = "1.2.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/gnorb-1.1.5.tar";
- sha256 = "128ag8zkfxspf6szxfd7dcscm1zzzcibx7p9dpbpk036cr7m5i1p";
+ url = "https://elpa.gnu.org/packages/gnorb-1.2.1.tar";
+ sha256 = "0mip0czvpdl26xz9wamii5azj9bacjhdg0jgkrxyv17vqqlbag9x";
};
packageRequires = [ cl-lib ];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 3cd7db90654..70ea1d58cf8 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -355,12 +355,12 @@
ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }:
melpaBuild {
pname = "ac-dcd";
- version = "20160311.617";
+ version = "20170323.601";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "ac-dcd";
- rev = "bfb4fe768c8bf6fc7b7ee880f54e2052ebb23e3b";
- sha256 = "1hlijh415wgl450ry16a1072jjrkqqqkk862hfhswfr2l6rjfw98";
+ rev = "1614aa624252e3445b0392c8a9b7197084f3e422";
+ sha256 = "02slswlcjh1rjc9hglvbizhvwp57xcnbhs8cmlcayw0yjwp6mnvb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/64142a4b14531409f45f02a8053ed8948f48221d/recipes/ac-dcd";
@@ -380,8 +380,8 @@
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "e9391a70b8add187fc7c0a22f083ca1ac42e289b";
- sha256 = "1z71rdr4p6bnm8flbqsmds2f2lk587x90qls01zb1fn6w4lsl4zl";
+ rev = "c13d1e853722bac880e82e6b04158015e7b12f6c";
+ sha256 = "18bm0prhnahj0b397hn9nn98d09rrzfhzfg86glxqy4y8k6f0ai6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -737,8 +737,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "c1fb9dcf6d656618d22e97f305349e360a6e9d39";
- sha256 = "1v97hghn39p4wjmy7y9cvv4v0d2n44s1zrw5hvpmh7ix19i4347h";
+ rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
+ sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -754,12 +754,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild {
pname = "ac-php-core";
- version = "20170304.704";
+ version = "20170327.542";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "c1fb9dcf6d656618d22e97f305349e360a6e9d39";
- sha256 = "1v97hghn39p4wjmy7y9cvv4v0d2n44s1zrw5hvpmh7ix19i4347h";
+ rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
+ sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -1299,12 +1299,12 @@
aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aggressive-indent";
- version = "20170314.1428";
+ version = "20170321.1300";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "aggressive-indent-mode";
- rev = "d5417f449af0dc13c402e6d9949ba002aa8b83af";
- sha256 = "0sn7706b9zfj0ry9mzml7rmxprg9q01bkyp9v68xx767jgl9mcf8";
+ rev = "9dfde9ccef6dffbfa68219d91703d779cfe7016a";
+ sha256 = "1aslsq5jjvg0hywk4qzk30k6kaics1xslpqd38n24w37872b70jn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -1549,12 +1549,12 @@
all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
melpaBuild {
pname = "all-the-icons";
- version = "20170314.112";
+ version = "20170328.2313";
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
- rev = "ceba445b3307822309b10a7de54bd500e9ec3be9";
- sha256 = "08gfr9wixnpmz7pvf3yg0qwbzrffhn8vja2nzvvci6qk1b0sy2zc";
+ rev = "e7c8f824d542fd946dfe695ef370dd57a218d03c";
+ sha256 = "0y5mf6iwyqsfl6xa00pkv23d52dadk1zgcmkx91i0ls3jb1cvarg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1684,12 +1684,12 @@
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
- version = "20170313.343";
+ version = "20170329.836";
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "b76345e0ba398c03347b6af4fa087f346eb32174";
- sha256 = "105m01hnkm2asq900c8ndcpim6a2dgndcl83669vb5v39alm17g6";
+ rev = "14061ecfbde5f58a0f807eafc7c1871ff178cea0";
+ sha256 = "05lq97xfdmw34yh1jy4b7ypks5nf3jjcrx12lk0jxhhgcr7j2lv3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1745,12 +1745,12 @@
android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "android-mode";
- version = "20170131.2347";
+ version = "20170323.115";
src = fetchFromGitHub {
owner = "remvee";
repo = "android-mode";
- rev = "76711e73b459de1ee639a49733e4f3f245b8fb41";
- sha256 = "1z0pw5h5yqpszr07jg7hqlfphhy0g6p2hqjyd9ds68p987v35vz0";
+ rev = "f274da87429617b0b9c5889d46b36de64d982da4";
+ sha256 = "17m4hp2qb54widwadv23amc1lasnbwzh2ipc6180fnajg8zcbvyw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode";
@@ -2269,12 +2269,12 @@
anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "anything-tramp";
- version = "20170313.257";
+ version = "20170325.1036";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-anything-tramp";
- rev = "75df15ac263701f921649fefb29f03f6b7d49b9f";
- sha256 = "0al2k5az5x6idnhkhckjxr4vh52f0n9fi20ranwid9ac8k6kspvz";
+ rev = "4e5f2ceb4624a633b809cb7ac671425fa061586b";
+ sha256 = "1jzyxxk8c9dfr5d3i89cq7apjlrwc3278nn1fr7hlcg05nv2lfwl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp";
@@ -2513,12 +2513,12 @@
apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apropospriate-theme";
- version = "20170212.1229";
+ version = "20170321.907";
src = fetchFromGitHub {
owner = "waymondo";
repo = "apropospriate-theme";
- rev = "f5ffcabf7f079bd899d95ffa11a78ccca7eb8c8e";
- sha256 = "1vrpg0fjshqcfhj4iwkgrqw052rvx9kf2l217mg2z94rjm1y9g55";
+ rev = "09f2f184445f179c3c888a4a9b6cafea82a0ca99";
+ sha256 = "000bihb4i07d5djf2b1hdyxm2yynnq5sirry1qgvn5wmrvny586l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -3906,12 +3906,12 @@
avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "avy";
- version = "20170208.148";
+ version = "20170326.1157";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "avy";
- rev = "b8d71639158b44a2a700b84cb02fc8518ad7d542";
- sha256 = "1yddpl78krl2y5l3w6f1h53f5qsc09ad4qcwv31k549ziwiz1vd4";
+ rev = "0c30cdba9e601c9e719b8b00101d2af9f93d2042";
+ sha256 = "18sklj4hc8qybcrqymm6144dz6y8hf34s6szxis3flnnhx1x6a06";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -4284,12 +4284,12 @@
base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "base16-theme";
- version = "20170317.1130";
+ version = "20170326.1839";
src = fetchFromGitHub {
owner = "belak";
repo = "base16-emacs";
- rev = "858c067dd05b1e1ef57e083504b094972ad3a318";
- sha256 = "08fsil8k7m2rs7471basxwpaihrjys1g4fdv3fb2xf2wwfcv08s3";
+ rev = "87b91379661f627cb1cecabfd648d6a3838cd448";
+ sha256 = "1fb4mhz17x235lasqqwzb0jacvl96h3lsjf7mkhdwzxp3p26l4gf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4699,12 +4699,12 @@
beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "beginend";
- version = "20150607.1001";
+ version = "20170324.728";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "beginend";
- rev = "05ed9428b3f09221da0e05fdd918cc5a0b643197";
- sha256 = "1vsid87pmls565bqknbgr7z907v7bb7115v70vzbw4z6lc4falry";
+ rev = "2d8908922fadc1e29938703593a77da6456dc276";
+ sha256 = "0h6i56pa92x89rilgb7kgfpnsx57d157r284q0icm4xj990svg21";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -4994,8 +4994,8 @@
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "bf9a73f919cbd677e4015f82e90099d7cabe5011";
- sha256 = "079vvhv0wjk0nqisk86z1nkxm9hgwnv93dsb3rlqnzjdijw6z2s2";
+ rev = "a354568ec2af8444b741f595a3a7183e3f67ad58";
+ sha256 = "19aaqcaycq1msfgvvnlqkzqqijbzqzc015k69pbg41l5bvrwnqcq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5548,22 +5548,22 @@
license = lib.licenses.free;
};
}) {};
- boxquote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "boxquote";
- version = "20081011.1326";
+ version = "20170329.406";
src = fetchFromGitHub {
owner = "davep";
repo = "boxquote.el";
- rev = "4c49b2046647ed187920c885e175ed388f4833dc";
- sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
+ rev = "b0239fb7b7a9d75d4ac3c66f9b96abd911dbf4e0";
+ sha256 = "0agnsghxf35b6g49radxigw81bmvw1ggljzzmy771nmwl44q2dbb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote";
sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
name = "boxquote";
};
- packageRequires = [];
+ packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/boxquote";
license = lib.licenses.free;
@@ -6109,12 +6109,12 @@
build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "build-status";
- version = "20170226.655";
+ version = "20170323.1621";
src = fetchFromGitHub {
owner = "sshaw";
repo = "build-status";
- rev = "25c61f445502699d18fda7eb2010a38cbf8085a2";
- sha256 = "04siqz69c5dp762c118b1b7iwdz8x3gavc3bncacgnx4ybyb1crf";
+ rev = "01bb9cc1776e8eaab68147175aee9879d9541c4b";
+ sha256 = "1c6q6rk6rvip5xv2zdpqamprx9kqh0c6v3r939fn7m4fnyyz15fn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status";
@@ -6825,8 +6825,8 @@
src = fetchFromGitHub {
owner = "skk-dev";
repo = "ddskk";
- rev = "b0c56cc59cc184bd88f20f00714b256c4b4a9c2b";
- sha256 = "12yzs19nl89lqbyyzcl1vygf0m2x5sxjw9vg7zc6ix9m59ig2q42";
+ rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd";
+ sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -6867,8 +6867,8 @@
src = fetchFromGitHub {
owner = "skk-dev";
repo = "ddskk";
- rev = "b0c56cc59cc184bd88f20f00714b256c4b4a9c2b";
- sha256 = "12yzs19nl89lqbyyzcl1vygf0m2x5sxjw9vg7zc6ix9m59ig2q42";
+ rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd";
+ sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -7094,7 +7094,7 @@
version = "20170201.347";
src = fetchsvn {
url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
- rev = "12069";
+ rev = "12088";
sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
};
recipeFile = fetchurl {
@@ -7675,12 +7675,12 @@
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "20170310.735";
+ version = "20170322.155";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "d528100ecb1441933b0c9ef1920d147cf6c9a40b";
- sha256 = "0a5vbiajw602i83f1j95jiqn1gyv0srmbnf2l878n2ha3qcgx9mr";
+ rev = "0816372ff483dd92eb8775c76929835b0955ae70";
+ sha256 = "0jh7wv2h6xxm7h3pmabcx30m16j2lz11z5pzv73p3miyqpvkh6mn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7801,12 +7801,12 @@
ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ciel";
- version = "20161230.2212";
+ version = "20170323.2203";
src = fetchFromGitHub {
owner = "cs14095";
repo = "ciel.el";
- rev = "ea047b6c097255ea3709b56007d0d1a3b3d5c9bc";
- sha256 = "1f0f2l3na49964wlyv8w99q2qqv5dsr880i6n1xin0q6yqms61yw";
+ rev = "2cc6a4a338e6b1e477f37e8a2fa3c661209c0804";
+ sha256 = "148g1wl9f2bbgpqnyl6qppmzs61z771d1l64643vwvrh3xn4q4vg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel";
@@ -7951,7 +7951,7 @@
version = "20170120.137";
src = fetchsvn {
url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
- rev = "298328";
+ rev = "299036";
sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2";
};
recipeFile = fetchurl {
@@ -8425,8 +8425,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clomacs";
- rev = "d35f139dfff1f0a7aafbc8ade36a97f894c29922";
- sha256 = "19zsz8yabs77zk0b2509g7rkgv3a1lkzgqyc7b80rqlpsrlki3d0";
+ rev = "0c7793b52166730a563c3318cdcb9f2b423bc675";
+ sha256 = "1sj4awcz6xdk1lq7yz69d8v0d97alipc3avzmnby6lpm2pw1n45a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs";
@@ -8593,8 +8593,8 @@
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "3be5896e013492cbe1cf65c1c61822b68d9d59c4";
- sha256 = "1ka86imvs9wx4bx3k8dmkg4sm83pvzcajfv84qld2i20j2f5qbsn";
+ rev = "6a5a214f43cccc83fbe3dd6de4747aba43088701";
+ sha256 = "09xkv6b83b8wv043zq287azsjvqgl0nsmfprq3lsk5hqc82l6006";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8800,8 +8800,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "codesearch.el";
- rev = "7f5ea7d653d01071ff9ce3c3281dc2bed4f96c5c";
- sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
+ rev = "7013d933cd9d3c04f19a6572176483b48a311807";
+ sha256 = "0g5w6p0hpsz5x4f3ic6q38ba5j5jfbx9nl77cxj6h1wpqdk49dhp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5aee771432c63fe2f0ec719ef000f2c5971947b5/recipes/codesearch";
@@ -8859,12 +8859,12 @@
coffee-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "coffee-mode";
- version = "20170315.2046";
+ version = "20170324.240";
src = fetchFromGitHub {
owner = "defunkt";
repo = "coffee-mode";
- rev = "ea6dc5fb2b3ba3818b91a4e5ca5d593145fb571f";
- sha256 = "0bjxvw000r95vzic38savispx3j5dx3d3ni9w7j4zb9hv78kjbnr";
+ rev = "86ab8aae8662e8eff54d3013010b9c693b16eac5";
+ sha256 = "0hf06wp6cpsm7fivwkph6xvc2r39xww8q3aibp4nprlrwcmmv2al";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode";
@@ -9357,12 +9357,12 @@
company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company";
- version = "20170315.1754";
+ version = "20170328.1748";
src = fetchFromGitHub {
owner = "company-mode";
repo = "company-mode";
- rev = "e19e53eacca9624981068939b00b8d630c987d53";
- sha256 = "1nxk64pnq4a7flazyrk179v9m25jm2sw2bn0s9viw26vhvm7y3lk";
+ rev = "f1499404163d8148e7a6303a8598f9c0f696d1cb";
+ sha256 = "1ncfvf6ndqnn95m02ij66l7674h7chzgwg2r9biymqadzxjxim9i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9533,12 +9533,12 @@
company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "company-coq";
- version = "20170227.644";
+ version = "20170327.827";
src = fetchFromGitHub {
owner = "cpitclaudel";
repo = "company-coq";
- rev = "202f38a11d8b14b8f3a84c8261816dbcf0dbff8f";
- sha256 = "0zs3n1nycpahx5qmlfpkb4nc1g7kjr0q9pc5lwgpasi54bcp3371";
+ rev = "daec3ad0f3119f04108574ce48cd77068a850392";
+ sha256 = "04fv3713sgy8c5y9blgx2xyjdg5qvg5idhvsf2p5lk9gjxbslp29";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -9649,8 +9649,8 @@
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "e9391a70b8add187fc7c0a22f083ca1ac42e289b";
- sha256 = "1z71rdr4p6bnm8flbqsmds2f2lk587x90qls01zb1fn6w4lsl4zl";
+ rev = "c13d1e853722bac880e82e6b04158015e7b12f6c";
+ sha256 = "18bm0prhnahj0b397hn9nn98d09rrzfhzfg86glxqy4y8k6f0ai6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9708,12 +9708,12 @@
company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-flow";
- version = "20170226.1930";
+ version = "20170325.810";
src = fetchFromGitHub {
owner = "aaronjensen";
repo = "company-flow";
- rev = "e2183e247720c1e252e04300313f386749997f5b";
- sha256 = "0gsdcm84k2j6753r44r2qxaq62264xj8cxqayynxvjsawzv3ljav";
+ rev = "339f502e46e7d9214b61498d539b17f8f0322d17";
+ sha256 = "0w2b3fk0q3ia5fjxk8gxj4161rxg43jw0hxpihidl5aak4i6dxb9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow";
@@ -10006,8 +10006,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "c1fb9dcf6d656618d22e97f305349e360a6e9d39";
- sha256 = "1v97hghn39p4wjmy7y9cvv4v0d2n44s1zrw5hvpmh7ix19i4347h";
+ rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
+ sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10285,8 +10285,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a";
- sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c";
+ rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79";
+ sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
@@ -10637,12 +10637,12 @@
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "20170320.434";
+ version = "20170328.737";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "beffa78885517beaad2da50accc339f9346f94ee";
- sha256 = "18bxh67xdkbxpmxdqidrnqwlzffdywmf9vwz4zcynagj7yscx3yb";
+ rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
+ sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10700,12 +10700,12 @@
counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-gtags";
- version = "20170310.536";
+ version = "20170326.559";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-counsel-gtags";
- rev = "4ef27b1cf1075097e11c3bcfee43e0710950dbcb";
- sha256 = "14rnccz8sm8zyghkh93id4iv65qwdix75rb5f6i2y23k94h2483f";
+ rev = "220ebb48419ee6891ecbf9ea8fe130b494b17ee2";
+ sha256 = "12ml45gwfh0lyvmf24pvryylrjx5g60yqpbjfcak7zvy7x5wmc1s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags";
@@ -11677,8 +11677,8 @@
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "c94245482141cf891a1cd8a4fa57b8bd61359a5d";
- sha256 = "1vm8ijk6x0h20366mdnwf5hxj8zbyms06c3dh8msrchvrhd52prz";
+ rev = "bd0bd943792530194e9bea86e4cf6fe9f8261182";
+ sha256 = "1z5li1h376978iby273ynvx52phdnsgsil8vlpj98izf19qnsmmq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11778,12 +11778,12 @@
danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "danneskjold-theme";
- version = "20170227.251";
+ version = "20170322.1007";
src = fetchFromGitHub {
owner = "rails-to-cosmos";
repo = "danneskjold-theme";
- rev = "5a52c5eca997655b7db349962d056daba64219cb";
- sha256 = "17kfv071zg0v3hcmlzk5yb88xpyknxig2fl2mj2cw3xjcshbxaa0";
+ rev = "2ea398532e8229e329f6ea9b264ffd42068b16b9";
+ sha256 = "1zxj81dqci73zf01h9rz3gkd0qfd7n8238jzkjsmyhyvq7l644hz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -11799,12 +11799,12 @@
dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "dante";
- version = "20170207.234";
+ version = "20170328.232";
src = fetchFromGitHub {
owner = "jyp";
repo = "dante";
- rev = "7acaefbf36fe53e9af9f812957eea404e11f8a61";
- sha256 = "0ascjab014sbv9fvkswyxwhg50f0siwa9v6s67k5g58n9f7r7bls";
+ rev = "0fe8c8243e5ce1aa6c241d4e5d51e489b1fbd512";
+ sha256 = "15r1bczfxbp7rgxh0gq1516kypgnkm4wsf9svl0fxzdcayaawl3k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -11988,12 +11988,12 @@
darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darktooth-theme";
- version = "20170313.317";
+ version = "20170328.1604";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-darktooth";
- rev = "dde50661210d8610cd03526a6c9a922bb0e494a6";
- sha256 = "1mab28rm175ylg17ziha2kndcqb9a23f8wrpydypa8k7iirhadp6";
+ rev = "419746ab4c06bd2146ff6ddf68aa74dfd73d8c96";
+ sha256 = "0gxvz617np99x5ynh7y0cammxmwxp42kcnnqxl5ljknn4lwbapar";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12282,12 +12282,12 @@
ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ddskk";
- version = "20170318.2238";
+ version = "20170322.401";
src = fetchFromGitHub {
owner = "skk-dev";
repo = "ddskk";
- rev = "b0c56cc59cc184bd88f20f00714b256c4b4a9c2b";
- sha256 = "12yzs19nl89lqbyyzcl1vygf0m2x5sxjw9vg7zc6ix9m59ig2q42";
+ rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd";
+ sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -13321,12 +13321,12 @@
dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-launch";
- version = "20170227.1532";
+ version = "20170328.809";
src = fetchFromGitHub {
owner = "thomp";
repo = "dired-launch";
- rev = "58cf696c396c12d143387f4bf446ccb8398837b6";
- sha256 = "1i7a3rjf62ksyfd161jw4x1zx3apjmra42vas7xpllkkhrk0cz08";
+ rev = "036204d3b86d4fbbd479f65d9af243cca079a47f";
+ sha256 = "1g7kn9c2w165rchjbrkllvykj4952f7zgrhlr3lnfnf5dampy20k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch";
@@ -13383,10 +13383,10 @@
}) {};
dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "dired-plus";
- version = "20170221.1620";
+ version = "20170324.1112";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/dired+.el";
- sha256 = "0jfv0m3w3vqafaqcxp4n53msvjp83zczxc7drgng1amksr82xi63";
+ sha256 = "00w4d3zw789cl0ch7h0nk4mzlb88806cbq6mcslwf82732vxzkv0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
@@ -13629,8 +13629,8 @@
src = fetchFromGitHub {
owner = "wbolster";
repo = "emacs-direnv";
- rev = "120d6e15cfef64b10ed599a5f748e7580eacaeac";
- sha256 = "0vma9ar82841gwlgx3x2qywqwdm9ydx28di7k6c56v9z500jf9ra";
+ rev = "72340994841db19083eb1226cd09abe75d1c1e13";
+ sha256 = "0dx63z3cmpcbn1lr9baqhh78j5xfyv1n5yp6fs210hmrbhlfpr8d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
@@ -14731,8 +14731,8 @@
src = fetchFromGitHub {
owner = "dracula";
repo = "emacs";
- rev = "3c9efcc81ecb18c2ebd71aeb8da691a47a1fd49a";
- sha256 = "10gz1pmpdxk2c7r47ac4vxc57bs703l9yqa9jp6q6wnldi2k0snd";
+ rev = "3ba76624318944cbadd95865dc3f50af01cb6241";
+ sha256 = "1x74nxxdv87sw0prd20nz2i0mxna29spy9dwm5qp6skl09bjwrfn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme";
@@ -14936,7 +14936,7 @@
version = "20130120.1257";
src = fetchsvn {
url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
- rev = "1787893";
+ rev = "1789422";
sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
};
recipeFile = fetchurl {
@@ -15037,12 +15037,12 @@
dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "dumb-jump";
- version = "20170318.1423";
+ version = "20170328.2013";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-jump";
- rev = "05fa8564d5f9a567f682e1efcc2d3bcdb9ba247d";
- sha256 = "0pwlz8g170x7dp46cshjvqsxsrz7snqy0dhpwf61ysbapflylyi8";
+ rev = "1df89e837d4c28c941db879b028f92b3378745d8";
+ sha256 = "19n18a057ngvfqhaancji06abpp3qlqymsygchv0s9v9q6nzfi49";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump";
@@ -15100,11 +15100,11 @@
dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dyalog-mode";
- version = "20170215.333";
+ version = "20170324.419";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "c4f10d72febc";
- sha256 = "0x9h38vs5vnvswp3dm3i2pdzw8rvqwxpsfpsjx7r84bww9nr9dyd";
+ rev = "6f4b44fb1966";
+ sha256 = "10d69aah8kq5ln3rcd2vcdck1vvqq5x47kk0bk4vpphh26j14jjp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -15411,6 +15411,27 @@
license = lib.licenses.free;
};
}) {};
+ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "easy-hugo";
+ version = "20170328.2015";
+ src = fetchFromGitHub {
+ owner = "masasam";
+ repo = "emacs-easy-hugo";
+ rev = "544b6ef850c10e6bb15d0ac9a6474d471044309a";
+ sha256 = "1j0ffs9517ba29lwd92sk30ih6sxlx2ychrr6lzc0a3lzdlzfaqz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/544fa512dc3e6379f451fd9b596d74a5849c87d2/recipes/easy-hugo";
+ sha256 = "07pa48rv5aqpz7fwkbc48scvnvnvg1v3qkapn2h1qllfc0h2nn5i";
+ name = "easy-hugo";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/easy-hugo";
+ license = lib.licenses.free;
+ };
+ }) {};
easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-kill";
@@ -15498,12 +15519,12 @@
ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
melpaBuild {
pname = "ebal";
- version = "20161231.1559";
+ version = "20170327.2229";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ebal";
- rev = "c0df139972c52200db417cc18e65f8748969fb79";
- sha256 = "19yxfc6lbd4311w291lxsw1v3hp0ha4inlp5fcakszd76bc69c4w";
+ rev = "e47c9eb6b8d6d2bc16c17f9d1dfa9fa2fc00124f";
+ sha256 = "00d4i1y9z3gaw01cgccsk6q4qcbn9sg8lzs0im4dh6hzg27w12qm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
@@ -15540,12 +15561,12 @@
ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
melpaBuild {
pname = "ebib";
- version = "20170222.1459";
+ version = "20170327.141";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "ebib";
- rev = "36d9d19abacaeade54a043701c5b2e4e58b8a61b";
- sha256 = "1fiwgdlykgnyi93lrnh0ifd4c5jlbs1kg69r2q2fyyfcwwvvq3ck";
+ rev = "1eea156ea6f1376d474274ce76b1d6864223c47e";
+ sha256 = "0lhpwa4rgxb480gzfp55infr9672fv3b3my72f6wkwhh1k5i5xjb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -15600,12 +15621,12 @@
eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
melpaBuild {
pname = "eclim";
- version = "20170317.1328";
+ version = "20170328.1807";
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "e9391a70b8add187fc7c0a22f083ca1ac42e289b";
- sha256 = "1z71rdr4p6bnm8flbqsmds2f2lk587x90qls01zb1fn6w4lsl4zl";
+ rev = "c13d1e853722bac880e82e6b04158015e7b12f6c";
+ sha256 = "18bm0prhnahj0b397hn9nn98d09rrzfhzfg86glxqy4y8k6f0ai6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -16258,12 +16279,12 @@
ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
melpaBuild {
pname = "ein";
- version = "20170320.1222";
+ version = "20170322.650";
src = fetchFromGitHub {
owner = "millejoh";
repo = "emacs-ipython-notebook";
- rev = "12e522c05f215ecf75541b07cc77cf89fea63c2d";
- sha256 = "18hb0b3wh681nqmlfn0xysr933mpb3cphlkp88rq8jg0wgw9psni";
+ rev = "2547226f2ee32726809a3a603e6797492896f170";
+ sha256 = "1rkva6lmss32vd96wvgh0r5phdr54xs1hjmwpkcr4x2h1dm1w7a6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16318,22 +16339,30 @@
license = lib.licenses.free;
};
}) {};
- ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
+ ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
melpaBuild {
pname = "ejc-sql";
- version = "20170221.33";
+ version = "20170328.706";
src = fetchFromGitHub {
owner = "kostafey";
repo = "ejc-sql";
- rev = "4663cd80af74d8e29001adc696568de5d3d8717c";
- sha256 = "1r6b4dgk1scy1fwsri96gjldcx4q60vdgqb29k5g9sljsw00xzfy";
+ rev = "9595e72e85e7edef0d9df5accf166d232824cd3d";
+ sha256 = "0h0ryi027f4vqv9m6dz8dgf9scqmcabcgin692yysxp9b5jkg8d3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx";
name = "ejc-sql";
};
- packageRequires = [ auto-complete cider clomacs dash emacs spinner ];
+ packageRequires = [
+ auto-complete
+ cider
+ clomacs
+ dash
+ direx
+ emacs
+ spinner
+ ];
meta = {
homepage = "https://melpa.org/#/ejc-sql";
license = lib.licenses.free;
@@ -17120,12 +17149,12 @@
elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
melpaBuild {
pname = "elm-mode";
- version = "20161210.49";
+ version = "20170322.1347";
src = fetchFromGitHub {
owner = "jcollard";
repo = "elm-mode";
- rev = "29f50a940113d793a21998f3bb414fdd9b0c5daa";
- sha256 = "02c7xl9w81140l7p9kywr5qwsdyv92nxdhzqcxjk0r09x7s0cvsk";
+ rev = "3d36c16bbe1cebc285341452a60da578afbb2804";
+ sha256 = "1aywgkf5505hx7qd0r4b8k89xmskkrz9imlmhp6xnwj31qs7ix63";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -17351,12 +17380,12 @@
elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "20170303.621";
+ version = "20170324.227";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "2c8792e6e379c565e8dbfb5d3486988ab49c6b4e";
- sha256 = "1zrr7gmfpxjk0psvi3gf87qxf8nzh29n92f5f14xb75kjn2ji9l6";
+ rev = "c793c9d048f16b74bddf7aff5b3e3cf32d90f71f";
+ sha256 = "0cmn8j2hbh5qzwwskhjmpilgcdf0h3lm9jj0vx1fwwagxg369gw2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -18049,12 +18078,12 @@
emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms-player-mpv-jp-radios";
- version = "20170213.655";
+ version = "20170322.830";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "emms-player-mpv-jp-radios";
- rev = "6897e43223eac133f0c2d9101932fec6479e58b6";
- sha256 = "1qjrnh25rv4n0cvdd8ynjlmvnb7zqibz1ky0x8ahkml72g672f5i";
+ rev = "dbb22a8ccfabf961965093abefa77217cac1d8ff";
+ sha256 = "0w22qkdqw5328rxn7ik4yfw77wbigaspyz30hd1v68qklhxpag94";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios";
@@ -18217,12 +18246,12 @@
emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
melpaBuild {
pname = "emojify";
- version = "20170313.640";
+ version = "20170323.730";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "emacs-emojify";
- rev = "00e8d01f114ad5ca95d5e9509ef327afa0087e0f";
- sha256 = "171ic2qcrc0mwfjjn2v8894m0r5waq3qpmw80lqqc1a05yn656si";
+ rev = "9ce171d38915c81ba0f387e013aad2e089d61d48";
+ sha256 = "1p2hws3jyk4pvgxznirp20r9s6h1554h6sn8kil203cb4l64wb3f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -19034,12 +19063,12 @@
ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "ergoemacs-mode";
- version = "20170112.1108";
+ version = "20170328.832";
src = fetchFromGitHub {
owner = "ergoemacs";
repo = "ergoemacs-mode";
- rev = "b4b5241e679cc1a7bd7b1f3703f1a7ce602cd1f6";
- sha256 = "1zmwzpp410hxgwycys7ij4xjmzz8piykx4scclvvyl63hhqlrrfh";
+ rev = "87fe85ac20a6ac32b41df5e7464d6ace5528445b";
+ sha256 = "0s2yf8hkigbzp5rhkznlkg4jqx3darj4i7h3dpbajc2lnc1c9nmc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
@@ -19080,8 +19109,8 @@
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "a85efc31824b4d59f4ed1eefcd19e9d7c6ef021f";
- sha256 = "1w8m12s8cjy20nssp5ya83zi3jkxk4f6fv4d7xr9gzgvrsqcq2rx";
+ rev = "53b483cb14c4b3b666eab63f9f09d7ac827f9a7c";
+ sha256 = "1pw1ibqyn7j56dk6yh21hg91xv5kp478da3xv3gb77mh4is09n8b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19660,12 +19689,12 @@
ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
melpaBuild {
pname = "ess";
- version = "20170227.802";
+ version = "20170327.248";
src = fetchFromGitHub {
owner = "emacs-ess";
repo = "ESS";
- rev = "e7e52d2c07d374209261d207293caa391db7b398";
- sha256 = "1apk33hmsn5qlagnrqnmd975pz2ydf69s4kwsnx00fj9fb48bkzz";
+ rev = "dd623f1c67c54fb1f9c20403fa976cb1272a5074";
+ sha256 = "033rsdxrmcjcmjpdkbqykr0zir7ycy0f706q5x6m3vn13wm5hgfb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20032,12 +20061,12 @@
evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "evil";
- version = "20170306.334";
+ version = "20170323.1140";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "56e92f7cb4e04e665670460093b41f58446b7a2b";
- sha256 = "0063x3v849h57bf4pqf3k2kiqrjj0sjw5y9w9lr0q0v33mn8q145";
+ rev = "273a714e2d073257f6604d03be53c5fd784117c4";
+ sha256 = "0vrvfgrl1pdmvphscsf9zyy9yvl25xm53h5k1wiw7v3kb66x7s88";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -20473,12 +20502,12 @@
evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-lion";
- version = "20170319.143";
+ version = "20170328.21";
src = fetchFromGitHub {
owner = "edkolev";
repo = "evil-lion";
- rev = "039c82f5183a01b6e008b1028b48f1ec33f74eff";
- sha256 = "1zgk0xmvfnqvh0d0925c8sfpr53frgk5ixbxis72r04p0hz4833v";
+ rev = "da324d54e539f042a85344d1c168b69106896b8b";
+ sha256 = "0sfs09bm6p55xz5f71370zika0qcmlph6mgcc9mzyvpx31vsyfg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion";
@@ -20914,12 +20943,12 @@
evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-snipe";
- version = "20170104.1209";
+ version = "20170328.1011";
src = fetchFromGitHub {
owner = "hlissner";
repo = "evil-snipe";
- rev = "e8acacd31466def1e8fa1eac0c5ccbbcd5a0ba2e";
- sha256 = "1x8qwvpjv87sv2lyda57k0l47mjvn0ichpgjs0vc7q8kmhww5k5h";
+ rev = "3579123acb130e18e9bd8ff3b3029f7052528a32";
+ sha256 = "0pn4k55wg2lzjlpv10c39mvcb6y2fgbc6cfb24czw70ykc5ln087";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -21541,12 +21570,12 @@
eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eziam-theme";
- version = "20170320.325";
+ version = "20170321.608";
src = fetchFromGitHub {
owner = "thblt";
repo = "eziam-theme-emacs";
- rev = "2cc09d6041dfef6e86113aef21897b9536fbfb54";
- sha256 = "181chqhqh3n6yh24qki3x8if1xgvqr739v8dags0kq8xbsnlzkcv";
+ rev = "c53e4b4ba21bd00196a28746a900f3fc1a9d1cbc";
+ sha256 = "0dbh9q0s1vps5nwdy16jcq5sqw9ilk0s9qlmbkiy0cvs4z08wgd1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -22943,12 +22972,12 @@
flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
melpaBuild {
pname = "flycheck";
- version = "20170309.145";
+ version = "20170324.340";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck";
- rev = "f8addaf0529a3060de65de9a86db26976d2a8372";
- sha256 = "1k2slk6h3av7hiqhzk8gpamd8r23r79y8jap9vy9xcl81z47l5g0";
+ rev = "794e339ab3bae5fa033b3c4913ab24ddad49dc2e";
+ sha256 = "099ffl46z046vzk1qhgcsn5b54zw6yjp9hnp6w7v4rr8pn4r1jlk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23136,8 +23165,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "squiggly-clojure";
- rev = "c690f780b07cf9412b5b58e981b0caff2cef0e44";
- sha256 = "136pmcp6zkarp5fasmw5532klik948hrbls5bbq5iqddb82si7x3";
+ rev = "2a0e96889b128808866a1e2e98694be1b251fd37";
+ sha256 = "1yw9ky7720hx6z401623bw7h6rr2b837a7x8gfw6shq4k26kirzb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure";
@@ -23363,12 +23392,12 @@
flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-dmd-dub";
- version = "20161223.856";
+ version = "20170323.634";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "flycheck-dmd-dub";
- rev = "8c6220f45c24d662f1c4afae54f311139f0242b1";
- sha256 = "0n0q5qhwpx3v0d3aw6swzv8w09cs5mlnx9aybfhclzfa44adn6rq";
+ rev = "5bc8c9511eb9817fddadb65ff4f0520b52c09de3";
+ sha256 = "18xcgpqr0cxhp79i6zq9c1131rwcsv9lmryiiyph56zl4vg2hb37";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub";
@@ -23468,12 +23497,12 @@
flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-flow";
- version = "20170207.605";
+ version = "20170325.504";
src = fetchFromGitHub {
owner = "lbolla";
repo = "emacs-flycheck-flow";
- rev = "090e89455b1f1dcb2de7a2f40c36d2a002417795";
- sha256 = "1vp2mswzxfd88i253l7mx5qj8x1h47fgvgy7dwi31xvp7vr40n6g";
+ rev = "e51aff467edf2d86e7b315d79d6f2f4d8408ea78";
+ sha256 = "1w1s7rcbmiikb7f80rf9d77gzszjcfyymx75x20vvq3rw4wvdnyj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow";
@@ -23510,12 +23539,12 @@
flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-gometalinter";
- version = "20161225.1721";
+ version = "20170321.732";
src = fetchFromGitHub {
owner = "favadi";
repo = "flycheck-gometalinter";
- rev = "b6fa2468401d9035b2aeb1dc9bdb12a518e0d13b";
- sha256 = "08cr2jij9iaa117l4b4mg977hi6klw9qj8knc42lfzz37d91r3i6";
+ rev = "c90ea1aba80ddfdf603c9ba731be302400fd6ba2";
+ sha256 = "0xw2wbch3y5nm90j9c53n3710xm161w724cknv8dwq27ickgp49b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter";
@@ -23930,12 +23959,12 @@
flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-pyflakes";
- version = "20140630.1521";
+ version = "20170325.1258";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "flycheck-pyflakes";
- rev = "026ef070f1589bc0ae8f86a02072fa36e57b9912";
- sha256 = "16albss527dq4ncpiy8p326fib038qc6wjbh985lw2p1f9babswa";
+ rev = "439c0e5bcc4bb1a0c68b619a862df6ea316f0b43";
+ sha256 = "0fjjv8ygx55vk91fdzn7ikm6kgwq9kzn14f5lfawipyymxrih3na";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05e6f3041151006e44f91e5bcbaa7be3750fb403/recipes/flycheck-pyflakes";
@@ -23972,12 +24001,12 @@
flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }:
melpaBuild {
pname = "flycheck-rust";
- version = "20161019.1103";
+ version = "20170322.306";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-rust";
- rev = "f8ae845d4d7a18c1873ee1edd1a4db272fde5dd3";
- sha256 = "1p7ijqcbrflaxqk7r5zvgxznsvd8kcr8hfnzlymdylwbgy04j6wy";
+ rev = "ae7c14758c3d33615d981f15951500feb2881b06";
+ sha256 = "1gldjfg112jphpvzbaz3viars8yjyb783ry1sp37g5nlb80lf7jb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust";
@@ -24137,15 +24166,36 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-yamllint";
+ version = "20170325.1035";
+ src = fetchFromGitHub {
+ owner = "krzysztof-magosa";
+ repo = "flycheck-yamllint";
+ rev = "c2b273d84f15bd03464d6722391e595d7c179a5c";
+ sha256 = "0snj6kkshk8bivwsnhp7kiyhzcn7x6952vw098wgzwqw2hgdkq97";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/932ee0a1f13a52d53102b90911da79145208cbb5/recipes/flycheck-yamllint";
+ sha256 = "1q2sy0hsbnwdlwq99wk8n5gi9fd8bs4jvi859np8bylbhhb3kj8m";
+ name = "flycheck-yamllint";
+ };
+ packageRequires = [ flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-yamllint";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
melpaBuild {
pname = "flycheck-ycmd";
- version = "20160913.130";
+ version = "20170327.1418";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a";
- sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c";
+ rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79";
+ sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
@@ -25709,22 +25759,22 @@
license = lib.licenses.free;
};
}) {};
- fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ fstar-mode = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fstar-mode";
- version = "20170314.1321";
+ version = "20170329.953";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "fstar-mode.el";
- rev = "a06f0fb63c3ddf2d66128f0dcfb32040472fbf0a";
- sha256 = "0k5mb8sss2smdr45lhxhvck2pcbscgidjfdr7b7jb7i2l9jfc8jp";
+ rev = "a033486d2d01cccb3d1b3a17e57155cca167b08e";
+ sha256 = "1dwcni802pqmj3safvr36c7l5mafdvyfvxy1k5qp3ah7qy08xknw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy";
name = "fstar-mode";
};
- packageRequires = [ dash emacs ];
+ packageRequires = [ company dash emacs ];
meta = {
homepage = "https://melpa.org/#/fstar-mode";
license = lib.licenses.free;
@@ -25736,8 +25786,8 @@
version = "20170107.626";
src = fetchgit {
url = "git://factorcode.org/git/factor.git";
- rev = "692f49d92ec108f15159da220ad8a7e79984a5a7";
- sha256 = "1czx0c1yb338wxm8njsgx6qdx23ym52nvcx7jp38zlp5h5lzw9p1";
+ rev = "30f73d63f4031b35b52ecb28652aebf1a8e430f1";
+ sha256 = "0yn1sk2fp3bvw79r9lalpcxkcnj70prn56gr82hmkd2n0lq5lzi1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25862,8 +25912,8 @@
src = fetchFromGitHub {
owner = "HIPERFIT";
repo = "futhark";
- rev = "37097c273d9100e66b97755054f71366f30ef60b";
- sha256 = "027id8r9vsksdnbd4j9pb67zmjlfp8v7y9227xby4hqxxzzgxiv8";
+ rev = "9e9f3b91db7ac161e5985ee8e6104c7eb05d24f9";
+ sha256 = "0kmj9kgp3xcyvx5xc67h69y8ghiw5wc42n9n2gc66in8j8sfxxr3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26186,12 +26236,12 @@
geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "geiser";
- version = "20170201.1455";
+ version = "20170325.1956";
src = fetchFromGitHub {
owner = "jaor";
repo = "geiser";
- rev = "166593c68b66276e36c7d91a9653bb1c44650afc";
- sha256 = "0r7m1blswgkm8zkb703ksa74jy296i1vj4rfq5lw2f4ixdvkyq2h";
+ rev = "b75e0376942c1ee54f7d173362d4a38e665342f9";
+ sha256 = "1mbip1w35mjcl4048a1aglvpqwkkf0h990i9yjr6w9p7wlxb8car";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -26207,12 +26257,12 @@
general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "general";
- version = "20170317.2017";
+ version = "20170328.954";
src = fetchFromGitHub {
owner = "noctuid";
repo = "general.el";
- rev = "a0d994ce04e66f17dadf17f985433ccb1581d58c";
- sha256 = "16h668kf90plf460yn2kc40vqysd0rappblyr680sdn2b08k0sbw";
+ rev = "fa0e6e2d2a9c06671fd44b5d938ea24387654525";
+ sha256 = "0wnh24jnnf0kl291l36hykx86nrn74kqwxlwzd2llydbhk07sq8s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
@@ -26673,8 +26723,8 @@
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "0344413a09537d1063917527634987bb4e0d9c31";
- sha256 = "0392hcxnc8rbafk3v7fl3v21la8ac30wqcxbray6kyw202gg0qp0";
+ rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335";
+ sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26900,12 +26950,12 @@
git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-timemachine";
- version = "20170226.24";
+ version = "20170325.220";
src = fetchFromGitHub {
owner = "pidu";
repo = "git-timemachine";
- rev = "efa6752397101739c6abb53a0ca7a904d1c7898d";
- sha256 = "1v85cci8rm82wgss53ia1dqvq2q17hf2vayx6pi34h0hvj7ihzlx";
+ rev = "7cb0d03bc370d3e734c8ee23b809a4e768b01743";
+ sha256 = "11yjw08dp8m25psl27qfgk8c9m9v51rbiyq3lp0mp9mhr17wdp9d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine";
@@ -28431,8 +28481,8 @@
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "c6b709f23dc29a0ad6204ce05e88def4acffad6e";
- sha256 = "14569d8bi0ibk8pq6fdbbbmagzx5lnm2791ndpyn6y62h54lyhq8";
+ rev = "ba5f0223b6e1fa692f0e700718a8cfa65595e2b3";
+ sha256 = "1bglnvp009x8c5na3zdzbvfz72i1arxmi5y1c2i0yjw4hggqvvlm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28557,8 +28607,8 @@
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "3db11a26384ce39651a2806193d7e2cda545f1aa";
- sha256 = "0y0bj4pid1hd1k26cv9hk0chx1as10qgl25acijxv60r0crayhyn";
+ rev = "3fc197576b0fada87b0b7a895a9fb0c27acd2827";
+ sha256 = "0xa2pshxs18i16yzbs04x82l8yx8mi2pnzb9ipyi5xwxjdkphq7z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -28937,12 +28987,12 @@
groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "groovy-mode";
- version = "20170305.813";
+ version = "20170323.817";
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "3db11a26384ce39651a2806193d7e2cda545f1aa";
- sha256 = "0y0bj4pid1hd1k26cv9hk0chx1as10qgl25acijxv60r0crayhyn";
+ rev = "3fc197576b0fada87b0b7a895a9fb0c27acd2827";
+ sha256 = "0xa2pshxs18i16yzbs04x82l8yx8mi2pnzb9ipyi5xwxjdkphq7z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29147,12 +29197,12 @@
guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "guix";
- version = "20170313.813";
+ version = "20170322.704";
src = fetchFromGitHub {
owner = "alezost";
repo = "guix.el";
- rev = "61d6ce9b133fb57d4b7a12d007b2e2c8bc6a645f";
- sha256 = "0jlzb06vcgdmj5yp0wnfq81bjdasnbrffvm3019b5yyx0cc7ysn3";
+ rev = "e1dfd9655b69e5e27a040cae5aeff25afec383f1";
+ sha256 = "19z6hapaj9nw238lyd7ivnhfhpxy6wnjkcn93jgdhdx4k3q9aq73";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -29256,8 +29306,8 @@
src = fetchFromGitHub {
owner = "abrochard";
repo = "emacs-habitica";
- rev = "9b42651888c4b75e1d6f9df41d138ce6e77acbcc";
- sha256 = "1jrvjk8ccf47945liwz24xqvdaqm6zch1kb4cahgm4pp8m9hdcgn";
+ rev = "f3e326b7342953ffd5d3ced9266b46387b2bf9ce";
+ sha256 = "0aixxlfp04vmipki7r7aqid2lsrzy7d38g09qc1hrjjdba7jrjlp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica";
@@ -29273,12 +29323,12 @@
hack-time-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hack-time-mode";
- version = "20170319.412";
+ version = "20170322.844";
src = fetchFromGitLab {
owner = "marcowahl";
repo = "hack-time-mode";
- rev = "87dda91b314ad2bde31b3b2fd405059dcecba52c";
- sha256 = "1hy07laa12r7gcfsc03b1qggqsm2zriahravj0ydix99jcjyikbv";
+ rev = "02ee6c5c1f691564399a0c76b9c606d7d7dbfe05";
+ sha256 = "0gxlmdf9gy2z3c0nswyac7g4j6cswgf7hd3ccb2bn25v67jb3y6c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode";
@@ -29651,12 +29701,12 @@
haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "haskell-mode";
- version = "20170228.730";
+ version = "20170325.553";
src = fetchFromGitHub {
owner = "haskell";
repo = "haskell-mode";
- rev = "775ff42884c0baab9da01fcdc87707c6c90480c8";
- sha256 = "1w6sc6klkr5b9fbp38pngmn0icps5hi6z6cbs59zlzz5lmq7jr9d";
+ rev = "c8fe96acc1a8e73e39445b2d5e050540d69d9f5a";
+ sha256 = "03wjrpr191ydqd1kgh65h6naw5bsk16zk14cw885zidyv27d0hr2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -29919,12 +29969,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "20170320.1242";
+ version = "20170329.1221";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "53ee9b05c855546b474b7255062b6aa8edbc325b";
- sha256 = "0w0yrwpxgdd9kl4fx7rsa3crrs8d760iss7ib8xjs4zhf1av3a4z";
+ rev = "b7b2cf9fbf0ad68a7487ddab62677384d19b3b8a";
+ sha256 = "0qhdyazyz5y0gs1fcyy4xf4ffdvwrjxpfiki4iyy1fin481bkhwv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30129,12 +30179,12 @@
helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
melpaBuild {
pname = "helm-bibtex";
- version = "20170308.36";
+ version = "20170321.1306";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "2e83867a39bbd4b7cb7901b897a66a131b5635e6";
- sha256 = "0gr8mlxypk5n4s19src71s2g6s91by3vp6ci9yqqh1q9ns31a43h";
+ rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25";
+ sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -30210,6 +30260,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-books = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-books";
+ version = "20170324.2331";
+ src = fetchFromGitHub {
+ owner = "grugrut";
+ repo = "helm-books";
+ rev = "625aadec1541a5ca36951e4ce1301f4b6fe2bf3f";
+ sha256 = "1d3nps765gxmadhbd1yqn4qvs23bczglwhxkciprky7ixm5lx53k";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/acba3db40f37e74e1bf9e30f2abed431c259ff50/recipes/helm-books";
+ sha256 = "0xh53vji7nsnpi0b38cjh97x26ryxk61mj7bd6m63qwh8dyhs3yx";
+ name = "helm-books";
+ };
+ packageRequires = [ helm ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-books";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-bundle-show";
@@ -30486,12 +30557,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "20170320.231";
+ version = "20170329.1221";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "53ee9b05c855546b474b7255062b6aa8edbc325b";
- sha256 = "0w0yrwpxgdd9kl4fx7rsa3crrs8d760iss7ib8xjs4zhf1av3a4z";
+ rev = "b7b2cf9fbf0ad68a7487ddab62677384d19b3b8a";
+ sha256 = "0qhdyazyz5y0gs1fcyy4xf4ffdvwrjxpfiki4iyy1fin481bkhwv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30507,12 +30578,12 @@
helm-cscope = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, xcscope }:
melpaBuild {
pname = "helm-cscope";
- version = "20150609.649";
+ version = "20170326.22";
src = fetchFromGitHub {
owner = "alpha22jp";
repo = "helm-cscope.el";
- rev = "ddc3f750a92044d6712585e29d3dbaface2e34db";
- sha256 = "0nhi8xhcf7qpsibpyy5v364xx7lqkhskzai7awkg0xcdq8b5090x";
+ rev = "3cc7259ab4989f9f7ca039e703cdac14b907530a";
+ sha256 = "0gh4csq6v6lqqpi966iwl2238wgkmr3vxb4kxffajpk8r0cq1c9x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2e3460df1ec750053bc8402ad6eb822c10c697/recipes/helm-cscope";
@@ -30654,12 +30725,12 @@
helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-dired-history";
- version = "20161023.806";
+ version = "20170321.2201";
src = fetchFromGitHub {
owner = "jixiuf";
repo = "helm-dired-history";
- rev = "8149f5cbb1b2915afcdcfa3cb44e2c5663b872e6";
- sha256 = "1h7700lf5bmbwaryf0jswd9q8hgfkpazak5ypidwvqwacd1wvx15";
+ rev = "9480383b6ccede6f7c200fbd50aaeb2898b3a008";
+ sha256 = "0cfq06lray7hpnhkwnhjq18izyk2w0m4cxqg0m5nyidiwc4qssqa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history";
@@ -31745,12 +31816,12 @@
helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-org-rifle";
- version = "20170320.1620";
+ version = "20170322.1209";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
- rev = "aa628be91f6f2c492891b102cda0f27023661ee6";
- sha256 = "1dnws9fpf33hp561kgr1ybax13xj4ci6qabvyn0qkm3ihw0cbfdp";
+ rev = "bc9c69b0495b1dd8e84bfcf1722165e30ea87904";
+ sha256 = "0zcxpijxgmpjxx8kincq9w8d83y4pnzi0glbiv92xlxm91fk3mbl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -31955,12 +32026,12 @@
helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
melpaBuild {
pname = "helm-projectile";
- version = "20170202.1000";
+ version = "20170328.2152";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "helm-projectile";
- rev = "e16da3ec6d6c495ee8355e3c3729294bdee0a57b";
- sha256 = "0wmzkqy7pr2nflfpbzq7gljk3jxxq3pbq76di1zl2rlj67whs1xk";
+ rev = "c987e81ededdcb69c5a7b2bb6efc32bc2398ce54";
+ sha256 = "06ygcmpdpr7qzpx6l7qlbdif10vpzw009zg8z8yl1p1r30qdcbs0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -32522,12 +32593,12 @@
helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-tramp";
- version = "20170313.139";
+ version = "20170325.1029";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-helm-tramp";
- rev = "affc1299eed800713bef422a72780c00cbfb3a65";
- sha256 = "1lb1vlqcj3139yp1h19d96izpxy6ybhkbdqgy52igk1v904ab44a";
+ rev = "9c7204ea9d7ce232ce3ff88107854c219397528c";
+ sha256 = "1vqr40bkf7ss25x5bd6nhqi417chgdrkf9gvp302z311vnvpycsy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
@@ -34443,12 +34514,12 @@
hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hydra";
- version = "20170108.148";
+ version = "20170325.815";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "hydra";
- rev = "36fb5e0149795404d0271419fd4354ba58f81dbc";
- sha256 = "1yycpyr1pc7jzb7fdkiyrbyz7wfgs2g0r27c034pmykcmj02sb1q";
+ rev = "38ce88a9c3be11b0431080078095159b2211ca7a";
+ sha256 = "0hja61lxhnkl0mpq3fj46pmd9pp85ncdzvgzc1dy82a48sib92dj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -34894,6 +34965,27 @@
license = lib.licenses.free;
};
}) {};
+ ido-flex-with-migemo = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, migemo }:
+ melpaBuild {
+ pname = "ido-flex-with-migemo";
+ version = "20170319.431";
+ src = fetchFromGitHub {
+ owner = "ROCKTAKEY";
+ repo = "ido-flex-with-migemo";
+ rev = "c620934f50b9713693eba8e23f88c2aaa8510708";
+ sha256 = "0aymvbf36ph0zaff38r5vd7q0z3kv8wl3ivakhaybpsa2zvsgvxf";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1647d1ae7400ddbc8367c355ade16b5c360b42fc/recipes/ido-flex-with-migemo";
+ sha256 = "1w8f1r17l4r7w5bacckv9zfl9qynv2ivsw639rzr5acg2ndxagv7";
+ name = "ido-flex-with-migemo";
+ };
+ packageRequires = [ emacs flx-ido migemo ];
+ meta = {
+ homepage = "https://melpa.org/#/ido-flex-with-migemo";
+ license = lib.licenses.free;
+ };
+ }) {};
ido-gnus = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
melpaBuild {
pname = "ido-gnus";
@@ -35749,12 +35841,12 @@
indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }:
melpaBuild {
pname = "indent-tools";
- version = "20161220.856";
+ version = "20170322.1001";
src = fetchFromGitLab {
owner = "emacs-stuff";
repo = "indent-tools";
- rev = "b6b8bf42bf50c8b0b1aff56894d8265df79361cc";
- sha256 = "007102am1q2dkp18p1vlsy34i28lvvq4n8b3grz7nyblbik1v5wp";
+ rev = "d50c762d9f6f66cd1b4b72f1b5d024284b378aa9";
+ sha256 = "1jk8k13mx5z3v38q9d8m5lz52p14imj89zvy7484mbjqmvxh6wga";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9d8c79e455b3a567b179812754f82452469dc267/recipes/indent-tools";
@@ -35812,12 +35904,12 @@
inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-clojure";
- version = "20170319.24";
+ version = "20170325.2346";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "inf-clojure";
- rev = "5ef6bdf09e8716340f09a08d5fa957ca3ebeef18";
- sha256 = "1n9jrdad3jcn94x1wrkwzd0dk7p09nhnvww2j151bpj2ggzpyqbr";
+ rev = "4e802769559153b975f1b24d5a28bc80d212c807";
+ sha256 = "0i66y0n0yq3dzhl176anqsjj7p0pvrpwfyahhg8cd5mw1svgdf5f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -36103,12 +36195,12 @@
inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inkpot-theme";
- version = "20170203.2120";
+ version = "20170325.221";
src = fetchFromGitHub {
owner = "ideasman42";
repo = "emacs-inkpot-theme";
- rev = "a7bbc67de279cbd1646d5f6733900fb4f4402280";
- sha256 = "1r0b7bnjg161km86pif4rsbwix81kr9n9w5bcp4p7ngrvxhfndgs";
+ rev = "cbe5ead0b5993e290ee88d7a07a6ead46f2d0697";
+ sha256 = "07qdg72i5na466gka1x50swlipy4d0k1pkhw1d1p6s3xwq7cfm2p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme";
@@ -36312,12 +36404,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "20170317.1852";
+ version = "20170321.129";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "d33d4a44b130595658439f1274db91a544792704";
- sha256 = "17slghcgvqb80ffl31g6a6z7b5hza1dbqybqhl37qjpfxa3i6pak";
+ rev = "04265e68647bbf27772df7b71c9927d451e6256f";
+ sha256 = "0zax01dmrk1zbqw8j8css1w6qynbavfdjfgfxs34pb37gp4v8mgg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -36582,12 +36674,12 @@
irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "irony";
- version = "20170313.1437";
+ version = "20170322.1438";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "irony-mode";
- rev = "4d64ecc0970ff43290b4b27e0c7d2176d1890c71";
- sha256 = "0g0m19x2flzm3pz9k19j9hp41wqihk1hbzbmrihn2sz4cgbrg98f";
+ rev = "63eb90e1f6f257ea8113450d0e02366148f5c2fb";
+ sha256 = "19cr7k33gkkbwzbpib6hvp67r4iz4j68ykmd6mij4gk8r517bqsh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -36644,10 +36736,10 @@
}) {};
isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "isearch-plus";
- version = "20170303.1503";
+ version = "20170321.1306";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/isearch+.el";
- sha256 = "0nkyav1fw3n16alb5b90cqb3bbmr7i74rc90bpd22hkm25wcvqbj";
+ sha256 = "0zdc45nmswipfi8vrsbfipzd1vg9y0pcggvi5mfpwf7c3qn4sgh2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+";
@@ -36870,12 +36962,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
- version = "20170320.422";
+ version = "20170328.1957";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "beffa78885517beaad2da50accc339f9346f94ee";
- sha256 = "18bxh67xdkbxpmxdqidrnqwlzffdywmf9vwz4zcynagj7yscx3yb";
+ rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
+ sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -36891,12 +36983,12 @@
ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
melpaBuild {
pname = "ivy-bibtex";
- version = "20170308.36";
+ version = "20170321.1306";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "2e83867a39bbd4b7cb7901b897a66a131b5635e6";
- sha256 = "0gr8mlxypk5n4s19src71s2g6s91by3vp6ci9yqqh1q9ns31a43h";
+ rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25";
+ sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -36912,12 +37004,12 @@
ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-erlang-complete";
- version = "20170316.2112";
+ version = "20170324.401";
src = fetchFromGitHub {
owner = "s-kostyaev";
repo = "ivy-erlang-complete";
- rev = "9d67a7e65408c5e218bff24b2dd6ce78257a66e4";
- sha256 = "06p14ga0k687mnavxczdmkij0945cm70zhcbm93b1a6gykbzvd0j";
+ rev = "1dcb258a0207053a33ac207c11f2414aa89daba2";
+ sha256 = "1nc6d67cbizk1k44b53sx913h2lbrlfmdbi60pz3h567idclw83i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -36979,8 +37071,8 @@
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "beffa78885517beaad2da50accc339f9346f94ee";
- sha256 = "18bxh67xdkbxpmxdqidrnqwlzffdywmf9vwz4zcynagj7yscx3yb";
+ rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
+ sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37246,12 +37338,12 @@
jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "jade";
- version = "20170320.655";
+ version = "20170321.214";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "jade";
- rev = "3e41fa6f132f2b3130d9abd250a52cfea7655d17";
- sha256 = "1sqpb227qky1lj552nwmyxjmbjqp0agxjs3arq329xi3c7ywkhj9";
+ rev = "7cd363187a8d41fe604925df51169ca9ed32f798";
+ sha256 = "0zy7xfa5m01518jf1jy0r4r4r0y0q4p0jd07zdvxihkga7ycr4bp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -37624,12 +37716,12 @@
jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
melpaBuild {
pname = "jdee";
- version = "20170319.26";
+ version = "20170326.1333";
src = fetchFromGitHub {
owner = "jdee-emacs";
repo = "jdee";
- rev = "e3a3ba35be0dcf5fef1bff965c6cfe92386c0835";
- sha256 = "11g73qclz1l77h7prrrl3akh7skxbz325yc4yb65cbnbz0bm30m3";
+ rev = "940069c397b6db841acfd21ffd15495388deba7c";
+ sha256 = "0p7pfy75cc2rqf4s9m71zaind8rfn3sqak63w10sn542d2m2nhng";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -38125,12 +38217,12 @@
js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js2-mode";
- version = "20170221.1636";
+ version = "20170321.153";
src = fetchFromGitHub {
owner = "mooz";
repo = "js2-mode";
- rev = "4787b5f2b8dbc1a8f8620c374402aa347e311527";
- sha256 = "0zlmadvmyl9q8qlzs1i880slr4h800qq6zgqisa45nzychx8b07k";
+ rev = "d3b31baf68acd1b7e0d05582e504c44e1a587be7";
+ sha256 = "1k9y5vzm518j98iysc7l6vhp2xy8a06qyd1v5p2xmf3dq751r57v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -38688,12 +38780,12 @@
kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kaolin-theme";
- version = "20170320.530";
+ version = "20170329.649";
src = fetchFromGitHub {
owner = "0rdy";
repo = "kaolin-theme";
- rev = "236d827c68d502d1ee8866d6038518590a5f7449";
- sha256 = "1kq0km53ysl7xapc7ayhav2k69yvgpf402hgri5522v01cmmfgg9";
+ rev = "be544a81cff86ab1b54ad673b9229185882ca998";
+ sha256 = "1pjbkff8lcjb6ixjh9pdmgzfdjqq21w9c4q8qjcwmicj1pn1wwya";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -39193,8 +39285,8 @@
src = fetchFromGitHub {
owner = "kivy";
repo = "kivy";
- rev = "b1248776c6ffc9f91a7c862dd2c1650a3de7f990";
- sha256 = "0pi805ii3w38vy3064yvf845m05wpnj2fmfwkngdx9jwpifgsavq";
+ rev = "dce021f9d6d4b20f32e93876302c89e27e1b3f44";
+ sha256 = "0h0vgrmcg922dcssn58slbnqbrlmifwg2qngj1k1gp9kmp8z5jih";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -39645,22 +39737,22 @@
license = lib.licenses.free;
};
}) {};
- lastpass = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "lastpass";
- version = "20170318.205";
+ version = "20170327.352";
src = fetchFromGitHub {
owner = "storvik";
repo = "emacs-lastpass";
- rev = "d65d0e0b03d39556d998fb3843058b1ab2addd45";
- sha256 = "0kdzklnmcwyy0l0564rxjc0frn9333syip5048l5q86fxm5y46vw";
+ rev = "37ce019f3d305ac9806bf7a6f087bd53b12b48b0";
+ sha256 = "0yvdi4fdgk7bk8mz3vjd246wbfbyw6yl821cx94zczlajg9cz9dn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass";
sha256 = "0x4c9c110nqv3v6kzcxdg9a9zcg7yn1hj6ffgrbsd8c3wbrdxrlj";
name = "lastpass";
};
- packageRequires = [ emacs ];
+ packageRequires = [ cl-lib emacs seq ];
meta = {
homepage = "https://melpa.org/#/lastpass";
license = lib.licenses.free;
@@ -40004,12 +40096,12 @@
lenlen-theme = callPackage ({ color-theme-solarized, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lenlen-theme";
- version = "20150307.11";
+ version = "20170328.1945";
src = fetchFromGitHub {
owner = "zk-phi";
repo = "lenlen-theme";
- rev = "05202458fa0a5242e5c6e4451e375f6c16920272";
- sha256 = "0ab84qiqaz3swiraks8lx0y1kzwylpy9wz2104xgnpwnc5169z65";
+ rev = "b8a6412c81633b10fb98ba0930f55b25071c084a";
+ sha256 = "177fqqhd498v2h6wki6pgg982rp4jxhn4wrzajcqppjz4nidb1b7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/lenlen-theme";
@@ -40486,12 +40578,12 @@
lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "lispy";
- version = "20170320.1442";
+ version = "20170326.801";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "lispy";
- rev = "0d2f382dca335d4b65bc91d840293ff2a83db999";
- sha256 = "14xshiwv3hqp68w297kjcvx1gmnd6v3yqhbs7ynm1i24xmgznigg";
+ rev = "15301856dbefe5138f14ade673df4a574cf15eae";
+ sha256 = "15wqgjnpr8i9lsk0mj9y0yaykdr8slh2xswh18hvky4x6azzc6lx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -40820,12 +40912,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "20170225.2207";
+ version = "20170326.934";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "0c253d6547008202c20eba2cb5649dd1f44b3126";
- sha256 = "02wrf9mih1dx2xgzwc5465gb8ylm4i3y84x0y0bv1pk420y4iiav";
+ rev = "b2ff3b041697d56dbc7bfd70d94f708e551a970a";
+ sha256 = "1xpwsajfr2ddn68w2d6j206m4g6h05b6n3xig5flk845899954a4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -40907,8 +40999,8 @@
version = "20150910.644";
src = fetchgit {
url = "http://llvm.org/git/llvm";
- rev = "9fe7c740276213df8a0a2eb419b227bf3a7f3227";
- sha256 = "0zr8hpc7dlmyd1x1xlwampjhw1k99jyrnh28kxqjw59nv3x1hpbx";
+ rev = "fef24043fa2c4020eec6ef45d0da7b8b3f967b57";
+ sha256 = "0wnzjj84n23nkfvx18pjfhc8jfip54qqbw218w3ci4qfghdx741p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -41316,22 +41408,22 @@
license = lib.licenses.free;
};
}) {};
- luarocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ luarocks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "luarocks";
- version = "20170226.1430";
+ version = "20170326.941";
src = fetchFromGitHub {
owner = "emacs-pe";
repo = "luarocks.el";
- rev = "29fb50ec6ec1943b54b5a4810c3249bccee249ce";
- sha256 = "19ailxb0jlvkl5ljvbpddd1862j8x9vf767lfrby89s09fjxwfcp";
+ rev = "e0e52ba395432e18508740cc3d097b2918f55b9b";
+ sha256 = "0rdsjmmi95agb859997qdhbk0dns2jyx2mlg8rync58wna70nmbn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5abd2b52a071ab206d40057dc85c891183204ea/recipes/luarocks";
sha256 = "05srrk9gmv1vhq7m5bjhh2hl2siis04j15b31x0sgknxh3ybr33x";
name = "luarocks";
};
- packageRequires = [ emacs ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/luarocks";
license = lib.licenses.free;
@@ -41589,12 +41681,12 @@
magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
melpaBuild {
pname = "magit";
- version = "20170317.903";
+ version = "20170329.221";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "0344413a09537d1063917527634987bb4e0d9c31";
- sha256 = "0392hcxnc8rbafk3v7fl3v21la8ac30wqcxbray6kyw202gg0qp0";
+ rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335";
+ sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -41789,8 +41881,8 @@
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "0344413a09537d1063917527634987bb4e0d9c31";
- sha256 = "0392hcxnc8rbafk3v7fl3v21la8ac30wqcxbray6kyw202gg0qp0";
+ rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335";
+ sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -42037,12 +42129,12 @@
make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "make-it-so";
- version = "20170320.415";
+ version = "20170328.216";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "make-it-so";
- rev = "b20bac2335596302d70a1dd9575517a81363966c";
- sha256 = "1xhg5pfm5qds6njdm464w95z9zfsf84ihkj68nvzr2qv73ihqzqg";
+ rev = "1f2015cb131d69ffd7994dcc153abef969999027";
+ sha256 = "0brqh1dis4ahxxa4q8zsqr039l6k7arxkji4bx9yh65aimp8ckcd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so";
@@ -42247,12 +42339,12 @@
mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
melpaBuild {
pname = "mandoku";
- version = "20170308.2031";
+ version = "20170325.1917";
src = fetchFromGitHub {
owner = "mandoku";
repo = "mandoku";
- rev = "67c15f292515142c2417f147117ea2a3172cd195";
- sha256 = "1kbr2x4s0ynwizm5hy3q4xdjs1jmfdsnpndcs0dlh0di0mhld6x0";
+ rev = "ab6cccaccea2d0d26fc461942b4ae3ea65bd8f39";
+ sha256 = "0k4dcm4gkjy82nhcg00wgk2hipzbzvrwn8qyvjjn5r6h1jcpmfb3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -42963,12 +43055,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "20170315.1652";
+ version = "20170324.222";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "7a6e26ae74c86cc2afffc21de7567a63feb19a7d";
- sha256 = "1l23nj6fsnqf2xc766rnz5ib6578rvsbn0cdwmw5li6waqbzvla2";
+ rev = "1ddaca25ee978736dcb3922bb1952d750c39cd5a";
+ sha256 = "09g81d1l5mhji4vbljxgfrgr0051sv7kqy0vwf7awxa4slgl6bnd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -44302,6 +44394,27 @@
license = lib.licenses.free;
};
}) {};
+ monokai-alt-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "monokai-alt-theme";
+ version = "20170325.1430";
+ src = fetchFromGitHub {
+ owner = "dawidof";
+ repo = "emacs-monokai-theme";
+ rev = "584aaf88b83a40bbbfeb6a7c89c5feecebf5a52b";
+ sha256 = "1709f2gf8gdz5ppb0k3gxcg4z0r7kgcm2hpymji9gnag87nnx1m6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6ff05515c2f3bd80cb8d7de9afc8fd983e62ad91/recipes/monokai-alt-theme";
+ sha256 = "135bli9vhgl898526q6znjvck356bja1ylsfi95d9445jd136c4v";
+ name = "monokai-alt-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/monokai-alt-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-theme";
@@ -44511,10 +44624,10 @@
}) {};
mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "mouse3";
- version = "20170307.858";
+ version = "20170324.1050";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/mouse3.el";
- sha256 = "0as1d26m3r1vacccsdlbw0rp6jyhj054wv1lssiky6d0kqzn6wa6";
+ sha256 = "0rnpfz0d4spxkyssgf3j5kfajm54i1vism2q0giikd0savrh0a1c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mouse3";
@@ -44845,12 +44958,12 @@
mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "mu4e-alert";
- version = "20170220.2245";
+ version = "20170323.2254";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "mu4e-alert";
- rev = "38452683b2cb4448de13062d47264f9e9d35e7c8";
- sha256 = "0mazixn55g0wcg541vj1wg2madczcy9r3ka38zfxnvj3jbf18cij";
+ rev = "e8b2c1d1a95c5275b1062956eb5384bf45fa8047";
+ sha256 = "06jyq6vilry39f24bn08l0wjh1kv9m1pl57vw1qvzk36vmld5cqy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert";
@@ -44968,11 +45081,11 @@
multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multi-project";
- version = "20170221.232";
+ version = "20170322.332";
src = fetchhg {
url = "https://bitbucket.com/ellisvelo/multi-project";
- rev = "c04d5bdeb213";
- sha256 = "1m4sjmbrc8rln8817b4nybbh1akphbl58i0pfl1ic515xn1g3by2";
+ rev = "c03cafbbfba9";
+ sha256 = "0v0q4v3pnqmm89hix90pfx4hpfpc9iv1r5ldn3zwzwhbs0jvgj3d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project";
@@ -46134,8 +46247,8 @@
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "ng2-mode";
- rev = "d06d8af34c1e74a7c7a8601233f5e42c38420035";
- sha256 = "0nz1lrx0iiapmhy78d17m8v91nly11hlykg00xvj91y1iw0713ql";
+ rev = "e48698fd474fb1b76356101fc97df00eaa610ddd";
+ sha256 = "0k356rw2ack1bf5f0km7fljws5iml9f8scp1ykpf86kskrl2gygq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode";
@@ -46255,12 +46368,12 @@
nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "nim-mode";
- version = "20161001.2336";
+ version = "20170326.144";
src = fetchFromGitHub {
owner = "nim-lang";
repo = "nim-mode";
- rev = "2ddac4faa12fc405fcb2148f7d045be83cae5f3d";
- sha256 = "1iaf03791x3jw1vgp2pc4aa01xw5kfr7mk87x7bg1py88pljkh7l";
+ rev = "dc81622d899976cb7d4515b592972d17d590ca20";
+ sha256 = "1mdficz9dgdlb6hvi7c5qkvw22j1wgaap3a6as1qka16mhlgv13j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
@@ -46276,12 +46389,12 @@
nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nimbus-theme";
- version = "20170320.1512";
+ version = "20170329.538";
src = fetchFromGitHub {
owner = "m-cat";
repo = "nimbus-theme";
- rev = "3a05714be2a5f1e87ba1dcd30959c7ec03900a3a";
- sha256 = "0hfqhcy9bzw5jsbcz11dh1b94l9m5jishdywxy3javlcjwqhjdi4";
+ rev = "94c08d19c94924b5f549aff61be84efc46e41126";
+ sha256 = "06plyf6hlkwk3c9kv8sagq5qhjmv82nv4rqbwlfjc0yxk2dr6gcf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -46343,8 +46456,8 @@
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "dc931fe1cd6e426bbb8392872a10f3b308ed008a";
- sha256 = "1dmavg2w3gdbg0607llzgl45h42m1pcnidfmgalmwb29snk9b33m";
+ rev = "c60715e937e3773bbb8a114fc9b9c6577f8c5cb5";
+ sha256 = "0hkc4g7i3z06y3rsdxqzdnx5rz77jb8ij1j13bdskbvpp7vfm60p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -46609,6 +46722,27 @@
license = lib.licenses.free;
};
}) {};
+ nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nord-theme";
+ version = "20170325.2314";
+ src = fetchFromGitHub {
+ owner = "arcticicestudio";
+ repo = "nord-emacs";
+ rev = "8df429d20d69e5fd914881a71ae3a044d02b392a";
+ sha256 = "15gjcrx514790djsyfmm8z8q36a3kyf4yhrms5qj423hfc94d3s7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
+ sha256 = "0p4fqg4i2ayimd8kxsqnb1xkapzhhxf7szxi1skva4dcym3z67cc";
+ name = "nord-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/nord-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "nose";
version = "20140520.948";
@@ -46633,8 +46767,8 @@
version = "20170313.1712";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "c39f6361d0798aa8d0dcd0b91f6b86ab9dc21c75";
- sha256 = "0dknkvpwa9fvvn512rij4vfdm7ifyddls5fh06i6cydw3id7dbid";
+ rev = "e1c1d33f3726f5cadb2f92d23735dcd1102fbc88";
+ sha256 = "0s2spmjl2v2zv80ri1l36njgipyxkdg7zvlb8ik5118i0fhbf3p2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -47192,12 +47326,12 @@
ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-go";
- version = "20170302.849";
+ version = "20170324.932";
src = fetchFromGitHub {
owner = "pope";
repo = "ob-go";
- rev = "f4e9c1afebe4b8a2d89bdf012ac533a2544cdf4e";
- sha256 = "05yz1kf1jszns4psf065gq18c5y12xlyg2zcqqbw5zjkvbgsgnh1";
+ rev = "1f582d5c16ff032207a40d49be0727190a227912";
+ sha256 = "1i0c7z1jfrd39pfdfr67qcisv578mmi6i73jnm9zliygk1mryggf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go";
@@ -47630,6 +47764,27 @@
license = lib.licenses.free;
};
}) {};
+ obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "obfusurl";
+ version = "20170325.802";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "obfusurl.el";
+ rev = "96c619fe4753062af93a12f44b67ba8aed22f2fb";
+ sha256 = "176a8r4y4glrjssywvc2xzdbk987fs796zsj892xcamcmzc688na";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl";
+ sha256 = "0xx2zsjbkd17iy7xzqc66f9xgc97f9js3nz656yhmmxakjk2krra";
+ name = "obfusurl";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/obfusurl";
+ license = lib.licenses.free;
+ };
+ }) {};
objc-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "objc-font-lock";
@@ -48078,8 +48233,8 @@
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "d6a00ff463f53f7357fd7ffbad95accdc8d1c367";
- sha256 = "0zq0rn1vbwmhr4z5dcgd5k9kslq3xxl05jiyab8835nfacb0zdf2";
+ rev = "bcc5d7ba940c1118ab61071783747162f0c927cf";
+ sha256 = "05i3z6whvgq81qnrwgvfglhwi214145ksg8h81rc0g4ir54wzsik";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@@ -48540,12 +48695,12 @@
org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-board";
- version = "20170318.754";
+ version = "20170327.1337";
src = fetchFromGitHub {
owner = "scallywag";
repo = "org-board";
- rev = "ed62187790f415a006194f69bf86c6ca6959b2e4";
- sha256 = "0kh32xkqiy4bh72mykswpi20x1fvr6m7751d4lnjczx836ncmggy";
+ rev = "53469a2f0577924de1c7d887fecea409d17fd588";
+ sha256 = "0fg7lkgcr7zwwjald7hbvwgl72m21lqxmz7p8sq31iw3jh42fqgf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -48708,12 +48863,12 @@
org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "org-clock-csv";
- version = "20170130.2213";
+ version = "20170326.1041";
src = fetchFromGitHub {
owner = "atheriel";
repo = "org-clock-csv";
- rev = "59482e800700e66db5381661c1e6b3edb2c03a34";
- sha256 = "099mjbd0n7azv4v3i4a7fw3f85c16ck334sqv2l92k0dpsjdmnrx";
+ rev = "0bae215df11e5602b07294e83b595447ae73ca0d";
+ sha256 = "17im4njl1w5wm0rxvib2g7v0ibg1p6n0ibq480wwz204jd98q4gv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv";
@@ -48978,6 +49133,27 @@
license = lib.licenses.free;
};
}) {};
+ org-edit-latex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-edit-latex";
+ version = "20170327.1847";
+ src = fetchFromGitHub {
+ owner = "et2010";
+ repo = "org-edit-latex";
+ rev = "ecdae5aa9763adbb1c103578a49dcd7fbfea3de7";
+ sha256 = "18mg5zy67hvm79y10z5gzjfdggdkfksb1zkpijqv347f84w1l31z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/180416a18ea8c424ec990be91bc11fc149e427d0/recipes/org-edit-latex";
+ sha256 = "0bnpr6plndz3q8515lni0mjwlpxy05jkg4bqifmrd52qh91x7j17";
+ name = "org-edit-latex";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/org-edit-latex";
+ license = lib.licenses.free;
+ };
+ }) {};
org-ehtml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }:
melpaBuild {
pname = "org-ehtml";
@@ -49277,8 +49453,8 @@
version = "20140107.519";
src = fetchgit {
url = "git://orgmode.org/org-mode.git";
- rev = "f64fd2a8f1ac57f0185fc82833b2a773644616ff";
- sha256 = "0gx6x65b46pw8k6hngc6y6akdqkwdrjy8vxsq1v4w1rs4vil8a9d";
+ rev = "8892fbdb6092af9e5ab5d9ed46762da67b57ffa1";
+ sha256 = "1n4djqrk9hqsxrra1x2cxgfx2djsavdmqd53bpik3wn6lr00w1gj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -49297,8 +49473,8 @@
version = "20170105.1723";
src = fetchgit {
url = "git://orgmode.org/org-mode.git";
- rev = "f64fd2a8f1ac57f0185fc82833b2a773644616ff";
- sha256 = "0gx6x65b46pw8k6hngc6y6akdqkwdrjy8vxsq1v4w1rs4vil8a9d";
+ rev = "8892fbdb6092af9e5ab5d9ed46762da67b57ffa1";
+ sha256 = "1n4djqrk9hqsxrra1x2cxgfx2djsavdmqd53bpik3wn6lr00w1gj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -49356,12 +49532,12 @@
org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mru-clock";
- version = "20170314.1357";
+ version = "20170323.308";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-mru-clock";
- rev = "471d206fb2f1d4fd974ec51474bf952141dfde5b";
- sha256 = "1zjn0knncj9yizhw664yg0a0n2qmjpjs6zn4jiqgd5452mambjy4";
+ rev = "98691aac779001d50516b12679e2a53b5192f164";
+ sha256 = "02v872vmvrda94s8gpv3ylss2fvj3ja6r70rvcmannjikmjdan5k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -49398,12 +49574,12 @@
org-notebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-notebook";
- version = "20170311.1302";
+ version = "20170321.2152";
src = fetchFromGitHub {
owner = "Rahi374";
repo = "org-notebook";
- rev = "ea6e477015a5f25d41df25af25252f521b12691a";
- sha256 = "1i1jchigh70z0ymil85plfx6wf9hwxlkl7jx9kxhv70zpc3m9mlg";
+ rev = "d90c4aeca2442161e6dd89de175561af85aace03";
+ sha256 = "15hf0x0v4fz6gxj8qx9pfm6xic7qni33nn4ga6cxbdgpwgyr61wz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04149b1f158e857ea824fe120372ac52a000adcf/recipes/org-notebook";
@@ -49636,12 +49812,12 @@
org-protocol-jekyll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-protocol-jekyll";
- version = "20151119.838";
+ version = "20170328.939";
src = fetchFromGitHub {
owner = "vonavi";
repo = "org-protocol-jekyll";
- rev = "f41902baaa62c8de3f81ad67a5f36d6aa5781578";
- sha256 = "1jzp65sf1am6pz533kg1z666h4jlynvjyx1mf24gyksiiwdhypsy";
+ rev = "dec064a42d6dfe81dfde7ba59ece5ca103ac6334";
+ sha256 = "1pgc0lfbz6q2x8b5qkk766i5qylql4p0ng732rcqr7rzg6j31gm7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1ee7c75da91fcf303ea89d148a05ac1e58e23e/recipes/org-protocol-jekyll";
@@ -49657,12 +49833,12 @@
org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-random-todo";
- version = "20161018.219";
+ version = "20170321.804";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-random-todo";
- rev = "10293cc751b13ef13ebdacb22968b4ffdcadb163";
- sha256 = "1fjlrs12kwybpx9zqrvyhalp4macx7v3vw739nd7bqsl1srwwr4f";
+ rev = "14a065e1d376838f16a6ba32ed8710304542a4e6";
+ sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
@@ -49726,12 +49902,12 @@
org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
melpaBuild {
pname = "org-ref";
- version = "20170320.728";
+ version = "20170325.703";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "org-ref";
- rev = "292a6d5ef0e169f41d745ea2d3083f189a59444b";
- sha256 = "0skj5f73qa5qxzpjhpkx65fk2pzhkn63ji3kgw7k76p5mw56i90h";
+ rev = "4117e8b9273ea8533a4ca9f1271cc81b789c57a4";
+ sha256 = "0kgfask1ylphcxjb93ybdgxmzrmhn58wky1iq0npcsq1949ajx1w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -49859,6 +50035,27 @@
license = lib.licenses.free;
};
}) {};
+ org-sync-snippets = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "org-sync-snippets";
+ version = "20170319.902";
+ src = fetchFromGitHub {
+ owner = "abrochard";
+ repo = "org-sync-snippets";
+ rev = "80d89985ae52c3adf445deba851b6eadc794eef3";
+ sha256 = "0vgq51im5124f7qzbqbyfyv4qbhjw4z4q1ksz3p5axd9hgir6520";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/96aff3f39adfa0c68aca8ff8d3b11fbfd889327e/recipes/org-sync-snippets";
+ sha256 = "0kv15zqva2cgx7jscp02x9gx20b5ckf525h546hyca86vfaakfbp";
+ name = "org-sync-snippets";
+ };
+ packageRequires = [ emacs f org ];
+ meta = {
+ homepage = "https://melpa.org/#/org-sync-snippets";
+ license = lib.licenses.free;
+ };
+ }) {};
org-table-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-table-comment";
@@ -50177,12 +50374,12 @@
org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org2elcomment";
- version = "20170313.1845";
+ version = "20170324.245";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "org2elcomment";
- rev = "e10e159d502aa7ab9c0d988c50c298a340ba2fcc";
- sha256 = "022ayjrsc2v5qw4xd7jxjw45lbryibwc6b68qi5555gjwd0mi3f5";
+ rev = "c88a75d9587c484ead18f7adf08592b09c1cceb0";
+ sha256 = "19r7rxnd2cl0vc8bbf86mh5b779pl5z917657ymlc74bqq140m3x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8af13650de8b4a814832638d4182bf8ce576244c/recipes/org2elcomment";
@@ -50853,8 +51050,8 @@
src = fetchFromGitHub {
owner = "jkitchin";
repo = "scimax";
- rev = "170a9d843f990f45c167ab62c12e342459110d19";
- sha256 = "1397s2qfn4b9b1b7s93sh131a36ifv9ydnpg6j5ihrwwa7556nng";
+ rev = "ac2479dd030ff47c760c30b68d7d6d133ed82903";
+ sha256 = "1vgqi073i6wlgfgjnpyaqbygrb3m9pm5frv0r70k07q2kvmalhy9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -50870,12 +51067,12 @@
ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-epub";
- version = "20170304.1600";
+ version = "20170328.1131";
src = fetchFromGitHub {
owner = "ofosos";
repo = "ox-epub";
- rev = "edc253b6f7397ac89a3a0b2d2a05e650baa483f8";
- sha256 = "0kvs5kpkly45fqdb7mka1w2yn7pks95gxgiy2ayx12cgvn3inyw6";
+ rev = "94ff7358ad311cc6ad3bd720fbbb51fbcce94aa3";
+ sha256 = "0iz38qc7fpd8rl9wacwq76y49mi53vr9jy6bw7f0ja1gbzfa8sgg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -50975,12 +51172,12 @@
ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-jira";
- version = "20170320.621";
+ version = "20170326.47";
src = fetchFromGitHub {
owner = "stig";
repo = "ox-jira.el";
- rev = "700736da7a42a56cc24864efa9863393c966121e";
- sha256 = "1x7k1pwjh4y07c0ln7d4rl10kvgfjddqd57414d6a010n7xr92m3";
+ rev = "638a9a44c96f5b21e2e36121465645e586910713";
+ sha256 = "12is86csnix270rnyf9q0l7ds70g128fn9nzgjgjgfylsp5nk9rf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira";
@@ -51035,6 +51232,27 @@
license = lib.licenses.free;
};
}) {};
+ ox-minutes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ox-minutes";
+ version = "20170323.835";
+ src = fetchFromGitHub {
+ owner = "kaushalmodi";
+ repo = "ox-minutes";
+ rev = "ad9632f35524ac546c6d55dfa827e8597669e1e1";
+ sha256 = "07knwl6d85sygqyvc7pm23y7v4nraiq1wl1b7szkzi2knd8wzi0s";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/162d0dacbb7252508147edb52fe33b1927a6bd69/recipes/ox-minutes";
+ sha256 = "13rwcp0k9h7l5g8xw2s2r1xhsmkibhfqyq6hlicvddv232g724sj";
+ name = "ox-minutes";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ox-minutes";
+ license = lib.licenses.free;
+ };
+ }) {};
ox-nikola = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, ox-rst }:
melpaBuild {
pname = "ox-nikola";
@@ -51374,12 +51592,12 @@
package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-lint";
- version = "20170305.2112";
+ version = "20170324.1727";
src = fetchFromGitHub {
owner = "purcell";
repo = "package-lint";
- rev = "4448466c8fe6f2dc049e076ac10cdc3ba31472fb";
- sha256 = "0fsj7fq2qgvaz76jdxcgrh08q3fnbl4afbsm44mcldfj7fjn1klk";
+ rev = "de08b846b3a031838b79445bb7a254c9de4a80f6";
+ sha256 = "0mvs4afjp5ab89vdz3bd9pca55brn57lxvjqjjyc6cyqxpclh06j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -51936,12 +52154,12 @@
parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "parsebib";
- version = "20170317.706";
+ version = "20170326.2344";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "parsebib";
- rev = "96e9320c3d09923fd4bd3bfbca3d4d4891273cfd";
- sha256 = "0nja6nmw5sqnaryr8f7isyp8iliz4y6kml4nc11cs88zpr6fq40q";
+ rev = "73327c471d92c7716484d8c3cbcdeed1d70ae468";
+ sha256 = "18g7mir5ynik5ryg0hl6vpjpajz6d6j0xd9ni54h3h60vvhciwmi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib";
@@ -52065,8 +52283,8 @@
version = "20151027.1449";
src = fetchgit {
url = "http://git.zx2c4.com/password-store";
- rev = "6f867674272a03273212259b9039c9356a6ed90f";
- sha256 = "1cn6iwkh19brz0wzxgf65lnb6wg4v87g66kbzd7fw52qv0xh4q7j";
+ rev = "caaa5f0f85fd93c1651d4c74c8bb8287a18c4e88";
+ sha256 = "10nqf5l320p61pajx7pj5yh7hxf666zsj1kcdb91ddb367kcwzzv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
@@ -53172,12 +53390,12 @@
phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "phoenix-dark-pink-theme";
- version = "20161206.1519";
+ version = "20170324.1144";
src = fetchFromGitHub {
owner = "j0ni";
repo = "phoenix-dark-pink";
- rev = "024a1dae5e12d9c62c67c6ba0bc56d2f8a109c15";
- sha256 = "1sfsf4ds6qvdj5hzzla31s1pvp5acbyxqqpncim2kvgim6sxyrac";
+ rev = "219edf69adb7e911394c5849c310ca0f4201a917";
+ sha256 = "0i7m9iqnglirwfdibskz2alk8bzkffp8gaa38yqg6bxwb46x67nq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme";
@@ -53193,12 +53411,12 @@
php-auto-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, yasnippet }:
melpaBuild {
pname = "php-auto-yasnippets";
- version = "20141128.1411";
+ version = "20170324.914";
src = fetchFromGitHub {
owner = "ejmr";
repo = "php-auto-yasnippets";
- rev = "7da250a0d40f3ec44c7249997436ee8c5cae04ef";
- sha256 = "1l64rka9wrnwdgfgwv8xh7mq9f1937z2v3r82qcfi6il3anw4zm0";
+ rev = "d6e04b2db9ebe220e25e4d3a1550bf6fdafdf032";
+ sha256 = "160y5kp5m7kfkj832i7rawgj4ylnf100xqn7v0fppqapri2f177l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d47ca8cd5900a80a2ede1b354547addf9b2bbbac/recipes/php-auto-yasnippets";
@@ -53634,12 +53852,12 @@
pippel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "pippel";
- version = "20170320.1703";
+ version = "20170325.649";
src = fetchFromGitHub {
owner = "brotzeitmacher";
repo = "pippel";
- rev = "a96b5cb4d6e74766d8d92b343aa4f86fd45d208a";
- sha256 = "0ryw6cd1snjb1jyzbddx0c2gxfpvxyzw1ilbzhr8xd0hc87z01iw";
+ rev = "764c8ec30ad14288accd05c7f8a1c9425d6aab7f";
+ sha256 = "0plpjjyhn1rz8pwyldshwa61r7pfz310j4qciw55smjizz4hfjx8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8dbdb25c8344c96048a7863333ace6dc07d8154c/recipes/pippel";
@@ -54068,12 +54286,12 @@
pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }:
melpaBuild {
pname = "pocket-mode";
- version = "20170320.627";
+ version = "20170327.438";
src = fetchFromGitHub {
owner = "lujun9972";
repo = "pocket-mode";
- rev = "36128b4c1785f94da52e3c7d98ca44da8911996e";
- sha256 = "0mr1acblwfm67x1v7wgz77djr81gv8bb8jd2giwbs8qxqic56zcn";
+ rev = "4338e869862a057e7ad1e53953e8c4a2c0f12a46";
+ sha256 = "0c23np33g9hndppyfvvh9qb8xdh2v92r8rvcsi2cbwwm4z7xsvra";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6aa3d04058bfc0bc1da3393d17429d517275e97c/recipes/pocket-mode";
@@ -54398,15 +54616,36 @@
license = lib.licenses.free;
};
}) {};
+ popup-edit-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "popup-edit-menu";
+ version = "20170329.452";
+ src = fetchFromGitHub {
+ owner = "debugfan";
+ repo = "popup-edit-menu";
+ rev = "bd823ae3068e053804258697848392492538914c";
+ sha256 = "0j2ynj8dshpagbjg38snfk626pfsb25y23w2nkb4h7v4kfv6587g";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e824ae5bd9214f8de210059f8145f13a4e62e8a1/recipes/popup-edit-menu";
+ sha256 = "1mqni09l1xfxv4g64hskpsla41r5d2xfbw81ncbszwqzlln6k5bf";
+ name = "popup-edit-menu";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/popup-edit-menu";
+ license = lib.licenses.free;
+ };
+ }) {};
popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }:
melpaBuild {
pname = "popup-imenu";
- version = "20160409.510";
+ version = "20170326.340";
src = fetchFromGitHub {
owner = "ancane";
repo = "popup-imenu";
- rev = "540e8c0473fd50ff0a85c870057e397a0d3c5eb5";
- sha256 = "19mqzfpki2zlnibp2vzymhdld1m20jinxwgdhmbl6zdfx74zbz7b";
+ rev = "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09";
+ sha256 = "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca5d65d6a9c7ef3fa2684271fe087dc132d3a61/recipes/popup-imenu";
@@ -54689,12 +54928,12 @@
prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "prassee-theme";
- version = "20170228.618";
+ version = "20170329.758";
src = fetchFromGitHub {
owner = "prassee";
repo = "prassee-emacs-theme";
- rev = "5c95639cf397b6cae5b0b37e462bd370296f84b2";
- sha256 = "0qyzfw7qxy6jb1qv93a6dvylji62yi06wvi8bqaxjsqf0a3zhb32";
+ rev = "5be0ad067182881012bea5ae352636eaff06b01b";
+ sha256 = "1l73dvi5pdbw8x1qbk9zhi1ddz000k54lm0jg2rzlcsxwnz2f4sf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme";
@@ -55191,8 +55430,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "codesearch.el";
- rev = "7f5ea7d653d01071ff9ce3c3281dc2bed4f96c5c";
- sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
+ rev = "7013d933cd9d3c04f19a6572176483b48a311807";
+ sha256 = "0g5w6p0hpsz5x4f3ic6q38ba5j5jfbx9nl77cxj6h1wpqdk49dhp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aa69679a71495a9ebaa8fcaac42f6682a5167d00/recipes/projectile-codesearch";
@@ -55271,12 +55510,12 @@
projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
melpaBuild {
pname = "projectile-rails";
- version = "20170315.730";
+ version = "20170323.210";
src = fetchFromGitHub {
owner = "asok";
repo = "projectile-rails";
- rev = "fb28fc8710b614e9ab535788ee58f9a9070561f1";
- sha256 = "0v7ddlk8mzqa8gvxrrcvd15klap5m31df8vn14z99s3ybj3zk0yb";
+ rev = "6f866e1e7cd50db563a16ae9237ad10f3be97fef";
+ sha256 = "1fs5pcqk1zfhgbh2k9kdyi7sm089iy2mwaqipa1k91lvmqawz5i6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -55569,8 +55808,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "ffa932bf10d958fc3dff3ac9153f1b4ef55d6024";
- sha256 = "1d6j2al7vz1a4dpzmn3vl62f2vsprjiddjlj4ww4j6g2lpphrik0";
+ rev = "4a0dd03e52e09332c8fd0f8f26a8e0ae9f911182";
+ sha256 = "0x741ivcyx1yn5qp63swl3n5966zwjngmalwr85sq3qb5vacifj0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -55583,15 +55822,36 @@
license = lib.licenses.free;
};
}) {};
+ protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "protocols";
+ version = "20170327.758";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "protocols.el";
+ rev = "1c93a48d4173635a7b742248797f424e7ce851e3";
+ sha256 = "1hbk7ikcp041m7g2nfbbvsyj15d7p3dhsv0yvyy1n6bm5azh30zr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols";
+ sha256 = "1wg3qh8a1ms82lkzz4i1bk787147a8agcj8rszj1zfvwg0ckqq1a";
+ name = "protocols";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/protocols";
+ license = lib.licenses.free;
+ };
+ }) {};
psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "psc-ide";
- version = "20170131.23";
+ version = "20170324.243";
src = fetchFromGitHub {
owner = "epost";
repo = "psc-ide-emacs";
- rev = "4a78aac90d84ea7aef6219497bd75c3ead988806";
- sha256 = "04qckg29wgzcr4z696s5wm4w8lrq3m799p447l87z5i23gk4hw7j";
+ rev = "28a3a95890243993b20c2c2bf66d6c00a2f0fd21";
+ sha256 = "0kajvmfyaxma9mh7mbrc3hiilzkdjwmgvv6zdfv39r9llwkrv80k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
@@ -55806,12 +56066,12 @@
puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "puppet-mode";
- version = "20170315.1112";
+ version = "20170323.331";
src = fetchFromGitHub {
owner = "voxpupuli";
repo = "puppet-mode";
- rev = "d7f25ade2266927356ae20053eb353c099ab233e";
- sha256 = "0hk5ikf5jnbmwn6jm2drpn3wv9agmcl2wp9dhlhc8c23pqrjv1hk";
+ rev = "ce098468af9e7dc50a3979b0f4b7de54abe0aa78";
+ sha256 = "1vap7vk6fsslpijy2iq3y0fb94naxjm60mcyf3xlz1gym3hfrwl5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -56312,8 +56572,8 @@
src = fetchFromGitHub {
owner = "PyCQA";
repo = "pylint";
- rev = "d78e0130720aba010a55e388ba16bd58debef828";
- sha256 = "0my3a7h7v6x1b19d8fd6lpdzn32zav4nwpmc8f8pypf076kjaf82";
+ rev = "da2e9724a195ea48451222457e56fbb9311186da";
+ sha256 = "15xwdmsffj4xysl4mg17ip7pid9i035xhsh3r1qg2bqi2ikwqzgr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -57866,8 +58126,8 @@
src = fetchFromGitHub {
owner = "RedPRL";
repo = "sml-redprl";
- rev = "d06d39486348a74981b2c4c4c2ed3af95b01d5ca";
- sha256 = "0k3f7pa332d0fs1js8hi7zszcirir1943bhkgwfxzsqx17m26x3n";
+ rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b";
+ sha256 = "08w4ll3z2pygry85x1g1kz2ibbiq93zq3my9zll226xi9hx1nll0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -57945,12 +58205,12 @@
refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
melpaBuild {
pname = "refine";
- version = "20170311.114";
+ version = "20170322.1527";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "refine";
- rev = "e46948a3567a462094fcda227daa0f462e9f9120";
- sha256 = "1damy0y5c4qnfvdmv9qzr7w6vs88dm71wsfv918p79a0drp7xrdb";
+ rev = "55984dbd570c361e7d56d85f2d4ecfbcc567bda1";
+ sha256 = "0amj5i69cgk0p0c3wlm68dgrav8in5n19msglnks210mbfd1vzhj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine";
@@ -58466,12 +58726,12 @@
resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "resize-window";
- version = "20170130.1926";
+ version = "20170329.1644";
src = fetchFromGitHub {
owner = "dpsutton";
repo = "resize-window";
- rev = "194805787694194cf713ff15ee52a78c8da2d1fa";
- sha256 = "1g2vyi53sna5416q1sgc74yaw8vpqwwhxas4r5xcp8qyxxk5zspy";
+ rev = "e4879731f3a3bc2261d6ec465bff01f88bd77d1d";
+ sha256 = "0lhf1sk1gx0vpy038bdnmlqjzpg4kchlladihk36pv4hgqn5r9w7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window";
@@ -58905,8 +59165,8 @@
src = fetchFromGitHub {
owner = "felipeochoa";
repo = "rjsx-mode";
- rev = "276be756cdf3cbaf23198e5f19ce7daa7bc2b6e8";
- sha256 = "0lhwkgk3n36kd6rzvnj6h5xcp5wwa4yczri0274a7ch5gz2jdhhz";
+ rev = "5347e3609c5ea8b767f9ec0c08969467d288c516";
+ sha256 = "1gnbphf4ldi60wdfwpcyyyhgj2scj0wmlxp10014cwz9xcdqnfl5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -58985,12 +59245,12 @@
rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rope-read-mode";
- version = "20170131.217";
+ version = "20170325.831";
src = fetchFromGitHub {
owner = "marcowahl";
repo = "rope-read-mode";
- rev = "a3810cf223c92353338418058153a466657a2dca";
- sha256 = "1i6dk80h6f4crw55iwbi5qxj15pr46j8cbd3b5nxcsvhl32900by";
+ rev = "a43d56d79a0595374a8414979b758fbea3cab0a8";
+ sha256 = "1z5f6z3mii24h82lhpdlyaazjlf69ffp6la1ajl0hn91hx297dw9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode";
@@ -59069,12 +59329,12 @@
rpn-calc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "rpn-calc";
- version = "20150302.534";
+ version = "20170328.349";
src = fetchFromGitHub {
owner = "zk-phi";
repo = "rpn-calc";
- rev = "ed202e9eb59c4ace74b4703174f7bc7fa7e2d594";
- sha256 = "0i5qwbhhdnspgs2y67kkgbk9zq6fx2j509q92mgfzbvjnf54h1r8";
+ rev = "9f38d2a5f9a7f24e01804dafcf8a4951daa2bc62";
+ sha256 = "08y8yczzpwg7bw01bgpc54kx0ijhg0y8pwl8kcgdxgmav38y46fb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/rpn-calc";
@@ -59132,12 +59392,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "20170303.1422";
+ version = "20170329.1245";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "81ac739febae408d593e2d743ac64c8c068fdb78";
- sha256 = "161nbshas80qxgpck5mnpa0y0v9bx9rdph2g87wr95lzw9dm3cyb";
+ rev = "8d868af718f29e7428658fe56979e05659f3a9c3";
+ sha256 = "1nj1r3hdgzfhmhy7v9s7ivww7y1hd70bw4vp904m20qwq81zpm69";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -59198,7 +59458,7 @@
version = "20161115.2259";
src = fetchsvn {
url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "58039";
+ rev = "58216";
sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
};
recipeFile = fetchurl {
@@ -59278,7 +59538,7 @@
version = "20150424.752";
src = fetchsvn {
url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "58039";
+ rev = "58216";
sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
};
recipeFile = fetchurl {
@@ -59967,12 +60227,12 @@
scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "scala-mode";
- version = "20170131.2121";
+ version = "20170323.502";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-scala-mode";
- rev = "730e16d254478d6f63f62cb04d47c137c9002f2d";
- sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9";
+ rev = "970d88eeff82df635ee12336ab1eb185585f30c6";
+ sha256 = "0wfv20dyb13v7fbfsvy0k5dajvmyyhn80l6xyx6kppiv3qmy9s90";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -60855,6 +61115,27 @@
license = lib.licenses.free;
};
}) {};
+ services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "services";
+ version = "20170327.835";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "services.el";
+ rev = "87d65bf9fd8b02101f751846c650fc518355d1ea";
+ sha256 = "01wlknj97jrmhji3c3dyc6cm8pp0rj93knfrg3l7zimr7crx3rg3";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services";
+ sha256 = "02lgmpbw52ps6z4p9gwzvh9iaxisq5mb0n9aml9ajxac1473vpcd";
+ name = "services";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/services";
+ license = lib.licenses.free;
+ };
+ }) {};
session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "session";
@@ -60921,12 +61202,12 @@
sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sexy-monochrome-theme";
- version = "20170225.346";
+ version = "20170324.510";
src = fetchFromGitHub {
owner = "nuncostans";
repo = "sexy-monochrome-theme";
- rev = "436206eef592ca22e4c3e0cd3bd87a1fba4083a1";
- sha256 = "0aaicpiihrd5ny2g68cpkasysyx5wj28gs727qwdqw3ljpc0qlz9";
+ rev = "c221231bb8a0d60413d710efe6226683326d57b0";
+ sha256 = "0zjy6d4fqg08dwbn1y360514pzzj3nrg3wzm656n7sg90mffh22i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme";
@@ -61337,8 +61618,8 @@
src = fetchFromGitHub {
owner = "chrisdone";
repo = "structured-haskell-mode";
- rev = "074c8696f52253af24a74e4b3a99edf9c0993aa9";
- sha256 = "1cn2kh5ccp09mg6y743vh2y9m96m0zbnh9w5infl9nj9xbidza72";
+ rev = "45b32a79d90a4e23064f0ca18d4ff9283b01ef03";
+ sha256 = "189vx1kjrdr0lxbfbvfvrxvr1y216px23rfa52ysha5av2khr39v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm";
@@ -61892,12 +62173,12 @@
skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
melpaBuild {
pname = "skeletor";
- version = "20151220.2054";
+ version = "20170327.1529";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "skeletor.el";
- rev = "78df0da39bdf0d3e78f8d672a3486c02baa9dbd0";
- sha256 = "1sabk2ly80k67hwypm5g292n3c4hjlcmvc61n3ixlkm4nq8dp6sy";
+ rev = "cf643ea320e172b3727f897f05e87a8e5a02c589";
+ sha256 = "1l3gjzzvrbkiapk41jxp1hwx2z2wc69m8bsy179nwvv9gsnxvwv1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e63aefc869900c2af6f958dc138f9c72c63e2b8/recipes/skeletor";
@@ -62018,12 +62299,12 @@
slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
melpaBuild {
pname = "slack";
- version = "20170318.627";
+ version = "20170328.2044";
src = fetchFromGitHub {
owner = "yuya373";
repo = "emacs-slack";
- rev = "0474bbf2d446ef706c5779b2f42d0d10375bdd7e";
- sha256 = "1q0bq9s38q0wba34gdngs3zhybdnzb2c840sivnqdlj5kp74wcq8";
+ rev = "fc85625ed4421e4fe79c87c3844d6561543c0ab8";
+ sha256 = "08xfqacvq1a0g6pvj6pjg3mi2yl1c756kn92csacdq3g7z4sfkm2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -62753,8 +63034,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "smartparens";
- rev = "a212f777eea775a5c106b5022dea3bbb215bf98a";
- sha256 = "19fpal1r0x11515s1lwgr5cjs0jk7pggfnv6y7jj4bvrvq87imnk";
+ rev = "2acdee84701021049bea0925988df61e340c2311";
+ sha256 = "1k0aybgaa595gdr8d1v3wid349hzmnxr3i0isdh3sdzf9b9dh313";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -63105,12 +63386,12 @@
snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "snakemake-mode";
- version = "20170226.1852";
+ version = "20170326.1920";
src = fetchFromGitHub {
owner = "kyleam";
repo = "snakemake-mode";
- rev = "6f2c034f1ec557c9e7e624cfd53e8ebb997376ab";
- sha256 = "0255lh2r73h84kks3h7pfr8242q86kb8qrv8sm6dwv9jcbjp094n";
+ rev = "349980879a66493ed421e9c83f4857662267b8df";
+ sha256 = "0alwp2i554alac76zlskviabi12nivmpy4yhm9nwz7lsnv7qsikj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -63147,12 +63428,12 @@
snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }:
melpaBuild {
pname = "snapshot-timemachine-rsnapshot";
- version = "20161008.305";
+ version = "20170324.513";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "snapshot-timemachine-rsnapshot";
- rev = "4ff6b96219f4da576141e376b0348813c1c25615";
- sha256 = "0krb1ziyjldyq27sp0phmygm1p9lssp251ycj08gdczbbfpw4lsa";
+ rev = "72b0b700d80f1a0442e62bbbb6a0c8c59182f97f";
+ sha256 = "1bdy7p0bjfdlv6l6yih6fvvi7xpldal4rj8l2ajpc6sgby24h8bb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot";
@@ -65189,12 +65470,12 @@
suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "suggest";
- version = "20170320.113";
+ version = "20170326.321";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "suggest.el";
- rev = "c0470316543091b4f64b334c51538acd95dffc9c";
- sha256 = "1f3w6qzbw1ksm9sxqcxygr1n6g9ddd7xx0b29yvp2s94mia3rbs7";
+ rev = "d23e9e86c413561177f7f0704056627ee3c0eb15";
+ sha256 = "0p02sjrhlcjbprw4s2gy8rccgm0k9ds4haj6hmg48gsbahxiz59v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -65561,12 +65842,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "swiper";
- version = "20170320.358";
+ version = "20170328.737";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "beffa78885517beaad2da50accc339f9346f94ee";
- sha256 = "18bxh67xdkbxpmxdqidrnqwlzffdywmf9vwz4zcynagj7yscx3yb";
+ rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
+ sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -66291,12 +66572,12 @@
tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tao-theme";
- version = "20170301.557";
+ version = "20170327.1017";
src = fetchFromGitHub {
owner = "11111000000";
repo = "tao-theme-emacs";
- rev = "1d68f51db69ed096a6e13b036755f0c4b6ad3e8f";
- sha256 = "0nh0yrn2jgccifh2xvrfly6n145flvxx76wxc5jjdkgg2xy7alys";
+ rev = "0b89755a5d985c27378795ec017c00b8bdd78f55";
+ sha256 = "04v6lb4mz802g72565ar8h2vx4fxfvs5y8hkiimr7r04y3b73d5p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -66736,8 +67017,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "df0c000f7b94faf3c451c855acbd30631167c41b";
- sha256 = "0s3j9pyjnry06lfz7jrd79vrd0mlw6vj9i62xs81zi6v4vf002wr";
+ rev = "e5a3f048ee7c7729434918648cafc564cbb3046a";
+ sha256 = "0dgsg6nppssf3fjv37idb7z4c3k6plxjybp9al079bqhkr1cawdz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -66757,8 +67038,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "df0c000f7b94faf3c451c855acbd30631167c41b";
- sha256 = "0s3j9pyjnry06lfz7jrd79vrd0mlw6vj9i62xs81zi6v4vf002wr";
+ rev = "e5a3f048ee7c7729434918648cafc564cbb3046a";
+ sha256 = "0dgsg6nppssf3fjv37idb7z4c3k6plxjybp9al079bqhkr1cawdz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -66984,12 +67265,12 @@
textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "textx-mode";
- version = "20161106.1243";
+ version = "20170329.339";
src = fetchFromGitHub {
owner = "novakboskov";
repo = "textx-mode";
- rev = "74b701ec2d31b228a8e1e9c993edd00f5c324dca";
- sha256 = "1i4bd17kymdc9w2xd83549f0dva2asnvqcppgsg3svyab8x1aa7z";
+ rev = "cd47daf9737479ff06e2fa43fbb45ada2d7386e8";
+ sha256 = "165m6p18nzpqvdvx2a6hf94blsa2r947wdf1x6jicqflfpki45cx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode";
@@ -67180,6 +67461,27 @@
license = lib.licenses.free;
};
}) {};
+ thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "thinks";
+ version = "20170325.430";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "thinks.el";
+ rev = "122c0dcafa79bb1d9b37dc5bf6045e9f62666e6c";
+ sha256 = "05jczr3vj7j7b83sv2w79hrd4hq8xip79yx4z9g1v8lr3j3l4gzq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
+ sha256 = "11vj9mjfzmqwdmkq97aqns3fh8hkgx9scnki6c2iag5lj0av2vcq";
+ name = "thinks";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/thinks";
+ license = lib.licenses.free;
+ };
+ }) {};
thread-dump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "thread-dump";
@@ -67229,8 +67531,8 @@
src = fetchFromGitHub {
owner = "apache";
repo = "thrift";
- rev = "6582757752e62efea3f9786dddf0260efaa1f450";
- sha256 = "1c9miaq60d0l352yyxc2l3v927wzgadsyvfxyvs88qdk6pmz59ig";
+ rev = "7470995ce4bb480a86beaf1d8babce95c6f4b8c7";
+ sha256 = "0srq5qcmnfplr30yxh6l4szl4vjfj41dwm615zq0mfjakxd3pbm1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -67286,12 +67588,12 @@
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "20170318.822";
+ version = "20170325.602";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "96b35dda1ff9fe5b185618edddd4787b4821f9e5";
- sha256 = "1jq1iyg0h4ddgkbsba0yw1h95xjh5dqnjdjdjsyx3ky8ir562la2";
+ rev = "a38e71fd07fceaa069d701cb6a3637dfd53c9f23";
+ sha256 = "01fg82i1a5ck6f5qj2nrz2hzl46hcsaxk13chbb71r99r80xm9lm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -67427,6 +67729,36 @@
license = lib.licenses.free;
};
}) {};
+ timonier = callPackage ({ all-the-icons, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pkg-info, request, s }:
+ melpaBuild {
+ pname = "timonier";
+ version = "20170328.116";
+ src = fetchFromGitHub {
+ owner = "nlamirault";
+ repo = "timonier";
+ rev = "f5d42f0a234b906f72da759240b9fc2067de1e80";
+ sha256 = "1dl99zwcps8n22pf60mp47r8px98a9ihyf95j1y6dfivnzm7kjy2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a31b0c177fd83bdeb1842a6ec3095de143bb4eae/recipes/timonier";
+ sha256 = "0vb83kv2dkca2bq876icxs8iivv9qgkzmzrsxfpnvbv752b220b0";
+ name = "timonier";
+ };
+ packageRequires = [
+ all-the-icons
+ dash
+ emacs
+ f
+ hydra
+ pkg-info
+ request
+ s
+ ];
+ meta = {
+ homepage = "https://melpa.org/#/timonier";
+ license = lib.licenses.free;
+ };
+ }) {};
timp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fifo-class, lib, melpaBuild, signal }:
melpaBuild {
pname = "timp";
@@ -67598,12 +67930,12 @@
toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "toc-org";
- version = "20170131.558";
+ version = "20170324.103";
src = fetchFromGitHub {
owner = "snosov1";
repo = "toc-org";
- rev = "cda8f73640ae26c476990eae421e42627445f9d0";
- sha256 = "1qkm70ay10blhji8z6c64f18288r1gswzmmkvg7b2z2rz9w475fm";
+ rev = "f0b94e07bb4b32db039088a58578bced29256431";
+ sha256 = "1dbi8kzr5nnb3sclafniq2sipwyran8h1vsqdy1wqd1a5306538h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
@@ -68119,12 +68451,12 @@
transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "transmission";
- version = "20170312.1927";
+ version = "20170326.1044";
src = fetchFromGitHub {
owner = "holomorph";
repo = "transmission";
- rev = "fd6334f795df409d8d854a0762ef2d2ac74556c0";
- sha256 = "0mi3xrgsshds09j70mv42ngn1f702wswvrn4wm3xh8gv6sqfbz5m";
+ rev = "5b88e643e93115af3a96c8cf558eb506b34a64fc";
+ sha256 = "1zcpy3628s9cm9am92imwhp31fdnd6146hz0x4qaazia4gbhp66z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -68657,12 +68989,12 @@
typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typescript-mode";
- version = "20170314.658";
+ version = "20170324.1301";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "typescript.el";
- rev = "5931f2776d07f361a9aa58075dcea721b9480416";
- sha256 = "12cw0nphc7xkzphwmflp2r2jbvixqhmb4lvvgp52qsy8b8n1hamr";
+ rev = "f25f4751fea12298905c811a1f469a6b0a169ef1";
+ sha256 = "1s4qzhi8bd45l824pwzh97i9npf7j4ai6wkbhf28q2nd1hiv29hw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -68861,12 +69193,12 @@
ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ujelly-theme";
- version = "20170309.131";
+ version = "20170321.1016";
src = fetchFromGitHub {
owner = "marktran";
repo = "color-theme-ujelly";
- rev = "c9ae717f38a7d01de30a8030f80032a5782aa88c";
- sha256 = "0jx8rfm8jrpn7b8q0wkabjsnvlbzmgn2q60qscmvz1bggb01r9ak";
+ rev = "2db6f0ab6054e9d6893d65bb239cdae5c2decf5f";
+ sha256 = "10m4bic1n8vmz1gr81cpr1cwyamyvp6iw3wdc0vwfma2fskd1pq2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -68946,8 +69278,8 @@
src = fetchFromGitHub {
owner = "sviridov";
repo = "undercover.el";
- rev = "465e339749f924606df71e250ae10d1f910f71a9";
- sha256 = "0p75m1v9hvdlmlpg9zk09q9zyxf1ld6njfqir6hx83lidgvs5wsm";
+ rev = "3d69b33a0b52ba25415ba8ad8552b0cfb250435d";
+ sha256 = "15h2nabbi6ysr6xrf35p8zs0mi00ifk645kskhhfyn3hm103j052";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover";
@@ -69369,6 +69701,27 @@
license = lib.licenses.free;
};
}) {};
+ uptimes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "uptimes";
+ version = "20170326.515";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "uptimes.el";
+ rev = "5e321692bf5ccdc286f4831fa8fe55467c1c56aa";
+ sha256 = "04n4bryfid6scma43whw156wcza77ij7szgc5f73d98j9fji6lay";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
+ sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h";
+ name = "uptimes";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/uptimes";
+ license = lib.licenses.free;
+ };
+ }) {};
url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "url-shortener";
@@ -69432,12 +69785,12 @@
use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "use-package";
- version = "20170319.12";
+ version = "20170327.1449";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "bf9a73f919cbd677e4015f82e90099d7cabe5011";
- sha256 = "079vvhv0wjk0nqisk86z1nkxm9hgwnv93dsb3rlqnzjdijw6z2s2";
+ rev = "a354568ec2af8444b741f595a3a7183e3f67ad58";
+ sha256 = "19aaqcaycq1msfgvvnlqkzqqijbzqzc015k69pbg41l5bvrwnqcq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -69478,8 +69831,8 @@
src = fetchFromGitHub {
owner = "diml";
repo = "utop";
- rev = "f2015062fa5f8ff5a39d3f2db9475862f433b2d0";
- sha256 = "1l00rhh9l4b9ww5sx1vm87qnydcr59ka4w2n2faifglnsv3awzn6";
+ rev = "d6f6a9465a26fc78ff72a3c234f118256ab24309";
+ sha256 = "1nswnzmr43b4x1kcai0ygy5v3nyc3713209x3pwq30hs7jk3swb0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -70104,16 +70457,16 @@
vimgolf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vimgolf";
- version = "20140814.1448";
+ version = "20170323.600";
src = fetchFromGitHub {
owner = "timvisher";
- repo = "vimgolf";
- rev = "289bef87963b660c0cf6ea1f648ac2440c609c88";
- sha256 = "1i407ilhmk2qrk66ygbvizq964bdk502x7lvrzs4wxwfr5y8ciyj";
+ repo = "vimgolf.el";
+ rev = "741e414ec24072af05471058a5719271bfcfe766";
+ sha256 = "0fs0gimry8xzydh7m305j86h1rq7qivsda19ah48sxbxks6xq5ax";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0bded518d1544a9442c13c5cbfab64f0f1cbdb6d/recipes/vimgolf";
- sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/50dc1c26cb848986dda3c930c8d9b421cd3b1d17/recipes/vimgolf";
+ sha256 = "15xq5vm82hy4pjw04m7xcqav7azsb3c65lp8cfxa29z7xg81w62f";
name = "vimgolf";
};
packageRequires = [];
@@ -70476,22 +70829,22 @@
license = lib.licenses.free;
};
}) {};
- vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
+ vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
melpaBuild {
pname = "vue-mode";
- version = "20170206.120";
+ version = "20170329.612";
src = fetchFromGitHub {
owner = "CodeFalling";
repo = "vue-mode";
- rev = "0b159770abc865796a1fa02be2f5959138b2f8a6";
- sha256 = "1i6a6g4l9xy45kllgr6kgai3mfg8b060dpspn6vv69kpwjcqiza7";
+ rev = "cbd1e35375309f0c813b5689a765c483caef6d60";
+ sha256 = "1lpac1bkgjnkhhglynpwfz4vr3g90m8124ii43yd5n06vpx21c3d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0";
name = "vue-mode";
};
- packageRequires = [ mmm-mode ];
+ packageRequires = [ mmm-mode ssass-mode vue-html-mode ];
meta = {
homepage = "https://melpa.org/#/vue-mode";
license = lib.licenses.free;
@@ -70598,12 +70951,12 @@
wakatime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wakatime-mode";
- version = "20170319.2117";
+ version = "20170324.2348";
src = fetchFromGitHub {
owner = "wakatime";
repo = "wakatime-mode";
- rev = "ac31d0def2a9c03c3aa2cbe9cdd94d61de5a6ecc";
- sha256 = "07grqwh71x4jd1vpah6lxz3vh3q9rxkn4dli2165db7cazpv1ym8";
+ rev = "7172a92df66a69537c849182c22404715ddd9bfe";
+ sha256 = "0scayq5vwxsilm90zbma8lc6fvmm6w7p3gfyphcvvsm93rx5601r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a46036a0e53afbebacafd3bc9545c99af79ccfcc/recipes/wakatime-mode";
@@ -70640,12 +70993,12 @@
wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
melpaBuild {
pname = "wandbox";
- version = "20160418.1114";
+ version = "20170324.1014";
src = fetchFromGitHub {
owner = "kosh04";
repo = "emacs-wandbox";
- rev = "c5c4f1279f48e7871407d0fca2409512f427107e";
- sha256 = "0xzwflvj0mq0h9qr62aq473jz71jggnq2dlf1x2vy0a7rh8qw445";
+ rev = "4e52c14aca11de4686d4f1de98588cb5cf42d815";
+ sha256 = "1c9wvnc8nqizh5sw424hznnqymfcyqdgdj8gzwfy5i04mi7mic4p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox";
@@ -70661,12 +71014,12 @@
wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
melpaBuild {
pname = "wanderlust";
- version = "20170309.1426";
+ version = "20170325.357";
src = fetchFromGitHub {
owner = "wanderlust";
repo = "wanderlust";
- rev = "40ea87cc62ac6d858235edf2e5d10e5867aa230e";
- sha256 = "0kmw7rhx7d1a9vhabrfks5l95jafya4lw6yl937imkyxjb6kqdf5";
+ rev = "0a324086eb9cf2d357d3c8a431e80cd45fce016a";
+ sha256 = "0hcyy44xxg6f7c10db6xf8944wiaijxln3kgrl49kc0m3icilxyy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -70976,12 +71329,12 @@
webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "webpaste";
- version = "20170320.1251";
+ version = "20170328.1448";
src = fetchFromGitHub {
owner = "etu";
repo = "webpaste.el";
- rev = "8e9f4e05503b8751736ee4db78e78cc8edbe9f8a";
- sha256 = "0gs1b2yvg2742vpjc4gaj5g2yf81br3456pi5yfz6cwkxk4adfyi";
+ rev = "382e01d787c4a0fa6bd4c58bed1810ed5b7787e2";
+ sha256 = "1nz4ri36k49gwdkc9sb886avpijijssrj4frjyrw27ff9aj9q9h0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -71439,8 +71792,8 @@
src = fetchFromGitHub {
owner = "foretagsplatsen";
repo = "emacs-js";
- rev = "92d6b0e8d81715c33b9926fc51adb74d8fa8a323";
- sha256 = "02ny5ygm7hlm5jx8hl0r10pf3bfvlyfnp2cvkhqz66mfhrv6f7yj";
+ rev = "e66476fef5c5afe75f09e4fe94109423a99fc2c6";
+ sha256 = "1lvk8nh9gp3i98jjinqx17fxammxkfwh0dvzhah9ram73i6xq1yd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -71807,8 +72160,8 @@
version = "20160419.1232";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "3447d48e8562";
- sha256 = "1qym4wfcr3hiq0a1z3myvzalblwwp5xalq9sjx090w3ag3ghgjrg";
+ rev = "c5c0bb98b281";
+ sha256 = "0gxvx2n6xza17qf1p4v0nbcqfkkhrmg9a56c5d126b4vgmg3bf9v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -72034,12 +72387,12 @@
worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "worf";
- version = "20170306.1230";
+ version = "20170326.712";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "worf";
- rev = "9dc5a0f5077e20ea3177376823a1fed18840d5f2";
- sha256 = "076mz72qqfcbrs2gw9ng8gbzhr9kzc9mnjmv51n67dmd7hi5mmyc";
+ rev = "820fe2316d672e7bb2be7a2ead8ad5ed027f1a9a";
+ sha256 = "13d089n9y8y7ka708byg9704rq0slxvdzfhw8vk0yzzd3jrbfgs3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -72115,6 +72468,27 @@
license = lib.licenses.free;
};
}) {};
+ wotd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "wotd";
+ version = "20170328.1248";
+ src = fetchFromGitHub {
+ owner = "cute-jumper";
+ repo = "emacs-word-of-the-day";
+ rev = "d2937a3d91e014f8028a1f33d21c18cc0b065a64";
+ sha256 = "0nwq5ymj9kx1fx3kfc789nkd80gwzljwmk7xxzzsrdrv47gm047m";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7a52690a9bae634825bdfb5b6b17e5faccb93e13/recipes/wotd";
+ sha256 = "145knl4n35kpqqzqkz1vd18d619nw011d93f8qp5h82xm92p3sb5";
+ name = "wotd";
+ };
+ packageRequires = [ emacs org ];
+ meta = {
+ homepage = "https://melpa.org/#/wotd";
+ license = lib.licenses.free;
+ };
+ }) {};
wrap-region = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wrap-region";
@@ -72160,12 +72534,12 @@
writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
melpaBuild {
pname = "writeroom-mode";
- version = "20170228.1521";
+ version = "20170324.1514";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "writeroom-mode";
- rev = "f853350da848d0814f822587ae310e52d895f523";
- sha256 = "1al4ch96p0c8qf51pqv62nl3cwz05w8s2cgkxl01ff3l9y7qjsvz";
+ rev = "071ebbecf6bc9dc40c5d1a120a9aa3d27ddaa81b";
+ sha256 = "1w4bhp9b3jm6gqj4lvxbljr2xw05xldsxb8xaddj3ac82afq7kh5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode";
@@ -72223,12 +72597,12 @@
wttrin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
melpaBuild {
pname = "wttrin";
- version = "20160414.837";
+ version = "20170322.2041";
src = fetchFromGitHub {
owner = "bcbcarl";
repo = "emacs-wttrin";
- rev = "e2a02cc58920a4f34ba01f7015c9e6bfcce51f61";
- sha256 = "1bq552mxlhq9sd2c9p2yir52p0jnfdav6vcdgs3xklcf89b1403m";
+ rev = "00ae9ee54056b16bb20c5b35e6bd262e6bda7eb5";
+ sha256 = "09vxi1vm5vsh7q9dqjbya8qrrclwid8r2hq9ycc46mbhx5blyz45";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b2b6876562f1fadd4af1ea9b279ac4dc1b21660/recipes/wttrin";
@@ -73147,12 +73521,12 @@
yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yang-mode";
- version = "20170213.154";
+ version = "20170323.1104";
src = fetchFromGitHub {
owner = "mbj4668";
repo = "yang-mode";
- rev = "46c201b1d5195842fdf540d4c153127f91b1a125";
- sha256 = "0bfx6wsj8g6ryawxly17x2nppzcgg3bxpkx00ar1hgcrs11988kk";
+ rev = "0d5d5df86dbb6cbb2de3c0f2d0d5f8c8f29d0695";
+ sha256 = "0ca55vjv9lz7w8mk2z731bia9vialrd4kv0igi09xs1mm0r2x5nv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
@@ -73188,10 +73562,10 @@
}) {};
yaoddmuse = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "yaoddmuse";
- version = "20160717.2212";
+ version = "20170325.1752";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/yaoddmuse.el";
- sha256 = "0j73zkzk1iyxpxca6zvjwq5iig8a6la6hm6i5kwwnbc9c681acqx";
+ sha256 = "0vlllq3xmnlni0ws226pqxj68nshclbl5rgqv6y11i3yvzgiazr6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e7dcbe43b65944968a882705ff4b3b2c9f40b6d2/recipes/yaoddmuse";
@@ -73312,12 +73686,12 @@
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yasnippet";
- version = "20170310.1724";
+ version = "20170326.1030";
src = fetchFromGitHub {
owner = "joaotavora";
repo = "yasnippet";
- rev = "7f337f4488da6e3ea4b92057ca1576d17bc51743";
- sha256 = "0g1irdas5vvzjfrzvvzpz7kii52smn4aa58s6v10kchppxrrikzc";
+ rev = "5043a961215158619199cf03a85a0c063a28c644";
+ sha256 = "145v9fvfm1yldr7k02d1lk3sgycs2j8zg9d8zmz7g7b9lghkp6fk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -73415,12 +73789,12 @@
ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
melpaBuild {
pname = "ycmd";
- version = "20170227.2341";
+ version = "20170329.1433";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a";
- sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c";
+ rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79";
+ sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -74048,11 +74422,11 @@
zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
melpaBuild {
pname = "zpresent";
- version = "20170307.1646";
+ version = "20170326.1630";
src = fetchhg {
url = "https://bitbucket.com/zck/zpresent.el";
- rev = "f79f9e8247da";
- sha256 = "0mdajrwwcfgy6g330ca3s6a240wnj56ryag6h2ghwwclzy81nwdc";
+ rev = "ef1de4ed0def";
+ sha256 = "1fb7n64wj1b6s5vm43i9xharbbfx9r97fzshmjfhik8vsjc7k4c5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index e63c11a9da5..488699f8a79 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -860,6 +860,27 @@
license = lib.licenses.free;
};
}) {};
+ add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "add-node-modules-path";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "codesuki";
+ repo = "add-node-modules-path";
+ rev = "9ed240e05dcb9628ba380151b54b02688be5e78e";
+ sha256 = "0avv3ypdpscchq9n1lxs0ba0fc52zjyv7dbv54s7sclqxx4mi63k";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path";
+ sha256 = "0gbl875fgqr5np6r4cs8njs6fil1qmy8a5wir88x78ybdwwxsmbl";
+ name = "add-node-modules-path";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/add-node-modules-path";
+ license = lib.licenses.free;
+ };
+ }) {};
adoc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markup-faces, melpaBuild }:
melpaBuild {
pname = "adoc-mode";
@@ -1166,12 +1187,12 @@
android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "android-mode";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "remvee";
repo = "android-mode";
- rev = "146476c5ae958715520bec2b7f8de6b30c48c19f";
- sha256 = "0gjynmzqlqz0d57fb4np6xrklqdn11y4vjbm18rlpvmk92bgw740";
+ rev = "f274da87429617b0b9c5889d46b36de64d982da4";
+ sha256 = "17m4hp2qb54widwadv23amc1lasnbwzh2ipc6180fnajg8zcbvyw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode";
@@ -1480,12 +1501,12 @@
anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "anything-tramp";
- version = "0.2";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-anything-tramp";
- rev = "75df15ac263701f921649fefb29f03f6b7d49b9f";
- sha256 = "0al2k5az5x6idnhkhckjxr4vh52f0n9fi20ranwid9ac8k6kspvz";
+ rev = "ca9d94c2a55c3cbbcc77b6818cc386dbd2f36d39";
+ sha256 = "0j1fm1ngd9vg3qrv9ks53ha9aijnl6mvx2sxsvlvn1libg7ym3zz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp";
@@ -2452,12 +2473,12 @@
beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "beginend";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "beginend";
- rev = "de3833a1a651532e76df668bd92cfa07893501f1";
- sha256 = "1agrci37bni1vfkxg171l53fvsnjdryhf05v54wj07jngnwf3cw9";
+ rev = "9c6ad190ecc71373f6ac7485c924f1ef3dce6fc4";
+ sha256 = "05z23amn1s1692y3wzwmbzpnm5m6qskq53aqp47wiyyxn3dq2kdj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -2764,22 +2785,22 @@
license = lib.licenses.free;
};
}) {};
- boxquote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "boxquote";
- version = "1.22";
+ version = "2.0";
src = fetchFromGitHub {
owner = "davep";
repo = "boxquote.el";
- rev = "4c49b2046647ed187920c885e175ed388f4833dc";
- sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
+ rev = "b0239fb7b7a9d75d4ac3c66f9b96abd911dbf4e0";
+ sha256 = "0agnsghxf35b6g49radxigw81bmvw1ggljzzmy771nmwl44q2dbb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote";
sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
name = "boxquote";
};
- packageRequires = [];
+ packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/boxquote";
license = lib.licenses.free;
@@ -3061,12 +3082,12 @@
buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buttercup";
- version = "1.5";
+ version = "1.6";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "emacs-buttercup";
- rev = "657acef2132a6fdf0796f8ec62c5f261c1beebf0";
- sha256 = "0wkivh8x75gfsks6hy1ps9mlk101hrwsk8hqxx7qhs7f5iv0a082";
+ rev = "c95b95fe8d93eeed510c281990842718a21e53b3";
+ sha256 = "077hxzichvr406m9grdxjf31k0l33g6wh9zdvx73f7crsmzxhkzy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -4185,12 +4206,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
- version = "3.8.0pre2";
+ version = "3.8.0pre3";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "e1adec32b8325fb731da084e99acd6070f5e39bf";
- sha256 = "08illrxn9jks2z8yj7kczy65k7q3dkifima6j706kz8vjza60ikm";
+ rev = "3b7f19a72ff2216b4613fdc8c5edf5d56e74d6fc";
+ sha256 = "0da0ywk6bxr78hiy34m7yf0fwvir2v2hvdmspai8n8kcnlcinkyw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -4434,22 +4455,22 @@
license = lib.licenses.free;
};
}) {};
- company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company";
- version = "0.9.2";
+ version = "0.9.3";
src = fetchFromGitHub {
owner = "company-mode";
repo = "company-mode";
- rev = "c9912e9ba7ef441677c1a9de7e14f78cb2da5e0e";
- sha256 = "1jc9mnqj38lnn3yxkcixlwgqkxb7lsyzqybakk74mh3l3gr9cv8k";
+ rev = "f1499404163d8148e7a6303a8598f9c0f696d1cb";
+ sha256 = "1ncfvf6ndqnn95m02ij66l7674h7chzgwg2r9biymqadzxjxim9i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
name = "company";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/company";
license = lib.licenses.free;
@@ -4968,12 +4989,12 @@
company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }:
melpaBuild {
pname = "company-ycmd";
- version = "1.0";
+ version = "1.1";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815";
- sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx";
+ rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590";
+ sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
@@ -7076,8 +7097,8 @@
version = "0.7";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "c4f10d72febc";
- sha256 = "0x9h38vs5vnvswp3dm3i2pdzw8rvqwxpsfpsjx7r84bww9nr9dyd";
+ rev = "6f4b44fb1966";
+ sha256 = "10d69aah8kq5ln3rcd2vcdck1vvqq5x47kk0bk4vpphh26j14jjp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -7258,6 +7279,27 @@
license = lib.licenses.free;
};
}) {};
+ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "easy-hugo";
+ version = "0.4.1";
+ src = fetchFromGitHub {
+ owner = "masasam";
+ repo = "emacs-easy-hugo";
+ rev = "8e8dde2ce96c9bf561bffa1ee0886cf9b87db370";
+ sha256 = "13jf3rps8s54pyxnmxdrxmza5jnyhzcixmqqw4vp4br3kay7lbrz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/544fa512dc3e6379f451fd9b596d74a5849c87d2/recipes/easy-hugo";
+ sha256 = "07pa48rv5aqpz7fwkbc48scvnvnvg1v3qkapn2h1qllfc0h2nn5i";
+ name = "easy-hugo";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/easy-hugo";
+ license = lib.licenses.free;
+ };
+ }) {};
easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-kill";
@@ -7366,12 +7408,12 @@
ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
melpaBuild {
pname = "ebib";
- version = "2.10.1";
+ version = "2.10.2";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "ebib";
- rev = "d415b91c91581ff39364384fec35c219cb89d43a";
- sha256 = "13283ymm4av2gk7zj2rsppg6sk0lixy9g4lic4arrm8b5yb0vcsd";
+ rev = "558097220099505994b7e9a2ea9e1208da6c5668";
+ sha256 = "1v9x69jzsfl7kh5nnbax218xykylz6ib0f73f9yrsjbmgap3fvva";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -11528,12 +11570,12 @@
flycheck-package = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, package-lint }:
melpaBuild {
pname = "flycheck-package";
- version = "0.11";
+ version = "0.12";
src = fetchFromGitHub {
owner = "purcell";
repo = "flycheck-package";
- rev = "cf561bf9896d3e7b6bdcdb7801de6cb9f548b573";
- sha256 = "124ahlxpkcb5mcndmg8k8rdxx0piis6372zllxk6ywmgxz9mlgy1";
+ rev = "afe8a49343d90d08ee72ac6f993d424dcc39cc38";
+ sha256 = "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package";
@@ -11714,15 +11756,36 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-yamllint";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "krzysztof-magosa";
+ repo = "flycheck-yamllint";
+ rev = "aa211b1243168a4f752888c0014c5b9d2da178b1";
+ sha256 = "1dg2lymb53vp16isdc6k0gq1a43h7vjpksbacskyd4nwmsxaf2bm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/932ee0a1f13a52d53102b90911da79145208cbb5/recipes/flycheck-yamllint";
+ sha256 = "1q2sy0hsbnwdlwq99wk8n5gi9fd8bs4jvi859np8bylbhhb3kj8m";
+ name = "flycheck-yamllint";
+ };
+ packageRequires = [ flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-yamllint";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
melpaBuild {
pname = "flycheck-ycmd";
- version = "1.0";
+ version = "1.1";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815";
- sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx";
+ rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590";
+ sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
@@ -15070,12 +15133,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "2.5.3";
+ version = "2.5.4";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "a7d4308604ae790ff568730f8a2f47e578209d3a";
- sha256 = "10xjdq8ch68c2ysfynrby9sxms23b5g2vmhjv8gv0vn15cc50ir5";
+ rev = "7a969880e7ea607517dbaa9d98da036fd9fec2fd";
+ sha256 = "0y9jg4xidb0f496fi30p1xjr73kg220qsjrzcr1i6p96qxr0qpfd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -15235,6 +15298,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-books = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-books";
+ version = "1.0.1";
+ src = fetchFromGitHub {
+ owner = "grugrut";
+ repo = "helm-books";
+ rev = "b4c57d2aed596faad41a753dccbcd0a31a717b76";
+ sha256 = "1yr5prp9xvd73balxbn4yn52zah2advq1186ba5aanj436pal0fh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/acba3db40f37e74e1bf9e30f2abed431c259ff50/recipes/helm-books";
+ sha256 = "0xh53vji7nsnpi0b38cjh97x26ryxk61mj7bd6m63qwh8dyhs3yx";
+ name = "helm-books";
+ };
+ packageRequires = [ helm ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-books";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-bundle-show";
@@ -15364,12 +15448,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "2.5.3";
+ version = "2.5.4";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "a7d4308604ae790ff568730f8a2f47e578209d3a";
- sha256 = "10xjdq8ch68c2ysfynrby9sxms23b5g2vmhjv8gv0vn15cc50ir5";
+ rev = "7a969880e7ea607517dbaa9d98da036fd9fec2fd";
+ sha256 = "0y9jg4xidb0f496fi30p1xjr73kg220qsjrzcr1i6p96qxr0qpfd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -15448,12 +15532,12 @@
helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-dired-history";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "jixiuf";
repo = "helm-dired-history";
- rev = "75416fa6ca9c5e113cca409ef63518266b4d8d56";
- sha256 = "17z84dx3z48mx2ssdhlhgzaqrxlzdy9mx3d14qlm0rcrmc0sck8i";
+ rev = "9480383b6ccede6f7c200fbd50aaeb2898b3a008";
+ sha256 = "0cfq06lray7hpnhkwnhjq18izyk2w0m4cxqg0m5nyidiwc4qssqa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history";
@@ -16435,12 +16519,12 @@
helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-tramp";
- version = "0.2";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-helm-tramp";
- rev = "87d323306a79bf5d71b0f556a7aefdfe5824f523";
- sha256 = "08rzgfzd70xf1hh54py325p9kf5war40qi5w21anzs4wwg86rz1v";
+ rev = "604e4630070ce2e345cbd21c2fbd8414eb064ef2";
+ sha256 = "09nbg890ppjvz1v2a3zcb198k1zq9gaa04ai4v3xynz6c3kvzyr9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
@@ -19813,12 +19897,12 @@
linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "linum-relative";
- version = "0.4";
+ version = "0.5";
src = fetchFromGitHub {
owner = "coldnew";
repo = "linum-relative";
- rev = "1074e12904d08e00dda438d9700f2a3bff238bd5";
- sha256 = "1m4g4b96cxs05pfln7kdi6gvrdbv76f8dk806py5lq0gq7da2csc";
+ rev = "b8a99dcfe38a491172a8193053fb7849634b43c0";
+ sha256 = "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative";
@@ -21073,12 +21157,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "0.7.0";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "7a6e26ae74c86cc2afffc21de7567a63feb19a7d";
- sha256 = "1l23nj6fsnqf2xc766rnz5ib6578rvsbn0cdwmw5li6waqbzvla2";
+ rev = "1ddaca25ee978736dcb3922bb1952d750c39cd5a";
+ sha256 = "09g81d1l5mhji4vbljxgfrgr0051sv7kqy0vwf7awxa4slgl6bnd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -21531,6 +21615,27 @@
license = lib.licenses.free;
};
}) {};
+ mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+ melpaBuild {
+ pname = "mocha-snippets";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "cowboyd";
+ repo = "mocha-snippets.el";
+ rev = "e054137bd78f0d236e983874da1f345d30a71816";
+ sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets";
+ sha256 = "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds";
+ name = "mocha-snippets";
+ };
+ packageRequires = [ yasnippet ];
+ meta = {
+ homepage = "https://melpa.org/#/mocha-snippets";
+ license = lib.licenses.free;
+ };
+ }) {};
mocker = callPackage ({ eieio ? null, el-x, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mocker";
@@ -22479,12 +22584,12 @@
nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nix-mode";
- version = "1.11.7";
+ version = "1.11.8";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "13fe83dc8e28a32bdd454d04908fe1514ec50d51";
- sha256 = "1mddzphb0xbsa5ma83h3hmama77fvxxhwp5qbcrnwpihz1g1l5dv";
+ rev = "206b61b07405229979ed9a1518da1560930d05ee";
+ sha256 = "1qlddlzkpavhsrb7h3cyqhif5qc2qhkhjwnv4pbzg9hamqbd45wc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -22581,6 +22686,27 @@
license = lib.licenses.free;
};
}) {};
+ nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nord-theme";
+ version = "0.1.2";
+ src = fetchFromGitHub {
+ owner = "arcticicestudio";
+ repo = "nord-emacs";
+ rev = "5327be91c155eb9fed19061a0f02619dd4284c64";
+ sha256 = "15gjcrx514790djsyfmm8z8q36a3kyf4yhrms5qj423hfc94d3s7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
+ sha256 = "0p4fqg4i2ayimd8kxsqnb1xkapzhhxf7szxi1skva4dcym3z67cc";
+ name = "nord-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/nord-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "nose";
version = "0.1.1";
@@ -22955,6 +23081,27 @@
license = lib.licenses.free;
};
}) {};
+ obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "obfusurl";
+ version = "2.0";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "obfusurl.el";
+ rev = "fb7524fe8432bf58f0c4f637e5a12565ae81134e";
+ sha256 = "15w8cnwl4hpcslfbmb3j81gbr2dvp0xra2z841503b26s5w91961";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl";
+ sha256 = "0xx2zsjbkd17iy7xzqc66f9xgc97f9js3nz656yhmmxakjk2krra";
+ name = "obfusurl";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/obfusurl";
+ license = lib.licenses.free;
+ };
+ }) {};
ocodo-svg-modelines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, svg-mode-line-themes }:
melpaBuild {
pname = "ocodo-svg-modelines";
@@ -23151,8 +23298,8 @@
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "d6a00ff463f53f7357fd7ffbad95accdc8d1c367";
- sha256 = "0zq0rn1vbwmhr4z5dcgd5k9kslq3xxl05jiyab8835nfacb0zdf2";
+ rev = "bcc5d7ba940c1118ab61071783747162f0c927cf";
+ sha256 = "05i3z6whvgq81qnrwgvfglhwi214145ksg8h81rc0g4ir54wzsik";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@@ -23408,12 +23555,12 @@
org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-board";
- version = "1000";
+ version = "1011";
src = fetchFromGitHub {
owner = "scallywag";
repo = "org-board";
- rev = "ed62187790f415a006194f69bf86c6ca6959b2e4";
- sha256 = "0kh32xkqiy4bh72mykswpi20x1fvr6m7751d4lnjczx836ncmggy";
+ rev = "53469a2f0577924de1c7d887fecea409d17fd588";
+ sha256 = "0fg7lkgcr7zwwjald7hbvwgl72m21lqxmz7p8sq31iw3jh42fqgf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -23910,12 +24057,12 @@
org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-random-todo";
- version = "0.4.1";
+ version = "0.5";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-random-todo";
- rev = "7398b8dff09bef54f579d158ce47b0090f00201e";
- sha256 = "1bi09hd5m994rkqcx0a045h20419b6n4vvwiiggzsi0723dd9fb9";
+ rev = "14a065e1d376838f16a6ba32ed8710304542a4e6";
+ sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
@@ -24739,12 +24886,12 @@
package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-lint";
- version = "0.3";
+ version = "0.4";
src = fetchFromGitHub {
owner = "purcell";
repo = "package-lint";
- rev = "93fdd7b51ad7456387b905ff4c9b104d0b3089a8";
- sha256 = "17swzcd58zh7yf221pfk8pmz8yhx2dsi2ad1y6lb2xpxxc5csflm";
+ rev = "de08b846b3a031838b79445bb7a254c9de4a80f6";
+ sha256 = "0mvs4afjp5ab89vdz3bd9pca55brn57lxvjqjjyc6cyqxpclh06j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -25094,12 +25241,12 @@
parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "parsebib";
- version = "2.0.3";
+ version = "2.2";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "parsebib";
- rev = "748d6a179fcbbc4af77c7b96059a66d579f34dc8";
- sha256 = "0f8rcifzfp4fs52pjgfly39vqz54kgjb3yqyxlh4adq12zbq11cd";
+ rev = "621a87d444d9b9c479221fffcd8f7cb5ce2f7717";
+ sha256 = "14rvqjd24xwp2pvl4r00jvhvq7p2wndpz3yy1ml9yymkkn1p1hnh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib";
@@ -26203,12 +26350,12 @@
popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }:
melpaBuild {
pname = "popup-imenu";
- version = "0.5";
+ version = "0.6";
src = fetchFromGitHub {
owner = "ancane";
repo = "popup-imenu";
- rev = "540e8c0473fd50ff0a85c870057e397a0d3c5eb5";
- sha256 = "19mqzfpki2zlnibp2vzymhdld1m20jinxwgdhmbl6zdfx74zbz7b";
+ rev = "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09";
+ sha256 = "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca5d65d6a9c7ef3fa2684271fe087dc132d3a61/recipes/popup-imenu";
@@ -26724,6 +26871,27 @@
license = lib.licenses.free;
};
}) {};
+ protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "protocols";
+ version = "1.6";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "protocols.el";
+ rev = "f5549f5d873a683af45a0e19c732524d5b964026";
+ sha256 = "0v9is6r307814gvrnch2d3mvikd7j8lnmsqb2c3gj6gvfj4p9y7r";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols";
+ sha256 = "1wg3qh8a1ms82lkzz4i1bk787147a8agcj8rszj1zfvwg0ckqq1a";
+ name = "protocols";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/protocols";
+ license = lib.licenses.free;
+ };
+ }) {};
psci = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }:
melpaBuild {
pname = "psci";
@@ -28008,12 +28176,12 @@
resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "resize-window";
- version = "0.4.0";
+ version = "0.5";
src = fetchFromGitHub {
owner = "dpsutton";
repo = "resize-window";
- rev = "27364959798de0f019da799975027842c07e7829";
- sha256 = "0x92s4cv9k566rc248zrcmh507df7d19p7b3vcfd0dlfpbqc0qnv";
+ rev = "e4879731f3a3bc2261d6ec465bff01f88bd77d1d";
+ sha256 = "0lhf1sk1gx0vpy038bdnmlqjzpg4kchlladihk36pv4hgqn5r9w7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window";
@@ -28365,12 +28533,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "2.8";
+ version = "2.9";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "6ac7740eaf05cdd9b699185f71cc2d1f634a761b";
- sha256 = "1w506qaklrly1lnq1i5kshl8m9aki8h2ba1y7h578gwx6lph3vhi";
+ rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936";
+ sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -28810,8 +28978,8 @@
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-scala-mode";
- rev = "730e16d254478d6f63f62cb04d47c137c9002f2d";
- sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9";
+ rev = "970d88eeff82df635ee12336ab1eb185585f30c6";
+ sha256 = "0wfv20dyb13v7fbfsvy0k5dajvmyyhn80l6xyx6kppiv3qmy9s90";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -29032,6 +29200,27 @@
license = lib.licenses.free;
};
}) {};
+ services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "services";
+ version = "1.7";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "services.el";
+ rev = "514e4095e8964c4d0f38c4f3ad6c692e86d12faa";
+ sha256 = "1k6w2ghi1iczh65bbln5ryxwnxmkkjm3p0p54s155q9sjidiqlwb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services";
+ sha256 = "02lgmpbw52ps6z4p9gwzvh9iaxisq5mb0n9aml9ajxac1473vpcd";
+ name = "services";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/services";
+ license = lib.licenses.free;
+ };
+ }) {};
session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "session";
@@ -29077,12 +29266,12 @@
sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sexy-monochrome-theme";
- version = "2.0";
+ version = "2.1";
src = fetchFromGitHub {
owner = "nuncostans";
repo = "sexy-monochrome-theme";
- rev = "436206eef592ca22e4c3e0cd3bd87a1fba4083a1";
- sha256 = "0aaicpiihrd5ny2g68cpkasysyx5wj28gs727qwdqw3ljpc0qlz9";
+ rev = "d74cf7a50852c469ad13c634df74be2fcb3f3a96";
+ sha256 = "14va3sy94vpkn4fc9g7gsxk3anl25jvp9a92c8ppndqzfisy7vgg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme";
@@ -30064,12 +30253,12 @@
snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }:
melpaBuild {
pname = "snapshot-timemachine-rsnapshot";
- version = "0.3";
+ version = "0.4";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "snapshot-timemachine-rsnapshot";
- rev = "4ff6b96219f4da576141e376b0348813c1c25615";
- sha256 = "0krb1ziyjldyq27sp0phmygm1p9lssp251ycj08gdczbbfpw4lsa";
+ rev = "72b0b700d80f1a0442e62bbbb6a0c8c59182f97f";
+ sha256 = "1bdy7p0bjfdlv6l6yih6fvvi7xpldal4rj8l2ajpc6sgby24h8bb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot";
@@ -31947,6 +32136,27 @@
license = lib.licenses.free;
};
}) {};
+ thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "thinks";
+ version = "1.10";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "thinks.el";
+ rev = "370d399703d232010599d24a242b5f91e25a1b9d";
+ sha256 = "1kac32mgk2gcchh9lvnny81xq03h4656v05xyd3fpkpr30sisyrq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
+ sha256 = "11vj9mjfzmqwdmkq97aqns3fh8hkgx9scnki6c2iag5lj0av2vcq";
+ name = "thinks";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/thinks";
+ license = lib.licenses.free;
+ };
+ }) {};
thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "thrift";
@@ -32031,6 +32241,27 @@
license = lib.licenses.free;
};
}) {};
+ timonier = callPackage ({ all-the-icons, dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pkg-info, request, s }:
+ melpaBuild {
+ pname = "timonier";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "nlamirault";
+ repo = "timonier";
+ rev = "33ca5887a1d1b63349177237e9edfb73546511a5";
+ sha256 = "0z6s26kc50rbmgkkbxzpasphi8hcwhixmi8ksqzrclayccjjj7ar";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a31b0c177fd83bdeb1842a6ec3095de143bb4eae/recipes/timonier";
+ sha256 = "0vb83kv2dkca2bq876icxs8iivv9qgkzmzrsxfpnvbv752b220b0";
+ name = "timonier";
+ };
+ packageRequires = [ all-the-icons dash hydra pkg-info request s ];
+ meta = {
+ homepage = "https://melpa.org/#/timonier";
+ license = lib.licenses.free;
+ };
+ }) {};
toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "toc-org";
@@ -32666,6 +32897,27 @@
license = lib.licenses.free;
};
}) {};
+ uptimes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "uptimes";
+ version = "3.1";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "uptimes.el";
+ rev = "5e321692bf5ccdc286f4831fa8fe55467c1c56aa";
+ sha256 = "04n4bryfid6scma43whw156wcza77ij7szgc5f73d98j9fji6lay";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
+ sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h";
+ name = "uptimes";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/uptimes";
+ license = lib.licenses.free;
+ };
+ }) {};
use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "use-package";
@@ -32918,27 +33170,6 @@
license = lib.licenses.free;
};
}) {};
- vimgolf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "vimgolf";
- version = "0.10.0";
- src = fetchFromGitHub {
- owner = "timvisher";
- repo = "vimgolf";
- rev = "9fd8aaf68bc69d1dd628de4c7cbb070e366545a9";
- sha256 = "1f94qx8rbnn21cl0grxqa9gzkbrz68vmqsihv8vvi8qf1c1dmd0i";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0bded518d1544a9442c13c5cbfab64f0f1cbdb6d/recipes/vimgolf";
- sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
- name = "vimgolf";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/vimgolf";
- license = lib.licenses.free;
- };
- }) {};
vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vimish-fold";
@@ -33152,12 +33383,12 @@
wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
melpaBuild {
pname = "wandbox";
- version = "0.6.0";
+ version = "0.6.2";
src = fetchFromGitHub {
owner = "kosh04";
repo = "emacs-wandbox";
- rev = "70728ba1bfa425dee7a66fd86c7bbf2747b2514c";
- sha256 = "1nx7cr7d4qmzwbvp59kc8139nzc965ibc9vf7afrz8z2h5qg4d4l";
+ rev = "4e52c14aca11de4686d4f1de98588cb5cf42d815";
+ sha256 = "1c9wvnc8nqizh5sw424hznnqymfcyqdgdj8gzwfy5i04mi7mic4p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox";
@@ -33341,12 +33572,12 @@
webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "webpaste";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "etu";
repo = "webpaste.el";
- rev = "58f66efcb8f061d25bf474b14f3867ae856f6b1d";
- sha256 = "0qczw7pdkjgqmjibwyw8psxhqy1bx183qzni832qx59sds15j13q";
+ rev = "f6583397a4f8c9cde6b556175a6e05303d6238de";
+ sha256 = "0z7pkqfli1lqvfjjaf8p1sbbwf0f7xgz87k3rqqav9xyc9iqh0ni";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -33785,8 +34016,8 @@
version = "0.9.1";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "3447d48e8562";
- sha256 = "1qym4wfcr3hiq0a1z3myvzalblwwp5xalq9sjx090w3ag3ghgjrg";
+ rev = "c5c0bb98b281";
+ sha256 = "0gxvx2n6xza17qf1p4v0nbcqfkkhrmg9a56c5d126b4vgmg3bf9v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -34493,12 +34724,12 @@
ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
melpaBuild {
pname = "ycmd";
- version = "1.0";
+ version = "1.1";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815";
- sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx";
+ rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590";
+ sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 90812fb802c..34729783cce 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -4,8 +4,10 @@
}:
stdenv.mkDerivation rec {
- emacsName = "emacs-25.1";
- name = "${emacsName}-mac-6.1";
+ emacsVersion = "25.1";
+ emacsName = "emacs-${emacsVersion}";
+ macportVersion = "6.1";
+ name = "emacs-mac-${emacsVersion}-${macportVersion}";
builder = ./builder.sh;
@@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
};
macportSrc = fetchurl {
- url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
+ url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
sha256 = "1zwxh7zsvwcg221mpjh0dhpdas3j9mc5q92pprf8yljl7clqvg62";
};
@@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
postUnpack = ''
mv $sourceRoot $name
- tar xzf $macportSrc
+ tar xzf $macportSrc -C $name --strip-components=1
mv $name $sourceRoot
# extract retina image resources
@@ -92,8 +94,8 @@ stdenv.mkDerivation rec {
extensions are distributed with GNU Emacs; others are available
separately.
- This is "Mac port" addition to GNU Emacs 24. This provides a native
- GUI support for Mac OS X 10.4 - 10.11. Note that Emacs 23 and later
+ This is "Mac port" addition to GNU Emacs 25. This provides a native
+ GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later
already contain the official GUI support via the NS (Cocoa) port for
Mac OS X 10.4 and later. So if it is good enough for you, then you
don't need to try this.
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 6ea5590106b..e298385f793 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -172,12 +172,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2016.3.5";
+ version = "2017.1";
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "0v5wxjbzrax688knjsf7xd956i8pq5i4svkgnrrc4s390f0ixnl5";
+ sha256 = "0pfsf7ykwixvljcmrv4gldaaflf13brch70cd6xpax0m89vm22vm";
};
wmClass = "jetbrains-idea-ce";
};
@@ -208,12 +208,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2016.3.4";
+ version = "2017.1";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
- sha256 = "1ichjrdmnhyqv9cr73d8kif9l53k3x36i8js8nf9cmkbhdsfckn3";
+ sha256 = "1858jhmyyb7nhx08yxbn5bfgx9m32r8yqwjxjw17rf8gnfvs8225";
};
wmClass = "jetbrains-idea";
};
@@ -256,36 +256,36 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2016.3.2";
+ version = "2017.1";
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "0fag5ng9n953mnf3gmxpac1icnb1qz6dybhqwjbr13qij8v2s2g1";
+ sha256 = "14p6f15n0927awgpsdsdqgmdfbbwkykrw5xggz5hnfl7d05i4sb6";
};
wmClass = "jetbrains-pycharm-ce";
};
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2016.3.2";
+ version = "2017.1";
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "1nylq0fyvix68l4dp9852dak58dbiamjphx2hin087cadaji6r63";
+ sha256 = "1rvic3njsq480pslhw6rxld7jngchihkplq3dfnmkr2h9gx26lkf";
};
wmClass = "jetbrains-pycharm";
};
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2016.3.2";
+ version = "2017.1";
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "05ylhpn1mijjphcmv6ay3123xp72yypw19430dgr8101zpsnifa5";
+ sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm";
};
wmClass = "jetbrains-phpstorm";
};
@@ -304,12 +304,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2016.3.3";
+ version = "2017.1";
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "08f266afi8ia5jvvgk2lncra2n3i0l5c3h7c8fwxz6y8fhhlas4y";
+ sha256 = "e651ad78ff9de92bb5b76698eeca1e02ab0f0c36209908074fa4a6b48586071c";
};
wmClass = "jetbrains-webstorm";
};
diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix
index 0de33d6d194..b553e09ed5e 100644
--- a/pkgs/applications/editors/notepadqq/default.nix
+++ b/pkgs/applications/editors/notepadqq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, which, qtbase }:
+{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }:
let
version = "0.53.0";
@@ -12,11 +12,11 @@ in stdenv.mkDerivation {
};
nativeBuildInputs = [
- pkgconfig which
+ pkgconfig which qttools
];
buildInputs = [
- qtbase.qtsvg qtbase.qtwebkit qtbase.qttools
+ qtbase qtsvg qtwebkit
];
preConfigure = ''
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index a92f8633c3a..3031fa1cb0c 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,24 +2,24 @@
makeWrapper, libXScrnSaver }:
let
- version = "1.10.0";
- rev = "49129d126e2c3c5592cfc8a509d872067b69d262";
+ version = "1.10.2";
+ rev = "8076a19fdcab7e1fc1707952d652f0bb6c6db331";
channel = "stable";
# The revision can be obtained with the following command (see https://github.com/NixOS/nixpkgs/issues/22465):
# curl -w "%{url_effective}\n" -I -L -s -S https://vscode-update.azurewebsites.net/latest/linux-x64/stable -o /dev/null
- sha256 = if stdenv.system == "i686-linux" then "14ip00ysnn6daw7ws3vgnhib18pi7r1z1szfr7s996awbq12ir3i"
- else if stdenv.system == "x86_64-linux" then "1krrshsx2pjkr4pc1d6zad664f5khdbhwaq8lpx1aagxxd921mx6"
- else if stdenv.system == "x86_64-darwin" then "1y574b4wpkk06a36clajx57ydj7a0scn2gms4070cqaf0afzy19f"
+ sha256 = if stdenv.system == "i686-linux" then "1rhwrpv17c8j06qja7i58cggzka8jm9v9h27jy22z30yxjz0p241"
+ else if stdenv.system == "x86_64-linux" then "1c1w7wc39a5vdap8j143ym976p9l9iwns1y28mcgjwrihdlb5wb8"
+ else if stdenv.system == "x86_64-darwin" then "1zznsn84k79lqirzv950q7caq7c88yh2gglwjc11y8k69awmlpva"
else throw "Unsupported system: ${stdenv.system}";
urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/";
urlStr = if stdenv.system == "i686-linux" then
- urlBase + "code-${channel}-code_${version}-1488384152_i386.tar.gz"
+ urlBase + "code-${channel}-code_${version}-1488982317_i386.tar.gz"
else if stdenv.system == "x86_64-linux" then
- urlBase + "code-${channel}-code_${version}-1488387854_amd64.tar.gz"
+ urlBase + "code-${channel}-code_${version}-1488981323_amd64.tar.gz"
else if stdenv.system == "x86_64-darwin" then
urlBase + "VSCode-darwin-${channel}.zip"
else throw "Unsupported system: ${stdenv.system}";
@@ -47,17 +47,22 @@ in
then [ unzip makeWrapper libXScrnSaver ]
else [ makeWrapper libXScrnSaver ];
- installPhase = ''
- mkdir -p $out/lib/vscode $out/bin
- cp -r ./* $out/lib/vscode
- ln -s $out/lib/vscode/code $out/bin
+ installPhase =
+ if stdenv.system == "x86_64-darwin" then ''
+ mkdir -p $out/lib/vscode $out/bin
+ cp -r ./* $out/lib/vscode
+ ln -s $out/lib/vscode/Contents/Resources/app/bin/code $out/bin
+ '' else ''
+ mkdir -p $out/lib/vscode $out/bin
+ cp -r ./* $out/lib/vscode
+ ln -s $out/lib/vscode/code $out/bin
- mkdir -p $out/share/applications
- cp $desktopItem/share/applications/* $out/share/applications
+ mkdir -p $out/share/applications
+ cp $desktopItem/share/applications/* $out/share/applications
- mkdir -p $out/share/pixmaps
- cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
- '';
+ mkdir -p $out/share/pixmaps
+ cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
+ '';
postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''
patchelf \
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index a8f38d61f9d..8d8e36a8bc8 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Gnome Diagram drawing software";
homepage = http://live.gnome.org/Dia;
- maintainers = with stdenv.lib.maintainers; [raskin urkud];
+ maintainers = with stdenv.lib.maintainers; [raskin];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index 2ce1ebb257d..85c0f58174a 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
description = "A portable DjVu viewer and browser plugin";
license = licenses.gpl2;
platforms = platforms.unix;
- maintainers = [ maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch b/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch
new file mode 100644
index 00000000000..dd375143277
--- /dev/null
+++ b/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch
@@ -0,0 +1,36 @@
+# HG changeset patch
+# User Bob Friesenhahn
+# Date 1487905610 21600
+# Node ID 6156b4c2992d855ece6079653b3b93c3229fc4b8
+# Parent 0392c4305a4369984ec8069055acc470c0a73647
+Fix out of bounds access when reading CMYKA tiff which claims wrong samples/pixel.
+
+diff -r 0392c4305a43 -r 6156b4c2992d coders/tiff.c
+--- a/coders/tiff.c Sun Jan 29 10:04:57 2017 -0600
++++ b/coders/tiff.c Thu Feb 23 21:06:50 2017 -0600
+@@ -1230,8 +1230,8 @@
+ case 0:
+ if (samples_per_pixel == 1)
+ *quantum_type=GrayQuantum;
+- else
+- *quantum_type=RedQuantum;
++ else
++ *quantum_type=RedQuantum;
+ break;
+ case 1:
+ *quantum_type=GreenQuantum;
+@@ -1411,12 +1411,12 @@
+ }
+ else
+ {
+- if (image->matte)
++ if (image->matte && samples_per_pixel >= 5)
+ {
+ *quantum_type=CMYKAQuantum;
+ *quantum_samples=5;
+ }
+- else
++ else if (samples_per_pixel >= 4)
+ {
+ *quantum_type=CMYKQuantum;
+ *quantum_samples=4;
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index f655979c2cc..0858dfba8b4 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation {
url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-7/debian/patches/CVE-2016-9830.patch";
sha256 = "0qh15sd7nx7vf9sld4453iml951bwsx2fx84hxc7plhds2k3gjpa";
})
+ ./cmyka-bounds.patch
];
configureFlags = [
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index 118630e9608..b7672a39d0d 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
+{ stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
, qtbase, qmakeHook, mesa_glu
}:
@@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "0a0sqf6h227zalh0jrz6jpm8iwji7q3i31plqk76i4qm9vsgrhir";
};
+ patches = [
+ (fetchurl {
+ url = "https://github.com/GilesBathgate/RapCAD/commit/278a8d6c7b8fe08f867002528bbab4a6319a7bb6.patch";
+ sha256 = "1vvkyf0wg79zdzs5zlggfrr1lrp1x75dglzl0mspnycwldsdwznj";
+ name = "disable-QVector-qHash.patch";
+ })
+ ];
+
nativeBuildInputs = [ qmakeHook ];
buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ];
diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix
index 39db1dd1f6d..023008183ff 100644
--- a/pkgs/applications/graphics/vimiv/default.nix
+++ b/pkgs/applications/graphics/vimiv/default.nix
@@ -68,5 +68,6 @@ python3Packages.buildPythonApplication rec {
description = "An image viewer with Vim-like keybindings";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
+ broken = true;
};
}
diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix
index b4f01bc642b..2585b554548 100644
--- a/pkgs/applications/misc/audio/sox/default.nix
+++ b/pkgs/applications/misc/audio/sox/default.nix
@@ -9,6 +9,7 @@
, enableLibsndfile ? true, libsndfile ? null
# amrnb and amrwb are unfree, disabled by default
, enableAMR ? false, amrnb ? null, amrwb ? null
+, enableLibpulseaudio ? true, libpulseaudio ? null
}:
with stdenv.lib;
@@ -30,7 +31,8 @@ stdenv.mkDerivation rec {
optional enableFLAC flac ++
optional enablePNG libpng ++
optional enableLibsndfile libsndfile ++
- optionals enableAMR [ amrnb amrwb ];
+ optionals enableAMR [ amrnb amrwb ] ++
+ optional enableLibpulseaudio libpulseaudio;
meta = {
description = "Sample Rate Converter for audio";
diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix
index 0341ffc64af..d4c8b1ada6c 100644
--- a/pkgs/applications/misc/direwolf/default.nix
+++ b/pkgs/applications/misc/direwolf/default.nix
@@ -1,38 +1,43 @@
-{ stdenv, fetchFromGitHub, unzip, alsaLib }:
-let
- version = "1.2";
-in
+{ stdenv, fetchFromGitHub
+, espeak, alsaLib, perl
+, python }:
+
+with stdenv.lib;
+
stdenv.mkDerivation rec {
name = "direwolf-${version}";
- inherit version;
+ version = "1.3";
src = fetchFromGitHub {
owner = "wb2osz";
repo = "direwolf";
- rev = "8b81a32";
- sha256 = "0r4fgdxghh292bzhqshr7zl5cg2lfsvlgmy4d5vqcli7x6qa1gcs";
+ rev = version;
+ sha256 = "1x6vvl3fy70ic5pqvqsyr0bkqwim8m9jaqnm5ls8z8i66rwq23fg";
};
buildInputs = [
- unzip alsaLib
- ];
+ espeak perl python
+ ] ++ (optional stdenv.isLinux alsaLib);
patchPhase = ''
- substituteInPlace Makefile.linux \
- --replace "/usr/local" "$out" \
- --replace "/usr/share" "$out/share"
- '';
+ substituteInPlace Makefile.* \
+ --replace /usr/share $out/share
- preInstall = ''
- mkdir -p $out/bin
- '';
+ substituteInPlace dwespeak.sh \
+ --replace espeak ${espeak}/bin/espeak
+ '';
- meta = with stdenv.lib; {
+ installPhase = ''
+ mkdir -p $out/bin
+ make INSTALLDIR=$out install
+ '';
+
+ meta = {
description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway";
# On the page: This page will be disappearing on October 8, 2015.
- homepage = https://home.comcast.net/~wb2osz/site/;
+ homepage = https://github.com/wb2osz/direwolf/;
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = [ maintainers.the-kenny ];
};
}
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix
index 093382e13e6..6e158f5696c 100644
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/pkgs/applications/misc/djvulibre/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
description = "A library and viewer for the DJVU file format for scanned images";
homepage = http://djvu.sourceforge.net;
license = licenses.gpl2;
- maintainers = with maintainers; [ urkud ];
+ maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index 5c163fe8c44..7248fe2c875 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "emem";
- version = "0.2.47";
+ version = "0.2.48";
name = "${pname}-${version}";
inherit jdk;
src = fetchurl {
url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
- sha256 = "0hz862g7k42kik9vgzskqr99321llmmakl54ay9vsykvcxs632mx";
+ sha256 = "0l68qqjh8lbqb2yqvggiga9qz2j32h3qklcfkycmcffn6l1nlqnq";
};
phases = [ "buildPhase" "installPhase" ];
diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index 962d8f8b31f..d0b98863d20 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "exercism-${version}";
- version = "2.3.0";
+ version = "2.4.0";
goPackagePath = "github.com/exercism/cli";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "exercism";
repo = "cli";
rev = "v${version}";
- sha256 = "1zhvvmsh5kw739kylk0bqj1wa6vjyahz43dlxdpv42h8gfiiksf5";
+ sha256 = "1hl13sr4ymqg9sjhkxdmhf8cfw69cic3bysw34xfv2j6bjjxfwaa";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix
deleted file mode 100644
index b4e71d4bbc7..00000000000
--- a/pkgs/applications/misc/freicoin/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ fetchurl, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, qmake4Hook, unzip }:
-
-stdenv.mkDerivation rec {
- version = "0.8.3-1";
- name = "freicoin-${version}";
-
- src = fetchurl {
- url = "https://github.com/freicoin/freicoin/archive/v${version}.zip";
- sha256 = "0v3mh8a96nnb86mkyaylyjj7qfdrl7i9gvybh7f8w2hrl9paszfh";
- };
-
- # I think that openssl and zlib are required, but come through other
- # packages
- buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip qmake4Hook ];
-
- installPhase = ''
- mkdir -p $out/bin
- cp freicoin-qt $out/bin
- '';
-
- meta = {
- description = "Peer-to-peer currency with demurrage fee";
- homepage = "http://freicoi.in/";
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
- };
-}
diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix
index 5d5f83a2370..44071b32875 100644
--- a/pkgs/applications/misc/galculator/default.nix
+++ b/pkgs/applications/misc/galculator/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchurl
-, intltool, pkgconfig, gtk }:
+{ stdenv, fetchFromGitHub
+, autoreconfHook, intltool
+, gtk, pkgconfig, flex }:
stdenv.mkDerivation rec {
-
name = "galculator-${version}";
- version = "2.1.3";
+ version = "2.1.4";
- src = fetchurl {
- url = "mirror://sourceforge/galculator/${name}.tar.gz";
- sha256 = "12m7dldjk10lpkdxk7zpk98n32ci65zmxidghihb7n1m3rhp3q17";
+ src = fetchFromGitHub {
+ owner = "galculator";
+ repo = "galculator";
+ rev = "v${version}";
+ sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w";
};
- buildInputs = [ intltool pkgconfig gtk ];
+ nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
+ buildInputs = [ gtk flex ];
meta = with stdenv.lib; {
description = "A GTK 2/3 algebraic and RPN calculator";
diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index 7560a8bfeb4..d3ba5a97333 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -1,13 +1,14 @@
-{ fetchFromGitHub, lib, pythonPackages }:
+{ stdenv, lib, fetchFromGitHub, pythonPackages
+, libnotify ? null }:
pythonPackages.buildPythonApplication rec {
version = "3.4.0";
name = "gcalcli-${version}";
src = fetchFromGitHub {
- owner = "insanum";
- repo = "gcalcli";
- rev = "v${version}";
+ owner = "insanum";
+ repo = "gcalcli";
+ rev = "v${version}";
sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8";
};
@@ -20,12 +21,23 @@ pythonPackages.buildPythonApplication rec {
parsedatetime
six
vobject
- ] ++ lib.optional (!pythonPackages.isPy3k) futures;
+ ]
+ ++ lib.optional (!pythonPackages.isPy3k) futures;
+
+ # there are no tests as of 3.4.0
+ doCheck = false;
+
+ postInstall = lib.optionalString stdenv.isLinux ''
+ substituteInPlace $out/bin/gcalcli \
+ --replace "command = 'notify-send -u critical -a gcalcli %s'" \
+ "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'"
+ '';
meta = with lib; {
homepage = https://github.com/insanum/gcalcli;
description = "CLI for Google Calendar";
license = licenses.mit;
- maintainers = [ maintainers.nocoolnametom ];
+ maintainers = with maintainers; [ nocoolnametom ];
+ inherit version;
};
}
diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix
index 5026fea0e35..e691c79d85c 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/pkgs/applications/misc/gpscorrelate/default.nix
@@ -1,17 +1,22 @@
-{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk2
+{ fetchFromGitHub, stdenv, pkgconfig, exiv2, libxml2, gtk2
, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
stdenv.mkDerivation rec {
- name = "gpscorrelate-1.6.0";
+ name = "gpscorrelate-${version}";
+ version = "1.6.1";
- src = fetchurl {
- url = "http://freefoote.dview.net/linux/${name}.tar.gz";
- sha256 = "1j0b244xkvvf0i4iivp4dw9k4xgyasx4sapd91mnwki35fy49sp0";
+ src = fetchFromGitHub {
+ owner = "freefoote";
+ repo = "gpscorrelate";
+ rev = version;
+ sha256 = "1z0fc75rx7dl6nnydksa578qv116j2c2xs1czfiijzxjghx8njdj";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig exiv2 libxml2 gtk2
- libxslt docbook_xsl docbook_xml_dtd_42
+ exiv2 libxml2 gtk2
+ libxslt docbook_xsl
+ docbook_xml_dtd_42
];
patchPhase = ''
@@ -19,7 +24,7 @@ stdenv.mkDerivation rec {
-es",^[[:blank:]]*prefix[[:blank:]]*=.*$,prefix = $out,g"
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A GPS photo correlation tool, to add EXIF geotags";
longDescription = ''
@@ -38,9 +43,8 @@ stdenv.mkDerivation rec {
one takes the GPS data in a different format.
'';
- license = stdenv.lib.licenses.gpl2Plus;
-
- homepage = http://freefoote.dview.net/linux_gpscorr.html;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl2Plus;
+ homepage = https://github.com/freefoote/gpscorrelate;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix
index 028e5d6b725..fa2ac38d383 100644
--- a/pkgs/applications/misc/iterm2/default.nix
+++ b/pkgs/applications/misc/iterm2/default.nix
@@ -2,16 +2,19 @@
stdenv.mkDerivation rec {
name = "iterm2-${version}";
- version = "3.0.4";
+ version = "3.0.14";
src = fetchFromGitHub {
owner = "gnachman";
repo = "iTerm2";
rev = "v${version}";
- sha256 = "0ffg9l2jvv503h13nd5rjkn5xrahswcqqwmm052qzd6d0lmqjm93";
+ sha256 = "03m0ja11w9910z96yi8fzq3436y8xl14q031rdb2w3sapjd54qrj";
};
patches = [ ./disable_updates.patch ];
+ postPatch = ''
+ sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj
+ '';
makeFlagsArray = ["Deployment"];
installPhase = ''
mkdir -p "$out/Applications"
diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
index bda64765941..072685b8194 100644
--- a/pkgs/applications/misc/k3b/default.nix
+++ b/pkgs/applications/misc/k3b/default.nix
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "CD/DVD Burning Application for KDE";
license = licenses.gpl2Plus;
- maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
+ maintainers = [ maintainers.sander maintainers.phreedom ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index c5bd9afd2cf..a5defaf5c29 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "keepassx-community-${version}";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = "${version}";
- sha256 = "0ncc157xki1mzxfa41bgwjfsz5jq9sq750ka578lq61smyzh5lq6";
+ sha256 = "1zamk3dc44fn61b880i3l1r0np2sx2hs05cvcf2x4748r3xicacf";
};
cmakeFlags = optional (withKeePassHTTP) [ "-DWITH_XC_HTTP=ON" ];
diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index 8ce74850e1a..1137d6c07f6 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -21,7 +21,7 @@ let
homepage = http://www.krename.net;
description = "A powerful batch renamer for KDE";
inherit (kconfig.meta) platforms;
- maintainers = with maintainers; [ urkud peterhoeg ];
+ maintainers = with maintainers; [ peterhoeg ];
};
buildInputs = [ taglib exiv2 podofo ];
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index 75b2da6e8a2..ed74eae46f3 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
description = "Norton/Total Commander clone for KDE";
license = "GPL";
homepage = http://www.krusader.org;
- maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+ maintainers = with stdenv.lib.maintainers; [ sander ];
inherit (kdelibs4.meta) platforms;
};
}
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 3882f679cae..a1744f7a2c0 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
description = "An openstreetmap editor";
homepage = http://merkaartor.org/;
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric urkud];
+ maintainers = with stdenv.lib.maintainers; [viric];
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 2f894514c51..8bc4a22bc92 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, octoprint, pythonPackages }:
+{ stdenv, fetchFromGitHub, fetchpatch, octoprint, pythonPackages }:
let
buildPlugin = args: pythonPackages.buildPythonApplication (args // {
@@ -23,6 +23,11 @@ let
patches = [
./m33-fio-one-library.patch
+ # Fix incompatibility with new OctoPrint
+ (fetchpatch {
+ url = "https://github.com/foosel/M33-Fio/commit/bdf2422dee3fb8e53b33f087f734956c3b209d72.patch";
+ sha256 = "0jm415sx6d3m0z4gfhbnxlasg08zf3f3mslaj4amn9wbvsik9s5d";
+ })
];
postPatch = ''
diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix
new file mode 100644
index 00000000000..fa160c51fe2
--- /dev/null
+++ b/pkgs/applications/misc/stog/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocf, ptime,
+ uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, camlp4, omd
+}:
+
+stdenv.mkDerivation rec {
+ name = "stog-${version}";
+ version = "0.17.0";
+ src = fetchFromGitHub {
+ owner = "zoggy";
+ repo = "stog";
+ rev = "release-${version}";
+ sha256 = "06fnl3im0rycn05w39adfmm7w4s8l3jrj43h8f8h3b56grh21x0d";
+ };
+
+ buildInputs = [ ocaml camlp4 uutf ];
+ propagatedBuildInputs = [ findlib omd ppx_blob ocf ptime uri xtmpl ocaml_lwt higlo ];
+
+ createFindlibDestdir = true;
+
+ patches = [ ./install.patch ];
+
+ meta = with stdenv.lib; {
+ description = "XML documents and web site compiler";
+ homepage = "https://zoggy.github.io/stog/";
+ license = licenses.lgpl3;
+ platforms = ocaml.meta.platforms or [];
+ maintainers = with maintainers; [ regnat ];
+ };
+}
+
+
diff --git a/pkgs/applications/misc/stog/install.patch b/pkgs/applications/misc/stog/install.patch
new file mode 100644
index 00000000000..a2407d3079f
--- /dev/null
+++ b/pkgs/applications/misc/stog/install.patch
@@ -0,0 +1,18 @@
+diff --git a/src/Makefile b/src/Makefile
+index 736dd037..79a85b9c 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -431,11 +431,12 @@ install-lib:
+ install-share:
+
+ install-bin:
++ mkdir $(out)/bin
+ $(CP) $(MAIN) $(MAIN_BYTE) $(TMPL) $(TMPL_BYTE) \
+ $(SERVER) $(SERVER_BYTE) $(OCAML_SESSION) \
+ $(MK_STOG) $(MK_STOG_BYTE) $(MK_STOG_OCAML) \
+ $(LATEX2STOG) $(LATEX2STOG_BYTE) \
+- `dirname \`which $(OCAMLC)\``/
++ $(out)/bin
+
+ uninstall: uninstall-lib uninstall-share uninstall-bin
+
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 06aca4b58e3..69b14db7047 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -1,925 +1,925 @@
{
- version = "52.0.1";
+ version = "52.0.2";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ach/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ach/firefox-52.0.2.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "9005c3ebc0eebb7e1b29384e931ed5c2b888d0d55c8a3f34133dda908b82df0a437c5f2a6f91288396306e161fd82df2cca4f2c49685f898760b125b6d7743dd";
+ sha512 = "5fbb048cce8addbbf8b985920a44fcd2580a31ebead7f1c9029287245bcdefffbe6c73d887da08dc7ffcbbd1f35ac235af59cc900519b49eb6d741a610b4d538";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/af/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/af/firefox-52.0.2.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "8b5e3fba883af6b097ec61bb79d3e024e55c59e9f1c3f443f74e944b9b71d56ac8ce7199bbdabff06087e0082db618636d3fc832fdde926a35877046c7baf740";
+ sha512 = "e48997da8e26a95c479804b4dbe75d5513574f9301b264f8f28bb8e2b2982b5d69792a454239ea6e8c384e2e5015bb1842dde450411f0019e5f11e0e19eedc33";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/an/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/an/firefox-52.0.2.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "cf0949e99606dc9f961da9f8324f96f5873ea3f7fc0454aebbf982b43704ae71575371fc8bad84b036348f206e9112ef251a0939185f39d3f0ff15aa3dcccbc0";
+ sha512 = "18ad310dc853078f556af387afefb6a4adbfa9b3db1ac3a710963510ab0b40acceae50d79cd4d851b1c6d114bdf555f792fddeecb53e0e00bce3c9827dd2ebb0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ar/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ar/firefox-52.0.2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "202e602cea8fab71cf3b0cad522986904fa328e181599d7005e7668a115edc3eedc3d03a66eee3a3f2ff3b07b36b43394ab90e5ddd915c89550302c203ce0a27";
+ sha512 = "8cd1078dbba732b635dae123206b0c5c312fdc1cc9c77271f451670e45f54fc13cda66623d2d6bbf4d99b94c463fd35300ebf6372d0b7206c493966f5aaff7c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/as/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/as/firefox-52.0.2.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "9eaaad262dbe64e70d21b651f847abeac51c66fc9ee6116847440e4217dae28bbc28d54c8d90ec7e35dc614170c86fd66bbe4d7d4e26359769d3022c3b1194fe";
+ sha512 = "e11476e2b9da554583fb2b5c8ce47b4e96a8de888a10191822fb8afa646da260df8517b3109853d08f2dad591e40c3bf20ab2bb101ec3bdac480d87a68cb9d03";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ast/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ast/firefox-52.0.2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "93bbd1bffd278e0b9ad3f137bfaf28ba0defc95c7c9c646daf034be198051fff59e3905bac5fbddb7e6e4565e21424e0de7fa1d223ff9367d165877fcea88675";
+ sha512 = "a476386d83f4b0ac51d9b21c5fa2a9c0a0241a17334f090528a9115c83fcd2aca302ae03ad3263b894ed4f1bef5fc3fd07f33d06ec2be493175fae0c155579b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/az/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/az/firefox-52.0.2.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "a7a431a8d9aff2ed8dec35b60c0802825a69ced5de4683c006feaaf2f7e05c5d19f3944fa2598be2dc6b3013e6483a0897a5924d648a8663e2a7f2647d86d491";
+ sha512 = "da12bb98f708cc7c30005581e0c17c2af7231a61042e6a5b94b6b15c802dbb4d5cd34e8f6ccdd8f919a6f369b7bf76cefd637eda2529fe3cc29a33850174eba6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bg/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bg/firefox-52.0.2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "edf77b166ce81c45f823d1e672ad17b9da4fa598322110c57866d32366e4df99c5b61ad96a5dd6696c5c7af4d8af941d32eedaa4e998e3cdfec1fb7512e2e503";
+ sha512 = "2beb76258e0addde9d4e5e478830e8ca04816fc4ae4964e1a74b7dc919144b5b811b075b6a8808032c9f343ab2d74dca00c2d73f9fd9e8ea5d72078225f43227";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bn-BD/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bn-BD/firefox-52.0.2.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "97b39ab362e5c99be87408bf69ac25fa9385a6fa9131e0cb653ab04993e379de1624df6cede9862535cb301244ab16e8356c243ce15970a0e292317c84399426";
+ sha512 = "ec5133db8877cc50159fac7ecae02cc7c084ce1b8183f88e654355fcc0467b593d4a7099b100746bf26dfeece89a2764bb42a728b1dfde7e87a6140ca9674f5f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bn-IN/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bn-IN/firefox-52.0.2.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "8b49ee12c9e9516348268a595b51a808dedb505b94c35ac55e357046e9346998ccc2b94e7540a749dec2c87b3ad6be95dad2f00edf8873feacef2fed162bba2c";
+ sha512 = "5333c97ec057f5fa5323a82bc81b93511fb5770df9937b679085f9ccb02ac02d35800427ddc9ef3d009e4042b95926796a5cdfd8cad7608d150248ca8677905f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/br/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/br/firefox-52.0.2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "b464d2da9bb8a734974e35740c8609ceafc7b731feffdc250fb16d9210c895f582f9e3faac3f70484d76b8c37f435163d6b3d1c0f9c1388f9bd1f473eaad42fe";
+ sha512 = "d9259119132d42aa8eb8ac07378ec87e58b724173dcd0540ffedc116448dbf8f0abf51c438533ea6ec69b882a423c2fa8a65a448ffee05af5cefbe5b06837778";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bs/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bs/firefox-52.0.2.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "f323bfb8893c0899810e7f58ce72e569771de10e50d1f711a52df627bd074d95532d09bd9c3dc5579876ef32ba3302e3ec6799f7d8e93fa4830d6584d8a69e1b";
+ sha512 = "8afe61d4d2bdb40d21d0673569b6b0514c559e492c9a736e0ab56f5bf35f07dd727a5a11c049a0d3a1eed211584d511bbca2c5248a54ed43779183301c4b207d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ca/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ca/firefox-52.0.2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "717cba2c2f690051e60a71f74e0b33d7792ddcf574cf65388de6780bf9bed90c231187a39357332bd389be83279a3b00778a04149adfaefbb6a1047077ff886c";
+ sha512 = "7ef55d89c32e45cb84aa2568d053d0950dd0e0f448056a7c6b9dff55484e0b2a0a81183bcb7708a8f85e2fdafd794b846ba4672b447cf987f903df04617cad99";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cak/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/cak/firefox-52.0.2.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "53c5a18b593450cac1336b6b16767bde7e3feb8575a5f32e00f57963daaea6a14276679378dddbeed4bf729ce55e929670ff79a65e2b3bc2da882d19a4c750af";
+ sha512 = "341739dbddac50589949738376aafd039029b7e566d02d6beb71d00dcfb27eab8fc36129273eaae983bcfb0cfe0f266ea7e2b1613a95515b5ed129d0d13763c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cs/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/cs/firefox-52.0.2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "464b3b2d86256fa941a8cbbc04e68452961e8562194abc14e3e972a15ac7ccd59472e41e9a3c80ea92e5ddebaf2f56c6ff297efdfa25d3d9a892ce6d75612c14";
+ sha512 = "8a03c8f2487d853d3c662510d486a4349b5f1c94d8064f38291b231e7a4ee1b02ea58d22324cf6cbb2c02e490e49244d99a20f1cf432e2da0c882fdb5436e3a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cy/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/cy/firefox-52.0.2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "00fc374e844bc59793e60d7813c7c2a255d6fcd62994455eb55a014743bec81b2eb5fa31ba39219d1d7ecfc79751f62913b3dd786d62227bdfb030f7c2d24c3c";
+ sha512 = "d22710f178f69efad411f8619a618264ab8b678f3156f1ba8ed4c1c15fb9598f8cda42840837e0bf62024cd160b1b4bbe3002072852c007d905486dd04eec617";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/da/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/da/firefox-52.0.2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "d61608a98197a6c48bc38edbcdfa7cc821fba8221c16534ffe67e6a013e5b1ba23011c3524a8e8f2b07e6f5c86952854cadb4c8b8d04f945f2e6dbfb1fb4aeff";
+ sha512 = "ed130939217b4a2fcffa91ad7112a5485752baac2834adb30a2ee5915a905a3383fdbe651b268d0c245920d608de80a37dca01ca6380cb6aede5bbfd8dd757f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/de/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/de/firefox-52.0.2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "af188724c00163656584d8e28bab102ac3660353a6f78c703b9fa336f1996e7b3598144d0862e31de595b0b40d5345527dbd2c515009f93af9c4452f7faafd25";
+ sha512 = "a16eda9c74517026092169ec9caa4e13876760e9e05774c70fd4148653e0198ed000f9ff3f6dd4224b8aca5fd5fcdb7dd3bb60043f9d4c32d93909f879f35e16";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/dsb/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/dsb/firefox-52.0.2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "a15754dab9300b45db4369e84f5adad3231763d0de944c589ebb90789b80116233ad159f90ce6ab5275e6e53266e09b1095905fcbca3b857318608174a776a13";
+ sha512 = "9e379f2d6ceacb223e4255c0ca89a6c1f13ed877168a06fc76b181d8b4476e9eb51a3f25a3be9853239363bcdad91f50cf8b2abe67ff937ec73fbedad1d03630";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/el/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/el/firefox-52.0.2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "fbefdf3d5f155e726132eac8eb61e2f94352a5377502b9f56e128c386e7950b4a9718c1c50782ef2e98cb2e4c5bb4eeacc11f200ca36c97baa0ad0adbe14b9ed";
+ sha512 = "b62e72b5583b204d121ca8739f83c57aae4a39467d8d0f7b48f5bd894c69f3a9c8689d6840f5b0cf9bdff94b669fff520b2a3d4478fd6b35637eb2ff597e3fc5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-GB/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/en-GB/firefox-52.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "6d492447da62f9d0f759c67b50b88bad0346a9d932f3eea2959b105395488dceb2a773f51c3e75ca97fca4426c3110ce1209fbbed4900f9d7bab1d78e5ec6883";
+ sha512 = "48bd9c2281d5f87b694b06354e35090ee940eb81a3c2fc05c0bd84a312b96952bc627995359eabc43fe12da6f7879c86f2e85efb0cddca5b4bb9a7a1eb7b6842";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-US/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/en-US/firefox-52.0.2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "186ddb8b223a968c4a4364dd0ea6a1492149e2290056f3fda58a1436f37312374c1e07775244debecd1044eb51586f43b893b82add94971eacbc86414757c0fd";
+ sha512 = "f84b186c83e7cc3cc2bcab136029e299cfb4cbf89891f07a7f0c79584df18c914c24c51615e6bdb677571e194e964cd6d49cdf10f76f68f3b7b9bcaae50ceb3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-ZA/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/en-ZA/firefox-52.0.2.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "1aa8e9c6de59af862b0578b6ff44d3a0e98827c6ddb8ad31d4e6de3f26768b7e302252bb76a7c9c8e0494b49d820806b00d9d89c1618eb44d307bcece7345f01";
+ sha512 = "f7d93f3b87b7b544b8f9e216e44c1198664651e338cfca2ed80c0b1da58f5ebc4e3ddff846fc24817fc990bc0fc4e71dc9ccab7536fbf00038c89b74c9792ff4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/eo/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/eo/firefox-52.0.2.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "5f1b247a37d72c0587ade24f4f4a9fb79f25bd8395e5777524a877d0854cfbb921b62e07a4662d8992d02fc1de6c318d2e28cd3cbeef5ec26ee9f2ef25e87939";
+ sha512 = "48a53a09475afb8a869d132b7d0eb9a4a95b51fa5b67660bad0ef2b85fb5fbeab8f1b87b1b11292be1449735abad8905aa5a35e23c3f9d04b23f8abc775309a2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-AR/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-AR/firefox-52.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "e6f1f54b43da0740b14bed00b45db2ae2d23735cbf9baff26b5d828f2e20161b8527d10ac2c2a63351122b7d3f8a2ac4b0d546f136ad063b75eab7255b16ab29";
+ sha512 = "f95ab62d722f2c4417dae3d95e07bff50cd94db863988f6216234a2781711b5ad6479276b213abf470be174a8130ae5fb40cca79cffd67acbee6a6d583e5131a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-CL/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-CL/firefox-52.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "9cb2f8c9aac77caeff715e687d239d9a57567e079c61efeec5647eaa65bde141251285509ea066a4f8a053986119cdf731a6d7ba182660ade5e2948cdee0352d";
+ sha512 = "ec9ec0fd29ca215de08656582738d0f00206c38ae9d52516abe8499c107af8b85567b96bd71345deb9e8eda98ca16ea5a6e89fa87769e65aa43832011eb36abd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-ES/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-ES/firefox-52.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "21254e11b51050a422ba68ac9df14be6f7f672518a7473e874145f7ff07f9071ae315c0d7395940c38caa8735bf53242f63658f3c2a9cfe12320525e24ded2d1";
+ sha512 = "b84b43d975d5848355d10e88ee131ab85cf3bd4f2f48668d2d75752b7e5d517e9aaa32eb7a482d768f5bb9512dd79240f6ffa3947ce21c377f632ed2c6ad3bdc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-MX/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-MX/firefox-52.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "98629639d6f6cf4c59ef294dc6b1bc3677babaf9130506e940e288beb4253406862484f1a0953accd25ee10492a5bb3578bbf692b61e7ee36a0b238e7ce6f317";
+ sha512 = "dd6c3ea08ce626ce5ac6ea14bbbff373394da116d386714d9a5eb62a5ceb50975e2246ab30948569693b75fd5ae63adf7bd76e6b694601e7968ea8e5d5426b6d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/et/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/et/firefox-52.0.2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "affc635c93901437f078bc4bb07c7f22939429ad20e0ef5171ee53762fe31124115892d77519d6ff59f86d19170ba239cd895273ac84f26aec4283323d7f7682";
+ sha512 = "0941ff6cceb4aa355933a4d631af009757c1be88d63568d3087685407d5162630012b1a3746ce23166cc31f56629d017efab1fb1c3fd7a9e7b62e61c01fb004a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/eu/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/eu/firefox-52.0.2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "2891294c7e382ac55a9c210d7e824479baa281eec8fdbd6cad6d1dea0baf08caa9051f49530c1aca11b71ce5d50fa475a1e192490c232170ffdb9aafa47d1458";
+ sha512 = "fa7d4950f1ff3414961ad2a0caf1d1beabe9522694baa212c7c58b91681c7971fe323b9b85296021635c805b853ae4de12428ea6ff83696c04c37a8442a03538";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fa/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fa/firefox-52.0.2.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "b7df64d26a1155616ef70a8cb99192ab5d9624a4b0649f5829dccdd2fe833cf4aac3aaff86939adb228487b9a75e7fbddd6bbecb3345a3a42113863cf466cb0f";
+ sha512 = "c31fc76bb460b0a18a8b8acbccd0e09491da203a8c88d238026192d2ce0c0b0b744286ed84363b6b1199c3d6bb92a2ae69c4897b82c6d4c46864d1a03fe6502d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ff/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ff/firefox-52.0.2.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "1341979a105df3a1cd5beca0e99ed6cf177e5245ee550decb2df3b06c867cf629522fda9826a69826a1e5676d728d16315e3822a71f523691d68a5114e68fb6d";
+ sha512 = "0349ff6ae8df062abbcb7a98d5d832c30b7abb8a2c9e9bb87d1646612ce81b7932a4ad1cef77e853bbe644bbd1285fb8aa156417209fbb20020e9b92b5c30ccc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fi/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fi/firefox-52.0.2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "01347d4f9d4cf31b3d2c2bca5206ef80123ef4f3b96cab6d9aaee503c497df2ae0a8099e28e9de410a3baee4d7b950f2c840056b690b528dbae5759fdad7e3cf";
+ sha512 = "b3ca267bb15fc2351164b2b561a399c7063d5e391a263f4a62bd7706de85e8720461a05b715fc3eb472ca3ff959464d0ceb20f86628553c6c39e74388c8b1722";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fr/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fr/firefox-52.0.2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "6d5eb134e9b75cdc0f0e4f4119c74f7aa73bd5c4512ebd0371c4ec330ca0c5414b9e6d398ae67284d73011e42ce6ab6e8ef4014cb7d6133d284abae159eae2cf";
+ sha512 = "f66d0139e7ab051e06fe73c11b2d2cf88ec1587fdd6787a4eaf6cc53358e4dacda5dba41dac46aa0eee2362740ba37a0fc728445d4182eea53d69dc4dc24bedd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fy-NL/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fy-NL/firefox-52.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "71e9ad99c3bfe723285ce4437a9b1a5506279186b8f144520e3479ff463d792ce3a53b7681a03de055d69849382616986f383ddc5e59eecd5502fd6a6f745819";
+ sha512 = "e0dd7577c12a669259204157d2a65ec00eac52beb91a1fe3d69bcd92705c9b27ea0010bb4a50dbb7f9e87e1161eb089e966b60f4db304b24ba4929468d7d62a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ga-IE/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ga-IE/firefox-52.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "9fae8bdc0b63bc38672f9f7cd3fe6d995d2f2131d4d4ca5f18dca0be21294e8e2328dcca6e630467929764a300f6fd9b82c080afe02a072d4e81f1874894e1b6";
+ sha512 = "10c7729dc2a774f09e44a3dfdc6635892efc7d9ed3e57ae5e6455c9221201d47f9228311c11d7220eaa5d40bc1e6af81fd1933c1b93f2a29cc37b5913ccbd366";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gd/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gd/firefox-52.0.2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "750dfe9668cc811e9b72e792223640bda908e5273f03b46e2af68614a070fee1fad999119d750e74eb42c6118dd5b4212c0cd75b3d8f9dc842c6af907938390e";
+ sha512 = "1a957c457be0b85b5623e730513c006d6ac5d783e8d6ff714ef6a46e89b4e4779f32ba6705b35da9c65949de433ac261653515adcc8ba7ff68dc6b727687f71a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gl/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gl/firefox-52.0.2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "dda00c0b6f88dc20516f65781ff9d96e45934c1f92138a1444aa83264a2aea85ea075376af91f71c5311c684a5f9aa9cccb63d67b4a3f2a96045540a161d36df";
+ sha512 = "75142b0a03d075938e1a221fb78b9d7833e70d55982f3b710ee6e9c664b44289c7b34d883e20cef27376c8836f26abfb15d8078bc6536f9fbdbbb085c101c04d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gn/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gn/firefox-52.0.2.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "4638c96bb72a53c2c8add3c7f767d58a9dc62ac812665aaa1c46ce840d3f4367a9cd7024794b38ab7e8c2e21ecd2bc94ceb38606dbd1f53b8b2dc1751fd1bb5e";
+ sha512 = "41809ce36cb357a0bb82ab5f22c747ce234ffb670fafc7dc695b75675f6192d5b251ca060d3f54c16ccfe9680939313c32a00cc2551d376420c2b7240654c7c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gu-IN/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gu-IN/firefox-52.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "41af30d770df6c5dde5e55e61ac4f5ac8a6b28bac27c554ab023171ad5eaa973c3b80f64e3ca9fb5db9c7d7943c9c9438ab7b37880f673a1a418e70ddde74624";
+ sha512 = "c6608688782cea5f8c96250590dd71659c80918b1219a6bd95c6825abe19fb2310e16a275018be1b828a2c49fc1b457ba922e504e9794d6ffde0a940d4569708";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/he/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/he/firefox-52.0.2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "023359000792e3ad54764abbb46c3708f248730e5f1c8c067b1bdb81d1fbde83ef44233ab3177fad322b50329c5663aa7a0c89e820a2c8efdafe5b92f134a0e8";
+ sha512 = "bde85d84e3a52c2ff7345b5f1fafb9badc4ced0ab53cf46e2376d0fbd2a73deacdf48a2a874f09937761a9242c8a95836441332fbd2b8c26ce62835f0da621dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hi-IN/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hi-IN/firefox-52.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "c2f26a610fec1c18333a01a5e7d44af1303366e9bb071ee945588b5886ce17670ea34c5bda3be647b4067dbb9a6e3f7c9c0751f7a39cc8463bf6c690e2460198";
+ sha512 = "3ab61abee1275844f906c09d17b986d0ec22345a0c49fd6ce262098495ad90a754cd671df65b2669193b24601eb037e3241d49ddaf29fc3b755c58ad9d6d7280";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hr/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hr/firefox-52.0.2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "68c04f03fe526b16552a734bc2ddad6dbbe276572586a3ffbe0ad90b8bda7f943fc107eccc9679f0778ca1fc61c475a3b519581c105ff526ff4d4896a6c41eaf";
+ sha512 = "5036e514a41103bc880ae6d6ac16da37570230026f9301c6d831ac88461783072149a252d647b0d8bc6af9e22b5c8845e368cb3d986c8a9020af56f29bfc2094";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hsb/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hsb/firefox-52.0.2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "b07a88ad8c041444a46ae81608de6048e05366fa0756270b4266c2a613246eaba0d7993e589556a92425558a106aa5e7a18d69423d680cd44cfaea6c64a64fc7";
+ sha512 = "ae110953078579fcf38d3ed24b6ecdade9e4de270ad77d757a1a4a413766b50a9d1ee9faee3986d30f18b9702d25a097e491c5a9d4f33ffa195bb9a52c3ca77c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hu/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hu/firefox-52.0.2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "14ac0e6a21bed1fd94f67bd04e4b93133c7a1e37b66b84effd2212df0561b88762dc1f4a218487077c060f72fa13cac14d5f8d0d70e016bcef624b6a2c2cef0b";
+ sha512 = "e236dc28c60ce2958557bc76dd80fc8f5dad8aaa9a1fd89aba168d1f84ec15512fd5b5967b5d518b8d1ddaf7399ec1cbc775774cd46480c5ea345ca6f0e12476";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hy-AM/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hy-AM/firefox-52.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "8d7808b549c8faee13a06671bd81c46fd896ea479a15723af0e8c70874c70993df3bab9a6013efddc2932cce910a0b52ed5a3ba853bf44fb0b18da6d4251755f";
+ sha512 = "ae7a7ac1bc08280552efa232a83f571319c4a0a1ce54b8876100dfbc6c4e43d1b461d92ab98764c6ce7d450a6a84a13845a3e972fedf7fb32ba04ae36083951f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/id/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/id/firefox-52.0.2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "ac3929a73f46bdc6ebc1d185fc53368590beadd0614e8447f390c52ee213459e49eb05a822128572fa2d4c4b128b93e7c1a4b94dfa4c2a4c071ea679d495db72";
+ sha512 = "96404c291b4bb1d3e57e811f3fe12bbb49f4d3c69a68c903f00c83f284da2c1843e2d045b1fe6f0de784850aeb1e828007a1baa7c7aeaac479611979ecb416ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/is/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/is/firefox-52.0.2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "e9b49b02dfa2ca87a273803c6a84c981d731e0320fce30a4580fa31d93c9ff06ea4d55f49efe771b008a5af3539a3c8e0fb9ccbd855bef951846dc687219ea4e";
+ sha512 = "da23804164392edf96728a18e21e53a4951a5122f22c867fa61a72db16f3dd697f48a099c91c3609fd555a20dd3e6f2221e0379f8d2a4f9b312359d1630c3225";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/it/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/it/firefox-52.0.2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "4fe510002bdd30d0d713ea112819365f55fc41de024877dfc02b217fe7ce825e5283838f81acdd0456418b5cfa70c42f071ca36668908b257ada23659042cb12";
+ sha512 = "74c4c4fe5ec6af0ccda964194e080657d294e237631ba90ea4378ee3f2eb1cab6338829c81b419994da181e696606617c1b617e0664f887e1cc45288b2854c1d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ja/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ja/firefox-52.0.2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "a56937787b4f6fe0fe079ee13a362a6cbbcf8160e0ce08d57d58bca7f14ca4fa34ea62c7ec1081aeefeb271c6f010a31a00ff31bb8d3d913b41382fceb9a3e3d";
+ sha512 = "8cc5accbdd64fe2cf725af09a5a6677033eac513a831793347d1c8a9eb3b78236e3311aa330c1a4c23f17df2dcd9ec78218ab6b478a0d0baff08fe9d1d8bee2a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ka/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ka/firefox-52.0.2.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "3138f39d4a346f1c38ac28c498bd27c34b541c1b389eb0bfcc1957e1da098fe9b2209d46e362eba66eb833a07e77e056e44c179651b7daa88e706c20f26ab0c4";
+ sha512 = "5b3023d30f70652409074a2507bdc998fccbfadf1d94b5ef3896fb18cd934eb4c0b21a8448042cc5950434cd1bdbf004207823b2416684f599cb5e9a7b425bce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kab/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/kab/firefox-52.0.2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "8539be22d54dee4a51207bf686260a85c66eabc19efb17d397604d19711776c310f1ceb2bb7e67be797216ba52b8eb6fbafbc63561db8dbff1d62b02baafd6ae";
+ sha512 = "cc9bce1b5ae317fa4e6f6e33440f4c0aa7beec036d27f36e8cfd17df34d4c78ebfea9d7bacad2c0805e5808a311adb6d573ef81c3230de99d6a51efc51d07f26";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kk/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/kk/firefox-52.0.2.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "4df849e9011631763f6a16ebe2e1bee6a0dfc25acebdee417b0b023e1c6279f91ec73ed2703c206b66a55e220425037ed11bf0a4d022d5a94ba8506537c26fd4";
+ sha512 = "d5ed3e9b0542076370df94fdcd2eb924d07dbaeb4763bca3452b156ef1d9d75e43a4c7d202e70cab018e9de5ce40f7e9702864c120fa6fd8f0833dc916d9d205";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/km/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/km/firefox-52.0.2.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "b9d063f695030b801502265ff5f93bd56a0812c45c032cfaba2354ff103e8e5c5ecc3ea43a23922c27b36e68887a9180746fe173de428c48c9a9069ab07e3c7a";
+ sha512 = "bbd78525f8871f115e64bb225e8b62f89a446f1df19521b364ef8a3d8fce2c44c4cf4f36130fab12b60d9db8e127604c08491b91e34fd9cdb21b4eab56728e0b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kn/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/kn/firefox-52.0.2.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "bad628d1438caaf285d14cd68ccd1f7d7021d1a7cbd28f6b86f3368e8eb7dd4c5eb60d5b75b645fa41b88ece5925e09b87eb69f2b187a1ce63e813537e0baaca";
+ sha512 = "63b06655503229444c03170141962374ea469398b55a154965c3d3e062016ee6004203a22575c0f737bb21a8271d70c9a816cd8150f72cf03ecf6ddea2717c59";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ko/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ko/firefox-52.0.2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "d1069067daaee4a20eb41efaaeb211554e110b9ff35d3a71e48248eaa1da6c12242fe66f41a1e38bc53dceb731e1f46e0b77b25a128c4546b2103e817a895ceb";
+ sha512 = "c96616dfe9abd66d8b92ac3c6e80cf93733587ba9facdc397136504b3532b014b9d43393e623cc6a0f44a0a719172da09f807a08ce0b82f00d21e6dd9731f43c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lij/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/lij/firefox-52.0.2.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "eacc7cb06e9d2bf006c5de5ff52063d76198f0444e66e0352a5cf337f722ec7648baf8555ac5da115254f35471ba176d2f7f5ba3a166005534327481a3c566d0";
+ sha512 = "615cb07855818b741c59fc7fee38f31052042e65962e809e46d75aae5dfd7ef13b77462c51c0956915631fb9979f4ecb093248825399cb6c3c6af98c112ccec8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lt/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/lt/firefox-52.0.2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "04e2984a9060fbb5315aea2f6cc822fb56c6bb73f44e95b410aea0e2748e15f31ff3e6ad869215d13df881300cf1caf55c6fdaf47fbc14472d103772d3ed06c4";
+ sha512 = "bc8ae3fc1989e400ac6f8baf251e2c9f43c457668e474a25f7c57cb0e55469a3b7c2cba51fe17a29bd2e8bd9287bfc9a8f39c811a63104f4af017ad7998c0d31";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lv/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/lv/firefox-52.0.2.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "2dfba1438c807e6f19bf659e17a6847f3d84cb6e1afde89026a5b54083ec5a040366a81a9a3d2653f121ab3ddaa8f2d9bf7c5d49d61370f29bad2f0c705137aa";
+ sha512 = "9bcffbc83770a25f2b44d4a89eea71de92a62fbe654abac762bda4db6075bca20f786b99b1942fce7b9a7a24b99ff129e3349938ee4ea9e06770d02326487cd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mai/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/mai/firefox-52.0.2.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "44ef596b16c11621b9064cef9c441be0d2a859429d59b7f6bdd760eeaaa7c487071da0610f1f2723ab1784a41931dcea31681ed91f9f5075b6dee3657e69feb5";
+ sha512 = "2d89a6b43bc9bc3096cd4e6c8537edf86fc9baca3e07e062bba03580c1c3321ac07024a904da27d6dbb246d0d9a691f2669f789f9a7b53332dd323bedfc23991";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mk/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/mk/firefox-52.0.2.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "52246cd03b0b9157a641ac25bd159a605ee2ae799c795f61fd5987b5057f0c364df07339e67cbe475fc0c053d1bb5f2244accdefb1e705b5201702272d210712";
+ sha512 = "09c763ee3657545eaa095acc2cd3df82b5d4d61afec274dfd026b2fec670f75fe0948854ace5ecbecdb1c32bbc3916cbdb0073dce83e004e6d36b84b177df7da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ml/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ml/firefox-52.0.2.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "a5548a153520fe7b930aa2f5645c3b6c73a957d564aa811b548fcc4a4814357fa2f1ca701948aadc2109f0c6ecf5117cda0f0752fbf981f3f65a46ee71543234";
+ sha512 = "db6b7d35faa8c0b37fc46b73e4af09ed3e297a70e21fe25496a36aabac41ae39f2ccc060c84ee6134855078f8ef3099f4a727ca8e6631960d72fee080646e2f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mr/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/mr/firefox-52.0.2.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "863e5c767b9c071f4cd24562b6259fd758b834f091d3e22be26ed7e81d242861fb6a0d401fcd1156b1a3d750243e37bdc4f0ff716024d3eff1dd783bf2153e06";
+ sha512 = "95690e4b71eb853d5482b28f0acddaad6bbdda466650b691836e07bf48ffc1005794f783dcf64620390936fcd77db352a0585abcaae796dcf9e60b93084d44be";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ms/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ms/firefox-52.0.2.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "a60877264b3ff2d2b0343f6030f2da7b07f6c21a4d805cf1d125297f49c7bc2b93980293e428c6cbc955b39407def434e503654084e8f1054290786734d89cd4";
+ sha512 = "e98d53dcc9af968211a81a97bb749b308139d35403ab221c7f36e0b291e8b429b7db6c7531a2c261bf90b81373430fa1e54cff75f88546586f808c8784f868d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nb-NO/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/nb-NO/firefox-52.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "2fbff650d3881898e6feb998bb00a77d320ac11d4974bc9ef3f77b6df0bdd07ba2486bf358691163e5cd11d11444c63aca728316bbb3e4ba15b1067d3a9b7962";
+ sha512 = "b7c34ba0d7fd0259637e650d2bc251dbf1b3ca2c365549f34928f7fe30c663b8b54c2cf7c587120df5586fbaa770c8b7482a53881339e2ce3b947b3866f4ef43";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nl/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/nl/firefox-52.0.2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "9ebf1a1fbd185f1992793b8c13cacd4ef26b7b51c239d69395c02903ba412382bdf21638fb60723f1b3a407ff2591fcf95836a75d4f4d1a660968b9aac513708";
+ sha512 = "85c57bd3bb2e8b89fbef5f2ec59130ab16d723fb79fbd91e1a4f3c056ec9dbe8ca5dc293d34730603af60015aff94b43eac581f9bc2bf462512762232ff445b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nn-NO/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/nn-NO/firefox-52.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "9e9fa5784fb5d5f1239f511cdbbcebb7b2dce412f7a038d9dc4a3c5890764621d8949d788de1fd83a2f7bc83e909f0f60591ae1cdcf26d6c09600877cc540a5e";
+ sha512 = "ddac997563c6cb2c2fb9096e85aade6645667b6c719b7743a405f4390c91222a9955432cc314a5fb2cabf2a80988dcdc491708dba7c507d658a4a8ca78eca688";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/or/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/or/firefox-52.0.2.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "aba2e5b466aa4f84453937f7750933be5bd0d2005843d4d3c4589fe8a08c622432ad63f59c2fd9150c47591a949a7d1da565cafb6e835ade711f882a4d21114a";
+ sha512 = "ba0f16f2b3be5c76f8d84ab92b1297597ebb6a7f33a83c37568dd0107b653678309f1eb5e5c0e48ecbfc1dd2af01854c49261cb21f264a4fbaefd25f256187ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pa-IN/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pa-IN/firefox-52.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "698d2541b460bbda27aa1295d790e7c452d372ae32ddb311b6d80e3f90e298a836f86c4c26778ec5060913f716bf8d5bce2364d5d4df8ba74ca883a80770d461";
+ sha512 = "0bf04494a4515064cbe2a125d64c3caec94521744770337598685766266d0076316d786292e1ebda62450103d67ee13a0d99995b9eaa0d10532a71b2bf3c928b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pl/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pl/firefox-52.0.2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "bf1025eed0a522a8fb9c05c08750d4c471c56181ade3bb3424e8031ca1510d3890484b4e911da8df5ed78956059f4d7bbffc1c82ea40864f96ec4bdc79f550e6";
+ sha512 = "d11d76ce3f088e56e882a9cf6c49997e01efc9f79635c75d1272fdb06f484ae9a634b3c52c9d15c938a657611552b54a26b67134e8c5396e6d74ad83fb3a9a69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pt-BR/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pt-BR/firefox-52.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "07dd9bfe0e4f5d1ed239d512b2af4b4153f86c5f94f6464898263e6688daec1b4da5a9e8758f819034f17857a57417afd7a5fc67439fbad1153d5d2d9cafe28b";
+ sha512 = "1a4de780de9105009d4f9549ea1be3e389e9a01ea32db30b72aaec7d90d522edae3c6ccb1061edefd2ae95f3610b7839e115e3b53884819088c70387990cc77b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pt-PT/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pt-PT/firefox-52.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "7a21921dc0a45a2967e7ece3177f014b8d84e0e08634882785f30f28860a3d56b1b5b224da101bf1bdbd322a6ce354db566a1c51e99d7266a7f532509bc21688";
+ sha512 = "29417545e0523bdcb980cb1be1a70bc3808360076f1e1a862ddecf10665a7a0e83e6f0ac29fc18a8d3b90ac9729aaae64236a091511ce930021808b4de3f6b65";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/rm/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/rm/firefox-52.0.2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "2fdc2e2ec175a6df36a26b5eb7be11455d51ef4d0d66b52f6036f4c743cbe95894aa6c9b904a3911801a798e4f7e53002879ba2f2aca3da14f23cc481276f7b4";
+ sha512 = "99a1820c89ee96bc90404d732874be0a136441d97c5302e74d5dfb38a734bdb1373f48c7af0232ab66dcde528a1480c161c0a3b8aac4a016dbeeea3c744efdd4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ro/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ro/firefox-52.0.2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "ac4731507c44d65eaf156a4a783e1dd3603e0c86b735c3a488f8b4a7ea4f506db42ceb068a917e1a8f4452213f68ad9779a894180ab7f7856b5e55791660bb14";
+ sha512 = "4ba5a9ba9fe3839ac8ca0d7428b2d1dcf05b1325d62c88ea833759f663a9cc45fd2c88e29bedb29a00e68d787e6fab6b1b5b9906acfd5b02c0cee9e18f701372";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ru/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ru/firefox-52.0.2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "8b67edacf0fc53168074da44c7a8b2452b0e22cef093b6573333e04df9fc2402d2a55b14ec3139e4cce6eb90d611ac1bb22e4f9f548aa65523941b9786ea23bd";
+ sha512 = "2e2db4238f73f8b27e8011ba528fb3d108da5a5d59de43b38f5aaa89740cf2b6ca655446ae28b31c6c22011777bb8c13ac43cd9a2ac234e3bba729daa426c3d5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/si/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/si/firefox-52.0.2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "15b24357e2cbcc2d3903da8cac5179cf56e1b4bd68b693a154960614cca39ac0c55129905448c94f5adea063455c3edbc9b32f5f530c8979fbf48347c7fb359f";
+ sha512 = "af65f79352fb6435b0e7b37f6d88988d08f5966b406d903eb03d9ef2c6b393e7516ea3fa3150059ff0c33437f68fa3cd28528e46144f8cd2c59721d5e0d593e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sk/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sk/firefox-52.0.2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "5d5b398b8f0157cb84ac8dd8a0bb091504ad34d1ba4b6daa02b9082fd900878d8dbdd5a8069df7d8e8938d4062145132bce9edbc81238362f761a92d6bbcbe5f";
+ sha512 = "cc0649946cd9cd2395fa399b2ee6aa9a469237cefed0db6dd65cb80ed12a18e572c33bd932985309a649b75665d4b8d65c241d0f5f9d92886315ca0cec6425cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sl/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sl/firefox-52.0.2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "0add0946e185b8f926115f0699227b661784a94afc56b2c9c9e03f27b790da8d73748016e86ea9260b16278699cdd72b4603a5bca72e0d9955ccff2807ff82f1";
+ sha512 = "c2f746ae453ff8c3160784eb853c20a3cc48ac4ae28fe231dbcccd24b41f003d38e8e13a1fdc269e7a4ce6d77c02f9a15c7e237b35c46d22256779844638c5ed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/son/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/son/firefox-52.0.2.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "97140c16c3b77352c2e3f56b4afd61c575d6e302dd98c333375a01e75a487297bbf429ff42a88e291f1dd2883d4119611a7e524e535b73ccf6de3215de29dead";
+ sha512 = "d0751c793f839cb6f334027217f164a0fca2861d62ab1d9c9c7a81fe1daf54b3fa6df03564b5d83fc3eb0bb3586f331ac7728d6dd6d2ebafeb614823088ec9b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sq/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sq/firefox-52.0.2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "9c97f6df5b0393ce34f33ee3ec06d21a70e6221c2aee65ff7c115ca5a7f7e82e3e3ccaef5e41c33d72281109ee03664f63240f20c15f6de254a712ad8a0187c3";
+ sha512 = "31edb40d07ce79679b84ced2ec867873a73adb0439e74260934fd415789f8703b1cff717241657bebf5411592d2c12aaf0aae3fd58cc7a37112dec33b68e1d9b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sr/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sr/firefox-52.0.2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "dbe2f803ef838ea0da7188a566619cc547e272d458a138b5d3b7d1109e708d3d1c72901276f745bec2ad65ec68112ad88523400f805dad48841b9f2e6266aac5";
+ sha512 = "f670f25b2a9fefa7b8667b3d2655a80283610da9aacfcff71c0ee133513f7f21e7521e1f767748896604fb9a69a84e1c6a56063e1db9b344b9e7cd7ea2a9fa26";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sv-SE/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sv-SE/firefox-52.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "555206c262c0ffd953937ffd58ed840585345739ff2868fee0e81df93d2b7bcd8b22ae567a13ea5f67cf06f7065fdc09dcd321a326e974f58f86225dbae93627";
+ sha512 = "72a2e2ccb76b6d8490d209c086c4748cc242dce4683a64d0ab30279dab09c608b9ec9d73f900f3816d00ad8d7543124624bffd51e8059a4175dfdc980a0e98e2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ta/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ta/firefox-52.0.2.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "fd577c71ec42c92a88fd05fc723fba543eeee80114e90b5939d053080574ebfefb2c9d31bd6f0d2625bd4113ec4ed94aa9dcf637a17a7bc0eeb5289552f41d01";
+ sha512 = "806d6a7f1094a84b6d9408dc9a4917291af9d1b42211d5562579200231ca77fc210aefdb93ac942aa28e16f089aec9cc6e8fadc4c410716dbf43287f5dd93ca3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/te/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/te/firefox-52.0.2.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "9b9f893c25394102f026d0be65173802aeee0999031cdf4a7c3e4964df5075bec2a1a3ebf029014b4a50623f8265672992ad78214a551fcaf776adf659ed5fb6";
+ sha512 = "3f2c06162eed155c1c75a4706ff4133791f7d39026936e67e320cd678e1fe843f620be8c01b822f16b4a6b51c3a42884d6015e98b1a43dcd328f01cb8cca7df5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/th/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/th/firefox-52.0.2.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "6511ec6a5c1229181849af9040fb2cdf12d13907731522312bc130880c78d698d3b8d0ec8bb31d080399de7f3beb29c2fe45b6d9d9d3a9c550996c1cf9496607";
+ sha512 = "487d30a850048207015b880ad6762181a66121002820d88d1c5629c19abdb121af6b6ad703227c8ef143786a6f9d5a5f550388703e314368562de09de54fd9c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/tr/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/tr/firefox-52.0.2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "26a076902a0eefed3f893ea72da54e233dc13d5bc0abcbb95cd75c68778526eb961d23315018456539811548ee66030d7b1ba02049574b6b2f6eed9bac16b8be";
+ sha512 = "07ea2cb754b6433d25820b5da3c388ac6d6441b15a1dbd12c442e4bb744ea94e51cd95d8147eafb57eeb6d1f689d9373425d25f3ffa67987017a98c6cc13dff7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/uk/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/uk/firefox-52.0.2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "d9f4cc9900a77e7de0cc0859af7ed1c83447b9a3cac52c4453a6294a6b85bb3b95b6c6385b65014a73fd92fdc4b014eb5c28ed0ca1aa60a75eaccd3272f67157";
+ sha512 = "167993a0fdceec4630f6fd60f28f9f060e7449f7c514893e35ee4a6f406dfe9e330f738cd32a94c109e858a9f0a62952a4b4213774a2703e061a7dbd2c2d5f25";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/uz/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/uz/firefox-52.0.2.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "a7cf647e57651ceee739af19008877b409791f86d75592e240dadeb0559cbce6316cca3c396f044a5b4d8daa3e0a11e96cc61e3f6c9addf3a22ef59dcaaf370f";
+ sha512 = "86d34713424a1a610a4d6955fb606d672705d4cb770a73705819600665a06c58f305ceb6eecf4f93f813a3ac8372050799c6d0c67943f5e8458ce7afc9eaead3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/vi/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/vi/firefox-52.0.2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "84e91aa0f8e92b0bb24ff53742e19869c3757343e1c05cbf2fc90aa14bf3917d3ec357f4757dc2932ffb1dd823104c42d6020e0f156a1f7cc21e696462c5d05d";
+ sha512 = "b05f36dc75e5bb6621e430bba274a98e8d780f5491a77cb1279855582f09861f340457a2c03c69eab89f8a1b84ef0f9638434877e65bb5bf9dc101930cd73af5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/xh/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/xh/firefox-52.0.2.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "cf97e6aac1723263608a29df8df9e67c9ddeea18f3043f10a4c8f22331f519e6a30d76f2e2b2d42e1f5e24a31812e57387198391b14d726c6c5dd2488e94a820";
+ sha512 = "339310357c9fe6fdb0bee54975b3a870efd687f504f0e1ca9eb1cabef2ec410100b7b6a6ce1ea0fef245220b8c8eb4a255c605c54919782c45b9a4524edbae73";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/zh-CN/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/zh-CN/firefox-52.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "74e10d0cf2e47f4133b25a9351a3a13cd634a4a17986dc896c32accd25fb4f09dab7c141faba5574015da83bb193087b64434a51fdd820b1ca6af82a2672beeb";
+ sha512 = "74b84acff05c34ed24addfc038f5273416164f635516c188787b61e1cf44b929307d01412093a861a1ca73d8a26ae192e40e89a764e285fb332690ccc1451433";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/zh-TW/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/zh-TW/firefox-52.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "2f024be661d830f179c5e19bb36415becefcdb2a98a750a09cd80f9a3a9e09f9c3ab113e51ac16ce185f42e3e4d00bfa906f7597f58b0282f3d5a98c690fc981";
+ sha512 = "4da030da94ca0d889ccfd8192d4812231be0c075f4de5e0f1cc1d1fef2ea2c960e447a73c7dbd141130315f886843cf66b463d8cfd0261ccea55b17b76dfc7ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ach/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ach/firefox-52.0.2.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "520a791d0c86a60a7f789451f690fde6cab934e536b5acce4b47e56e95c8d775c9bb5bdeec32e4a694ddfc7bb0301758fbda5b575ca1baec6d134df39b6861ff";
+ sha512 = "ca8ffe68361681aed552bccc3141fe49fee7645865344afdac4b08aa8b8d950b5a36773495c827e0ab1095e8541cae406912dc4e539483001cfc7550b59e7194";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/af/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/af/firefox-52.0.2.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "4fa7361db2a87f5c133e262e7006844f9d734765c589f97843fdd3b95127c37e040f9634e11f295ab67a1ceb08fefafc8592658e3730be7d1be7680decdecf61";
+ sha512 = "1e08575a3727eecdfcd5a8e04a3b6667077bc7dfcf5d3b22a76dee6d09d54bf97100dcb478ff451999ad4d0fde1cbe12e2b248b7a3112b0a29d1b19a93e46228";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/an/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/an/firefox-52.0.2.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "8cd72218d6b9eff75cc009224ca28da2b668c786b111f2761190eb85e5467f980b3ff577cb1de30806b049d92a820aebb854572489140c22e4509f165fb53943";
+ sha512 = "20d6a18d4e203b016d40162e67f2f438d20f18bb923395b63c1b5b1064900ea38ef21038b6765c34dda7afed6c3463fd16cdb4506fcaa13bc963d7d9c104598a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ar/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ar/firefox-52.0.2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "a7fcfe0d20d28d15d40f15c6af83e1bef20db2ca8f74e669fb1912b3d7b411b83b8f2081e653048fcce0914800f71f3b07c8119c01f9ea9cc039f94c47681279";
+ sha512 = "a3e6088eea7a569ba3520813667d858b4073a6b4d5d0fe725539139d6747ff30e1a053bc3af37ea72ad12438db9f842ce4cae8bbe08629cdc33600a795cc84ba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/as/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/as/firefox-52.0.2.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "ad2cd9bbfb85458108a2b32aa07a090d05554cf8d60e113035cd92ac877e0a0a7fa2f7ed6a3061bb17977464d635843c4e1902071496b1ba898c74458c2878b3";
+ sha512 = "9bde92cb7625e37ad287d54bdf3dc876105ab8b026d3dea2ce7121385c61d3c44c3cb7ea931e2805ecb8e345cab1d26db50075b31c19a09eb4e38a185db17c32";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ast/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ast/firefox-52.0.2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "2fa3f46e646ab0a4774f827de282b8a54f324dd801d30b256988bab79bf2356723f0e0a1d401c04e429e8e4cf91a0a4b4c0b5ac0c793cb3d2fcf82b6bb311832";
+ sha512 = "6c6ad98afd3ad8cc2ffba9bf19282efcaca160e51ad74f1c7121ca5ca44dd8cd661ed206837ad79d924c1cdb9d2e749f9edd6c9d2dff976439231568df00f785";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/az/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/az/firefox-52.0.2.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "0d63c772859254b591e62ab45c542247eca411a8230afd8b0dea6b358d6db6e0dfdde43e05337be554c922caa40f13ff6db38e0526572531f32c9f0baa400bd8";
+ sha512 = "3591e35e7627d12f27ee03f98bc05adb88d048b742e386931ae8b01fa34b977b865cb6990cad41bcc336f94b9d40d0ccb1c493d2cd5b0e3d5f413568160c5318";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bg/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bg/firefox-52.0.2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "2eb0521db20b5cd659c733a18cbb04cf4c15ffdd89482e12df2886d388a85634848108b2ec6508637afae9e36b5ad0ae7b9ee611ba531605db4cae60f1e61ed2";
+ sha512 = "28a9646f6c135b4ad1b52a4b61fec8762d16f4f1ab9471226c88e0958cbde5a094d7a91bbd4e7385f57f45953de62b6efd943ef74899da7b7566402e1c5ef68c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bn-BD/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bn-BD/firefox-52.0.2.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "f0d2ff957dfb93a11c2a374a30dfb800e39ffa309f2b50419fea33488d4098fcc7e1429d434825c4854a5d27240625f2c1643496d15eaa58853fdcc91a93a601";
+ sha512 = "a9d2e14f9218986603d4215e4b28534f60ec208898446bf5e798d921189b045bb8d9954a900545ab4c01a56d23bd21bf0075fc9eb0cacc913b7c66d4dbf20fae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bn-IN/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bn-IN/firefox-52.0.2.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "2ed01637decdc6e11c686665aaaf1628793590352d804b3f524778c7fc5f1af6e866d28dd1a90acdec105fca392f6aad3e37a4a8d32264e790436df401d60005";
+ sha512 = "1e3e883c9df8982809f699b176dba7176c63b9ccfc7ecd2552f1147a197f0c22671fd11be05a455c9619152f6783a95f4167547d556903b1756e458804de3483";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/br/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/br/firefox-52.0.2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "19172c0112eb0ddd67da1f2bd8b759a901f9ce29ee6a85b889317e6f8aa9ea85a9ca6bdab6bfefaa8d65a9b7081300acc5b4eb3bf69b8ffea2eb7de4ba448636";
+ sha512 = "a0bec7977f03803b29bb1ef818c0efeaeb17d0c679ad35c00357dca1c29da6a294da352d2aae751763d1c5e20d385f51bb0841c61bdb8f7dcdddf92b3774f1b2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bs/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bs/firefox-52.0.2.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "eb4bf2dc8c9d74775a227254f0895d9b10c5e3f72a6c37bf9709eaef555a208b6b455e35e8122e5f96ade59956b7481df5807f4787092b642a6affaf870b8d52";
+ sha512 = "c741b54422602932086e903fe8aa1fcfa91b705236ca223a24b23eedbe4034279111eb3a4a1fbf1a431cee7f6ce8333ac01efa3cc5e3a52768bdd93bc3099359";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ca/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ca/firefox-52.0.2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "7bea06ab95279b5daba518d8d30a506f0f79c3b54f36796318213ac1c2e19aa0763774a0746315f564501930e4930105affacd4997b19f6142c1063b45e5427c";
+ sha512 = "f2f4ad205d9b256871a5252c488deb8b9dd2714d843eff0d815f3e9f5495da3269ed47cb2d1cc21aa67220ae06b4958f120be0a8bebcad296a8cb7612fd21ae0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cak/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/cak/firefox-52.0.2.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "c5366697fa4d91ea125bf16073191174158497e548453c310292851fc582b05a70768339397a4076b5347c8f9b4d2ef0ff62a03217295f4eb8717a4027c8562a";
+ sha512 = "22a1d0d1010d93720123661599d2b259a72135637692a95ee6bcaafb32677bfda139f4265fb541f5cf571d31d23f6996594710c2d3e6c9fad7f744c443b851c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cs/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/cs/firefox-52.0.2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "80fa7b6e3bff168c3b82d3fc188ec7dd33bac07d4d2629df205ebacd7b795638d4fca0ea80aed5d2ff9128d1bbd66ee48512a6b19c8934a8949db7e85f444642";
+ sha512 = "255ad178324900c33ba15721553ec145d6045115462424c58592c2fd4572bfcd5168f3a8035da068bebc0f81c7c9a9fad29739fb09d927a2258a1e7b77139b8b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cy/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/cy/firefox-52.0.2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "5d7e8741b2880f96c9778e84a07e905ce5c31df4db703ead9f5a8aa23b6ec2a478b760adc02a6747adbcb1f8098716ab0bce2a0cd00de1379961f41682e980a3";
+ sha512 = "4f5a3d8e2bf5bb88122b8593e3f97026878a5c70b9366cad2ed8f723770c583ce32b29177360ef7307bf6bde99caf1179c50fae60b2f817e84a9b4d0579ee94a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/da/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/da/firefox-52.0.2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "ca122f0ab79a17d7c07df8607fb9b0018197319f8a644aec4b56328193009e2fa7f9f0b4a9b4a78027f13702c25061443e3412f9be62bbf4eaf793676b1e7fd5";
+ sha512 = "988080ba24f31c90ee293b48def58706e08598341f274bdb378aa1f7e8a437dc2deaf7c36394d4df2043cf07494a4c30d69573afa2c12c962207521cd13febf6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/de/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/de/firefox-52.0.2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "a813a51c347d34fd9c34d9d65289644946008000d8d93fc3df7ff3f7de66f3cb7fca134af2c6e139dbcb58bf5deecfbdb4b10208bd2f7c424fc00a1d48ece9ac";
+ sha512 = "a144a9d9d3f7b6e4d57c73b7d3dfb558cae47aeee0bea8a445739a1ee610d44b99aef8d1a6eea4f49dafd03677dbae637902a8c225ea31b0189da392ed3b827a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/dsb/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/dsb/firefox-52.0.2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "bf2a32dc433dcfcf44d205ce54fe8e2697f1485abacf11fb4cb2b7a1a24d149f85b07684f3127db3a44f83b652db1d56fb416d1f809eaef83383a70dbff5bbbe";
+ sha512 = "4fa7bdf38c7c96b599243d653a0570882fc9ab704515d362fe96a56b44b863fa09b895f9be496bbbaffd10bd12dcd77839a906db81176509bcc1af05fe92b3ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/el/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/el/firefox-52.0.2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "7d7192af4849b104c7b0c410ef27b708ecaac96fabed438baad76d086dcd2bd46e364a163f59b545d941510fbffa82c39785d9957f6cd6d99f0b3786b3d14a35";
+ sha512 = "2ab698be0d304d66b29c52f37077fabb8d9a74a4819cefd51d09e217ee38959250f92c31a9966adbc8cbbf1217f25953cadc634a385e6d956447887df869e9ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-GB/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/en-GB/firefox-52.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "d19127e4e8ef347b50cff1c1960d0e6ad9e248810d9b346a9fa04b9ebcb8fd6207d3b313aa5ac3fb69fce1f096d5594584e9458f061948ca5efd242d779fcd33";
+ sha512 = "c97a29ff79db2ebf58370f0ae259c66dd1b275bb7bdc8dd60844bba658a4fd1f9d605f43fa9a3e3af44d1c7830b75e3a5bb18f2aa3e0b3920854fa3d455fa2af";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-US/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/en-US/firefox-52.0.2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "10a22069e479cf6bb63c4ddaf796b557bc3ab557e17b88fbf4acad26280df5ad46af32d1d39ab85f5d16b58b5d4be5a9b79f5a081cb23a1c4ef9bf6ff69a054b";
+ sha512 = "0b7a25e0df55a7607aa9e6478b5aa188fb545842a6a8ef2279f7997faa725555d966b276aa1201cc1be45b1428faee846d59e0af39cbadb8ae4dee92d9dbb2c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-ZA/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/en-ZA/firefox-52.0.2.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "d716e7f3b435234477c68c9ec92c8f1912db6d9e10b8d77519f4731e2423143ee2974fe187f69532e93d0994257844e374e05ee5829e8ffb9d73915eee8dd67d";
+ sha512 = "0124f925185f4ff2a0517dfb3b2d41c66a808dce1d3ff3cf95d90ec99892cfd7db6ecf9f8812759a91ac9123d8e1b2a1184b22306e50e1cf42dddec5a36932fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/eo/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/eo/firefox-52.0.2.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "088fae14d0ccac9b243e0457ee842b260051a802d3b47318b4b9d6d723af8b272a0c0c0541deca98459c928c5b271e22cc500c70992d3b2e64655ab15bb397b5";
+ sha512 = "76e0d3669243bc75abd77c0c9691291726a23346ef1facee97065e8d2dd8a99a2fd4c86d48e642877a90ae229ec5ffaee398fb8d67e77cb293ad8a4abfb12b06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-AR/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-AR/firefox-52.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "aff8ffd7a042f1ef80ba7fd725efdd022b5a8862714888af1e736a1d08ca1df5974ff39f3b465061c3f6c60bdc975432f04dde651165309f9095ef98b51a53b9";
+ sha512 = "ceb1b2a454c9c53f159bfc3e04802ffea0c0a799ccbeaac15d792c382b92037c0d447c14e373c9601a1ae22ddf6a7cc47e84f34f27c6bf36ccd107048c003db0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-CL/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-CL/firefox-52.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "d8042352f0e54257ce7c96233832cd63d0cb4a0e4d6988a1299a81c9cad01190545c254045f993bff5ae5b2330a6b81baeff582a204674ec236e43ba6492e629";
+ sha512 = "5c62daf105158ab03823fc146ee58d5c0bd41f96cd2e725540992153cc8e2f0065bf0f38050f9125b4ac0fa17f5d0897fd4c9c3776eb8b7bc1dd107608a2b253";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-ES/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-ES/firefox-52.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "5e6d4473335146bfdc9655b4d610ae94e5cda83e2411c495c4196690c029d7ad37775e727afebcca0ef3325f27278508fb51c61cb978392bee7723eb2e501b8d";
+ sha512 = "0365d4fdb398fb75c6b3bfde89d47f24b09224d9f2325cdb1c587519e09299fc9838c5eef96a69b5511ef384e2abef1428e51b22e8404d65e13448ea0dcf4c9b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-MX/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-MX/firefox-52.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "c59952163414d8a1147ea182ad70af0c2223c2f8497248e7e9585c378b95247c88a89c5c08fa6a80fd39bf71f7bbc60126fc9c103f4d8f4eb6dfd400675666b5";
+ sha512 = "b374f2437fa7319bf621a39d13c398e798e9f2e1d1bca8212bc8431d455e6b61f1f15d9ba3a853306952a8e489b37758cc68ee7e72bd7184d1b61866e4384b04";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/et/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/et/firefox-52.0.2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "a2f17512791b57a94f23a5581978517a9bdf817d313fb8378e7e4e34347fe67ac525ea50d19a73436dd0d8de7ca6a227d16bbbf5458c669fffd5731b868c9854";
+ sha512 = "3372452da795fcc8bca30a370dc6c18c159e1ecc195857b6a6603f2187069ce692be96df7376136e68c92c3105795f559599a2c9d8e01ef0bb036a748ee86202";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/eu/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/eu/firefox-52.0.2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "df4cc75f28a3a0f58b2baa78505e4a9624301e42c3f263f0f46c73a5c36915488de98e8eeaa36544de6881a21fde33c8cb78500dd335a6e904c5fb30df3b6a85";
+ sha512 = "66c02a00d2b17dcf158be576c937aa4c74a7a341f6ab0a108bb494dacffe09141a6060431c95e92d26ceea000fb97a103044df899759c549f4dc50808277454d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fa/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fa/firefox-52.0.2.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "faf68fba10608a010bec43cc0bd994fab084de47ed7dd4908bf33fbf90369f115ab6964481558763a06ef603ce6ffc4d97db48006a3dfc92fefaf13b8c97e6d3";
+ sha512 = "850457906736be46b827ae4efe2db44235b485f86a4b0b749be9715182f1a964c3b06703b9a0a710011f74c86f6ce6f146320cd21077da1070d80d25d8bf073b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ff/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ff/firefox-52.0.2.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "199159e04b958f9e485a5d643dce371fc19840bd7e9a4f95d7f1281d5eb860e30950583e569e806e0eae90c757917d6bf1bd32d8cadf07ce7b3c82b5771e0f55";
+ sha512 = "3e81a45db8c20d46e511a94f4a59649b4949c160c4bcd4f1e9d1746c1a00bb870d5ac10d8659fa94cbca5d481ee9f589b625804276b2a29ff27cc57314391b84";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fi/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fi/firefox-52.0.2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "a5ae3dd65552ddc5c8bb843c9860ce070e793ecf67b35a77e005e54c5bfef1174beb0df114b7fb380ad3635465f84e4167f2b247c34a82b9a2208cdfe55986b6";
+ sha512 = "976920e06a5417dccc81fe44df54ec159935452c4a364a8e59772732e7cafbd99602bf38c4020d9e6e24b80c58723255e532c4a96b1500b00438a7a80561d717";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fr/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fr/firefox-52.0.2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "a6f0d89b4a6d52fddbac39db1947f8671544bea26b8ed0b2759030398fa5d1e7865fa1200b67da6a8400a470e402bac0dcb97afc49c20de6a101c224ec9d00ea";
+ sha512 = "ae997ed56e309ea4d084a05ec9be2548fedff29a4b91574326c04bb0f871aa84feaab64e1f9b9b1810288b4518aab45ed0823e3c3dc66ef19960dea1e31eaed5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fy-NL/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fy-NL/firefox-52.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "0facf3356011c6300283eff40bd8311f7e3f75f0eaf46a673f06a0aab807498758d943adc8015e4e649f66041d35107509de402a2514d108075d4398e0201300";
+ sha512 = "cc6007ecb609d9ec48c45a7ffd51a5f86fa5615f281221cc709166c56262dfe702566773a84e196abef08d2168efaec46fb8531f9d65b053252506925f45d103";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ga-IE/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ga-IE/firefox-52.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "7023456136343eb9aaf5ead84df355c03f5cf7d02928ae3ec8e7ba6d7ada3e6aa020bd8b79f9dbf8f8b5d9c2ea15a37d136cbcff215f77452ad75f40a3ff8001";
+ sha512 = "26e3eaa12931d9df39f23c0b32cd75c3a4b59e7e72a35836f2182775a21dd59714acaf6a598046d59b4f9e89a78dd1bb52bbebb115f68fc2fc03c011c4b2176b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gd/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gd/firefox-52.0.2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "342b1ee75b201661fb588a5f6d8530014378512465ed9beb69608fb9fb32fc7f9308cfe4592ff16f325952b3224c27c16a6c5f0e2236b9eabf048f6b096c8510";
+ sha512 = "99684a6628291e8e4549ddd6ccbc8d53d450eeafe15d06d6aee97fa16ffe10d3c2acb3f39ec1e2f7821bef783e0551f8b4b225745ac1e015a0b504e05d300e98";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gl/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gl/firefox-52.0.2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "af25290d169e7b0a4a52e71bbfd2b635347410cd1405a3433dbd14e500d16a8ffc311c25787c2a736abab0361dd1f601de770d8080b023544573e66a14652971";
+ sha512 = "e22599c9126cf546d039ad6a3a6504791b3f29108b4936098f577142bcb29035b8a75ecaf3558601a3cedcccfbe4fe7d4d1e0a6dd5ffd6171f4fcefa4678b45e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gn/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gn/firefox-52.0.2.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "124f5bce4eecd640618e62707b16f8def80fc045c20fceba65a2dad488d60bc8a5ce2e112cb766dc2b463e3d6bd72b4eda612d7c66e727f36c4f3b85cec2b5af";
+ sha512 = "b7b174da4feea6503c3a37d676f916c199a16449854b97f8c3f8417511c8e24317e3cd93edce7702b170a35c48dcf71ec0d8566e6da335707a1bc826720c0043";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gu-IN/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gu-IN/firefox-52.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "17d6e909835cfec67f1e3dd4971e1bdd80c07488e5390a21525604ed923be9b7bb3eae18c3d011cc85d83d10d124041c14af2cb49b79b4e8df94f6f38012963b";
+ sha512 = "2385ba4859ff208965a274d4d23fcb4fd27006b1f73cc2af057ec813d2ee1ba584d532dcbf69f581421e3070847774b0e5bb414db5aa9dcf735315cf1c293a76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/he/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/he/firefox-52.0.2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "70de0d3266df3f9665706f693faebd8c3c29fe1fd7e8c1f391d1366cb094c1178f18baa3947593a3674c2d3c21e1713a5161118c4f241e6c88c47e9b1ec818ba";
+ sha512 = "c56a2a4da1c01a891e0eb6d11f176ad2a428fede830fcaace386c9387a11f93f0636fccbeb78ea8e2c92a20ca568a848bf24a34c270cf278c23fd76f2ae5dfb3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hi-IN/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hi-IN/firefox-52.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "fd8a3250fc495115b83b1b4d360c24ad263fe52f6333dccc527807c6a30060b1afbeda1b95e2a86b0f9ae8b6f63165e4c6c8b58f443bbc89f4c9291870a4d2de";
+ sha512 = "22645937b5d1b0e302b4facee5396685d498441d48610dff428a77645ca2a9e9b5a790fae89ee75014446d424f33fbd3ac8aa3a25d18cc92cbec9121f32951c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hr/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hr/firefox-52.0.2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "561996e2fc7a3c2b9450b87e57cb6cdb6bcf7f454b6736c7d9ca764a85834dea40673f7142513c58624c95ee4f70c21122e54d678c1b9d5edb7273ac3d63cb6d";
+ sha512 = "41a43b8f79447d42b1c2261924955d6c0f463cadc4133069c27b865a14b73fe665104e9de21e1681402dca67ead1e80438cbf9043ce9f0e389e94feb2cfd25e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hsb/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hsb/firefox-52.0.2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "0ef7119929a28c267e94c5fa7afe583b5da6571753a437a7213c84cbfc18c6459da36595dade5187d7e7b8cfb83efd9430ef43400b85318b661512bc8c12a1bd";
+ sha512 = "5641092c539d0d61fc550a0c49992ea8618d245da33e4091bf83f2b85f74078a7037301697430adbde85b3682c99bd6f7ecaa7b933ed7c8f3c58dad9ce8f3a16";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hu/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hu/firefox-52.0.2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "2f27911819f6a625ddf77e02da900f219563e6b070aca76f2c08b9f432c1f15b83eaf09558df4cc1e8a0186938ac4a328f1ceaafa109411dcd270db66f189099";
+ sha512 = "14427a52743b9619d7e675cdcdf00d59d435c0adaa25acbce79fe127670be0d8a8f6dcb909f1d8107cc0381c53688cbe691d074d0c4368bae951abe05f0980e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hy-AM/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hy-AM/firefox-52.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "dde5aede668eda9fbc212f3b18a2326b24a50f399bc70e2c21f65a1f4df574c614d95be6ef55642829c78507d1ae360fc476e599521a39419e2eede1b6cad586";
+ sha512 = "b12a676c274bea2408a885598fca845a558bf0216a680e15e10e07da4dc45a583378c1fb76f95207fdb9ebe98b11cf956811496fcf0fa280f0d27d34b0d4045b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/id/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/id/firefox-52.0.2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "63155285ab64209dfbd71bd5357d754889414b99ff45e9eb393b0ca8938c17152ade97251e3ef48d1d3f197cfa9f2ab1cb57000940216748c43a08174f7d9447";
+ sha512 = "a50d2c3a234c6576909b1327ad60e4a6b93cb8ded5f8e42f66947d5ca55b6eba6601a7da5d65e14c06b58aaeb6c426b839585db670cc8a1502bb0d0c1037b9b3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/is/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/is/firefox-52.0.2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "d01c9eaa33cba50f6fef6da0313eff25e2d45c025d0ed3694abaeed833cd84590ecf6d9b7bd7ee5dcfcbdf678b4ec0f39c6a8eddec670124c9a4d79711cd6d4e";
+ sha512 = "9225d6e5ef21ab486c054cfed58bb2b38cd1c4d32cbe827e221c777959db31bb5b29b6c04a072547fe0cc361e12cfe46b5d5ed44c285316bb1907a97915708bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/it/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/it/firefox-52.0.2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "40a3934d0c9ee388f80d20ccd38a718ee782aa0a8c1e02d14d68eda8c84454c05dcb944396f5c1b092c3fe8820176314e46f232f734079f84bfd04e4b7767618";
+ sha512 = "30507cd7dbbff0871575d9dd61ca646f1e187ecb921cae1e8340f2535adcb47c96b99a84683eadc7d0ab72c3aa30b98fcc9361d2dc27f4dcc891e7bfc59ac52f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ja/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ja/firefox-52.0.2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "506302d0fe4d1198d10f6a12a38e7266585830d2648e1a4a8d5bd58c21836fcc55682137c3b706f4a3c6feee37f88828df8de850a8fba40d3d572e84381c8a1c";
+ sha512 = "1151ef2192ff26ba790243d8fad92f43eec6afaa2a4f76d0fbf0c6cb82b1a57f7e5fc361bcff8f3c2ec178bcb2039320dd9fedc6d31d0f61dbedf90852d5935b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ka/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ka/firefox-52.0.2.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "4d2719f82d245067f7c90da659081e7a5a9f083fae6456911aaeb042863a3796d739b08ff912a6c6ce163121e9b124d96ffd3e557afd2cc238ced8c62fdd4ea5";
+ sha512 = "884090864f90ad4dae20de7a366507d7d65dad097c8e0485c07bae0d343671e578024cd338cfa030f3560b4a4248d8b1cf55930b7e23ad81de6c71d3a3478cb6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kab/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/kab/firefox-52.0.2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "8c173f08c9d83877fe96c270a22ed96dd101d5e7be0eb0225f592457f5a201946a4582147851058ee8c6bcf03890277ae225e145b7b6a824b412cb8ac3643a2f";
+ sha512 = "c8fb0910d031f92c898924457cc5c8062d1048eb73ee3f4136382abec6f33314a936607fd29073a9d07379f49df825bde0073dce8cacab0f84be832f757018a9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kk/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/kk/firefox-52.0.2.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "e08260dbd8c179eccf7ecf0fd036e94542652856360ce927a9430d7c9cd8e966c9b71496ac9b98dcf1a0f10b54800bb84b382b797e2d1daf5ea3742692dc6d5c";
+ sha512 = "015f3a8266dd17fb022cb08b4e5e6a0cf250d841b43157b030af54da2acaa80100a7424df172acad78839bfa4485164d81e14f0efb15ed532eaf91dd81a78bae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/km/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/km/firefox-52.0.2.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "1bb1d99790cbe604e7c6ffc00b9e29b971391257ff3a04787bdce35d79c2c2ebde81037d4597d5f854fccebf9d8e13b73eb3caa11ec2cc50ed82a7db1da6213f";
+ sha512 = "e9c56276434897bcdff5b7895cab82b46b17f8be871ca6ec0ca36b99783da3db448fad7487093119fb0bbb3d08a6d074295684d83d5104b214c7a63b679acd21";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kn/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/kn/firefox-52.0.2.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "426b524506c6d50a7b4625fb3cb0737bfc0f40f1d620f8d59ca60f642d6d5072abeb279722916d285a32653c9d3dffdea480ed7b76bbe81b199082c3af88e3d0";
+ sha512 = "ce79495e3afdff69816007f4f7cd6046f7864579e0699dfc09ac19ef26790ea8fa13fdfd20ea1fe5755f0a7fc11b7588fe860306ab68ad2ba72cb5bb44edebfd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ko/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ko/firefox-52.0.2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "f24bb055650deb5bafc50105e5eccd1dfd09cd114175ca727c7f955b9e7fecf2be1e9e43df80ca1b986e43c991b6e960281c33654b08ea10e1a7612306253a4b";
+ sha512 = "3c0541e19f7e5970f8e7115f66a1722af768997dfdd65fde8b36ffc938c8a241185f7d68f9e8d954c0323fb57b4662c9f6b1cba68c0171c0045bb1922def4499";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lij/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/lij/firefox-52.0.2.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "d53e5e7b56c38f514de40215304982fce5f1d6600ee18fb3cb1f7b9da41b419c74ce1afa2c27bc6b93fa77b7240a3eb020b016dc4f40c744c775626939982686";
+ sha512 = "3ff3966fad4e30e2132113450d31ceae884a430950a91a27b1259e287ceec1a02c67777a1576c45e7e4c40725f7114c96b714d47e1f6cf408121e23765369d06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lt/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/lt/firefox-52.0.2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "0c8fe608177aa128573ee86e15788878ba431fb7436c041754d6107189bb46a323b8966402c31175089ab2b343bb44c4dceaf11ee170503817ffb0e2905fef9a";
+ sha512 = "e5191997323d0f21ce7dc50694b1fbabefbb203920de4c56e6b6374de9b59354cbcaaa8e7ef2292eadb8c70d3428aa4f237cd8e61a5eb6d8783979acde87c86e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lv/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/lv/firefox-52.0.2.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "e3d831a73ced3e2e5bc41657c1d0628209f464884d44c242948e3a3c56c956af6f06e6cdd2e85b2ee25300a28aef09c755324db928ba6f7ba3582348afa44c73";
+ sha512 = "b0e5dc0f277e8764632074086dbf67238b62435fb198a0ef70c18fc45c20647f945caf9ee68f0ebb791ce5bad11002c326bd90c8810e54db29061a5cf16ba8cc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mai/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/mai/firefox-52.0.2.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "74cde9da097068a888894d61bcaba89ff61efa003586e01083ca06f6d69aeda1831ca68d88b7e00b9eb917e0c2c7085c6486f50190ce50879a431670e347c0e6";
+ sha512 = "8b3279e34bb0b45682e27f7db1b3a56f1abca16c16b0a852ddd70b3f614977c9d03af8dcdd84d82cfb2b29c8426382606e9469c673449859f99fe96f6d3f0476";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mk/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/mk/firefox-52.0.2.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "8c9394b7a4ec6cf251071eeee4ffb60ae74c2c0b0cc77ed7b87ed1933220503a9e24438d7f286bca8d667d174f0669573c55dbab961875fead0be92ac5a2ab10";
+ sha512 = "6daf8cb7e9786472872203b98f15a44bb0de1e14cd85be9547ef35e262392df1ad35d9074be0574a4df99a38668e97c8edd7f78b93bde3b227ee86c06e6c16b7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ml/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ml/firefox-52.0.2.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "68c76f6b39c4e43f618aaab34dde32c0ce35c846d0992098606d0103998a0f8ebd15c296569c7afba7bc85f8916f36a3ab0142a226f2468b74b588af1ffb9bb8";
+ sha512 = "2c214f629f2549aeb145901dd79d71410fadab25f6e1f9000fc0f3710af71ddbf756275e5e491e4c9d703a7458a5444d4b6e4f7c5d2666460d0ff9399c8c45c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mr/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/mr/firefox-52.0.2.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "b9732c556ef495c208dc45287d578fc508436365f067f930a9ec44e8cd0c6a9b0e668a07d206d56a9234e37bb80edd1a3b86f97e8b97f102c9b665eb95f58e3c";
+ sha512 = "5126ea191ae20227e208287b3196aed4210514cd3fcb244916f39c614cff287a011d9154f09652a92cae2cfc1a3ff2b090747864205ef8376d55a165faf4ff80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ms/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ms/firefox-52.0.2.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "4c87190253012cdf66129820d50c7e039ae846e4d22564582f9e653847e99a17c4225e3dca222e4d88ae4971756e9e6a116c00bd3d54642709d0935212880ebc";
+ sha512 = "1d24a4f378b2515a0cef0b0e83153b1ac13da2366ed43465c68b173f5d108b07953073043e23a736af9dd87616b2549f54db74bb6be6134a797eaf9704a493c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nb-NO/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/nb-NO/firefox-52.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "3e2b6d33fa7bb6d955781e33c09d36db223baec583ee84bf96d5cac1ea6adad8cde1c929dab075eb1ba44e425c6bb199028536ce1da9f49583508549a806155e";
+ sha512 = "7f3d8036be432dd56ce421d0fcc9ea18ebe6a829e77cd9982e3eb461d66151ddbabb50266eecd832bfa4fcc934bca4650f9180fe7341e7dd24436ca410c5cd46";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nl/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/nl/firefox-52.0.2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "d13f5483c76d27b10a1b6f95d8c6f45c1d46b606f10b73ea0f8fe182eb1e07e3a708eaf6c5f8e1cbaa8b8832f98613362f7b781f45be4ccb529e48bf25444408";
+ sha512 = "865e3793198f3a6184be1189d45a59f7fc927e461c419177419b24064b22f026c2472043fa94d5d0bf31f4766a3c7c9aa8fb0ac941e539f7a599d3057616eb63";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nn-NO/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/nn-NO/firefox-52.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "1e44236fe14462c0922114fc39d45c3b7ffc1d1f51a247d403447dc406820c66b4617f7646b358fb240d220ecda3317d05bb46f127f1bca0460e7be687671c1b";
+ sha512 = "146ad9571d8aa517f6f36a9e74250bc2fd18854686153b84a5e365f8a850d06fabd2d220bd99b0aeb51522fbe03f48f9021efbd157d3be32b84be1f028c4ad60";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/or/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/or/firefox-52.0.2.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "609ed1aae8c84d2aa1e4c4ce034dee90aee36a01599855b91949e422d63a39aecfe3a7a7038130a9cb93e1874cd0036ad809641c84bfde2ad8893f7c46cb6d39";
+ sha512 = "1e6eea8ac94645a6d7137a841b5335cca9c018eb2c3df2685357c8003856846d06401d07417ea7cf2197a06f99ff9ef2865b200bd50607368ea062f3093f5143";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pa-IN/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pa-IN/firefox-52.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "3c5689b2a6d594ceee2b52eedf22ef73fa9138a36abaf9f873b4cead3473dc51e2c53c436fcbeaf247d2b74cb7a880dce72086a99a24a3e19be8f37521d2a8ca";
+ sha512 = "1c96db3314794c5a2840fc4fbbcc46af424b45da9a7a25a47f84a6db22896094f87d523d9828e424507bef6394002c6f585aca9f0b21687957bbbae9ad6d2b5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pl/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pl/firefox-52.0.2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "3222b352e3f9bc05fa1e5cd96c763cc6b4b7b119cee94886bb6191657789f30f31a49e786b3c46607129c639de658c0d3c53494d556d7d31a17204ec338868a6";
+ sha512 = "9748ccfdceff346c1b9fd888f3b50281e1b32030446bd9e8d1fc2b3931903ecbef15d2fb6bbb895f10a66a2d103a640d8a9610d8b4e91fd6558b0608a3b9ffb3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pt-BR/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pt-BR/firefox-52.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "e2ec0b35ad75c2e8f4d8fea32ea84b59fcdc939d83aec878d84c1d5140d1884fa977fb767be203068a4073b5752f5a1a9b646ded10ad87a47bf8f14f8aa8bd09";
+ sha512 = "4403ed0cc168740b92bca6e24243f6797a6d604ef159fce37459d0d6a56aab57d1feddf5e382931d17cb388ce98a2f0cfb1b21f877dd4bc72d666e6e9d390d7b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pt-PT/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pt-PT/firefox-52.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "bff1ff7109c1da0954685031a25c397828b2ab299f82447a46f773179bda440ab35dd687375b12524d03c48ee46f24ef54ebf02449e332fcef20c84bed7c6394";
+ sha512 = "25a08eec03fc6d09258c4c0bb545a86e0e762dfedc47551da51b35c9eae61732726a4484b44e0124fabdf4e89f5148cc435019a253d4f35740155e7c272d3516";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/rm/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/rm/firefox-52.0.2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "98771e89b0747de5da54878fc112b4686006891dba3e213c1460f8ad4b8a97d16f68f6969105c4f6e920e78d0fba09326aaf1d4a5f3d3acb9c5aff699e3ffd73";
+ sha512 = "d378a1fa02ee8976c1545d31a3914745777c0a9246004d127d7beb5764643d1f57a237e1039d85388f9f8e4b987d2e9a2bd1b95bda2d11ff319c3bc7bf992243";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ro/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ro/firefox-52.0.2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "87445f515ab98e5363fd613e50c920d8545feb6e8dbd18eda15fd0e383e4d1525c7d80d6ea50ecae0fde1cb9880a6daabbdded058d009da6fedd3df8d224576c";
+ sha512 = "4776dea591426d6d42c1aa9d64988b57d0b691348185e1656a6363d1ad30495601501546600bfd375513773d5b2fa2030c475254f430facfd30f54dae039fc18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ru/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ru/firefox-52.0.2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "8f7d007fbc550731a42817ae2a9e71eae660fa016e868ec076ef32404e2720d20edc9e56b54d1dff41b2d6771a96bca3052e178e8620646b9a798077135dd498";
+ sha512 = "aedb429d9cc396b71bc2eb4ee4a48fb3a35b1e3a8d0a4cd92514a864243527aadb443c3419841128253bc8700a154808281b6d54d5a455c9e8a0a986219da09c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/si/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/si/firefox-52.0.2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "01ac64cd7a60d606ac9974b7ed1cf6a33d5ee7c99d3afd0514bad6580560e55cf5466c83b8309f09188a68335a556d9e2d5ed5e3d35da4d53fe34c31d4054f26";
+ sha512 = "5626afbbacc76c688c887e5554fe68c75ad966b1a2d968fbeab1113626e014699c7e3eb88c6cf57a79fb3167cf00132188b842e78cdace2edf6268246c0bb616";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sk/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sk/firefox-52.0.2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "516342913ad7e38f0f4ee2baeeb5cb0640a46d9aaa0d0f4fb9d0762cabb88639efaabe158bbdf1a22afed05f99b77271cb5e432eed2ff606f79fdb754d5a553e";
+ sha512 = "e923b6bff6772e85d5e92517ffdeac5fe69cafdc0253e5cdbe7e0bf8d7796048e85609cab00c68a81953dd61fee5a45cfd962efb365c1aafc2fb331d04d499df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sl/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sl/firefox-52.0.2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "239c2137bf2b2f873874f5d58d245179b55687e69f6d170c2f6d2acdfd90d0cc1a95383ea2a03de2a6a93dae6145651fbc18aefaf4a34ffbafdb9fb6fd30b7f3";
+ sha512 = "1d719fa0a38859ce974d18288a80e4e39d2d7ac445503d1ff199087e584e716da27682a557989178fcf9ac5ffeafec520d33be467a8011ae182f1403219cb5da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/son/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/son/firefox-52.0.2.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "a4f896919679ae68abace99a38a44b0b4c97ec190fd076fb732c5f4fdaf37dcebc0ba8d8ce79273fc1118f010bdefb304a6d1d6de0aecd7404795d31501af511";
+ sha512 = "41a431f673bf3b50fc881f4f038728493204e54c01b381f65709515966457629805ee74cbcc29b15790e01e0cca12d04f1dbe89ddbb02864f771ef3afe764e29";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sq/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sq/firefox-52.0.2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "9cab63ca40a6389d55ea3cc3fed3efb545784f7f3a257b79f440b72ac891e800f52aaf02e732ad2ecf99aa1810db7b88900f1f6b77cb2c6d2daa3a61210df62e";
+ sha512 = "723b08e56396dc0a6d5de76c8740da5ce05a3cad52bd82d07b7acfc0796f24c92c9f1906788728a0c40779dd5a0370643da8f9a3b661227e0587032c7b8d0003";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sr/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sr/firefox-52.0.2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "22ac168005c7675d32f2e9524d0356e2de305289dffd0be60334663adbcab48584fdf1dc0990381561aca65711d01b4b007546152d30716fec97bf1486fb788d";
+ sha512 = "9d217e36877985e1b16dfaef3b8d38139611c9b69ef9b6b8195c7848b7422eb8c1473ae1afbe0c72a78c7210ea1230be3f61690a691a1bdef5afa000c81d4dd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sv-SE/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sv-SE/firefox-52.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "a958aebdaaf7737000a4a6ce7d86b299287bdcfa810a230334ace7a25a277cb17193d373d54724dfb5acf64e78e3c573d2d0c2ce0921ca545e133bfdb20c167d";
+ sha512 = "32d937a075de2a2e82fcd8577f5675e1021b6790188c96e236501491fc01fef8ddee119efefa6285f3453fd4b769386c3f5bb5a9768b72c113636ca209f37d8a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ta/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ta/firefox-52.0.2.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "107e51b9990dd0438d6fd45fe02582474f5c14dc3a07a8fa2598cca25cacedcf7f7580f8f80c7094eeb7af9cfbda125d469d4da4c2091d8d7a6ae0eeb80fdbc2";
+ sha512 = "64950279283837ff0bc154c24f83923c5744e9373554393d7be3fcee3064677d52ac40851bdb44a5dc42ddb504b75d0f7f48ba3af85eeb0e9a227a4c4700e90e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/te/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/te/firefox-52.0.2.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "13f611011ee3c82df3aca2dfa4e6c4edf933bebe394f162e30af7c5bd27db3e141fdbb34e3491130605c6af9913a2a95d41d2b3a74cc4f31264e0bc7893bdb45";
+ sha512 = "645c17713775bb33636b67d6390e4ba419a409dc9b26c66644a61df96dba9ce1b921fdacb179a711826b71124c71d65acd64bd6f8633d26b524bc97850bab68f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/th/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/th/firefox-52.0.2.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "f7d474dbd9cec1c84406ff1f56249896c37e0d7f4c2e7b513dae1e2d2f1278c88cdfa56dd291e4d63746060f0d8e9a71d34f4e5b3004165b70e274e5bfa7e1b8";
+ sha512 = "96131590a5d6c0bd06e319a35466873c08b90f7922499827e84044f5b69b10ef0d79435652487761ebad0740348244204bc5deed707b6c293e15f7b48ba254fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/tr/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/tr/firefox-52.0.2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "51a785b556800301ad6a3dde8fee0606d74f00bab1b75fe188d83cfba67a4de2dde402e542cef62eae04059217d5e5acf29f62691c03d4e024f85264778872aa";
+ sha512 = "5b290f2e223f943b9b7c7df43df6ec01dbb5744d7db8c35256896ac5c4ae216fe0af72ffa6797d7a4b7c69eb9e742b48e2242914b52d02a99ed1c8a384030bc8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/uk/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/uk/firefox-52.0.2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "76f12345ce05edfebd0c5c14b894a0affdcae45899c46a229eeff1930bbd1302f7e1d80f007f0e3b831d8b1460b86a7f607924c24c39160768cf254825178a39";
+ sha512 = "112741b2048410a65d7070b2d7c8a6cc0ae2bef812d626aaf3efd907afe50bba496bd6af06edbd433140040722fc6b7999695f7e2a9cfd3049eb105219a1004f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/uz/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/uz/firefox-52.0.2.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "7d6ec5c13514721741cfb569769137ea28516279b494b77fc066be89ebdef629d5c15f878ad62d794e5c1e345bc8e2851dbdfb9575f09c8d848d1a61c638463a";
+ sha512 = "1cbc2e527e928d4afaf138ae0515e9d6c3c2b7bb95f097c88a697c14988b84f765eb328509f451b024e2b62596f93c85ef298d5ffc76c4a8244cc77c10d9db05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/vi/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/vi/firefox-52.0.2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "c27e0109761f2199c7013abbd206abb24bc33a60d1b87f39ca50a05fc44c4436507b94cf72c7cac9dd30ee0613bf2b32b27272878a446185166f3c83e35ca1db";
+ sha512 = "925658b5946201243ebbb6c1a92537702e0afc1e67f990ecdc8b17c976791e671907c314b0681fef7eacd63a9ec554af25862f6a98c1b1508bc1c0fc2a282d35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/xh/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/xh/firefox-52.0.2.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "8c46324dd71f3ef17e998911100c451701fdcbecc460facffd1ea43074ceec54b1b84070168496ef38706fd52a69306de76709ba100214c3c9d11252c1fe7d9a";
+ sha512 = "0ff098e6fc96238a475cbd209f03d888bc3a23fdeb45497e2ba86f52f6aad6d69b679af83f559d9b9086f01c0fcf894025138dafe6d9250b1851769a1b262e64";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/zh-CN/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/zh-CN/firefox-52.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "6bb1e84bdea7b61ac4cc4b145478a167993bc843a4171d97bc9f6a06969eee72f527c25f3b2add2ba5341aa1aa5995b3cfe6d691a4e1ed315cec0df522911313";
+ sha512 = "cc0bca5885820769253613f851159e91e2a982616cc84fde27d57ed0064b0e650a6239bfb8c291e2889cb2e5d1fd29de6d8e828e9e6defd65fff030d79d2ef3f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/zh-TW/firefox-52.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/zh-TW/firefox-52.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "172364ccbacf6918571440cb9910eabb43457deba65449d95adfff550ac3d56b3118d21f862050a6df97ff173f079e8f2c48b41a01ec160da263bf7903c737b3";
+ sha512 = "f40191f32c211314a6ee4bbae6675eeeb70dddb10cf770c197440969487722ecf1543a2479cd18b3e55d927d642b54d06722822ac99851d2e1d400d9784baa38";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index d44e11ec853..1ca50ec8954 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -153,8 +153,8 @@ in {
firefox-unwrapped = common {
pname = "firefox";
- version = "52.0.1";
- sha512 = "535e2cc0ee645d4ebe9f1d2d1f4fbb16ff5d1745ce493add6b2e323ca3b0907c3054705c5a15eaadb314d5d6474ba1825554fd1ff0780ab7f76fd3f9672a6974";
+ version = "52.0.2";
+ sha512 = "15668625d212acf874b560d0adf738faf3e0df532c549ab94e1d91944542e13bf16265f08fca1eded42820f9b7ad3f0ff70a8b5bc9adde0a79d11e022bb1158e";
updateScript = import ./update.nix {
attrPath = "firefox-unwrapped";
inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;
@@ -163,8 +163,8 @@ in {
firefox-esr-unwrapped = common {
pname = "firefox-esr";
- version = "52.0.1esr";
- sha512 = "c1f0aea279254e7788f62bba7892840edd2b667f385a649d374c9e783b93ec7faf9e5ebfccd04cd94f46da37aeb6bd7785d17faca2ad441a0b6e8587917faab2";
+ version = "52.0.2esr";
+ sha512 = "a0f31479e5265c7f40d3013c3dc8368c6bdf03f21f1c9054fb2ae5557065584da433b288b493680d6147a3b11155f41bd33ad2a5d53c6eaa507258c7e00d7335";
updateScript = import ./update.nix {
attrPath = "firefox-esr-unwrapped";
versionSuffix = "esr";
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index befe3cb21f9..f504c3c2b33 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://links.twibright.com/;
description = "A small browser with some graphics support";
- maintainers = with maintainers; [ raskin urkud viric ];
+ maintainers = with maintainers; [ raskin viric ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 30e8af85b2a..2863ee876e7 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -37,7 +37,7 @@
let
mirror = https://get.geo.opera.com/pub/opera/desktop;
- version = "43.0.2442.991";
+ version = "44.0.2510.857";
rpath = stdenv.lib.makeLibraryPath [
@@ -91,12 +91,12 @@ in stdenv.mkDerivation {
if stdenv.system == "i686-linux" then
fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
- sha256 = "0gd30b5gs2n4ypyn2ky2dlz648akmss2kixb8dqsy4yfd0mz7xqr";
+ sha256 = "1589phaxbzmsr70afzqkrlm4fy4nwf2c0gn4rbv2ah2bq62bcp36";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
- sha256 = "1pj2d3zhzyavv2gj3v5w07m14679k2vlbfk6sd9bjdy6g7fb5f7x";
+ sha256 = "1fah9pm42ljdcdqgxjikb03c8393smhh3g2rbkhrvmjwknba05ym";
}
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index b167b59f03c..bd334356df5 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -3,21 +3,21 @@
, dbus, dbus_glib, file, fontconfig, freetype
, gstreamer, gst-plugins-base, gst_all_1
, gtk2, hunspell, icu, libevent, libjpeg, libnotify
-, libstartup_notification, libvpx, makeWrapper, mesa
-, nspr, nss, pango, perl, python, libpulseaudio, sqlite
+, libstartup_notification, libvpx, makeWrapper, mesa
+, nspr, nss, pango, perl, python, libpulseaudio, sqlite
, unzip, xlibs, which, yasm, zip, zlib
}:
stdenv.mkDerivation rec {
name = "palemoon-${version}";
- version = "27.1.1";
+ version = "27.2.1";
src = fetchFromGitHub {
name = "palemoon-src";
owner = "MoonchildProductions";
repo = "Pale-Moon";
- rev = "a35936746069e6591181eb67e5f9ea094938bae5";
- sha256 = "0hns5993dh93brwz3z4xp1zp8n90x1hajxylv17zybpysax64jsk";
+ rev = version + "_Release";
+ sha256 = "1yyipxd5lmavf4aca4vrcnp7hb8zkn4sv2zp6n2cm6w4pxlza0g4";
};
desktopItem = makeDesktopItem {
@@ -79,6 +79,8 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
+ mkdir -p $out/share/applications
+ cp ${desktopItem}/share/applications/* $out/share/applications
cd $builddir
$src/mach install
'';
diff --git a/pkgs/applications/networking/browsers/surf/webkit2.nix b/pkgs/applications/networking/browsers/surf/webkit2.nix
index 4a7b3d44e79..929bf7dbcb2 100644
--- a/pkgs/applications/networking/browsers/surf/webkit2.nix
+++ b/pkgs/applications/networking/browsers/surf/webkit2.nix
@@ -6,9 +6,9 @@
let
# http://git.suckless.org/surf/log/?h=surf-webkit2
- rev = "37e43501d80710533f3ec0bd61ee84916c8524a4";
- sha256 = "1q388rzm4irpaam4z8xycbyh5dgkjlar5jn1iw7zfls1pbpzr5br";
- date = "2017-03-06";
+ rev = "7e02344a615a61246ccce1c7f770e88fbd57756e";
+ sha256 = "11f93fbjhl7nfgwkcc45lcm3x1wk5h87ap8fbw9w855021i57pp6";
+ date = "2017-03-22";
in
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/browsers/torbrowser/default.nix b/pkgs/applications/networking/browsers/torbrowser/default.nix
new file mode 100644
index 00000000000..5ce7c4780c8
--- /dev/null
+++ b/pkgs/applications/networking/browsers/torbrowser/default.nix
@@ -0,0 +1,329 @@
+{ stdenv
+, fetchurl
+, makeDesktopItem
+
+# Common run-time dependencies
+, zlib
+
+# libxul run-time dependencies
+, alsaLib
+, atk
+, cairo
+, dbus
+, dbus_glib
+, fontconfig
+, freetype
+, gdk_pixbuf
+, glib
+, gtk2
+, libX11
+, libXext
+, libXrender
+, libXt
+, pango
+
+# Pulseaudio support
+, pulseaudioSupport ? mediaSupport
+, libpulseaudio
+
+# Media support (implies pulseaudio support)
+, mediaSupport ? false
+, gstreamer
+, gst-plugins-base
+, gst-plugins-good
+, gst-ffmpeg
+, gmp
+, ffmpeg
+
+# Pluggable transport dependencies
+, python27
+}:
+
+with stdenv.lib;
+
+let
+ libPath = makeLibraryPath ([
+ alsaLib
+ atk
+ cairo
+ dbus
+ dbus_glib
+ fontconfig
+ freetype
+ gdk_pixbuf
+ glib
+ gtk2
+ libX11
+ libXext
+ libXrender
+ libXt
+ pango
+ stdenv.cc.cc
+ zlib
+ ]
+ ++ optionals pulseaudioSupport [ libpulseaudio ]
+ ++ optionals mediaSupport [
+ gstreamer
+ gst-plugins-base
+ gmp
+ ffmpeg
+ ]);
+
+ gstPluginsPath = concatMapStringsSep ":" (x:
+ "${x}/lib/gstreamer-0.10") [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-good
+ gst-ffmpeg
+ ];
+
+ # Library search path for the fte transport
+ fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
+
+ # Upstream source
+ version = "6.5.1";
+
+ lang = "en-US";
+
+ srcs = {
+ "x86_64-linux" = fetchurl {
+ url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
+ sha256 = "1p2bgavvyzahqpjg9vp14c0s50rmha3v1hs1c8zvz6fj8fgrhn0i";
+ };
+
+ "i686-linux" = fetchurl {
+ url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
+ sha256 = "1zfghr01bhpn39wqaw7hyx7yap7xyla4m3mrgz2vi9a5qsyxmbcr";
+ };
+ };
+in
+
+stdenv.mkDerivation rec {
+ name = "tor-browser-${version}";
+ inherit version;
+
+ src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
+
+ preferLocalBuild = true;
+
+ desktopItem = makeDesktopItem {
+ name = "torbrowser";
+ exec = "tor-browser";
+ icon = "torbrowser";
+ desktopName = "Tor Browser";
+ genericName = "Web Browser";
+ comment = meta.description;
+ categories = "Network;WebBrowser;Security;";
+ };
+
+ buildCommand = ''
+ # For convenience ...
+ TBB_IN_STORE=$out/share/tor-browser
+ interp=$(< $NIX_CC/nix-support/dynamic-linker)
+
+ # Unpack & enter
+ mkdir -p "$TBB_IN_STORE"
+ tar xf "${src}" -C "$TBB_IN_STORE" --strip-components=2
+ pushd "$TBB_IN_STORE"
+
+ # Set ELF interpreter
+ for exe in firefox TorBrowser/Tor/tor ; do
+ patchelf --set-interpreter "$interp" "$exe"
+ done
+
+ # The final libPath. Note, we could split this into firefoxLibPath
+ # and torLibPath for accuracy, but this is more convenient ...
+ libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor
+
+ # Fixup paths to pluggable transports.
+ sed -i TorBrowser/Data/Tor/torrc-defaults \
+ -e "s,./TorBrowser,$TBB_IN_STORE/TorBrowser,g"
+
+ # Fixup obfs transport. Work around patchelf failing to set
+ # interpreter for pre-compiled Go binaries by invoking the interpreter
+ # directly.
+ sed -i TorBrowser/Data/Tor/torrc-defaults \
+ -e "s|\(ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit\) exec|\1 exec $interp|" \
+
+ # Fixup fte transport
+ #
+ # Note: the script adds its dirname to search path automatically
+ sed -i TorBrowser/Tor/PluggableTransports/fteproxy.bin \
+ -e "s,/usr/bin/env python,${python27.interpreter},"
+
+ patchelf --set-rpath "${fteLibPath}" TorBrowser/Tor/PluggableTransports/fte/cDFA.so
+
+ # Prepare for autoconfig.
+ #
+ # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment
+ cat >defaults/pref/autoconfig.js <mozilla.cfg <fonts,$TBB_IN_STORE/fonts,"
+
+ # Move default extension overrides into distribution dir, to avoid
+ # having to synchronize between local state and store.
+ mv TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js defaults/pref/torbrowser.js
+
+ # Hard-code paths to geoip data files. TBB resolves the geoip files
+ # relative to torrc-defaults_path but if we do not hard-code them
+ # here, these paths end up being written to the torrc in the user's
+ # state dir.
+ cat >>TorBrowser/Data/Tor/torrc-defaults < "$out/bin/tor-browser" << EOF
+ #! ${stdenv.shell}
+ set -o errexit -o nounset
+
+ # Enter local state directory.
+ REAL_HOME=\$HOME
+ TBB_HOME=\''${TBB_HOME:-''${XDG_DATA_HOME:-\$REAL_HOME/.local/share}/tor-browser}
+ HOME=\$TBB_HOME
+
+ mkdir -p "\$HOME"
+ cd "\$HOME"
+
+ # Initialize empty TBB local state directory hierarchy. We
+ # intentionally mirror the layout that TBB would see if executed from
+ # the unpacked bundle dir.
+ mkdir -p "\$HOME/TorBrowser" "\$HOME/TorBrowser/Data"
+
+ # Initialize the Tor data directory.
+ mkdir -p "\$HOME/TorBrowser/Data/Tor"
+
+ # Initialize the browser profile state. Note that the only data
+ # copied from the Store payload is the initial bookmark file, which is
+ # never updated once created. All other files under user's profile
+ # dir are generated by TBB.
+ mkdir -p "\$HOME/TorBrowser/Data/Browser/profile.default"
+ cp -u --no-preserve=mode,owner "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/bookmarks.html" \
+ "\$HOME/TorBrowser/Data/Browser/profile.default/bookmarks.html"
+
+ # Clear out some files that tend to capture store references but are
+ # easily generated by firefox at startup.
+ rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json}
+
+ # Ensure that we're always using the up-to-date extensions.
+ ln -snf "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions" \
+ "\$HOME/TorBrowser/Data/Browser/profile.default/extensions"
+
+ ${optionalString pulseaudioSupport ''
+ # Figure out some envvars for pulseaudio
+ : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}"
+ : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}"
+ : "\''${PULSE_SERVER:=\$XDG_RUNTIME_DIR/pulse/native}"
+ : "\''${PULSE_COOKIE:=\$XDG_CONFIG_HOME/pulse/cookie}"
+ ''}
+
+ # Font cache files capture store paths; clear them out on the off
+ # chance that TBB would continue using old font files.
+ rm -rf "\$HOME/.cache/fontconfig"
+
+ # Lift-off
+ #
+ # XAUTHORITY and DISPLAY are required for TBB to work at all.
+ #
+ # DBUS_SESSION_BUS_ADDRESS is inherited to avoid auto-launch; to
+ # prevent that, set it to an empty/invalid value prior to running
+ # tor-browser.
+ #
+ # PULSE_SERVER is necessary for audio playback.
+ #
+ # Setting FONTCONFIG_FILE is required to make fontconfig read the TBB
+ # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024
+ # indicates the system fonts.conf being used instead.
+ exec env -i \
+ HOME="\$HOME" \
+ XAUTHORITY="\$XAUTHORITY" \
+ DISPLAY="\$DISPLAY" \
+ DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \
+ \
+ PULSE_SERVER="\''${PULSE_SERVER:-}" \
+ PULSE_COOKIE="\''${PULSE_COOKIE:-}" \
+ \
+ GST_PLUGIN_SYSTEM_PATH="${optionalString mediaSupport gstPluginsPath}" \
+ GST_REGISTRY="/dev/null" \
+ GST_REGISTRY_UPDATE="no" \
+ \
+ FONTCONFIG_FILE="$FONTCONFIG_FILE" \
+ \
+ LD_LIBRARY_PATH="$libPath" \
+ \
+ "$TBB_IN_STORE/firefox" \
+ --class "Tor Browser" \
+ -no-remote \
+ -profile "\$HOME/TorBrowser/Data/Browser/profile.default" \
+ "\''${@}"
+ EOF
+ chmod +x $out/bin/tor-browser
+
+ # Easier access to docs
+ mkdir -p $out/share/doc
+ ln -s $TBB_IN_STORE/TorBrowser/Docs $out/share/doc/tor-browser
+
+ # Install .desktop item
+ mkdir -p $out/share/applications
+ cp $desktopItem/share/applications"/"* $out/share/applications
+ sed -i $out/share/applications/torbrowser.desktop \
+ -e "s,Exec=.*,Exec=$out/bin/tor-browser,"
+
+ # Install icons
+ mkdir -p $out/share/pixmaps
+ cp browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png
+
+ # Check installed apps
+ echo "Checking bundled Tor ..."
+ LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null
+
+ echo "Checking tor-browser wrapper ..."
+ DISPLAY="" XAUTHORITY="" DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \
+ $out/bin/tor-browser --version >/dev/null
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Tor Browser Bundle";
+ homepage = https://www.torproject.org/;
+ platforms = attrNames srcs;
+ maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ];
+ hydraPlatforms = [];
+ # MPL2.0+, GPL+, &c. While it's not entirely clear whether
+ # the compound is "libre" in a strict sense (some components place certain
+ # restrictions on redistribution), it's free enough for our purposes.
+ license = licenses.free;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index bf69eac318d..69fe6a1730a 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -18,13 +18,13 @@ with lib;
stdenv.mkDerivation rec {
name = "kubernetes-${version}";
- version = "1.5.4";
+ version = "1.5.6";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "1xhz6m6ly6ffj60id9ms1liijlrik8n2pxyzb5m77ym3zf7rxlpl";
+ sha256 = "0mkg4vgz9szgq1k5ignkdr5gmg703xlq8zsrr422a1qfqb8zp15w";
};
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index bdcb0a84625..7ba8a2ea1cd 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -1,4 +1,5 @@
{ stdenv, fetchzip, makeWrapper, jre, pythonPackages
+, RSupport? true, R
, mesosSupport ? true, mesos
, version
}:
@@ -30,6 +31,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
+ ++ optional RSupport R
++ optional mesosSupport mesos;
untarDir = "${name}-bin-${hadoopVersion}";
@@ -46,6 +48,9 @@ stdenv.mkDerivation rec {
export SPARK_HOME="$out/lib/${untarDir}"
export PYSPARK_PYTHON="${pythonPackages.python}/bin/${pythonPackages.python.executable}"
export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH"
+ ${optionalString RSupport
+ ''export SPARKR_R_SHELL="${R}/bin/R"
+ export PATH=$PATH:"${R}/bin/R"''}
${optionalString mesosSupport
''export MESOS_NATIVE_LIBRARY="$MESOS_NATIVE_LIBRARY"''}
EOF
@@ -57,7 +62,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "Lightning-fast cluster computing";
+ description = "Apache Spark is a fast and general engine for large-scale data processing";
homepage = "http://spark.apache.org";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix
index 892d8fa3300..18c55c80fc0 100644
--- a/pkgs/applications/networking/dropbox-cli/default.nix
+++ b/pkgs/applications/networking/dropbox-cli/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p "$out/bin/" "$out/share/applications"
cp data/dropbox.desktop "$out/share/applications"
+ cp -a data/icons "$out/share/icons"
+ find "$out/share/icons" -type f \! -name '*.png' -delete
substitute "dropbox.in" "$out/bin/dropbox" \
--replace '@PACKAGE_VERSION@' ${version} \
--replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 3721f7ed4af..097ff84a704 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -3,7 +3,7 @@
, libdrm, libffi, libICE, libSM
, libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
, libxml2, libxslt, ncurses, zlib
-, qtbase, qtdeclarative, qtwebkit
+, qtbase, qtdeclarative, qtwebkit, makeQtWrapper
}:
# this package contains the daemon version of dropbox
@@ -23,11 +23,11 @@
let
# NOTE: When updating, please also update in current stable,
# as older versions stop working
- version = "21.4.25";
+ version = "22.4.24";
sha256 =
{
- "x86_64-linux" = "1pgab1ah6rl30rm4dj0biq5714pfzd5jjd2bp0nmhdqn1hm5vmhv";
- "i686-linux" = "05kn8qman8ghknb0chrlmcxrxg7w6l79frkaqj6blgnhanh13h4n";
+ "x86_64-linux" = "1353mwk8hjqfc9a87zrp12klsc4anrxr7ccai4cffnq0yw2pnbfp";
+ "i686-linux" = "07gpdxq61qkj3c4aywh61zwj34w7j24gcv5y2xf2qgcwn8bykks2";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch =
@@ -68,31 +68,23 @@ in stdenv.mkDerivation {
sourceRoot = ".dropbox-dist";
- nativeBuildInputs = [ makeWrapper patchelf ];
- dontPatchELF = true; # patchelf invoked explicitly below
+ nativeBuildInputs = [ makeQtWrapper patchelf ];
dontStrip = true; # already done
installPhase = ''
mkdir -p "$out/${appdir}"
cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
+ # Vendored libraries interact poorly with our graphics drivers
rm "$out/${appdir}/libdrm.so.2"
rm "$out/${appdir}/libffi.so.6"
rm "$out/${appdir}/libGL.so.1"
rm "$out/${appdir}/libX11-xcb.so.1"
- rm "$out/${appdir}/libQt5Core.so.5"
- rm "$out/${appdir}/libQt5DBus.so.5"
- rm "$out/${appdir}/libQt5Gui.so.5"
- rm "$out/${appdir}/libQt5Network.so.5"
- rm "$out/${appdir}/libQt5OpenGL.so.5"
- rm "$out/${appdir}/libQt5PrintSupport.so.5"
- rm "$out/${appdir}/libQt5Qml.so.5"
- rm "$out/${appdir}/libQt5Quick.so.5"
- rm "$out/${appdir}/libQt5Sql.so.5"
- rm "$out/${appdir}/libQt5WebKit.so.5"
- rm "$out/${appdir}/libQt5WebKitWidgets.so.5"
- rm "$out/${appdir}/libQt5XcbQpa.so.5"
+ # Cannot use vendored Qt libraries due to problem with xkbcommon
+ rm "$out/${appdir}/"libQt5*.so.5
+ rm "$out/${appdir}/qt.conf"
+ rm -fr "$out/${appdir}/plugins"
mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* $out/share/applications
@@ -102,7 +94,7 @@ in stdenv.mkDerivation {
mkdir -p "$out/bin"
RPATH="${ldpath}:$out/${appdir}"
- makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
+ makeQtWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
--prefix LD_LIBRARY_PATH : "$RPATH"
chmod 755 $out/${appdir}/dropbox
@@ -112,33 +104,22 @@ in stdenv.mkDerivation {
INTERP=$(cat $NIX_CC/nix-support/dynamic-linker)
RPATH="${ldpath}:$out/${appdir}"
getType='s/ *Type: *\([A-Z]*\) (.*/\1/'
- find "$out/${appdir}" -type f -a -perm -0100 -print | while read obj; do
+ find "$out/${appdir}" -type f -print | while read obj; do
dynamic=$(readelf -S "$obj" 2>/dev/null | grep "DYNAMIC" || true)
-
if [[ -n "$dynamic" ]]; then
- type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType")
-
- if [[ "$type" == "EXEC" ]]; then
+ if readelf -l "$obj" 2>/dev/null | grep "INTERP" >/dev/null; then
echo "patching interpreter path in $type $obj"
patchelf --set-interpreter "$INTERP" "$obj"
+ fi
+
+ type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType")
+ if [ "$type" == "EXEC" ] || [ "$type" == "DYN" ]; then
echo "patching RPATH in $type $obj"
oldRPATH=$(patchelf --print-rpath "$obj")
patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj"
- echo "shrinking RPATH in $type $obj"
- patchelf --shrink-rpath "$obj"
-
- elif [[ "$type" == "DYN" ]]; then
-
- echo "patching RPATH in $type $obj"
- oldRPATH=$(patchelf --print-rpath "$obj")
- patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj"
-
- echo "shrinking RPATH in $type $obj"
- patchelf --shrink-rpath "$obj"
-
else
echo "unknown ELF type \"$type\"; not patching $obj"
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 95e0c502749..ffc22429d1e 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
-let version = "3.25.0"; in
+let version = "3.25.1"; in
stdenv.mkDerivation {
name = "filezilla-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
- sha256 = "1b1lb1zvm887xy3q9i5ziqvwk4ww2pd81a1msbwjrxzy5lq5ykhh";
+ sha256 = "1h9g26i16wvc3yjavd39lxifr8d21q9mvfidnwjp9ksrc1qvwww8";
};
configureFlags = [
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
index bfd4e11ccac..5645e1cebaa 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
@@ -2,16 +2,19 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "bitlbee-facebook-2015-08-27";
+ name = "bitlbee-facebook-${version}";
+ version = "1.1.0";
src = fetchFromGitHub {
- rev = "094a11b542e2cd8fac4f00fe01870ecd1cb4c062";
+ rev = "v${version}";
owner = "jgeboski";
repo = "bitlbee-facebook";
- sha256 = "1dvbl1z6fl3wswvqbs82vkqlggk24dyi8w7cmm5jh1fmaznmwqrl";
+ sha256 = "0qclyc2zz8144dc42bhfv2xxrahpiv9j2iwq9h3cmfxszvkb8r3s";
};
- buildInputs = [ bitlbee autoconf automake libtool pkgconfig glib json_glib ];
+ nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
+
+ buildInputs = [ bitlbee glib json_glib ];
preConfigure = ''
export BITLBEE_PLUGINDIR=$out/lib/bitlbee
diff --git a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix
new file mode 100644
index 00000000000..f12a14c5c92
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix
@@ -0,0 +1,104 @@
+{
+ stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, curl, dbus, expat,
+ fontconfig, freetype, glib, gnome2, libnotify, nspr, nss, systemd, xorg
+}:
+
+with stdenv.lib;
+
+let
+
+ version = "2.0.6";
+
+ rpath = makeLibraryPath [
+ alsaLib
+ atk
+ cairo
+ cups
+ curl
+ dbus
+ expat
+ fontconfig
+ freetype
+ glib
+ gnome2.GConf
+ gnome2.gdk_pixbuf
+ gnome2.gtk
+ gnome2.pango
+ libnotify
+ nspr
+ nss
+ stdenv.cc.cc
+ systemd
+
+ xorg.libxkbfile
+ xorg.libX11
+ xorg.libXcomposite
+ xorg.libXcursor
+ xorg.libXdamage
+ xorg.libXext
+ xorg.libXfixes
+ xorg.libXi
+ xorg.libXrandr
+ xorg.libXrender
+ xorg.libXtst
+ xorg.libXScrnSaver
+ ] + ":${stdenv.cc.cc.lib}/lib64";
+
+ src =
+ if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = "https://github.com/aluxian/Messenger-for-Desktop/releases/download/v2.0.6/messengerfordesktop-2.0.6-linux-amd64.deb";
+ sha256 = "bf3f3ed9ac46ceb4b7dffbeb33c7d15bbcbfcdd141c4dbfbb620e8bfefae906b";
+ }
+ else
+ throw "Messenger for Desktop is not supported on ${stdenv.system}";
+
+in stdenv.mkDerivation {
+ name = "messenger-for-desktop-${version}";
+
+ inherit src;
+
+ buildInputs = [ dpkg ];
+ unpackPhase = "true";
+ buildCommand = ''
+ mkdir -p $out
+ dpkg -x $src $out
+
+ mv $out/usr/share $out/share
+ mv $out/opt/messengerfordesktop $out/libexec
+ rmdir $out/usr $out/opt
+
+ chmod -R g-w $out
+
+ # patch the binaries
+ for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
+ patchelf --set-rpath ${rpath}:$out/libexec $file || true
+ done
+
+ # add symlink to bin
+ mkdir -p $out/bin
+ ln -s $out/libexec/messengerfordesktop $out/bin/messengerfordesktop
+
+ # Fix the desktop link
+ substituteInPlace $out/share/applications/messengerfordesktop.desktop \
+ --replace /opt/messengerfordesktop/messengerfordesktop $out/bin/messengerfordesktop
+ '';
+
+ meta = {
+ description = "Bring messenger.com to your Linux desktop.";
+ longDescription = ''
+ A simple & beautiful desktop client for Facebook Messenger. Chat without
+ distractions on OS X, Windows and Linux. Not affiliated with Facebook.
+ This is NOT an official product.
+ '';
+ homepage = https://messengerfordesktop.org;
+ license = licenses.mit;
+ maintainers = [
+ maintainers.shawndellysse
+ ];
+ platforms = [
+ "x86_64-linux"
+ ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index 36be2517fbd..6693550bd3b 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }:
-let version = "1.20.0"; in
+let version = "1.22.0"; in
stdenv.mkDerivation {
name = "pidgin-sipe-${version}";
src = fetchurl {
url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz";
- sha256 = "14d8q9by531hfssm6ydn75xkgidka3ar4sy3czjdb03s1ps82srs";
+ sha256 = "1aeb348e2ba79b82b1fd102555f86cdc42eaa6f9e761b771d74c4f9c9cf15fc3";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index f0c99841c1b..d05ff845ebb 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ profpatsch AndersonTorres ];
platforms = platforms.linux;
+ broken = true;
};
}
#TODO: appindicator, for system tray plugin (by @profpatsch)
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
index 592fc2b5934..0a5a309c27d 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
@@ -54,7 +54,7 @@ let
meta = {
inherit (kdelibs4.meta) platforms;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
);
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 2ade2fd3edd..4cf0d2a0449 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Logger service for Telepathy framework";
homepage = http://telepathy.freedesktop.org/wiki/Logger ;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.gnu; # Arbitrary choice
};
}
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
deleted file mode 100644
index 7d06d57ca9a..00000000000
--- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfigUpstream, libxslt, telepathy_glib, libxml2, dbus_glib
-, sofia_sip }:
-
-stdenv.mkDerivation rec {
- pname = "telepathy-rakia";
- name = "${pname}-0.8.0";
-
- src = fetchurl {
- url = "${meta.homepage}/releases/${pname}/${name}.tar.gz";
- sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv";
- };
-
- nativeBuildInputs = [pkgconfigUpstream libxslt ];
- buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip telepathy_glib.python ];
-
- meta = {
- homepage = http://telepathy.freedesktop.org;
- };
-}
diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
deleted file mode 100644
index b4403a780ed..00000000000
--- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg
-, bwidget, makeWrapper, xlibsWrapper
-, withSitePlugins ? true
-, theme ? null
-}:
-
-with stdenv.lib;
-
-let
- version = "1.1";
-
- main = {
- name = "tkabber";
- sha256 = "1ip0mi2icqkjxiam4qj1qcynnz9ck1ggzcbcqyjj132hakd855a2";
- };
-
- plugins = {
- name = "tkabber-plugins";
- sha256 = "1dr12rh4vs1w1bga45k4ijgxs39801c1k4z3b892pn1dwv84il5y";
- };
-
- tclLibraries = [ bwidget tcllib tcltls tclgpg ];
-
- getTclLibPath = p: "${p}/lib/${p.libPrefix}";
-
- tclLibPaths = stdenv.lib.concatStringsSep " "
- (map getTclLibPath tclLibraries);
-
- mkTkabber = attrs: stdenv.mkDerivation (rec {
- name = "${attrs.name}-${version}";
-
- src = fetchurl {
- url = "http://files.jabber.ru/tkabber/${name}.tar.xz";
- inherit (attrs) sha256;
- };
-
- prePatch = ''
- sed -e "s@/usr/local@$out@" -i Makefile
- '';
- } // removeAttrs attrs [ "name" "sha256" ]);
-
-in mkTkabber (main // {
- postPatch = optionalString (theme != null) ''
- themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb"
- sed -i '/^if.*load_default_xrdb/,/^}$/ {
- s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$themePath"'"@
- }' tkabber.tcl
- '';
-
- postInstall = ''
- for prog in $out/bin/*; do
- wrapProgram "$prog" \
- --prefix PATH : "${tk}/bin" \
- --set TCLLIBPATH '${tclLibPaths}' \
- ${optionalString withSitePlugins ''
- --set TKABBER_SITE_PLUGINS '${mkTkabber plugins}/share/tkabber-plugins'
- ''}
- done
- '';
-
- buildInputs = [ tcl tk xlibsWrapper makeWrapper ] ++ tclLibraries;
-
- meta = {
- homepage = "http://tkabber.jabber.ru/";
- description = "A GUI XMPP (Jabber) client written in Tcl/Tk";
- license = stdenv.lib.licenses.gpl2;
- };
-})
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
deleted file mode 100644
index 067b1c7884a..00000000000
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ /dev/null
@@ -1,104 +0,0 @@
-{ alsaLib
-, fetchurl
-, gcc
-, glib
-, gst-plugins-base
-, gstreamer
-, icu
-, libpulseaudio
-, libuuid
-, libxml2
-, libxslt
-, makeQtWrapper
-, qt56
-, sqlite
-, stdenv
-, xlibs
-, xorg
-, zlib
-}:
-
-stdenv.mkDerivation rec {
- name = "zoom-us";
- meta = {
- homepage = http://zoom.us;
- description = "zoom.us instant messenger";
- license = stdenv.lib.licenses.unfree;
- platforms = stdenv.lib.platforms.linux;
- };
-
- version = "2.0.81497.0116";
- src = fetchurl {
- url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
- sha256 = "1lq59l5vxirjgcsrl6r4nqgvjr519gkn69alffv1f1fwq5vzif7j";
- };
-
- phases = [ "unpackPhase" "installPhase" ];
- nativeBuildInputs = [ makeQtWrapper ];
- buildInputs = [
- alsaLib
- gcc.cc
- glib
- gst-plugins-base
- gstreamer
- icu
- libpulseaudio
- libuuid
- libxml2
- libxslt
- qt56.qtbase
- qt56.qtdeclarative
- qt56.qtlocation
- qt56.qtscript
- qt56.qtwebchannel
- qt56.qtwebengine
- sqlite
- xlibs.xcbutilkeysyms
- xorg.libX11
- xorg.libxcb
- xorg.libXcomposite
- xorg.libXext
- xorg.libXfixes
- xorg.libXrender
- xorg.xcbutilimage
- zlib
- ];
-
- libPath = stdenv.lib.makeLibraryPath buildInputs;
-
- installPhase = ''
- mkdir -p $out/share
- cp -r \
- application-x-zoom.png \
- audio \
- imageformats \
- config-dump.sh \
- dingdong1.pcm \
- dingdong.pcm \
- doc \
- Droplet.pcm \
- Droplet.wav \
- platforminputcontexts \
- platforms \
- platformthemes \
- leave.pcm \
- ring.pcm \
- ring.wav \
- version.txt \
- xcbglintegrations \
- zcacert.pem \
- zoom \
- Zoom.png \
- ZXMPPROOT.cer \
- $out/share
-
- patchelf \
- --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
- --set-rpath ${libPath} \
- $out/share/zoom
- paxmark m $out/share/zoom
- wrapQtProgram "$out/share/zoom"
- mkdir -p $out/bin
- ln -s $out/share/zoom $out/bin/zoom-us
- '';
- }
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index d46539a88b7..7ab6a4438f3 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
stdenv.mkDerivation rec {
- version = "1.0.1";
+ version = "1.0.2";
name = "irssi-${version}";
src = fetchurl {
url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
- sha256 = "1nqrm376bipvh4x483vygydjzs05n4fmfzip1gfakq1vfqqfhshr";
+ sha256 = "1fas6dqz6g8m2400spvkhfxihj3w06qb917h4vhcb716g9wpjkwf";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
index 17d66ba6043..c008c478d22 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
-, notmuch, openssl, pkgconfig, sqlite, xapian
+, notmuch, openssl, pkgconfig, sqlite, xapian, zlib
}:
stdenv.mkDerivation rec {
version = "2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
url = "http://www.muchsync.org/src/${name}.tar.gz";
sha256 = "1dqp23a043kkzl0g2f4j3m7r7lg303gz7a0fsj0dm5ag3kpvp5f1";
};
- buildInputs = [ notmuch openssl pkgconfig sqlite xapian ];
+ buildInputs = [ notmuch openssl pkgconfig sqlite xapian zlib ];
meta = {
description = "Synchronize maildirs and notmuch databases";
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index b1cdd509f98..509a2ab0118 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -1,5 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2
-
, openssl ? null
, gpgme ? null
, sslSupport ? true
@@ -13,15 +12,16 @@ assert gpgSupport -> gpgme != null;
stdenv.mkDerivation rec {
name = "sylpheed-${version}";
- version = "3.5.0";
+ version = "3.5.1";
src = fetchurl {
url = "http://sylpheed.sraoss.jp/sylpheed/v3.5/${name}.tar.bz2";
- sha256 = "0p50cr9h8b7cv1ayxhqxpj3kv0b7k9dga7lmmfb1lvyagg8n42sa";
+ sha256 = "11qhbfyvi5hxv1f448zgbzgrdjj3a4mxj2bfpk6k4bqf7ahh8nis";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs =
- [ pkgconfig gtk2 ]
+ [ gtk2 ]
++ optional sslSupport openssl
++ optional gpgSupport gpgme;
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 7c773b0db8b..0de567e7a74 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -132,5 +132,7 @@ in {
mumble = client stableSource;
mumble_git = client gitSource;
murmur = server stableSource;
- murmur_git = server gitSource;
+ murmur_git = (server gitSource).overrideAttrs (old: {
+ meta = old.meta // { broken = true; };
+ });
}
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 12692b9566f..6feeacc675a 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -10,7 +10,7 @@ let
version = "2.92";
in
-with { inherit (stdenv.lib) optional optionals optionalString; };
+let inherit (stdenv.lib) optional optionals optionalString; in
stdenv.mkDerivation rec {
name = "transmission-" + optionalString enableGTK3 "gtk-" + version;
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index cf7afc37b8b..c656ff24df8 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -22,14 +22,15 @@
, alsaLib
}:
-stdenv.mkDerivation rec {
+let versionRec = { major = "13"; minor = "4"; patch = "0"; };
+in stdenv.mkDerivation rec {
name = "citrix-receiver-${version}";
- version = "13.4.0";
+ version = with versionRec; "${major}.${minor}.${patch}";
homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
- src = requireFile rec {
+ src = with versionRec; requireFile rec {
name = "${prefixWithBitness}-${version}.10109380.tar.gz";
sha256 =
if stdenv.is64bit
@@ -41,12 +42,14 @@ stdenv.mkDerivation rec {
${homepage}
- (if you do not find version ${version} there, try https://www.citrix.com/downloads/citrix-receiver/)
+ (if you do not find version ${version} there, try at
+ https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-${major}-${minor}.html
+ or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux")
Once you have downloaded the file, please use the following command and re-run the
installation:
- nix-prefetch-url file://$PWD/${name}
+ nix-prefetch-url file://\$PWD/${name}
'';
};
@@ -135,7 +138,8 @@ stdenv.mkDerivation rec {
echo "Wrapping wfica..."
mkdir "$out/bin"
- makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \
+ makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
+ --add-flags "-icaroot $ICAInstDir" \
--set ICAROOT "$ICAInstDir" \
--set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 154ff33c844..76027f29a70 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
vector graphics.
'';
homepage = http://calligra.org;
- maintainers = with maintainers; [ urkud phreedom ebzzry ];
+ maintainers = with maintainers; [ phreedom ebzzry ];
inherit (kdelibs4.meta) platforms;
license = licenses.gpl2;
};
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 59389a69e7c..c43a06838b8 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -22,7 +22,7 @@ let
primary-src = import ./default-primary-src.nix { inherit fetchurl; };
in
-with { inherit (primary-src) major minor subdir version; };
+let inherit (primary-src) major minor subdir version; in
let
lib = stdenv.lib;
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index b973a4192bb..7a2174b557e 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -22,7 +22,7 @@ let
primary-src = import ./still-primary-src.nix { inherit fetchurl; };
in
-with { inherit (primary-src) major minor subdir version; };
+let inherit (primary-src) major minor subdir version; in
let
lib = stdenv.lib;
diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix
index 9a59bef617b..0e53d58a083 100644
--- a/pkgs/applications/office/marp/default.nix
+++ b/pkgs/applications/office/marp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "marp-${version}";
- version = "0.0.9";
+ version = "0.0.10";
src = fetchurl {
url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz";
- sha256 = "142c35d88rkgjy85f4204givgx0p1qyfpipbrsa11lp3cb6jzhn2";
+ sha256 = "0x4qldbyvq88cs12znxv33bb0nxr3wxcwhyr97pkjrjc2cn7nphx";
};
sourceRoot = ".";
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index d24c59b87d9..0a14a87cf56 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -36,14 +36,14 @@ let
then "i386"
else "amd64";
- shortVersion = "1.17.8-stable";
+ shortVersion = "1.17.9-stable";
version = "${shortVersion}_${arch}";
url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
sha256 = if stdenv.system == arch32
- then "0j2hi0kd3cjjs47fxdzilc3rh02kzkdhvh70yyv7j8n58lnyjnx7"
- else "0pi1bis0jmy618c1jn6b61mn666w7546xzicbqv1g6c4l8s3wgm5";
+ then "0z04r3ipwp2vca3qhp3b1zj0m12h023ynmbjsz4sysnd1bb5f2yr"
+ else "0h3m6s3s5283g9w3sm4fszhhnzgmqw49nr0ihvdwyxrgawxmz4vg";
deps = [
qt5.qtbase
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index 71f38bb8d3c..0cf85840db6 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = {
description = "GTD for KDE";
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
inherit (kdelibs4.meta) platforms;
};
}
diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix
index bdb93c99226..9c79bfe1a55 100644
--- a/pkgs/applications/science/astronomy/xplanet/default.nix
+++ b/pkgs/applications/science/astronomy/xplanet/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
description = "Renders an image of the earth or other planets into the X root window";
homepage = http://xplanet.sourceforge.net;
license = "GPL";
- maintainers = [ stdenv.lib.maintainers.sander stdenv.lib.maintainers.urkud ];
+ maintainers = [ stdenv.lib.maintainers.sander ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix
index 775e2ec3cc8..e9d99aeb254 100644
--- a/pkgs/applications/science/biology/ncbi-tools/default.nix
+++ b/pkgs/applications/science/biology/ncbi-tools/default.nix
@@ -9,16 +9,14 @@
stdenv.mkDerivation rec {
name = "ncbi_tools";
- ncbi_version="Dec_31_2008";
+ ncbi_version = "Dec_31_2008";
src = fetchurl {
url = "ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/${ncbi_version}/ncbi_cxx--${ncbi_version}.tar.gz";
sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr";
};
configureFlags = "--without-debug --with-bin-release --with-dll --without-static";
- # PIC flag (position independent code for shared libraries)
- NIX_CXXFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
- buildInputs = [cpio];
+ buildInputs = [ cpio ];
meta = {
description = ''NCBI Bioinformatics toolbox (incl. BLAST)'';
@@ -26,5 +24,6 @@ stdenv.mkDerivation rec {
homepage = http://www.ncbi.nlm.nih.gov/IEB/ToolBox/;
license = "GPL";
priority = "5"; # zlib.so gives a conflict with zlib
+ broken = true;
};
}
diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix
index 1e9f3ee521b..878dfde8f4e 100644
--- a/pkgs/applications/science/chemistry/avogadro/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Molecule editor and visualizer";
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.mesaPlatforms;
};
}
diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix
index 0cbe1d1cb37..49245c73f2c 100644
--- a/pkgs/applications/science/logic/redprl/default.nix
+++ b/pkgs/applications/science/logic/redprl/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchgit, mlton }:
stdenv.mkDerivation {
- name = "redprl-2016-09-22";
+ name = "redprl-2017-03-28";
src = fetchgit {
url = "https://github.com/RedPRL/sml-redprl.git";
- rev = "3215faf0d494f4ac14d6e10172329a161df192c4";
- sha256 = "0pcq4q9xy34j7ziwbly4qxccpkcrl92r9y11bv6hdkbzwm1g2a77";
+ rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b";
+ sha256 = "0cihwnd78d3ksxp6mppifm7xpi3fsii5mixvicajy87ggw8z305c";
fetchSubmodules = true;
};
buildInputs = [ mlton ];
diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index aee4831034d..916f0dc360f 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "geogebra-${version}";
- version = "5-0-338-0";
+ version = "5-0-346-0";
preferLocalBuild = true;
src = fetchurl {
url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
- sha256 = "1namwib3912zjizgl9swan0fwgmq9kvfq5k5y8lz818vh4lv88kx";
+ sha256 = "13yiksdk5qwa7c5zp5l0h3czqq31qlf04ncgrh8mn7z70ng1f3l4";
};
srcIcon = fetchurl {
diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix
index 9ea43023d57..ee67af62bb1 100644
--- a/pkgs/applications/science/math/ginac/default.nix
+++ b/pkgs/applications/science/math/ginac/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "GiNaC is Not a CAS";
homepage = http://www.ginac.de/;
- maintainers = with maintainers; [ lovek323 urkud ];
+ maintainers = with maintainers; [ lovek323 ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 85a13f7ac37..5a19f73d9cf 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -57,6 +57,7 @@ stdenv.mkDerivation ({
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.peti ];
+ broken = ecl != null;
};
} // (stdenv.lib.optionalAttrs ecl-fasl {
preConfigure = ''
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index af4cda87473..e6630815ba1 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.sagemath.org";
description = "A free open source mathematics software system";
license = stdenv.lib.licenses.gpl2Plus;
+ broken = true;
};
}
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index 6cd66c62a0a..9cd72c2fd50 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -44,9 +44,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A CAS for polynomial computations";
- maintainers = with maintainers;
- [ raskin ];
- platforms = platforms.linux;
+ maintainers = with maintainers; [ raskin ];
+ platforms = subtractLists platforms.i686 platforms.linux;
license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
homepage = "http://www.singular.uni-kl.de/index.php";
downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/";
diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index 334423660a0..33de9cd0d97 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
'';
maintainers = with maintainers; [ gebner ];
platforms = platforms.all;
+ broken = builtins.compareVersions qtbase.version "5.8.0" >= 0;
};
-
}
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index 98567c340bc..e323b42d7ae 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -89,5 +89,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3Plus;
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ pxc ];
+ broken = true; # relies improperly on private Qt 5.5 headers
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index d6cc205bbae..e1e01c1ed28 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -11,7 +11,7 @@
}:
let
- version = "2.12.0";
+ version = "2.12.2";
svn = subversionClient.override { perlBindings = true; };
in
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "09r0lcjj5v2apj39f0ziqzjq2bi1jpnhszc9q4n0ab86g5j7c88q";
+ sha256 = "0jlccxx7l4c76h830y8lhrxr4kqksrxqlnmj3xb8sqbfa0irw6nj";
};
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 28d89fb32d0..d17af6f5188 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -1,19 +1,21 @@
-{stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib
- ,libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig
- ,libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
- ,nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
+{ stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib
+, libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig
+, libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
+, nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
}:
+with stdenv.lib;
+
stdenv.mkDerivation rec {
name = "gitkraken-${version}";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchurl {
url = "https://release.gitkraken.com/linux/v${version}.tar.gz";
- sha256 = "0a3ed917e6e937af4dd180144fbb4ad8b99b35b5d8c1f0684a55de38189a812d";
+ sha256 = "12nyw2dh9ylrms264dbw0xzyif0znmba32zyfq7kdp0iay0wvgqd";
};
- libPath = stdenv.lib.makeLibraryPath [
+ libPath = makeLibraryPath [
stdenv.cc.cc.lib
curl
udev
@@ -47,24 +49,26 @@ stdenv.mkDerivation rec {
libgnome_keyring
];
- phases = [ "unpackPhase" "installPhase" ];
+ nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ makeWrapper ];
+ dontBuild = true;
installPhase = ''
mkdir -p "$out/opt/gitkraken"
cp -r ./* "$out/opt/gitkraken"
- fixupPhase
+ '';
+
+ postFixup = ''
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken"
wrapProgram $out/opt/gitkraken/gitkraken \
- --prefix LD_PRELOAD : "${stdenv.lib.makeLibraryPath [ curl ]}/libcurl.so.4" \
- --prefix LD_PRELOAD : "${stdenv.lib.makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0"
+ --prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \
+ --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0"
mkdir "$out/bin"
ln -s "$out/opt/gitkraken/gitkraken" "$out/bin/gitkraken"
'';
- meta = with stdenv.lib; {
+ meta = {
homepage = https://www.gitkraken.com/;
description = "The downright luxurious and most popular Git client for Windows, Mac & Linux";
license = licenses.unfree;
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index b9a1f2e7a84..4ab97cc06d2 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -3,25 +3,26 @@
, sqliteSupport ? true
}:
+with stdenv.lib;
+
buildGoPackage rec {
name = "gogs-${version}";
- version = "0.9.113";
+ version = "0.10.18";
src = fetchFromGitHub {
owner = "gogits";
repo = "gogs";
rev = "v${version}";
- sha256 = "1zk83c9jiazfw3221yi2sidp7917q3dxb2xb7wrjg4an18gj46j7";
+ sha256 = "1f1dlickjpdilf4j295i9v2h4ig4pf5d2mnpbr59wh14bby4bh0y";
};
patchPhase = ''
- substituteInPlace models/repo.go \
- --replace '#!/usr/bin/env' '#!${coreutils}/bin/env'
- '';
+ patchShebangs .
+ '';
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ];
- buildFlags = stdenv.lib.optionalString sqliteSupport "-tags sqlite";
+ buildFlags = optionalString sqliteSupport "-tags sqlite";
outputs = [ "bin" "out" "data" ];
@@ -30,7 +31,7 @@ buildGoPackage rec {
cp -R $src/{public,templates} $data
wrapProgram $bin/bin/gogs \
- --prefix PATH : ${stdenv.lib.makeBinPath [ bash git gzip openssh ]} \
+ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} \
--run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \
--run 'mkdir -p "$GOGS_WORK_DIR" && cd "$GOGS_WORK_DIR"' \
--run "ln -fs $data/{public,templates} ."
@@ -42,7 +43,7 @@ buildGoPackage rec {
meta = {
description = "A painless self-hosted Git service";
homepage = "https://gogs.io";
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ schneefux ];
+ license = licenses.mit;
+ maintainers = [ maintainers.schneefux ];
};
}
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index f87d81bd8fb..6587b25ef94 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub }:
-let version = "1.05"; in
+let version = "1.07"; in
stdenv.mkDerivation {
name = "yadm-${version}";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
owner = "TheLocehiliosan";
repo = "yadm";
rev = "${version}";
- sha256 = "11bqgz28qzgb3iz8xvda9z0mh5r1a9m032pqm772ypiixsfz8hdd";
+ sha256 = "0kkxrvw17pmrx1dq0dq53jb9pm545firakrxc48znfw54n2036fw";
};
buildCommand = ''
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index d7625b8ebac..9c421e0c828 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -44,12 +44,12 @@ let
sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81";
};
in stdenv.mkDerivation rec {
- name = "kodi-" + version;
- version = "17.0";
+ name = "kodi-${version}";
+ version = "17.1";
src = fetchurl {
url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
- sha256 = "0ib59x733yf8ivsw82qlsq43jn5214n668nrn5df2flpjcjgmzsb";
+ sha256 = "1vmvrq0qdjnphw34yils2b5jnm05cmsg777hc4lwqz5mrc1kjgrh";
};
buildInputs = [
@@ -97,9 +97,18 @@ in stdenv.mkDerivation rec {
'';
preConfigure = ''
+ patchShebangs .
./bootstrap
+ # tests here fail
+ sed -i '/TestSystemInfo.cpp/d' xbmc/utils/test/{Makefile,CMakeLists.txt}
+ # tests here trigger a segfault in kodi.bin
+ sed -i '/TestWebServer.cpp/d' xbmc/network/test/{Makefile,CMakeLists.txt}
'';
+ enableParallelBuild = true;
+
+ doCheck = true;
+
configureFlags = [ "--enable-libcec" ]
++ lib.optional (!sambaSupport) "--disable-samba"
++ lib.optional vdpauSupport "--enable-vdpau"
@@ -110,19 +119,17 @@ in stdenv.mkDerivation rec {
postInstall = ''
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
- --prefix PATH ":" "${python2}/bin" \
- --prefix PATH ":" "${glxinfo}/bin" \
- --prefix PATH ":" "${xdpyinfo}/bin" \
+ --prefix PATH ":" "${lib.makeBinPath
+ [ python2 glxinfo xdpyinfo ]}" \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
- [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]
- }"
+ [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]}"
done
'';
meta = with stdenv.lib; {
homepage = http://kodi.tv/;
description = "Media center";
- license = stdenv.lib.licenses.gpl2;
+ license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ domenkozar titanous edwtjo ];
};
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 60625412617..ba02583a274 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -198,7 +198,7 @@ stdenv.mkDerivation rec {
description = "A movie player that supports many video formats";
homepage = "http://mplayerhq.hu";
license = "GPL";
- maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.urkud ];
+ maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index a6238d9e808..539314867ab 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -27,12 +27,10 @@ in stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
- rev = "${version}";
- sha256 = "0mvjmkq5zlcppjqy18933w7r7rz1mpr2jpf8ipd0famdlgyacix6";
+ rev = "624aa2a5";
+ sha256 = "1bs82rqyq7wjjg99mh23ap8z5bmrhjfnza5iyjx808fzqc0bgzaj";
};
- patches = [ ./segfault-patch-systray.patch ];
-
nativeBuildInputs = [ cmake
];
diff --git a/pkgs/applications/video/obs-studio/segfault-patch-systray.patch b/pkgs/applications/video/obs-studio/segfault-patch-systray.patch
deleted file mode 100644
index c66b07bb57a..00000000000
--- a/pkgs/applications/video/obs-studio/segfault-patch-systray.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c31e0f682431508ccd2d3c0f74e6e16fc71445d8 Mon Sep 17 00:00:00 2001
-From: Cray Elliott
-Date: Fri, 10 Mar 2017 03:48:36 -0800
-Subject: [PATCH] Fix segfault in Linux when no system tray exists
-
-previously, switching workspaces while obs-studio is running resulted in a
-segfault if no system tray was available
----
- UI/window-basic-main.cpp | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
-index 8590dd75..024854d6 100644
---- a/UI/window-basic-main.cpp
-+++ b/UI/window-basic-main.cpp
-@@ -2916,13 +2916,15 @@ void OBSBasic::closeEvent(QCloseEvent *event)
-
- void OBSBasic::changeEvent(QEvent *event)
- {
-- if (event->type() == QEvent::WindowStateChange &&
-- isMinimized() &&
-- trayIcon->isVisible() &&
-- sysTrayMinimizeToTray()) {
--
-- ToggleShowHide();
-- }
-+ if (trayIcon) {
-+ if (event->type() == QEvent::WindowStateChange &&
-+ isMinimized() &&
-+ trayIcon->isVisible() &&
-+ sysTrayMinimizeToTray()) {
-+
-+ ToggleShowHide();
-+ }
-+ }
- }
-
- void OBSBasic::on_actionShow_Recordings_triggered()
---
-2.12.0
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index ca44742b046..a1d8cb0f01e 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -1,11 +1,8 @@
{stdenv, fetchurl, fetchFromGitHub, callPackage, makeWrapper, doxygen
-, ffmpeg, python3Packages, qt55}:
+, ffmpeg, python3Packages, libopenshot, qtbase, qtmultimedia }:
with stdenv.lib;
-let
- libopenshot = callPackage ./libopenshot.nix {};
-in
stdenv.mkDerivation rec {
name = "openshot-qt-${version}";
version = "2.1.0";
@@ -20,8 +17,8 @@ stdenv.mkDerivation rec {
buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg];
propagatedBuildInputs = [
- qt55.qtbase
- qt55.qtmultimedia
+ qtbase
+ qtmultimedia
libopenshot
];
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index b0891a3d69f..de4a0cf1dcd 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen
-, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp
+{ stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen
+, imagemagick, ffmpeg, qtbase, qtmultimedia, swig, python3, ruby, unittest-cpp
, cppzmq, czmqpp
}:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cmake doxygen
- imagemagick ffmpeg qt55.qtbase qt55.qtmultimedia swig python3 ruby
+ imagemagick ffmpeg qtbase qtmultimedia swig python3 ruby
unittest-cpp cppzmq czmqpp
];
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 787729d3afc..9bc2bc3db08 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, python2Packages, intltool, curl
-, wrapGAppsHook, virtinst, gtkvnc, vte
-, gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
-, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3, system-libvirt
+{ stdenv, fetchurl, python2Packages, intltool, file
+, wrapGAppsHook, virtinst, gtkvnc, vte, avahi, dconf
+, gobjectIntrospection, libvirt-glib, system-libvirt
+, gsettings_desktop_schemas, glib, libosinfo, gnome3
+, spiceSupport ? true, spice_gtk ? null
}:
with stdenv.lib;
-with python2Packages;
-buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "virt-manager-${version}";
version = "1.4.1";
namePrefix = "";
@@ -17,17 +17,19 @@ buildPythonApplication rec {
sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6";
};
- propagatedBuildInputs =
- [ eventlet greenlet gflags netaddr carrot routes
- PasteDeploy m2crypto ipy twisted
- distutils_extra simplejson glanceclient cheetah lockfile httplib2
- urlgrabber virtinst pyGtkGlade dbus-python /*gnome_python FIXME*/ pygobject3
- libvirt libxml2 ipaddr vte libosinfo gobjectIntrospection gtk3 mox
- gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme
- wrapGAppsHook
+ nativeBuildInputs = [ wrapGAppsHook intltool file ];
+
+ buildInputs =
+ [ libvirt-glib vte virtinst dconf gtkvnc gnome3.defaultIconTheme avahi
+ gsettings_desktop_schemas libosinfo
] ++ optional spiceSupport spice_gtk;
- buildInputs = [ dconf avahi intltool ];
+ propagatedBuildInputs = with python2Packages;
+ [ eventlet greenlet gflags netaddr carrot routes PasteDeploy
+ m2crypto ipy twisted distutils_extra simplejson glanceclient
+ cheetah lockfile httplib2 urlgrabber pyGtkGlade dbus-python
+ pygobject3 ipaddr mox libvirt libxml2
+ ];
patchPhase = ''
sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
@@ -35,7 +37,7 @@ buildPythonApplication rec {
'';
postConfigure = ''
- ${python.interpreter} setup.py configure --prefix=$out
+ ${python2Packages.python.interpreter} setup.py configure --prefix=$out
'';
postInstall = ''
@@ -54,6 +56,6 @@ buildPythonApplication rec {
manages Xen and LXC (linux containers).
'';
license = licenses.gpl2;
- maintainers = with maintainers; [qknight offline];
+ maintainers = with maintainers; [ qknight offline fpletz ];
};
}
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index b8de872d6ff..3b8d0a7cf63 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,7 +1,9 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
-, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, libcap_ng, yajl
-, gsettings_desktop_schemas, makeWrapper, xen, numactl, libvirt-glib
-, spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
+, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen
+, gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl
+, libapparmor
+, spiceSupport ? true
+, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
}:
assert spiceSupport ->
@@ -19,12 +21,12 @@ stdenv.mkDerivation rec {
sha256 = "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b";
};
+ nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
- pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl
- shared_mime_info libvirt libcap_ng yajl gsettings_desktop_schemas makeWrapper
- numactl libvirt-glib
- ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm
- ] ++ optional (stdenv.system == "x86_64-linux") xen;
+ glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info
+ libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib
+ libcap_ng numactl libapparmor xen
+ ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ];
postInstall = ''
for f in "$out"/bin/*; do
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 257c419d88c..6c49e95b6b9 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -58,7 +58,7 @@ in stdenv.mkDerivation {
++ optional pythonBindings python # Python is needed even when not building bindings
++ optional pulseSupport libpulseaudio
++ optionals (headless) [ libXrandr ]
- ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];
+ ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras qt5.makeQtWrapper libXinerama SDL ];
hardeningDisable = [ "fortify" "pic" "stackprotector" ];
@@ -72,15 +72,17 @@ in stdenv.mkDerivation {
''} -i configure
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2
- sed -i -e '
- s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g
- s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g
- ${optionalString pulseSupport ''
- s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g
- ''}
- ' src/VBox/Main/xml/Settings.cpp \
- src/VBox/Devices/Audio/{alsa,pulse}_stubs.c \
- include/VBox/dbus-calls.h
+
+ grep 'libpulse\.so\.0' src include -rI --files-with-match | xargs sed -i -e '
+ ${optionalString pulseSupport
+ ''s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g''}'
+
+ grep 'libdbus-1\.so\.3' src include -rI --files-with-match | xargs sed -i -e '
+ s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g'
+
+ grep 'libasound\.so\.2' src include -rI --files-with-match | xargs sed -i -e '
+ s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g'
+
export USER=nix
set +x
'';
@@ -153,7 +155,12 @@ in stdenv.mkDerivation {
# Create wrapper script
mkdir -p $out/bin
- for file in VirtualBox VBoxManage VBoxSDL VBoxBalloonCtrl VBoxBFE VBoxHeadless; do
+ ${optionalString (!headless) ''
+ makeQtWrapper "$libexec/VirtualBox" $out/bin/VirtualBox
+ ''}
+ for file in ${optionalString (!headless) "VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
+ echo "Linking $file to /bin"
+ test -x "$libexec/$file"
ln -s "$libexec/$file" $out/bin/$file
done
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 8a088daec1a..eccb1a19538 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
+{ stdenv, fetchurl, fetchFromGitHub, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter
, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
@@ -38,6 +38,13 @@ with luaPackages; stdenv.mkDerivation rec {
xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
xcbutilxrm ];
+ patches = [
+ (fetchurl {
+ url = "https://patch-diff.githubusercontent.com/raw/awesomeWM/awesome/pull/1639.patch";
+ sha256 = "00piynmbxajd2xbg960gmf0zlqn7m489f4ww482y49ravfy1jhsj";
+ })
+ ];
+
#cmakeFlags = "-DGENERATE_MANPAGES=ON";
LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}";
diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
new file mode 100755
index 00000000000..d9d84e83430
--- /dev/null
+++ b/pkgs/applications/window-managers/way-cooler/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig
+, wayland, xwayland, wlc, dbus_libs, dbus_glib, cairo, libxkbcommon }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+ name = "way-cooler-${version}";
+ version = "0.5.2";
+
+ src = fetchFromGitHub {
+ owner = "way-cooler";
+ repo = "way-cooler";
+ rev = "v${version}";
+ sha256 = "10s01x54kwjm2c85v57i6g3pvj5w3wpkjblj036mmd865fla1brb";
+ };
+
+ depsSha256 = "1k5xbw2zhm5z650mxdbxixr90im53wlpjdvq2pbnx2snqm84idlc";
+
+ buildInputs = [ wlc dbus_libs dbus_glib cairo libxkbcommon ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = with stdenv.lib; {
+ description = "Customizable Wayland compositor (window manager)";
+ longDescription = ''
+ Way Cooler is a customizable tiling window manager written in Rust
+ for Wayland and configurable using Lua. It is heavily inspired by
+ the tiling and extensibility of both i3 and awesome. While Lua is
+ used for the configuration, like awesome, extensions for Way Cooler
+ are implemented as totally separate client programs using D-Bus.
+ This means that you can use virtually any language to extend the
+ window manager, with much better guarantees about interoperability
+ between extensions.
+ '';
+ homepage = http://way-cooler.org/;
+ license = with licenses; [ mit ];
+ maintainers = [ maintainers.miltador ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix
index 3d24f6fb434..2b1b34429c5 100644
--- a/pkgs/build-support/build-dotnet-package/default.nix
+++ b/pkgs/build-support/build-dotnet-package/default.nix
@@ -102,8 +102,9 @@ attrsOrig @
mkdir -p "$out"/bin
commandName="$(basename -s .exe "$(echo "$exe" | tr "[A-Z]" "[a-z]")")"
makeWrapper \
- "${mono}/bin/mono \"$exe\"" \
+ "${mono}/bin/mono" \
"$out"/bin/"$commandName" \
+ --add-flags "\"$exe\"" \
''${makeWrapperArgs}
done
done
diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix
index 1cbac0709a6..6c5e0570fd0 100644
--- a/pkgs/build-support/emacs/buffer.nix
+++ b/pkgs/build-support/emacs/buffer.nix
@@ -39,6 +39,8 @@
(make-local-variable 'process-environment)
(put 'process-environment 'permanent-local t)
(inherit-local 'process-environment)
+ ; setenv modifies in place, so copy the environment first
+ (setq process-environment (copy-tree process-environment))
(setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH")))
(inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path))
diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix
new file mode 100644
index 00000000000..8c55db5372d
--- /dev/null
+++ b/pkgs/build-support/fetchrepoproject/default.nix
@@ -0,0 +1,73 @@
+{ stdenv, git, gitRepo, gnupg ? null, cacert, copyPathsToStore }:
+
+{ name, manifest, rev ? "HEAD", sha256, repoRepoURL ? "", repoRepoRev ? "", referenceDir ? ""
+, localManifests ? [], createMirror ? false, useArchive ? !createMirror
+}:
+
+assert repoRepoRev != "" -> repoRepoURL != "";
+assert createMirror -> !useArchive;
+
+with stdenv.lib;
+
+let
+ repoInitFlags = [
+ "--manifest-url=${manifest}"
+ "--manifest-branch=${rev}"
+ "--depth=1"
+ #TODO: fetching clone.bundle seems to fail spectacularly inside a sandbox.
+ "--no-clone-bundle"
+ (optionalString createMirror "--mirror")
+ (optionalString useArchive "--archive")
+ (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}")
+ (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}")
+ (optionalString (referenceDir != "") "--reference=${referenceDir}")
+ ];
+
+ local_manifests = copyPathsToStore localManifests;
+
+in
+
+with stdenv.lib;
+
+let
+ extraRepoInitFlags = [
+ (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}")
+ (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}")
+ (optionalString (referenceDir != "") "--reference=${referenceDir}")
+ ];
+in
+
+stdenv.mkDerivation {
+ buildCommand = ''
+ mkdir .repo
+ ${optionalString (local_manifests != []) ''
+ mkdir ./.repo/local_manifests
+ for local_manifest in ${concatMapStringsSep " " toString local_manifests}
+
+ do
+ cp $local_manifest ./.repo/local_manifests/$(stripHash $local_manifest; echo $strippedName)
+ done
+ ''}
+
+ export HOME=.repo
+ repo init ${concatStringsSep " " repoInitFlags}
+
+ repo sync --jobs=$NIX_BUILD_CORES --current-branch
+ ${optionalString (!createMirror) "rm -rf $out/.repo"}
+ '';
+
+ GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+ impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [
+ "GIT_PROXY_COMMAND" "SOCKS_SERVER"
+ ];
+
+ buildInputs = [git gitRepo cacert] ++ optional (gnupg != null) [gnupg] ;
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = sha256;
+
+ preferLocalBuild = true;
+ enableParallelBuilding = true;
+ inherit name cacert manifest rev repoRepoURL repoRepoRev referenceDir;
+}
diff --git a/pkgs/build-support/kde/wrapper.nix b/pkgs/build-support/kde/wrapper.nix
index f5add12e8ec..228eb696bd9 100644
--- a/pkgs/build-support/kde/wrapper.nix
+++ b/pkgs/build-support/kde/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeWrapper, buildEnv }:
+{ stdenv, lib, makeWrapper, buildEnv, gtk3, dconf }:
packages:
@@ -47,10 +47,11 @@ stdenv.mkDerivation {
--argv0 '"$0"' \
--suffix PATH : "$env/bin" \
--prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \
- --prefix XDG_DATA_DIRS : "$env/share" \
+ --prefix XDG_DATA_DIRS : "$env/share:${gtk3}/share/gsettings-schemas/${gtk3.name}" \
--set QML_IMPORT_PATH "$env/lib/qt5/imports" \
--set QML2_IMPORT_PATH "$env/lib/qt5/qml" \
- --set QT_PLUGIN_PATH "$env/lib/qt5/plugins"
+ --set QT_PLUGIN_PATH "$env/lib/qt5/plugins" \
+ --prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules"
good="1"
break
fi
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index a69ef5c6b07..91569d0c070 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation (args // {
echo "Using cargo deps from $cargoDeps"
- cp -r "$cargoDeps" deps
+ cp -a "$cargoDeps" deps
chmod +w deps -R
# It's OK to use /dev/null as the URL because by the time we do this, cargo
diff --git a/pkgs/build-support/setup-systemd-units.nix b/pkgs/build-support/setup-systemd-units.nix
new file mode 100644
index 00000000000..4fa2f42c39d
--- /dev/null
+++ b/pkgs/build-support/setup-systemd-units.nix
@@ -0,0 +1,83 @@
+# | Build a script to install and start a set of systemd units on any
+# systemd-based system.
+#
+# Creates a symlink at /etc/systemd-static/${namespace} for slightly
+# improved atomicity.
+{ writeScriptBin
+, bash
+, coreutils
+, systemd
+, runCommand
+, lib
+}:
+ { units # : AttrSet String (Either Path { path : Path, wanted-by : [ String ] })
+ # ^ A set whose names are unit names and values are
+ # either paths to the corresponding unit files or a set
+ # containing the path and the list of units this unit
+ # should be wanted-by (none by default).
+ #
+ # The names should include the unit suffix
+ # (e.g. ".service")
+ , namespace # : String
+ # The namespace for the unit files, to allow for
+ # multiple independent unit sets managed by
+ # `setupSystemdUnits`.
+ }:
+ let static = runCommand "systemd-static" {}
+ ''
+ mkdir -p $out
+ ${lib.concatStringsSep "\n" (lib.mapAttrsToList (nm: file:
+ "ln -sv ${file.path or file} $out/${nm}"
+ ) units)}
+ '';
+ add-unit-snippet = name: file:
+ ''
+ oldUnit=$(readlink -f "$unitDir/${name}" || echo "$unitDir/${name}")
+ if [ -f "$oldUnit" -a "$oldUnit" != "${file.path or file}" ]; then
+ unitsToStop+=("${name}")
+ fi
+ ln -sf "/etc/systemd-static/${namespace}/${name}" \
+ "$unitDir/.${name}.tmp"
+ mv -T "$unitDir/.${name}.tmp" "$unitDir/${name}"
+ ${lib.concatStringsSep "\n" (map (unit:
+ ''
+ mkdir -p "$unitDir/${unit}.wants"
+ ln -sf "../${name}" \
+ "$unitDir/${unit}.wants/.${name}.tmp"
+ mv -T "$unitDir/${unit}.wants/.${name}.tmp" \
+ "$unitDir/${unit}.wants/${name}"
+ ''
+ ) file.wanted-by or [])}
+ unitsToStart+=("${name}")
+ '';
+ in
+ writeScriptBin "setup-systemd-units"
+ ''
+ #!${bash}/bin/bash -e
+ export PATH=${coreutils}/bin:${systemd}/bin
+
+ unitDir=/etc/systemd/system
+ if [ ! -w "$unitDir" ]; then
+ unitDir=/etc/systemd-mutable/system
+ mkdir -p "$unitDir"
+ fi
+ declare -a unitsToStop unitsToStart
+
+ oldStatic=$(readlink -f /etc/systemd-static/${namespace} || true)
+ if [ "$oldStatic" != "${static}" ]; then
+ ${lib.concatStringsSep "\n"
+ (lib.mapAttrsToList add-unit-snippet units)}
+ if [ ''${#unitsToStop[@]} -ne 0 ]; then
+ echo "Stopping unit(s) ''${unitsToStop[@]}" >&2
+ systemctl stop "''${unitsToStop[@]}"
+ fi
+ mkdir -p /etc/systemd-static
+ ln -sfT ${static} /etc/systemd-static/.${namespace}.tmp
+ mv -T /etc/systemd-static/.${namespace}.tmp /etc/systemd-static/${namespace}
+ systemctl daemon-reload
+ echo "Starting unit(s) ''${unitsToStart[@]}" >&2
+ systemctl start "''${unitsToStart[@]}"
+ else
+ echo "Units unchanged, doing nothing" >&2
+ fi
+ ''
diff --git a/pkgs/data/documentation/rnrs/common.nix b/pkgs/data/documentation/rnrs/common.nix
index 8053020a3f2..bd38389eb47 100644
--- a/pkgs/data/documentation/rnrs/common.nix
+++ b/pkgs/data/documentation/rnrs/common.nix
@@ -24,5 +24,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://swiss.csail.mit.edu/~jaffer/Scheme;
+
+ broken = true;
};
}
diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix
new file mode 100644
index 00000000000..942a284e2c0
--- /dev/null
+++ b/pkgs/data/fonts/shrikhand/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ version = "2016-03-03";
+ name = "shrikhand-${version}";
+
+ src = fetchFromGitHub {
+ owner = "jonpinhorn";
+ repo = "shrikhand";
+ rev = "c11c9b0720fba977fad7cb4f339ebacdba1d1394";
+ sha256 = "1d21bvj4w8i0zrmkdrgbn0rpzac89iazfids1x273gsrsvvi45kk";
+ };
+
+ installPhase = ''
+ install -D -m644 build/Shrikhand-Regular.ttf $out/share/fonts/truetype/Shrikhand-Regular.ttf
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://jonpinhorn.github.io/shrikhand/;
+ description = "A vibrant and playful typeface for both Latin and Gujarati writing systems";
+ maintainers = with maintainers; [ sternenseemann ];
+ platforms = platforms.all;
+ license = licenses.ofl;
+ };
+}
diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index f20b992ab72..01203f9b0bd 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -1,17 +1,21 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "iana-etc-2.30";
+ name = "iana-etc-${version}";
+ version = "20170328";
src = fetchurl {
- url = "http://sethwklein.net/${name}.tar.bz2";
- sha256 = "03gjlg5zlwsdk6qyw3v85l129rna5bpm4m7pzrp864h0n97qg9mr";
+ url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
+ sha256 = "0c0zgijmh035wan3pvz8ykkmkdbraml4b9kx36b4j1lj9fhgy1yk";
};
- preInstall = "installFlags=\"PREFIX=$out\"";
+ installPhase = ''
+ mkdir -p $out/etc
+ cp services protocols $out/etc/
+ '';
meta = {
- homepage = http://sethwklein.net/iana-etc;
+ homepage = https://github.com/Mic92/iana-etc;
description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)";
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix
index 0c4e5bc2a13..95c66ed029e 100644
--- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix
+++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders;
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.publicDomain;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index beac8105199..59f4724e1be 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
description = "Encoding files for Poppler, a PDF rendering library";
platforms = platforms.all;
license = licenses.free; # more free licenses combined
- maintainers = with maintainers; [ urkud ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix
index 831028467f4..72895653479 100644
--- a/pkgs/data/misc/shared-desktop-ontologies/default.nix
+++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
are used by projects like KDE or Strigi.
'';
platforms = platforms.all;
- maintainers = [ maintainers.sander maintainers.urkud ];
+ maintainers = [ maintainers.sander ];
};
}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
index a9bb4514a3a..cb8bf49254b 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32
-, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
-, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
-, libusb, libarchive, acl, libgudev, qemu, libsecret
+, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop_file_utils
+, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
+, libcap_ng, numactl, xen, libapparmor
}:
# TODO: ovirt (optional)
@@ -15,12 +15,16 @@ stdenv.mkDerivation rec {
doCheck = true;
+ nativeBuildInputs = [
+ makeWrapper pkgconfig intltool
+ ];
+
buildInputs = [
- makeWrapper pkgconfig intltool itstool libvirt-glib glib
- gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
- libuuid libsoup libosinfo systemd tracker vala_0_32 libcap_ng libcap yajl gmp
- gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
- librsvg desktop_file_utils acl libgudev numactl xen libsecret
+ itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc
+ libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd
+ tracker vala_0_32 libcap yajl gmp gdbm cyrus_sasl libusb libarchive
+ gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret
+ libcap_ng numactl xen libapparmor
];
preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
index 02c60256e15..f67dc7e32ae 100644
--- a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1jaqsr1r0grpd25rbsc2v3vb0sc51lia9w31wlqswgqsncp2k0w6";
};
+ outputs = [ "out" "lib" "dev" ];
+
buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
intltool docbook_xsl docbook_xsl_ns makeWrapper ];
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
index 7ba3c3734f8..0d8e46aeece 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# Disable Access Control because our X does not support FamilyServerInterpreted yet
- patches = [ #./xserver_path.patch # gdm now uses wayland
+ patches = [ ./xserver_path.patch
./sessions_dir.patch
./gdm-x-session_extra_args.patch
./gdm-session-worker_xserver-path.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix
index 8f525945a6a..80f2dde534e 100644
--- a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, itstool }:
+, gnome_doc_utils, intltool, libX11, which, itstool, wrapGAppsHook }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
- nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
+ nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which wrapGAppsHook ];
meta = with stdenv.lib; {
platforms = platforms.linux;
diff --git a/pkgs/desktops/kde-4.14/support/akonadi/default.nix b/pkgs/desktops/kde-4.14/support/akonadi/default.nix
index 5238744cc7b..ecfb4913a42 100644
--- a/pkgs/desktops/kde-4.14/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.14/support/akonadi/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
description = "KDE PIM Storage Service";
license = "LGPL";
homepage = http://pim.kde.org/akonadi;
- maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
+ maintainers = [ maintainers.sander maintainers.phreedom ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
index dfbd39acaa3..d2faf9c0eee 100644
--- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
@@ -1,5 +1,5 @@
{
- stdenv, fetchFromGitHub, standardPatch,
+ stdenv, fetchFromGitHub, fetchurl, standardPatch,
cmake, pkgconfig, lxqt-build-tools,
qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat,
@@ -49,6 +49,13 @@ stdenv.mkDerivation rec {
lxmenu-data
];
+ patches = [
+ (fetchurl {
+ url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch;
+ sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr";
+ })
+ ];
+
cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
postPatch = standardPatch;
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
new file mode 100644
index 00000000000..aea006fc486
--- /dev/null
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ name = "caja-${version}";
+ version = "${major-ver}.${minor-ver}";
+ major-ver = "1.18";
+ minor-ver = "0";
+
+ src = fetchurl {
+ url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+ sha256 = "1fc7dxj9hw8fffrcnwxbj8pq7gl08il68rkpk92rv3qm7siv1606";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ intltool
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gtk3
+ libnotify
+ libxml2
+ libexif
+ exempi
+ mate.mate-desktop
+ ];
+
+ configureFlags = [ "--disable-update-mimedb" ];
+
+ meta = {
+ description = "File manager for the MATE desktop";
+ homepage = "http://mate-desktop.org";
+ license = with stdenv.lib.licenses; [ gpl2 lgpl2 ];
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.romildo ];
+ };
+}
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 4d662cf52a9..d9565e8f4d1 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -1,5 +1,6 @@
{ callPackage, pkgs }:
rec {
+ caja = callPackage ./caja { };
mate-common = callPackage ./mate-common { };
mate-desktop = callPackage ./mate-desktop { };
mate-icon-theme = callPackage ./mate-icon-theme { };
diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index b020351afe2..7bd7a3f2770 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "mate-common-${version}";
version = "${major-ver}.${minor-ver}";
- major-ver = "1.17";
+ major-ver = "1.18";
minor-ver = "0";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
- sha256 = "06pvbi2kk39ysd9dfi6ljkncm53hn02n7dygax6ig4p9qd750sdc";
+ sha256 = "1005laf3z1h8qczm7pmwr40r842665cv6ykhjg7r93vldra48z6p";
};
meta = {
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index fcb66c9ad79..2afd700d933 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -1,33 +1,36 @@
-{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-desktop-${version}";
- version = "${major-ver}.${minor-ver}";
- major-ver = "1.17";
- minor-ver = "2";
+ name = "mate-desktop-${version}";
+ version = "${major-ver}.${minor-ver}";
+ major-ver = "1.18";
+ minor-ver = "0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
- sha256 = "1l7aih9hvmnmddwjwyafhz87drd5vdkmjr41m7f24bn5k7abl90g";
+ url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+ sha256 = "12iv2y4dan962fs7vkkxbjkp77pbvjnwfa43ggr0zkdsc3ydjbbg";
};
- propagatedUserEnvPkgs = [ pkgs.gnome3.gnome_themes_standard ];
-
- buildInputs = with pkgs; [
- intltool
- pkgconfig
-
- gnome3.dconf
- gnome3.gtk
- gnome3.defaultIconTheme
+ propagatedUserEnvPkgs = [
+ gnome3.gnome_themes_standard
];
- nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+ buildInputs = [
+ gnome3.dconf
+ gnome3.gtk
+ gnome3.defaultIconTheme
+ ];
+
+ nativeBuildInputs = [
+ pkgconfig
+ intltool
+ wrapGAppsHook
+ ];
meta = with stdenv.lib; {
description = "Library with common API for various MATE modules";
- homepage = "http://mate-desktop.org";
- license = licenses.gpl2;
- platforms = platforms.unix;
+ homepage = "http://mate-desktop.org";
+ license = licenses.gpl2;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index d9370f318d7..3d820553b4a 100644
--- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "mate-icon-theme-faenza-${version}";
version = "${major-ver}.${minor-ver}";
- major-ver = "1.16";
+ major-ver = "1.18";
minor-ver = "0";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
- sha256 = "0p3z3qarbvrhzj2sdw3f8dp0c7wwjkk9a749bq8rh5gm9m66hibg";
+ sha256 = "1crfv6s3ljbc7a7m229bvs3qbjzlp8cgvyhqmdaa9npd5lxmk88v";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index ab699c78c0e..e41a1c21710 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "mate-icon-theme-${version}";
version = "${major-ver}.${minor-ver}";
- major-ver = "1.17";
+ major-ver = "1.18";
minor-ver = "0";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
- sha256 = "1kxpckaksaz5g3c4jjkh4pdm9yhbjda5835am3wg2iyy2p7rjn8n";
+ sha256 = "19bd9zlfc1jfdl7imvfy1vq35a0jvxq5fldmr2c5bq0kyasvww6i";
};
nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];
diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index dd380f39477..fd907c56280 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, wrapGAppsHook }:
stdenv.mkDerivation rec {
- name = "mate-terminal-${version}";
- version = "${major-ver}.${minor-ver}";
- major-ver = "1.17";
+ name = "mate-terminal-${version}";
+ version = "${major-ver}.${minor-ver}";
+ major-ver = "1.18";
minor-ver = "0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
- sha256 = "0sbncykjf0ifj87rwpdw2ln0wavykiki4zqsw60vch7agh49fw0f";
+ url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+ sha256 = "07z8g8zkc8k6d7xqdlg18cjnwg7zzv5hbgwma5y9mh8zx9xsqz92";
};
- buildInputs = with pkgs; [
- intltool
- pkgconfig
+ buildInputs = [
glib
itstool
libxml2
@@ -25,12 +23,16 @@ stdenv.mkDerivation rec {
gnome3.dconf
];
- nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+ nativeBuildInputs = [
+ pkgconfig
+ intltool
+ wrapGAppsHook
+ ];
meta = with stdenv.lib; {
description = "The MATE Terminal Emulator";
- homepage = "http://mate-desktop.org";
- license = licenses.gpl3;
- platforms = platforms.unix;
+ homepage = "http://mate-desktop.org";
+ license = licenses.gpl3;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 343148da0bc..cf78009708b 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -6,17 +6,15 @@ stdenv.mkDerivation rec {
version = "${major-ver}.${minor-ver}";
major-ver = gnome3.version;
minor-ver = {
- "3.18" = "4";
- "3.20" = "12";
- "3.22" = "3";
+ "3.20" = "16";
+ "3.22" = "7";
}."${major-ver}";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz";
sha256 = {
- "3.18" = "1h3z705jrg7gng5glf51ksszjz6v81qq83qvmfpv1v69bwn6fy4b";
- "3.20" = "15s2xp2cq9x8iikvbywr5gl8l33i57i1xvbv4jc2qipnkn3c4yca";
- "3.22" = "0p1rf5q2nr1vsab3pljwycclbrnwylvp88d0dhk8as0d6n6fp85k";
+ "3.20" = "1dvzljpq6cscr82gnsqagf23inb039q84fnawraj0nhfjif11r7v";
+ "3.22" = "1kjchqkds0zj32x7cjfcq96zakcmhva1yg0nxfd6369a5nwkp5k0";
}."${major-ver}";
};
diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix
index 0c8b0f5ce60..15c51af005f 100644
--- a/pkgs/development/compilers/aliceml/default.nix
+++ b/pkgs/development/compilers/aliceml/default.nix
@@ -52,5 +52,6 @@ stdenv.mkDerivation {
homepage = http://www.ps.uni-saarland.de/alice/;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.doublec ];
+ broken = true;
};
}
diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix
index 1c347655ebe..e045dc67a50 100644
--- a/pkgs/development/compilers/ghcjs/head.nix
+++ b/pkgs/development/compilers/ghcjs/head.nix
@@ -1,22 +1,26 @@
{ fetchgit, fetchFromGitHub, bootPkgs }:
bootPkgs.callPackage ./base.nix {
- version = "0.2.020161101";
+ version = "0.2.020170323";
# deprecated on HEAD, directly included in the distribution
ghcjs-prim = null;
inherit bootPkgs;
ghcjsSrc = fetchFromGitHub {
- owner = "ghcjs";
+ # TODO: switch back to the regular ghcjs repo
+ # when https://github.com/ghcjs/ghcjs/pull/573 is merged.
+ owner = "basvandijk";
repo = "ghcjs";
- rev = "2dc14802e78d7d9dfa35395d5dbfc9c708fb83e6";
- sha256 = "0cvmapbrwg0h1pbz648isc2l84z694ylnfm8ncd1g4as28lmj0pz";
+ rev = "e6cdc71964a1c2e4184416a493e9d384c408914c";
+ sha256 = "00fk9qwyx4vpvr0h9jbqxwlrvl6w63l5sq8r357prsp6xyv5zniz";
};
ghcjsBootSrc = fetchgit {
- url = git://github.com/ghcjs/ghcjs-boot.git;
- rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8";
- sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq";
+ # TODO: switch back to git://github.com/ghcjs/ghcjs-boot.git
+ # when https://github.com/ghcjs/ghcjs-boot/pull/41 is merged.
+ url = git://github.com/basvandijk/ghcjs-boot.git;
+ rev = "19a3b157ecb807c2224daffda5baecc92b76af35";
+ sha256 = "16sgr8vfr1nx5ljnk8gckgjk70zpa67ix4dbr9aizkwyz41ilfrb";
fetchSubmodules = true;
};
diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/head_stage2.nix
index 765a384bf63..d4247f51b3e 100644
--- a/pkgs/development/compilers/ghcjs/head_stage2.nix
+++ b/pkgs/development/compilers/ghcjs/head_stage2.nix
@@ -2,107 +2,117 @@
{
async = callPackage
- ({ mkDerivation, base, HUnit, stdenv, stm, test-framework
- , test-framework-hunit
- }:
- mkDerivation {
- pname = "async";
- version = "2.1.0";
- src = "${ghcjsBoot}/boot/async";
- doCheck = false;
- libraryHaskellDepends = [ base stm ];
- testHaskellDepends = [
- base HUnit test-framework test-framework-hunit
- ];
- jailbreak = true;
- homepage = "https://github.com/simonmar/async";
- description = "Run IO operations asynchronously and wait for their results";
- license = stdenv.lib.licenses.bsd3;
- }) {};
+ ({ mkDerivation, base, HUnit, stm, test-framework
+ , test-framework-hunit, stdenv
+ }:
+ mkDerivation {
+ pname = "async";
+ version = "2.1.1";
+ src = "${ghcjsBoot}/boot/async";
+ doCheck = false;
+ libraryHaskellDepends = [ base stm ];
+ testHaskellDepends = [
+ base HUnit test-framework test-framework-hunit
+ ];
+ jailbreak = true;
+ homepage = "https://github.com/simonmar/async";
+ description = "Run IO operations asynchronously and wait for their results";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
aeson = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
- , dlist, fail, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific
- , stdenv, syb, tagged, template-haskell, test-framework
- , test-framework-hunit, test-framework-quickcheck2, text, time
- , transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "aeson";
- version = "0.11.2.0";
- src = "${ghcjsBoot}/boot/aeson";
- doCheck = false;
- libraryHaskellDepends = [
- attoparsec base bytestring containers deepseq dlist fail ghc-prim
- hashable mtl scientific syb tagged template-haskell text time transformers
- unordered-containers vector
- ];
- testHaskellDepends = [
- attoparsec base bytestring containers ghc-prim HUnit QuickCheck
- template-haskell test-framework test-framework-hunit
- test-framework-quickcheck2 text time unordered-containers vector
- ];
- jailbreak = true;
- homepage = "https://github.com/bos/aeson";
- description = "Fast JSON parsing and encoding";
- license = stdenv.lib.licenses.bsd3;
- }) {};
+ ({ mkDerivation, attoparsec, base, base-compat, base-orphans
+ , base16-bytestring, bytestring, containers, deepseq, directory
+ , dlist, fetchgit, filepath, generic-deriving, ghc-prim, hashable
+ , hashable-time, HUnit, integer-logarithms, QuickCheck
+ , quickcheck-instances, scientific, stdenv, tagged
+ , template-haskell, test-framework, test-framework-hunit
+ , test-framework-quickcheck2, text, time, time-locale-compat
+ , unordered-containers, uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "aeson";
+ version = "1.1.1.0";
+ src = "${ghcjsBoot}/boot/aeson";
+ libraryHaskellDepends = [
+ attoparsec base base-compat bytestring containers deepseq dlist
+ ghc-prim hashable scientific tagged template-haskell text time
+ time-locale-compat unordered-containers uuid-types vector
+ ];
+ testHaskellDepends = [
+ attoparsec base base-compat base-orphans base16-bytestring
+ bytestring containers directory dlist filepath generic-deriving
+ ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
+ quickcheck-instances scientific tagged template-haskell
+ test-framework test-framework-hunit test-framework-quickcheck2 text
+ time time-locale-compat unordered-containers uuid-types vector
+ ];
+ jailbreak = true;
+ homepage = "https://github.com/bos/aeson";
+ description = "Fast JSON parsing and encoding";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
attoparsec = callPackage
- ({ mkDerivation, array, base, bytestring, containers, deepseq
- , QuickCheck, quickcheck-unicode, scientific, stdenv
- , test-framework, test-framework-quickcheck2, text, transformers
- , vector
- }:
- mkDerivation {
- pname = "attoparsec";
- version = "0.13.0.2";
- src = "${ghcjsBoot}/boot/attoparsec";
- doCheck = false;
- libraryHaskellDepends = [
- array base bytestring containers deepseq scientific text
- transformers
- ];
- testHaskellDepends = [
- array base bytestring containers deepseq QuickCheck
- quickcheck-unicode scientific test-framework
- test-framework-quickcheck2 text transformers vector
- ];
- jailbreak = true;
- homepage = "https://github.com/bos/attoparsec";
- description = "Fast combinator parsing for bytestrings and text";
- license = stdenv.lib.licenses.bsd3;
- }) {};
+ ({ mkDerivation, array, base, bytestring, case-insensitive
+ , containers, criterion, deepseq, directory, filepath, ghc-prim
+ , http-types, parsec, QuickCheck, quickcheck-unicode, scientific
+ , tasty, tasty-quickcheck, text, transformers, unordered-containers
+ , vector, stdenv
+ }:
+ mkDerivation {
+ pname = "attoparsec";
+ version = "0.13.1.0";
+ src = "${ghcjsBoot}/boot/attoparsec";
+ libraryHaskellDepends = [
+ array base bytestring containers deepseq scientific text
+ transformers
+ ];
+ testHaskellDepends = [
+ array base bytestring deepseq QuickCheck quickcheck-unicode
+ scientific tasty tasty-quickcheck text transformers vector
+ ];
+ benchmarkHaskellDepends = [
+ array base bytestring case-insensitive containers criterion deepseq
+ directory filepath ghc-prim http-types parsec scientific text
+ transformers unordered-containers vector
+ ];
+ jailbreak = true;
+ homepage = "https://github.com/bos/attoparsec";
+ description = "Fast combinator parsing for bytestrings and text";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
case-insensitive = callPackage
- ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit, stdenv
- , test-framework, test-framework-hunit, text
- }:
- mkDerivation {
- pname = "case-insensitive";
- version = "1.2.0.6";
- src = "${ghcjsBoot}/boot/case-insensitive";
- doCheck = false;
- libraryHaskellDepends = [ base bytestring deepseq hashable text ];
- testHaskellDepends = [
- base bytestring HUnit test-framework test-framework-hunit text
- ];
- jailbreak = true;
- homepage = "https://github.com/basvandijk/case-insensitive";
- description = "Case insensitive string comparison";
- license = stdenv.lib.licenses.bsd3;
- }) {};
+ ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
+ , HUnit, test-framework, test-framework-hunit, text, stdenv
+ }:
+ mkDerivation {
+ pname = "case-insensitive";
+ version = "1.2.0.8";
+ src = "${ghcjsBoot}/boot/case-insensitive";
+ doCheck = false;
+ libraryHaskellDepends = [ base bytestring deepseq hashable text ];
+ testHaskellDepends = [
+ base bytestring HUnit test-framework test-framework-hunit text
+ ];
+ benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
+ jailbreak = true;
+ homepage = "https://github.com/basvandijk/case-insensitive";
+ description = "Case insensitive string comparison";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
dlist = callPackage
({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }:
- mkDerivation {
- pname = "dlist";
- version = "0.7.1.2";
- src = "${ghcjsBoot}/boot/dlist";
- doCheck = false;
- libraryHaskellDepends = [ base deepseq ];
- testHaskellDepends = [ base Cabal QuickCheck ];
- jailbreak = true;
- homepage = "https://github.com/spl/dlist";
- description = "Difference lists";
- license = stdenv.lib.licenses.bsd3;
- }) {};
+ mkDerivation {
+ pname = "dlist";
+ version = "0.8.0.2";
+ src = "${ghcjsBoot}/boot/dlist";
+ doCheck = false;
+ libraryHaskellDepends = [ base deepseq ];
+ testHaskellDepends = [ base Cabal QuickCheck ];
+ jailbreak = true;
+ homepage = "https://github.com/spl/dlist";
+ description = "Difference lists";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
extensible-exceptions = callPackage
({ mkDerivation, base, stdenv }:
mkDerivation {
@@ -175,29 +185,29 @@
license = stdenv.lib.licenses.bsd3;
}) {};
scientific = callPackage
- ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc-prim
- , hashable, integer-gmp, QuickCheck, smallcheck, stdenv, tasty
- , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck
- , text, vector
- }:
- mkDerivation {
- pname = "scientific";
- version = "0.3.4.7";
- src = "${ghcjsBoot}/boot/scientific";
- doCheck = false;
- libraryHaskellDepends = [
- base binary bytestring containers deepseq ghc-prim hashable
- integer-gmp text vector
- ];
- testHaskellDepends = [
- base bytestring QuickCheck smallcheck tasty tasty-ant-xml
- tasty-hunit tasty-quickcheck tasty-smallcheck text
- ];
- jailbreak = true;
- homepage = "https://github.com/basvandijk/scientific";
- description = "Numbers represented using scientific notation";
- license = stdenv.lib.licenses.bsd3;
- }) {};
+ ({ mkDerivation, base, binary, bytestring, containers, criterion
+ , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
+ , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
+ , tasty-quickcheck, tasty-smallcheck, text, vector, stdenv
+ }:
+ mkDerivation {
+ pname = "scientific";
+ version = "0.3.4.10";
+ src = "${ghcjsBoot}/boot/scientific";
+ libraryHaskellDepends = [
+ base binary bytestring containers deepseq ghc-prim hashable
+ integer-gmp integer-logarithms text vector
+ ];
+ testHaskellDepends = [
+ base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
+ tasty-hunit tasty-quickcheck tasty-smallcheck text
+ ];
+ benchmarkHaskellDepends = [ base criterion ];
+ jailbreak = true;
+ homepage = "https://github.com/basvandijk/scientific";
+ description = "Numbers represented using scientific notation";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
stm = callPackage
({ mkDerivation, array, base, stdenv }:
mkDerivation {
@@ -224,6 +234,23 @@
description = "Scrap Your Boilerplate";
license = stdenv.lib.licenses.bsd3;
}) {};
+ tagged = callPackage
+ ({ mkDerivation, base, deepseq, template-haskell, transformers
+ , transformers-compat, stdenv
+ }:
+ mkDerivation {
+ pname = "tagged";
+ version = "0.8.5";
+ src = "${ghcjsBoot}/boot/tagged";
+ doCheck = false;
+ libraryHaskellDepends = [
+ base deepseq template-haskell transformers transformers-compat
+ ];
+ jailbreak = true;
+ homepage = "http://github.com/ekmett/tagged";
+ description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
text = callPackage
({ mkDerivation, array, base, binary, bytestring, deepseq, directory
, ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode
@@ -249,25 +276,52 @@
license = stdenv.lib.licenses.bsd3;
}) {};
unordered-containers = callPackage
- ({ mkDerivation, base, ChasingBottoms, containers, deepseq, hashable
- , HUnit, QuickCheck, stdenv, test-framework, test-framework-hunit
- , test-framework-quickcheck2
- }:
- mkDerivation {
- pname = "unordered-containers";
- version = "0.2.7.0";
- src = "${ghcjsBoot}/boot/unordered-containers";
- doCheck = false;
- libraryHaskellDepends = [ base deepseq hashable ];
- testHaskellDepends = [
- base ChasingBottoms containers hashable HUnit QuickCheck
- test-framework test-framework-hunit test-framework-quickcheck2
- ];
- jailbreak = true;
- homepage = "https://github.com/tibbe/unordered-containers";
- description = "Efficient hashing-based container types";
- license = stdenv.lib.licenses.bsd3;
- }) {};
+ ({ mkDerivation, base, bytestring, ChasingBottoms, containers
+ , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
+ , mtl, QuickCheck, random, test-framework, test-framework-hunit
+ , test-framework-quickcheck2, stdenv
+ }:
+ mkDerivation {
+ pname = "unordered-containers";
+ version = "0.2.7.2";
+ src = "${ghcjsBoot}/boot/unordered-containers";
+ libraryHaskellDepends = [ base deepseq hashable ];
+ testHaskellDepends = [
+ base ChasingBottoms containers hashable HUnit QuickCheck
+ test-framework test-framework-hunit test-framework-quickcheck2
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring containers criterion deepseq deepseq-generics
+ hashable hashmap mtl random
+ ];
+ jailbreak = true;
+ homepage = "https://github.com/tibbe/unordered-containers";
+ description = "Efficient hashing-based container types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+ uuid-types = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, criterion
+ , deepseq, hashable, HUnit, QuickCheck, random, stdenv, tasty
+ , tasty-hunit, tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "uuid-types";
+ version = "1.0.3";
+ src = "${ghcjsBoot}/boot/uuid/uuid-types";
+ libraryHaskellDepends = [
+ base binary bytestring deepseq hashable random text
+ ];
+ testHaskellDepends = [
+ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring containers criterion deepseq random
+ ];
+ jailbreak = true;
+ homepage = "https://github.com/aslatter/uuid";
+ description = "Type definitions for Universally Unique Identifiers";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
vector = callPackage
({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
, random, stdenv, template-haskell, test-framework
diff --git a/pkgs/development/compilers/ghcjs/stage2.nix b/pkgs/development/compilers/ghcjs/stage2.nix
index 8c68b6f15a6..b88051113b5 100644
--- a/pkgs/development/compilers/ghcjs/stage2.nix
+++ b/pkgs/development/compilers/ghcjs/stage2.nix
@@ -327,6 +327,7 @@
version = "1.22.8.0";
src = "${ghcjsBoot}/boot/cabal/Cabal";
doCheck = false;
+ hyperlinkSource = false;
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
pretty process time unix
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index f60077e8962..2a1944debd9 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana_etc, libcCross
+{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross
, pkgconfig
, pcre
, Security }:
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
# ParseInLocation fails the test
sed -i '/TestParseInSydney/areturn' src/time/format_test.go
- sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
+ sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
'' + lib.optionalString stdenv.isLinux ''
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index 52ffbab6dcb..4a777d7b4f1 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, tzdata, iana_etc, go_bootstrap, runCommand
+{ stdenv, lib, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand
, perl, which, pkgconfig, patch, fetchpatch
, pcre
, Security, Foundation, bash }:
@@ -75,8 +75,8 @@ stdenv.mkDerivation rec {
# Remove the timezone naming test
sed -i '/TestLoadFixed/areturn' src/time/time_test.go
- sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
- sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go
+ sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
+ sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
'' + lib.optionalString stdenv.isLinux ''
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
'' + lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix
index 7fa35e1fcac..76f6141e2e3 100644
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin
+{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, fetchpatch
, pcre, cacert
, Security, Foundation, bash }:
@@ -69,8 +69,8 @@ stdenv.mkDerivation rec {
# Remove the timezone naming test
sed -i '/TestLoadFixed/areturn' src/time/time_test.go
- sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
- sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go
+ sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
+ sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
# Disable cgo lookup tests not works, they depend on resolver
rm src/net/cgo_unix_test.go
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
patches =
[ ./remove-tools-1.7.patch
- ./cacert-1.7.patch
+ ./ssl-cert-file-1.7.patch
./creds-test.patch
# This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
})
];
- SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+ NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
GOOS = if stdenv.isDarwin then "darwin" else "linux";
GOARCH = if stdenv.isDarwin then "amd64"
diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix
index 6d9ee3de550..60125b2e22a 100644
--- a/pkgs/development/compilers/go/1.8.nix
+++ b/pkgs/development/compilers/go/1.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin
+{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, fetchpatch
, pcre, cacert
, Security, Foundation, bash }:
@@ -71,8 +71,8 @@ stdenv.mkDerivation rec {
# Remove the timezone naming test
sed -i '/TestLoadFixed/areturn' src/time/time_test.go
- sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
- sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go
+ sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
+ sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
# Disable cgo lookup tests not works, they depend on resolver
rm src/net/cgo_unix_test.go
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
patches =
[ ./remove-tools-1.8.patch
- ./cacert-1.8.patch
+ ./ssl-cert-file-1.8.patch
./creds-test.patch
./remove-test-pie-1.8.patch
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
})
];
- SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+ NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
GOOS = if stdenv.isDarwin then "darwin" else "linux";
GOARCH = if stdenv.isDarwin then "amd64"
diff --git a/pkgs/development/compilers/go/cacert-1.7.patch b/pkgs/development/compilers/go/ssl-cert-file-1.7.patch
similarity index 92%
rename from pkgs/development/compilers/go/cacert-1.7.patch
rename to pkgs/development/compilers/go/ssl-cert-file-1.7.patch
index 57f09c975d9..e35ad9e4b75 100644
--- a/pkgs/development/compilers/go/cacert-1.7.patch
+++ b/pkgs/development/compilers/go/ssl-cert-file-1.7.patch
@@ -13,7 +13,7 @@ index a4b33c7..9700b75 100644
func loadSystemRoots() (*CertPool, error) {
roots := NewCertPool()
-+ if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
+ roots.AppendCertsFromPEM(data)
@@ -36,7 +36,7 @@ index 59b303d..d4a34ac 100644
+ roots = NewCertPool()
+ )
+
-+ if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
+ roots.AppendCertsFromPEM(data)
@@ -65,7 +65,7 @@ index 7bcb3d6..3986e1a 100644
func loadSystemRoots() (*CertPool, error) {
roots := NewCertPool()
-+ if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
+ roots.AppendCertsFromPEM(data)
diff --git a/pkgs/development/compilers/go/cacert-1.8.patch b/pkgs/development/compilers/go/ssl-cert-file-1.8.patch
similarity index 92%
rename from pkgs/development/compilers/go/cacert-1.8.patch
rename to pkgs/development/compilers/go/ssl-cert-file-1.8.patch
index bf44e123711..052655eed52 100644
--- a/pkgs/development/compilers/go/cacert-1.8.patch
+++ b/pkgs/development/compilers/go/ssl-cert-file-1.8.patch
@@ -13,7 +13,7 @@ index a4b33c7..9700b75 100644
func loadSystemRoots() (*CertPool, error) {
roots := NewCertPool()
-+ if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
+ roots.AppendCertsFromPEM(data)
@@ -43,7 +43,7 @@ index 66cdb5e..bb28036 100644
numVerified int // number of execs of 'security verify-cert', for debug stats
)
-+ if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
+ roots.AppendCertsFromPEM(data)
@@ -67,7 +67,7 @@ index 7bcb3d6..3986e1a 100644
func loadSystemRoots() (*CertPool, error) {
roots := NewCertPool()
-+ if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
+ roots.AppendCertsFromPEM(data)
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 33921ef02cd..508ac254f0a 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
stdenv.mkDerivation rec {
- version = "1.1";
+ version = "1.1.1";
name = "kotlin-${version}";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
- sha256 = "179m5y56fi50qvxsm075h0547swib7n2pfdn8a4axk9wpwldni5a";
+ sha256 = "1c96l1bkll0l8c82cfzmph0z38f96r3x68zmggq4s8hhdqgwk8mc";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index ba8302919e1..a43826d7a31 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -10,22 +10,27 @@ stdenv.mkDerivation rec {
export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
'';
+ # https://github.com/llvm-mirror/libcxx/commit/bcc92d75df0274b9593ebd097fcae60494e3bffc
+ patches = [ ./pthread_mach_thread_np.patch ];
+
+ prePatch = ''
+ substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
+ '';
+
preConfigure = ''
# Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")
'';
- patchPhase = ''
- substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
- '';
+ nativeBuildInputs = [ cmake ];
- buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+ buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
cmakeFlags = [
- "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
- "-DLIBCXX_LIBCPPABI_VERSION=2"
- "-DLIBCXX_CXX_ABI=libcxxabi"
- ];
+ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
+ "-DLIBCXX_LIBCPPABI_VERSION=2"
+ "-DLIBCXX_CXX_ABI=libcxxabi"
+ ];
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch b/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch
new file mode 100644
index 00000000000..8c71f1b815d
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch
@@ -0,0 +1,41 @@
+From bcc92d75df0274b9593ebd097fcae60494e3bffc Mon Sep 17 00:00:00 2001
+From: Asiri Rathnayake
+Date: Thu, 26 Jan 2017 10:40:17 +0000
+Subject: [PATCH] Fix chromium build (libcxx)
+
+Remove the reference to pthread_mach_thread_np() in libcxx headers.
+
+git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@293167 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ include/__threading_support | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/include/__threading_support b/include/__threading_support
+index 13ab769..dfe7fe1 100644
+--- a/include/__threading_support
++++ b/include/__threading_support
+@@ -149,11 +149,6 @@ int __libcpp_execute_once(__libcpp_exec_once_flag *flag,
+ void (*init_routine)(void));
+
+ // Thread id
+-#if defined(__APPLE__) && !defined(__arm__)
+-_LIBCPP_THREAD_ABI_VISIBILITY
+-mach_port_t __libcpp_thread_get_port();
+-#endif
+-
+ _LIBCPP_THREAD_ABI_VISIBILITY
+ bool __libcpp_thread_id_equal(__libcpp_thread_id t1, __libcpp_thread_id t2);
+
+@@ -297,12 +292,6 @@ int __libcpp_execute_once(__libcpp_exec_once_flag *flag,
+ }
+
+ // Thread id
+-#if defined(__APPLE__) && !defined(__arm__)
+-mach_port_t __libcpp_thread_get_port() {
+- return pthread_mach_thread_np(pthread_self());
+-}
+-#endif
+-
+ // Returns non-zero if the thread ids are equal, otherwise 0
+ bool __libcpp_thread_id_equal(__libcpp_thread_id t1, __libcpp_thread_id t2)
+ {
diff --git a/pkgs/development/compilers/manticore/builder.sh b/pkgs/development/compilers/manticore/builder.sh
deleted file mode 100755
index ad72f50a1b3..00000000000
--- a/pkgs/development/compilers/manticore/builder.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!@shell@
-
-source $stdenv/setup
-echo "Building Manticore research compiler."
-set -xe
-
-PATH=$smlnj/bin:$PATH
-
-mkdir -p $out/bin
-
-# Manticore seems to use the MLB files from the build tree,
-# so for now we copy the whole build tree into the store:
-cd $out/
-tar xf $src
-mv manticore* repo_checkout
-cd repo_checkout/
-# TODO: At the very least, this could probably be cut down to a subset
-# of the repo.
-
-${autoconf}/bin/autoheader -Iconfig
-${autoconf}/bin/autoconf -Iconfig
-./configure --prefix=$out
-make build -j
-make install
diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index 7e8312549da..795830e0e70 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -1,14 +1,41 @@
-{ stdenv, fetchurl, coreutils, autoconf, automake, smlnj }:
+{ stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }:
-stdenv.mkDerivation rec {
+let
+ rev = "592a5714595b4448b646a7d49df04c285668c2f8";
+in stdenv.mkDerivation rec {
name = "manticore-${version}";
version = "2014.08.18";
- builder = ./builder.sh;
- src = fetchurl {
- url = https://github.com/rrnewton/manticore_temp_mirror/archive/snapshot-20140818.tar.gz;
- sha256 = "1x52xpj5gbcpqjqm6aw6ssn901f353zypj3d5scm8i3ad777y29d";
+
+ src = fetchFromGitHub {
+ owner = "rrnewton";
+ repo = "manticore_temp_mirror";
+ sha256 = "1snwlm9a31wfgvzb80y7r7yvc6n0k0bi675lqwzll95as7cdswwi";
+ inherit rev;
};
- inherit stdenv coreutils autoconf automake smlnj;
+
+ enableParallelBuilding = false;
+
+ nativeBuildInputs = [ autoreconfHook ];
+
+ buildInputs = [ coreutils smlnj ];
+
+ autoreconfFlags = "-Iconfig -vfi";
+
+ unpackPhase = ''
+ mkdir -p $out
+ cd $out
+ unpackFile $src
+ mv manticore_temp_mirror-${rev}-src repo_checkout
+ cd repo_checkout
+ chmod u+w . -R
+ '';
+
+ postPatch = ''
+ patchShebangs .
+ substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout'
+ '';
+
+ preInstall = "mkdir -p $out/bin";
meta = {
description = "A parallel, pure variant of Standard ML";
diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix
index 2f3391f70e0..51effd2c784 100644
--- a/pkgs/development/compilers/openjdk-darwin/8.nix
+++ b/pkgs/development/compilers/openjdk-darwin/8.nix
@@ -7,11 +7,11 @@ let
};
jdk = stdenv.mkDerivation {
- name = "zulu1.8.0_66-8.11.0.1";
+ name = "zulu1.8.0_121-8.20.0.5";
src = fetchurl {
- url = "http://cdn.azulsystems.com/zulu/bin/zulu1.8.0_66-8.11.0.1-macosx.zip";
- sha256 = "0pvbpb3vf0509xm2x1rh0p0w4wmx50zf15604p28z1k8ai1a23sz";
+ url = "http://cdn.azul.com/zulu/bin/zulu8.20.0.5-jdk8.0.121-macosx_x64.zip";
+ sha256 = "2a58bd1d9b0cbf0b3d8d1bcdd117c407e3d5a0ec01e2f53565c9bec5cf9ea78b";
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
};
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index f78eafa68af..a386abec95b 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
- version = "0.11.3";
+ version = "0.11.4";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
- sha256 = "08wh8rh17bf043glvn7778bwpxyzpm95kgfll645hf2m65n5ncsh";
+ sha256 = "0csssmc9dcm2ib9k5qhglnjyrqsmci9b5q0b5cxwvl5z1llib9hg";
};
buildInputs = [ llvm makeWrapper which ];
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 91d7cda1c00..afab703ae5b 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -1,5 +1,8 @@
-{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform,
- targets ? [], targetToolchains ? [], targetPatches ? [] }:
+{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm
+, targets ? []
+, targetToolchains ? []
+, targetPatches ? []
+}:
let
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
@@ -17,6 +20,7 @@ rec {
./patches/darwin-disable-fragile-tcp-tests.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+ inherit llvm;
inherit targets;
inherit targetPatches;
inherit targetToolchains;
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index a693afb8b59..f2fe7fbca7a 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -153,6 +153,6 @@ stdenv.mkDerivation {
description = "A safe, concurrent, practical language";
maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
license = [ licenses.mit licenses.asl20 ];
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = subtractLists platforms.i686 (platforms.linux ++ platforms.darwin);
};
}
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index 7f8580f058b..75daad36f76 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -38,7 +38,7 @@ in stdenv.mkDerivation {
'' + stdenv.lib.optionalString stdenv.isDarwin (with darwin; ''
sed -i '/^[[:space:]]*\*x86-darwin\*)$/,/^[[:space:]]*\*) ;;/ c\
\ \*x86-darwin\*)\
-\ INCLFILE=${osx_sdk}/Developer/SDKs/${osx_sdk.name}/usr/include/unistd.h\
+\ INCLFILE=${apple_sdk.sdk}/include/unistd.h\
\ ;;\
\ \*) ;;
' base/runtime/config/gen-posix-names.sh
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
new file mode 100644
index 00000000000..9764ede7281
--- /dev/null
+++ b/pkgs/development/compilers/swift/default.nix
@@ -0,0 +1,265 @@
+{ stdenv
+, cmake
+, coreutils
+, glibc
+, which
+, perl
+, libedit
+, ninja
+, pkgconfig
+, sqlite
+, swig
+, bash
+, libxml2
+, llvm
+, clang
+, python
+, ncurses
+, libuuid
+, libbsd
+, icu
+, autoconf
+, libtool
+, automake
+, libblocksruntime
+, curl
+, rsync
+, git
+, libgit2
+, binutils
+, fetchFromGitHub
+, paxctl
+, findutils
+#, systemtap
+}:
+
+let
+ v_major = "3.1";
+ version = "${v_major}-RELEASE";
+ version_friendly = "${v_major}";
+
+ tag = "refs/tags/swift-${version}";
+ fetch = { repo, sha256, fetchSubmodules ? false }:
+ fetchFromGitHub {
+ owner = "apple";
+ inherit repo sha256 fetchSubmodules;
+ rev = tag;
+ name = "${repo}-${version}-src";
+ };
+
+sources = {
+ # FYI: SourceKit probably would work but currently requires building everything twice
+ # For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759
+ clang = fetch {
+ repo = "swift-clang";
+ sha256 = "0820mx1ghfnk4p5595r1f313y1699jwi61zghfbwak5wgwgy7n4x";
+ };
+ llvm = fetch {
+ repo = "swift-llvm";
+ sha256 = "0zb1zi77b2xdz5szlz2m3j3d92dc0q00dv8py2s6iaq3k435i3sq";
+ };
+ compilerrt = fetch {
+ repo = "swift-compiler-rt";
+ sha256 = "1gjcr6g3ffs3nhf4a84iwg4flbd7rqcf9rvvclwyq96msa3mj950";
+ };
+ cmark = fetch {
+ repo = "swift-cmark";
+ sha256 = "0qf2f3zd8lndkfbxbz6vkznzz8rvq5gigijh7pgmfx9fi4zcssqx";
+ };
+ lldb = fetch {
+ repo = "swift-lldb";
+ sha256 = "17n4whpf3wxw9zaayiq21gk9q3547qxi4rvxld2hybh0k7a1bj5c";
+ };
+ llbuild = fetch {
+ repo = "swift-llbuild";
+ sha256 = "1l3hnb2s01jby91k1ipbc3bhszq14vyx5pzdhf2chld1yhpg420d";
+ };
+ pm = fetch {
+ repo = "swift-package-manager";
+ sha256 = "05zijald08z4jbppjawlc0h9n0i4dvn6jnhq0i5b9qq55l7a1lrk";
+ };
+ xctest = fetch {
+ repo = "swift-corelibs-xctest";
+ sha256 = "0cj5y7wanllfldag08ci567x12aw793c79afckpbsiaxmwy4xhnm";
+ };
+ foundation = fetch {
+ repo = "swift-corelibs-foundation";
+ sha256 = "0d34clr7n0kfy0l94hmgg1cailg3bml0qzlhy8wh75hrrv3n4g1v";
+ };
+ libdispatch = fetch {
+ repo = "swift-corelibs-libdispatch";
+ sha256 = "1rka7ijkdk4ybdvyk3map5mc1fm79v848v9nhpfq75m5i63r61bh";
+ fetchSubmodules = true;
+ };
+ swift = fetch {
+ repo = "swift";
+ sha256 = "172q84z70z9gpwahmlcifihldrvc3cafy9ajbz4wi5f6ncw7wbmb";
+ };
+ };
+
+ devInputs = [
+ curl
+ glibc
+ icu
+ libblocksruntime
+ libbsd
+ libedit
+ libuuid
+ libxml2
+ ncurses
+ sqlite
+ swig
+ # systemtap?
+ ];
+
+ cmakeFlags = [
+ "-DGLIBC_INCLUDE_PATH=${stdenv.cc.libc.dev}/include"
+ "-DC_INCLUDE_DIRS=${stdenv.lib.makeSearchPathOutput "dev" "include" devInputs}:${libxml2.dev}/include/libxml2"
+ "-DGCC_INSTALL_PREFIX=${clang.cc.gcc}"
+ ];
+
+ builder = ''
+ $SWIFT_SOURCE_ROOT/swift/utils/build-script \
+ --preset=buildbot_linux \
+ installable_package=$INSTALLABLE_PACKAGE \
+ install_prefix=$out \
+ install_destdir=$SWIFT_INSTALL_DIR \
+ extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"'';
+
+in
+stdenv.mkDerivation rec {
+ name = "swift-${version_friendly}";
+
+ buildInputs = devInputs ++ [
+ autoconf
+ automake
+ bash
+ clang
+ cmake
+ coreutils
+ libtool
+ ninja
+ perl
+ pkgconfig
+ python
+ rsync
+ which
+ findutils
+ ] ++ stdenv.lib.optional stdenv.needsPax paxctl;
+
+ # TODO: Revisit what's propagated and how
+ propagatedBuildInputs = [
+ libgit2
+ python
+ ];
+ propagatedUserEnvPkgs = [ git pkgconfig ];
+
+ hardeningDisable = [ "format" ]; # for LLDB
+
+ configurePhase = ''
+ cd ..
+
+ export INSTALLABLE_PACKAGE=$PWD/swift.tar.gz
+
+ mkdir build install
+ export SWIFT_BUILD_ROOT=$PWD/build
+ export SWIFT_INSTALL_DIR=$PWD/install
+
+ cd $SWIFT_BUILD_ROOT
+
+ unset CC
+ unset CXX
+
+ export NIX_ENFORCE_PURITY=
+ '';
+
+ unpackPhase = ''
+ mkdir src
+ cd src
+ export sourceRoot=$PWD
+ export SWIFT_SOURCE_ROOT=$PWD
+
+ cp -r ${sources.clang} clang
+ cp -r ${sources.llvm} llvm
+ cp -r ${sources.compilerrt} compiler-rt
+ cp -r ${sources.cmark} cmark
+ cp -r ${sources.lldb} lldb
+ cp -r ${sources.llbuild} llbuild
+ cp -r ${sources.pm} swiftpm
+ cp -r ${sources.xctest} swift-corelibs-xctest
+ cp -r ${sources.foundation} swift-corelibs-foundation
+ cp -r ${sources.libdispatch} swift-corelibs-libdispatch
+ cp -r ${sources.swift} swift
+
+ chmod -R u+w .
+ '';
+
+ patchPhase = ''
+ # Just patch all the things for now, we can focus this later
+ patchShebangs $SWIFT_SOURCE_ROOT
+
+ substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \
+ --replace '/usr/include' "${stdenv.cc.libc.dev}/include"
+ substituteInPlace swift/utils/build-script-impl \
+ --replace '/usr/include/c++' "${clang.cc.gcc}/include/c++"
+ '' + stdenv.lib.optionalString stdenv.needsPax ''
+ patch -p1 -d swift -i ${./patches/build-script-pax.patch}
+ '' + ''
+ patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch}
+ patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch}
+ patch -p1 -d swift -i ${./patches/0003-build-presets-linux-disable-tests.patch}
+ patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch}
+
+ substituteInPlace clang/lib/Driver/ToolChains.cpp \
+ --replace ' addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \
+ ' addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);'
+ patch -p1 -d clang -i ${./purity.patch}
+
+ # Workaround hardcoded dep on "libcurses" (vs "libncurses"):
+ sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt
+ substituteInPlace llbuild/tests/BuildSystem/Build/basic.llbuild \
+ --replace /usr/bin/env $(type -p env)
+
+ # This test fails on one of my machines, not sure why.
+ # Disabling for now.
+ rm llbuild/tests/Examples/buildsystem-capi.llbuild
+
+ substituteInPlace swift-corelibs-foundation/lib/script.py \
+ --replace /bin/cp $(type -p cp)
+
+ PREFIX=''${out/#\/}
+ substituteInPlace swift-corelibs-xctest/build_script.py \
+ --replace usr "$PREFIX"
+ substituteInPlace swiftpm/Utilities/bootstrap \
+ --replace "usr" "$PREFIX"
+ '';
+
+ doCheck = false;
+
+ buildPhase = builder;
+
+ installPhase = ''
+ mkdir -p $out
+
+ # Extract the generated tarball into the store
+ PREFIX=''${out/#\/}
+ tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX
+
+ paxmark pmr $out/bin/swift
+ paxmark pmr $out/bin/*
+
+ # TODO: Use wrappers to get these on the PATH for swift tools, instead
+ ln -s ${clang}/bin/* $out/bin/
+ ln -s ${binutils}/bin/ar $out/bin/ar
+ '';
+
+ meta = with stdenv.lib; {
+ description = "The Swift Programming Language";
+ homepage = "https://github.com/apple/swift";
+ maintainers = with maintainers; [ jb55 dtzWill ];
+ license = licenses.asl20;
+ # Swift doesn't support 32bit Linux, unknown on other platforms.
+ platforms = [ "x86_64-linux" ];
+ };
+}
+
diff --git a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
new file mode 100644
index 00000000000..6ef83754a67
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
@@ -0,0 +1,25 @@
+From 1fc49285c7a198de14005803dfde64bda17f4120 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Tue, 28 Mar 2017 15:01:16 -0500
+Subject: [PATCH 1/4] build-presets: (linux) don't require using Ninja
+
+---
+ utils/build-presets.ini | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/build-presets.ini b/utils/build-presets.ini
+index 7ee57ad2df..e6b0af3581 100644
+--- a/utils/build-presets.ini
++++ b/utils/build-presets.ini
+@@ -686,7 +686,7 @@ swiftpm
+ xctest
+ dash-dash
+
+-build-ninja
++# build-ninja
+ install-swift
+ install-lldb
+ install-llbuild
+--
+2.12.2
+
diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
new file mode 100644
index 00000000000..0e18e8812a8
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
@@ -0,0 +1,25 @@
+From fca6624b7a0ad670157105336a737cc95f9ce9fb Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Tue, 28 Mar 2017 15:01:40 -0500
+Subject: [PATCH 2/4] build-presets: (linux) allow custom install prefix
+
+---
+ utils/build-presets.ini | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/build-presets.ini b/utils/build-presets.ini
+index e6b0af3581..1095cbaab7 100644
+--- a/utils/build-presets.ini
++++ b/utils/build-presets.ini
+@@ -692,7 +692,7 @@ install-lldb
+ install-llbuild
+ install-swiftpm
+ install-xctest
+-install-prefix=/usr
++install-prefix=%(install_prefix)s
+ swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license
+ build-swift-static-stdlib
+ build-swift-static-sdk-overlay
+--
+2.12.2
+
diff --git a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch
new file mode 100644
index 00000000000..f647d9189dd
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch
@@ -0,0 +1,38 @@
+From fcc7c216da6cd255f884b7aa39f361786e3afa6a Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Tue, 28 Mar 2017 15:02:18 -0500
+Subject: [PATCH 3/4] build-presets: (linux) disable tests.
+
+---
+ utils/build-presets.ini | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/utils/build-presets.ini b/utils/build-presets.ini
+index 1095cbaab7..1739e91dc2 100644
+--- a/utils/build-presets.ini
++++ b/utils/build-presets.ini
+@@ -700,7 +700,7 @@ build-swift-stdlib-unittest-extra
+
+ # Executes the lit tests for the installable package that is created
+ # Assumes the swift-integration-tests repo is checked out
+-test-installable-package
++# test-installable-package
+
+ # Path to the root of the installation filesystem.
+ install-destdir=%(install_destdir)s
+@@ -713,9 +713,9 @@ mixin-preset=mixin_linux_installation
+ build-subdir=buildbot_linux
+ lldb
+ release
+-test
+-validation-test
+-long-test
++#test
++#validation-test
++#long-test
+ foundation
+ libdispatch
+ lit-args=-v
+--
+2.12.2
+
diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
new file mode 100644
index 00000000000..5493196303c
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
@@ -0,0 +1,25 @@
+From 4a46b12f580d0a9779937d07c4f1fd347570c4ef Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Tue, 28 Mar 2017 15:02:37 -0500
+Subject: [PATCH 4/4] build-presets: (linux) plumb extra-cmake-options
+
+---
+ utils/build-presets.ini | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/utils/build-presets.ini b/utils/build-presets.ini
+index 1739e91dc2..0608fed9c1 100644
+--- a/utils/build-presets.ini
++++ b/utils/build-presets.ini
+@@ -708,6 +708,8 @@ install-destdir=%(install_destdir)s
+ # Path to the .tar.gz package we would create.
+ installable-package=%(installable_package)s
+
++extra-cmake-options=%(extra_cmake_options)s
++
+ [preset: buildbot_linux]
+ mixin-preset=mixin_linux_installation
+ build-subdir=buildbot_linux
+--
+2.12.2
+
diff --git a/pkgs/development/compilers/swift/patches/build-script-pax.patch b/pkgs/development/compilers/swift/patches/build-script-pax.patch
new file mode 100644
index 00000000000..9f1976a2d88
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/build-script-pax.patch
@@ -0,0 +1,32 @@
+--- swift/utils/build-script-impl 2017-01-23 12:47:20.401326309 -0600
++++ swift-pax/utils/build-script-impl 2017-01-23 13:24:10.339366996 -0600
+@@ -1823,6 +1823,16 @@ function set_lldb_xcodebuild_options() {
+ fi
+ }
+
++## XXX: Taken from nixpkgs /pkgs/stdenv/generic/setup.sh
++isELF() {
++ local fn="$1"
++ local magic
++ exec {fd}< "$fn"
++ read -n 4 -u $fd magic
++ exec {fd}<&-
++ if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi
++}
++
+ #
+ # Configure and build each product
+ #
+@@ -2624,6 +2634,12 @@ for host in "${ALL_HOSTS[@]}"; do
+ fi
+
+ call "${CMAKE_BUILD[@]}" "${build_dir}" $(cmake_config_opt ${product}) -- "${BUILD_ARGS[@]}" ${build_targets[@]}
++
++ while IFS= read -r -d $'\0' i; do
++ if ! isELF "$i"; then continue; fi
++ echo "setting pax flags on $i"
++ paxctl -czexm "$i" || true
++ done < <(find "${build_dir}" -executable -type f -wholename "*/bin/*" -print0)
+ fi
+ done
+ done
diff --git a/pkgs/development/compilers/swift/purity.patch b/pkgs/development/compilers/swift/purity.patch
new file mode 100644
index 00000000000..f5fb4c73af4
--- /dev/null
+++ b/pkgs/development/compilers/swift/purity.patch
@@ -0,0 +1,16 @@
+--- a/lib/Driver/Tools.cpp 2016-08-25 15:48:05.187553443 +0200
++++ b/lib/Driver/Tools.cpp 2016-08-25 15:48:47.534468882 +0200
+@@ -9420,13 +9420,6 @@
+ if (!Args.hasArg(options::OPT_static)) {
+ if (Args.hasArg(options::OPT_rdynamic))
+ CmdArgs.push_back("-export-dynamic");
+-
+- if (!Args.hasArg(options::OPT_shared)) {
+- const std::string Loader =
+- D.DyldPrefix + ToolChain.getDynamicLinker(Args);
+- CmdArgs.push_back("-dynamic-linker");
+- CmdArgs.push_back(Args.MakeArgString(Loader));
+- }
+ }
+
+ CmdArgs.push_back("-o");
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b2d678edada..ef3725fb50f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -55,6 +55,7 @@ self: super: {
# check requires mysql server
mysql-simple = dontCheck super.mysql-simple;
+ mysql-haskell = dontCheck super.mysql-haskell;
# Link the proper version.
zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };
@@ -482,17 +483,6 @@ self: super: {
# https://github.com/afcowie/locators/issues/1
locators = dontCheck super.locators;
- # https://github.com/haskell/haddock/issues/378
- haddock-library = dontCheck super.haddock-library;
-
- # https://github.com/haskell/haddock/issues/571
- haddock-api = appendPatch (doJailbreak super.haddock-api) (pkgs.fetchpatch {
- url = "https://github.com/basvandijk/haddock/commit/f4c5e46ded05a4b8884f5ad6f3102f79ff3bb127.patch";
- sha256 = "01dawvikzw6y43557sbp9q7z9vw2g3wnzvv5ny0f0ks6ccc0vj0m";
- stripLen = 2;
- addPrefixes = true;
- });
-
# https://github.com/anton-k/csound-expression-dynamic/issues/1
csound-expression-dynamic = dontHaddock super.csound-expression-dynamic;
@@ -870,9 +860,6 @@ self: super: {
# https://github.com/diagrams/diagrams-lib/issues/288
diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; });
- # https://github.com/cartazio/arithmoi/issues/49
- arithmoi = overrideCabal super.arithmoi (drv: { doCheck = !pkgs.stdenv.isi686; });
-
# https://github.com/danidiaz/streaming-eversion/issues/1
streaming-eversion = dontCheck super.streaming-eversion;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index 3bbfa34fb50..4c2fb69ec80 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -92,7 +92,8 @@ self: super: {
# Needs tagged on pre 7.6.x compilers.
reflection = addBuildDepend super.reflection self.tagged;
- # Needs nats on pre 7.6.x compilers.
- semigroups = addBuildDepend super.semigroups self.nats;
+ # These builds Need additional dependencies on pre 7.6.x compilers.
+ semigroups = addBuildDepends super.semigroups (with self; [nats bytestring-builder tagged unordered-containers transformers]);
+ QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 1be8f16a7d5..1a151efcf38 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -139,12 +139,21 @@ self: super: {
conduit = addBuildDepend super.conduit self.void;
conduit_1_2_5 = addBuildDepend super.conduit_1_2_5 self.void;
+ # Breaks a dependency cycle between QuickCheck and semigroups
+ hashable = dontCheck super.hashable;
+ unordered-containers = dontCheck super.unordered-containers;
+
# Needs additional inputs on pre 7.10.x compilers.
semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]);
lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
distributive = addBuildDepend super.distributive self.semigroups;
+ QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);
+ void = addBuildDepends super.void (with self; [hashable semigroups]);
# Haddock doesn't cope with the new markup.
bifunctors = dontHaddock super.bifunctors;
+ # extra-test: : hFlush: invalid argument (Bad file descriptor)
+ extra = dontCheck super.extra;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index bea914354de..d6d7277cc9d 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -53,6 +53,14 @@ self: super:
terminfo = self.terminfo_0_4_0_2;
xhtml = self.xhtml_3000_2_1;
+ # Cabal isn't part of the stage1 packages which form the default package-db
+ # that GHCJS provides.
+ # Almost all packages require Cabal to build their Setup.hs,
+ # but usually they don't declare it explicitly as they don't need to for normal GHC.
+ # To account for that we add Cabal by default.
+ mkDerivation = args:
+ if args.pname == "Cabal" then super.mkDerivation args else super.mkDerivation (args //
+ { setupHaskellDepends = (args.setupHaskellDepends or []) ++ [ self.Cabal ]; });
## OTHER PACKAGES
@@ -181,8 +189,6 @@ self: super:
] drv.libraryHaskellDepends;
});
- semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ];
-
transformers-compat = overrideCabal super.transformers-compat (drv: {
configureFlags = [];
});
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b8ff822726d..91460eb4019 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
default-package-overrides:
- store < 0.4.1 # https://github.com/fpco/store/issues/104
- # LTS Haskell 8.5
+ # LTS Haskell 8.6
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Vector ==2.3.2
@@ -163,7 +163,7 @@ default-package-overrides:
- ansi-terminal ==0.6.2.3
- ansi-wl-pprint ==0.6.7.3
- ansigraph ==0.3.0.2
- - app-settings ==0.2.0.10
+ - app-settings ==0.2.0.11
- appar ==0.1.4
- arbtt ==0.9.0.12
- arithmoi ==0.4.3.0
@@ -197,7 +197,7 @@ default-package-overrides:
- b9 ==0.5.31
- bake ==0.5
- bank-holidays-england ==0.1.0.5
- - base-compat ==0.9.1
+ - base-compat ==0.9.2
- base-noprelude ==4.9.1.0
- base-orphans ==0.5.4
- base-prelude ==1.0.1.1
@@ -244,7 +244,7 @@ default-package-overrides:
- bitcoin-tx ==0.13.1
- bitcoin-types ==0.9.2
- bits ==0.5
- - bitx-bitcoin ==0.11.0.0
+ - bitx-bitcoin ==0.11.0.1
- blake2 ==0.2.0
- blank-canvas ==0.6
- BlastHTTP ==1.2.1
@@ -253,7 +253,7 @@ default-package-overrides:
- blaze-builder ==0.4.0.2
- blaze-html ==0.8.1.3
- blaze-markup ==0.7.1.1
- - blaze-svg ==0.3.6
+ - blaze-svg ==0.3.6.1
- blaze-textual ==0.2.1.0
- BlogLiterately ==0.8.4.3
- BlogLiterately-diagrams ==0.2.0.5
@@ -272,7 +272,7 @@ default-package-overrides:
- boundingboxes ==0.2.3
- bower-json ==1.0.0.1
- boxes ==0.1.4
- - brick ==0.17.1
+ - brick ==0.17.2
- broadcast-chan ==0.1.1
- bson ==0.3.2.3
- bson-lens ==0.1.1
@@ -300,13 +300,13 @@ default-package-overrides:
- cabal-doctest ==1
- cabal-file-th ==0.2.4
- cabal-helper ==0.7.3.0
- - cabal-rpm ==0.11
+ - cabal-rpm ==0.11.1
- cache ==0.1.0.0
- cacophony ==0.9.2
- cairo ==0.13.3.1
- call-stack ==0.1.0
- camfort ==0.901
- - carray ==0.1.6.5
+ - carray ==0.1.6.6
- cartel ==0.18.0.2
- case-insensitive ==1.2.0.8
- cased ==0.1.0.0
@@ -368,12 +368,12 @@ default-package-overrides:
- clumpiness ==0.17.0.0
- ClustalParser ==1.2.1
- clustering ==0.3.1
- - cmark ==0.5.5
+ - cmark ==0.5.5.1
- cmark-highlight ==0.2.0.0
- cmark-lucid ==0.1.0.0
- - cmdargs ==0.10.15
+ - cmdargs ==0.10.16
- code-builder ==0.1.3
- - code-page ==0.1.2
+ - code-page ==0.1.3
- codo-notation ==0.5.2
- colorful-monoids ==0.2.1.0
- colour ==2.3.3
@@ -397,10 +397,10 @@ default-package-overrides:
- configuration-tools ==0.2.15
- configurator ==0.3.0.0
- configurator-export ==0.1.0.1
- - connection ==0.2.7
+ - connection ==0.2.8
- connection-pool ==0.2.1
- console-style ==0.0.2.1
- - constraints ==0.9
+ - constraints ==0.9.1
- consul-haskell ==0.4.2
- containers-unicode-symbols ==0.3.1.1
- contravariant ==1.4
@@ -512,9 +512,9 @@ default-package-overrides:
- directory-tree ==0.12.1
- discount ==0.1.1
- disk-free-space ==0.1.0.1
- - disposable ==0.2.0.0
+ - disposable ==0.2.0.3
- distance ==0.1.0.0
- - distributed-closure ==0.3.3.0
+ - distributed-closure ==0.3.4.0
- distributed-process ==0.6.6
- distributed-process-simplelocalnet ==0.2.3.3
- distributed-static ==0.3.5.0
@@ -605,7 +605,7 @@ default-package-overrides:
- exceptional ==0.3.0.0
- exceptions ==0.8.3
- executable-hash ==0.2.0.4
- - executable-path ==0.0.3
+ - executable-path ==0.0.3.1
- exhaustive ==1.1.3
- exp-pairs ==0.1.5.2
- expiring-cache-map ==0.0.6.1
@@ -631,7 +631,7 @@ default-package-overrides:
- feature-flags ==0.1.0.1
- feed ==0.3.12.0
- FenwickTree ==0.1.2.1
- - fft ==0.1.8.4
+ - fft ==0.1.8.5
- fgl ==5.5.3.1
- fgl-arbitrary ==0.2.0.3
- file-embed ==0.0.10
@@ -657,7 +657,7 @@ default-package-overrides:
- focus ==0.1.5
- fold-debounce ==0.2.0.5
- fold-debounce-conduit ==0.1.0.5
- - foldl ==1.2.3
+ - foldl ==1.2.4
- foldl-statistics ==0.1.4.2
- folds ==0.7.1
- FontyFruity ==0.5.3.2
@@ -682,7 +682,7 @@ default-package-overrides:
- fuzzcheck ==0.1.1
- gd ==3000.7.3
- Genbank ==1.0.3
- - general-games ==1.0.3
+ - general-games ==1.0.5
- generic-aeson ==0.2.0.8
- generic-deriving ==1.11.1
- generic-random ==0.4.1.0
@@ -705,6 +705,7 @@ default-package-overrides:
- ghc-typelits-knownnat ==0.2.3
- ghc-typelits-natnormalise ==0.5.2
- ghcid ==0.6.6
+ - ghcjs-base-stub ==0.1.0.2
- ghcjs-codemirror ==0.0.0.1
- ghcjs-hplay ==0.3.4.2
- ghcjs-perch ==0.3.3.1
@@ -892,8 +893,8 @@ default-package-overrides:
- happy ==1.19.5
- HaRe ==0.8.4.0
- harp ==0.4.2
- - hasbolt ==0.1.1.1
- - hashable ==1.2.5.0
+ - hasbolt ==0.1.1.2
+ - hashable ==1.2.6.0
- hashable-time ==0.2
- hashmap ==1.3.2
- hashtables ==1.2.1.0
@@ -972,7 +973,7 @@ default-package-overrides:
- hjsonpointer ==1.1.0.2
- hjsonschema ==1.5.0.1
- hlibgit2 ==0.18.0.16
- - hlibsass ==0.1.5.0
+ - hlibsass ==0.1.6.0
- hlint ==1.9.41
- hmatrix ==0.18.0.0
- hmatrix-gsl ==0.18.0.1
@@ -1004,7 +1005,7 @@ default-package-overrides:
- hruby ==0.3.4.3
- hs-bibutils ==5.5
- hs-GeoIP ==0.3
- - hsass ==0.4.0
+ - hsass ==0.4.1
- hsb2hs ==0.3.1
- hscolour ==1.24.1
- hsdns ==1.7
@@ -1013,21 +1014,21 @@ default-package-overrides:
- hsemail ==1.7.7
- HSet ==0.0.0
- hset ==2.2.0
- - hsexif ==0.6.1.0
+ - hsexif ==0.6.1.1
- hsignal ==0.2.7.5
- hsinstall ==1.5
- hslogger ==1.2.10
- hslua ==0.4.1
- hsndfile ==0.8.0
- hsndfile-vector ==0.5.2
- - HsOpenSSL ==0.11.4.1
+ - HsOpenSSL ==0.11.4.4
- HsOpenSSL-x509-system ==0.1.0.3
- hsp ==0.10.0
- - hspec ==2.4.2
+ - hspec ==2.4.3
- hspec-attoparsec ==0.1.0.2
- hspec-contrib ==0.4.0
- - hspec-core ==2.4.2
- - hspec-discover ==2.4.2
+ - hspec-core ==2.4.3
+ - hspec-discover ==2.4.3
- hspec-expectations ==0.8.2
- hspec-expectations-pretty-diff ==0.7.2.4
- hspec-golden-aeson ==0.2.0.3
@@ -1050,7 +1051,7 @@ default-package-overrides:
- html-conduit ==1.2.1.1
- html-email-validate ==0.2.0.0
- htoml ==1.0.0.3
- - HTTP ==4000.3.5
+ - HTTP ==4000.3.6
- http-api-data ==0.3.5
- http-client ==0.5.6.1
- http-client-openssl ==0.2.0.4
@@ -1060,7 +1061,7 @@ default-package-overrides:
- http-date ==0.0.6.1
- http-link-header ==1.0.3
- http-media ==0.6.4
- - http-reverse-proxy ==0.4.3.2
+ - http-reverse-proxy ==0.4.3.3
- http-streams ==0.8.4.0
- http-types ==0.9.1
- http2 ==1.6.3
@@ -1134,7 +1135,7 @@ default-package-overrides:
- io-memoize ==1.1.1.0
- io-region ==0.1.1
- io-storage ==0.3
- - io-streams ==1.3.6.0
+ - io-streams ==1.3.6.1
- io-streams-haproxy ==1.0.0.1
- ip6addr ==0.5.2
- iproute ==1.7.1
@@ -1143,7 +1144,7 @@ default-package-overrides:
- irc-client ==0.4.4.1
- irc-conduit ==0.2.2.1
- irc-ctcp ==0.1.3.0
- - irc-dcc ==2.0.0
+ - irc-dcc ==2.0.1
- islink ==0.1.0.0
- iso3166-country-codes ==0.20140203.8
- iso639 ==0.1.0.3
@@ -1201,10 +1202,10 @@ default-package-overrides:
- language-javascript ==0.6.0.9
- language-lua2 ==0.1.0.5
- language-nix ==2.1.0.1
- - language-puppet ==1.3.6
+ - language-puppet ==1.3.7
- language-python ==0.5.4
- language-thrift ==0.10.0.0
- - large-hashable ==0.1.0.3
+ - large-hashable ==0.1.0.4
- largeword ==1.2.5
- lattices ==1.5.0
- lazy-csv ==0.5.1
@@ -1248,7 +1249,7 @@ default-package-overrides:
- lmdb ==0.2.5
- loch-th ==0.2.1
- log ==0.7
- - log-base ==0.7
+ - log-base ==0.7.1
- log-domain ==0.11
- log-elasticsearch ==0.7
- log-postgres ==0.7
@@ -1280,7 +1281,7 @@ default-package-overrides:
- marvin-interpolate ==1.1
- math-functions ==0.2.1.0
- mathexpr ==0.3.0.0
- - matplotlib ==0.4.1
+ - matplotlib ==0.4.3
- matrices ==0.4.4
- matrix ==0.3.5.0
- matrix-market-attoparsec ==0.1.0.5
@@ -1290,7 +1291,7 @@ default-package-overrides:
- median-stream ==0.7.0.0
- mega-sdist ==0.3.0.2
- megaparsec ==5.2.0
- - memory ==0.14.1
+ - memory ==0.14.2
- MemoTrie ==0.6.7
- mersenne-random ==1.0.0.1
- mersenne-random-pure64 ==0.2.2.0
@@ -1312,7 +1313,7 @@ default-package-overrides:
- mime-mail ==0.4.13.1
- mime-mail-ses ==0.3.2.3
- mime-types ==0.1.0.7
- - mintty ==0.1
+ - mintty ==0.1.1
- misfortune ==0.1.1.2
- missing-foreign ==0.1.1
- MissingH ==1.4.0.1
@@ -1326,7 +1327,7 @@ default-package-overrides:
- monad-extras ==0.6.0
- monad-http ==0.1.0.0
- monad-journal ==0.7.2
- - monad-logger ==0.3.20.2
+ - monad-logger ==0.3.21
- monad-logger-json ==0.1.0.0
- monad-logger-prefix ==0.1.6
- monad-logger-syslog ==0.1.3.0
@@ -1338,7 +1339,7 @@ default-package-overrides:
- monad-peel ==0.2.1.2
- monad-primitive ==0.1
- monad-products ==4.0.1
- - monad-skeleton ==0.1.3
+ - monad-skeleton ==0.1.3.2
- monad-time ==0.2
- monad-unlift ==0.2.0
- monad-unlift-ref ==0.2.0
@@ -1433,7 +1434,7 @@ default-package-overrides:
- ObjectName ==1.1.0.1
- octane ==0.18.2
- Octree ==0.5.4.3
- - oeis ==0.3.8
+ - oeis ==0.3.9
- ofx ==0.4.2.0
- old-locale ==1.0.0.7
- old-time ==1.1.0.3
@@ -1482,7 +1483,7 @@ default-package-overrides:
- partial-handler ==1.0.2
- partial-isomorphisms ==0.2.2
- patat ==0.5.0.0
- - path ==0.5.12
+ - path ==0.5.13
- path-extra ==0.0.3
- path-io ==1.2.2
- path-pieces ==0.2.1
@@ -1536,7 +1537,7 @@ default-package-overrides:
- pkcs10 ==0.2.0.0
- placeholders ==0.1
- plan-b ==0.2.0
- - plot ==0.2.3.6
+ - plot ==0.2.3.7
- plot-gtk ==0.2.0.4
- plot-gtk-ui ==0.3.0.2
- plot-gtk3 ==0.1.0.2
@@ -1557,8 +1558,8 @@ default-package-overrides:
- postgresql-simple-migration ==0.1.9.0
- postgresql-simple-url ==0.2.0.0
- postgresql-transactional ==1.1.1
- - postgresql-typed ==0.5.0
- - pqueue ==1.3.2
+ - postgresql-typed ==0.5.1
+ - pqueue ==1.3.2.2
- pred-set ==0.0.1
- prednote ==0.36.0.4
- prefix-units ==0.2.0
@@ -1577,7 +1578,7 @@ default-package-overrides:
- printcess ==0.1.0.3
- process-extras ==0.7.1
- product-profunctors ==0.7.1.0
- - profiteur ==0.4.2.1
+ - profiteur ==0.4.2.2
- profunctor-extras ==4.0
- profunctors ==5.2
- project-template ==0.2.0
@@ -1626,13 +1627,13 @@ default-package-overrides:
- range ==0.1.2.0
- range-set-list ==0.1.2.0
- rank1dynamic ==0.3.3.0
- - Rasterific ==0.7.1
+ - Rasterific ==0.7.2.1
- rasterific-svg ==0.3.2.1
- ratel ==0.3.2
- ratel-wai ==0.2.0
- rattletrap ==2.1.5
- raw-strings-qq ==1.1
- - rawfilepath ==0.1.0.0
+ - rawfilepath ==0.1.1
- rawstring-qm ==0.2.3.0
- rdf ==0.1.0.1
- read-editor ==0.1.0.2
@@ -1670,7 +1671,7 @@ default-package-overrides:
- reinterpret-cast ==0.1.0
- relational-query ==0.8.3.5
- relational-query-HDBC ==0.6.0.2
- - relational-record ==0.1.6.1
+ - relational-record ==0.1.7.1
- relational-schemas ==0.1.3.1
- renderable ==0.2.0.1
- repa ==3.4.1.2
@@ -1701,7 +1702,7 @@ default-package-overrides:
- rfc5051 ==0.1.0.3
- riak ==1.1.1.0
- riak-protobuf ==0.22.0.0
- - RNAlien ==1.3.1
+ - RNAlien ==1.3.7
- rng-utils ==0.2.1
- rose-trees ==0.0.4.3
- rot13 ==0.1.0.2
@@ -1714,7 +1715,7 @@ default-package-overrides:
- safe ==0.3.14
- safe-exceptions ==0.1.5.0
- safe-exceptions-checked ==0.1.0
- - safecopy ==0.9.3
+ - safecopy ==0.9.3.1
- SafeSemaphore ==0.10.1
- sampling ==0.3.2
- sandi ==0.4.0
@@ -1774,7 +1775,7 @@ default-package-overrides:
- sets ==0.0.5.2
- SHA ==1.6.4.2
- shake ==0.15.11
- - shake-language-c ==0.10.0
+ - shake-language-c ==0.10.1
- shakespeare ==2.0.12.1
- shell-conduit ==4.5.2
- shelly ==1.6.8.3
@@ -1805,7 +1806,7 @@ default-package-overrides:
- smoothie ==0.4.2.6
- smtLib ==1.0.8
- smtp-mail ==0.1.4.6
- - snap-core ==1.0.1.0
+ - snap-core ==1.0.2.0
- snap-server ==1.0.1.1
- snowflake ==0.1.1.1
- soap ==0.2.3.3
@@ -1839,7 +1840,7 @@ default-package-overrides:
- sqlite-simple ==0.4.13.0
- sqlite-simple-errors ==0.6.0.0
- srcloc ==0.5.1.0
- - stache ==0.2.1
+ - stache ==0.2.2
- stack-run-auto ==0.1.1.4
- stack-type ==0.1.0.0
- state-plus ==0.1.2
@@ -1894,7 +1895,7 @@ default-package-overrides:
- sundown ==0.6
- superbuffer ==0.2.0.1
- svg-builder ==0.1.0.2
- - svg-tree ==0.6
+ - svg-tree ==0.6.1
- SVGFonts ==1.6.0.1
- swagger ==0.3.0
- swagger2 ==2.1.3
@@ -1959,7 +1960,7 @@ default-package-overrides:
- test-framework-th ==0.2.4
- test-simple ==0.1.9
- testing-feat ==0.4.0.3
- - texmath ==0.9.3
+ - texmath ==0.9.4
- text ==1.2.2.1
- text-all ==0.3.0.2
- text-binary ==0.2.1.1
@@ -2011,7 +2012,7 @@ default-package-overrides:
- tinylog ==0.14.0
- tinytemplate ==0.1.2.0
- titlecase ==0.1.0.3
- - tls ==1.3.9
+ - tls ==1.3.10
- tls-debug ==0.4.4
- token-bucket ==0.1.0.1
- tostring ==0.2.1.1
@@ -2031,7 +2032,7 @@ default-package-overrides:
- tuple ==0.3.0.2
- tuple-th ==0.2.5
- tuples-homogenous-h98 ==0.1.1.0
- - turtle ==1.3.1
+ - turtle ==1.3.2
- turtle-options ==0.1.0.4
- twitter-feed ==0.2.0.11
- type-aligned ==0.9.6
@@ -2078,7 +2079,7 @@ default-package-overrides:
- unix-time ==0.3.7
- Unixutils ==1.54.1
- unlit ==0.4.0.0
- - unordered-containers ==0.2.7.2
+ - unordered-containers ==0.2.8.0
- uri-bytestring ==0.2.3.1
- uri-encode ==1.5.0.5
- uri-templater ==0.2.1.0
@@ -2090,7 +2091,7 @@ default-package-overrides:
- users-test ==0.5.0.1
- utf8-light ==0.4.2
- utf8-string ==1.0.1.1
- - utility-ht ==0.0.12
+ - utility-ht ==0.0.13
- uu-interleaved ==0.2.0.0
- uu-parsinglib ==2.9.1.1
- uuid ==1.3.13
@@ -2112,7 +2113,7 @@ default-package-overrides:
- vector-space ==0.10.4
- vector-split ==1.0.0.2
- vector-th-unbox ==0.2.1.6
- - vectortiles ==1.2.0.2
+ - vectortiles ==1.2.0.4
- verbosity ==0.2.3.0
- versions ==3.0.0
- vhd ==0.2.2
@@ -2120,7 +2121,7 @@ default-package-overrides:
- viewprof ==0.0.0.1
- vinyl ==0.5.3
- vinyl-utils ==0.3.0.0
- - void ==0.7.1
+ - void ==0.7.2
- vty ==5.15
- wai ==3.2.1.1
- wai-app-static ==3.1.6.1
@@ -2130,7 +2131,7 @@ default-package-overrides:
- wai-extra ==3.0.19.1
- wai-handler-launch ==3.0.2.2
- wai-logger ==2.3.0
- - wai-middleware-auth ==0.1.1.1
+ - wai-middleware-auth ==0.1.1.2
- wai-middleware-caching ==0.1.0.2
- wai-middleware-caching-lru ==0.1.0.0
- wai-middleware-caching-redis ==0.2.0.0
@@ -2154,7 +2155,7 @@ default-package-overrides:
- warp ==3.2.11.1
- warp-tls ==3.2.3
- wave ==0.1.4
- - wavefront ==0.7.0.3
+ - wavefront ==0.7.1
- wavefront-obj ==0.1.0.1
- web-plugins ==0.2.9
- web-routes ==0.27.11
@@ -2183,7 +2184,7 @@ default-package-overrides:
- wire-streams ==0.1.1.0
- with-location ==0.1.0
- withdependencies ==0.2.4
- - witherable ==0.1.3.3
+ - witherable ==0.1.3.4
- witness ==0.4
- wizards ==1.0.2
- wl-pprint ==1.2
@@ -2212,7 +2213,7 @@ default-package-overrides:
- x509-system ==1.6.4
- x509-validation ==1.6.5
- Xauth ==0.1
- - xdcc ==1.1.3
+ - xdcc ==1.1.4
- xdg-basedir ==0.2.2
- xeno ==0.1
- xenstore ==0.1.1
@@ -2247,7 +2248,7 @@ default-package-overrides:
- yesod-auth-account ==1.4.3
- yesod-auth-basic ==0.1.0.2
- yesod-auth-hashdb ==1.6.0.1
- - yesod-bin ==1.5.2.1
+ - yesod-bin ==1.5.2.2
- yesod-core ==1.4.32
- yesod-eventsource ==1.4.1
- yesod-fay ==0.8.0
@@ -2737,6 +2738,7 @@ dont-distribute-packages:
aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ axiom: [ i686-linux, x86_64-linux, x86_64-darwin ]
azubi: [ i686-linux, x86_64-linux, x86_64-darwin ]
azure-service-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
azure-servicebus: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2975,6 +2977,7 @@ dont-distribute-packages:
bytestring-read: [ i686-linux, x86_64-linux, x86_64-darwin ]
bytestringreadp: [ i686-linux, x86_64-linux, x86_64-darwin ]
bytestring-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ bytestring-strict-builder: [ i686-linux, x86_64-linux, x86_64-darwin ]
bytestring-typenats: [ i686-linux, x86_64-linux, x86_64-darwin ]
cabal2arch: [ i686-linux, x86_64-linux, x86_64-darwin ]
cabal2doap: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3258,6 +3261,7 @@ dont-distribute-packages:
comonad-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
comonad-random: [ i686-linux, x86_64-linux, x86_64-darwin ]
ComonadSheet: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ compactable: [ i686-linux, x86_64-linux, x86_64-darwin ]
compact-map: [ i686-linux, x86_64-linux, x86_64-darwin ]
compact-socket: [ i686-linux, x86_64-linux, x86_64-darwin ]
compact-string: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3656,6 +3660,7 @@ dont-distribute-packages:
DiscussionSupportSystem: [ i686-linux, x86_64-linux, x86_64-darwin ]
Dish: [ i686-linux, x86_64-linux, x86_64-darwin ]
disjoint-set: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ disjoint-set-stateful: [ i686-linux, x86_64-linux, x86_64-darwin ]
distance-of-time: [ i686-linux, x86_64-linux, x86_64-darwin ]
Dist: [ i686-linux, x86_64-linux, x86_64-darwin ]
DisTract: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3798,6 +3803,7 @@ dont-distribute-packages:
elevator: [ i686-linux, x86_64-linux, x86_64-darwin ]
elision: [ i686-linux, x86_64-linux, x86_64-darwin ]
elocrypt: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ elsa: [ i686-linux, x86_64-linux, x86_64-darwin ]
emacs-keys: [ i686-linux, x86_64-linux, x86_64-darwin ]
email: [ i686-linux, x86_64-linux, x86_64-darwin ]
emailparse: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3947,6 +3953,7 @@ dont-distribute-packages:
feldspar-language: [ i686-linux, x86_64-linux, x86_64-darwin ]
fenfire: [ i686-linux, x86_64-linux, x86_64-darwin ]
FermatsLastMargin: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ fernet: [ i686-linux, x86_64-linux, x86_64-darwin ]
FerryCore: [ i686-linux, x86_64-linux, x86_64-darwin ]
Feval: [ i686-linux, x86_64-linux, x86_64-darwin ]
ffeed: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4119,6 +4126,7 @@ dont-distribute-packages:
fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ]
fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ]
fwgl-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ g4ip: [ i686-linux, x86_64-linux, x86_64-darwin ]
gact: [ i686-linux, x86_64-linux, x86_64-darwin ]
gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ]
game-of-life: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4211,6 +4219,7 @@ dont-distribute-packages:
ghc-session: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ ghc-usage: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghc-vis: [ i686-linux, x86_64-linux, x86_64-darwin ]
ght: [ i686-linux, x86_64-linux, x86_64-darwin ]
giak: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4269,6 +4278,9 @@ dont-distribute-packages:
glade: [ i686-linux, x86_64-linux, x86_64-darwin ]
gladexml-accessor: [ i686-linux, x86_64-linux, x86_64-darwin ]
glapp: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ glazier-react-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ glazier-react: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ glazier-react-widget: [ i686-linux, x86_64-linux, x86_64-darwin ]
GLFW-b-demo: [ i686-linux, x86_64-linux, x86_64-darwin ]
GLFW-OGL: [ i686-linux, x86_64-linux, x86_64-darwin ]
GLFW-task: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4287,8 +4299,11 @@ dont-distribute-packages:
GlomeVec: [ i686-linux, x86_64-linux, x86_64-darwin ]
GlomeView: [ i686-linux, x86_64-linux, x86_64-darwin ]
gloss-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gloss-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ]
gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ]
gloss-devil: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gloss-raster: [ i686-linux, x86_64-linux, x86_64-darwin ]
gloss-sodium: [ i686-linux, x86_64-linux, x86_64-darwin ]
glue-common: [ i686-linux, x86_64-linux, x86_64-darwin ]
glue-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4579,6 +4594,7 @@ dont-distribute-packages:
haroonga: [ i686-linux, x86_64-linux, x86_64-darwin ]
harvest-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
hasbolt: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ HasCacBDD: [ i686-linux, x86_64-linux, x86_64-darwin ]
hascal: [ i686-linux, x86_64-linux, x86_64-darwin ]
hascas: [ i686-linux, x86_64-linux, x86_64-darwin ]
hascat: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4761,6 +4777,7 @@ dont-distribute-packages:
HCL: [ i686-linux, x86_64-linux, x86_64-darwin ]
hcltest: [ i686-linux, x86_64-linux, x86_64-darwin ]
hcoap: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hcoord: [ i686-linux, x86_64-linux, x86_64-darwin ]
hcron: [ i686-linux, x86_64-linux, x86_64-darwin ]
hCsound: [ i686-linux, x86_64-linux, x86_64-darwin ]
hcube: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5071,6 +5088,7 @@ dont-distribute-packages:
hR: [ i686-linux, x86_64-linux, x86_64-darwin ]
hricket: [ i686-linux, x86_64-linux, x86_64-darwin ]
Hricket: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hriemann: [ i686-linux, x86_64-linux, x86_64-darwin ]
HROOT-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
HROOT-graf: [ i686-linux, x86_64-linux, x86_64-darwin ]
HROOT-hist: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5394,6 +5412,7 @@ dont-distribute-packages:
implicit-params: [ i686-linux, x86_64-linux, x86_64-darwin ]
imports: [ i686-linux, x86_64-linux, x86_64-darwin ]
impossible: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ imprevu-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ]
improve: [ i686-linux, x86_64-linux, x86_64-darwin ]
INblobs: [ i686-linux, x86_64-linux, x86_64-darwin ]
inch: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5441,6 +5460,7 @@ dont-distribute-packages:
intro: [ i686-linux, x86_64-linux, x86_64-darwin ]
intro-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
intset: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ invertible-hlist: [ i686-linux, x86_64-linux, x86_64-darwin ]
invertible: [ i686-linux, x86_64-linux, x86_64-darwin ]
invertible-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ]
io-capture: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5568,6 +5588,7 @@ dont-distribute-packages:
json-togo: [ i686-linux, x86_64-linux, x86_64-darwin ]
json-tools: [ i686-linux, x86_64-linux, x86_64-darwin ]
jsontsv: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ jsonxlsx: [ i686-linux, x86_64-linux, x86_64-darwin ]
jspath: [ i686-linux, x86_64-linux, x86_64-darwin ]
juandelacosa: [ i686-linux, x86_64-linux, x86_64-darwin ]
judy: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5714,6 +5735,8 @@ dont-distribute-packages:
language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ]
language-puppet: [ i686-linux, x86_64-darwin ]
language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ language-python: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ language-python-test: [ i686-linux, x86_64-linux, x86_64-darwin ]
language-qux: [ i686-linux, x86_64-linux, x86_64-darwin ]
language-sh: [ i686-linux, x86_64-linux, x86_64-darwin ]
language-spelling: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5805,6 +5828,7 @@ dont-distribute-packages:
libxml: [ i686-linux, x86_64-linux, x86_64-darwin ]
libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ]
libzfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ LibZip: [ i686-linux, x86_64-linux, x86_64-darwin ]
lifter: [ i686-linux, x86_64-linux, x86_64-darwin ]
ligature: [ i686-linux, x86_64-linux, x86_64-darwin ]
lightning-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5873,6 +5897,7 @@ dont-distribute-packages:
llvm-general: [ i686-linux, x86_64-linux, x86_64-darwin ]
llvm-general-pure: [ i686-linux, x86_64-linux, x86_64-darwin ]
llvm-general-quote: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ llvm-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
llvm-ht: [ i686-linux, x86_64-linux, x86_64-darwin ]
llvm: [ i686-linux, x86_64-linux, x86_64-darwin ]
llvm-tf: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6015,6 +6040,7 @@ dont-distribute-packages:
mathblog: [ i686-linux, x86_64-linux, x86_64-darwin ]
mathlink: [ i686-linux, x86_64-linux, x86_64-darwin ]
matlab: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ matplotlib: [ i686-linux, x86_64-linux, x86_64-darwin ]
matsuri: [ i686-linux, x86_64-linux, x86_64-darwin ]
maude: [ i686-linux, x86_64-linux, x86_64-darwin ]
maxent: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6043,6 +6069,7 @@ dont-distribute-packages:
mech: [ i686-linux, x86_64-linux, x86_64-darwin ]
mechs: [ i686-linux, x86_64-linux, x86_64-darwin ]
Mechs: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mediabus-fdk-aac: [ i686-linux, x86_64-linux, x86_64-darwin ]
mediabus: [ i686-linux ]
mediabus-rtp: [ i686-linux ]
mediawiki2latex: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6114,6 +6141,7 @@ dont-distribute-packages:
mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ]
mlist: [ i686-linux, x86_64-linux, x86_64-darwin ]
ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mmtf: [ i686-linux, x86_64-linux, x86_64-darwin ]
mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ]
mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ]
mnist-idx: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6141,6 +6169,7 @@ dont-distribute-packages:
MonadCatchIO-transformers-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ]
MonadCatchIO-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ]
monad-classes: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ monad-classes-logging: [ i686-linux, x86_64-linux, x86_64-darwin ]
MonadCompose: [ i686-linux, x86_64-linux, x86_64-darwin ]
monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ]
monad-fork: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6207,6 +6236,7 @@ dont-distribute-packages:
mps: [ i686-linux, x86_64-linux, x86_64-darwin ]
mpvguihs: [ i686-linux, x86_64-linux, x86_64-darwin ]
mqtt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mqtt: [ i686-linux, x86_64-linux, x86_64-darwin ]
mrm: [ i686-linux, x86_64-linux, x86_64-darwin ]
msgpack-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
msgpack: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6262,6 +6292,7 @@ dont-distribute-packages:
mustache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
mustache: [ i686-linux, x86_64-linux, x86_64-darwin ]
mutable-iter: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ MutationOrder: [ i686-linux, x86_64-linux, x86_64-darwin ]
mute-unmute: [ i686-linux, x86_64-linux, x86_64-darwin ]
mvc: [ i686-linux, x86_64-linux, x86_64-darwin ]
mvclient: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6394,10 +6425,15 @@ dont-distribute-packages:
nntp: [ i686-linux, x86_64-linux, x86_64-darwin ]
nofib-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ]
noise: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ nomyx-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ nomyx-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
Nomyx-Core: [ i686-linux, x86_64-linux, x86_64-darwin ]
Nomyx: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ nomyx-language: [ i686-linux, x86_64-linux, x86_64-darwin ]
Nomyx-Language: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ nomyx-library: [ i686-linux, x86_64-linux, x86_64-darwin ]
Nomyx-Rules: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ nomyx-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
Nomyx-Web: [ i686-linux, x86_64-linux, x86_64-darwin ]
NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ]
nonfree: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6502,6 +6538,7 @@ dont-distribute-packages:
optimal-blocks: [ i686-linux, x86_64-linux, x86_64-darwin ]
optimization: [ i686-linux, x86_64-linux, x86_64-darwin ]
optimusprime: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ optparse-applicative-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
OrchestrateDB: [ i686-linux, x86_64-linux, x86_64-darwin ]
orchestrate: [ i686-linux, x86_64-linux, x86_64-darwin ]
orchid-demo: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6697,6 +6734,7 @@ dont-distribute-packages:
pitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ]
pit: [ i686-linux, x86_64-linux, x86_64-darwin ]
pivotal-tracker: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ pixelated-avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ]
pkggraph: [ i686-linux, x86_64-linux, x86_64-darwin ]
plailude: [ i686-linux, x86_64-linux, x86_64-darwin ]
planar-graph: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7055,6 +7093,7 @@ dont-distribute-packages:
regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ]
regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ]
regexdot: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ regex-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
regex-genex: [ i686-linux, x86_64-linux, x86_64-darwin ]
regex: [ i686-linux, x86_64-linux, x86_64-darwin ]
regex-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7067,6 +7106,7 @@ dont-distribute-packages:
regex-tdfa-utf8: [ i686-linux, x86_64-linux, x86_64-darwin ]
regex-tre: [ i686-linux, x86_64-linux, x86_64-darwin ]
regex-type: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ regex-with-pcre: [ i686-linux, x86_64-linux, x86_64-darwin ]
regex-xmlschema: [ i686-linux, x86_64-linux, x86_64-darwin ]
regional-pointers: [ i686-linux, x86_64-linux, x86_64-darwin ]
regions: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7345,6 +7385,7 @@ dont-distribute-packages:
servant-auth-token-acid: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth-token-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth-token: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ servant-auth-token-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-auth-token-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7379,6 +7420,7 @@ dont-distribute-packages:
sessions: [ i686-linux, x86_64-linux, x86_64-darwin ]
setdown: [ i686-linux, x86_64-linux, x86_64-darwin ]
setgame: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ setoid: [ i686-linux, x86_64-linux, x86_64-darwin ]
sets: [ i686-linux, x86_64-linux, x86_64-darwin ]
setters: [ i686-linux, x86_64-linux, x86_64-darwin ]
set-with: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7733,6 +7775,7 @@ dont-distribute-packages:
structured-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ]
structures: [ i686-linux, x86_64-linux, x86_64-darwin ]
stunts: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ stutter: [ i686-linux, x86_64-linux, x86_64-darwin ]
stylized: [ i686-linux, x86_64-linux, x86_64-darwin ]
styx: [ i686-linux, x86_64-linux, x86_64-darwin ]
subhask: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7996,6 +8039,7 @@ dont-distribute-packages:
tkhs: [ i686-linux, x86_64-linux, x86_64-darwin ]
tkyprof: [ i686-linux, x86_64-linux, x86_64-darwin ]
tld: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tldr: [ i686-linux, x86_64-linux, x86_64-darwin ]
tls-extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
tn: [ i686-linux, x86_64-linux, x86_64-darwin ]
toboggan: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8039,6 +8083,7 @@ dont-distribute-packages:
transformers-runnable: [ i686-linux, x86_64-linux, x86_64-darwin ]
TransformersStepByStep: [ i686-linux, x86_64-linux, x86_64-darwin ]
transient-universe: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ transient-universe-tls: [ i686-linux, x86_64-linux, x86_64-darwin ]
translatable-intset: [ i686-linux, x86_64-linux, x86_64-darwin ]
translate: [ i686-linux, x86_64-linux, x86_64-darwin ]
travis-meta-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8115,6 +8160,7 @@ dont-distribute-packages:
typed-process: [ i686-linux, x86_64-linux, x86_64-darwin ]
typedquery: [ i686-linux, x86_64-linux, x86_64-darwin ]
typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ typed-streams: [ i686-linux, x86_64-linux, x86_64-darwin ]
typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ]
typed-wire-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
typehash: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8626,12 +8672,19 @@ dont-distribute-packages:
zeromq-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
zeroth: [ i686-linux, x86_64-linux, x86_64-darwin ]
ZFS: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ zifter-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ zifter-git: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ zifter-hindent: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ zifter-hlint: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ zifter: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ zifter-stack: [ i686-linux, x86_64-linux, x86_64-darwin ]
zim-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
zip-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
zipedit: [ i686-linux, x86_64-linux, x86_64-darwin ]
zip: [ i686-linux ]
zipkin: [ i686-linux, x86_64-linux, x86_64-darwin ]
zipper: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ ziptastic-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
zlib-enum: [ i686-linux, x86_64-linux, x86_64-darwin ]
ZMachine: [ i686-linux, x86_64-linux, x86_64-darwin ]
zmcat: [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 7205f777bcf..8242990fe74 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -15,6 +15,7 @@ let
mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
inherit stdenv;
inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused;
+ nodejs = pkgs.nodejs-slim;
jailbreak-cabal = if (self.ghc.cross or null) != null
then self.ghc.bootPkgs.jailbreak-cabal
else self.jailbreak-cabal;
@@ -84,14 +85,7 @@ let
callHackage = name: version: self.callPackage (hackage2nix name version);
# Creates a Haskell package from a source package by calling cabal2nix on the source.
- callCabal2nix = name: src: args:
- let
- # Filter out files other than the cabal file. This ensures
- # that we don't create new derivations even when the cabal
- # file hasn't changed.
- justCabal = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src;
- drv = self.callPackage (haskellSrc2nix { inherit name; src = justCabal; }) args;
- in overrideCabal drv (drv': { inherit src; }); # Restore the desired src.
+ callCabal2nix = name: src: self.callPackage (haskellSrc2nix { inherit src name; });
ghcWithPackages = selectFrom: withPackages (selectFrom self);
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 42678e342be..1f5d97941ce 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused
-, jailbreak-cabal, hscolour, cpphs
+, jailbreak-cabal, hscolour, cpphs, nodejs
}: let isCross = (ghc.cross or null) != null; in
{ pname
@@ -133,6 +133,7 @@ let
setupCompileFlags = [
(optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir")
+ (optionalString isGhcjs "-build-runner")
(optionalString (isGhcjs || isHaLVM || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES")
# https://github.com/haskell/cabal/issues/2398
(optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded")
@@ -157,7 +158,7 @@ let
ghcEnv = ghc.withPackages (p: haskellBuildInputs);
- setupBuilder = if isCross || isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand;
+ setupBuilder = if isCross then "${nativeGhc}/bin/ghc" else ghcCommand;
setupCommand = "./Setup";
ghcCommand' = if isGhcjs then "ghcjs" else "ghc";
crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else "";
@@ -294,6 +295,14 @@ stdenv.mkDerivation ({
local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile )
mv $packageConfFile $packageConfDir/$pkgId.conf
''}
+ ${optionalString isGhcjs ''
+ for exeDir in "$out/bin/"*.jsexe; do
+ exe="''${exeDir%.jsexe}"
+ printf '%s\n' '#!${nodejs}/bin/node' > "$exe"
+ cat "$exeDir/all.js" >> "$exe"
+ chmod +x "$exe"
+ done
+ ''}
${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"}
${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
for exe in "$out/bin/"* ; do
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 0b033b61b3a..d52c47bbe9e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1377,8 +1377,8 @@ self: {
}:
mkDerivation {
pname = "BioHMM";
- version = "1.0.6";
- sha256 = "81728f5329327dce9f586fad4fc6c8d2da30964f6f9b5a1309c4d20f9eed3ac5";
+ version = "1.0.7";
+ sha256 = "935925dabec9ebabc50947ffcb9c355639a2c1939bf68c712b3c32773a1c5685";
libraryHaskellDepends = [
base colour diagrams-cairo diagrams-lib directory either-unwrap
filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
@@ -3697,6 +3697,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "Data-Angle" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "Data-Angle";
+ version = "0.9";
+ sha256 = "e1540b8f8d3601ca48bf45a4867e4aad66036d98c53296724a6f620f89e16052";
+ libraryHaskellDepends = [ base ];
+ homepage = "https://github.com/deadmanswitch/Data.Angle";
+ description = "Geometric angles";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"Data-Hash-Consistent" = callPackage
({ mkDerivation, base, bytestring, digest, utf8-string, vector
, vector-algorithms
@@ -3843,6 +3855,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "DeepDarkFantasy" = callPackage
+ ({ mkDerivation, base, mtl, random }:
+ mkDerivation {
+ pname = "DeepDarkFantasy";
+ version = "0.0.1.1";
+ sha256 = "c8e7e54cbddd22603d8df947229bc904f6129d2ed6286c1dd15a091a84089552";
+ libraryHaskellDepends = [ base mtl random ];
+ description = "A DSL for creating neural network";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"DefendTheKing" = callPackage
({ mkDerivation, base, binary, bytestring, containers, GLUT, HTTP
, MaybeT, mtl, network, peakachu, random, time, utility-ht, zlib
@@ -8276,31 +8299,6 @@ self: {
}) {};
"HTTP" = callPackage
- ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
- , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
- , network, network-uri, parsec, pureMD5, split, test-framework
- , test-framework-hunit, time, wai, warp
- }:
- mkDerivation {
- pname = "HTTP";
- version = "4000.3.5";
- sha256 = "bca0bf130666e924abaf3daff22be6e27928f83f91d6a34cbc39616497908aed";
- revision = "2";
- editedCabalFile = "6b9a05236856d7cd5523b18339cc577f3d2522609558816b072f33aa94c9bbc9";
- libraryHaskellDepends = [
- array base bytestring mtl network network-uri parsec time
- ];
- testHaskellDepends = [
- base bytestring case-insensitive conduit conduit-extra deepseq
- http-types httpd-shed HUnit mtl network network-uri pureMD5 split
- test-framework test-framework-hunit wai warp
- ];
- homepage = "https://github.com/haskell/HTTP";
- description = "A library for client-side HTTP";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "HTTP_4000_3_6" = callPackage
({ mkDerivation, array, base, bytestring, case-insensitive, conduit
, conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
, network, network-uri, parsec, pureMD5, split, test-framework
@@ -8321,7 +8319,6 @@ self: {
homepage = "https://github.com/haskell/HTTP";
description = "A library for client-side HTTP";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"HTTP-Simple" = callPackage
@@ -8387,6 +8384,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "HUnit_1_6_0_0" = callPackage
+ ({ mkDerivation, base, call-stack, deepseq, filepath }:
+ mkDerivation {
+ pname = "HUnit";
+ version = "1.6.0.0";
+ sha256 = "7448e6b966e98e84b7627deba23f71b508e9a61e7bc571d74304a25d30e6d0de";
+ libraryHaskellDepends = [ base call-stack deepseq ];
+ testHaskellDepends = [ base call-stack deepseq filepath ];
+ homepage = "https://github.com/hspec/HUnit#readme";
+ description = "A unit testing framework for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"HUnit-Diff" = callPackage
({ mkDerivation, ansi-terminal, base, Diff, groom, HUnit }:
mkDerivation {
@@ -8824,6 +8835,7 @@ self: {
homepage = "https://github.com/m4lvin/HasCacBDD";
description = "Haskell bindings for CacBDD";
license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {CacBDD = null;};
"HasGP" = callPackage
@@ -9576,27 +9588,8 @@ self: {
}:
mkDerivation {
pname = "HsOpenSSL";
- version = "0.11.4.1";
- sha256 = "03445cb1ed881f3a8825e375d87af92a5521549ab86042a5bd4d6052b4e7bfbd";
- libraryHaskellDepends = [
- base bytestring integer-gmp network time
- ];
- librarySystemDepends = [ openssl ];
- testHaskellDepends = [ base bytestring ];
- homepage = "https://github.com/vshabanov/HsOpenSSL";
- description = "Partial OpenSSL binding for Haskell";
- license = stdenv.lib.licenses.publicDomain;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {inherit (pkgs) openssl;};
-
- "HsOpenSSL_0_11_4_2" = callPackage
- ({ mkDerivation, base, bytestring, integer-gmp, network, openssl
- , time
- }:
- mkDerivation {
- pname = "HsOpenSSL";
- version = "0.11.4.2";
- sha256 = "dc937f7119c00b5c8cc96038185d6078bfd37f968ee4534e207b9aa393ee5767";
+ version = "0.11.4.4";
+ sha256 = "efb284b5a3c55c2c83ba3ede5810bdd1efabf1939b40317023a090046a6849eb";
libraryHaskellDepends = [
base bytestring integer-gmp network time
];
@@ -10989,6 +10982,7 @@ self: {
homepage = "http://bitbucket.org/astanin/hs-libzip/";
description = "Bindings to libzip, a library for manipulating zip archives";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"Limit" = callPackage
@@ -12245,6 +12239,7 @@ self: {
homepage = "https://github.com/choener/MutationOrder";
description = "Most likely order of mutation events in RNA";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"MyPrimes" = callPackage
@@ -13820,8 +13815,8 @@ self: {
}:
mkDerivation {
pname = "Plot-ho-matic";
- version = "0.11.0.0";
- sha256 = "bb9d6d7e5c39e48ebf380653f4f9c65391bb746ea68d44650707d02b3f6521a9";
+ version = "0.11.2.0";
+ sha256 = "923509dbb3b7ca051770c8f75a0e312640925c68eede5d5ad60f909548dbbdcb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -14575,39 +14570,6 @@ self: {
}) {};
"RNAlien" = callPackage
- ({ mkDerivation, aeson, base, biocore, biofasta, BlastHTTP
- , blastxml, bytestring, cassava, ClustalParser, cmdargs, containers
- , directory, edit-distance, either-unwrap, EntrezHTTP, filepath
- , hierarchical-clustering, HTTP, http-conduit, http-types, hxt
- , matrix, network, parsec, process, pureMD5, random, split
- , Taxonomy, text, text-metrics, time, transformers, vector
- , ViennaRNAParser
- }:
- mkDerivation {
- pname = "RNAlien";
- version = "1.3.1";
- sha256 = "2e928bb739cba57427fc3a24780b8b36c8eaf6a709e72dadfc637aab0a862fb3";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base biocore biofasta BlastHTTP blastxml bytestring cassava
- ClustalParser cmdargs containers directory edit-distance
- either-unwrap EntrezHTTP filepath hierarchical-clustering HTTP
- http-conduit http-types hxt matrix network parsec process pureMD5
- random Taxonomy text text-metrics transformers vector
- ViennaRNAParser
- ];
- executableHaskellDepends = [
- base biocore biofasta bytestring cassava cmdargs containers
- directory either-unwrap filepath process random split text time
- vector ViennaRNAParser
- ];
- description = "Unsupervized construction of RNA family models";
- license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "RNAlien_1_3_7" = callPackage
({ mkDerivation, aeson, base, biocore, biofasta, BlastHTTP
, blastxml, bytestring, cassava, ClustalParser, cmdargs, containers
, directory, edit-distance, either-unwrap, EntrezHTTP, filepath
@@ -14816,10 +14778,8 @@ self: {
}:
mkDerivation {
pname = "Rasterific";
- version = "0.7.1";
- sha256 = "a3614c5d87c6aacbbd2aabc16d1258f559b03bf46537f47c375949438e7eb5ef";
- revision = "1";
- editedCabalFile = "6d38b54477eb7392b57e8082cc442a44ec34534a58f61bd09cf4d0b9cee7d089";
+ version = "0.7.2.1";
+ sha256 = "7f6d86495a5a3aa72dd9c13f2dd8d93526cd5166889f39c5e7dde529cef44d74";
libraryHaskellDepends = [
base bytestring containers dlist FontyFruity free JuicyPixels mtl
primitive transformers vector vector-algorithms
@@ -15680,8 +15640,8 @@ self: {
}:
mkDerivation {
pname = "ShellCheck";
- version = "0.4.5";
- sha256 = "53039ac314b99af691a99aec111572ee51b0579280c7fa5795ac48d0c4e02fa7";
+ version = "0.4.6";
+ sha256 = "11eb9b2794363fbccc6fbd18601db49680e2c439440a9b103eebfda1aa86b1bc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -19208,8 +19168,8 @@ self: {
}:
mkDerivation {
pname = "accelerate-cuda";
- version = "0.15.1.1";
- sha256 = "6140c60df329f78d77d258ae3029522cb7a3fb038c531e23792dd8b307ff379d";
+ version = "0.16.0.0";
+ sha256 = "a5856713e24d2441823f3e53b7edaff3808b9757c687ca0c9fcf014a8001f7e5";
libraryHaskellDepends = [
accelerate array base binary bytestring cryptohash cuda directory
fclabels filepath hashable hashtables language-c-quote
@@ -19256,8 +19216,8 @@ self: {
pname = "accelerate-examples";
version = "0.15.1.0";
sha256 = "2191601709da693aedb29f570e44b899b5132d2bc05fe618bc93608a43fec4a2";
- revision = "1";
- editedCabalFile = "77df83db322287253ea831448eced5c2adff5fe3edc413392cfb0eb8bdb0833b";
+ revision = "2";
+ editedCabalFile = "bcebd104b948308a60f7f5ff63cdacb7e4b07d84be73fe3a83c5ef641a2b41f4";
configureFlags = [ "-f-opencl" ];
isLibrary = true;
isExecutable = true;
@@ -19287,6 +19247,8 @@ self: {
pname = "accelerate-fft";
version = "0.15.1.0";
sha256 = "fd2648931ce4607aba4ad527691a4bba0f043ea4182a160aa8f024152101a702";
+ revision = "1";
+ editedCabalFile = "c283fc3767bf4281da75b958ae0c8a404ba0e26f7c7b746158355e6824e2d22d";
libraryHaskellDepends = [
accelerate accelerate-cuda base cuda cufft
];
@@ -20644,15 +20606,15 @@ self: {
}) {};
"aeson-diff" = callPackage
- ({ mkDerivation, aeson, base, bytestring, directory
+ ({ mkDerivation, aeson, base, bytestring, directory, doctest
, edit-distance-vector, filepath, Glob, hashable, hlint, mtl
, optparse-applicative, QuickCheck, quickcheck-instances
, scientific, text, unordered-containers, vector
}:
mkDerivation {
pname = "aeson-diff";
- version = "1.1.0.0";
- sha256 = "eeeb97b3f40485e7234427f192c66d044c0a25a1b7a24d91870e85fb226c1086";
+ version = "1.1.0.2";
+ sha256 = "2d7b0ce01d261690058c4c49d2b6e91f39f32920125a54adda9328fd9dfd7716";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -20663,8 +20625,8 @@ self: {
aeson base bytestring optparse-applicative text
];
testHaskellDepends = [
- aeson base bytestring directory filepath Glob hlint QuickCheck
- quickcheck-instances text unordered-containers vector
+ aeson base bytestring directory doctest filepath Glob hlint
+ QuickCheck quickcheck-instances text unordered-containers vector
];
homepage = "https://github.com/thsutton/aeson-diff";
description = "Extract and apply patches to JSON documents";
@@ -21128,16 +21090,17 @@ self: {
"affection" = callPackage
({ mkDerivation, babl, base, clock, containers, gegl, glib
- , monad-loops, mtl, sdl2, text
+ , monad-loops, monad-parallel, mtl, sdl2, text
}:
mkDerivation {
pname = "affection";
- version = "0.0.0.5";
- sha256 = "4d5f2d6257d6dcb6fe7b1658bead8e0c48451414d434d44e5492709b81ac43e7";
+ version = "0.0.0.6";
+ sha256 = "bf4993ebf47cabd6126feace83ce954443e06b5361931903a84c21437f388039";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- babl base clock containers gegl glib monad-loops mtl sdl2 text
+ babl base clock containers gegl glib monad-loops monad-parallel mtl
+ sdl2 text
];
homepage = "https://github.com/nek0/affection#readme";
description = "A simple Game Engine using SDL";
@@ -21728,8 +21691,8 @@ self: {
({ mkDerivation, base, deepseq, template-haskell, text }:
mkDerivation {
pname = "alex-tools";
- version = "0.1.1.0";
- sha256 = "c0a1c33e24955a7e2536ef5ad7614b227523330ed4c68724fda47ba4ba368d86";
+ version = "0.2.0.0";
+ sha256 = "6ffbfafcc03ec27a825ec4f488ec4d0c7323e3e7f72463b4920fa2111ac2186e";
libraryHaskellDepends = [ base deepseq template-haskell text ];
description = "A set of functions for a common use case of Alex";
license = stdenv.lib.licenses.isc;
@@ -21869,6 +21832,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "algebraic-graphs" = callPackage
+ ({ mkDerivation, array, base, containers, criterion, extra
+ , QuickCheck
+ }:
+ mkDerivation {
+ pname = "algebraic-graphs";
+ version = "0.0.4";
+ sha256 = "f59348961d74eeba4195cc7ee473ab5df2ad9c13a94f8c4e99401e4cb7480eb5";
+ libraryHaskellDepends = [ array base containers ];
+ testHaskellDepends = [ base containers extra QuickCheck ];
+ benchmarkHaskellDepends = [ base containers criterion ];
+ homepage = "https://github.com/snowleopard/alga";
+ description = "A library for algebraic graph construction and transformation";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"algebraic-prelude" = callPackage
({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }:
mkDerivation {
@@ -25349,8 +25328,8 @@ self: {
}:
mkDerivation {
pname = "app-settings";
- version = "0.2.0.10";
- sha256 = "88dd9df76930467c14b764108cda92676a6702f68ad38a09c26e740bce29ac28";
+ version = "0.2.0.11";
+ sha256 = "6a14c69aca4e55cf27933475f5ae0ffead3a83f69f4233896eb13c41dccd50b1";
libraryHaskellDepends = [
base containers directory mtl parsec text
];
@@ -27526,15 +27505,22 @@ self: {
}) {};
"audacity" = callPackage
- ({ mkDerivation, base, deepseq, utility-ht }:
+ ({ mkDerivation, base, bytestring, deepseq, directory
+ , explicit-exception, filepath, non-empty, storable-record
+ , storablevector, tagchup, transformers, utility-ht, xml-basic
+ }:
mkDerivation {
pname = "audacity";
- version = "0.0";
- sha256 = "1f578e6cf8bfc5524a9e49ff306a736ab1c5db2a8a4ab4a3e4f47cb34a2fd7ed";
+ version = "0.0.1.1";
+ sha256 = "f1d333e19a70af7be5d0bc99640b2d8ebb29bf4c6f707cf5639f5a4fe041abc2";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base deepseq utility-ht ];
- homepage = "http://code.haskell.org/~thielema/audacity";
+ libraryHaskellDepends = [
+ base bytestring deepseq directory explicit-exception filepath
+ non-empty storable-record storablevector tagchup transformers
+ utility-ht xml-basic
+ ];
+ homepage = "http://hub.darcs.net/thielema/audacity";
description = "Interchange with the Audacity sound signal editor";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -28659,6 +28645,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "axiom" = callPackage
+ ({ mkDerivation, base, bytestring, containers, directory
+ , ghcjs-perch, mtl, transformers, transient, transient-universe
+ }:
+ mkDerivation {
+ pname = "axiom";
+ version = "0.4.4";
+ sha256 = "84f8b0b843c67cd34c28f4fa3fac1ef6abbdf0b141615ca29d8cc7f292895002";
+ libraryHaskellDepends = [
+ base bytestring containers directory ghcjs-perch mtl transformers
+ transient transient-universe
+ ];
+ homepage = "https://github.com/transient-haskell/axiom";
+ description = "Web EDSL for running in browsers and server nodes using transient";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"axiomatic-classes" = callPackage
({ mkDerivation, base, containers, control-invariants, lens
, monad-loops, mtl, portable-template-haskell-lens, QuickCheck
@@ -29326,18 +29330,6 @@ self: {
}) {};
"base-compat" = callPackage
- ({ mkDerivation, base, hspec, QuickCheck, unix }:
- mkDerivation {
- pname = "base-compat";
- version = "0.9.1";
- sha256 = "1033b48146b9ffcf4f7c75a321ea0b1525c1b662230f46c41957a1b501b6464a";
- libraryHaskellDepends = [ base unix ];
- testHaskellDepends = [ base hspec QuickCheck ];
- description = "A compatibility layer for base";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "base-compat_0_9_2" = callPackage
({ mkDerivation, base, hspec, QuickCheck, unix }:
mkDerivation {
pname = "base-compat";
@@ -29347,7 +29339,6 @@ self: {
testHaskellDepends = [ base hspec QuickCheck ];
description = "A compatibility layer for base";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"base-generics" = callPackage
@@ -32800,30 +32791,6 @@ self: {
}) {};
"bitx-bitcoin" = callPackage
- ({ mkDerivation, aeson, base, bytestring, deepseq, directory
- , doctest, exceptions, hspec, http-client, http-client-tls
- , http-types, microlens, microlens-th, network, QuickCheck, safe
- , scientific, split, text, time
- }:
- mkDerivation {
- pname = "bitx-bitcoin";
- version = "0.11.0.0";
- sha256 = "9f46782f5a9688b7c1681789d7165c9a21247dc5fc67807cf847bf526414ce20";
- libraryHaskellDepends = [
- aeson base bytestring deepseq exceptions http-client
- http-client-tls http-types microlens microlens-th network
- QuickCheck scientific split text time
- ];
- testHaskellDepends = [
- aeson base bytestring directory doctest hspec http-client
- http-types microlens safe text time
- ];
- homepage = "https://github.com/tebello-thejane/bitx.hs";
- description = "A Haskell library for working with the BitX bitcoin exchange";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "bitx-bitcoin_0_11_0_1" = callPackage
({ mkDerivation, aeson, base, bytestring, deepseq, directory
, doctest, exceptions, hspec, http-client, http-client-tls
, http-types, microlens, microlens-th, network, QuickCheck, safe
@@ -32845,7 +32812,6 @@ self: {
homepage = "https://github.com/tebello-thejane/bitx.hs";
description = "A Haskell library for working with the BitX bitcoin exchange";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bizzlelude" = callPackage
@@ -33384,18 +33350,6 @@ self: {
}) {};
"blaze-svg" = callPackage
- ({ mkDerivation, base, blaze-markup, mtl }:
- mkDerivation {
- pname = "blaze-svg";
- version = "0.3.6";
- sha256 = "90dff37d78bffe5ee2587bab4281c158d5d1bd3901fe359bfdcc1cb6fb387179";
- libraryHaskellDepends = [ base blaze-markup mtl ];
- homepage = "https://github.com/deepakjois/blaze-svg";
- description = "SVG combinator library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "blaze-svg_0_3_6_1" = callPackage
({ mkDerivation, base, blaze-markup, mtl }:
mkDerivation {
pname = "blaze-svg";
@@ -33405,7 +33359,6 @@ self: {
homepage = "https://github.com/deepakjois/blaze-svg";
description = "SVG combinator library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"blaze-textual" = callPackage
@@ -33485,8 +33438,10 @@ self: {
}:
mkDerivation {
pname = "ble";
- version = "0.2.0.0";
- sha256 = "c8961033317b333de25d2fa49375b309b17aa1d825bb4030cc0cc990df6655e1";
+ version = "0.3.1.0";
+ sha256 = "d3ef2722c649903a26ddbc4d78bf8b7121d5f0bac84fc71ebad4c02e8f9e798c";
+ revision = "1";
+ editedCabalFile = "7ff3ee0a435f1d611c4ae67323913260a53fc3e22947c1db00bdf721bba7d45b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -33495,7 +33450,7 @@ self: {
uuid
];
executableHaskellDepends = [
- base bytestring cereal containers d-bus data-default-class
+ base bytestring cereal containers d-bus data-default-class hslogger
microlens microlens-ghc microlens-th mtl random stm text
transformers uuid
];
@@ -34702,27 +34657,6 @@ self: {
}) {};
"brick" = callPackage
- ({ mkDerivation, base, containers, contravariant, deepseq, dlist
- , microlens, microlens-mtl, microlens-th, stm, template-haskell
- , text, text-zipper, transformers, vector, vty
- }:
- mkDerivation {
- pname = "brick";
- version = "0.17.1";
- sha256 = "8c7ae11cbe393d3498e8e4a2e2b6eb1ee8b0582b3724fe6e844104e479c48511";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base containers contravariant deepseq dlist microlens microlens-mtl
- microlens-th stm template-haskell text text-zipper transformers
- vector vty
- ];
- homepage = "https://github.com/jtdaugherty/brick/";
- description = "A declarative terminal user interface library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "brick_0_17_2" = callPackage
({ mkDerivation, base, containers, contravariant, deepseq, dlist
, microlens, microlens-mtl, microlens-th, stm, template-haskell
, text, text-zipper, transformers, vector, vty
@@ -34741,7 +34675,6 @@ self: {
homepage = "https://github.com/jtdaugherty/brick/";
description = "A declarative terminal user interface library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"brillig" = callPackage
@@ -35379,8 +35312,8 @@ self: {
}:
mkDerivation {
pname = "byline";
- version = "0.2.3.0";
- sha256 = "964668e4e3eec9807e64c739a4a215c8e07800661c6d34ad2bd258e08872845c";
+ version = "0.2.4.0";
+ sha256 = "82433a4629c3ff2f538914100fc6747f6552c3497e4f64223dc9e24791967eef";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -35764,6 +35697,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bytestring-strict-builder" = callPackage
+ ({ mkDerivation, base, base-prelude, bytestring, criterion
+ , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit
+ , tasty-quickcheck, tasty-smallcheck
+ }:
+ mkDerivation {
+ pname = "bytestring-strict-builder";
+ version = "0.4.3";
+ sha256 = "d56f6bc42518565f9310eaa13ce1d35cf29879bdae995d9b893fd309c093d231";
+ libraryHaskellDepends = [
+ base base-prelude bytestring semigroups
+ ];
+ testHaskellDepends = [
+ quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
+ tasty-smallcheck
+ ];
+ benchmarkHaskellDepends = [ criterion rerebase ];
+ homepage = "https://github.com/nikita-volkov/bytestring-strict-builder";
+ description = "An efficient strict bytestring builder";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"bytestring-time" = callPackage
({ mkDerivation, attoparsec, base, bytestring, Cabal, hspec
, QuickCheck, text, time
@@ -36643,6 +36599,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "cabal-plan" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring
+ , bytestring, containers, directory, filepath, mtl, text
+ }:
+ mkDerivation {
+ pname = "cabal-plan";
+ version = "0.1.0.0";
+ sha256 = "14181990a168231a74b5f277e33f55c3dce8b58e0cb9f7bd828cb06d82326eae";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base base16-bytestring bytestring containers directory
+ filepath text
+ ];
+ executableHaskellDepends = [
+ ansi-terminal base bytestring containers mtl text
+ ];
+ homepage = "https://github.com/hvr/cabal-plan";
+ description = "Library and utiltity for processing cabal's plan.json file";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"cabal-progdeps" = callPackage
({ mkDerivation, base, Cabal, directory, filepath }:
mkDerivation {
@@ -36676,24 +36654,6 @@ self: {
}) {};
"cabal-rpm" = callPackage
- ({ mkDerivation, base, Cabal, directory, filepath, old-locale
- , process, time, unix
- }:
- mkDerivation {
- pname = "cabal-rpm";
- version = "0.11";
- sha256 = "c705a4fc4bcdf64989d26b94b52381ab465db542e0a99e8614ced9fe872ed9d5";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- base Cabal directory filepath old-locale process time unix
- ];
- homepage = "https://github.com/juhp/cabal-rpm";
- description = "RPM packaging tool for Haskell Cabal-based packages";
- license = stdenv.lib.licenses.gpl3;
- }) {};
-
- "cabal-rpm_0_11_1" = callPackage
({ mkDerivation, base, Cabal, directory, filepath, old-locale
, process, time, unix
}:
@@ -36709,7 +36669,6 @@ self: {
homepage = "https://github.com/juhp/cabal-rpm";
description = "RPM packaging tool for Haskell Cabal-based packages";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cabal-scripts" = callPackage
@@ -37930,8 +37889,8 @@ self: {
}:
mkDerivation {
pname = "carray";
- version = "0.1.6.5";
- sha256 = "6b253bd77cbe3cf1ed05ed60fa45f72f2ed5f6a0db5395ba26d58317b146786b";
+ version = "0.1.6.6";
+ sha256 = "9f50136c01e6a58e7195c5c72fa3e13a76c81933467ae74177dfcc8b91b142c0";
libraryHaskellDepends = [
array base binary bytestring ix-shapable QuickCheck syb
];
@@ -41314,8 +41273,8 @@ self: {
}:
mkDerivation {
pname = "clean-home";
- version = "0.0.4";
- sha256 = "42307b2fdcf750a64cae131845e39964a47adb1e1b16ba19497f4ab907250969";
+ version = "0.0.5";
+ sha256 = "c1c54d4579c557936b455768bc4f0e52181d845b93aec01e14898d3533b0cfb0";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -41575,21 +41534,21 @@ self: {
}) {};
"clit" = callPackage
- ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
+ ({ mkDerivation, ansi-wl-pprint, authenticate-oauth, base
, bytestring, data-default, directory, http-client, http-client-tls
, http-types, lens, megaparsec, MissingH, optparse-applicative
, split, text
}:
mkDerivation {
pname = "clit";
- version = "0.4.0.3";
- sha256 = "de42b5f458969a651aa4b40bb47f169eefbf2195f21f31586a39e249ecbc7d6c";
+ version = "0.4.0.6";
+ sha256 = "09463f9525829b9fa7d8cef461ae3d9ce163bdab04e9cfa0afc88318b0163493";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson ansi-wl-pprint authenticate-oauth base bytestring
- data-default directory http-client http-client-tls http-types lens
- megaparsec MissingH optparse-applicative split text
+ ansi-wl-pprint authenticate-oauth base bytestring data-default
+ directory http-client http-client-tls http-types lens megaparsec
+ MissingH optparse-applicative split text
];
executableHaskellDepends = [ base ];
homepage = "https://github.com/vmchale/command-line-tweeter#readme";
@@ -41916,8 +41875,8 @@ self: {
}:
mkDerivation {
pname = "cmark";
- version = "0.5.5";
- sha256 = "03bd6fc962bb92127f64a9c597a904492a16fb3f34587775a741d22311fe53e2";
+ version = "0.5.5.1";
+ sha256 = "62b461f2ab0a611f0a88325c98f11c053a356d94e877b5efed564abb4f5b5a0d";
libraryHaskellDepends = [ base bytestring text ];
testHaskellDepends = [ base HUnit text ];
benchmarkHaskellDepends = [
@@ -42031,8 +41990,8 @@ self: {
}:
mkDerivation {
pname = "cmdargs";
- version = "0.10.15";
- sha256 = "c80306ee127532fe4f852b690da470e7f5d8e58dce7122368c7e1b5b4629a55f";
+ version = "0.10.16";
+ sha256 = "fb194adb76f6f464ff38df8a6644c6ed7375cc7054278492145a705a87526fbd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -42204,19 +42163,6 @@ self: {
}) {};
"code-page" = callPackage
- ({ mkDerivation, base }:
- mkDerivation {
- pname = "code-page";
- version = "0.1.2";
- sha256 = "aef2b0b043767ef28496aa6b8c744db8185492c0d1e94e567a62eb4fdcaa3b09";
- libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base ];
- homepage = "https://github.com/RyanGlScott/code-page";
- description = "Windows code page library for Haskell";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "code-page_0_1_3" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "code-page";
@@ -42227,7 +42173,6 @@ self: {
homepage = "https://github.com/RyanGlScott/code-page";
description = "Windows code page library for Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"codec" = callPackage
@@ -42951,8 +42896,8 @@ self: {
}:
mkDerivation {
pname = "comfort-graph";
- version = "0.0.1";
- sha256 = "81487e3610993d2939bf1777823357095645f710d1bee94dd4dd0fa052b428a0";
+ version = "0.0.2";
+ sha256 = "ec69c1718ac3f790953912262d261a10bd3515a3c809b0671e108c3958e8fb3e";
libraryHaskellDepends = [
base containers QuickCheck transformers utility-ht
];
@@ -42965,6 +42910,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "comic" = callPackage
+ ({ mkDerivation, aeson, base, text }:
+ mkDerivation {
+ pname = "comic";
+ version = "0";
+ sha256 = "e3c1b2ad7814d6ad252f7239e77c0b26457805086e72a0df8b9adc6bda1dc203";
+ libraryHaskellDepends = [ aeson base text ];
+ homepage = "https://oss.xkcd.com/";
+ description = "A format for describing comics";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"comma" = callPackage
({ mkDerivation, attoparsec, base, QuickCheck, text }:
mkDerivation {
@@ -43257,6 +43214,7 @@ self: {
libraryHaskellDepends = [ base containers transformers vector ];
description = "A generalization for containers that can be stripped of Nothings";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"compactmap" = callPackage
@@ -43293,6 +43251,8 @@ self: {
pname = "compdata";
version = "0.10.1";
sha256 = "61572f134ec555695905c28db76c8f1f50df531337e56d5c74a16a52c58840cb";
+ revision = "1";
+ editedCabalFile = "beac5f52bb9a37fdfe168d354a51b915d01b8837c51394358347d35483f530eb";
libraryHaskellDepends = [
base containers deepseq derive mtl QuickCheck template-haskell
th-expand-syns transformers tree-view
@@ -43507,18 +43467,27 @@ self: {
}) {};
"composite-aeson" = callPackage
- ({ mkDerivation, aeson, aeson-better-errors, base, basic-prelude
- , composite-base, containers, contravariant, generic-deriving, lens
- , profunctors, scientific, text, unordered-containers, vinyl
+ ({ mkDerivation, aeson, aeson-better-errors, aeson-qq, base
+ , basic-prelude, composite-base, containers, contravariant, Frames
+ , generic-deriving, hspec, lens, profunctors, QuickCheck
+ , scientific, tagged, template-haskell, text, time
+ , unordered-containers, vector, vinyl
}:
mkDerivation {
pname = "composite-aeson";
- version = "0.1.0.0";
- sha256 = "dbefe06c854762ec1f9fe0920cd9e2373caf20c49c1cbe9c0641d8c2ce36f288";
+ version = "0.2.0.0";
+ sha256 = "57319e561a9b8d52dcaff3ef5fda46de8128e39ed2a7bbae212b32f8652f21a6";
libraryHaskellDepends = [
aeson aeson-better-errors base basic-prelude composite-base
- containers contravariant generic-deriving lens profunctors
- scientific text unordered-containers vinyl
+ containers contravariant Frames generic-deriving lens profunctors
+ scientific tagged template-haskell text time unordered-containers
+ vector vinyl
+ ];
+ testHaskellDepends = [
+ aeson aeson-better-errors aeson-qq base basic-prelude
+ composite-base containers contravariant Frames generic-deriving
+ hspec lens profunctors QuickCheck scientific tagged
+ template-haskell text time unordered-containers vector vinyl
];
homepage = "https://github.com/ConferHealth/composite#readme";
description = "JSON for Vinyl/Frames records";
@@ -43526,21 +43495,42 @@ self: {
}) {};
"composite-base" = callPackage
- ({ mkDerivation, base, basic-prelude, Frames, lens
- , template-haskell, text, vinyl
+ ({ mkDerivation, base, basic-prelude, Frames, hspec, lens
+ , QuickCheck, template-haskell, text, vinyl
}:
mkDerivation {
pname = "composite-base";
- version = "0.1.0.0";
- sha256 = "18686bd5a539a5ca82be8ebc6ffb374578d9ff5334cf4959e00c1998e1cd18ea";
+ version = "0.2.0.0";
+ sha256 = "b18c0b286d4d8dfd8771df540dba9f8e9d0fc58484650d7434ed24e95d6428b1";
libraryHaskellDepends = [
base basic-prelude Frames lens template-haskell text vinyl
];
+ testHaskellDepends = [
+ base basic-prelude Frames hspec lens QuickCheck template-haskell
+ text vinyl
+ ];
homepage = "https://github.com/ConferHealth/composite#readme";
description = "Shared utilities for composite-* packages";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "composite-ekg" = callPackage
+ ({ mkDerivation, base, basic-prelude, composite-base, ekg, ekg-core
+ , Frames, lens, text, vinyl
+ }:
+ mkDerivation {
+ pname = "composite-ekg";
+ version = "0.2.0.0";
+ sha256 = "bb836d7e938e18848ae3bae573c4e7ec47b4dfdd56e5ebfdb556033e1a62c095";
+ libraryHaskellDepends = [
+ base basic-prelude composite-base ekg ekg-core Frames lens text
+ vinyl
+ ];
+ homepage = "https://github.com/ConferHealth/composite#readme";
+ description = "EKG Metrics for Vinyl/Frames records";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"composite-opaleye" = callPackage
({ mkDerivation, base, basic-prelude, bytestring, composite-base
, Frames, lens, opaleye, postgresql-simple, product-profunctors
@@ -43548,8 +43538,8 @@ self: {
}:
mkDerivation {
pname = "composite-opaleye";
- version = "0.1.0.0";
- sha256 = "1a2687c59106ebbd3d4ec0b8d9bd31f63b19d1a328a458bb05e9083c7a32008c";
+ version = "0.2.0.0";
+ sha256 = "e1f018cd598679e2a79d9ce4b99463cdf0a2720ff3df57be2e1025731417ef37";
libraryHaskellDepends = [
base basic-prelude bytestring composite-base Frames lens opaleye
postgresql-simple product-profunctors profunctors template-haskell
@@ -43762,6 +43752,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "concise" = callPackage
+ ({ mkDerivation, base, bytestring, lens, QuickCheck
+ , quickcheck-instances, tasty, tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "concise";
+ version = "0.1.0.0";
+ sha256 = "b5760c71b0968fb7e6aa683d81c1563776b7239f5fc5e2d819b6b0da6503413d";
+ libraryHaskellDepends = [ base bytestring lens text ];
+ testHaskellDepends = [
+ base bytestring lens QuickCheck quickcheck-instances tasty
+ tasty-quickcheck text
+ ];
+ homepage = "https://github.com/frasertweedal/hs-concise";
+ description = "Utilities for Control.Lens.Cons";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"concorde" = callPackage
({ mkDerivation, base, containers, process, safe, temporary }:
mkDerivation {
@@ -44376,6 +44384,8 @@ self: {
pname = "conduit-extra";
version = "1.1.15";
sha256 = "7bef29eb0db59c236519b0c5cac82183ed7741a535a57e0772aac1158e90bb8d";
+ revision = "1";
+ editedCabalFile = "94498d0883d567317ebd300ed3efcd1712ae0b444e35f50a941b3b62f57b164f";
libraryHaskellDepends = [
async attoparsec base blaze-builder bytestring conduit directory
exceptions filepath monad-control network primitive process
@@ -44902,8 +44912,8 @@ self: {
}:
mkDerivation {
pname = "connection";
- version = "0.2.7";
- sha256 = "46d452dc92ebc6e851a9f9ac01dd2d29df846795dfce039cf07ba7102a323235";
+ version = "0.2.8";
+ sha256 = "70b1f44e8786320c18b26fc5d4ec115fc8ac016ba1f852fa8137f55d785a93eb";
libraryHaskellDepends = [
base byteable bytestring containers data-default-class network
socks tls x509 x509-store x509-system x509-validation
@@ -45072,23 +45082,6 @@ self: {
}) {};
"constraints" = callPackage
- ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
- , transformers, transformers-compat
- }:
- mkDerivation {
- pname = "constraints";
- version = "0.9";
- sha256 = "b7b4135ceacdd18d291bbd83277cc21bbb066d0e16ce35f879619f17c1c8d29d";
- libraryHaskellDepends = [
- base binary deepseq ghc-prim hashable mtl transformers
- transformers-compat
- ];
- homepage = "http://github.com/ekmett/constraints/";
- description = "Constraint manipulation";
- license = stdenv.lib.licenses.bsd2;
- }) {};
-
- "constraints_0_9_1" = callPackage
({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
, transformers, transformers-compat
}:
@@ -45103,7 +45096,6 @@ self: {
homepage = "http://github.com/ekmett/constraints/";
description = "Constraint manipulation";
license = stdenv.lib.licenses.bsd2;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"constructible" = callPackage
@@ -46476,6 +46468,8 @@ self: {
pname = "cpphs";
version = "1.20.4";
sha256 = "d159437cea89854c3f413f7157f40ea2d82272fce83efe6ce17e2065883da47e";
+ revision = "1";
+ editedCabalFile = "9304f73fec5750ee55b381f925d34c73cc1f660f5adaa6490d9d8dabf4ae1880";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -48127,8 +48121,8 @@ self: {
}:
mkDerivation {
pname = "csound-catalog";
- version = "0.6.1";
- sha256 = "aa97c5076d7d1d217ea62027b7529b8acfb6539001aafa50da3064fb4afbf1c1";
+ version = "0.7.0";
+ sha256 = "1e00985b6e618c873dc5ddf46c14397302fdf0fbeb13236597dfeb891877b5bb";
libraryHaskellDepends = [
base csound-expression csound-sampler sharc-timbre transformers
];
@@ -48146,8 +48140,8 @@ self: {
}:
mkDerivation {
pname = "csound-expression";
- version = "5.1.0";
- sha256 = "3d42e34bb20823342974362c08f6bc386656922119020b34dbf92c39e72c8885";
+ version = "5.2.0";
+ sha256 = "54431ddf02de0ce6205853eea81cd6177db50295ab6d840326c56f481897d6d2";
libraryHaskellDepends = [
base Boolean colour containers csound-expression-dynamic
csound-expression-opcodes csound-expression-typed data-default
@@ -48164,8 +48158,8 @@ self: {
}:
mkDerivation {
pname = "csound-expression-dynamic";
- version = "0.2.0";
- sha256 = "901b7811a296ab59b2baecf161e69c478da2f4b9a1f8d24d5e0c7063704df475";
+ version = "0.3.0";
+ sha256 = "5836c4fe387f84e0d042b6a57bfa5969135c64c1840b6a989cabd6eefe8026f4";
libraryHaskellDepends = [
array base Boolean containers data-default data-fix data-fix-cse
hashable transformers wl-pprint
@@ -48181,8 +48175,8 @@ self: {
}:
mkDerivation {
pname = "csound-expression-opcodes";
- version = "0.0.3.1";
- sha256 = "c725eab85daca0de9dd689b40013f5af95089ef09539c009c58ebd020b161136";
+ version = "0.0.3.2";
+ sha256 = "44139db6b4ddbe2f5e632eebabd106b42eb11340dbf665f5162d9a29a2da7e27";
libraryHaskellDepends = [
base csound-expression-dynamic csound-expression-typed transformers
];
@@ -48197,8 +48191,8 @@ self: {
}:
mkDerivation {
pname = "csound-expression-typed";
- version = "0.1.0.0";
- sha256 = "ecff32336825df2197502e7b464c00b3fd1dc40eaab52f40cd9a585c4180e866";
+ version = "0.2.0.0";
+ sha256 = "282e20fe3a1272f56b3376fa3d8789a657d21fee8a266843ca16d5256ba21cc6";
libraryHaskellDepends = [
base Boolean colour containers csound-expression-dynamic
data-default deepseq ghc-prim hashable temporal-media transformers
@@ -48213,8 +48207,8 @@ self: {
({ mkDerivation, base, csound-expression, transformers }:
mkDerivation {
pname = "csound-sampler";
- version = "0.0.7.0";
- sha256 = "deb478e275edcf7dada65f57ace1989d3e9e8f1c2fe2ef81aa1c257f82236870";
+ version = "0.0.8.0";
+ sha256 = "394811198d15d102542d4d34d3d9536e0854c5c5b0352778c1866564795c2fa2";
libraryHaskellDepends = [ base csound-expression transformers ];
homepage = "https://github.com/anton-k/csound-sampler";
description = "A musical sampler based on Csound";
@@ -48586,10 +48580,8 @@ self: {
}:
mkDerivation {
pname = "cuda";
- version = "0.7.5.2";
- sha256 = "749b2411255f699289d2989c8720b751940678bfbb621ccd8bb98eaf0a7b94d6";
- revision = "1";
- editedCabalFile = "dd05fcdff465dcbe7252532e3b9ba481d76548611e02bc28fce734378c093dee";
+ version = "0.7.5.3";
+ sha256 = "c6cf3a3047d13042f81b822c54683fedb989fe844b3f8e528ecda29da0f7a7f5";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal directory filepath ];
@@ -48859,6 +48851,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "cutter" = callPackage
+ ({ mkDerivation, base, bytestring, explicit-exception, spreadsheet
+ , utility-ht
+ }:
+ mkDerivation {
+ pname = "cutter";
+ version = "0.0";
+ sha256 = "117319c36a20efea6d9edd0a8d902e37ec0386512f2eb8a6e5563411c00c6ac2";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring explicit-exception spreadsheet utility-ht
+ ];
+ description = "Cut files according to a position list";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"cv-combinators" = callPackage
({ mkDerivation, allocated-processor, base, HOpenCV, vector-space
}:
@@ -50547,6 +50556,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "data-msgpack-types" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, hashable
+ , QuickCheck, text, unordered-containers, vector, void
+ }:
+ mkDerivation {
+ pname = "data-msgpack-types";
+ version = "0.0.1";
+ sha256 = "529f139f089643a240c6e139b76c4ca1f18bce24dd352615584ebf041e94a898";
+ libraryHaskellDepends = [
+ base bytestring containers deepseq hashable QuickCheck text
+ unordered-containers vector void
+ ];
+ homepage = "http://msgpack.org/";
+ description = "A Haskell implementation of MessagePack";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"data-named" = callPackage
({ mkDerivation, attoparsec, base, binary, containers, text }:
mkDerivation {
@@ -53536,8 +53562,8 @@ self: {
pname = "diagrams-contrib";
version = "1.4.0.1";
sha256 = "1194be9ab13c8660ef1c56c35b3a6578953db51e173de96eb8d49603e855750c";
- revision = "1";
- editedCabalFile = "58ebbd4d2285416111e8582c133d68ced6ecb5a2a94d5dc07cca899a971b02f8";
+ revision = "2";
+ editedCabalFile = "f48239089189d320f3f48f25d2381f5d1e931ed7cdbdd70eb2ce246a9d04fda5";
libraryHaskellDepends = [
base circle-packing colour containers cubicbezier data-default
data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -55030,6 +55056,7 @@ self: {
homepage = "https://github.com/clintonmead/disjoint-set-stateful";
description = "Monadic disjoint set";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"disjoint-sets-st" = callPackage
@@ -55071,28 +55098,15 @@ self: {
}) {};
"disposable" = callPackage
- ({ mkDerivation, base, dlist }:
- mkDerivation {
- pname = "disposable";
- version = "0.2.0.0";
- sha256 = "d931d76f4a6ce0596f82cc7ae608cd43ea28bae5e6b0864e632b70ac2fc1e684";
- libraryHaskellDepends = [ base dlist ];
- homepage = "https://github.com/louispan/disposable#readme";
- description = "Allows storing different resource-releasing actions together";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "disposable_0_2_0_1" = callPackage
({ mkDerivation, base, dlist, ghcjs-base-stub }:
mkDerivation {
pname = "disposable";
- version = "0.2.0.1";
- sha256 = "0b033cad06890ad3aed574f7980efef238795fdf6b51707e53908397e3c9bbd3";
+ version = "0.2.0.3";
+ sha256 = "6d1b6d12d1f742f204effb46c204a596cd3aeeae42bebacb86c37e60db202351";
libraryHaskellDepends = [ base dlist ghcjs-base-stub ];
homepage = "https://github.com/louispan/disposable#readme";
description = "Allows storing different resource-releasing actions together";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"dist-upload" = callPackage
@@ -55143,8 +55157,8 @@ self: {
}:
mkDerivation {
pname = "distributed-closure";
- version = "0.3.3.0";
- sha256 = "bc675fd3b93c7e51a923969220821ea1676c639ff9fd4e742bd864e90f2e368f";
+ version = "0.3.4.0";
+ sha256 = "efb5bb1afca02c9ae4df081cb9f5665e4f9ba4273270250425c229f59970f2b0";
libraryHaskellDepends = [
base binary bytestring constraints syb template-haskell
];
@@ -55244,8 +55258,8 @@ self: {
}:
mkDerivation {
pname = "distributed-process-client-server";
- version = "0.2.0";
- sha256 = "de26c3cfcf8c290c0ffd8f8fa330cdd85c421e237dc0ce0530ede71a58b09b15";
+ version = "0.2.1";
+ sha256 = "1be8b6ea3468b063b3e30fc6cb027c3293373eedb073c70894ac21d937f52d93";
libraryHaskellDepends = [
base binary containers deepseq distributed-process
distributed-process-async distributed-process-extras exceptions
@@ -55348,6 +55362,39 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "distributed-process-fsm" = callPackage
+ ({ mkDerivation, ansi-terminal, base, binary, bytestring
+ , containers, data-accessor, deepseq, distributed-process
+ , distributed-process-client-server, distributed-process-extras
+ , distributed-process-systest, distributed-static, exceptions
+ , fingertree, ghc-prim, hashable, HUnit, mtl, network
+ , network-transport, network-transport-tcp, QuickCheck, rematch
+ , stm, test-framework, test-framework-hunit
+ , test-framework-quickcheck2, time, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "distributed-process-fsm";
+ version = "0.0.1";
+ sha256 = "c639ad24d035b47df926deec89b92243058503d7852ee905df2bb6fb00eb60bb";
+ libraryHaskellDepends = [
+ base binary containers deepseq distributed-process
+ distributed-process-client-server distributed-process-extras
+ exceptions mtl stm time transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ ansi-terminal base binary bytestring containers data-accessor
+ deepseq distributed-process distributed-process-extras
+ distributed-process-systest distributed-static fingertree ghc-prim
+ hashable HUnit mtl network network-transport network-transport-tcp
+ QuickCheck rematch stm test-framework test-framework-hunit
+ test-framework-quickcheck2 time transformers unordered-containers
+ ];
+ homepage = "http://github.com/haskell-distributed/distributed-process-fsm";
+ description = "The Cloud Haskell implementation of Erlang/OTP gen_statem";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"distributed-process-lifted" = callPackage
({ mkDerivation, base, binary, deepseq, distributed-process
, distributed-process-monad-control, HUnit, lifted-base
@@ -56134,20 +56181,26 @@ self: {
}) {};
"docker" = callPackage
- ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection
- , containers, data-default-class, http-client, http-client-tls
- , http-types, lens, lens-aeson, mtl, network, process, QuickCheck
- , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time, tls
- , transformers, unordered-containers, x509, x509-store, x509-system
+ ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
+ , conduit-combinators, conduit-extra, connection, containers
+ , data-default-class, directory, exceptions, filemanip, filepath
+ , http-client, http-client-tls, http-conduit, http-types, lens
+ , lens-aeson, monad-control, mtl, network, process, QuickCheck
+ , resourcet, scientific, tar, tasty, tasty-hunit, tasty-quickcheck
+ , temporary, text, time, tls, transformers, transformers-base
+ , unordered-containers, uuid, x509, x509-store, x509-system, zlib
}:
mkDerivation {
pname = "docker";
- version = "0.3.0.1";
- sha256 = "410054ae9a047caff47af15a72d26a699b500f59cca3d6a66f54a5fc505a4ec7";
+ version = "0.4.0.0";
+ sha256 = "61f68e9e1335e7d625b2c7476619f3f4dba7e67faf9738d26e9b73b89cf18f39";
libraryHaskellDepends = [
- aeson base blaze-builder bytestring containers data-default-class
- http-client http-types mtl network scientific text time tls
- unordered-containers x509 x509-store x509-system
+ aeson base blaze-builder bytestring conduit conduit-combinators
+ conduit-extra containers data-default-class directory exceptions
+ filemanip filepath http-client http-conduit http-types
+ monad-control mtl network resourcet scientific tar temporary text
+ time tls transformers transformers-base unordered-containers uuid
+ x509 x509-store x509-system zlib
];
testHaskellDepends = [
aeson base bytestring connection containers http-client
@@ -57164,6 +57217,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "dsc" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring, hspec
+ , QuickCheck, SimpleAES, string-conversions
+ }:
+ mkDerivation {
+ pname = "dsc";
+ version = "0.2.0";
+ sha256 = "ef44a52479a8945abe392192cde1cb09211b25e0afe1aa949dc0589ec922d513";
+ libraryHaskellDepends = [
+ base base64-bytestring bytestring SimpleAES string-conversions
+ ];
+ testHaskellDepends = [
+ base base64-bytestring bytestring hspec QuickCheck SimpleAES
+ string-conversions
+ ];
+ homepage = "https://github.com/qoelet/dsc#readme";
+ description = "Helper functions for setting up Double Submit Cookie defense for forms";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"dsh-sql" = callPackage
({ mkDerivation, aeson, algebra-dag, algebra-sql, base, bytestring
, bytestring-lexing, containers, Decimal, DSH, either, HDBC
@@ -58629,21 +58702,21 @@ self: {
"egison" = callPackage
({ mkDerivation, array, base, containers, criterion, deepseq
- , directory, filepath, ghc, ghc-paths, Glob, haskeline, HUnit
- , monad-parallel, mtl, parsec, process, random, regex-tdfa
- , test-framework, test-framework-hunit, text, transformers
- , unordered-containers, vector
+ , directory, filepath, ghc, ghc-paths, Glob, haskeline, HUnit, mtl
+ , parallel, parsec, process, random, regex-tdfa, test-framework
+ , test-framework-hunit, text, transformers, unordered-containers
+ , vector
}:
mkDerivation {
pname = "egison";
- version = "3.6.4";
- sha256 = "8900413b3f0e42c0907bec37dfd2ed0d2f6c618836ea6054615a786ff4fcf5f3";
+ version = "3.6.5";
+ sha256 = "56ffcb0beb846026eb73cbf541c1b6e287daa13e13f8698be4ad251fcabcb4b9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- array base containers directory ghc ghc-paths haskeline
- monad-parallel mtl parsec process random regex-tdfa text
- transformers unordered-containers vector
+ array base containers directory ghc ghc-paths haskeline mtl
+ parallel parsec process random regex-tdfa text transformers
+ unordered-containers vector
];
executableHaskellDepends = [
array base containers directory filepath ghc ghc-paths haskeline
@@ -59532,6 +59605,7 @@ self: {
homepage = "http://github.com/ucsd-progsys/elsa";
description = "A tiny language for understanding the lambda-calculus";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"emacs-keys" = callPackage
@@ -60454,8 +60528,8 @@ self: {
}:
mkDerivation {
pname = "equal-files";
- version = "0.0.5.2";
- sha256 = "1c391e4f2e813d5aaaa77c849ce96f070fd0846d192fd0784fdf021075ebc91e";
+ version = "0.0.5.3";
+ sha256 = "e5b785c286c557c57dba7107d913b220781aa2549ba4b7685da494b20a0172aa";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -60909,6 +60983,8 @@ self: {
pname = "esqueleto";
version = "2.5.1";
sha256 = "76a75c84c4b4e0d41b28d8f8e73cc746282f5e7e50cfb11fcc252286950c87d9";
+ revision = "1";
+ editedCabalFile = "d612bc43e57e7d69561a7d88ad5cb564999c202ddaffe8460bff1979402710b8";
libraryHaskellDepends = [
base blaze-html bytestring conduit monad-logger persistent
resourcet tagged text transformers unordered-containers
@@ -61329,8 +61405,8 @@ self: {
}:
mkDerivation {
pname = "eventloop";
- version = "0.8.2.1";
- sha256 = "aed31b9515e726ae439323590336295cbdcd9c530aebb95f976a1068fc4c6848";
+ version = "0.8.2.2";
+ sha256 = "20681dea13cfc53e4b8e0b27c4e8ec62462a0c0886a797eb773370db1ca0e00e";
libraryHaskellDepends = [
aeson base bytestring concurrent-utilities deepseq network stm
suspend text timers websockets
@@ -61727,8 +61803,8 @@ self: {
({ mkDerivation, base, directory, filepath, unix }:
mkDerivation {
pname = "executable-path";
- version = "0.0.3";
- sha256 = "8c7215ed4c3cd558f89dc862d21cf9dab3c6b762f4f90c0c1be9e3141c46e5c9";
+ version = "0.0.3.1";
+ sha256 = "9cc742b6d40a487b3af38dca6852ca3b50a0db94d42fe819576c84beb5adbc6f";
libraryHaskellDepends = [ base directory filepath unix ];
homepage = "http://code.haskell.org/~bkomuves/";
description = "Finding out the full path of the executable";
@@ -63300,6 +63376,8 @@ self: {
pname = "fclabels";
version = "2.0.3.2";
sha256 = "4d5d83ffc3c8bc610e9c42e19c2e07a1ca68666310261de15703c605047182b0";
+ revision = "1";
+ editedCabalFile = "9e2c00e02216a9ba54f4798c9c68e88b0b94440e9ebd583d126404e8f7fe8c90";
libraryHaskellDepends = [ base mtl template-haskell transformers ];
testHaskellDepends = [
base HUnit mtl template-haskell transformers
@@ -63412,6 +63490,8 @@ self: {
pname = "feed";
version = "0.3.12.0";
sha256 = "cc2d6a3b91027d75b91a0a4c0f83f2df68bee3ce0d7338ea5ae0bcab6dd47942";
+ revision = "1";
+ editedCabalFile = "f4f8a8372bb2337c23c91e9fb5e29b379def01dba7234db0e44b9e753c25cc8c";
libraryHaskellDepends = [
base old-locale old-time time time-locale-compat utf8-string xml
];
@@ -63707,6 +63787,33 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {raptor = null;};
+ "fernet" = callPackage
+ ({ mkDerivation, aeson, base, binary, byteable, bytestring
+ , cryptonite, HUnit, memory, optparse-applicative, QuickCheck
+ , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, time, unix
+ }:
+ mkDerivation {
+ pname = "fernet";
+ version = "0.1.0.0";
+ sha256 = "3ed511803b0754f56948dd172888ad51314cfb41ea029f92306d89b03dac1119";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary byteable bytestring cryptonite memory time
+ ];
+ executableHaskellDepends = [
+ base bytestring memory optparse-applicative time unix
+ ];
+ testHaskellDepends = [
+ aeson base bytestring HUnit memory QuickCheck tasty tasty-golden
+ tasty-hunit tasty-quickcheck time
+ ];
+ homepage = "https://github.com/rvl/fernet-hs";
+ description = "Generate and verify HMAC-based authentication tokens";
+ license = stdenv.lib.licenses.lgpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fez-conf" = callPackage
({ mkDerivation, base, containers, regex-compat }:
mkDerivation {
@@ -63813,8 +63920,8 @@ self: {
}:
mkDerivation {
pname = "fft";
- version = "0.1.8.4";
- sha256 = "2ea96d3150c1fca6ae2d8f0cead263ea1deddc0be18727a0cf4030f2ef07e1b4";
+ version = "0.1.8.5";
+ sha256 = "fa290a4d7e2f356237e8d450a5a945cf2bde1b281b08a703d101ccc2e959aa1f";
libraryHaskellDepends = [
array base carray ix-shapable storable-complex syb transformers
];
@@ -65502,8 +65609,8 @@ self: {
}:
mkDerivation {
pname = "fltkhs";
- version = "0.5.1.4";
- sha256 = "a512cfb0cdad3873c4457eec90c25e7e8a8042e6b98fedb50d883235a55711e3";
+ version = "0.5.1.5";
+ sha256 = "74cdfdc677fe52b1c551fed125a7fb38b3858e0256be2c512929a9cd0c3d45f0";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal directory filepath ];
@@ -65781,8 +65888,8 @@ self: {
}:
mkDerivation {
pname = "foldl";
- version = "1.2.3";
- sha256 = "fb081168f7736a04dc68db348d2e0bc58d535da5ed74c4394a022dbaa46d3f25";
+ version = "1.2.4";
+ sha256 = "1c9777b172422aa0a184a44fdd20ee74f2d5e9d735b127fcc7ee1e61647ce3b5";
libraryHaskellDepends = [
base bytestring comonad containers contravariant mwc-random
primitive profunctors text transformers vector
@@ -67286,8 +67393,8 @@ self: {
}:
mkDerivation {
pname = "friday-juicypixels";
- version = "0.1.2";
- sha256 = "2f8fca7cf49c86af592691bdaaada94ae768a9e054956759a860c9b59ae16ed1";
+ version = "0.1.2.1";
+ sha256 = "ca861884ede7a37567fc291e8e98515f3ec5cc8dfc0200944e5fd5fa49251af4";
libraryHaskellDepends = [ base friday JuicyPixels vector ];
testHaskellDepends = [
base bytestring file-embed friday hspec JuicyPixels
@@ -68295,6 +68402,20 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "g4ip" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "g4ip";
+ version = "0.1.0.0";
+ sha256 = "fc280273fd9e6324d1b304bf553ae43f69202ae8619a74fa2b4bd7fa069ec086";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/cacay/G4ip";
+ description = "A theorem prover for propositional logic that uses G4ip";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"gact" = callPackage
({ mkDerivation, base, biopsl, bytestring, cmdargs, hashable
, unordered-containers
@@ -68808,8 +68929,8 @@ self: {
}:
mkDerivation {
pname = "general-games";
- version = "1.0.3";
- sha256 = "3be96a6b56f39e6d122b57759802cd8de36210f72192a1dfee24247bdfe0c7ef";
+ version = "1.0.5";
+ sha256 = "427d0319c4aa99d8071d25bc4df7e7f1eff341b05d8f5ed85a735b1b6c032a53";
libraryHaskellDepends = [
base monad-loops MonadRandom random random-shuffle
];
@@ -69468,6 +69589,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "genvalidity-hspec-binary" = callPackage
+ ({ mkDerivation, base, binary, deepseq, doctest, genvalidity
+ , genvalidity-hspec, hspec, QuickCheck
+ }:
+ mkDerivation {
+ pname = "genvalidity-hspec-binary";
+ version = "0.0.0.0";
+ sha256 = "fdb91ed09a3e486508d8180dc4fcc3f229d376838576c5a0a271b4dbbd2937b6";
+ libraryHaskellDepends = [
+ base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck
+ ];
+ testHaskellDepends = [ base doctest genvalidity hspec ];
+ homepage = "https://github.com/NorfairKing/validity#readme";
+ description = "Standard spec's for binary-related Instances";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"genvalidity-hspec-cereal" = callPackage
({ mkDerivation, base, cereal, deepseq, doctest, genvalidity
, genvalidity-hspec, hspec, QuickCheck
@@ -70656,6 +70794,7 @@ self: {
executableHaskellDepends = [ base ghc-paths unix ];
description = "Print minimal export lists";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ghc-vis" = callPackage
@@ -71992,8 +72131,8 @@ self: {
}:
mkDerivation {
pname = "git-annex";
- version = "6.20170301.1";
- sha256 = "f416c02fabefb28e346b3bb6723141b0ff9785575e78e4d1e9ab5982cf6389de";
+ version = "6.20170321";
+ sha256 = "f86351a99bbfff0285914c4639d2bc68ffcc172a6dacdef164254261cf1f0795";
configureFlags = [
"-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
"-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -72918,16 +73057,18 @@ self: {
}) {};
"gl" = callPackage
- ({ mkDerivation, base, containers, directory, filepath, fixed, half
- , hxt, mesa, split, transformers
+ ({ mkDerivation, base, Cabal, containers, directory, filepath
+ , fixed, half, hxt, mesa, transformers
}:
mkDerivation {
pname = "gl";
- version = "0.7.8.1";
- sha256 = "ed792ee75d32489857295ef9ae6a4a49900e2ed4a01cd2bac9fdd17959a6219a";
+ version = "0.8.0";
+ sha256 = "aa4d2838157c86da920bda651458a4266fccc7c291ea93a69558ab02540e1439";
+ setupHaskellDepends = [
+ base Cabal containers directory filepath hxt transformers
+ ];
libraryHaskellDepends = [
- base containers directory filepath fixed half hxt split
- transformers
+ base containers fixed half transformers
];
librarySystemDepends = [ mesa ];
description = "Complete OpenGL raw bindings";
@@ -73092,19 +73233,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "glazier_0_11_0_0" = callPackage
+ "glazier_0_11_0_1" = callPackage
({ mkDerivation, base, lens, mmorph, mtl, semigroupoids
, transformers
}:
mkDerivation {
pname = "glazier";
- version = "0.11.0.0";
- sha256 = "8ef0c04025f7d6942eeee13f9f376ed8019e38b6cd48e1eaffff5f5cd789c0ff";
+ version = "0.11.0.1";
+ sha256 = "1151031c7943140b19fc3b319f6e1c648cc75fa0fd619f17d64dfe7857b60b46";
libraryHaskellDepends = [
base lens mmorph mtl semigroupoids transformers
];
homepage = "https://github.com/louispan/glazier#readme";
- description = "Composable widgets framework";
+ description = "Composable widgets framework with enhanced with transformers and lens";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -73151,8 +73292,8 @@ self: {
}:
mkDerivation {
pname = "glazier-react";
- version = "0.2.0.0";
- sha256 = "ab19e2b5fc513c2be8d6ea5ec361eefc6be338ec76dd081566be344b41261467";
+ version = "0.4.0.0";
+ sha256 = "2486f02a5c8375cc2b7f75d53279ef96257067e24bc1b946c9ab304cf3b7b883";
libraryHaskellDepends = [
base containers deepseq disposable dlist free ghcjs-base-stub
glazier javascript-extras lens mmorph mtl pipes-concurrency
@@ -73162,6 +73303,31 @@ self: {
homepage = "https://github.com/louispan/glazier-react#readme";
description = "ReactJS binding using Glazier and Pipes.Fluid";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "glazier-react-examples" = callPackage
+ ({ mkDerivation, base, containers, disposable, dlist, free
+ , ghcjs-base-stub, glazier, glazier-react, glazier-react-widget
+ , javascript-extras, lens, mmorph, mtl, pipes, pipes-concurrency
+ , pipes-misc, stm, text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "glazier-react-examples";
+ version = "0.4.0.0";
+ sha256 = "2bff5dbf10e7f78bf61f93a8abe210d0cafcf634f3973e78aa2b1e7fd8188152";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base containers disposable dlist free ghcjs-base-stub glazier
+ glazier-react glazier-react-widget javascript-extras lens mmorph
+ mtl pipes pipes-concurrency pipes-misc stm text transformers
+ unordered-containers
+ ];
+ homepage = "https://github.com/louispan/glazier-react#readme";
+ description = "Examples of using glazier-react";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"glazier-react-widget" = callPackage
@@ -73171,8 +73337,8 @@ self: {
}:
mkDerivation {
pname = "glazier-react-widget";
- version = "0.2.0.0";
- sha256 = "5326958b5590c76cfee47eac0445cc66cca0a85480c6dee4c80fc736f4329fa4";
+ version = "0.4.0.0";
+ sha256 = "f60ebf2ff016382dda3d5808eef28eb900fc62f86b5f7c6be98c92186bce2d68";
libraryHaskellDepends = [
base containers disposable dlist free ghcjs-base-stub glazier
glazier-react javascript-extras lens mmorph mtl pipes-concurrency
@@ -73181,6 +73347,7 @@ self: {
homepage = "https://github.com/louispan/glazier-react-widget#readme";
description = "Generic widget library using glazier-react";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gli" = callPackage
@@ -73499,6 +73666,7 @@ self: {
homepage = "http://gloss.ouroborus.net";
description = "Data structures and algorithms for working with 2D graphics";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gloss-banana" = callPackage
@@ -73546,6 +73714,7 @@ self: {
homepage = "http://gloss.ouroborus.net";
description = "Examples using the gloss library";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gloss-game" = callPackage
@@ -73594,6 +73763,7 @@ self: {
homepage = "http://gloss.ouroborus.net";
description = "Parallel rendering of raster images";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gloss-raster-accelerate" = callPackage
@@ -73897,8 +74067,8 @@ self: {
}:
mkDerivation {
pname = "gnss-converters";
- version = "0.2.4";
- sha256 = "0781dbaaece9a06a2ded982b193e6a5fed7a4a36f4e3ac031f89d710e97dfafd";
+ version = "0.2.5";
+ sha256 = "fdb2f813be0fe972855910100b544f7dbf3a2cd69d79e99bcffc9f60e761ec02";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -74130,6 +74300,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "gochan" = callPackage
+ ({ mkDerivation, array, base, criterion, ghc-prim, hspec
+ , hspec-core, primitive, random, vector, vector-algorithms, weigh
+ }:
+ mkDerivation {
+ pname = "gochan";
+ version = "0.0.2";
+ sha256 = "f3c7e4f9c355f59725a46f3723360bc778d8306192b205b218a0074dd1be1ae5";
+ revision = "1";
+ editedCabalFile = "05736bf5e4d1080b23156bd7acd6f24925641a7c0a911bf15992a7232f0554a7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base ghc-prim primitive random vector vector-algorithms
+ ];
+ executableHaskellDepends = [ base criterion random weigh ];
+ testHaskellDepends = [ base hspec hspec-core ];
+ homepage = "http://github.com/cstrahan/gochan";
+ description = "Go-style channels";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"gofer-prelude" = callPackage
({ mkDerivation, base, ghc-prim }:
mkDerivation {
@@ -76885,15 +77077,15 @@ self: {
"google-oauth2-for-cli" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, filepath
- , hspec, http-types, req, time, wai, warp
+ , hspec, http-types, req, time, unix, wai, warp
}:
mkDerivation {
pname = "google-oauth2-for-cli";
- version = "0.1.0.0";
- sha256 = "ccbb42b8d946442399d057cf211df23f46a8d95bd82a6965bc078e5385d2232d";
+ version = "0.1.0.1";
+ sha256 = "811b7daf819be3afdad8e7fda31ec8ff1ec8a79476de687d14229e5e43aa37d8";
libraryHaskellDepends = [
- aeson base bytestring directory filepath http-types req time wai
- warp
+ aeson base bytestring directory filepath http-types req time unix
+ wai warp
];
testHaskellDepends = [ base hspec ];
homepage = "https://github.com/ishiy1993/google-oauth2-for-cli#readme";
@@ -78520,6 +78712,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "group-by-date" = callPackage
+ ({ mkDerivation, base, explicit-exception, filemanip, hsshellscript
+ , pathtype, time, transformers, unix-compat, utility-ht
+ }:
+ mkDerivation {
+ pname = "group-by-date";
+ version = "0.1";
+ sha256 = "6660c6bd7be563375b5bacf6c3d0a0499678896808b1843e62e94c7bebb7f3ee";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base explicit-exception filemanip hsshellscript pathtype time
+ transformers unix-compat utility-ht
+ ];
+ homepage = "http://hub.darcs.net/thielema/group-by-date/";
+ description = "Shell command for grouping files by dates into folders";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"group-with" = callPackage
({ mkDerivation, base, Cabal, containers, hspec, hspec-expectations
, QuickCheck
@@ -80857,10 +81068,8 @@ self: {
}:
mkDerivation {
pname = "haddock-api";
- version = "2.17.3";
- sha256 = "8d35a256c2ee07083c1e1a8b08e536069ffdad27598bed69d88847fb51234dc7";
- revision = "1";
- editedCabalFile = "5d33603e8e6befb2c2ed2dd8c5029b78e1377a387b165671105cadb9cb7df4f8";
+ version = "2.17.3.1";
+ sha256 = "ed8c5282260d3300dc06e45e2f9a5d53606315a15a2336db749d3faa64d564ba";
libraryHaskellDepends = [
array base bytestring Cabal containers deepseq directory filepath
ghc ghc-boot ghc-paths haddock-library transformers xhtml
@@ -81913,6 +82122,8 @@ self: {
pname = "hamtmap";
version = "0.3";
sha256 = "d4d107ece7ffa69528a720763a0741dcab4773646df974596220d745250fd911";
+ revision = "1";
+ editedCabalFile = "bbdcebe83e12f704a0b6611b1a9e7aa22db20023c6e3d44505617410f53733b6";
libraryHaskellDepends = [ array base deepseq hashable ];
homepage = "https://github.com/exclipy/pdata";
description = "A purely functional and persistent hash map";
@@ -83244,8 +83455,8 @@ self: {
}:
mkDerivation {
pname = "hasbolt";
- version = "0.1.1.1";
- sha256 = "c715475ce67d5b311f6dc252d2d2e58cac9a12e417c007e28635c30c8ca619b1";
+ version = "0.1.1.2";
+ sha256 = "a89161c4a2939f92906d67c85133c82d2295f8f53577ad210260463411fb2a8f";
libraryHaskellDepends = [
base binary bytestring containers data-binary-ieee754 data-default
hex network network-simple text transformers
@@ -83423,32 +83634,6 @@ self: {
}) {};
"hashable" = callPackage
- ({ mkDerivation, base, bytestring, criterion, ghc-prim, HUnit
- , integer-gmp, QuickCheck, random, siphash, test-framework
- , test-framework-hunit, test-framework-quickcheck2, text, unix
- }:
- mkDerivation {
- pname = "hashable";
- version = "1.2.5.0";
- sha256 = "153eb1614a739f3ccf8c5fcd4230a17b8b24862ab727c46dd4acd22bc15fb2bc";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base bytestring ghc-prim integer-gmp text
- ];
- testHaskellDepends = [
- base bytestring ghc-prim HUnit QuickCheck random test-framework
- test-framework-hunit test-framework-quickcheck2 text unix
- ];
- benchmarkHaskellDepends = [
- base bytestring criterion ghc-prim integer-gmp siphash text
- ];
- homepage = "http://github.com/tibbe/hashable";
- description = "A class for types that can be converted to a hash value";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hashable_1_2_6_0" = callPackage
({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
, HUnit, integer-gmp, QuickCheck, random, siphash, test-framework
, test-framework-hunit, test-framework-quickcheck2, text, unix
@@ -83457,6 +83642,8 @@ self: {
pname = "hashable";
version = "1.2.6.0";
sha256 = "429b663c827af52f64b0f376ee6e7a990e57ec54a59107857311054ade6e0a52";
+ revision = "1";
+ editedCabalFile = "8f8a4f7b788fb1ea04636634c7e1c9cd0a4a6cfe66cdb808dc24f56c187451df";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -83472,7 +83659,6 @@ self: {
homepage = "http://github.com/tibbe/hashable";
description = "A class for types that can be converted to a hash value";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hashable-extras" = callPackage
@@ -86431,27 +86617,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hasql_0_19_17_1" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
- , bytestring-tree-builder, contravariant, contravariant-extras
+ "hasql_0_19_18" = callPackage
+ ({ mkDerivation, attoparsec, base, base-prelude, bytestring
+ , bytestring-strict-builder, contravariant, contravariant-extras
, criterion, data-default-class, deepseq, dlist, either, hashable
- , hashtables, loch-th, mtl, network-ip, placeholders
- , postgresql-binary, postgresql-libpq, profunctors, QuickCheck
- , quickcheck-instances, rebase, rerebase, scientific, semigroups
- , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
- , time, transformers, uuid, vector
+ , hashtables, loch-th, mtl, placeholders, postgresql-binary
+ , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances
+ , rebase, rerebase, scientific, semigroups, tasty, tasty-hunit
+ , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+ , uuid, vector
}:
mkDerivation {
pname = "hasql";
- version = "0.19.17.1";
- sha256 = "d9e9a38256637f1bebb96898a91780f1b977c737c5933903b582f2e93bd81156";
+ version = "0.19.18";
+ sha256 = "a67e8bc48197e36e1d9906d4bba3779913e44105e58703169db914207315224d";
libraryHaskellDepends = [
- aeson attoparsec base base-prelude bytestring
- bytestring-tree-builder contravariant contravariant-extras
- data-default-class dlist either hashable hashtables loch-th mtl
- network-ip placeholders postgresql-binary postgresql-libpq
- profunctors scientific semigroups text time transformers uuid
- vector
+ attoparsec base base-prelude bytestring bytestring-strict-builder
+ contravariant contravariant-extras data-default-class dlist either
+ hashable hashtables loch-th mtl placeholders postgresql-binary
+ postgresql-libpq profunctors semigroups text transformers vector
];
testHaskellDepends = [
data-default-class QuickCheck quickcheck-instances rebase rerebase
@@ -86519,8 +86703,8 @@ self: {
}:
mkDerivation {
pname = "hasql-cursor-query";
- version = "0.4.1";
- sha256 = "9f0b1bf2ea1634f2f2da0727bfab331722c71573a3574f65423cada54da7c902";
+ version = "0.4.2";
+ sha256 = "9cf2c8ea63f69fbe5c989c6c8c9dac6043da781bb08e65950399a8e7abb07556";
libraryHaskellDepends = [
base base-prelude bytestring contravariant foldl hasql
hasql-cursor-transaction hasql-transaction profunctors
@@ -86537,16 +86721,16 @@ self: {
"hasql-cursor-transaction" = callPackage
({ mkDerivation, base, base-prelude, bytestring
- , bytestring-tree-builder, contravariant, hasql, hasql-transaction
- , transformers
+ , bytestring-tree-builder, contravariant, contravariant-extras
+ , hasql, hasql-transaction, transformers
}:
mkDerivation {
pname = "hasql-cursor-transaction";
- version = "0.6";
- sha256 = "07b991914a5664378ab358536ba36ea9c54f7771c41c7eed6688053fa289c2f6";
+ version = "0.6.1";
+ sha256 = "4f68d7f004212712cbde02e037a4f539410ff77070112be2d268402c9e6b85bf";
libraryHaskellDepends = [
base base-prelude bytestring bytestring-tree-builder contravariant
- hasql hasql-transaction transformers
+ contravariant-extras hasql hasql-transaction transformers
];
homepage = "https://github.com/nikita-volkov/hasql-cursor-transaction";
description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
@@ -87642,6 +87826,7 @@ self: {
homepage = "https://github.com/danfran/hcoord#readme";
description = "Easily convert between latitude/longitude, UTM and OSGB";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hcron" = callPackage
@@ -88037,10 +88222,8 @@ self: {
}:
mkDerivation {
pname = "hdocs";
- version = "0.5.1.0";
- sha256 = "bb4a43b479b1731105b7c6195bff59a3763042daf1102765c4f78d075a5ba2df";
- revision = "1";
- editedCabalFile = "5be14f612b7dfcc066e9fceeac312deb162c08f043f8929b0d2649c76d4f6b0f";
+ version = "0.5.2.0";
+ sha256 = "aca302d1b972c6623b03091e965af6f259b5b81ff383d66c6511027d53ba8a90";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -89930,8 +90113,8 @@ self: {
}:
mkDerivation {
pname = "hgis";
- version = "0.1.2.0";
- sha256 = "d1a976e0e8373e9448944200b77408dabbb04fb2221232832574244bb19935cc";
+ version = "0.1.3.1";
+ sha256 = "1616cb332092457e7649ea02687cfc7a5a7d777ac426207870a4df2afc32d6ab";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -91387,6 +91570,34 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hjsonschema_1_6_1" = callPackage
+ ({ mkDerivation, aeson, async, base, bytestring, containers
+ , directory, file-embed, filepath, hashable, hjsonpointer, hspec
+ , http-client, http-types, pcre-heavy, profunctors, protolude
+ , QuickCheck, scientific, semigroups, text, unordered-containers
+ , vector, wai-app-static, warp
+ }:
+ mkDerivation {
+ pname = "hjsonschema";
+ version = "1.6.1";
+ sha256 = "c3816837b0ff64d32db0e575bf25cf3c23866b4bd1825e51172e1f964c81bc9e";
+ libraryHaskellDepends = [
+ aeson base bytestring containers file-embed filepath hashable
+ hjsonpointer http-client http-types pcre-heavy profunctors
+ protolude QuickCheck scientific semigroups text
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson async base bytestring directory filepath hjsonpointer hspec
+ profunctors protolude QuickCheck semigroups text
+ unordered-containers vector wai-app-static warp
+ ];
+ homepage = "https://github.com/seagreen/hjsonschema";
+ description = "JSON Schema library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hkdf" = callPackage
({ mkDerivation, base, byteable, bytestring, cryptohash, hspec }:
mkDerivation {
@@ -91846,12 +92057,13 @@ self: {
}) {inherit (pkgs) git; inherit (pkgs) openssl;};
"hlibsass" = callPackage
- ({ mkDerivation, base, hspec, libsass }:
+ ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
mkDerivation {
pname = "hlibsass";
- version = "0.1.5.0";
- sha256 = "ce3e9a15d01c1b61d41b03e9b05ecd9b4b9aaf6da7d591086181b74e18d25bb8";
+ version = "0.1.6.0";
+ sha256 = "3d8826ce12d8e1179ff226f38f860355e40601cf9fd7955f93d97613734a9cde";
configureFlags = [ "-fexternallibsass" ];
+ setupHaskellDepends = [ base Cabal directory ];
libraryHaskellDepends = [ base ];
librarySystemDepends = [ libsass ];
testHaskellDepends = [ base hspec ];
@@ -94741,6 +94953,7 @@ self: {
homepage = "https://github.com/shmish111/hriemann";
description = "Initial project template from stack";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hruby" = callPackage
@@ -95454,8 +95667,8 @@ self: {
}:
mkDerivation {
pname = "hsass";
- version = "0.4.0";
- sha256 = "512faf0e01e720395699066139379fb2e5e5f456f465c72d58282b75b6ec0f9d";
+ version = "0.4.1";
+ sha256 = "67db51178ebd99cd69c232b04a2d2a319b6a8b73c2713d172caf81344915fbcc";
libraryHaskellDepends = [
base bytestring data-default-class filepath hlibsass monad-loops
transformers
@@ -96155,10 +96368,8 @@ self: {
}:
mkDerivation {
pname = "hsdev";
- version = "0.2.2.0";
- sha256 = "844973b82ed0a0a7321d8106755e71db229889af4b0516e5da861bf6474bb932";
- revision = "1";
- editedCabalFile = "18e2c175baf6aa0fef8e7fcf7126e19d8df085bab6ed405bb4d55b6f98121a3b";
+ version = "0.2.2.2";
+ sha256 = "39fa69fb48273f81c6a6683544720cf9b61d41374901e8e1730609c1a189d1d2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -96357,8 +96568,8 @@ self: {
}:
mkDerivation {
pname = "hsexif";
- version = "0.6.1.0";
- sha256 = "868a46bcd841a2db36eebba803962f966c24c4a98b7581c9f329fd596bafab4f";
+ version = "0.6.1.1";
+ sha256 = "37702ce6939a7c1d1780185285ae9353abcbc3c59552d06a2e1bcaa820a33f09";
libraryHaskellDepends = [
base binary bytestring containers iconv text time
];
@@ -96743,6 +96954,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {inherit (pkgs) lua5_1;};
+ "hslua_0_5_0" = callPackage
+ ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit
+ , lua5_1, QuickCheck, quickcheck-instances, text
+ }:
+ mkDerivation {
+ pname = "hslua";
+ version = "0.5.0";
+ sha256 = "6b270a14cce6046a443e6700d0b73725bef2dc068dd40aa6a1feb1c84f41171b";
+ configureFlags = [ "-fsystem-lua" ];
+ libraryHaskellDepends = [ base bytestring ];
+ librarySystemDepends = [ lua5_1 ];
+ testHaskellDepends = [
+ base bytestring hspec hspec-contrib HUnit QuickCheck
+ quickcheck-instances text
+ ];
+ description = "A Lua language interpreter embedding in Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) lua5_1;};
+
"hslua-aeson" = callPackage
({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
, ieee754, QuickCheck, quickcheck-instances, scientific, text
@@ -96750,8 +96981,8 @@ self: {
}:
mkDerivation {
pname = "hslua-aeson";
- version = "0.1.0.0";
- sha256 = "62564714c0952da7f631f60ad502863376aad1963aa80d2365d5765f93872ff7";
+ version = "0.1.0.3";
+ sha256 = "f10c7fc9fdcc1c41964eb5ab170ce233be99343eb73ddaff5c175bea5bfcf1ea";
libraryHaskellDepends = [
aeson base hashable hslua scientific text unordered-containers
vector
@@ -96973,29 +97204,27 @@ self: {
}) {};
"hsoz" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
- , base64-bytestring, byteable, bytestring, case-insensitive
- , containers, cryptonite, data-default, either, errors, exceptions
- , hashable, http-client, http-conduit, http-types, HUnit, lens
- , lucid, memory, mtl, network, optparse-applicative, QuickCheck
- , scientific, scotty, securemem, tasty, tasty-golden, tasty-hunit
- , tasty-quickcheck, text, time, transformers, unordered-containers
- , uri-bytestring, vault, wai, warp
+ ({ mkDerivation, aeson, attoparsec, base, bytestring
+ , case-insensitive, containers, cryptonite, data-default, either
+ , errors, exceptions, hashable, http-client, http-conduit
+ , http-types, HUnit, lens, lucid, memory, mtl, network
+ , optparse-applicative, QuickCheck, scientific, scotty, tasty
+ , tasty-golden, tasty-hunit, tasty-quickcheck, text, time
+ , transformers, unordered-containers, uri-bytestring, vault, wai
+ , warp
}:
mkDerivation {
pname = "hsoz";
- version = "0.0.0.4";
- sha256 = "a007f1ed9937208c613cbd854d103b09c54bdc35f972186d43adf0e3795dd058";
- revision = "1";
- editedCabalFile = "00802583e500dd540bb78ae2e03802dcb5965e3bc9338616d72149cbeea12073";
+ version = "0.0.1.0";
+ sha256 = "c524eef8566f37cc8bee4717088cbb32a440df3b2304da465090819ebbea2d64";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson attoparsec base base16-bytestring base64-bytestring byteable
- bytestring case-insensitive containers cryptonite data-default
- either errors exceptions hashable http-client http-types lens
- memory mtl network scientific scotty securemem text time
- transformers unordered-containers uri-bytestring vault wai warp
+ aeson attoparsec base bytestring case-insensitive containers
+ cryptonite data-default either errors exceptions hashable
+ http-client http-types lens memory mtl network scientific scotty
+ text time transformers unordered-containers uri-bytestring vault
+ wai warp
];
executableHaskellDepends = [
aeson base bytestring case-insensitive containers cryptonite
@@ -97099,8 +97328,8 @@ self: {
}:
mkDerivation {
pname = "hspec";
- version = "2.4.2";
- sha256 = "48b7e342c0990ae38373acbb7cac5a2ef9b1bb2cca8bdf41a896f1593e677484";
+ version = "2.4.3";
+ sha256 = "3a7388e3471461e09f49dd37a64d29769b406448b8365ce1538f6da1fdaf6e37";
libraryHaskellDepends = [
base call-stack hspec-core hspec-discover hspec-expectations HUnit
QuickCheck transformers
@@ -97167,8 +97396,8 @@ self: {
}:
mkDerivation {
pname = "hspec-core";
- version = "2.4.2";
- sha256 = "393ba143901824579b736fb4313c7e07e57eda45580e657bf24d1b1c32c0a318";
+ version = "2.4.3";
+ sha256 = "7c9d6f34799b3f0221d016f73509be147bb9deb1161321ccdc19f2af0809e155";
libraryHaskellDepends = [
ansi-terminal array async base call-stack deepseq directory
filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -97189,8 +97418,8 @@ self: {
({ mkDerivation, base, directory, filepath, hspec-meta }:
mkDerivation {
pname = "hspec-discover";
- version = "2.4.2";
- sha256 = "8c9ad7bc21eabcc28526e8fd8e12927c0d659c9b3179e665c30b175fa5011d2c";
+ version = "2.4.3";
+ sha256 = "aa3d75c891dd134020dcb6afe547f15d055e6c304c2cd1a5c723f7602868b44e";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base directory filepath ];
@@ -98038,6 +98267,8 @@ self: {
pname = "hsshellscript";
version = "3.3.4";
sha256 = "3bd909d227215e0de6d6a42af736ccc21c360b677b9bff5b9c366859f582b54e";
+ revision = "2";
+ editedCabalFile = "29ba42acbe811deb1bf36828db57e8063c8e733e39e7d848fc29c0aca184602b";
libraryHaskellDepends = [ base directory parsec random unix ];
libraryToolDepends = [ c2hs ];
homepage = "http://www.volker-wysk.de/hsshellscript/";
@@ -99678,33 +99909,6 @@ self: {
}) {};
"http-reverse-proxy" = callPackage
- ({ mkDerivation, async, base, blaze-builder, bytestring
- , case-insensitive, conduit, conduit-extra, containers
- , data-default-class, hspec, http-client, http-conduit, http-types
- , lifted-base, monad-control, network, resourcet, streaming-commons
- , text, transformers, wai, wai-logger, warp, word8
- }:
- mkDerivation {
- pname = "http-reverse-proxy";
- version = "0.4.3.2";
- sha256 = "c2b3300bf43a9810e8642dd7fa44ecfb5e0ce1055dc01e0b604ae9a99fbfd77a";
- libraryHaskellDepends = [
- async base blaze-builder bytestring case-insensitive conduit
- conduit-extra containers data-default-class http-client http-types
- lifted-base monad-control network resourcet streaming-commons text
- transformers wai wai-logger word8
- ];
- testHaskellDepends = [
- base blaze-builder bytestring conduit conduit-extra hspec
- http-conduit http-types lifted-base network resourcet
- streaming-commons transformers wai warp
- ];
- homepage = "https://github.com/fpco/http-reverse-proxy";
- description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "http-reverse-proxy_0_4_3_3" = callPackage
({ mkDerivation, async, base, blaze-builder, bytestring
, case-insensitive, conduit, conduit-extra, containers
, data-default-class, hspec, http-client, http-conduit, http-types
@@ -99729,7 +99933,6 @@ self: {
homepage = "https://github.com/fpco/http-reverse-proxy";
description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"http-server" = callPackage
@@ -100222,12 +100425,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hunit-dejafu_0_4_0_0" = callPackage
+ "hunit-dejafu_0_4_0_1" = callPackage
({ mkDerivation, base, dejafu, exceptions, HUnit, random }:
mkDerivation {
pname = "hunit-dejafu";
- version = "0.4.0.0";
- sha256 = "70c53e26261d0075807635c135ead2a8b96a5fec004e9f50ee9043ead136e216";
+ version = "0.4.0.1";
+ sha256 = "b0e97ecb22eb7b0b1552daad8cd7ddab4e91c255e7fc8183e0ee2536fa7d8caf";
libraryHaskellDepends = [ base dejafu exceptions HUnit random ];
homepage = "https://github.com/barrucadu/dejafu";
description = "Deja Fu support for the HUnit test framework";
@@ -102135,6 +102338,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hzenhan" = callPackage
+ ({ mkDerivation, base, containers, QuickCheck, text }:
+ mkDerivation {
+ pname = "hzenhan";
+ version = "0.0.1";
+ sha256 = "13350850717d2691ad30dbbfe76a8506d726fae278b6079bb1258dfcecccf6d8";
+ libraryHaskellDepends = [ base containers text ];
+ testHaskellDepends = [ base containers QuickCheck text ];
+ homepage = "https://github.com/karky7/hzenhan#readme";
+ description = "Zenhan library for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hzk" = callPackage
({ mkDerivation, base, bytestring, resource-pool, tasty
, tasty-hunit, time, zookeeper_mt
@@ -102277,6 +102493,8 @@ self: {
pname = "iban";
version = "0.1.1.1";
sha256 = "e9e2ef69259edb58988ab147fbd71d75f7c1a1015220e40cca4e1c68d5fc9c91";
+ revision = "1";
+ editedCabalFile = "6feb3674edd88f6a5d6de76bd3ee726d39564309c148249762ee02a657434cbf";
libraryHaskellDepends = [
base containers iso3166-country-codes text unordered-containers
];
@@ -102639,8 +102857,8 @@ self: {
}:
mkDerivation {
pname = "idris";
- version = "0.99.1";
- sha256 = "199018612112180778da0d6b75f602848e6b8b4ce4747163a385daac44217c8a";
+ version = "0.99.2";
+ sha256 = "c3ff38dfeecab2edb7afee907ccbc9b3f348c658ceff686d0617aa3b661d8c3a";
configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
isLibrary = true;
isExecutable = true;
@@ -102757,8 +102975,8 @@ self: {
({ mkDerivation, base, binary, bytestring }:
mkDerivation {
pname = "iff";
- version = "0.0.5";
- sha256 = "26ec287bfa3039429d21af00f98b9a7723922dab71d721c54fc7cd9f464bc1e3";
+ version = "0.0.6";
+ sha256 = "6b8845808481307e2d374fd8d17e82a5de1284e612cf8ade27db8785e9e12837";
libraryHaskellDepends = [ base binary bytestring ];
homepage = "http://code.haskell.org/~thielema/iff/";
description = "Constructing and dissecting IFF files";
@@ -103413,6 +103631,41 @@ self: {
license = "unknown";
}) {};
+ "imm_1_2_0_0" = callPackage
+ ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base
+ , blaze-html, blaze-markup, bytestring, case-insensitive
+ , chunked-data, comonad, conduit, conduit-combinators, connection
+ , containers, directory, dyre, fast-logger, filepath, free
+ , hashable, HaskellNet, HaskellNet-SSL, http-client
+ , http-client-tls, http-types, mime-mail, mono-traversable
+ , monoid-subclasses, network, opml-conduit, optparse-applicative
+ , rainbow, rainbox, rss-conduit, safe-exceptions, tagged, text
+ , time, timerep, tls, transformers, uri-bytestring, xml
+ , xml-conduit, xml-types
+ }:
+ mkDerivation {
+ pname = "imm";
+ version = "1.2.0.0";
+ sha256 = "29256d69fb797031bbcb2307d230e3a988491de604a9f76f5098b8fda1d2ecae";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson ansi-wl-pprint atom-conduit base blaze-html blaze-markup
+ bytestring case-insensitive chunked-data comonad conduit
+ conduit-combinators connection containers directory dyre
+ fast-logger filepath free hashable HaskellNet HaskellNet-SSL
+ http-client http-client-tls http-types mime-mail mono-traversable
+ monoid-subclasses network opml-conduit optparse-applicative rainbow
+ rainbox rss-conduit safe-exceptions tagged text time timerep tls
+ transformers uri-bytestring xml xml-conduit xml-types
+ ];
+ executableHaskellDepends = [ base free ];
+ homepage = "https://github.com/k0ral/imm";
+ description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"immortal" = callPackage
({ mkDerivation, base, lifted-base, monad-control, stm, tasty
, tasty-hunit, transformers, transformers-base
@@ -103632,6 +103885,7 @@ self: {
homepage = "http://www.nomyx.net";
description = "Imprevu support for Happstack";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"improve" = callPackage
@@ -104185,8 +104439,8 @@ self: {
}:
mkDerivation {
pname = "influxdb";
- version = "1.0.0";
- sha256 = "6b86e068856689490a006dcaeac1f47fc8deb3d678bd0ddd9dad7c78cff396ad";
+ version = "1.1.0";
+ sha256 = "3be3e60a8ac3b280f183e6ffad81a534556740de6b22784c47f1fb5c24817c2e";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -105033,15 +105287,15 @@ self: {
({ mkDerivation, array, base, containers, QuickCheck, utility-ht }:
mkDerivation {
pname = "interpolation";
- version = "0.1";
- sha256 = "cad3e655c9893007058dfd8b128195a15434f0759e447c78722fb50aa50337fa";
+ version = "0.1.0.1";
+ sha256 = "ac693e487d2097c6997d3bf82113deaac5562ec97bda692e69fc684f24982948";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base utility-ht ];
testHaskellDepends = [
array base containers QuickCheck utility-ht
];
- homepage = "http://code.haskell.org/~thielema/interpolation/";
+ homepage = "http://hub.darcs.net/thielema/interpolation/";
description = "piecewise linear and cubic Hermite interpolation";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -105107,20 +105361,21 @@ self: {
"intricacy" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
- , cryptohash, directory, filepath, hscurses, mtl, network-fancy
- , random, safe, SDL, SDL-gfx, SDL-mixer, SDL-ttf, stm, time
- , transformers, vector
+ , crypto-api, crypto-pubkey-types, cryptohash, directory, filepath
+ , hscurses, mtl, network-fancy, random, RSA, safe, SDL, SDL-gfx
+ , SDL-mixer, SDL-ttf, stm, time, transformers, vector
}:
mkDerivation {
pname = "intricacy";
- version = "0.6.2";
- sha256 = "dce6907980d4b3e9eace2e4e5f5192459992a365d12d2c22860ff1afe2ffb5c7";
+ version = "0.7";
+ sha256 = "0ec6a1cc5b37eca4a6d9794227d77f6d41c1eb30e2ad01981bc810aa53155237";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- array base binary bytestring containers cryptohash directory
- filepath hscurses mtl network-fancy random safe SDL SDL-gfx
- SDL-mixer SDL-ttf stm time transformers vector
+ array base binary bytestring containers crypto-api
+ crypto-pubkey-types cryptohash directory filepath hscurses mtl
+ network-fancy random RSA safe SDL SDL-gfx SDL-mixer SDL-ttf stm
+ time transformers vector
];
homepage = "http://mbays.freeshell.org/intricacy";
description = "A game of competitive puzzle-design";
@@ -105300,6 +105555,7 @@ self: {
libraryHaskellDepends = [ base HList invertible ];
description = "invertible functions and instances for HList";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"invertible-hxt" = callPackage
@@ -105455,10 +105711,8 @@ self: {
}:
mkDerivation {
pname = "io-streams";
- version = "1.3.6.0";
- sha256 = "5e2ae8363cc30d69687db98bfa6711ec53b3b104fcc1829c1e62d8de3d249e3d";
- revision = "1";
- editedCabalFile = "2e5ea27945eb6c0f4260a482cc77c6ebebdf160cd00fa86130f4d31342fa994f";
+ version = "1.3.6.1";
+ sha256 = "28dcd4abc4b132aa4689c2f9c455ca6777b792f1ffef682576e0978793c83628";
configureFlags = [ "-fnointeractivetests" ];
libraryHaskellDepends = [
attoparsec base bytestring bytestring-builder network primitive
@@ -105958,18 +106212,18 @@ self: {
}) {};
"irc-dcc" = callPackage
- ({ mkDerivation, attoparsec, base, binary, bytestring, errors
+ ({ mkDerivation, attoparsec, base, binary, bytestring
, hspec-attoparsec, io-streams, iproute, irc-ctcp, mtl, network
, path, safe-exceptions, tasty, tasty-hspec, tasty-quickcheck
, transformers, utf8-string
}:
mkDerivation {
pname = "irc-dcc";
- version = "2.0.0";
- sha256 = "af21bb0929ead7439e0d45ce4db1c35799949d91c8dd8f25f048826498483115";
+ version = "2.0.1";
+ sha256 = "6408a28733743d3463664677c5e3ad72e46c168799dad458988067039f25d2df";
libraryHaskellDepends = [
- attoparsec base binary bytestring errors io-streams iproute
- irc-ctcp mtl network path safe-exceptions transformers utf8-string
+ attoparsec base binary bytestring io-streams iproute irc-ctcp mtl
+ network path safe-exceptions transformers utf8-string
];
testHaskellDepends = [
base bytestring hspec-attoparsec iproute network path tasty
@@ -106263,6 +106517,8 @@ self: {
pname = "iso3166-country-codes";
version = "0.20140203.8";
sha256 = "b4d6e01cd61bcaef9a8e455c331a8e7a2298531cb587ef6f23675eae7a6b0a36";
+ revision = "1";
+ editedCabalFile = "ee03b7547119da3be9afb040b2e93d06ad65d63c3bc401044d1c443c77bd0158";
libraryHaskellDepends = [ base ];
description = "A datatype for ISO 3166 country codes";
license = "LGPL";
@@ -106675,8 +106931,8 @@ self: {
pname = "ivory-backend-c";
version = "0.1.0.5";
sha256 = "e07d69634f6b50145f51886b87b7556bd6eb01e21bcd6476f849071a1120e535";
- revision = "1";
- editedCabalFile = "d628f3ab8d4d61816af6f9ff9fb34bf8cbcf28d2ff75246aa86303a59c457d1a";
+ revision = "3";
+ editedCabalFile = "896caeaf7836e16c1e75400cb0d4be531cfdf5bac4c87740c54319b9964c2027";
libraryHaskellDepends = [
base base-compat bytestring containers directory filepath ivory
ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib
@@ -106772,6 +107028,8 @@ self: {
pname = "ivory-opts";
version = "0.1.0.5";
sha256 = "36bbf696b1f711885a2493233d09a304686572ff32d0e7e8f30c0a8ebc139340";
+ revision = "1";
+ editedCabalFile = "f64e49dfa4b60729864f1a33acfb53df1465c19b200a92786537d4cf6f96c1d6";
libraryHaskellDepends = [
base base-compat containers data-reify dlist fgl filepath ivory
monadLib pretty
@@ -107289,8 +107547,8 @@ self: {
({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }:
mkDerivation {
pname = "javascript-extras";
- version = "0.2.0.0";
- sha256 = "28a191b67d0047a34d1d1f7dc8c8ad03abe725a9a75319746b9eecfbf1cb96e1";
+ version = "0.2.0.2";
+ sha256 = "45075e3abfe658311f209110701c02fa57dddd36b1df9405cb7ae5abdb3d6c83";
libraryHaskellDepends = [
base deepseq ghcjs-base-stub parallel text
];
@@ -107734,6 +107992,21 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "js-jquery_3_2_1" = callPackage
+ ({ mkDerivation, base, HTTP }:
+ mkDerivation {
+ pname = "js-jquery";
+ version = "3.2.1";
+ sha256 = "60503d82d0a601291cf0aa495edecbdb749dcf8982502bf18b9a886979ac1e0f";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base HTTP ];
+ doCheck = false;
+ homepage = "https://github.com/ndmitchell/js-jquery#readme";
+ description = "Obtain minified jQuery code";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"jsaddle" = callPackage
({ mkDerivation, aeson, attoparsec, base, base64-bytestring
, bytestring, containers, deepseq, filepath, ghc-prim, http-types
@@ -108387,8 +108660,8 @@ self: {
pname = "json-schema";
version = "0.7.4.1";
sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96";
- revision = "6";
- editedCabalFile = "b6211ab8989ce7d576cac285b7d17f2e50ee79139545e2e84b2dd319904360b2";
+ revision = "7";
+ editedCabalFile = "c3b107899b4297971b6b2cb913b3ace26f6d847844c6a7a6b6fe9f8dc2a9a6f7";
libraryHaskellDepends = [
aeson base containers generic-aeson generic-deriving mtl scientific
text time unordered-containers vector
@@ -108563,6 +108836,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "jsonextfilter" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+ , monads-tf, optparse-applicative, process, scientific, string-qq
+ , text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "jsonextfilter";
+ version = "0.1.0.0";
+ sha256 = "6c2dc674133e3a6304a0803c3e823d1210b50cd4d1c711b1182f767addc0a156";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson attoparsec base bytestring containers monads-tf
+ optparse-applicative process scientific string-qq text
+ unordered-containers vector
+ ];
+ homepage = "https://github.com/mackeyrms/jsonextfilter#readme";
+ description = "Filter select values in JSON objects to unix programs";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"jsonresume" = callPackage
({ mkDerivation, aeson, base, bytestring, old-locale, text, time
, unordered-containers
@@ -108666,6 +108960,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "jsonxlsx" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+ , HUnit, old-time, optparse-applicative, scientific, string-qq
+ , text, time, unordered-containers, vector, xlsx
+ }:
+ mkDerivation {
+ pname = "jsonxlsx";
+ version = "0.1.0.1";
+ sha256 = "4778267befeec6c792da44faa7e81b4c7649f8f2983501fea523d7c4e1f9c460";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson attoparsec base bytestring containers HUnit old-time
+ optparse-applicative scientific string-qq text time
+ unordered-containers vector xlsx
+ ];
+ homepage = "https://github.com/mackeyrms/jsonxlsx#readme";
+ description = "json to xlsx converter";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"jspath" = callPackage
({ mkDerivation, base, bytestring, bytestring-trie, JSONb
, utf8-string
@@ -108729,8 +109045,8 @@ self: {
}:
mkDerivation {
pname = "juicy-gcode";
- version = "0.1.0.2";
- sha256 = "6088c4602591b4f9b94e17ef42a6fada27abacb1e2ddd3a666848020d3b0ca0b";
+ version = "0.1.0.3";
+ sha256 = "fbef1579a9561b62b308e5f172cee2dc4d11e7b5fb6e51fae7c1721bd60eeb33";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -110359,8 +110675,8 @@ self: {
}:
mkDerivation {
pname = "knead";
- version = "0.2.0.1";
- sha256 = "767515c8db0abff908d927354a027cb4f2cac929cb768302ba3900c050ad945c";
+ version = "0.2.1";
+ sha256 = "0aa766ebd9b72370dd18b1f7e3bef2d67c6575b36d9f47467ab54997bfe88f0d";
libraryHaskellDepends = [
base llvm-extra llvm-tf storable-record storable-tuple transformers
utility-ht
@@ -111786,6 +112102,8 @@ self: {
pname = "language-c-quote";
version = "0.11.7.3";
sha256 = "8e1bdc55d7c146e3d58feba03388f679933a8e033aaf15087e73d4d45e344152";
+ revision = "1";
+ editedCabalFile = "33b48f16c0cb1e3476c76828c61c9faed896f1bba16336903bd2bafbae94145c";
libraryHaskellDepends = [
array base bytestring containers exception-mtl
exception-transformers filepath haskell-src-meta mainland-pretty
@@ -112331,8 +112649,8 @@ self: {
}:
mkDerivation {
pname = "language-puppet";
- version = "1.3.6";
- sha256 = "25acf7b9449999beb8b65c8f594c51171f94b074fb5a5228ce267f96f50d2be2";
+ version = "1.3.7";
+ sha256 = "9b549422aed7b8a4b0d1fb1ed62e8648d2b16646c29d3736aeef1008035955ee";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -112361,50 +112679,6 @@ self: {
hydraPlatforms = [ "x86_64-linux" ];
}) {};
- "language-puppet_1_3_7" = callPackage
- ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
- , base16-bytestring, bytestring, case-insensitive, containers
- , cryptonite, directory, either, exceptions, filecache, formatting
- , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec
- , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec
- , memory, mtl, operational, optparse-applicative, parallel-io
- , parsec, pcre-utils, process, random, regex-pcre-builtin
- , scientific, semigroups, servant, servant-client, split, stm
- , strict-base-types, temporary, text, time, transformers, unix
- , unordered-containers, vector, yaml
- }:
- mkDerivation {
- pname = "language-puppet";
- version = "1.3.7";
- sha256 = "9b549422aed7b8a4b0d1fb1ed62e8648d2b16646c29d3736aeef1008035955ee";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
- case-insensitive containers cryptonite directory either exceptions
- filecache formatting hashable hruby hslogger hspec http-api-data
- http-client lens lens-aeson megaparsec memory mtl operational
- parsec pcre-utils process random regex-pcre-builtin scientific
- semigroups servant servant-client split stm strict-base-types text
- time transformers unix unordered-containers vector yaml
- ];
- executableHaskellDepends = [
- aeson base bytestring containers Glob hslogger http-client lens
- megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin
- servant-client strict-base-types text transformers
- unordered-containers vector yaml
- ];
- testHaskellDepends = [
- ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens
- megaparsec mtl scientific strict-base-types temporary text
- transformers unix unordered-containers vector
- ];
- homepage = "http://lpuppet.banquise.net/";
- description = "Tools to parse and evaluate the Puppet DSL";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"language-python" = callPackage
({ mkDerivation, alex, array, base, containers, happy, monads-tf
, pretty, transformers, utf8-string
@@ -112420,6 +112694,7 @@ self: {
homepage = "http://github.com/bjpop/language-python";
description = "Parsing and pretty printing of Python code";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"language-python-colour" = callPackage
@@ -112451,6 +112726,7 @@ self: {
homepage = "http://github.com/bjpop/language-python-test";
description = "testing code for the language-python library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"language-qux" = callPackage
@@ -112612,8 +112888,8 @@ self: {
}:
mkDerivation {
pname = "large-hashable";
- version = "0.1.0.3";
- sha256 = "ece9da94f91dfb97f3507035f280fe89a9bed50cf1071aae1afbd5d288682d89";
+ version = "0.1.0.4";
+ sha256 = "e9c3345d9fa0161f1b809f2c57e00b4c687ebd48ea42623fe480cc85339a628e";
libraryHaskellDepends = [
aeson base base16-bytestring bytes bytestring containers scientific
strict template-haskell text time transformers unordered-containers
@@ -112909,6 +113185,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "layout-rules" = callPackage
+ ({ mkDerivation, alex-tools, base, text }:
+ mkDerivation {
+ pname = "layout-rules";
+ version = "0.1.0.1";
+ sha256 = "b00a77aec2f4d8dcd71b29b5c399a7668158ae7bc05d1c7fb09e414ec3354934";
+ libraryHaskellDepends = [ alex-tools base text ];
+ homepage = "https://github.com/elliottt/layout-rules";
+ description = "A collection of different layout implementations";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"lazy-csv" = callPackage
({ mkDerivation, base, bytestring }:
mkDerivation {
@@ -113345,19 +113633,19 @@ self: {
"legion" = callPackage
({ mkDerivation, aeson, base, binary, binary-conduit, bytestring
, canteven-http, conduit, conduit-extra, containers
- , data-default-class, data-dword, directory, exceptions, http-types
+ , data-default-class, data-dword, exceptions, http-types
, monad-logger, network, Ranged-sets, scotty, scotty-resource, text
, time, transformers, unix, uuid, wai, wai-extra, warp
}:
mkDerivation {
pname = "legion";
- version = "0.9.0.1";
- sha256 = "413e8097861e841555335c0c0027eb4291a6aead9bf41d8799d7626a0d9890bd";
+ version = "0.9.0.2";
+ sha256 = "784005d0ca6875192b9837ea169b4b768e0fd34881f913809c2e7310044191eb";
libraryHaskellDepends = [
aeson base binary binary-conduit bytestring canteven-http conduit
- conduit-extra containers data-default-class data-dword directory
- exceptions http-types monad-logger network Ranged-sets scotty
- scotty-resource text time transformers unix uuid wai wai-extra warp
+ conduit-extra containers data-default-class data-dword exceptions
+ http-types monad-logger network Ranged-sets scotty scotty-resource
+ text time transformers unix uuid wai wai-extra warp
];
homepage = "https://github.com/owensmurray/legion#readme";
description = "Distributed, stateful, homogeneous microservice framework";
@@ -113374,8 +113662,8 @@ self: {
}:
mkDerivation {
pname = "legion-discovery";
- version = "0.3.0.2";
- sha256 = "4e9b4ece222d4cc3eb0a0f14bfba1b0f9f2a517d3471d9f61936faf953f74191";
+ version = "1.0.0.0";
+ sha256 = "7be93501fda9e9f37fbd90db3692ea1bf36069b1bb80f34f6663e339f3104854";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -113419,8 +113707,8 @@ self: {
}:
mkDerivation {
pname = "legion-extra";
- version = "0.1.2.0";
- sha256 = "20619c18f0b4155fdef8a358338a987e41bc0ae3081990cdfcf3354cc4c67bec";
+ version = "0.1.2.1";
+ sha256 = "696c33bc6dd19dbc6320a637359675bfc3090b9ad05d92fd356b4242f8832519";
libraryHaskellDepends = [
aeson attoparsec base binary bytestring canteven-log conduit
containers data-default-class data-dword directory legion network
@@ -113876,10 +114164,8 @@ self: {
({ mkDerivation, base, base-unicode-symbols, transformers }:
mkDerivation {
pname = "lenz";
- version = "0.1";
- sha256 = "98b3aef14ca16218ecd6643812e9df5dde5c60af6e2f56f98ec523ecc0917397";
- revision = "1";
- editedCabalFile = "48a9254ce289eedf5db423844732c4b5a42798d94b3c2e82b4b9770f87c97f07";
+ version = "0.1.2.1";
+ sha256 = "086dc7dd29cdc7f8166f2248bd9cebbfe0f926ec5f6a6d99e6ac81cfe62b1215";
libraryHaskellDepends = [ base base-unicode-symbols transformers ];
description = "Van Laarhoven lenses";
license = "unknown";
@@ -114419,8 +114705,8 @@ self: {
}:
mkDerivation {
pname = "liblawless";
- version = "0.18.3";
- sha256 = "55b460995913b582f3f4df876bb9877598e7b8b27bae49fa1a2a4af4b08645d3";
+ version = "0.19.1";
+ sha256 = "e2d5e56b411098adcd139d6aae5f9226f8951b0a932af8cbfa178ffa626f326c";
libraryHaskellDepends = [
aeson base base-unicode-symbols binary boomerang bytestring
concurrent-machines containers containers-unicode-symbols
@@ -116563,8 +116849,8 @@ self: {
}:
mkDerivation {
pname = "llvm-extra";
- version = "0.7.0.1";
- sha256 = "4928e405deff09451edce864558ce7b3276549ca7f1d71dac118dcbcafe15573";
+ version = "0.7.1";
+ sha256 = "02b54ca12c6dbcb24589bbc93819a4857f169b811e15a6d00d05b7e42f1f6505";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -116686,6 +116972,54 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "llvm-hs" = callPackage
+ ({ mkDerivation, array, base, bytestring, Cabal, containers
+ , llvm-config, llvm-hs-pure, mtl, parsec, pretty-show, QuickCheck
+ , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary
+ , transformers, transformers-compat, utf8-string
+ }:
+ mkDerivation {
+ pname = "llvm-hs";
+ version = "4.0.0.0";
+ sha256 = "9f67758f1a0f73d9f1182251f0ded41cf9bd82382aa7b767d0b7ed6ee46c93b5";
+ setupHaskellDepends = [ base Cabal containers ];
+ libraryHaskellDepends = [
+ array base bytestring containers llvm-hs-pure mtl parsec
+ template-haskell transformers transformers-compat utf8-string
+ ];
+ libraryToolDepends = [ llvm-config ];
+ testHaskellDepends = [
+ base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck
+ tasty tasty-hunit tasty-quickcheck temporary transformers
+ transformers-compat
+ ];
+ homepage = "http://github.com/llvm-hs/llvm-hs/";
+ description = "General purpose LLVM bindings";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {llvm-config = null;};
+
+ "llvm-hs-pure" = callPackage
+ ({ mkDerivation, base, containers, mtl, parsec, tasty, tasty-hunit
+ , template-haskell, transformers, transformers-compat
+ }:
+ mkDerivation {
+ pname = "llvm-hs-pure";
+ version = "4.0.0.0";
+ sha256 = "7452314aac955bd9afb4e93df2fc235788d069b18b16872878681cf91d0639fd";
+ libraryHaskellDepends = [
+ base containers mtl parsec template-haskell transformers
+ transformers-compat
+ ];
+ testHaskellDepends = [
+ base containers mtl tasty tasty-hunit transformers
+ transformers-compat
+ ];
+ homepage = "http://github.com/llvm-hs/llvm-hs/";
+ description = "Pure Haskell LLVM functionality (no FFI)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"llvm-ht" = callPackage
({ mkDerivation, base, bytestring, directory, mtl, process
, type-level
@@ -116763,8 +117097,8 @@ self: {
}:
mkDerivation {
pname = "llvm-tf";
- version = "3.1.0.1";
- sha256 = "5aa4e2e733b442de88096ba0eaa7fe92e52a1e61601c423d4fbb4dc44355e2e5";
+ version = "3.1.0.2";
+ sha256 = "566a16989cdb64a87a78287341aa71379db88c6072683219c2853dff2afabf98";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -117146,25 +117480,6 @@ self: {
}) {};
"log-base" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
- , exceptions, monad-control, monad-time, mtl, semigroups, stm, text
- , time, transformers-base, unordered-containers
- }:
- mkDerivation {
- pname = "log-base";
- version = "0.7";
- sha256 = "ba961838e19cccb5d84a052ba75acbd7320119dda482a4fa230346743c8a8c07";
- libraryHaskellDepends = [
- aeson aeson-pretty base bytestring deepseq exceptions monad-control
- monad-time mtl semigroups stm text time transformers-base
- unordered-containers
- ];
- homepage = "https://github.com/scrive/log";
- description = "Structured logging solution (base package)";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "log-base_0_7_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
, exceptions, monad-control, monad-time, mtl, semigroups, stm, text
, time, transformers-base, unordered-containers
@@ -117181,7 +117496,6 @@ self: {
homepage = "https://github.com/scrive/log";
description = "Structured logging solution (base package)";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"log-domain" = callPackage
@@ -119118,8 +119432,8 @@ self: {
}:
mkDerivation {
pname = "mackerel-client";
- version = "0.0.3";
- sha256 = "aaa47cb30b2e727602de95d600446aba6094854bd772ac5be945b86cedbbc269";
+ version = "0.0.4";
+ sha256 = "2f63c376f93d771a8ac9fbd531cf4ad208459423bd3cc2a9cddb44ae0e9724d0";
libraryHaskellDepends = [
aeson base bytestring data-default directory filepath htoml
http-client http-client-tls http-types parsec split text
@@ -119180,24 +119494,25 @@ self: {
}) {};
"madlang" = callPackage
- ({ mkDerivation, ansi-wl-pprint, base, containers, hspec
+ ({ mkDerivation, ansi-wl-pprint, base, containers, criterion, hspec
, hspec-megaparsec, lens, megaparsec, mtl, mwc-random
- , optparse-applicative, text
+ , optparse-applicative, text, tibetan-utils
}:
mkDerivation {
pname = "madlang";
- version = "2.0.0.1";
- sha256 = "c7723b24bb564f3a5b4a3ab5641a4264005476bf59d19d91ee074c92f5ee62bf";
+ version = "2.0.1.1";
+ sha256 = "f58b9a47a8f213c030ffbee9c8b2ed71443b32b832eaa761fd06ac3c37a0dccb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-wl-pprint base containers lens megaparsec mtl mwc-random
- optparse-applicative text
+ optparse-applicative text tibetan-utils
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
base hspec hspec-megaparsec megaparsec mtl text
];
+ benchmarkHaskellDepends = [ base criterion megaparsec text ];
homepage = "https://github.com/vmchale/madlang#readme";
description = "Randomized templating language DSL";
license = stdenv.lib.licenses.bsd3;
@@ -120670,27 +120985,6 @@ self: {
}) {eng = null; mat = null; mx = null;};
"matplotlib" = callPackage
- ({ mkDerivation, ad, aeson, base, bytestring, containers, process
- , random, raw-strings-qq, split, tasty, tasty-expected-failure
- , tasty-golden, tasty-hunit, temporary
- }:
- mkDerivation {
- pname = "matplotlib";
- version = "0.4.1";
- sha256 = "7a0d0ac10ff394c8ee4a673dbc6454cb5218c9189d9312a4c4af64efe255b97b";
- libraryHaskellDepends = [
- aeson base bytestring containers process temporary
- ];
- testHaskellDepends = [
- ad base bytestring process random raw-strings-qq split tasty
- tasty-expected-failure tasty-golden tasty-hunit temporary
- ];
- homepage = "https://github.com/abarbu/matplotlib-haskell";
- description = "Bindings to Matplotlib; a Python plotting library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "matplotlib_0_4_3" = callPackage
({ mkDerivation, ad, aeson, base, bytestring, containers, process
, random, raw-strings-qq, split, tasty, tasty-expected-failure
, tasty-golden, tasty-hunit, temporary
@@ -120965,6 +121259,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "mbox-utility" = callPackage
+ ({ mkDerivation, base, bytestring, hsemail, non-empty, old-time
+ , parsec, spreadsheet, utility-ht
+ }:
+ mkDerivation {
+ pname = "mbox-utility";
+ version = "0.0";
+ sha256 = "b17881a3674b55bf361c3ae7e6164a2106087900e665f44c8d55371078c2cb39";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring hsemail non-empty old-time parsec spreadsheet
+ utility-ht
+ ];
+ description = "List contents of an mbox file containing e-mails";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"mcm" = callPackage
({ mkDerivation, base, blaze-html, bytestring, containers
, directory, filepath, hostname, MissingH, polyparse, process, text
@@ -121276,6 +121588,7 @@ self: {
homepage = "https://github.com/lindenbaum/mediabus-fdk-aac";
description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {fdk-aac = null;};
"mediabus-rtp" = callPackage
@@ -121765,21 +122078,6 @@ self: {
}) {};
"memory" = callPackage
- ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty
- , tasty-hunit, tasty-quickcheck
- }:
- mkDerivation {
- pname = "memory";
- version = "0.14.1";
- sha256 = "1cd87a34ca28ab5fbb9fbeb82f66cdbabf4e276e10caf7a64b798bf42edc0825";
- libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
- testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
- homepage = "https://github.com/vincenthz/hs-memory";
- description = "memory and related abstraction stuff";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "memory_0_14_2" = callPackage
({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty
, tasty-hunit, tasty-quickcheck
}:
@@ -121792,7 +122090,6 @@ self: {
homepage = "https://github.com/vincenthz/hs-memory";
description = "memory and related abstraction stuff";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"memorypool" = callPackage
@@ -122475,8 +122772,8 @@ self: {
}:
mkDerivation {
pname = "midi-music-box";
- version = "0.0.0.1";
- sha256 = "1e830c1f871cbf8f5b478c5923d52f76457b15eda2d64a4bf9e6c2016ed47de9";
+ version = "0.0.0.3";
+ sha256 = "e698cefeee56bc3561376a6dfab990e0a48388938d80fb3410ed017f6b4ae141";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -123172,18 +123469,6 @@ self: {
}) {};
"mintty" = callPackage
- ({ mkDerivation, base }:
- mkDerivation {
- pname = "mintty";
- version = "0.1";
- sha256 = "956b346c89b12e683b957bf45eb0d09cae121fd247916de0386687f713ca0865";
- libraryHaskellDepends = [ base ];
- homepage = "https://github.com/RyanGlScott/mintty";
- description = "A reliable way to detect the presence of a MinTTY console on Windows";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "mintty_0_1_1" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "mintty";
@@ -123193,7 +123478,6 @@ self: {
homepage = "https://github.com/RyanGlScott/mintty";
description = "A reliable way to detect the presence of a MinTTY console on Windows";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"mios" = callPackage
@@ -123406,6 +123690,8 @@ self: {
pname = "mmorph";
version = "1.0.9";
sha256 = "e1f27d3881b254e2a87ffb21f33e332404abb180361f9d29092a85e321554563";
+ revision = "1";
+ editedCabalFile = "4dd6d1966746918b7503dafa8b78b75df2245406baa083858e1a2310313aaef7";
libraryHaskellDepends = [
base mtl transformers transformers-compat
];
@@ -123413,6 +123699,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "mmtf" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, data-msgpack
+ , hspec, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "mmtf";
+ version = "0.1.0.1";
+ sha256 = "29404fe3eff386a044f1c750eadc80b98b51d377020a27b8c253a285cdf61080";
+ libraryHaskellDepends = [
+ base binary bytestring containers data-msgpack text
+ ];
+ testHaskellDepends = [ base bytestring hspec QuickCheck ];
+ homepage = "https://github.com/zmactep/mmtf#readme";
+ description = "Macromolecular Transmission Format implementation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mmtl" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -123513,8 +123817,10 @@ self: {
}:
mkDerivation {
pname = "model";
- version = "0.2.1";
- sha256 = "0da6c98beffd1767fa5bbee92de5ff444402899a4855b193f83511309afeb96d";
+ version = "0.2.4";
+ sha256 = "9ff1ea0de33416c070d47cc3aaf565818f01006cc61e5b822a966862b7a12d0b";
+ revision = "1";
+ editedCabalFile = "ab32dfd91043557c42073acf6e9687c849fab77564358e09cf2e5bf654f5d3d4";
libraryHaskellDepends = [
base containers deepseq ListLike pretty transformers
];
@@ -123910,6 +124216,7 @@ self: {
homepage = "https://github.com/edwardgeorge/monad-classes-logging#readme";
description = "monad-classes based typeclass for Ollie's logging-effect LoggingT";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"monad-codec" = callPackage
@@ -124175,8 +124482,8 @@ self: {
}:
mkDerivation {
pname = "monad-logger";
- version = "0.3.20.2";
- sha256 = "1f004999b282b3895cc0904053befb48b863efc2899a89e93195b4544cc9c737";
+ version = "0.3.21";
+ sha256 = "878d41b5a15e08817e0ad8675ea2f1e012747027f773df7a319e05f47828e53c";
libraryHaskellDepends = [
base blaze-builder bytestring conduit conduit-extra exceptions
fast-logger lifted-base monad-control monad-loops mtl resourcet stm
@@ -124188,7 +124495,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "monad-logger_0_3_21" = callPackage
+ "monad-logger_0_3_22" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, conduit
, conduit-extra, exceptions, fast-logger, lifted-base
, monad-control, monad-loops, mtl, resourcet, stm, stm-chans
@@ -124197,8 +124504,8 @@ self: {
}:
mkDerivation {
pname = "monad-logger";
- version = "0.3.21";
- sha256 = "878d41b5a15e08817e0ad8675ea2f1e012747027f773df7a319e05f47828e53c";
+ version = "0.3.22";
+ sha256 = "997152368c9200cff7547cc2037ed4f2b34e6e56de97d1aaac6b5a888a9b01e6";
libraryHaskellDepends = [
base blaze-builder bytestring conduit conduit-extra exceptions
fast-logger lifted-base monad-control monad-loops mtl resourcet stm
@@ -124542,18 +124849,6 @@ self: {
}) {};
"monad-skeleton" = callPackage
- ({ mkDerivation, base }:
- mkDerivation {
- pname = "monad-skeleton";
- version = "0.1.3";
- sha256 = "4de3aee29408f98fe0f3dc6161d98e13a5292a67b23cb80e7f1875eead7d8a40";
- libraryHaskellDepends = [ base ];
- homepage = "https://github.com/fumieval/monad-skeleton";
- description = "Monads of program skeleta";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "monad-skeleton_0_1_3_2" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "monad-skeleton";
@@ -124563,7 +124858,6 @@ self: {
homepage = "https://github.com/fumieval/monad-skeleton";
description = "Monads of program skeleta";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"monad-st" = callPackage
@@ -125889,6 +126183,36 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "mqtt" = callPackage
+ ({ mkDerivation, async, attoparsec, base, binary, bytestring
+ , case-insensitive, clock, containers, criterion, deepseq
+ , exceptions, hslogger, network-uri, random, socket, tasty
+ , tasty-hunit, tasty-quickcheck, text, tls, uuid, websockets, x509
+ , x509-validation
+ }:
+ mkDerivation {
+ pname = "mqtt";
+ version = "0.1.1.0";
+ sha256 = "7b6dbb9ebd768f208c78b270086abbbfb9543a3735e8c2e9671900ff6ba8e432";
+ libraryHaskellDepends = [
+ async attoparsec base binary bytestring case-insensitive clock
+ containers hslogger socket text tls uuid websockets x509
+ x509-validation
+ ];
+ testHaskellDepends = [
+ async attoparsec base binary bytestring containers deepseq
+ exceptions network-uri random tasty tasty-hunit tasty-quickcheck
+ text tls uuid
+ ];
+ benchmarkHaskellDepends = [
+ base binary bytestring criterion text
+ ];
+ homepage = "https://github.com/lpeterse/haskell-mqtt";
+ description = "An MQTT protocol implementation";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mqtt-hs" = callPackage
({ mkDerivation, async, attoparsec, base, bytestring, monad-loops
, mtl, network, singletons, stm, text, transformers
@@ -128668,22 +128992,23 @@ self: {
}) {};
"nested-routes" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, composition-extra
- , errors, exceptions, hashable, hashtables, HSet, hspec, hspec-wai
- , http-types, mtl, poly-arity, pred-set, pred-trie, regex-compat
- , semigroups, tasty, tasty-hspec, text, transformers, tries
- , unordered-containers, wai-middleware-content-type
- , wai-middleware-verbs, wai-transformers
+ ({ mkDerivation, attoparsec, base, bifunctors, bytestring
+ , composition-extra, errors, exceptions, hashable, hashtables, HSet
+ , hspec, hspec-wai, http-types, mtl, poly-arity, pred-set
+ , pred-trie, regex-compat, semigroups, tasty, tasty-hspec, text
+ , transformers, tries, unordered-containers
+ , wai-middleware-content-type, wai-middleware-verbs
+ , wai-transformers
}:
mkDerivation {
pname = "nested-routes";
- version = "7.2.2";
- sha256 = "f93d56283b2855aee02daac7ecd693a2b9f7e99a5da33211694a5a5746c35cd9";
+ version = "8.0.0";
+ sha256 = "ad7c65559f6324f533f9c58607b46651253759f390815802c1cff2e02c01805f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- attoparsec base bytestring composition-extra errors exceptions
- hashable hashtables mtl poly-arity pred-set pred-trie regex-compat
+ attoparsec base bifunctors bytestring errors exceptions hashable
+ hashtables mtl poly-arity pred-set pred-trie regex-compat
semigroups text transformers tries unordered-containers
wai-middleware-content-type wai-middleware-verbs wai-transformers
];
@@ -130797,6 +131122,7 @@ self: {
homepage = "http://www.nomyx.net";
description = "REST API for Nomyx";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"nomyx-core" = callPackage
@@ -130825,6 +131151,7 @@ self: {
homepage = "http://www.nomyx.net";
description = "A Nomic game in haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"nomyx-language" = callPackage
@@ -130844,6 +131171,7 @@ self: {
homepage = "http://www.nomyx.net";
description = "Language to express rules for Nomic";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"nomyx-library" = callPackage
@@ -130861,6 +131189,7 @@ self: {
homepage = "http://www.nomyx.net";
description = "Library of rules for Nomyx";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"nomyx-server" = callPackage
@@ -130883,6 +131212,7 @@ self: {
homepage = "http://www.nomyx.net";
description = "A Nomic game in haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"nomyx-web" = callPackage
@@ -132229,8 +132559,10 @@ self: {
}:
mkDerivation {
pname = "oeis";
- version = "0.3.8";
- sha256 = "4be72f80596045a51e56f8d810b5a044689f117b38a614bd9645e97dd3e39c93";
+ version = "0.3.9";
+ sha256 = "8a692c0b898f5d89e607f9593697a24827981a1cfee53045c192084015061b8e";
+ revision = "1";
+ editedCabalFile = "524984744830f3a5d6709b9fe20faab0f27de42be3daaf7854c82bbaf0a06665";
libraryHaskellDepends = [ base HTTP network network-uri ];
testHaskellDepends = [
base HUnit test-framework test-framework-hunit
@@ -133833,6 +134165,7 @@ self: {
homepage = "https://github.com/nikita-volkov/optparse-applicative-simple";
description = "Simple command line interface arguments parser";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"optparse-declarative" = callPackage
@@ -134178,8 +134511,8 @@ self: {
}:
mkDerivation {
pname = "orgstat";
- version = "0.0.2";
- sha256 = "7187c2118b82f48f25306315160b3483e05a7638df53e5167fc519b8f8e4ff8d";
+ version = "0.0.3";
+ sha256 = "28f2e870e547e0e2a452cadbd509aef6e054dee9e57f96c859383b7776b3b8b3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -134851,8 +135184,8 @@ self: {
pname = "pandoc";
version = "1.19.2.1";
sha256 = "08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801";
- revision = "1";
- editedCabalFile = "0ba3a65619868f044f48fcad137a2d3564ef1f07daf022f3e147248c1eed3bfa";
+ revision = "2";
+ editedCabalFile = "5dc6d0e5637a60e185b91d0540ba0c729ff9413bb852abd94fe9ac19fa3f1227";
configureFlags = [ "-fhttps" "-f-trypandoc" ];
isLibrary = true;
isExecutable = true;
@@ -135121,8 +135454,8 @@ self: {
pname = "pandoc-types";
version = "1.17.0.5";
sha256 = "c8825588b587ff5ed0c105156a11a43f3b752279997231cfc13102809bbc51b3";
- revision = "1";
- editedCabalFile = "f6238d666c941d4eb5c80c195a9df9cb4d6579281b648dbecd2aad84aaf0e949";
+ revision = "2";
+ editedCabalFile = "7a12dacfadc507c1e7992acdceeba8a1a12ca682724dd1cc4faefaf985b8c2ea";
libraryHaskellDepends = [
aeson base bytestring containers deepseq ghc-prim QuickCheck syb
];
@@ -136583,19 +136916,21 @@ self: {
"patch-image" = callPackage
({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda
, accelerate-cufft, accelerate-fourier, accelerate-io
- , accelerate-utility, base, Cabal, filepath, gnuplot, hmatrix
- , JuicyPixels, utility-ht, vector
+ , accelerate-utility, array, base, Cabal, carray, containers
+ , enumset, fft, filepath, gnuplot, hmatrix, JuicyPixels, knead
+ , llvm-extra, llvm-tf, pqueue, tfp, utility-ht, vector
}:
mkDerivation {
pname = "patch-image";
- version = "0.1.0.2";
- sha256 = "5dfe265b69765a8a9e2ef550da10a6a65c56fde23ad2124046bafe2c2ec95e35";
+ version = "0.2";
+ sha256 = "23517289417a46873182c45091da803df80942758b38dca89303c0d066546450";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
accelerate accelerate-arithmetic accelerate-cuda accelerate-cufft
- accelerate-fourier accelerate-io accelerate-utility base Cabal
- filepath gnuplot hmatrix JuicyPixels utility-ht vector
+ accelerate-fourier accelerate-io accelerate-utility array base
+ Cabal carray containers enumset fft filepath gnuplot hmatrix
+ JuicyPixels knead llvm-extra llvm-tf pqueue tfp utility-ht vector
];
homepage = "http://hub.darcs.net/thielema/patch-image/";
description = "Compose a big image from overlapping parts";
@@ -136624,27 +136959,6 @@ self: {
}) {};
"path" = callPackage
- ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
- , filepath, hashable, hspec, HUnit, mtl, QuickCheck
- , template-haskell
- }:
- mkDerivation {
- pname = "path";
- version = "0.5.12";
- sha256 = "52f0dae7e3d72d26fa62ff55de65b6697744dd0c5b96f48625cb00df1cf1055d";
- revision = "2";
- editedCabalFile = "b4b398831f283efea1eb8dd53cb41ddf0c0fe25eab8b809f82f463a7d72496b9";
- libraryHaskellDepends = [
- aeson base deepseq exceptions filepath hashable template-haskell
- ];
- testHaskellDepends = [
- aeson base bytestring filepath hspec HUnit mtl QuickCheck
- ];
- description = "Support for well-typed paths";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "path_0_5_13" = callPackage
({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
, filepath, hashable, hspec, mtl, template-haskell
}:
@@ -136658,7 +136972,6 @@ self: {
testHaskellDepends = [ aeson base bytestring filepath hspec mtl ];
description = "Support for well-typed paths";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"path-extra" = callPackage
@@ -136909,6 +137222,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "pb-next" = callPackage
+ ({ mkDerivation, base, data-default, either, optparse-applicative
+ , parsec, tasty, tasty-hunit, text, transformers
+ }:
+ mkDerivation {
+ pname = "pb-next";
+ version = "0.1.0.0";
+ sha256 = "0c62eb075cdef80c0393162925369476fe6469d8a252cd0c298c5f05fb6ba3aa";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base either parsec text transformers ];
+ executableHaskellDepends = [
+ base data-default either optparse-applicative text
+ ];
+ testHaskellDepends = [ base parsec tasty tasty-hunit ];
+ homepage = "https://github.com/githubuser/pb-next#readme";
+ description = "Utility CLI for working with protobuf files";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"pbc4hs" = callPackage
({ mkDerivation, base, hslua, string-qq }:
mkDerivation {
@@ -138540,8 +138873,8 @@ self: {
}:
mkDerivation {
pname = "phash";
- version = "0.0.5";
- sha256 = "7b199d520b4b08562532ab968853c701ecb868df35862ba6db5c8be299fdcdae";
+ version = "0.0.6";
+ sha256 = "f575e0aadb3fbf185defc6ded00efc150ed162dd8ef4e311575e012e6ab221bb";
libraryHaskellDepends = [ base ];
librarySystemDepends = [ pHash ];
testHaskellDepends = [
@@ -140307,6 +140640,7 @@ self: {
homepage = "https://github.com/ExcaliburZero/pixelated-avatar-generator";
description = "A library and application for generating pixelated avatars";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pkcs1" = callPackage
@@ -140581,8 +140915,8 @@ self: {
}:
mkDerivation {
pname = "plot";
- version = "0.2.3.6";
- sha256 = "ad606de1d746f26cea36f1818209adab83bb32bf46b562465930f64c975afdfd";
+ version = "0.2.3.7";
+ sha256 = "918611e37c6c2a01c00621b079e4de63dbe24a63936b64cd923f3bdb6e9757a4";
libraryHaskellDepends = [
array base cairo colour hmatrix mtl pango transformers
];
@@ -141214,12 +141548,12 @@ self: {
}) {};
"poly-arity" = callPackage
- ({ mkDerivation, base, constraints, HList }:
+ ({ mkDerivation, base, constraints }:
mkDerivation {
pname = "poly-arity";
- version = "0.0.7";
- sha256 = "8a11a127ef8aa3d9cbf773623930c710a7c0e92ac602957c891ed6a385540b66";
- libraryHaskellDepends = [ base constraints HList ];
+ version = "0.1.0";
+ sha256 = "cb10a644fe04de8e703942f4bd0d97c4df0f9e3915d33a494994e85830cfdd29";
+ libraryHaskellDepends = [ base constraints ];
description = "Tools for working with functions of undetermined arity";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -141302,6 +141636,8 @@ self: {
pname = "polynomial";
version = "0.7.2";
sha256 = "e19fff25579b5882da6d7ec0f3e344b88ee320ae8284fc1afefed04385ba3ff0";
+ revision = "1";
+ editedCabalFile = "9acba2e7f5f4e3ec6989c9670a92a6b9033ee9331b2c9bc114890b8929f45b35";
libraryHaskellDepends = [
base deepseq pretty vector vector-space vector-th-unbox
];
@@ -141967,22 +142303,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "postgresql-binary_0_10" = callPackage
+ "postgresql-binary_0_12_1" = callPackage
({ mkDerivation, aeson, base, base-prelude, binary-parser
- , bytestring, conversion, conversion-bytestring, conversion-text
- , criterion, foldl, json-ast, loch-th, network-ip, placeholders
- , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase
- , scientific, tasty, tasty-hunit, tasty-quickcheck
- , tasty-smallcheck, text, time, transformers, uuid, vector
+ , bytestring, bytestring-strict-builder, containers, conversion
+ , conversion-bytestring, conversion-text, criterion, json-ast
+ , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck
+ , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit
+ , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+ , unordered-containers, uuid, vector
}:
mkDerivation {
pname = "postgresql-binary";
- version = "0.10";
- sha256 = "28816184fb287ddafcd8344f4d8cdba678be2fb29f06005cc7f597ee4386e7c6";
+ version = "0.12.1";
+ sha256 = "a20a9f6c102d09f220e5f08357b3cd0a06a5f8d22eff4dd7f9e6fc668e1165cd";
libraryHaskellDepends = [
- aeson base base-prelude binary-parser bytestring foldl loch-th
- network-ip placeholders scientific text time transformers uuid
- vector
+ aeson base base-prelude binary-parser bytestring
+ bytestring-strict-builder containers loch-th network-ip
+ placeholders scientific text time transformers unordered-containers
+ uuid vector
];
testHaskellDepends = [
aeson conversion conversion-bytestring conversion-text json-ast
@@ -142339,8 +142677,8 @@ self: {
}:
mkDerivation {
pname = "postgresql-typed";
- version = "0.5.0";
- sha256 = "c6b93a05eff7b5a315dfe26abdd6885dd9290dec3096c3cc795c16bc1395f2ff";
+ version = "0.5.1";
+ sha256 = "9b0f95824a14391f2d1cb39af3740ceebb93d0676bdb8817a8fa6f89ff5a792f";
libraryHaskellDepends = [
aeson array attoparsec base binary bytestring containers cryptonite
haskell-src-meta HDBC memory network old-locale postgresql-binary
@@ -142351,7 +142689,7 @@ self: {
QuickCheck time
];
homepage = "https://github.com/dylex/postgresql-typed";
- description = "A PostgreSQL library with compile-time SQL type inference and optional HDBC backend";
+ description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -142703,17 +143041,6 @@ self: {
}) {};
"pqueue" = callPackage
- ({ mkDerivation, base, deepseq }:
- mkDerivation {
- pname = "pqueue";
- version = "1.3.2";
- sha256 = "58d6c91432d91c1e9908495f5bfeb231239a53b5c59bda724fe8d7bd3873adf1";
- libraryHaskellDepends = [ base deepseq ];
- description = "Reliable, persistent, fast priority queues";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "pqueue_1_3_2_2" = callPackage
({ mkDerivation, base, deepseq, QuickCheck }:
mkDerivation {
pname = "pqueue";
@@ -142723,7 +143050,6 @@ self: {
testHaskellDepends = [ base deepseq QuickCheck ];
description = "Reliable, persistent, fast priority queues";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pqueue-mtl" = callPackage
@@ -142864,8 +143190,8 @@ self: {
}:
mkDerivation {
pname = "pred-trie";
- version = "0.5.1";
- sha256 = "821e1cefa47a3090808af5c39d9997f6471e05aa4f98b46e05eccb9c4a99cdd1";
+ version = "0.5.1.1";
+ sha256 = "7342dab0c18f25b023da8613798dcb3e75fceb8b082a1feb57e5597de9827ecf";
libraryHaskellDepends = [
base composition-extra containers hashable hashtables mtl
poly-arity pred-set QuickCheck semigroups tries
@@ -143208,8 +143534,8 @@ self: {
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "present";
- version = "4.0.2";
- sha256 = "1eae62ac47ca11a2f13d8bebf7930b0f11e1197a5f0d8628bafce279e000600f";
+ version = "4.1.0";
+ sha256 = "bae8b334817a31572cc0e771f40e89b976e72b2b55d0955e4e198502dd8a427b";
libraryHaskellDepends = [ base template-haskell ];
homepage = "https://github.com/chrisdone/present";
description = "Make presentations for data types";
@@ -144170,8 +144496,8 @@ self: {
}:
mkDerivation {
pname = "profiteur";
- version = "0.4.2.1";
- sha256 = "6b2af36243f15aa5396e0056159d9ad38422cce9eebafa59e6d439b2a8932916";
+ version = "0.4.2.2";
+ sha256 = "caa7a1c197dc94b0343755506fa657ae40dd155534379adccf39701d8c0a953f";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -144541,8 +144867,8 @@ self: {
}:
mkDerivation {
pname = "propellor";
- version = "4.0.0";
- sha256 = "da1b4e26e28232907d351dc7e1abe7cfcef77e31b723a49da7822557472ba074";
+ version = "4.0.2";
+ sha256 = "cb659ab34b22126c0c07075e556a6f56170af3896f2e23dcd16035d70e578624";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -145622,25 +145948,23 @@ self: {
}) {};
"purescript" = callPackage
- ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty
- , ansi-terminal, ansi-wl-pprint, base, base-compat, blaze-html
- , bower-json, boxes, bytestring, cheapskate, clock, containers
- , data-ordlist, deepseq, directory, dlist, edit-distance
- , file-embed, filepath, foldl, fsnotify, Glob, haskeline, hspec
- , hspec-discover, http-client, http-types, HUnit
- , language-javascript, lens, lifted-base, monad-control
- , monad-logger, mtl, network, optparse-applicative, parallel
- , parsec, pattern-arrows, pipes, pipes-http, process, protolude
- , regex-tdfa, safe, scientific, semigroups, silently, sourcemap
- , spdx, split, stm, syb, system-filepath, text, time, transformers
- , transformers-base, transformers-compat, turtle
- , unordered-containers, utf8-string, vector, wai, wai-websockets
- , warp, websockets
+ ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal
+ , ansi-wl-pprint, base, base-compat, blaze-html, bower-json, boxes
+ , bytestring, cheapskate, clock, containers, data-ordlist, deepseq
+ , directory, dlist, edit-distance, file-embed, filepath, fsnotify
+ , gitrev, Glob, haskeline, hspec, hspec-discover, http-client
+ , http-types, HUnit, language-javascript, lens, lifted-base
+ , monad-control, monad-logger, mtl, network, optparse-applicative
+ , parallel, parsec, pattern-arrows, pipes, pipes-http, process
+ , protolude, regex-tdfa, safe, scientific, semigroups, silently
+ , sourcemap, spdx, split, stm, syb, text, time, transformers
+ , transformers-base, transformers-compat, unordered-containers
+ , utf8-string, vector, wai, wai-websockets, warp, websockets
}:
mkDerivation {
pname = "purescript";
- version = "0.10.7";
- sha256 = "85dff2f4b6916e9d45b6a1b2674dc6c91c56ac6c1597f627d5f1cbee9d0b3a9d";
+ version = "0.11.0";
+ sha256 = "811e55bfc87e2ec65f57b134980866a5924a3f5c7967bf83fac19c7f9fd12cdd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -145655,12 +145979,12 @@ self: {
unordered-containers utf8-string vector
];
executableHaskellDepends = [
- aeson aeson-pretty ansi-terminal ansi-wl-pprint base base-compat
- boxes bytestring containers directory file-embed filepath foldl
+ aeson ansi-terminal ansi-wl-pprint base base-compat blaze-html
+ boxes bytestring containers directory file-embed filepath gitrev
Glob haskeline http-types monad-logger mtl network
optparse-applicative parsec process protolude sourcemap split stm
- system-filepath text time transformers transformers-compat turtle
- utf8-string wai wai-websockets warp websockets
+ text time transformers transformers-compat utf8-string wai
+ wai-websockets warp websockets
];
testHaskellDepends = [
aeson aeson-better-errors base base-compat bower-json boxes
@@ -146307,8 +146631,10 @@ self: {
}:
mkDerivation {
pname = "qr-imager";
- version = "1.0.0.2";
- sha256 = "b9c758375936269cfc16bd28b82adcbab3e8ed79e48e88fc2e23a8e89ec0d504";
+ version = "1.0.0.3";
+ sha256 = "ff97d131702a42710d3c9a4a211055499495bd3319697908b4fa83c4a01381f4";
+ revision = "1";
+ editedCabalFile = "9011708b42c261b2ec8a2f7a39315fbdff193d61c8d70c73f32b60e3428fe067";
libraryHaskellDepends = [
aeson base bytestring cryptonite directory haskell-qrencode
jose-jwt JuicyPixels lens MissingH optparse-applicative process
@@ -148253,6 +148579,8 @@ self: {
pname = "rasa";
version = "0.1.12";
sha256 = "5ae77122fd34c6c87ec9137c7d686106ee57baaef164090c55efd2d0bbe85f21";
+ revision = "1";
+ editedCabalFile = "79e6edef2ef82c0a65343db171bfddb85cbf23d45420ccffb97383e031d3979f";
libraryHaskellDepends = [
async base bifunctors containers data-default eve free hspec lens
mtl pipes pipes-concurrency pipes-parse profunctors text text-lens
@@ -148602,6 +148930,32 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "rattletrap_2_2_0" = callPackage
+ ({ mkDerivation, aeson, aeson-casing, base, bimap, binary
+ , binary-bits, bytestring, containers, data-binary-ieee754
+ , filepath, tasty, tasty-hspec, template-haskell, temporary, text
+ , vector
+ }:
+ mkDerivation {
+ pname = "rattletrap";
+ version = "2.2.0";
+ sha256 = "fe1ba54cce7d1d6c2b4bfe54f433bc61a31b15b866abae7ae2ee4a53b384f2c8";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-casing base bimap binary binary-bits bytestring
+ containers data-binary-ieee754 template-haskell text vector
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base bytestring filepath tasty tasty-hspec temporary
+ ];
+ homepage = "https://github.com/tfausak/rattletrap#readme";
+ description = "Parse and generate Rocket League replays";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"raven-haskell" = callPackage
({ mkDerivation, aeson, base, bytestring, hspec, http-conduit
, network, random, text, time, unordered-containers, uuid
@@ -148683,13 +149037,15 @@ self: {
({ mkDerivation, base, bytestring, unix }:
mkDerivation {
pname = "rawfilepath";
- version = "0.1.0.0";
- sha256 = "1673897fbcb4a4a194bb66ff8514a21db6c1d9f6ba0d960dc20677c9902c2614";
+ version = "0.1.1";
+ sha256 = "fc5c0a6177abece59cc962d08ab019d98aac2b61b4495630f00280b029988c66";
+ revision = "1";
+ editedCabalFile = "39c576d107385d8d240d32673c8dfd702e2e17ef87ece13f86010d1a3411c693";
libraryHaskellDepends = [ base bytestring unix ];
- testHaskellDepends = [ base ];
+ testHaskellDepends = [ base bytestring ];
homepage = "https://github.com/xtendo-org/rawfilepath#readme";
description = "Use RawFilePath instead of FilePath";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.asl20;
}) {};
"rawr" = callPackage
@@ -148763,22 +149119,26 @@ self: {
}) {};
"rbpcp-api" = callPackage
- ({ mkDerivation, aeson, base, base16-bytestring, bytestring, cereal
- , haskoin-core, servant, string-conversions, text
+ ({ mkDerivation, aeson, base, base16-bytestring
+ , bitcoin-payment-protocol, bytestring, cereal, haskoin-core
+ , http-api-data, servant, servant-client, string-conversions, text
+ , time
}:
mkDerivation {
pname = "rbpcp-api";
- version = "0.1.0.0";
- sha256 = "16290f21dc85b53a4738753a7c827584bfd2455d1e0f0d11f78c2520448afd06";
+ version = "0.2.0.0";
+ sha256 = "958f1067973daaa1fcba4afab2bd6dbb09bd6b84aa6c342246103b442a4c1855";
libraryHaskellDepends = [
- aeson base base16-bytestring bytestring cereal haskoin-core servant
- string-conversions text
+ aeson base base16-bytestring bitcoin-payment-protocol bytestring
+ cereal haskoin-core http-api-data servant servant-client
+ string-conversions text time
];
homepage = "http://paychandoc.runeks.me/";
description = "RESTful Bitcoin Payment Channel Protocol Servant API description";
license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
+ broken = true;
+ }) {bitcoin-payment-protocol = null;};
"rbr" = callPackage
({ mkDerivation, base, bio, bytestring, containers }:
@@ -149377,6 +149737,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "read-env-var_1_0_0_0" = callPackage
+ ({ mkDerivation, base, doctest, exceptions, Glob, transformers }:
+ mkDerivation {
+ pname = "read-env-var";
+ version = "1.0.0.0";
+ sha256 = "03f3c8176fc08ce838ae772f13991258e2b496712cc71edb1a00336e7ce0b75c";
+ libraryHaskellDepends = [ base exceptions transformers ];
+ testHaskellDepends = [ base doctest Glob ];
+ homepage = "https://github.com/cdepillabout/read-env-var#readme";
+ description = "Functions for safely reading environment variables";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"read-io" = callPackage
({ mkDerivation, base, containers, directory, filepath, hspec }:
mkDerivation {
@@ -150568,19 +150942,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "regex_0_8_0_0" = callPackage
+ "regex_0_10_0_2" = callPackage
({ mkDerivation, array, base, base-compat, bytestring, containers
- , hashable, heredoc, regex-base, regex-tdfa, regex-tdfa-text
+ , hashable, regex-base, regex-tdfa, regex-tdfa-text
, template-haskell, text, time, time-locale-compat, transformers
, unordered-containers
}:
mkDerivation {
pname = "regex";
- version = "0.8.0.0";
- sha256 = "6bd9c5aefde6010c0ab1fd0ed60c969b3ade609d23553221810330d287fe9062";
+ version = "0.10.0.2";
+ sha256 = "5ecb41e7bfc60aaad2bfca8d07ea84088c46fce881f70eccb87fbd02b8bf417b";
libraryHaskellDepends = [
- array base base-compat bytestring containers hashable heredoc
- regex-base regex-tdfa regex-tdfa-text template-haskell text time
+ array base base-compat bytestring containers hashable regex-base
+ regex-tdfa regex-tdfa-text template-haskell text time
time-locale-compat transformers unordered-containers
];
homepage = "http://regex.uk";
@@ -150734,8 +151108,8 @@ self: {
}:
mkDerivation {
pname = "regex-examples";
- version = "0.8.0.0";
- sha256 = "0ba7b0c30259818a48952d3218b0b89bba19979f4d2882c77e752091f654dddd";
+ version = "0.10.0.2";
+ sha256 = "d92f00f991ccc2597f0cc62eba00a0b22aeb075717baa1e24d581d5df34603ba";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -150755,6 +151129,7 @@ self: {
homepage = "http://regex.uk";
description = "Tutorial, tests and example programs for regex";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"regex-genex" = callPackage
@@ -151007,19 +151382,22 @@ self: {
"regex-with-pcre" = callPackage
({ mkDerivation, base, base-compat, bytestring, containers, regex
- , regex-base, regex-pcre-builtin, template-haskell, transformers
+ , regex-base, regex-pcre-builtin, regex-tdfa, template-haskell
+ , transformers, unordered-containers
}:
mkDerivation {
pname = "regex-with-pcre";
- version = "0.8.0.0";
- sha256 = "c965675df2d1b52bc9e0f1a5df0da150f47103a41494deba0ae985b2707ecd6b";
+ version = "0.10.0.2";
+ sha256 = "645a63d6174c15bcf10274f08df68b85090e816492bd9e01b871aa8fe5b53b64";
libraryHaskellDepends = [
base base-compat bytestring containers regex regex-base
- regex-pcre-builtin template-haskell transformers
+ regex-pcre-builtin regex-tdfa template-haskell transformers
+ unordered-containers
];
homepage = "http://regex.uk";
description = "Toolkit for regex-base";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"regex-xmlschema" = callPackage
@@ -151414,8 +151792,8 @@ self: {
}:
mkDerivation {
pname = "relapse";
- version = "0.1.1.1";
- sha256 = "613a385a54ba9d9fa95562121aa0ef94614fbb984b319477e2ef49512ef1a20a";
+ version = "1.0.0.0";
+ sha256 = "65c68af5e3d18e67bd6f81ab62ea9cc271d8283d876f7baf1c4ee64515a9aa19";
libraryHaskellDepends = [ attoparsec base bytestring ];
testHaskellDepends = [
aeson base base16-bytestring bytestring containers include-file
@@ -151507,8 +151885,8 @@ self: {
}:
mkDerivation {
pname = "relational-record";
- version = "0.1.6.1";
- sha256 = "c18bb200618b86a0baec590408ac941fb6a2a1d158ba74d6f9f4239a8d4bdada";
+ version = "0.1.7.1";
+ sha256 = "18fa0712dc906c056d0c21cfc262a97673906348fa37130761688b16f9cd7a2c";
libraryHaskellDepends = [
base persistable-types-HDBC-pg relational-query
relational-query-HDBC
@@ -152744,8 +153122,8 @@ self: {
pname = "rest-core";
version = "0.39";
sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404";
- revision = "4";
- editedCabalFile = "261e22e228e0d1f042f24a0a9e784a7ed3ea44342006cb79cb7e4021f0e46b9a";
+ revision = "6";
+ editedCabalFile = "38c82ac051ac1cda463e93d4704be00680ee24fc044eb1cabcf48789306a8635";
libraryHaskellDepends = [
aeson aeson-utils base base-compat bytestring case-insensitive
errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat
@@ -152797,8 +153175,8 @@ self: {
pname = "rest-gen";
version = "0.20.0.0";
sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542";
- revision = "5";
- editedCabalFile = "f215b849b6a581cb87b835c7feeee8de835d6cd5039eb7c15272c4b9fdc9456a";
+ revision = "7";
+ editedCabalFile = "8cd3ba2ec87976c3118b1de8d9172104e3a136f0afd9443e935130435fbc4c7d";
libraryHaskellDepends = [
aeson base base-compat blaze-html Cabal code-builder directory
fclabels filepath hashable haskell-src-exts HStringTemplate hxt
@@ -154088,13 +154466,13 @@ self: {
}:
mkDerivation {
pname = "rose-trie";
- version = "1.0.0.2";
- sha256 = "94eb35048ea15968f66aed88e1598b4e742f129928a880ddbbd4e6a2b38ff99e";
+ version = "1.0.0.5";
+ sha256 = "9d6328c9a639585edf2777b2e2ec6aab025f6fda9132222316caa078efb6a31c";
libraryHaskellDepends = [
base containers deepseq minilens mtl transformers
];
homepage = "https://github.com/RaminHAL9001/rose-trie";
- description = "Provides \"Data.Tree.RoseTrie\": trees with polymorphic paths to nodes, combining properties of Rose Tree data structures and Trie data structures.";
+ description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -154690,6 +155068,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) rtl-sdr;};
+ "rtnetlink" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, hspec, monad-loops, mtl
+ , pretty-hex, random, socket, transformers, unix
+ }:
+ mkDerivation {
+ pname = "rtnetlink";
+ version = "0.1.0.2";
+ sha256 = "090a563053b83e624e7de7e161c2bffc239a72db926ed64229cb1cc9d78a02e4";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring cereal monad-loops mtl pretty-hex random socket
+ transformers unix
+ ];
+ testHaskellDepends = [ base hspec socket unix ];
+ homepage = "https://gitlab.com/formaltech/rtnetlink-hs";
+ description = "Manipulate network devices, addresses, and routes on Linux";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"rtorrent-rpc" = callPackage
({ mkDerivation, attoparsec, base, blaze-builder, blaze-textual
, bytestring, deepseq, haxr, mtl, network, split, utf8-string
@@ -155243,8 +155641,8 @@ self: {
}:
mkDerivation {
pname = "safecopy";
- version = "0.9.3";
- sha256 = "7ec166f50363eef698c884b3495405f1705e974c8dfaf54b9374977b334f6ec8";
+ version = "0.9.3.1";
+ sha256 = "63ee973ad84c0a4440934b726bc066aa571d27014bc27f2dd93bc9839340471a";
libraryHaskellDepends = [
array base bytestring cereal containers old-time template-haskell
text time vector
@@ -155570,8 +155968,8 @@ self: {
({ mkDerivation, base, numeric-prelude, sample-frame }:
mkDerivation {
pname = "sample-frame-np";
- version = "0.0.4";
- sha256 = "cdec6e95f9b3739ca5031dfa914465d5e82b9b6bb09c95529728c92efb21e4d0";
+ version = "0.0.4.1";
+ sha256 = "b1db7621b07503f5fe49390bf1e1b4257c49f4760d617121a23d845278f93624";
libraryHaskellDepends = [ base numeric-prelude sample-frame ];
homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
description = "Orphan instances for types from sample-frame and numericprelude";
@@ -156579,6 +156977,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "scientific_0_3_4_11" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, criterion
+ , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
+ , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
+ , tasty-quickcheck, tasty-smallcheck, text, vector
+ }:
+ mkDerivation {
+ pname = "scientific";
+ version = "0.3.4.11";
+ sha256 = "990f4ba464606eb2bf07059c527b8e1e7aa11e2f0d9e2f3c0b4e6aec9f9e7ed4";
+ libraryHaskellDepends = [
+ base binary bytestring containers deepseq ghc-prim hashable
+ integer-gmp integer-logarithms text vector
+ ];
+ testHaskellDepends = [
+ base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
+ tasty-hunit tasty-quickcheck tasty-smallcheck text
+ ];
+ benchmarkHaskellDepends = [ base criterion ];
+ homepage = "https://github.com/basvandijk/scientific";
+ description = "Numbers represented using scientific notation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"scion" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, directory
, filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset
@@ -157419,8 +157842,8 @@ self: {
}:
mkDerivation {
pname = "seakale-postgresql";
- version = "0.2.0.0";
- sha256 = "f7205329cf6388331f77da685cfc9e742130e6714d6a2103e57a5cd6cf49b9ac";
+ version = "0.2.0.1";
+ sha256 = "c214ab985c0bb5174acceaec0d5952e3bd01f6b998dbfd4025203bf4a78643b9";
libraryHaskellDepends = [
base bytestring free mtl postgresql-libpq seakale time
];
@@ -157624,6 +158047,8 @@ self: {
pname = "secret-sharing";
version = "1.0.0.3";
sha256 = "62af2ba181d30e6d6c6cfd01f83a5082b6bc378a745c90497cff42ebea2b6160";
+ revision = "1";
+ editedCabalFile = "61cd19283cfa3fb48b92ac636aead422be5120efb8a77b4390a1ca2d571819e1";
libraryHaskellDepends = [
base binary bytestring dice-entropy-conduit finite-field polynomial
vector
@@ -158462,8 +158887,8 @@ self: {
}:
mkDerivation {
pname = "serokell-util";
- version = "0.1.5.0";
- sha256 = "c8dbcdf8c6650a45fa6c5bf2a95a1d754818ac2dd276a29291fa942e831bc74a";
+ version = "0.1.5.3";
+ sha256 = "049c553f26e9e8e59273851abb7897d2e6d1554b21d66a035ee43983796d3c16";
libraryHaskellDepends = [
acid-state aeson aeson-extra ansi-terminal base base16-bytestring
base64-bytestring binary binary-orphans bytestring cereal
@@ -158775,47 +159200,6 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "servant-auth-server_0_2_1_0" = callPackage
- ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
- , bytestring, bytestring-conversion, case-insensitive, cookie
- , crypto-api, data-default-class, entropy, hspec, http-api-data
- , http-client, http-types, jose, lens, lens-aeson, markdown-unlit
- , monad-time, mtl, QuickCheck, servant-auth, servant-server, text
- , time, transformers, unordered-containers, wai, warp, wreq
- }:
- mkDerivation {
- pname = "servant-auth-server";
- version = "0.2.1.0";
- sha256 = "0f9e848300a916de0892c55a8b530a02d3fc8bcbc7983012780355a88e266c84";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson base base64-bytestring blaze-builder bytestring
- bytestring-conversion case-insensitive cookie crypto-api
- data-default-class entropy http-api-data jose lens monad-time mtl
- servant-auth servant-server text time unordered-containers wai
- ];
- executableHaskellDepends = [
- aeson base base64-bytestring blaze-builder bytestring
- bytestring-conversion case-insensitive cookie crypto-api
- data-default-class entropy http-api-data jose lens markdown-unlit
- monad-time mtl servant-auth servant-server text time transformers
- unordered-containers wai warp
- ];
- testHaskellDepends = [
- aeson base base64-bytestring blaze-builder bytestring
- bytestring-conversion case-insensitive cookie crypto-api
- data-default-class entropy hspec http-api-data http-client
- http-types jose lens lens-aeson monad-time mtl QuickCheck
- servant-auth servant-server text time unordered-containers wai warp
- wreq
- ];
- homepage = "http://github.com/plow-technologies/servant-auth#readme";
- description = "servant-server/servant-auth compatibility";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"servant-auth-server" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
, bytestring, bytestring-conversion, case-insensitive, cookie
@@ -158958,6 +159342,7 @@ self: {
homepage = "https://github.com/ncrashed/servant-auth-token#readme";
description = "Leveldb backend for servant-auth-token server";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-auth-token-persistent" = callPackage
@@ -159744,6 +160129,20 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "servant-ruby" = callPackage
+ ({ mkDerivation, base, casing, doctest, lens, servant-foreign, text
+ }:
+ mkDerivation {
+ pname = "servant-ruby";
+ version = "0.2.0.0";
+ sha256 = "5ac0095edc4254edc3db4f4a0913669391f838a8a6b4c9f78ff00daa2b467e17";
+ libraryHaskellDepends = [ base casing lens servant-foreign text ];
+ testHaskellDepends = [ base doctest ];
+ homepage = "https://github.com/joneshf/servant-ruby#readme";
+ description = "Generate a Ruby client from a Servant API with Net::HTTP";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"servant-scotty" = callPackage
({ mkDerivation, aeson, base, http-types, scotty, servant
, servant-response, text, transformers
@@ -159980,7 +160379,6 @@ self: {
homepage = "https://github.com/haskell-servant/servant-swagger";
description = "Generate Swagger specification for your servant API";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-swagger_1_1_2_1" = callPackage
@@ -160036,7 +160434,6 @@ self: {
homepage = "https://github.com/phadej/servant-swagger-ui#readme";
description = "Servant swagger ui";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-yaml" = callPackage
@@ -160432,6 +160829,7 @@ self: {
];
description = "A Haskell implementation of setoid";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"setops" = callPackage
@@ -160587,18 +160985,21 @@ self: {
}) {};
"sext" = callPackage
- ({ mkDerivation, base, bytestring, template-haskell, text, vector
+ ({ mkDerivation, base, bytestring, tasty, tasty-hunit
+ , template-haskell, text, vector
}:
mkDerivation {
pname = "sext";
- version = "0.1.2";
- sha256 = "c046a0613bc8275f9e0c4c0052c2a9e9e7468fa20a1fd7f64a6d6ce5f02f46a1";
+ version = "0.1.3";
+ sha256 = "6b1cc147120f0730ed2aa199033c9840fde2ed235d2d243667ceceb2e123ca7c";
libraryHaskellDepends = [
base bytestring template-haskell text vector
];
- testHaskellDepends = [ base template-haskell ];
+ testHaskellDepends = [
+ base bytestring tasty tasty-hunit template-haskell
+ ];
homepage = "https://github.com/dzhus/sext#readme";
- description = "Lists, Texts, ByteStrings, and Vectors with type-encoded length";
+ description = "Lists, Texts, ByteStrings and Vectors with type-encoded length";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -160874,25 +161275,6 @@ self: {
}) {};
"shake-language-c" = callPackage
- ({ mkDerivation, base, data-default-class, directory, doctest
- , fclabels, hspec, process, shake, split, unordered-containers
- }:
- mkDerivation {
- pname = "shake-language-c";
- version = "0.10.0";
- sha256 = "1b0f031c37db7ac320f80e09ab79dca2bdb85ba922a48c10f0954efd6d407888";
- libraryHaskellDepends = [
- base data-default-class fclabels process shake split
- unordered-containers
- ];
- testHaskellDepends = [ base directory doctest hspec shake ];
- doCheck = false;
- homepage = "https://github.com/samplecount/shake-language-c";
- description = "Utilities for cross-compiling with Shake";
- license = stdenv.lib.licenses.asl20;
- }) {};
-
- "shake-language-c_0_10_1" = callPackage
({ mkDerivation, base, data-default-class, directory, doctest
, fclabels, hspec, process, shake, split, unordered-containers
}:
@@ -160909,7 +161291,6 @@ self: {
homepage = "https://github.com/samplecount/shake-language-c";
description = "Utilities for cross-compiling with Shake";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"shake-minify" = callPackage
@@ -164345,31 +164726,31 @@ self: {
({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
, case-insensitive, containers, deepseq, directory, filepath
, hashable, HUnit, io-streams, lifted-base, monad-control, mtl
- , old-locale, parallel, QuickCheck, random, readable, regex-posix
- , test-framework, test-framework-hunit, test-framework-quickcheck2
- , text, time, transformers, transformers-base, unix-compat
- , unordered-containers, vector, zlib
+ , network, network-uri, old-locale, parallel, QuickCheck, random
+ , readable, regex-posix, test-framework, test-framework-hunit
+ , test-framework-quickcheck2, text, time, transformers
+ , transformers-base, unix-compat, unordered-containers, vector
+ , zlib
}:
mkDerivation {
pname = "snap-core";
- version = "1.0.1.0";
- sha256 = "f5d2a8b690e77b03626e7bd1856011fc2a13b286939176bde7b61c064aafa37c";
- revision = "1";
- editedCabalFile = "ef248be20bc9d535defbc2f091db3f48dd02e5b233a8305f8ad3c83f2f4548c8";
+ version = "1.0.2.0";
+ sha256 = "e48eba4727169b9c599c6de1791deb881eeee12e25658a30590116b450e5b65c";
libraryHaskellDepends = [
attoparsec base bytestring bytestring-builder case-insensitive
- containers directory filepath HUnit io-streams lifted-base
- monad-control mtl old-locale random readable regex-posix text time
- transformers transformers-base unix-compat unordered-containers
- vector
+ containers directory filepath hashable HUnit io-streams lifted-base
+ monad-control mtl network network-uri old-locale random readable
+ regex-posix text time transformers transformers-base unix-compat
+ unordered-containers vector
];
testHaskellDepends = [
attoparsec base bytestring bytestring-builder case-insensitive
containers deepseq directory filepath hashable HUnit io-streams
- lifted-base monad-control mtl old-locale parallel QuickCheck random
- readable regex-posix test-framework test-framework-hunit
- test-framework-quickcheck2 text time transformers transformers-base
- unix-compat unordered-containers vector zlib
+ lifted-base monad-control mtl network network-uri old-locale
+ parallel QuickCheck random readable regex-posix test-framework
+ test-framework-hunit test-framework-quickcheck2 text time
+ transformers transformers-base unix-compat unordered-containers
+ vector zlib
];
homepage = "http://snapframework.com/";
description = "Snap: A Haskell Web Framework (core interfaces and types)";
@@ -166219,20 +166600,20 @@ self: {
}) {};
"sound-collage" = callPackage
- ({ mkDerivation, array, base, carray, directory, fft, filepath
- , numeric-prelude, optparse-applicative, sample-frame, soxlib
- , storablevector, storablevector-carray, synthesizer-core
- , temporary, transformers, utility-ht
+ ({ mkDerivation, array, base, Cabal, carray, containers, fft
+ , filepath, numeric-prelude, optparse-applicative, pathtype
+ , sample-frame, soxlib, storablevector, storablevector-carray
+ , synthesizer-core, temporary, transformers, utility-ht
}:
mkDerivation {
pname = "sound-collage";
- version = "0.1";
- sha256 = "b584afca2dc682dfa7e5350b8eb3877b7cf6cedfb5f7ed9a7af006910b86fc87";
+ version = "0.2";
+ sha256 = "5c07cfaa39450292f4649d62c9e9d938a23ffd0baadd94feeb9db10a7e853ac2";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- array base carray directory fft filepath numeric-prelude
- optparse-applicative sample-frame soxlib storablevector
+ array base Cabal carray containers fft filepath numeric-prelude
+ optparse-applicative pathtype sample-frame soxlib storablevector
storablevector-carray synthesizer-core temporary transformers
utility-ht
];
@@ -166874,6 +167255,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "sphinxesc" = callPackage
+ ({ mkDerivation, base, MissingH, optparse-applicative, parsec
+ , split
+ }:
+ mkDerivation {
+ pname = "sphinxesc";
+ version = "0.1.0.1";
+ sha256 = "f26952487373f7b14f3e3990b76dd5e81686b0d4dbaf76508e334213b997ea7c";
+ revision = "1";
+ editedCabalFile = "85317b910b35a1970e97bf69405bac67eb9ede00d54c27002caafbe742f2224a";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base MissingH parsec split ];
+ executableHaskellDepends = [ base optparse-applicative ];
+ homepage = "https://github.com/mackeyrms/sphinxesc#readme";
+ description = "Transform queries for sphinx input";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"spice" = callPackage
({ mkDerivation, base, bytestring, containers, data-default, elerea
, GLFW, JuicyPixels, JuicyPixels-repa, OpenGL
@@ -167070,8 +167470,8 @@ self: {
}:
mkDerivation {
pname = "split-record";
- version = "0.1.1.2";
- sha256 = "8d87da014bbf612290335c4f2df31e77c30882ac3a2b8daae4158eab3483877e";
+ version = "0.1.1.3";
+ sha256 = "12df38229ac15f8851951d3be685f9b8941ae1d9d7541c3366ffa179856bba79";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -167971,8 +168371,8 @@ self: {
}:
mkDerivation {
pname = "stache";
- version = "0.2.1";
- sha256 = "f25c0a913cca7ae0056d8030e5351da809bdff53afef80d863c1ecaa0dbbd00f";
+ version = "0.2.2";
+ sha256 = "66c75aaf078dc778b2e33ddef4850107b5b488fd966c81c7e2f133539276b86e";
libraryHaskellDepends = [
aeson base bytestring containers deepseq directory exceptions
filepath megaparsec mtl template-haskell text unordered-containers
@@ -168016,6 +168416,8 @@ self: {
pname = "stack";
version = "1.4.0";
sha256 = "f10d6f031aa0e682da3e1f61fa12b9c31f1617150b0f99f691c873a0ce19e8b6";
+ revision = "4";
+ editedCabalFile = "13605cb5121333a73a680f622b29003ad03fbc720522119f740881ba1ecd4343";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -169342,6 +169744,8 @@ self: {
pname = "stm-io-hooks";
version = "1.1.0";
sha256 = "35014012b671a6964ec0d5f5de2ab13a61d8ee01cb0bbd685a3cc17385fae235";
+ revision = "1";
+ editedCabalFile = "b74a4d65fd2f5bbcdb0e1c52318d88db3240c513bb3fb9b2aa7a00ec00f39aa9";
libraryHaskellDepends = [ array base containers mtl stm ];
description = "STM with IO hooks";
license = stdenv.lib.licenses.bsd3;
@@ -169662,8 +170066,8 @@ self: {
}:
mkDerivation {
pname = "storablevector";
- version = "0.2.11";
- sha256 = "b2edb8234ae9de08baa4dc7b292314a2a9edaee5c090cedd7f3db405ab27c65e";
+ version = "0.2.12";
+ sha256 = "cb7e9eba213b609c8e08d1e84164976bba680d8450f43747d3c9edaacef7e8a6";
libraryHaskellDepends = [
base deepseq non-negative QuickCheck syb transformers unsafe
utility-ht
@@ -171069,6 +171473,7 @@ self: {
homepage = "https://github.com/nmattia/stutter#readme";
description = "(Stutter Text|String)-Utterer";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"stylish-haskell" = callPackage
@@ -171676,8 +172081,8 @@ self: {
}:
mkDerivation {
pname = "svg-tree";
- version = "0.6";
- sha256 = "7b055b1f66fe8aeacb91bb01315275b3669ddb84b057bd28fdbed17d1e1c5732";
+ version = "0.6.1";
+ sha256 = "9bf58c55557d3e2675e16b17d1d77455a6f79946b087b3fdd8b4b96568045751";
libraryHaskellDepends = [
attoparsec base bytestring containers JuicyPixels lens linear mtl
scientific text transformers vector xml
@@ -172510,8 +172915,8 @@ self: {
}:
mkDerivation {
pname = "synthesizer-core";
- version = "0.8.0.2";
- sha256 = "1ad216fe5cd2f22223349d584bd32be44bb12f76fcfa13e5198fc2e3108ee54f";
+ version = "0.8.1";
+ sha256 = "e928dc2138315d84c4057ee3eea1fe2a5c6568ebef980cab1eab07dec7781ad2";
libraryHaskellDepends = [
array base binary bytestring containers deepseq event-list
explicit-exception filepath non-empty non-negative numeric-prelude
@@ -175702,8 +176107,8 @@ self: {
pname = "test-framework-hunit";
version = "0.3.0.2";
sha256 = "95cb8ee02a850b164bfdabdf4dbc839d621361f3ac770ad21ea43a8bde360bf8";
- revision = "2";
- editedCabalFile = "f3b7d4b2bf246b88de781a03806e5c90a499c64b2b0c040be50dd980764fcc62";
+ revision = "3";
+ editedCabalFile = "7fd007e9cb082cd64a2213a6d36acf057f7d6df6b5343a088e81b2b3a9a23545";
libraryHaskellDepends = [
base extensible-exceptions HUnit test-framework
];
@@ -176172,8 +176577,8 @@ self: {
}:
mkDerivation {
pname = "texmath";
- version = "0.9.3";
- sha256 = "541624a64a2dee55e87ce361a66fdd3c82856437b19e2a7c113a04cb7cbc8a7e";
+ version = "0.9.4";
+ sha256 = "da665d069708679fb40ee2e981dcdede55e79f3165c0ae09c55621273e682195";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -177533,8 +177938,8 @@ self: {
}:
mkDerivation {
pname = "themoviedb";
- version = "1.1.2.0";
- sha256 = "c4dc8038b004f192854c5e8341c8cc4637f6c9d340a76e77f9e36ee412a7eb88";
+ version = "1.1.3.0";
+ sha256 = "2c3480876a2dda192edd72ba1ecc5fd8200b80b3a35f8b98b6cd0c4877f0832f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -177930,6 +178335,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "threepenny-gui-flexbox_0_4_0_2" = callPackage
+ ({ mkDerivation, base, clay, text, threepenny-gui }:
+ mkDerivation {
+ pname = "threepenny-gui-flexbox";
+ version = "0.4.0.2";
+ sha256 = "6edbd91b86e3711bd9198e9747cbcc49603b5f852bfb175f24abceef90ce0918";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base clay text threepenny-gui ];
+ executableHaskellDepends = [ base threepenny-gui ];
+ homepage = "https://github.com/barischj/threepenny-gui-flexbox";
+ description = "Flexbox layouts for Threepenny-gui";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"thrift" = callPackage
({ mkDerivation, attoparsec, base, base64-bytestring, binary
, bytestring, containers, ghc-prim, hashable, hspec, HTTP, network
@@ -178114,8 +178535,8 @@ self: {
}:
mkDerivation {
pname = "tibetan-utils";
- version = "0.1.1.1";
- sha256 = "fa38e4f2062e801c5f8bccb2afea945cfcf40bd24671d9080bf538e0533bbb2a";
+ version = "0.1.1.2";
+ sha256 = "8dd09d6346d04736a03965d6c4c3146edcffaf017055941cab056f3fe1dac082";
libraryHaskellDepends = [
base composition either megaparsec text text-show
];
@@ -179370,35 +179791,31 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "tls" = callPackage
- ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
- , cereal, criterion, cryptonite, data-default-class, hourglass
- , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck
- , transformers, x509, x509-store, x509-validation
+ "tldr" = callPackage
+ ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory
+ , filepath, optparse-applicative, semigroups, shell-conduit, text
}:
mkDerivation {
- pname = "tls";
- version = "1.3.9";
- sha256 = "81355e16528796d3097719e74f7f1f8cae50daed06926d1995731bab8e02267b";
+ pname = "tldr";
+ version = "0.2.0";
+ sha256 = "2abf1633a568f61c786ec3cfefeec3fa372b3e9d3301b9916516f6fbf0e6f69d";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
- asn1-encoding asn1-types async base bytestring cereal cryptonite
- data-default-class memory mtl network transformers x509 x509-store
- x509-validation
+ ansi-terminal base bytestring cmark text
];
- testHaskellDepends = [
- base bytestring cereal cryptonite data-default-class hourglass mtl
- QuickCheck tasty tasty-quickcheck x509 x509-validation
+ executableHaskellDepends = [
+ base directory filepath optparse-applicative semigroups
+ shell-conduit
];
- benchmarkHaskellDepends = [
- base bytestring criterion cryptonite data-default-class hourglass
- mtl QuickCheck tasty-quickcheck x509 x509-validation
- ];
- homepage = "http://github.com/vincenthz/hs-tls";
- description = "TLS/SSL protocol native implementation (Server and Client)";
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/psibi/tldr-hs#readme";
+ description = "Haskell tldr client";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "tls_1_3_10" = callPackage
+ "tls" = callPackage
({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
, cereal, criterion, cryptonite, data-default-class, hourglass
, memory, mtl, network, QuickCheck, tasty, tasty-quickcheck
@@ -179426,7 +179843,6 @@ self: {
homepage = "http://github.com/vincenthz/hs-tls";
description = "TLS/SSL protocol native implementation (Server and Client)";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tls-debug" = callPackage
@@ -179820,8 +180236,8 @@ self: {
}:
mkDerivation {
pname = "torrent";
- version = "10000.0.1";
- sha256 = "ba7c9565f5397f7603b924a67537abe6738cdc20649ff3fb510b5731d1e18725";
+ version = "10000.1.1";
+ sha256 = "2009964210e229ee67254a73fead3413f60299415238887fa7ef30e40e06fa54";
libraryHaskellDepends = [
base bencode binary bytestring containers filepath syb
];
@@ -180583,6 +180999,7 @@ self: {
homepage = "http://github.com/transient-haskell/transient-universe-tls";
description = "transient with secure communications";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"translatable-intset" = callPackage
@@ -180878,25 +181295,18 @@ self: {
}:
mkDerivation {
pname = "tries";
- version = "0.0.4";
- sha256 = "6be9638a03b35effe69c9bbfc33b00fe92156211945b83dee871e70cf266f94a";
+ version = "0.0.4.1";
+ sha256 = "c0b8ba913f98dd0732efe37bc29bacc28d2ed6d6ac23584102865e0cbeaab28a";
libraryHaskellDepends = [
base bytestring bytestring-trie composition composition-extra
containers deepseq hashable keys QuickCheck quickcheck-instances
rose-trees semigroups sets unordered-containers
];
testHaskellDepends = [
- base bytestring bytestring-trie composition composition-extra
- containers deepseq hashable keys mtl QuickCheck
- quickcheck-instances rose-trees semigroups sets tasty
- tasty-quickcheck unordered-containers
- ];
- benchmarkHaskellDepends = [
- base bytestring bytestring-trie composition composition-extra
- containers criterion deepseq hashable keys mtl QuickCheck
- quickcheck-instances rose-trees semigroups sets
- unordered-containers
+ base containers mtl QuickCheck quickcheck-instances tasty
+ tasty-quickcheck
];
+ benchmarkHaskellDepends = [ base criterion ];
description = "Various trie implementations in Haskell";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -181090,6 +181500,8 @@ self: {
pname = "tskiplist";
version = "1.0.0";
sha256 = "aa20f823c787122858513b38207bc74e9eb032435ac7e6624569f1411d825e2d";
+ revision = "1";
+ editedCabalFile = "27204b6f7657f68fcab0bb7585905fe8d45177d2105352d17dec060b22115a98";
libraryHaskellDepends = [ array base containers random stm ];
homepage = "https://github.com/thaldyron/tskiplist";
description = "A Skip List Implementation in Software Transactional Memory (STM)";
@@ -181561,29 +181973,6 @@ self: {
}) {};
"turtle" = callPackage
- ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
- , criterion, directory, doctest, foldl, hostname, managed
- , optional-args, optparse-applicative, process, stm, system-fileio
- , system-filepath, temporary, text, time, transformers, unix
- , unix-compat
- }:
- mkDerivation {
- pname = "turtle";
- version = "1.3.1";
- sha256 = "233d05f8d73d171278be765872d623e56f1d795234a94d33a57f1bcca98edd5e";
- libraryHaskellDepends = [
- ansi-wl-pprint async base bytestring clock directory foldl hostname
- managed optional-args optparse-applicative process stm
- system-fileio system-filepath temporary text time transformers unix
- unix-compat
- ];
- testHaskellDepends = [ base doctest ];
- benchmarkHaskellDepends = [ base criterion text ];
- description = "Shell programming, Haskell-style";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "turtle_1_3_2" = callPackage
({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
, criterion, directory, doctest, foldl, hostname, managed
, optional-args, optparse-applicative, process, stm, system-fileio
@@ -181604,7 +181993,6 @@ self: {
benchmarkHaskellDepends = [ base criterion text ];
description = "Shell programming, Haskell-style";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"turtle-options" = callPackage
@@ -181674,6 +182062,34 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "tweet-hs" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, authenticate-oauth, base
+ , bytestring, composition, criterion, data-default, directory
+ , extra, hspec, hspec-megaparsec, http-client, http-client-tls
+ , http-types, lens, megaparsec, MissingH, optparse-applicative
+ , split, text
+ }:
+ mkDerivation {
+ pname = "tweet-hs";
+ version = "0.5.3.2";
+ sha256 = "749ac037384f0f9e09526cffcb7c1a55375480effeb3d586b19bcbb1f1c6e40e";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-wl-pprint authenticate-oauth base bytestring composition
+ data-default directory extra http-client http-client-tls http-types
+ lens megaparsec MissingH optparse-applicative split text
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base bytestring hspec hspec-megaparsec megaparsec
+ ];
+ benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
+ homepage = "https://github.com/vmchale/command-line-tweeter#readme";
+ description = "Command-line tool for twitter";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"twentefp" = callPackage
({ mkDerivation, base, gloss, parsec, time }:
mkDerivation {
@@ -182860,6 +183276,7 @@ self: {
];
description = "A stream based replacement for lists";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"typed-wire" = callPackage
@@ -184740,30 +185157,6 @@ self: {
}) {};
"unordered-containers" = callPackage
- ({ mkDerivation, base, bytestring, ChasingBottoms, containers
- , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
- , mtl, QuickCheck, random, test-framework, test-framework-hunit
- , test-framework-quickcheck2
- }:
- mkDerivation {
- pname = "unordered-containers";
- version = "0.2.7.2";
- sha256 = "7f5c4344fcab01f6046378c64522f0dfd69e417f6c1a8858a24bdabaadb3e56e";
- libraryHaskellDepends = [ base deepseq hashable ];
- testHaskellDepends = [
- base ChasingBottoms containers hashable HUnit QuickCheck
- test-framework test-framework-hunit test-framework-quickcheck2
- ];
- benchmarkHaskellDepends = [
- base bytestring containers criterion deepseq deepseq-generics
- hashable hashmap mtl random
- ];
- homepage = "https://github.com/tibbe/unordered-containers";
- description = "Efficient hashing-based container types";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "unordered-containers_0_2_8_0" = callPackage
({ mkDerivation, base, bytestring, ChasingBottoms, containers
, criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
, mtl, QuickCheck, random, test-framework, test-framework-hunit
@@ -184785,7 +185178,6 @@ self: {
homepage = "https://github.com/tibbe/unordered-containers";
description = "Efficient hashing-based container types";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"unordered-containers-rematch" = callPackage
@@ -184928,10 +185320,8 @@ self: {
}:
mkDerivation {
pname = "unsequential";
- version = "0.5.2";
- sha256 = "89e70fc1bcdb982cf832e20c5fe540524d885a22210b832d3e3ea7307e3c7b4a";
- revision = "1";
- editedCabalFile = "c74a7fd593a4e843d8d77e57180a71e5ed13a91fa8bfc2ea70453fc0f448f49e";
+ version = "0.5.2.1";
+ sha256 = "758767a7fe4757b5397e23a3c5344850298eec73414ca72f4f25397bf47e4302";
libraryHaskellDepends = [ base base-prelude dlist transformers ];
testHaskellDepends = [
attoparsec interspersed QuickCheck quickcheck-instances rebase
@@ -185746,8 +186136,8 @@ self: {
({ mkDerivation, base, QuickCheck }:
mkDerivation {
pname = "utility-ht";
- version = "0.0.12";
- sha256 = "a4445f436354599c1f3e923dfb3e4463b6f65e7c1dabea1e2d34d11c4a5b05ef";
+ version = "0.0.13";
+ sha256 = "952b77f060177f2eca3f61e2deec0e30693bb4471e936e13a7494a3e57f94cbe";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base QuickCheck ];
description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
@@ -187253,8 +187643,8 @@ self: {
}:
mkDerivation {
pname = "vectortiles";
- version = "1.2.0.2";
- sha256 = "9540f0b55c63ae9185a7e2e264a4f10a5fbd0e682e3ecad33e52245d5e32a886";
+ version = "1.2.0.4";
+ sha256 = "0624b74d6c02f7add5cba5f3410c156a50a38fd170aeda5224ab4ceb596ec3c4";
libraryHaskellDepends = [
base bytestring cereal containers deepseq protobuf text
transformers vector
@@ -187535,8 +187925,8 @@ self: {
}:
mkDerivation {
pname = "vimeta";
- version = "0.2.2.0";
- sha256 = "ce63a34e2c7fd31b2ad2a9f1e9b8c3d2c10c70e1ba5ccf2b06e8dc99770b065d";
+ version = "0.2.3.0";
+ sha256 = "e4450254730743448d4462907b8ee0249edc4725d81277b57f3cf85a6c964300";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -187893,14 +188283,12 @@ self: {
}) {};
"void" = callPackage
- ({ mkDerivation, base, deepseq, ghc-prim, hashable, semigroups }:
+ ({ mkDerivation, base }:
mkDerivation {
pname = "void";
- version = "0.7.1";
- sha256 = "c9f0fd93680c029abb9654b5464be260652829961b18b7046f96a0df95e825f4";
- libraryHaskellDepends = [
- base deepseq ghc-prim hashable semigroups
- ];
+ version = "0.7.2";
+ sha256 = "d3fffe66a03e4b53db1e459edf75ad8402385a817cae415d857ec0b03ce0cf2b";
+ libraryHaskellDepends = [ base ];
homepage = "http://github.com/ekmett/void";
description = "A Haskell 98 logically uninhabited data type";
license = stdenv.lib.licenses.bsd3;
@@ -188748,8 +189136,8 @@ self: {
}:
mkDerivation {
pname = "wai-middleware-auth";
- version = "0.1.1.1";
- sha256 = "591a7c723aac4916eec000d81c14c593d7ffbc497fc5afe7f41affa0f6975988";
+ version = "0.1.1.2";
+ sha256 = "f14016ba27f24a11395661cd2969cc41cf5a5043045468c584a0e03c4ddfa896";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -189901,8 +190289,8 @@ self: {
}:
mkDerivation {
pname = "wavefront";
- version = "0.7.0.3";
- sha256 = "7e6ee21fa04410c4c01f0b86fa0acdc3d4d64d3167614e2cb58ce7528bbd0d65";
+ version = "0.7.1";
+ sha256 = "a7598a4237dbb9008cf2c33b324fdc1625308b090b7bf969c66dba82ec442f6f";
libraryHaskellDepends = [
attoparsec base dlist filepath mtl text transformers vector
];
@@ -191402,16 +191790,17 @@ self: {
}) {};
"wires" = callPackage
- ({ mkDerivation, base, deepseq, profunctors, semigroupoids, these
+ ({ mkDerivation, base, deepseq, mtl, profunctors, semigroupoids
+ , these
}:
mkDerivation {
pname = "wires";
- version = "0.1.0";
- sha256 = "4145f1870301d1ba7af683ec17877450dbeaa93afa002d0cf9a36b1ef4248c65";
+ version = "0.2.0";
+ sha256 = "dd062d0863c401b3d54c404f95392d56a358fc4615fa614db60ae73cf66091b0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base deepseq profunctors semigroupoids these
+ base deepseq mtl profunctors semigroupoids these
];
homepage = "https://github.com/esoeylemez/wires";
description = "Functional reactive programming library";
@@ -191483,23 +191872,6 @@ self: {
}) {};
"witherable" = callPackage
- ({ mkDerivation, base, base-orphans, containers, hashable
- , transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "witherable";
- version = "0.1.3.3";
- sha256 = "6fdfd607e71b442d17b48ab7e00fe3d8dda2c39cf041134d01d49da83421cf6c";
- libraryHaskellDepends = [
- base base-orphans containers hashable transformers
- unordered-containers vector
- ];
- homepage = "https://github.com/fumieval/witherable";
- description = "Generalization of filter and catMaybes";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "witherable_0_1_3_4" = callPackage
({ mkDerivation, base, base-orphans, containers, hashable
, transformers, unordered-containers, vector
}:
@@ -191514,7 +191886,6 @@ self: {
homepage = "https://github.com/fumieval/witherable";
description = "filterable traversable";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"witness" = callPackage
@@ -192970,8 +193341,8 @@ self: {
}:
mkDerivation {
pname = "xdcc";
- version = "1.1.3";
- sha256 = "b34b1b10c8fc92347b0713b5b2d1ebb7450984fd7dd284d8501c291e016db49e";
+ version = "1.1.4";
+ sha256 = "a9c4f4c904bb6d4c634b224eb0587babc60cbee51a9d7ed6a487f138df266464";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -195372,8 +195743,8 @@ self: {
}:
mkDerivation {
pname = "yeshql";
- version = "2.2.0.0";
- sha256 = "3a17da3d051c19d44cd65bdccd3f47ca78c9df6b9190ca732dba16ad086c9e2d";
+ version = "3.0.0.1";
+ sha256 = "659327284a2293694684134911b9f7a705f05520b2cd8cf0d1b519c72e079de2";
libraryHaskellDepends = [
base containers convertible filepath HDBC parsec syb-with-class
template-haskell
@@ -195813,40 +196184,6 @@ self: {
}) {};
"yesod-bin" = callPackage
- ({ mkDerivation, async, attoparsec, base, base64-bytestring
- , blaze-builder, bytestring, Cabal, conduit, conduit-extra
- , containers, data-default-class, deepseq, directory, file-embed
- , filepath, fsnotify, http-client, http-client-tls
- , http-reverse-proxy, http-types, lifted-base, network
- , optparse-applicative, parsec, process, project-template
- , resourcet, safe-exceptions, say, shakespeare, split, stm
- , streaming-commons, tar, template-haskell, text, time
- , transformers, transformers-compat, typed-process, unix-compat
- , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib
- }:
- mkDerivation {
- pname = "yesod-bin";
- version = "1.5.2.1";
- sha256 = "21e10e0f15af8505ae575103e3bad4f660a9ded28baccf275255c3f55d59ce57";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- async attoparsec base base64-bytestring blaze-builder bytestring
- Cabal conduit conduit-extra containers data-default-class deepseq
- directory file-embed filepath fsnotify http-client http-client-tls
- http-reverse-proxy http-types lifted-base network
- optparse-applicative parsec process project-template resourcet
- safe-exceptions say shakespeare split stm streaming-commons tar
- template-haskell text time transformers transformers-compat
- typed-process unix-compat unordered-containers wai wai-extra warp
- warp-tls yaml zlib
- ];
- homepage = "http://www.yesodweb.com/";
- description = "The yesod helper executable";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-bin_1_5_2_2" = callPackage
({ mkDerivation, async, attoparsec, base, base64-bytestring
, blaze-builder, bytestring, Cabal, conduit, conduit-extra
, containers, data-default-class, deepseq, directory, file-embed
@@ -195878,7 +196215,6 @@ self: {
homepage = "http://www.yesodweb.com/";
description = "The yesod helper executable";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-bootstrap" = callPackage
@@ -195995,6 +196331,8 @@ self: {
pname = "yesod-core";
version = "1.4.32";
sha256 = "0a3389e0e5d188c0bfcb99bb39856adcde28a1ebf572c0aebf8afa0e34946869";
+ revision = "1";
+ editedCabalFile = "570c6168c84e518cc4978bfbbfd7a2cc23a04879937f66a8729eb592a9492af8";
libraryHaskellDepends = [
aeson auto-update base blaze-builder blaze-html blaze-markup
byteable bytestring case-insensitive cereal clientsession conduit
@@ -198316,26 +198654,27 @@ self: {
"zifter" = callPackage
({ mkDerivation, ansi-terminal, async, base, directory, exceptions
- , filepath, genvalidity, genvalidity-hspec, hspec
+ , filepath, genvalidity, genvalidity-hspec, genvalidity-path, hspec
, optparse-applicative, path, path-io, process, QuickCheck, safe
, stm, validity, validity-path
}:
mkDerivation {
pname = "zifter";
- version = "0.0.1.0";
- sha256 = "f161fdbc1db3ccfe65bb47552cabc883a7b5a99e12fb4c27015264fab7ac958a";
+ version = "0.0.1.1";
+ sha256 = "ea8c1a721789144ae7207474a91f0471d17c42aa5a8e6962eca93c41b189de45";
libraryHaskellDepends = [
ansi-terminal async base directory exceptions filepath
optparse-applicative path path-io process safe stm validity
validity-path
];
testHaskellDepends = [
- ansi-terminal base genvalidity genvalidity-hspec hspec path path-io
- QuickCheck stm
+ ansi-terminal base directory genvalidity genvalidity-hspec
+ genvalidity-path hspec path path-io QuickCheck stm
];
homepage = "http://cs-syd.eu";
description = "zifter";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"zifter-cabal" = callPackage
@@ -198352,6 +198691,7 @@ self: {
homepage = "http://cs-syd.eu";
description = "zifter-cabal";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"zifter-git" = callPackage
@@ -198364,6 +198704,7 @@ self: {
homepage = "http://cs-syd.eu";
description = "zifter-git";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"zifter-hindent" = callPackage
@@ -198380,6 +198721,7 @@ self: {
homepage = "http://cs-syd.eu";
description = "zifter-hindent";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"zifter-hlint" = callPackage
@@ -198395,6 +198737,7 @@ self: {
homepage = "http://cs-syd.eu";
description = "zifter-hlint";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"zifter-stack" = callPackage
@@ -198411,6 +198754,7 @@ self: {
homepage = "http://cs-syd.eu";
description = "zifter-stack";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"zigbee-znet25" = callPackage
@@ -198627,6 +198971,7 @@ self: {
homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme";
description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ziptastic-core" = callPackage
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 2093ec2b218..912d26c806c 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -38,6 +38,9 @@ rec {
addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x];
addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkgconfigDepends = (drv.pkgconfigDepends or []) ++ xs; });
+ addSetupDepend = drv: x: addSetupDepends drv [x];
+ addSetupDepends = drv: xs: overrideCabal drv (drv: { setupHaskellDepends = (drv.setupHaskellDepends or []) ++ xs; });
+
enableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f-${x}") "-f${x}";
disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}";
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index b4a9282e185..1928d51d3e5 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "groovy-${version}";
- version = "2.4.8";
+ version = "2.4.10";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
- sha256 = "1zcdkarz9mbx9k5sl69nbphjjcy0xd15zjicjnhp2wq32zm6b2k6";
+ sha256 = "1a8pqcrm014h4x54gqqyxp7r1vkwhphqwrfa7gnqr6nzdqxzyk8w";
};
buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix
index 296176148c7..78eb04601cd 100644
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -1,23 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, nix, git }: let
+{ stdenv, fetchurl, pkgconfig, nix, git, gcc6 }: let
version = "4.1.6";
in stdenv.mkDerivation {
name = "nix-exec-${version}";
src = fetchurl {
url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz";
-
sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar";
};
- buildInputs = [ pkgconfig nix git ];
+ buildInputs = [ pkgconfig nix git gcc6 ];
+
+ NIX_CFLAGS_COMPILE = "-std=c++1y";
meta = {
description = "Run programs defined in nix expressions";
-
homepage = https://github.com/shlevy/nix-exec;
-
license = stdenv.lib.licenses.mit;
-
platforms = nix.meta.platforms;
};
}
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index f32cb9db02a..f8c98c727f4 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, pkgconfig
, libjack2, libsndfile, fftw, curl, gcc
-, libXt, qt55, readline
+, libXt, qtbase, qttools, qtwebkit, readline
, useSCEL ? false, emacs
}:
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
-DSC_EL=${if useSCEL then "ON" else "OFF"}
'';
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig qttools ];
buildInputs = [
- gcc libjack2 libsndfile fftw curl libXt qt55.qtwebkit qt55.qttools readline ]
+ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebkit readline ]
++ optional useSCEL emacs;
meta = {
diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index 277886d717a..4433a3df45d 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1";
hydraPlatforms = [];
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ goibhniu urkud ];
+ maintainers = with maintainers; [ goibhniu ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index e44ad424e0c..cd2ffe55664 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+ maintainers = with stdenv.lib.maintainers; [ raskin ];
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix
index 3174dc57667..d883100fd3c 100644
--- a/pkgs/development/libraries/attica/default.nix
+++ b/pkgs/development/libraries/attica/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Library to access Open Collaboration Service providers";
license = "LGPL";
- maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
+ maintainers = [ maintainers.sander maintainers.phreedom ];
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index d3e655676e6..d3b6722b36c 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
stdenv.mkDerivation rec {
name = "actor-framework-${version}";
@@ -11,8 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "0202nsdriigdh6sxi1k3hddvmf1x54qpykbvf2ghfhzyh0m1q7j2";
};
+ # See https://github.com/actor-framework/actor-framework/issues/545 and remove on next release that incorporates this
+ patches = [ (fetchpatch {
+ url = "https://github.com/actor-framework/actor-framework/commit/c5a3ee26a6e76b28dd4226f35230b280f291386d.patch";
+ sha256 = "1l0323cqyqlp3lvggm709fmfm6lk6av1smdbd420adhi3ksj2vhj";
+ }) ];
+
nativeBuildInputs = [ cmake ];
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "An open source implementation of the actor model in C++";
homepage = http://actor-framework.org/;
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index e1b87fafd8e..3db8b719f77 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -9,7 +9,7 @@
assert glSupport -> mesa_noglu != null;
-with { inherit (stdenv.lib) optional optionals; };
+let inherit (stdenv.lib) optional optionals; in
stdenv.mkDerivation rec {
name = "cairo-1.14.8";
diff --git a/pkgs/development/libraries/capnproto/clang4.patch b/pkgs/development/libraries/capnproto/clang4.patch
new file mode 100644
index 00000000000..e83abe9f433
--- /dev/null
+++ b/pkgs/development/libraries/capnproto/clang4.patch
@@ -0,0 +1,22 @@
+From 0f1fd1938b19dccdb5dbfe9cb5177c4342a2a5b5 Mon Sep 17 00:00:00 2001
+From: Eric Fiselier
+Date: Thu, 29 Dec 2016 14:23:40 -0700
+Subject: [PATCH] Fix conversion build error when building with Clang 4.0
+
+---
+ c++/src/capnp/layout.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/c++/src/capnp/layout.h b/c++/src/capnp/layout.h
+index 850925a..b955f08 100644
+--- a/src/capnp/layout.h
++++ b/src/capnp/layout.h
+@@ -126,7 +126,7 @@template <> struct ElementSizeForType { static constexpr ElementSize value
+ template <> struct ElementSizeForType { static constexpr ElementSize value = ElementSize::BIT; };
+
+ // Lists and blobs are pointers, not structs.
+-template struct ElementSizeForType> {
++template struct ElementSizeForType> {
+ static constexpr ElementSize value = ElementSize::POINTER;
+ };
+ template <> struct ElementSizeForType {
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index 839d48e488f..0a5df88efdb 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "1yvaadhgakskqq5wpv53hd6fc3pp17mrdldw4i5cvgck4iwprcfd";
};
+ patches = [
+ # Remove once they release a version above 0.5.3. See https://github.com/sandstorm-io/capnproto/issues/433
+ ./clang4.patch
+ ];
+
meta = with stdenv.lib; {
homepage = "http://kentonv.github.io/capnproto";
description = "Cap'n Proto cerealization protocol";
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index c6523921fb5..9d7c9c4f30f 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = {
description = "C/C++ library for numbers, a part of GiNaC";
homepage = http://www.ginac.de/CLN/;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = with stdenv.lib.platforms; allBut cygwin;
};
}
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index ef2ac6f9385..39296f86d8e 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
description = "Clutter-GTK";
homepage = http://www.clutter-project.org/;
license = stdenv.lib.licenses.lgpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
+ maintainers = with stdenv.lib.maintainers; [ lethalman ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index fc80b0ec2b2..af7acb35aac 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl2Plus;
homepage = http://www.clutter-project.org/;
- maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
+ maintainers = with stdenv.lib.maintainers; [ lethalman ];
platforms = stdenv.lib.platforms.mesaPlatforms;
};
}
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index df983ff3471..4d27552d735 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
homepage = http://dbus.freedesktop.org;
license = with stdenv.lib.licenses; [ afl21 gpl2 ];
description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism";
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix
new file mode 100644
index 00000000000..83466b693f5
--- /dev/null
+++ b/pkgs/development/libraries/docopt_cpp/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, cmake, python }:
+
+stdenv.mkDerivation rec {
+ version = "0.6.2";
+ name = "docopt.cpp-${version}";
+
+ src = fetchFromGitHub {
+ owner = "docopt";
+ repo = "docopt.cpp";
+ rev = "v${version}";
+ sha256 = "1rgkc8nsc2zz2lkyai0y68vrd6i6kbq63hm3vdza7ab6ghq0n1dd";
+ };
+
+ nativeBuildInputs = [ cmake python ];
+
+ cmakeFlags = ["-DWITH_TESTS=ON"];
+
+ doCheck = true;
+
+ checkPhase = "LD_LIBRARY_PATH=$(pwd) python ./run_tests";
+
+ meta = with stdenv.lib; {
+ description = "C++11 port of docopt";
+ homepage = https://github.com/docopt/docopt.cpp;
+ license = with licenses; [ mit boost ];
+ platforms = platforms.all;
+ maintainers = with maintainers; [ knedlsepp ];
+ };
+}
+
diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix
index 04e7b5e38cb..8841855a24e 100644
--- a/pkgs/development/libraries/eigen/2.0.nix
+++ b/pkgs/development/libraries/eigen/2.0.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
license = licenses.lgpl3Plus;
homepage = http://eigen.tuxfamily.org ;
- maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ];
+ maintainers = with stdenv.lib.maintainers; [ sander raskin ];
branch = "2";
platforms = with stdenv.lib.platforms; unix;
};
diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix
index b4cb1029001..582b4fed9df 100644
--- a/pkgs/development/libraries/eigen/3.3.nix
+++ b/pkgs/development/libraries/eigen/3.3.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
license = licenses.lgpl3Plus;
homepage = http://eigen.tuxfamily.org ;
platforms = platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ];
+ maintainers = with stdenv.lib.maintainers; [ sander raskin ];
inherit version;
};
}
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 374f52c9cb0..5869276a797 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
license = licenses.lgpl3Plus;
homepage = http://eigen.tuxfamily.org ;
platforms = platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ];
+ maintainers = with stdenv.lib.maintainers; [ sander raskin ];
inherit version;
};
}
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index 260a424038f..03473881339 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
meta = {
homepage = http://www.freedesktop.org/wiki/Software/Farstream;
description = "Audio/Video Communications Framework formely known as farsight";
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 146fd66deff..287a0742440 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -9,11 +9,11 @@
useEncumberedCode ? true,
}:
-with { inherit (stdenv.lib) optional optionals optionalString; };
+let
+ inherit (stdenv.lib) optional optionals optionalString;
+ version = "2.7.1"; name = "freetype-" + version;
-let version = "2.7.1"; name = "freetype-" + version; in
-
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
inherit name;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix
index 161d836bf31..d0850128ebc 100644
--- a/pkgs/development/libraries/funambol/default.nix
+++ b/pkgs/development/libraries/funambol/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = {
description = "SyncML client sdk by Funambol project";
homepage = http://www.funambol.com;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 9eb71fc708f..5d8d98af8d3 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
description = "C library of programming buildings blocks";
homepage = http://www.gtk.org/;
license = licenses.lgpl2Plus;
- maintainers = with maintainers; [ lovek323 raskin urkud ];
+ maintainers = with maintainers; [ lovek323 raskin ];
platforms = platforms.unix;
longDescription = ''
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index b5cd936ce4f..14104b30d12 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, m4, cxx ? true, withStatic ? true }:
-with { inherit (stdenv.lib) optional optionalString; };
+let inherit (stdenv.lib) optional optionalString; in
let self = stdenv.mkDerivation rec {
name = "gmp-5.1.3";
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 4d12ed8a8b1..bb4e40dd3a7 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, m4, cxx ? true, withStatic ? false }:
-with { inherit (stdenv.lib) optional optionalString; };
+let inherit (stdenv.lib) optional optionalString; in
let self = stdenv.mkDerivation rec {
name = "gmp-6.1.1";
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 7154db626aa..4773cc38000 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A middleware layer between C libraries and language bindings";
homepage = http://live.gnome.org/GObjectIntrospection;
- maintainers = with maintainers; [ lovek323 urkud lethalman ];
+ maintainers = with maintainers; [ lovek323 lethalman ];
platforms = platforms.unix;
longDescription = ''
diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5.x.nix
index b4aa9414163..fb6af9c895d 100644
--- a/pkgs/development/libraries/grantlee/5.x.nix
+++ b/pkgs/development/libraries/grantlee/5.x.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
and the design of Django is reused in Grantlee.'';
homepage = http://gitorious.org/grantlee;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
inherit (qtbase.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
index bb2461a98a1..3944d2ecab6 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
and the design of Django is reused in Grantlee.'';
homepage = http://gitorious.org/grantlee;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
index d298fbd7fc3..74b1417e069 100644
--- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost, glib, qt4, cmake
+{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost155, glib, qt4, cmake
, automoc4, flex, bison, pkgconfig }:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ gstreamer gst-plugins-base glib qt4 ];
- propagatedBuildInputs = [ boost ];
+ propagatedBuildInputs = [ boost155 ];
nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index d21fef3e674..10f01294301 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
license = licenses.lgpl2Plus;
- maintainers = with maintainers; [ urkud raskin vcunat lethalman ];
+ maintainers = with maintainers; [ raskin vcunat lethalman ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix
index 39d5b2c792a..5a1af01c3b1 100644
--- a/pkgs/development/libraries/herqq/default.nix
+++ b/pkgs/development/libraries/herqq/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
homepage = http://herqq.org;
description = "A software library for building UPnP devices and control points";
inherit (qt4.meta) platforms;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix
index eebd105a00d..424ffd18499 100644
--- a/pkgs/development/libraries/hspell/default.nix
+++ b/pkgs/development/libraries/hspell/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
description = "Hebrew spell checker";
homepage = http://hspell.ivrix.org.il/;
platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
# Note that I don't speak hebrew, so I can only fix compile problems
};
}
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index ea0919caa31..b64d8c84e22 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation ({
meta = with stdenv.lib; {
description = "Unicode and globalization support library";
homepage = http://site.icu-project.org/;
- maintainers = with maintainers; [ raskin urkud ];
+ maintainers = with maintainers; [ raskin ];
platforms = platforms.all;
};
} // (if stdenv.isArm then {
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index ed742888a0e..7d07408236e 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://pkg-isocodes.alioth.debian.org/;
description = "Various ISO codes packaged as XML files";
- maintainers = [ maintainers.urkud ];
+ maintainers = [ ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 36b2c469eaf..34e7e4a761f 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, fetchpatch, libjpeg, cmake }:
stdenv.mkDerivation rec {
- name = "jasper-2.0.10";
+ name = "jasper-2.0.12";
src = fetchurl {
# You can find this code on Github at https://github.com/mdadams/jasper
# however note at https://www.ece.uvic.ca/~frodo/jasper/#download
# not all tagged releases are for distribution.
url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz";
- sha256 = "1s022mfxyw8jw60fgyj60lbm9h6bc4nk2751b0in8qsjwcl59n2l";
+ sha256 = "1njdbxv7d4anzrd476wjww2qsi96dd8vfnp4hri0srrqxpszl92v";
};
# newer reconf to recognize a multiout flag
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
moveToOutput bin "$bin"
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://www.ece.uvic.ca/~frodo/jasper/;
description = "JPEG2000 Library";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index 776a7646bd7..bd740b75758 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
platforms = platforms.linux;
- maintainers = [ maintainers.urkud ];
+ maintainers = [ ];
license = stdenv.lib.licenses.lgpl3;
description = "An opensource database of photographic lenses and their characteristics";
homepage = http://lensfun.sourceforge.net/;
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index 3528edcba12..b3345c47732 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/libass/libass;
license = licenses.isc;
platforms = platforms.unix;
- maintainers = with maintainers; [ codyopel urkud ];
+ maintainers = with maintainers; [ codyopel ];
repositories.git = git://github.com/libass/libass.git;
};
}
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 6d81a284040..e0b4babc970 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -17,7 +17,7 @@
assert faacSupport -> enableUnfree;
-with { inherit (stdenv.lib) optional optionals hasPrefix; };
+let inherit (stdenv.lib) optional optionals hasPrefix; in
/* ToDo:
- more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools
diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix
new file mode 100644
index 00000000000..34ab70e0adc
--- /dev/null
+++ b/pkgs/development/libraries/libblocksruntime/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, clang }:
+
+stdenv.mkDerivation {
+ name = "blocksruntime";
+
+ src = fetchFromGitHub {
+ owner = "mackyle";
+ repo = "blocksruntime";
+ rev = "b5c5274daf1e0e46ecc9ad8f6f69889bce0a0a5d";
+ sha256 = "0ic4lagagkylcvwgf10mg0s1i57h4i25ds2fzvms22xj4zwzk1sd";
+ };
+
+ buildInputs = [ clang ];
+
+ configurePhase = ''
+ export CC=clang
+ export CXX=clang++
+ '';
+
+ buildPhase = "./buildlib";
+
+ checkPhase = "./checktests";
+
+ doCheck = false; # hasdescriptor.c test fails, hrm.
+
+ installPhase = ''prefix="/" DESTDIR=$out ./installlib'';
+}
diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index d49f4cc6a72..34ba39d799e 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Provides a Qt implementation of the DBusMenu spec";
inherit homepage;
- maintainers = [ maintainers.urkud ];
+ maintainers = [ ];
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/libdc1394/darwin-fixes.patch b/pkgs/development/libraries/libdc1394/darwin-fixes.patch
new file mode 100644
index 00000000000..5356a111112
--- /dev/null
+++ b/pkgs/development/libraries/libdc1394/darwin-fixes.patch
@@ -0,0 +1,24 @@
+diff -Naur libdc1394-2.2.5-old/dc1394/bayer.c libdc1394-2.2.5-new/dc1394/bayer.c
+--- libdc1394-2.2.5-old/dc1394/bayer.c 2016-10-11 02:19:10.000000000 -0400
++++ libdc1394-2.2.5-new/dc1394/bayer.c 2017-03-28 17:59:02.000000000 -0400
+@@ -775,7 +775,7 @@
+ {
+ uint8_t *outR, *outG, *outB;
+ register int i, j;
+- uint tmp;
++ uint32_t tmp;
+ int st=sx*sy;
+ int p;
+ int sx2=sx<<1;
+diff -Naur libdc1394-2.2.5-old/dc1394/macosx/capture.c libdc1394-2.2.5-new/dc1394/macosx/capture.c
+--- libdc1394-2.2.5-old/dc1394/macosx/capture.c 2016-12-20 08:10:34.000000000 -0500
++++ libdc1394-2.2.5-new/dc1394/macosx/capture.c 2017-03-28 17:58:38.000000000 -0400
+@@ -614,7 +614,7 @@
+ dc1394video_frame_t * frame_tmp = capture->frames + next;
+ char ch;
+
+- if(craw->frames==NULL || craw->capture_is_set==0) {
++ if(craw->capture.frames==NULL || craw->capture_is_set==0) {
+ *frame=NULL;
+ return DC1394_CAPTURE_IS_NOT_SET;
+ }
diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix
index c1d11ce87ee..036adcef74c 100644
--- a/pkgs/development/libraries/libdc1394/default.nix
+++ b/pkgs/development/libraries/libdc1394/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isLinux libraw1394
++ stdenv.lib.optional stdenv.isDarwin CoreServices;
+ patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fixes.patch;
+
meta = with stdenv.lib; {
homepage = http://sourceforge.net/projects/libdc1394/;
description = "Capture and control API for IIDC compliant cameras";
diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix
index 68bd72f3e0f..20e74cdc151 100644
--- a/pkgs/development/libraries/libdevil/default.nix
+++ b/pkgs/development/libraries/libdevil/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats";
license = licenses.lgpl2;
platforms = platforms.mesaPlatforms;
- maintainers = [ maintainers.phreedom maintainers.urkud ];
+ maintainers = [ maintainers.phreedom ];
};
}
diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix
index 26cf2c023eb..390bb4ea9e4 100644
--- a/pkgs/development/libraries/libdmtx/default.nix
+++ b/pkgs/development/libraries/libdmtx/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
description = "An open source software for reading and writing Data Matrix barcodes";
homepage = http://libdmtx.org;
platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index e35da9e8087..60400712e30 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -33,6 +33,6 @@ in stdenv.mkDerivation rec {
description = "Library used by gtkpod to access the contents of an ipod";
license = "LGPL";
platforms = stdenv.lib.platforms.gnu;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index a22b99be8da..588d0b8dadc 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
, python, perl, gdk_pixbuf, libiconv, libintlOrEmpty }:
-with { inherit (stdenv.lib) optionals; };
+let inherit (stdenv.lib) optionals; in
stdenv.mkDerivation rec {
name = "libgsf-1.14.41";
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 8901fef21fd..69bd6702ef5 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
postInstall = ''
for bin in $out/bin/*; do
wrapProgram "$bin" \
- --prefix "PATH" : "$out/bin:${hivex}/bin" \
+ --prefix "PATH" : "$out/bin:${hivex}/bin:${qemu}/bin" \
--prefix "PERL5LIB" : "$PERL5LIB:$out/lib/perl5/site_perl"
done
'';
diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix
index aee95b1f1af..7a3eb9caa66 100644
--- a/pkgs/development/libraries/libkate/default.nix
+++ b/pkgs/development/libraries/libkate/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
in an Ogg container. It can carry Unicode text, images, and animate
them.'';
homepage = http://code.google.com/p/libkate;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index ad578ac272b..0beb689090a 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
repositories.git = git://github.com/lastfm/liblastfm.git;
description = "Official LastFM library";
inherit (qt4.meta) platforms;
- maintainers = with stdenv.lib.maintainers; [ urkud phreedom ];
+ maintainers = with stdenv.lib.maintainers; [ phreedom ];
};
}
diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix
index 3af1227c69b..e505871eb02 100644
--- a/pkgs/development/libraries/liblqr-1/default.nix
+++ b/pkgs/development/libraries/liblqr-1/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
homepage = http://liblqr.wikidot.com;
description = "Seam-carving C/C++ library called Liquid Rescaling";
platforms = platforms.all;
- maintainers = [ maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix
index 441b4ea7f9a..d1dd7860de4 100644
--- a/pkgs/development/libraries/libmms/default.nix
+++ b/pkgs/development/libraries/libmms/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://libmms.sourceforge.net;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix
index 103595bc035..ff627499855 100644
--- a/pkgs/development/libraries/libmng/default.nix
+++ b/pkgs/development/libraries/libmng/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics";
homepage = http://www.libmng.com;
license = licenses.zlib;
- maintainers = with maintainers; [ marcweber urkud ];
+ maintainers = with maintainers; [ marcweber ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index e1902263ac2..b187c213bee 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
systems. We implement MTP Basic, the stuff proposed for standardization.
'';
platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/libmusicbrainz/2.x.nix b/pkgs/development/libraries/libmusicbrainz/2.x.nix
index 4cad0c0f9f6..f12b854e778 100644
--- a/pkgs/development/libraries/libmusicbrainz/2.x.nix
+++ b/pkgs/development/libraries/libmusicbrainz/2.x.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
The libmusicbrainz (also known as mb_client or MusicBrainz Client
Library) is a development library geared towards developers who wish to
add MusicBrainz lookup capabilities to their applications.'';
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix
index 5ec8f80f7e0..4765e90c6df 100644
--- a/pkgs/development/libraries/libmusicbrainz/5.x.nix
+++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
The libmusicbrainz (also known as mb_client or MusicBrainz Client
Library) is a development library geared towards developers who wish to
add MusicBrainz lookup capabilities to their applications.'';
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix
index 99c253cdb35..596399c4fa8 100644
--- a/pkgs/development/libraries/libmusicbrainz/default.nix
+++ b/pkgs/development/libraries/libmusicbrainz/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
The libmusicbrainz (also known as mb_client or MusicBrainz Client
Library) is a development library geared towards developers who wish to
add MusicBrainz lookup capabilities to their applications.'';
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix
index cdde02c361f..fe38755f10c 100644
--- a/pkgs/development/libraries/libnatspec/default.nix
+++ b/pkgs/development/libraries/libnatspec/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (rec {
homepage = http://natspec.sourceforge.net/ ;
description = "A library intended to smooth national specificities in using of programs";
platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
NIX_LDFLAGS = "-liconv";
diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix
index 396e8e92acf..7927dba8983 100644
--- a/pkgs/development/libraries/libofx/default.nix
+++ b/pkgs/development/libraries/libofx/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
homepage = http://libofx.sourceforge.net/;
license = "LGPL";
platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix
index 0689be2c621..83bb80cc320 100644
--- a/pkgs/development/libraries/liboggz/default.nix
+++ b/pkgs/development/libraries/liboggz/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
interleaving data container developed by Monty at Xiph.Org, originally to
support the Ogg Vorbis audio format but now used for many free codecs
including Dirac, FLAC, Speex and Theora.'';
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index b98fdbdb470..7ff44db52a8 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
meta = {
homepage = http://github.com/JonathanBeck/libplist;
platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
knownVulnerabilities = [
"CVE-2017-5209: base64decode function in base64.c allows attackers to obtain sensitive information from process memory or cause a denial of service"
"CVE-2017-5545: attackers to obtain sensitive information from process memory or cause a denial of service"
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index 734760c8830..abc0eb4a228 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An advanced calculator library";
homepage = http://qalculate.github.io;
- maintainers = with maintainers; [ urkud gebner ];
+ maintainers = with maintainers; [ gebner ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix
index f84cfa044c6..1271089060b 100644
--- a/pkgs/development/libraries/librdf/raptor2.nix
+++ b/pkgs/development/libraries/librdf/raptor2.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
description = "The RDF Parser Toolkit";
homepage = "http://librdf.org/raptor";
license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
- maintainers = with stdenv.lib.maintainers; [ marcweber urkud ];
+ maintainers = with stdenv.lib.maintainers; [ marcweber ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index 6a5e4578cac..8a0ca6f000d 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
description = "Library that handles Resource Description Framework (RDF)";
homepage = "http://librdf.org/rasqal";
license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
- maintainers = with stdenv.lib.maintainers; [ marcweber urkud ];
+ maintainers = with stdenv.lib.maintainers; [ marcweber ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 025a2ee37ff..1db053ef398 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "SSH client library";
license = licenses.lgpl2Plus;
- maintainers = with maintainers; [ sander urkud ];
+ maintainers = with maintainers; [ sander ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 0e53d27c889..4320cacc590 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
description = "A client-side C library implementing the SSH2 protocol";
homepage = http://www.libssh2.org;
platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 3a00408c7ca..d92674e59ef 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "libtoxcore-${version}";
- version = "0.1.6";
+ version = "0.1.7";
src = fetchFromGitHub {
owner = "TokTok";
repo = "c-toxcore";
rev = "v${version}";
- sha256 = "0a00gjar6ibaqa2cm81867nk7chsd141v360268v7ym2mxwa0ya6";
+ sha256 = "11lqq825id174xdjxm0cy5dbyvmdy841hjy9q3l51yiya9f82d5b";
};
cmakeFlags = [
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 947a10c0e47..5a76a93b8e3 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
homepage = http://www.libusb.info;
description = "User-space USB library";
platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index 0018e38a9f9..8cebaeee2af 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl
, nettle, libgcrypt, pythonPackages, gobjectIntrospection, libcap_ng, numactl
-, xen
+, xen, libapparmor
}:
let
@@ -15,9 +15,11 @@ in stdenv.mkDerivation rec {
buildInputs = [
pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt
- python pygobject2 gobjectIntrospection libcap_ng numactl xen
+ python pygobject2 gobjectIntrospection libcap_ng numactl xen libapparmor
];
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "Library for working with virtual machines";
longDescription = ''
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 5fcdd153c99..96649a0927e 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,36 +1,38 @@
{ stdenv, fetchurl, fetchpatch
, pkgconfig, makeWrapper
-, libxml2, gnutls, devicemapper, perl, python2
+, libxml2, gnutls, devicemapper, perl, python2, attr
, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
-, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng
+, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, curl, libiconv, gmp, xen, zfs
}:
+
+with stdenv.lib;
+
# if you update, also bump pythonPackages.libvirt or it will break
stdenv.mkDerivation rec {
name = "libvirt-${version}";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchurl {
url = "http://libvirt.org/sources/${name}.tar.xz";
- sha256 = "0php6wxjcilpir0miwg06yd2ha25zi9fv2apvvgv5c8k1svjd7cx";
+ sha256 = "1a9j6yqfy7i5yv414wk6nv26a5bpfyyg0rpcps6ybi6a1yd04ybq";
};
patches = [ ./build-on-bsd.patch ];
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [
- libxml2 gnutls perl python2 readline
- gettext libtasn1 libgcrypt yajl
- libxslt xhtml1 perlPackages.XMLXPath curl libpcap
- ] ++ stdenv.lib.optionals stdenv.isLinux [
- libpciaccess devicemapper lvm2 utillinux systemd libcap_ng
- libnl numad numactl xen zfs
- ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
+ attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap
+ ] ++ optionals stdenv.isLinux [
+ libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs
+ libapparmor libcap_ng numactl xen
+ ] ++ optionals stdenv.isDarwin [
libiconv gmp
];
- preConfigure = stdenv.lib.optionalString stdenv.isLinux ''
+ preConfigure = optionalString stdenv.isLinux ''
PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH
substituteInPlace configure \
--replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"'
@@ -48,13 +50,16 @@ stdenv.mkDerivation rec {
"--with-test"
"--with-esx"
"--with-remote"
- ] ++ stdenv.lib.optionals stdenv.isLinux [
+ ] ++ optionals stdenv.isLinux [
+ "--with-attr"
+ "--with-apparmor"
+ "--with-secdriver-apparmor"
"--with-numad"
"--with-macvtap"
"--with-virtualport"
- "--with-init-script=redhat"
+ "--with-init-script=systemd+redhat"
"--with-storage-zfs"
- ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ ] ++ optionals stdenv.isDarwin [
"--with-init-script=none"
];
@@ -66,17 +71,19 @@ stdenv.mkDerivation rec {
postInstall = ''
sed -i 's/ON_SHUTDOWN=suspend/ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}/' $out/libexec/libvirt-guests.sh
substituteInPlace $out/libexec/libvirt-guests.sh \
- --replace "$out/bin" "${gettext}/bin"
- '' + stdenv.lib.optionalString stdenv.isLinux ''
+ --replace "$out/bin" "${gettext}/bin" \
+ --replace "lock/subsys" "lock"
+ rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
+ '' + optionalString stdenv.isLinux ''
wrapProgram $out/sbin/libvirtd \
- --prefix PATH : ${stdenv.lib.makeBinPath [ iptables iproute pmutils numad numactl ]}
+ --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl ]}
'';
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
- meta = with stdenv.lib; {
+ meta = {
homepage = http://libvirt.org/;
repositories.git = git://libvirt.org/libvirt.git;
description = ''
diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index 0cb405d4837..57dfe34132f 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://libwpg.sourceforge.net;
description = "C++ library to parse WPG";
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index eac07ddbfb1..ea8bd57766b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -32,8 +32,10 @@ else
let
defaultGalliumDrivers =
- if (stdenv.isArm || stdenv.isAarch64)
- then ["nouveau" "freedreno" "vc4" "etnaviv"]
+ if stdenv.isArm
+ then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"]
+ else if stdenv.isAarch64
+ then ["nouveau" "vc4" ]
else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"];
defaultDriDrivers =
if (stdenv.isArm || stdenv.isAarch64)
diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix
index 48abf2b6151..741ca96348d 100644
--- a/pkgs/development/libraries/mp4v2/default.nix
+++ b/pkgs/development/libraries/mp4v2/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://code.google.com/p/mp4v2;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index 5fb9cc36e96..3033c4301af 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -13,7 +13,7 @@ assert enableAsioLib -> boost != null;
assert enableGetAssets -> libxml2 != null;
assert enableJemalloc -> jemalloc != null;
-with { inherit (stdenv.lib) optional; };
+let inherit (stdenv.lib) optional; in
stdenv.mkDerivation rec {
name = "nghttp2-${version}";
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index 564bf9f62e3..3483d4bed77 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
description = "Network Connectivity Tracking library for Desktop Applications";
homepage = https://launchpad.net/ntrack;
platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index b124e592f36..61024a33113 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
meta = {
platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index fc63c1942c2..0888fba4eca 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://p11-glue.freedesktop.org/;
platforms = platforms.all;
- maintainers = with maintainers; [ urkud wkennington ];
+ maintainers = with maintainers; [ wkennington ];
license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 22cf7be84d0..b90ff39dc1f 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
homepage = http://www.pango.org/;
license = licenses.lgpl2Plus;
- maintainers = with maintainers; [ raskin urkud ];
+ maintainers = with maintainers; [ raskin ];
platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index d226a51d0f8..8df18530472 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
name = "pcre2-${version}";
- version = "10.22";
+ version = "10.23";
src = fetchurl {
url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
- sha256 = "05pl338962d7syd1rbkg96916mq7d3amz1n2fjnm0v5cyhcldd5j";
+ sha256 = "0vn5g0mkkp99mmzpissa06hpyj6pk9s4mlwbjqrjvw3ihy8rpiyz";
};
configureFlags = [
@@ -14,6 +14,23 @@ stdenv.mkDerivation rec {
"--enable-jit"
];
+ patches = [
+ (fetchpatch {
+ name = "CVE-2017-7186-part1.patch";
+ url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_ucd.c?view=patch&r1=316&r2=670&sortby=date";
+ sha256 = "10yzglvbn7h06hg7zffr5zh378i5jihvx7d5gggkynws79vgwvfr";
+ stripLen = 2;
+ addPrefixes = true;
+ })
+ (fetchpatch {
+ name = "CVE-2017-7186-part2.patch";
+ url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_internal.h?view=patch&r1=600&r2=670&sortby=date";
+ sha256 = "1bggk7vd5hg0bjg96lj4h1lacmr6grq68dm6iz1n7vg3zf7virjn";
+ stripLen = 2;
+ addPrefixes = true;
+ })
+ ];
+
outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ];
postFixup = ''
diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
new file mode 100644
index 00000000000..0f971cff64d
--- /dev/null
+++ b/pkgs/development/libraries/poco/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysql }:
+
+stdenv.mkDerivation rec {
+ name = "poco-${version}";
+
+ version = "1.7.8";
+
+ src = fetchurl {
+ url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz";
+ sha256 = "17y6kvj4qdpb3p1im8n9qfylfh4bd2xsvbpn24jv97x7f146nhjf";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysql ];
+
+ cmakeFlags = [
+ "-DMYSQL_INCLUDE_DIR=${libmysql.dev}/include/mysql"
+ "-DPOCO_UNBUNDLED=ON"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://pocoproject.org/;
+ description = "Cross-platform C++ libraries with a network/internet focus";
+ license = licenses.boost;
+ maintainers = with maintainers; [ orivej ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index d7569c017a7..5f5dcfb71e6 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
homepage = http://podofo.sourceforge.net;
description = "A library to work with the PDF file format";
platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 27482743d2c..c1f8725f6f7 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
homepage = http://www.freedesktop.org/wiki/Software/polkit;
description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes";
platforms = platforms.linux;
- maintainers = [ maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix
index 7beb93eb462..29ff988a226 100644
--- a/pkgs/development/libraries/prison/default.nix
+++ b/pkgs/development/libraries/prison/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Qt4 library for QR-codes";
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix
index 6a951fddb79..2265d0df394 100644
--- a/pkgs/development/libraries/qca2/default.nix
+++ b/pkgs/development/libraries/qca2/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
description = "Qt Cryptographic Architecture";
license = "LGPL";
homepage = http://delta.affinix.com/qca;
- maintainers = [ maintainers.sander maintainers.urkud ];
+ maintainers = [ maintainers.sander ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index 1d4da00bf4c..6ab134a0306 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake qt4 ];
meta = {
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix
index 5a448d33067..48a63e41234 100644
--- a/pkgs/development/libraries/qoauth/default.nix
+++ b/pkgs/development/libraries/qoauth/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation {
meta = {
description = "Qt library for OAuth authentication";
inherit (qt4.meta) platforms;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index d4b85e0dfe4..46bb7a4e8fa 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -54,6 +54,12 @@ stdenv.mkDerivation rec {
# there might be more references, but this is the only one I could find
substituteInPlace tools/macdeployqt/tests/tst_deployment_mac.cpp \
--replace /usr/lib/libstdc++.6.dylib "${stdenv.cc}/lib/libstdc++.6.dylib"
+ '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+ substituteInPlace src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp \
+ --replace 'optionalHeight > 0' 'optionalHeight != NULL'
+
+ substituteInPlace ./tools/linguist/linguist/messagemodel.cpp \
+ --replace 'm->comment()) >= 0' 'm->comment()) != NULL'
'';
patches =
@@ -211,7 +217,7 @@ stdenv.mkDerivation rec {
homepage = http://qt-project.org/;
description = "A cross-platform application framework for C++";
license = licenses.lgpl21Plus; # or gpl3
- maintainers = with maintainers; [ lovek323 phreedom sander urkud ];
+ maintainers = with maintainers; [ lovek323 phreedom sander ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
deleted file mode 100644
index b7e8fb33387..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-
-# Minor Updates
-
-1. Edit ./fetchsrcs.sh to point to the updated URL.
-2. Run ./fetchsrcs.sh.
-3. Build and enjoy.
-
-# Major Updates
-
-1. Make a copy of this directory. (We like to keep the old version around
- for a short time after major updates.)
-2. Delete the tmp/ subdirectory of the copy.
-3. Follow the minor update instructions above.
-4. Package any new Qt modules, if necessary.
-
-*/
-
-{
- newScope,
- stdenv, fetchurl, makeSetupHook, makeWrapper,
- bison, cups ? null, harfbuzz, mesa, perl,
- libgnomeui, GConf, gnome_vfs,
- gstreamer, gst-plugins-base,
-
- # options
- developerBuild ? false,
- decryptSslTraffic ? false,
-}:
-
-with stdenv.lib;
-
-let
-
- mirror = "http://download.qt.io";
- srcs = import ./srcs.nix { inherit mirror; inherit fetchurl; };
-
- qtSubmodule = args:
- let
- inherit (args) name;
- inherit (srcs."${args.name}") version src;
- inherit (stdenv) mkDerivation;
- in mkDerivation (args // {
- name = "${name}-${version}";
- inherit src;
-
- propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
- nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.qmakeHook ];
-
- NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
-
- outputs = args.outputs or [ "out" "dev" ];
- setOutputFlags = args.setOutputFlags or false;
-
- setupHook = ../qtsubmodule-setup-hook.sh;
-
- enableParallelBuilding = args.enableParallelBuilding or true;
-
- meta = self.qtbase.meta // (args.meta or {});
- });
-
- addPackages = self: with self;
- let
- callPackage = self.newScope { inherit qtSubmodule srcs; };
- in {
-
- qtbase = callPackage ./qtbase {
- inherit bison cups harfbuzz mesa;
- # GNOME dependencies are not used unless gtkStyle == true
- inherit libgnomeui GConf gnome_vfs;
- inherit developerBuild decryptSslTraffic;
- };
-
- /* qt3d = not packaged */
- /* qtactiveqt = not packaged */
- /* qtandroidextras = not packaged */
- /* qtcanvas3d = not packaged */
- qtconnectivity = callPackage ./qtconnectivity.nix {};
- qtdeclarative = callPackage ./qtdeclarative {};
- qtdoc = callPackage ./qtdoc.nix {};
- qtenginio = callPackage ./qtenginio.nix {};
- qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {};
- qtimageformats = callPackage ./qtimageformats.nix {};
- qtlocation = callPackage ./qtlocation.nix {};
- /* qtmacextras = not packaged */
- qtmultimedia = callPackage ./qtmultimedia.nix {
- inherit gstreamer gst-plugins-base;
- };
- qtquick1 = callPackage ./qtquick1 {};
- qtquickcontrols = callPackage ./qtquickcontrols.nix {};
- qtquickcontrols2 = null;
- qtscript = callPackage ./qtscript {};
- qtsensors = callPackage ./qtsensors.nix {};
- qtserialport = callPackage ./qtserialport {};
- qtsvg = callPackage ./qtsvg.nix {};
- qttools = callPackage ./qttools {};
- qttranslations = callPackage ./qttranslations.nix {};
- /* qtwayland = not packaged */
- /* qtwebchannel = not packaged */
- /* qtwebengine = not packaged */
- qtwebkit = callPackage ./qtwebkit {};
- qtwebkit-examples = callPackage ./qtwebkit-examples.nix {};
- qtwebsockets = callPackage ./qtwebsockets.nix {};
- /* qtwinextras = not packaged */
- qtx11extras = callPackage ./qtx11extras.nix {};
- qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
-
- env = callPackage ../qt-env.nix {};
- full = env "qt-${qtbase.version}" [
- qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats
- qtlocation qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport
- qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwebsockets qtx11extras
- qtxmlpatterns
- ];
-
- makeQtWrapper =
- makeSetupHook
- { deps = [ makeWrapper ]; }
- ../make-qt-wrapper.sh;
-
- qmakeHook =
- makeSetupHook
- { deps = [ self.qtbase.dev ]; }
- ../qmake-hook.sh;
-
- };
-
- self = makeScope newScope addPackages;
-
-in self
diff --git a/pkgs/development/libraries/qt-5/5.5/fetch.sh b/pkgs/development/libraries/qt-5/5.5/fetch.sh
deleted file mode 100755
index 512d985f346..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/fetch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/ \
- http://download.qt.io/community_releases/5.5/5.5.1/ \
- -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch
deleted file mode 100644
index 63c4ab7256a..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-Index: qtbase-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ qtbase-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
- endif()
- !!ENDIF
-
--!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
--!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
--!!ELSE
--get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
--# Use original install prefix when loaded through a
--# cross-prefix symbolic link such as /lib -> /usr/lib.
--get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
--get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
--if(_realCurr STREQUAL _realOrig)
-- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
--else()
-- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
--endif()
--unset(_realOrig)
--unset(_realCurr)
--unset(_IMPORT_PREFIX)
--!!ENDIF
--!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
--!!ELSE
--set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
--!!ENDIF
--
- !!IF !equals(TEMPLATE, aux)
- # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
- set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
-@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+ if(NOT EXISTS \"${imported_location}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+ endif()
- !!ELSE
- set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ENDIF
-@@ -74,45 +53,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
- \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
- )
-
--!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ELSE
-- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ENDIF
-- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
-- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
-- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
-- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
-- )
-- endif()
--!!ENDIF
- endmacro()
- !!ENDIF
-
- if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-
- !!IF !no_module_headers
--!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
-- )
--!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
-- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
-- )
--!!ELSE
-- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
--!!ENDIF
--!!ELSE
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
-- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
-+ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR\" \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
- !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
-+ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
-+ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
- )
- !!ELSE
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
-@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
- !!ENDIF
- !!ENDIF
--!!ENDIF
-+
- !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
- include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
- !!ENDIF
-@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
-
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
- !!IF isEmpty(CMAKE_DEBUG_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
-- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
-- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
--!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
- if (EXISTS
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
-+ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
- !!ELSE
- \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
- !!ENDIF
- AND EXISTS
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
-+ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ELSE
- \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ENDIF
- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
- endif()
- !!ENDIF // CMAKE_DEBUG_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- !!ENDIF // CMAKE_RELEASE_TYPE
-
- !!IF !isEmpty(CMAKE_DEBUG_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
-- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
--!!ELSE
- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
- !!IF isEmpty(CMAKE_RELEASE_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
-- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
-- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
--!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
- if (EXISTS
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-+ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
- !!ELSE
- \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
- !!ENDIF
- AND EXISTS
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
-+ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
- !!ELSE
- \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
- !!ENDIF
- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
- endif()
- !!ENDIF // CMAKE_RELEASE_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -329,7 +259,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
- !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
-+ set(imported_location \"@NIX_OUT@/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
- !!ELSE
- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in
-@@ -2,7 +2,7 @@
- !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
-
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
--set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
-+set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\")
- !!ELSE
- set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
- !!ENDIF
-@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert
- set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ELSE
- set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ENDIF
-
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-+ set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ELSE
- set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
- add_executable(Qt5::uic IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
- add_executable(Qt5::qmake IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
- add_executable(Qt5::moc IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)
- add_executable(Qt5::rcc IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain)
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
- set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ELSE
- set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ENDIF
-@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain)
- set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ELSE
- set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-+++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-@@ -1,6 +1,6 @@
-
- !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-+++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-@@ -1,6 +1,6 @@
-
- !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.6.0/src/qtbase/dbus/Qt5DBusConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.6.0.orig/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.6.0/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
- add_executable(Qt5::qdbuscpp2xml IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
- add_executable(Qt5::qdbusxml2cpp IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch
deleted file mode 100644
index 08d12087f08..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-@@ -68,10 +68,7 @@ void TableGenerator::initPossibleLocatio
- // the QTCOMPOSE environment variable
- if (qEnvironmentVariableIsSet("QTCOMPOSE"))
- m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
-- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
-- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
-- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
-- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
-+ m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale"));
- m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
- m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
- }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch
deleted file mode 100644
index 2cb3f7dfa70..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -48,7 +48,7 @@
- ****************************************************************************/
-
- //#define QSSLSOCKET_DEBUG
--//#define QT_DECRYPT_SSL_TRAFFIC
-+#define QT_DECRYPT_SSL_TRAFFIC
-
- #include "qssl_p.h"
- #include "qsslsocket_openssl_p.h"
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
deleted file mode 100644
index 141acfc3e57..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ /dev/null
@@ -1,293 +0,0 @@
-{ stdenv, lib, fetchpatch, copyPathsToStore
-, srcs
-
-, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
-, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon
-, fontconfig, freetype, harfbuzz
-, openssl, dbus, glib, udev, libxml2, libxslt, pcre16
-, zlib, libjpeg, libpng, libtiff, sqlite, icu
-
-, coreutils, bison, flex, gdb, gperf, lndir
-, patchelf, perl, pkgconfig, python2
-
-# optional dependencies
-, cups ? null
-, mysql ? null, postgresql ? null
-
-# options
-, mesaSupported, mesa
-, buildExamples ? false
-, buildTests ? false
-, developerBuild ? false
-, libgnomeui, GConf, gnome_vfs, gtk2
-, decryptSslTraffic ? false
-}:
-
-let
- inherit (srcs.qt5) version;
- system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
-
- # Search path for Gtk plugin
- gtkLibPath = lib.makeLibraryPath [ gtk2 gnome_vfs libgnomeui GConf ];
-
- dontInvalidateBacking = fetchpatch {
- url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c";
- name = "qtbug-48321-dont-invalidate-backing-store.patch";
- sha256 = "1wynm2hhbhpvzvsz4vpzzkl0ss5skac6934bva8brcpi5xq68h1q";
- };
-in
-
-stdenv.mkDerivation {
-
- name = "qtbase-${version}";
- inherit version;
-
- srcs = with srcs; [ qt5.src qtbase.src ];
-
- sourceRoot = "qt-everywhere-opensource-src-${version}";
-
- outputs = [ "out" "dev" "gtk" ];
-
- postUnpack = ''
- mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase
- '';
-
- patches =
- copyPathsToStore (lib.readPathsFromFile ./. ./series)
- ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
- ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
-
- postPatch =
- ''
- cd qtbase
- patch -p1 <${dontInvalidateBacking}
- cd ..
-
- substituteInPlace configure --replace /bin/pwd pwd
- substituteInPlace qtbase/configure --replace /bin/pwd pwd
- substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
- sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
-
- sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in"
- sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake"
- sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in"
- sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
-
- substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \
- --replace "@glibc@" "${stdenv.cc.libc.out}"
- substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \
- --replace "@glibc@" "${stdenv.cc.libc.out}"
-
- substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \
- --replace "@libXcursor@" "${libXcursor.out}"
-
- substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \
- --replace "@openssl@" "${openssl.out}"
-
- substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \
- --replace "@dbus_libs@" "${dbus.lib}"
-
- substituteInPlace \
- qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
- --replace "@libX11@" "${libX11.out}"
- ''
- + lib.optionalString mesaSupported ''
- substituteInPlace \
- qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
- --replace "@mesa_lib@" "${mesa.out}"
- substituteInPlace qtbase/mkspecs/common/linux.conf \
- --replace "@mesa_lib@" "${mesa.out}" \
- --replace "@mesa_inc@" "${mesa.dev}"
- '';
-
-
- setOutputFlags = false;
- preConfigure = ''
- export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
- export MAKEFLAGS=-j$NIX_BUILD_CORES
-
- configureFlags+="\
- -plugindir $out/lib/qt5/plugins \
- -importdir $out/lib/qt5/imports \
- -qmldir $out/lib/qt5/qml \
- -docdir $out/share/doc/qt5"
- '';
-
- prefixKey = "-prefix ";
-
- # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa
- # TODO Remove obsolete and useless flags once the build will be totally mastered
- configureFlags = ''
- -verbose
- -confirm-license
- -opensource
-
- -release
- -shared
- -c++11
- ${lib.optionalString developerBuild "-developer-build"}
- -largefile
- -accessibility
- -rpath
- -optimized-qmake
- -strip
- -no-reduce-relocations
- -system-proxies
- -pkg-config
-
- -gui
- -widgets
- -opengl desktop
- -qml-debug
- -nis
- -iconv
- -icu
- -pch
- -glib
- -xcb
- -qpa xcb
- -${lib.optionalString (cups == null) "no-"}cups
- -gtkstyle
-
- -no-eglfs
- -no-directfb
- -no-linuxfb
- -no-kms
-
- ${lib.optionalString (!system-x86_64) "-no-sse2"}
- -no-sse3
- -no-ssse3
- -no-sse4.1
- -no-sse4.2
- -no-avx
- -no-avx2
- -no-mips_dsp
- -no-mips_dspr2
-
- -system-zlib
- -system-libpng
- -system-libjpeg
- -system-harfbuzz
- -system-xcb
- -system-xkbcommon
- -system-pcre
- -openssl-linked
- -dbus-linked
-
- -system-sqlite
- -${if mysql != null then "plugin" else "no"}-sql-mysql
- -${if postgresql != null then "plugin" else "no"}-sql-psql
-
- -make libs
- -make tools
- -${lib.optionalString (buildExamples == false) "no"}make examples
- -${lib.optionalString (buildTests == false) "no"}make tests
- '';
-
- # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
- # if dependency paths contain the string "pq", which can occur in the hash.
- # To prevent these failures, we need to override PostgreSQL detection.
- PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
-
- propagatedBuildInputs = [
- dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib
-
- # Image formats
- libjpeg libpng libtiff
-
- # Text rendering
- fontconfig freetype harfbuzz icu
-
- # X11 libs
- xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
- xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
- ]
- ++ lib.optional mesaSupported mesa;
-
- buildInputs =
- [ bison flex gperf ]
- ++ lib.optional developerBuild gdb
- ++ lib.optional (cups != null) cups
- ++ lib.optional (mysql != null) mysql.lib
- ++ lib.optional (postgresql != null) postgresql
- # FIXME: move to the main list on rebuild.
- ++ [gnome_vfs.out libgnomeui.out gtk2 GConf];
-
- nativeBuildInputs = [ lndir patchelf perl pkgconfig python2 ];
-
- # freetype-2.5.4 changed signedness of some struct fields
- NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
-
- postInstall = ''
- find "$out" -name "*.cmake" | while read file; do
- substituteInPlace "$file" \
- --subst-var-by NIX_OUT "$out" \
- --subst-var-by NIX_DEV "$dev"
- done
- '';
-
- preFixup = ''
- # We cannot simply set these paths in configureFlags because libQtCore retains
- # references to the paths it was built with.
- moveToOutput "bin" "$dev"
- moveToOutput "include" "$dev"
- moveToOutput "mkspecs" "$dev"
-
- # The destination directory must exist or moveToOutput will do nothing
- mkdir -p "$dev/share"
- moveToOutput "share/doc" "$dev"
-
- # Move the QGtkStyle plugin to the gtk output
- mkdir -p "$gtk/lib/qt5/plugins/platformthemes"
- mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes"
- rm "$out/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake"
-
- # Set RPATH for QGtkStyle plugin
- qgtk2="$gtk/lib/qt5/plugins/platformthemes/libqgtk2.so"
- qgtk2_RPATH="$(patchelf --print-rpath "$qgtk2")"
- qgtk2_RPATH="$qgtk2_RPATH''${qgtk2_RPATH:+:}${gtkLibPath}"
- patchelf "$qgtk2" \
- --add-needed libgtk-x11-2.0.so \
- --add-needed libgnomeui-2.so \
- --add-needed libgnomevfs-2.so \
- --add-needed libgconf-2.so \
- --set-rpath "$qgtk2_RPATH"
- '';
-
- postFixup =
- ''
- # Don't retain build-time dependencies like gdb.
- sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
-
- # Move libtool archives and qmake projects
- if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
- pushd "''${!outputLib}"
- find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \
- while read -r file; do
- mkdir -p "''${!outputDev}/$(dirname "$file")"
- mv "''${!outputLib}/$file" "''${!outputDev}/$file"
- done
- popd
- fi
- ''
-
- # fixup .pc file (where to find 'moc' etc.)
- + lib.optionalString (!stdenv.isDarwin) ''
- sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
- -e "/^host_bins=/ c host_bins=$dev/bin"
- '';
-
- inherit lndir;
- setupHook = ../../qtbase-setup-hook.sh;
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- homepage = http://www.qt.io;
- description = "A cross-platform application framework for C++";
- license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
- maintainers = with maintainers; [ qknight ttuegel ];
- platforms = platforms.linux;
- };
-
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch
deleted file mode 100644
index 401cfd5c295..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/dbus/qdbus_symbols.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp
-@@ -89,7 +89,7 @@ bool qdbus_loadLibDBus()
- #ifdef Q_OS_WIN
- QLatin1String("dbus-1"),
- #endif
-- QLatin1String("libdbus-1")
-+ QLatin1String("@dbus_libs@/lib/libdbus-1")
- };
-
- lib->unload();
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch
deleted file mode 100644
index 59f510ac54d..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-@@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const
- {
- extern const QString qt_gl_library_name();
- // QLibrary lib(qt_gl_library_name());
-+ // Check system library paths first
- QLibrary lib(QLatin1String("GL"));
-+ if (!lib.load()) {
-+ // Fallback to Mesa driver
-+ lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL"));
-+ }
- glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
- }
- }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch
deleted file mode 100644
index e66ce1676d3..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c
- #ifdef XCB_USE_XLIB
- static bool function_ptrs_not_initialized = true;
- if (function_ptrs_not_initialized) {
-- QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
-+ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1);
- bool xcursorFound = xcursorLib.load();
- if (!xcursorFound) { // try without the version number
-- xcursorLib.setFileName(QLatin1String("Xcursor"));
-+ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor"));
- xcursorFound = xcursorLib.load();
- }
- if (xcursorFound) {
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch
deleted file mode 100644
index 1cc6fac583b..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -640,8 +640,8 @@ static QPair loadO
- #endif
- #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
- // first attempt: the canonical name is libssl.so.
-- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
-- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
-+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
-+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
- if (libcrypto->load() && libssl->load()) {
- // libssl.so. and libcrypto.so. found
- return pair;
-@@ -658,8 +658,8 @@ static QPair loadO
- // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
- // attempt, _after_ /Contents/Frameworks has been searched.
- // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
-- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
-- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
-+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1);
-+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1);
- if (libcrypto->load() && libssl->load()) {
- // libssl.so.0 and libcrypto.so.0 found
- return pair;
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
deleted file mode 100644
index 20e56bf3149..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qdnslookup_unix.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp
-@@ -79,7 +79,7 @@ static void resolveLibrary()
- if (!lib.load())
- #endif
- {
-- lib.setFileName(QLatin1String("resolv"));
-+ lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
- if (!lib.load())
- return;
- }
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qhostinfo_unix.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp
-@@ -95,7 +95,7 @@ static void resolveLibrary()
- if (!lib.load())
- #endif
- {
-- lib.setFileName(QLatin1String("resolv"));
-+ lib.setFileName(QLatin1String("@glibc@/lib/libresolv"));
- if (!lib.load())
- return;
- }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch
deleted file mode 100644
index e483ad14e05..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001
-From: hasufell
-Date: Sat, 10 Oct 2015 01:15:01 +0200
-Subject: [PATCH] Fix compilation with libressl
-
-By additionally checking for defined(SSL_CTRL_SET_CURVES), which
-is defined in openssl, but not in libressl.
----
- src/network/ssl/qsslcontext_openssl.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/qtbase/src/network/ssl/qsslcontext_openssl.cpp b/qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index b88ab54..cfc4f6d 100644
---- a/qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ b/qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -338,7 +338,7 @@ init_context:
-
- const QVector qcurves = sslContext->sslConfiguration.ellipticCurves();
- if (!qcurves.isEmpty()) {
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
- // Set the curves to be used
- if (q_SSLeay() >= 0x10002000L) {
- // SSL_CTX_ctrl wants a non-const pointer as last argument,
-@@ -352,7 +352,7 @@ init_context:
- return sslContext;
- }
- } else
--#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
-+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
- {
- // specific curves requested, but not possible to set -> error
- sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2"));
---
-2.6.0
-
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch
deleted file mode 100644
index 56ee0a411d4..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/mkspecs/common/linux.conf
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
-@@ -12,8 +12,8 @@ QMAKE_INCDIR =
- QMAKE_LIBDIR =
- QMAKE_INCDIR_X11 =
- QMAKE_LIBDIR_X11 =
--QMAKE_INCDIR_OPENGL =
--QMAKE_LIBDIR_OPENGL =
-+QMAKE_INCDIR_OPENGL = @mesa_inc@/include
-+QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib
- QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
- QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
- QMAKE_INCDIR_EGL =
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch
deleted file mode 100644
index b4561db6e77..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/kernel/qcoreapplication.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/kernel/qcoreapplication.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/kernel/qcoreapplication.cpp
-@@ -2498,6 +2498,16 @@ QStringList QCoreApplication::libraryPat
- }
- }
- }
-+ qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes
-+
-+ // Add library paths derived from NIX_PROFILES.
-+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+ const QString plugindir = QString::fromLatin1("/lib/qt5/plugins");
-+ Q_FOREACH (const QByteArray &profile, profiles) {
-+ if (!profile.isEmpty()) {
-+ app_libpaths->append(QFile::decodeName(profile) + plugindir);
-+ }
-+ }
- }
- return *(coreappdata()->app_libpaths);
- }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/series b/pkgs/development/libraries/qt-5/5.5/qtbase/series
deleted file mode 100644
index 1dfd8ac2683..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/series
+++ /dev/null
@@ -1,10 +0,0 @@
-dlopen-resolv.patch
-tzdir.patch
-dlopen-libXcursor.patch
-dlopen-openssl.patch
-dlopen-dbus.patch
-xdg-config-dirs.patch
-nix-profiles-library-paths.patch
-compose-search-path.patch
-libressl.patch
-cmake-paths.patch
\ No newline at end of file
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch
deleted file mode 100644
index 92adeda8273..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -62,7 +62,10 @@ typedef QHash Q
- // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
- static QTzTimeZoneHash loadTzTimeZones()
- {
-- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
-+ QString path = qgetenv("TZDIR");
-+ path += "/zone.tab";
-+ if (!QFile::exists(path))
-+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
- if (!QFile::exists(path))
- path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
-
-@@ -560,12 +563,18 @@ void QTzTimeZonePrivate::init(const QByt
- if (!tzif.open(QIODevice::ReadOnly))
- return;
- } else {
-- // Open named tz, try modern path first, if fails try legacy path
-- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+ // Try TZDIR first
-+ QString zoneinfoDir = qgetenv("TZDIR");
-+ zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId);
-+ tzif.setFileName(zoneinfoDir);
- if (!tzif.open(QIODevice::ReadOnly)) {
-- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-- if (!tzif.open(QIODevice::ReadOnly))
-- return;
-+ // Open named tz, try modern path first, if fails try legacy path
-+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+ if (!tzif.open(QIODevice::ReadOnly)) {
-+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+ if (!tzif.open(QIODevice::ReadOnly))
-+ return;
-+ }
- }
- }
-
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch
deleted file mode 100644
index 24dc3bde148..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/io/qsettings.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings.cpp
-@@ -1131,6 +1131,24 @@ QConfFileSettingsPrivate::QConfFileSetti
- if (!application.isEmpty())
- confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
- confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false));
-+
-+#if !defined(Q_OS_WIN)
-+ // Add directories specified in $XDG_CONFIG_DIRS
-+ const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS"));
-+ if (!pathEnv.isEmpty()) {
-+ const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts);
-+ if (!pathEntries.isEmpty()) {
-+ int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those.
-+ for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) {
-+ const QString& path = pathEntries.at(k);
-+ if (!application.isEmpty())
-+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false));
-+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false));
-+ }
-+ }
-+ }
-+#endif
-+
- #else
- QString confName = getPath(format, QSettings::UserScope) + org;
- if (!application.isEmpty())
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings_p.h
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/io/qsettings_p.h
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings_p.h
-@@ -240,7 +240,7 @@ public:
- F_Organization = 0x1,
- F_User = 0x0,
- F_System = 0x2,
-- NumConfFiles = 4
-+ NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis
- #else
- SandboxConfFile = 0,
- NumConfFiles = 1
diff --git a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
deleted file mode 100644
index 95cd6fea79b..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
- name = "qtconnectivity";
- qtInputs = [ qtbase qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
deleted file mode 100644
index 9b6a6c46176..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ qtSubmodule, lib, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
-
-qtSubmodule {
- name = "qtdeclarative";
- patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
- qtInputs = [ qtbase qtsvg qtxmlpatterns ];
- nativeBuildInputs = [ python2 ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/nix-profiles-import-paths.patch
deleted file mode 100644
index 06b244b974f..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/nix-profiles-import-paths.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
-===================================================================
---- qtdeclarative-opensource-src-5.5.1.orig/src/qml/qml/qqmlimport.cpp
-+++ qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
-@@ -1549,6 +1549,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q
- QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
- addImportPath(installImportsPath);
-
-+ // Add library paths derived from NIX_PROFILES.
-+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+ const QString qmldir = QString::fromLatin1("/lib/qt5/qml");
-+ Q_FOREACH (const QByteArray &profile, profiles) {
-+ if (!profile.isEmpty()) {
-+ addImportPath(QFile::decodeName(profile) + qmldir);
-+ }
-+ }
-+
- // env import paths
- QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
- if (!envImportPath.isEmpty()) {
diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/series
deleted file mode 100644
index 7dbe197c56e..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/series
+++ /dev/null
@@ -1 +0,0 @@
-nix-profiles-import-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.5/qtdoc.nix b/pkgs/development/libraries/qt-5/5.5/qtdoc.nix
deleted file mode 100644
index 578ea6ba0b2..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtdoc.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
- name = "qtdoc";
- qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
deleted file mode 100644
index b860a73ef89..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
- name = "qtenginio";
- qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix
deleted file mode 100644
index 3273f12eb83..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
- name = "qtgraphicaleffects";
- qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.5/qtimageformats.nix
deleted file mode 100644
index 03d0fffbe80..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtimageformats.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
- name = "qtimageformats";
- qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
deleted file mode 100644
index 1e134057c4b..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtmultimedia }:
-
-qtSubmodule {
- name = "qtlocation";
- qtInputs = [ qtbase qtmultimedia ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
deleted file mode 100644
index 7c1cc5da07e..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative, pkgconfig
-, alsaLib, gstreamer, gst-plugins-base, libpulseaudio
-}:
-
-qtSubmodule {
- name = "qtmultimedia";
- qtInputs = [ qtbase qtdeclarative ];
- buildInputs = [
- pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio
- ];
- qmakeFlags = [ "GST_VERSION=1.0" ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
deleted file mode 100644
index 64937b3dcd3..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ qtSubmodule, lib, copyPathsToStore, qtscript, qtsvg, qtwebkit, qtxmlpatterns }:
-
-qtSubmodule {
- name = "qtquick1";
- patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
- qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch
deleted file mode 100644
index c01061d3378..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qtquick1-opensource-src-5.5.1/src/declarative/qml/qdeclarativeimport.cpp
-===================================================================
---- qtquick1-opensource-src-5.5.1.orig/src/declarative/qml/qdeclarativeimport.cpp
-+++ qtquick1-opensource-src-5.5.1/src/declarative/qml/qdeclarativeimport.cpp
-@@ -725,6 +725,15 @@ QDeclarativeImportDatabase::QDeclarative
-
- addImportPath(installImportsPath);
-
-+ // Add library paths derived from NIX_PROFILES.
-+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+ const QString importdir = QString::fromLatin1("/lib/qt5/imports");
-+ Q_FOREACH (const QByteArray &profile, profiles) {
-+ if (!profile.isEmpty()) {
-+ addImportPath(QFile::decodeName(profile) + importdir);
-+ }
-+ }
-+
- // env import paths
- QByteArray envImportPath = qgetenv("QML_IMPORT_PATH");
- if (!envImportPath.isEmpty()) {
diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/series b/pkgs/development/libraries/qt-5/5.5/qtquick1/series
deleted file mode 100644
index 7dbe197c56e..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtquick1/series
+++ /dev/null
@@ -1 +0,0 @@
-nix-profiles-import-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix
deleted file mode 100644
index 93a864621b8..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
- name = "qtquickcontrols";
- qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.5/qtscript/0001-glib-2.32.patch
deleted file mode 100644
index 887e107b6c1..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtscript/0001-glib-2.32.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From abd80356449bb36c8adcc5c9ca1df6b47715d265 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Sun, 23 Aug 2015 09:13:34 -0500
-Subject: [PATCH] glib-2.32
-
----
- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-index 1f6d25e..087c3fb 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-@@ -81,7 +81,7 @@
- #include
- #elif PLATFORM(GTK)
- #include
--typedef struct _GMutex GMutex;
-+typedef union _GMutex GMutex;
- typedef struct _GCond GCond;
- #endif
-
---
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
deleted file mode 100644
index 127766e2ebd..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ qtSubmodule, qtbase, qttools }:
-
-qtSubmodule {
- name = "qtscript";
- qtInputs = [ qtbase qttools ];
- patches = [ ./0001-glib-2.32.patch ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
deleted file mode 100644
index 61e64dc47e4..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
- name = "qtsensors";
- qtInputs = [ qtbase qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch
deleted file mode 100644
index 3a813dc8007..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Sun, 23 Aug 2015 09:16:02 -0500
-Subject: [PATCH] dlopen serialport udev
-
----
- src/serialport/qtudev_p.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h
-index 6f2cabd..81b9849 100644
---- a/src/serialport/qtudev_p.h
-+++ b/src/serialport/qtudev_p.h
-@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
- inline bool resolveSymbols(QLibrary *udevLibrary)
- {
- if (!udevLibrary->isLoaded()) {
-- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
-+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
- if (!udevLibrary->load()) {
-- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
-+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
- if (!udevLibrary->load()) {
- qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
- return false;
---
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
deleted file mode 100644
index 2bffd0a2bd6..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ qtSubmodule, qtbase, substituteAll, systemd }:
-
-qtSubmodule {
- name = "qtserialport";
- qtInputs = [ qtbase ];
- patches = [
- (substituteAll {
- src = ./0001-dlopen-serialport-udev.patch;
- libudev = systemd.lib;
- })
- ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
deleted file mode 100644
index b9ccac7cf93..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
- name = "qtsvg";
- qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch
deleted file mode 100644
index fe5bcadbe9a..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
-===================================================================
---- qttools-opensource-src-5.5.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in
-+++ qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
-@@ -2,11 +2,10 @@
- if (NOT TARGET Qt5::qcollectiongenerator)
- add_executable(Qt5::qcollectiongenerator IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
--!!ELSE
-- set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-+ if(NOT EXISTS \"${imported_location}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-+ endif()
- _qt5_Help_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::qcollectiongenerator PROPERTIES
-Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
-===================================================================
---- qttools-opensource-src-5.5.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in
-+++ qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
-@@ -44,11 +44,10 @@ endmacro()
- if (NOT TARGET Qt5::lrelease)
- add_executable(Qt5::lrelease IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
--!!ELSE
-- set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
-+ if(NOT EXISTS \"${imported_location}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
-+ endif()
- _qt5_LinguistTools_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::lrelease PROPERTIES
-@@ -59,11 +58,10 @@ endif()
- if (NOT TARGET Qt5::lupdate)
- add_executable(Qt5::lupdate IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
--!!ELSE
-- set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
-+ if(NOT EXISTS \"${imported_location}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
-+ endif()
- _qt5_LinguistTools_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::lupdate PROPERTIES
-@@ -74,11 +72,10 @@ endif()
- if (NOT TARGET Qt5::lconvert)
- add_executable(Qt5::lconvert IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
--!!ELSE
-- set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
-+ if(NOT EXISTS \"${imported_location}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
-+ endif()
- _qt5_LinguistTools_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::lconvert PROPERTIES
diff --git a/pkgs/development/libraries/qt-5/5.5/qttools/default.nix b/pkgs/development/libraries/qt-5/5.5/qttools/default.nix
deleted file mode 100644
index d72d7b6c64c..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qttools/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ qtSubmodule, lib, copyPathsToStore, qtbase }:
-
-qtSubmodule {
- name = "qttools";
- qtInputs = [ qtbase ];
- patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
- postFixup = ''
- moveToOutput "bin/qdbus" "$out"
- moveToOutput "bin/qtpaths" "$out"
- '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qttools/series b/pkgs/development/libraries/qt-5/5.5/qttools/series
deleted file mode 100644
index 6cc1d3b87bc..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qttools/series
+++ /dev/null
@@ -1 +0,0 @@
-cmake-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.5/qttranslations.nix b/pkgs/development/libraries/qt-5/5.5/qttranslations.nix
deleted file mode 100644
index 50fc8cf6826..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qttranslations.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qttools }:
-
-qtSubmodule {
- name = "qttranslations";
- qtInputs = [ qttools ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix
deleted file mode 100644
index 64f85c42d19..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qttools, qtwebkit }:
-
-qtSubmodule {
- name = "qtwebkit-examples";
- qtInputs = [ qttools qtwebkit ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch
deleted file mode 100644
index 0eeacce1bc0..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 862ce7d357a3ec32683ac6ec7c0ebdc9346b44ba Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Sun, 23 Aug 2015 09:18:54 -0500
-Subject: [PATCH 1/3] dlopen webkit nsplugin
-
----
- Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +-
- Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +-
- Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-index a923d49..2731d05 100644
---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0)
- }
- }
-
-- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
-+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
- if (library.load()) {
- typedef void *(*gtk_init_check_ptr)(int*, char***);
- gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
-diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-index de06a2f..363bde5 100644
---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-@@ -697,7 +697,7 @@ static Display *getPluginDisplay()
- // support gdk based plugins (like flash) that use a different X connection.
- // The code below has the same effect as this one:
- // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
-- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0);
- if (!library.load())
- return 0;
-
-diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-index d734ff6..62a2197 100644
---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-@@ -64,7 +64,7 @@ static Display* getPluginDisplay()
- // The code below has the same effect as this one:
- // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
-
-- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0);
- if (!library.load())
- return 0;
-
---
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch
deleted file mode 100644
index bb5d1f74364..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Sun, 23 Aug 2015 09:19:16 -0500
-Subject: [PATCH 2/3] dlopen webkit gtk
-
----
- Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-index 8de6521..0b25748 100644
---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr
-
- static bool initializeGtk()
- {
-- QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
-+ QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
- if (!gtkLibrary.load())
- return false;
- typedef void* (*gtk_init_ptr)(void*, void*);
---
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch
deleted file mode 100644
index 1c360cd81aa..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Sun, 23 Aug 2015 09:19:29 -0500
-Subject: [PATCH 3/3] dlopen webkit udev
-
----
- Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp
-index 60ff317..da8ac69 100644
---- a/Source/WebCore/platform/qt/GamepadsQt.cpp
-+++ b/Source/WebCore/platform/qt/GamepadsQt.cpp
-@@ -111,12 +111,12 @@ private:
- bool load()
- {
- m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint);
-- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1);
-+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
- m_loaded = m_libUdev.load();
- if (resolveMethods())
- return true;
-
-- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0);
-+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
- m_loaded = m_libUdev.load();
- return resolveMethods();
- }
---
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
deleted file mode 100644
index 35568c1eb2f..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors
-, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
-, sqlite, systemd, glib, gst_all_1
-, bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
-, substituteAll
-, flashplayerFix ? false
-}:
-
-with stdenv.lib;
-
-qtSubmodule {
- name = "qtwebkit";
- qtInputs = [ qtdeclarative qtlocation qtsensors ];
- buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
- nativeBuildInputs = [
- bison2 flex gdb gperf perl pkgconfig python2 ruby
- ];
- patches =
- let dlopen-webkit-nsplugin = substituteAll {
- src = ./0001-dlopen-webkit-nsplugin.patch;
- gtk = gtk2.out;
- gdk_pixbuf = gdk_pixbuf.out;
- };
- dlopen-webkit-gtk = substituteAll {
- src = ./0002-dlopen-webkit-gtk.patch;
- gtk = gtk2.out;
- };
- dlopen-webkit-udev = substituteAll {
- src = ./0003-dlopen-webkit-udev.patch;
- libudev = systemd.lib;
- };
- in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
- ++ [ dlopen-webkit-udev ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
deleted file mode 100644
index fbdfbbcf0db..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
- name = "qtwebsockets";
- qtInputs = [ qtbase qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
deleted file mode 100644
index a765161e2d7..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
- name = "qtx11extras";
- qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
deleted file mode 100644
index 9a8ddbba2bd..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
- name = "qtxmlpatterns";
- qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.5/srcs.nix b/pkgs/development/libraries/qt-5/5.5/srcs.nix
deleted file mode 100644
index 20aa28a55da..00000000000
--- a/pkgs/development/libraries/qt-5/5.5/srcs.nix
+++ /dev/null
@@ -1,261 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
- qt3d = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qt3d-opensource-src-5.5.1.tar.xz";
- sha256 = "1xqvifsy5x2vj7p51c2z1ly7k2yq7l3byhshnkd2bn6b5dp91073";
- name = "qt3d-opensource-src-5.5.1.tar.xz";
- };
- };
- qt5 = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qt5-opensource-src-5.5.1.tar.xz";
- sha256 = "0g83vzsj6hdjmagccy6gxgc1l8q0q6663r9xj58ix4lj7hsphf26";
- name = "qt5-opensource-src-5.5.1.tar.xz";
- };
- };
- qtactiveqt = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtactiveqt-opensource-src-5.5.1.tar.xz";
- sha256 = "09dz5jj7gxa9ds2gw6xw8lacmv27ydhi64370q1ncc7khd0p6g3m";
- name = "qtactiveqt-opensource-src-5.5.1.tar.xz";
- };
- };
- qtandroidextras = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtandroidextras-opensource-src-5.5.1.tar.xz";
- sha256 = "1cam9zd0kxgyplnaijy91rl8p30j2jbp2ikq9rnigcsglfnx5hd4";
- name = "qtandroidextras-opensource-src-5.5.1.tar.xz";
- };
- };
- qtbase = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz";
- sha256 = "05p91m1d9b3gdfm5pgmxw63rk0fdxqz87s77hn9bdip4syjfi96z";
- name = "qtbase-opensource-src-5.5.1.tar.xz";
- };
- };
- qtcanvas3d = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtcanvas3d-opensource-src-5.5.1.tar.xz";
- sha256 = "105hl3mvsdif416l4dvpxl7r1iw42if8hhrnji8hf4fp6081g6vm";
- name = "qtcanvas3d-opensource-src-5.5.1.tar.xz";
- };
- };
- qtconnectivity = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtconnectivity-opensource-src-5.5.1.tar.xz";
- sha256 = "08sh4hzib5l26l6mc6iil4nvl807cn9rn5w46vxw0bsqz3gfcdrn";
- name = "qtconnectivity-opensource-src-5.5.1.tar.xz";
- };
- };
- qtdeclarative = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtdeclarative-opensource-src-5.5.1.tar.xz";
- sha256 = "14b7naaa0rk4q6cxf0w62gvamxk812kr65k82zxkdzrzp3plxlaz";
- name = "qtdeclarative-opensource-src-5.5.1.tar.xz";
- };
- };
- qtdoc = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtdoc-opensource-src-5.5.1.tar.xz";
- sha256 = "11hgw1i1qm2yqzfyg0jsvjda9092hjas35l0bmxn6pvnl5asy3cz";
- name = "qtdoc-opensource-src-5.5.1.tar.xz";
- };
- };
- qtenginio = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtenginio-opensource-src-5.5.1.tar.xz";
- sha256 = "1qpg9pcniqp5xxi2qrc6indqdyn850djk0njiniandbabfykd6d7";
- name = "qtenginio-opensource-src-5.5.1.tar.xz";
- };
- };
- qtgraphicaleffects = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtgraphicaleffects-opensource-src-5.5.1.tar.xz";
- sha256 = "0irdq4lfbv740mbvd40x62k3zzj0aj8h95gsxg79wa54nf6hzjlv";
- name = "qtgraphicaleffects-opensource-src-5.5.1.tar.xz";
- };
- };
- qtimageformats = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtimageformats-opensource-src-5.5.1.tar.xz";
- sha256 = "19alny9bm2lzzlxicbvw56ra4qcxdrnm9054zs4z1y82qq0fwzy9";
- name = "qtimageformats-opensource-src-5.5.1.tar.xz";
- };
- };
- qtlocation = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtlocation-opensource-src-5.5.1.tar.xz";
- sha256 = "05k31nm1p444fixplspgh1d5j4f3xz6z674jpr8497v4hz5lis8z";
- name = "qtlocation-opensource-src-5.5.1.tar.xz";
- };
- };
- qtmacextras = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtmacextras-opensource-src-5.5.1.tar.xz";
- sha256 = "0n4hxi9xhnyvp5cxklr9ygg4ficvahak2w73kr9ihqckrkym0lq2";
- name = "qtmacextras-opensource-src-5.5.1.tar.xz";
- };
- };
- qtmultimedia = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtmultimedia-opensource-src-5.5.1.tar.xz";
- sha256 = "0zwmgmiix56c567qw5xnijd1y43mbjg4jw1n624c31qmyjcwmivw";
- name = "qtmultimedia-opensource-src-5.5.1.tar.xz";
- };
- };
- qtquick1 = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtquick1-opensource-src-5.5.1.tar.xz";
- sha256 = "0b0znnwy2fv5rn368nw7ph2fypz16fchb09id63hm7wbkbjsf4n8";
- name = "qtquick1-opensource-src-5.5.1.tar.xz";
- };
- };
- qtquickcontrols = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtquickcontrols-opensource-src-5.5.1.tar.xz";
- sha256 = "1w7w87c8i6v3p78psmjb30fh9sx7745m5jyjkdi6q1jnss4q6yhv";
- name = "qtquickcontrols-opensource-src-5.5.1.tar.xz";
- };
- };
- qtscript = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtscript-opensource-src-5.5.1.tar.xz";
- sha256 = "1z98x3758mk24wf0nxxw4lphbxw1xxzl1q27cjqbq8lgk7fxsind";
- name = "qtscript-opensource-src-5.5.1.tar.xz";
- };
- };
- qtsensors = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtsensors-opensource-src-5.5.1.tar.xz";
- sha256 = "1spfr2pn8zz5vz3qz9lzs0wfshmim6hdgf2fpmwpcpcsfb04y9jx";
- name = "qtsensors-opensource-src-5.5.1.tar.xz";
- };
- };
- qtserialport = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtserialport-opensource-src-5.5.1.tar.xz";
- sha256 = "0ylgjscmql3lspzv0cr5n4g1v354frz0yfalvswvkc9x0bxxnd50";
- name = "qtserialport-opensource-src-5.5.1.tar.xz";
- };
- };
- qtsvg = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtsvg-opensource-src-5.5.1.tar.xz";
- sha256 = "1iwibbh835cpxbfh7rnrpvl9k20valr6h256np59rzdy92z8ixgp";
- name = "qtsvg-opensource-src-5.5.1.tar.xz";
- };
- };
- qttools = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz";
- sha256 = "1zbvr039sv0jzd41ngarxif6954bl50pha8814b5hw3i977gcqa3";
- name = "qttools-opensource-src-5.5.1.tar.xz";
- };
- };
- qttranslations = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qttranslations-opensource-src-5.5.1.tar.xz";
- sha256 = "1im4qzpyp1wqrrrlwc4r56b46w5y4bxg2m0y7wkcmihb1xqh1y21";
- name = "qttranslations-opensource-src-5.5.1.tar.xz";
- };
- };
- qtwayland = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwayland-opensource-src-5.5.1.tar.xz";
- sha256 = "19nxifpg9q785ahzaii2fd2911cg5m0dpk5v041sylm997f4p063";
- name = "qtwayland-opensource-src-5.5.1.tar.xz";
- };
- };
- qtwebchannel = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebchannel-opensource-src-5.5.1.tar.xz";
- sha256 = "1l0m5xjxg5va9dwvgf52r52inl4dl3954d16rfiwnkndazp9ahkz";
- name = "qtwebchannel-opensource-src-5.5.1.tar.xz";
- };
- };
- qtwebengine = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebengine-opensource-src-5.5.1.tar.xz";
- sha256 = "141bgr3x7n2vjbsydgll44aq0pcf99gn2l1l1jpim685sf6k4kbw";
- name = "qtwebengine-opensource-src-5.5.1.tar.xz";
- };
- };
- qtwebkit-examples = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-examples-opensource-src-5.5.1.tar.xz";
- sha256 = "1ij65v3nzh5f6rdq43w6vmljjgfw1vky8dd6s4kr093d5ns3b289";
- name = "qtwebkit-examples-opensource-src-5.5.1.tar.xz";
- };
- };
- qtwebkit = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-opensource-src-5.5.1.tar.xz";
- sha256 = "0sbdglcf57lmgbcybimvvbpqikn3blb1pxvd71sdhsiypnfkyn3p";
- name = "qtwebkit-opensource-src-5.5.1.tar.xz";
- };
- };
- qtwebsockets = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebsockets-opensource-src-5.5.1.tar.xz";
- sha256 = "1srdn668z62j95q1wwhg6xk2dic407r4wl5yi1qk743vhr586kng";
- name = "qtwebsockets-opensource-src-5.5.1.tar.xz";
- };
- };
- qtwinextras = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwinextras-opensource-src-5.5.1.tar.xz";
- sha256 = "07w5ipiwvvapasjswk0g4ndcp0lq65pz2n6l348zwfb0gand406b";
- name = "qtwinextras-opensource-src-5.5.1.tar.xz";
- };
- };
- qtx11extras = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtx11extras-opensource-src-5.5.1.tar.xz";
- sha256 = "0rgbxgp5l212c4vg8z685zv008j9s03mx8p576ny2qibjwfs11v3";
- name = "qtx11extras-opensource-src-5.5.1.tar.xz";
- };
- };
- qtxmlpatterns = {
- version = "5.5.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtxmlpatterns-opensource-src-5.5.1.tar.xz";
- sha256 = "1v78s0jygg83yzyldwms8zb72cwp718cc5ialc2ki3lqa81fndxm";
- name = "qtxmlpatterns-opensource-src-5.5.1.tar.xz";
- };
- };
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix
deleted file mode 100644
index f387a242101..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/default.nix
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-
-# Updates
-
-Before a major version update, make a copy of this directory. (We like to
-keep the old version around for a short time after major updates.) Add a
-top-level attribute to `top-level/all-packages.nix`.
-
-1. Update the URL in `maintainers/scripts/generate-qt.sh`.
-2. From the top of the Nixpkgs tree, run
- `./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
-3. Check that the new packages build correctly.
-4. Commit the changes and open a pull request.
-
-*/
-
-{
- newScope,
- stdenv, fetchurl, makeSetupHook, makeWrapper,
- bison, cups ? null, harfbuzz, mesa, perl,
- gstreamer, gst-plugins-base,
-
- # options
- developerBuild ? false,
- decryptSslTraffic ? false,
-}:
-
-with stdenv.lib;
-
-let
-
- mirror = "http://download.qt.io";
- srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
-
- qtSubmodule = args:
- let
- inherit (args) name;
- version = args.version or srcs."${name}".version;
- src = args.src or srcs."${name}".src;
- inherit (stdenv) mkDerivation;
- in mkDerivation (args // {
- name = "${name}-${version}";
- inherit src;
-
- propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
- nativeBuildInputs =
- (args.nativeBuildInputs or [])
- ++ [ perl self.qmakeHook ];
-
- NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
-
- outputs = args.outputs or [ "out" "dev" ];
- setOutputFlags = args.setOutputFlags or false;
-
- setupHook = ../qtsubmodule-setup-hook.sh;
-
- enableParallelBuilding = args.enableParallelBuilding or true;
-
- meta = self.qtbase.meta // (args.meta or {});
- });
-
- addPackages = self: with self;
- let
- callPackage = self.newScope { inherit qtSubmodule srcs; };
- in {
-
- qtbase = callPackage ./qtbase {
- inherit (srcs.qtbase) src version;
- inherit bison cups harfbuzz mesa;
- inherit developerBuild decryptSslTraffic;
- };
-
- qtconnectivity = callPackage ./qtconnectivity.nix {};
- qtdeclarative = callPackage ./qtdeclarative {};
- qtdoc = callPackage ./qtdoc.nix {};
- qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {};
- qtimageformats = callPackage ./qtimageformats.nix {};
- qtlocation = callPackage ./qtlocation.nix {};
- qtmultimedia = callPackage ./qtmultimedia.nix {
- inherit gstreamer gst-plugins-base;
- };
- qtquick1 = null;
- qtquickcontrols = callPackage ./qtquickcontrols.nix {};
- qtquickcontrols2 = callPackage ./qtquickcontrols2.nix {};
- qtscript = callPackage ./qtscript {};
- qtsensors = callPackage ./qtsensors.nix {};
- qtserialport = callPackage ./qtserialport {};
- qtsvg = callPackage ./qtsvg.nix {};
- qttools = callPackage ./qttools {};
- qttranslations = callPackage ./qttranslations.nix {};
- qtwayland = callPackage ./qtwayland.nix {};
- qtwebchannel = callPackage ./qtwebchannel.nix {};
- qtwebengine = callPackage ./qtwebengine {};
- qtwebkit = callPackage ./qtwebkit {};
- qtwebsockets = callPackage ./qtwebsockets.nix {};
- qtx11extras = callPackage ./qtx11extras.nix {};
- qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
-
- env = callPackage ../qt-env.nix {};
- full = env "qt-${qtbase.version}" [
- qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats
- qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript
- qtsensors qtserialport qtsvg qttools qttranslations qtwayland
- qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras
- qtxmlpatterns
- ];
-
- makeQtWrapper =
- makeSetupHook
- { deps = [ makeWrapper ]; }
- (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
-
- qmakeHook =
- makeSetupHook
- { deps = [ self.qtbase.dev ]; }
- (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
-
- };
-
- self = makeScope newScope addPackages;
-
-in self
diff --git a/pkgs/development/libraries/qt-5/5.7/fetch.sh b/pkgs/development/libraries/qt-5/5.7/fetch.sh
deleted file mode 100644
index 6a6a34d520d..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/fetch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/ \
- http://download.qt.io/community_releases/5.7/5.7.1/ \
- -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch
deleted file mode 100644
index 0d5c2d51092..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch
+++ /dev/null
@@ -1,385 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
- endif()
- !!ENDIF
-
--!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
--!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
--!!ELSE
--get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
--# Use original install prefix when loaded through a
--# cross-prefix symbolic link such as /lib -> /usr/lib.
--get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
--get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
--if(_realCurr STREQUAL _realOrig)
-- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
--else()
-- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
--endif()
--unset(_realOrig)
--unset(_realCurr)
--unset(_IMPORT_PREFIX)
--!!ENDIF
--!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
--!!ELSE
--set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
--!!ENDIF
--
- !!IF !equals(TEMPLATE, aux)
- # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
- set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
-@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+ if(NOT EXISTS \"${imported_location}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+ endif()
- !!ELSE
- set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ENDIF
-@@ -74,45 +53,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
- \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
- )
-
--!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ELSE
-- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ENDIF
-- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
-- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
-- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
-- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
-- )
-- endif()
--!!ENDIF
- endmacro()
- !!ENDIF
-
- if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-
- !!IF !no_module_headers
--!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
-- )
--!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
-- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
-- )
--!!ELSE
-- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
--!!ENDIF
--!!ELSE
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
-- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
-+ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR\" \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
- !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
-+ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
-+ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
- )
- !!ELSE
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
-@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
- !!ENDIF
- !!ENDIF
--!!ENDIF
-+
- !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
- include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
- !!ENDIF
-@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
-
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
- !!IF isEmpty(CMAKE_DEBUG_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
-- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
-- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
--!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
- if (EXISTS
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
-+ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
- !!ELSE
- \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
- !!ENDIF
- AND EXISTS
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
-+ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ELSE
- \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ENDIF
- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
- endif()
- !!ENDIF // CMAKE_DEBUG_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- !!ENDIF // CMAKE_RELEASE_TYPE
-
- !!IF !isEmpty(CMAKE_DEBUG_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
-- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
--!!ELSE
- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
- !!IF isEmpty(CMAKE_RELEASE_TYPE)
--!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
-- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
-- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
--!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
- if (EXISTS
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-+ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
- !!ELSE
- \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
- !!ENDIF
- AND EXISTS
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
-+ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
- !!ELSE
- \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
- !!ENDIF
- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
- endif()
- !!ENDIF // CMAKE_RELEASE_TYPE
- !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
- set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
--!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
--!!ELSE
-- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
--!!ENDIF
-+ set(imported_location \"${PLUGIN_LOCATION}\")
- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
- set_target_properties(Qt5::${Plugin} PROPERTIES
- \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-Index: qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in
-@@ -2,7 +2,7 @@
- !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
-
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
--set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
-+set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\")
- !!ELSE
- set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
- !!ENDIF
-@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert
- set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ELSE
- set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ENDIF
-
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-+ set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ELSE
- set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
- add_executable(Qt5::uic IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
- add_executable(Qt5::qmake IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
- add_executable(Qt5::moc IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)
- add_executable(Qt5::rcc IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -133,7 +133,7 @@ if (NOT TARGET Qt5::WinMain)
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
- set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ELSE
- set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ENDIF
-@@ -147,7 +147,7 @@ if (NOT TARGET Qt5::WinMain)
- set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ELSE
- set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-@@ -1,6 +1,6 @@
-
- !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-@@ -1,6 +1,6 @@
-
- !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in
-@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
- add_executable(Qt5::qdbuscpp2xml IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
- add_executable(Qt5::qdbusxml2cpp IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-Index: qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/create_cmake.prf
-+++ qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf
-@@ -136,28 +136,28 @@ contains(CONFIG, plugin) {
-
- win32 {
- isEmpty(CMAKE_STATIC_TYPE) {
-- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll
-- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll
-+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll
-+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll
- } else:mingw {
-- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a
-- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a
-+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a
-+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a
- } else { # MSVC static
-- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib
-- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib
-+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib
-+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib
- }
- } else {
- mac {
- isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
- else: CMAKE_PlUGIN_EXT = .a
-
-- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
- } else {
- isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so
- else: CMAKE_PlUGIN_EXT = .a
-
-- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
-+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
- }
- }
- cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
-Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-+++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-@@ -2,10 +2,10 @@
- add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
-
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
- !!ENDIF
- !!IF !isEmpty(CMAKE_DEBUG_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
- !!ENDIF
-
- list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch
deleted file mode 100644
index a0e344a7bc6..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-+++ qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-@@ -257,10 +257,7 @@ void TableGenerator::initPossibleLocatio
- // the QTCOMPOSE environment variable
- if (qEnvironmentVariableIsSet("QTCOMPOSE"))
- m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
-- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
-- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
-- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
-- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
-+ m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale"));
- m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
- m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
- }
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch
deleted file mode 100644
index 495db07cfbb..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp
-===================================================================
---- qtbase-opensource-src-5.5.1.orig/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp
-@@ -48,7 +48,7 @@
- ****************************************************************************/
-
- //#define QSSLSOCKET_DEBUG
--//#define QT_DECRYPT_SSL_TRAFFIC
-+#define QT_DECRYPT_SSL_TRAFFIC
-
- #include "qssl_p.h"
- #include "qsslsocket_openssl_p.h"
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
deleted file mode 100644
index f41e8da1193..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
+++ /dev/null
@@ -1,313 +0,0 @@
-{
- stdenv, lib, copyPathsToStore,
- src, version,
-
- coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2,
- ruby,
- darwin, libiconv,
-
- dbus, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite,
- libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
- libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, sqlite, udev,
- xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xlibs,
- zlib,
-
- # optional dependencies
- cups ? null, mysql ? null, postgresql ? null,
-
- # options
- mesaSupported ? (!stdenv.isDarwin),
- mesa,
- buildExamples ? false,
- buildTests ? false,
- developerBuild ? false,
- decryptSslTraffic ? false
-}:
-
-let
- system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
-in
-
-stdenv.mkDerivation {
-
- name = "qtbase-${version}";
- inherit src version;
-
- outputs = [ "out" "dev" ];
-
- patches =
- copyPathsToStore (lib.readPathsFromFile ./. ./series)
- ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)]
- ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
- ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
-
- postPatch =
- ''
- substituteInPlace configure --replace /bin/pwd pwd
- substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
- sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf
-
- sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5Config.cmake.in"
- sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5CoreMacros.cmake"
- sed -i 's/NO_DEFAULT_PATH//' "src/gui/Qt5GuiConfigExtras.cmake.in"
- sed -i 's/PATHS.*NO_DEFAULT_PATH//' "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
-
- substituteInPlace src/network/kernel/qdnslookup_unix.cpp \
- --replace "@glibc@" "${stdenv.cc.libc.out}"
- substituteInPlace src/network/kernel/qhostinfo_unix.cpp \
- --replace "@glibc@" "${stdenv.cc.libc.out}"
-
- substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \
- --replace "@openssl@" "${openssl.out}"
- '' + lib.optionalString stdenv.isLinux ''
- substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \
- --replace "@libXcursor@" "${libXcursor.out}"
-
- substituteInPlace src/dbus/qdbus_symbols.cpp \
- --replace "@dbus_libs@" "${dbus.lib}"
-
- substituteInPlace \
- src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
- --replace "@libX11@" "${libX11.out}"
- ''
- + lib.optionalString mesaSupported ''
- substituteInPlace \
- src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
- --replace "@mesa_lib@" "${mesa.out}"
- substituteInPlace mkspecs/common/linux.conf \
- --replace "@mesa_lib@" "${mesa.out}" \
- --replace "@mesa_inc@" "${mesa.dev or mesa}"
- ''+ lib.optionalString stdenv.isDarwin ''
- sed -i \
- -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \
- -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \
- -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \
- -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \
- -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \
- -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
- -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \
- ./configure
- sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf
- sed -i '26,$d' ./mkspecs/features/mac/default_post.prf
- sed -i '1,$d' ./mkspecs/features/mac/sdk.prf
- sed 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' -i ./mkspecs/common/mac.conf
- '';
- # Note on the above: \x27 is a way if including a single-quote
- # character in the sed string arguments.
-
- setOutputFlags = false;
- preConfigure = ''
- export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH"
- export MAKEFLAGS=-j$NIX_BUILD_CORES
-
- configureFlags+="\
- -plugindir $out/lib/qt5/plugins \
- -importdir $out/lib/qt5/imports \
- -qmldir $out/lib/qt5/qml \
- -docdir $out/share/doc/qt5"
- '';
-
- prefixKey = "-prefix ";
-
- # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa
- # TODO Remove obsolete and useless flags once the build will be totally mastered
- configureFlags = ''
- -verbose
- -confirm-license
- -opensource
-
- -release
- -shared
- ${lib.optionalString developerBuild "-developer-build"}
- -largefile
- -accessibility
- -optimized-qmake
- -strip
- -no-reduce-relocations
- -system-proxies
- -pkg-config
-
- -gui
- -widgets
- -opengl desktop
- -qml-debug
- -iconv
- -icu
- -pch
-
- ${lib.optionalString (!system-x86_64) "-no-sse2"}
- -no-sse3
- -no-ssse3
- -no-sse4.1
- -no-sse4.2
- -no-avx
- -no-avx2
- -no-mips_dsp
- -no-mips_dspr2
-
- -system-zlib
- -system-libpng
- -system-libjpeg
- -system-harfbuzz
- -system-pcre
- -openssl-linked
-
- -system-sqlite
- -${if mysql != null then "plugin" else "no"}-sql-mysql
- -${if postgresql != null then "plugin" else "no"}-sql-psql
-
- -make libs
- -make tools
- -${lib.optionalString (buildExamples == false) "no"}make examples
- -${lib.optionalString (buildTests == false) "no"}make tests
- -v
- '' + lib.optionalString (!stdenv.isDarwin) ''
- -no-rpath
- -glib
- -xcb
- -qpa xcb
-
- -${lib.optionalString (cups == null) "no-"}cups
-
- -no-eglfs
- -no-directfb
- -no-linuxfb
- -no-kms
-
- -libinput
- -gtk
- -system-xcb
- -system-xkbcommon
- -dbus-linked
- '' + lib.optionalString stdenv.isDarwin ''
- -platform macx-clang
- -no-use-gold-linker
- -no-fontconfig
- -qt-freetype
- '';
-
- # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
- # if dependency paths contain the string "pq", which can occur in the hash.
- # To prevent these failures, we need to override PostgreSQL detection.
- PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
-
- propagatedBuildInputs = [
- libxml2 libxslt openssl pcre16 sqlite zlib
-
- # Text rendering
- harfbuzz icu
-
- # Image formats
- libjpeg libpng libtiff
- ]
- ++ lib.optional mesaSupported mesa
- ++ lib.optionals (!stdenv.isDarwin) [
- dbus glib udev
-
- # Text rendering
- fontconfig freetype
-
- # X11 libs
- libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil
- xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm
- ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
- ApplicationServices CoreServices AppKit Carbon OpenGL AGL Cocoa
- DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk
- ]);
-
- buildInputs = [ ]
- ++ lib.optionals (!stdenv.isDarwin) [ gtk3 libinput ]
- ++ lib.optional developerBuild gdb
- ++ lib.optional (cups != null) cups
- ++ lib.optional (mysql != null) mysql.lib
- ++ lib.optional (postgresql != null) postgresql;
-
- nativeBuildInputs = [ bison flex gperf lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf;
-
- # freetype-2.5.4 changed signedness of some struct fields
- NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"
- + lib.optionalString stdenv.isDarwin " -D__MAC_OS_X_VERSION_MAX_ALLOWED=1090 -D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))";
- # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is
- # 10.9 which necessitates the above macro definition that mentions
- # 10.10
-
- postInstall = ''
- find "$out" -name "*.cmake" | while read file; do
- substituteInPlace "$file" \
- --subst-var-by NIX_OUT "$out" \
- --subst-var-by NIX_DEV "$dev"
- done
- '';
-
- preFixup = ''
- # We cannot simply set these paths in configureFlags because libQtCore retains
- # references to the paths it was built with.
- moveToOutput "bin" "$dev"
- moveToOutput "include" "$dev"
- moveToOutput "mkspecs" "$dev"
-
- # The destination directory must exist or moveToOutput will do nothing
- mkdir -p "$dev/share"
- moveToOutput "share/doc" "$dev"
- '';
-
- postFixup =
- ''
- # Don't retain build-time dependencies like gdb.
- sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
-
- # Move libtool archives and qmake projects
- if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
- pushd "''${!outputLib}"
- find lib -name '*.a' -o -name '*.la'${if stdenv.isDarwin then "" else "-o -name '*.prl'"} | \
- while read -r file; do
- mkdir -p "''${!outputDev}/$(dirname "$file")"
- mv "''${!outputLib}/$file" "''${!outputDev}/$file"
- done
- popd
- fi
- ''
-
- # fixup .pc file (where to find 'moc' etc.)
- + lib.optionalString (!stdenv.isDarwin) ''
- sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
- -e "/^host_bins=/ c host_bins=$dev/bin"
- ''
-
- # Don't move .prl files on darwin because they end up in
- # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent
- # use of lndir in the qtbase setup-hook. On Linux, the .prl files
- # are in lib, and so do not cause a subsequent recreation of deep
- # framework directory trees.
- + lib.optionalString stdenv.isDarwin ''
- fixDarwinDylibNames_rpath() {
- local flags=()
-
- for fn in "$@"; do
- flags+=(-change "@rpath/$fn.framework/Versions/5/$fn" "$out/lib/$fn.framework/Versions/5/$fn")
- done
-
- for fn in "$@"; do
- echo "$fn: fixing dylib"
- install_name_tool -id "$out/lib/$fn.framework/Versions/5/$fn" "''${flags[@]}" "$out/lib/$fn.framework/Versions/5/$fn"
- done
- }
- fixDarwinDylibNames_rpath "QtConcurrent" "QtPrintSupport" "QtCore" "QtSql" "QtDBus" "QtTest" "QtGui" "QtWidgets" "QtNetwork" "QtXml" "QtOpenGL"
- '';
-
- inherit lndir;
- setupHook = if stdenv.isDarwin
- then ../../qtbase-setup-hook-darwin.sh
- else ../../qtbase-setup-hook.sh;
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- homepage = http://www.qt.io;
- description = "A cross-platform application framework for C++";
- license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
- maintainers = with maintainers; [ qknight ttuegel ];
- platforms = platforms.unix;
- };
-
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch
deleted file mode 100644
index 10b0b6701dd..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/dbus/qdbus_symbols.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/dbus/qdbus_symbols.cpp
-+++ qtbase-opensource-src-5.7.0/src/dbus/qdbus_symbols.cpp
-@@ -97,7 +97,7 @@ bool qdbus_loadLibDBus()
- #ifdef Q_OS_WIN
- QLatin1String("dbus-1"),
- #endif
-- QLatin1String("libdbus-1")
-+ QLatin1String("@dbus_libs@/lib/libdbus-1")
- };
-
- lib->unload();
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch
deleted file mode 100644
index ea3073ced50..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-===================================================================
---- qtbase-opensource-src-5.5.1.orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-+++ qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-@@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const
- {
- extern const QString qt_gl_library_name();
- // QLibrary lib(qt_gl_library_name());
-+ // Check system library paths first
- QLibrary lib(QLatin1String("GL"));
-+ if (!lib.load()) {
-+ // Fallback to Mesa driver
-+ lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL"));
-+ }
- glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
- }
- }
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gtkstyle.patch
deleted file mode 100644
index 755b0965cf5..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gtkstyle.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: qtbase-opensource-src-5.5.1/src/widgets/styles/qgtk2painter.cpp
-===================================================================
---- qtbase-opensource-src-5.5.1.orig/src/widgets/styles/qgtk2painter.cpp
-+++ qtbase-opensource-src-5.5.1/src/widgets/styles/qgtk2painter.cpp
-@@ -96,7 +96,7 @@ static void initGtk()
- static bool initialized = false;
- if (!initialized) {
- // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
-- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
-+ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
-
- QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new");
- QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable");
-Index: qtbase-opensource-src-5.5.1/src/widgets/styles/qgtkstyle_p.cpp
-===================================================================
---- qtbase-opensource-src-5.5.1.orig/src/widgets/styles/qgtkstyle_p.cpp
-+++ qtbase-opensource-src-5.5.1/src/widgets/styles/qgtkstyle_p.cpp
-@@ -327,7 +327,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus
- void QGtkStylePrivate::resolveGtk() const
- {
- // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
-- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
-+ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
-
- gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
- gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new");
-@@ -425,8 +425,8 @@ void QGtkStylePrivate::resolveGtk() cons
- pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family");
- pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style");
-
-- gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync");
-- gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init");
-+ gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync");
-+ gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init");
- }
-
- /* \internal
-@@ -594,9 +594,9 @@ void QGtkStylePrivate::cleanupGtkWidgets
- static bool resolveGConf()
- {
- if (!QGtkStylePrivate::gconf_client_get_default) {
-- QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default");
-- QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string");
-- QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool");
-+ QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default");
-+ QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string");
-+ QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool");
- }
- return (QGtkStylePrivate::gconf_client_get_default !=0);
- }
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch
deleted file mode 100644
index 02b7efb73d2..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/plugins/platforms/xcb/qxcbcursor.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ qtbase-opensource-src-5.7.0/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -309,10 +309,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c
- #if defined(XCB_USE_XLIB) && !defined(QT_NO_LIBRARY)
- static bool function_ptrs_not_initialized = true;
- if (function_ptrs_not_initialized) {
-- QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
-+ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1);
- bool xcursorFound = xcursorLib.load();
- if (!xcursorFound) { // try without the version number
-- xcursorLib.setFileName(QLatin1String("Xcursor"));
-+ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor"));
- xcursorFound = xcursorLib.load();
- }
- if (xcursorFound) {
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch
deleted file mode 100644
index 9891bfeac5b..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -658,8 +658,8 @@ static QPair loadO
- #endif
- #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
- // first attempt: the canonical name is libssl.so.
-- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
-- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
-+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
-+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
- if (libcrypto->load() && libssl->load()) {
- // libssl.so. and libcrypto.so. found
- return pair;
-@@ -676,8 +676,8 @@ static QPair loadO
- // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
- // attempt, _after_ /Contents/Frameworks has been searched.
- // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
-- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
-- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
-+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1);
-+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1);
- if (libcrypto->load() && libssl->load()) {
- // libssl.so.0 and libcrypto.so.0 found
- return pair;
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch
deleted file mode 100644
index 98a3610f5fb..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/network/kernel/qdnslookup_unix.cpp
-+++ qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp
-@@ -85,7 +85,7 @@ static bool resolveLibraryInternal()
- if (!lib.load())
- #endif
- {
-- lib.setFileName(QLatin1String("resolv"));
-+ lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
- if (!lib.load())
- return false;
- }
-Index: qtbase-opensource-src-5.7.0/src/network/kernel/qhostinfo_unix.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/network/kernel/qhostinfo_unix.cpp
-+++ qtbase-opensource-src-5.7.0/src/network/kernel/qhostinfo_unix.cpp
-@@ -100,7 +100,7 @@ static bool resolveLibraryInternal()
- if (!lib.load())
- #endif
- {
-- lib.setFileName(QLatin1String("resolv"));
-+ lib.setFileName(QLatin1String("@glibc@/lib/libresolv"));
- if (!lib.load())
- return false;
- }
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch
deleted file mode 100644
index 4390db977a7..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001
-From: hasufell
-Date: Sat, 10 Oct 2015 01:15:01 +0200
-Subject: [PATCH] Fix compilation with libressl
-
-By additionally checking for defined(SSL_CTRL_SET_CURVES), which
-is defined in openssl, but not in libressl.
----
- src/network/ssl/qsslcontext_openssl.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp
-@@ -347,7 +347,7 @@ init_context:
-
- const QVector qcurves = sslContext->sslConfiguration.ellipticCurves();
- if (!qcurves.isEmpty()) {
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
- // Set the curves to be used
- if (q_SSLeay() >= 0x10002000L) {
- // SSL_CTX_ctrl wants a non-const pointer as last argument,
-@@ -360,7 +360,7 @@ init_context:
- sslContext->errorCode = QSslError::UnspecifiedError;
- }
- } else
--#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
-+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
- {
- // specific curves requested, but not possible to set -> error
- sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2"));
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch
deleted file mode 100644
index fda3d3e3653..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf
-===================================================================
---- qtbase-opensource-src-5.5.1.orig/mkspecs/common/linux.conf
-+++ qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf
-@@ -12,8 +12,8 @@ QMAKE_INCDIR =
- QMAKE_LIBDIR =
- QMAKE_INCDIR_X11 =
- QMAKE_LIBDIR_X11 =
--QMAKE_INCDIR_OPENGL =
--QMAKE_LIBDIR_OPENGL =
-+QMAKE_INCDIR_OPENGL = @mesa_inc@/include
-+QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib
- QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
- QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
- QMAKE_INCDIR_EGL =
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch
deleted file mode 100644
index ebaf3651a6d..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/kernel/qcoreapplication.cpp
-+++ qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp
-@@ -2487,7 +2487,17 @@ QStringList QCoreApplication::libraryPat
- QStringList *app_libpaths = new QStringList;
- coreappdata()->app_libpaths.reset(app_libpaths);
-
-+ // Add library paths derived from NIX_PROFILES.
-+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+ const QString plugindir = QString::fromLatin1("/lib/qt5/plugins");
-+ for (const QByteArray &profile: profiles) {
-+ if (!profile.isEmpty()) {
-+ app_libpaths->append(QFile::decodeName(profile) + plugindir);
-+ }
-+ }
-+
- const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
-+ qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes
- if (!libPathEnv.isEmpty()) {
- QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
- for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) {
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/series b/pkgs/development/libraries/qt-5/5.7/qtbase/series
deleted file mode 100644
index 2196d838375..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/series
+++ /dev/null
@@ -1,9 +0,0 @@
-dlopen-resolv.patch
-tzdir.patch
-dlopen-libXcursor.patch
-dlopen-openssl.patch
-dlopen-dbus.patch
-xdg-config-dirs.patch
-nix-profiles-library-paths.patch
-compose-search-path.patch
-libressl.patch
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch
deleted file mode 100644
index f4056dd9cc9..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -68,7 +68,10 @@ typedef QHash Q
- // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
- static QTzTimeZoneHash loadTzTimeZones()
- {
-- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
-+ QString path = qgetenv("TZDIR");
-+ path += "/zone.tab";
-+ if (!QFile::exists(path))
-+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
- if (!QFile::exists(path))
- path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
-
-@@ -566,12 +569,18 @@ void QTzTimeZonePrivate::init(const QByt
- if (!tzif.open(QIODevice::ReadOnly))
- return;
- } else {
-- // Open named tz, try modern path first, if fails try legacy path
-- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+ // Try TZDIR first
-+ QString zoneinfoDir = qgetenv("TZDIR");
-+ zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId);
-+ tzif.setFileName(zoneinfoDir);
- if (!tzif.open(QIODevice::ReadOnly)) {
-- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-- if (!tzif.open(QIODevice::ReadOnly))
-- return;
-+ // Open named tz, try modern path first, if fails try legacy path
-+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+ if (!tzif.open(QIODevice::ReadOnly)) {
-+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+ if (!tzif.open(QIODevice::ReadOnly))
-+ return;
-+ }
- }
- }
-
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch
deleted file mode 100644
index 1f2f316c5b2..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/io/qsettings.cpp
-+++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp
-@@ -1161,6 +1161,23 @@ QConfFileSettingsPrivate::QConfFileSetti
- confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
- confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false));
-
-+#if !defined(Q_OS_WIN)
-+ // Add directories specified in $XDG_CONFIG_DIRS
-+ const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS"));
-+ if (!pathEnv.isEmpty()) {
-+ const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts);
-+ if (!pathEntries.isEmpty()) {
-+ int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those.
-+ for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) {
-+ const QString& path = pathEntries.at(k);
-+ if (!application.isEmpty())
-+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false));
-+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false));
-+ }
-+ }
-+ }
-+#endif
-+
- for (i = 0; i < NumConfFiles; ++i) {
- if (confFiles[i]) {
- spec = i;
-Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings_p.h
-===================================================================
---- qtbase-opensource-src-5.7.0.orig/src/corelib/io/qsettings_p.h
-+++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings_p.h
-@@ -246,7 +246,7 @@ public:
- F_Organization = 0x1,
- F_User = 0x0,
- F_System = 0x2,
-- NumConfFiles = 4
-+ NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis
- };
-
- QSettings::Format format;
diff --git a/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix
deleted file mode 100644
index 95cd6fea79b..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
- name = "qtconnectivity";
- qtInputs = [ qtbase qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix
deleted file mode 100644
index 9b6a6c46176..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ qtSubmodule, lib, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
-
-qtSubmodule {
- name = "qtdeclarative";
- patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
- qtInputs = [ qtbase qtsvg qtxmlpatterns ];
- nativeBuildInputs = [ python2 ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch
deleted file mode 100644
index 06b244b974f..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
-===================================================================
---- qtdeclarative-opensource-src-5.5.1.orig/src/qml/qml/qqmlimport.cpp
-+++ qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
-@@ -1549,6 +1549,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q
- QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
- addImportPath(installImportsPath);
-
-+ // Add library paths derived from NIX_PROFILES.
-+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+ const QString qmldir = QString::fromLatin1("/lib/qt5/qml");
-+ Q_FOREACH (const QByteArray &profile, profiles) {
-+ if (!profile.isEmpty()) {
-+ addImportPath(QFile::decodeName(profile) + qmldir);
-+ }
-+ }
-+
- // env import paths
- QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
- if (!envImportPath.isEmpty()) {
diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series
deleted file mode 100644
index 7dbe197c56e..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series
+++ /dev/null
@@ -1 +0,0 @@
-nix-profiles-import-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.7/qtdoc.nix b/pkgs/development/libraries/qt-5/5.7/qtdoc.nix
deleted file mode 100644
index 578ea6ba0b2..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtdoc.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
- name = "qtdoc";
- qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix
deleted file mode 100644
index 3273f12eb83..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
- name = "qtgraphicaleffects";
- qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix
deleted file mode 100644
index 03d0fffbe80..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
- name = "qtimageformats";
- qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtlocation.nix b/pkgs/development/libraries/qt-5/5.7/qtlocation.nix
deleted file mode 100644
index 1e134057c4b..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtlocation.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtmultimedia }:
-
-qtSubmodule {
- name = "qtlocation";
- qtInputs = [ qtbase qtmultimedia ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix
deleted file mode 100644
index a48dd38ae6d..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, qtSubmodule, qtbase, qtdeclarative, pkgconfig
-, alsaLib, gstreamer, gst-plugins-base, libpulseaudio
-}:
-
-qtSubmodule {
- name = "qtmultimedia";
- qtInputs = [ qtbase qtdeclarative ];
- buildInputs = [
- pkgconfig gstreamer gst-plugins-base libpulseaudio
- ] ++ stdenv.lib.optional stdenv.isLinux alsaLib;
- qmakeFlags = [ "GST_VERSION=1.0" ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix
deleted file mode 100644
index 93a864621b8..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
- name = "qtquickcontrols";
- qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix
deleted file mode 100644
index 19750f2fd99..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
- name = "qtquickcontrols2";
- qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch
deleted file mode 100644
index 887e107b6c1..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From abd80356449bb36c8adcc5c9ca1df6b47715d265 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Sun, 23 Aug 2015 09:13:34 -0500
-Subject: [PATCH] glib-2.32
-
----
- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-index 1f6d25e..087c3fb 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-@@ -81,7 +81,7 @@
- #include
- #elif PLATFORM(GTK)
- #include
--typedef struct _GMutex GMutex;
-+typedef union _GMutex GMutex;
- typedef struct _GCond GCond;
- #endif
-
---
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix
deleted file mode 100644
index 127766e2ebd..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ qtSubmodule, qtbase, qttools }:
-
-qtSubmodule {
- name = "qtscript";
- qtInputs = [ qtbase qttools ];
- patches = [ ./0001-glib-2.32.patch ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtsensors.nix b/pkgs/development/libraries/qt-5/5.7/qtsensors.nix
deleted file mode 100644
index 61e64dc47e4..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtsensors.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
- name = "qtsensors";
- qtInputs = [ qtbase qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch
deleted file mode 100644
index 3a813dc8007..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Sun, 23 Aug 2015 09:16:02 -0500
-Subject: [PATCH] dlopen serialport udev
-
----
- src/serialport/qtudev_p.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h
-index 6f2cabd..81b9849 100644
---- a/src/serialport/qtudev_p.h
-+++ b/src/serialport/qtudev_p.h
-@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
- inline bool resolveSymbols(QLibrary *udevLibrary)
- {
- if (!udevLibrary->isLoaded()) {
-- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
-+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
- if (!udevLibrary->load()) {
-- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
-+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
- if (!udevLibrary->load()) {
- qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
- return false;
---
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix
deleted file mode 100644
index 2bffd0a2bd6..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ qtSubmodule, qtbase, substituteAll, systemd }:
-
-qtSubmodule {
- name = "qtserialport";
- qtInputs = [ qtbase ];
- patches = [
- (substituteAll {
- src = ./0001-dlopen-serialport-udev.patch;
- libudev = systemd.lib;
- })
- ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtsvg.nix b/pkgs/development/libraries/qt-5/5.7/qtsvg.nix
deleted file mode 100644
index b9ccac7cf93..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtsvg.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
- name = "qtsvg";
- qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch
deleted file mode 100644
index e3db17e978c..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Naur qttools-opensource-src-5.7.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in qttools-opensource-src-5.7.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
---- qttools-opensource-src-5.7.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in 2016-11-03 09:31:16.000000000 +0100
-+++ qttools-opensource-src-5.7.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in 2017-02-28 16:37:20.130457615 +0100
-@@ -2,11 +2,10 @@
- if (NOT TARGET Qt5::qcollectiongenerator)
- add_executable(Qt5::qcollectiongenerator IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
--!!ELSE
-- set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-+ if(NOT EXISTS \"${imported_location}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-+ endif()
- _qt5_Help_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::qcollectiongenerator PROPERTIES
-@@ -17,11 +16,10 @@
- if (NOT TARGET Qt5::qhelpgenerator)
- add_executable(Qt5::qhelpgenerator IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
--!!ELSE
-- set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
-+ if(NOT EXISTS \"${imported_location}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
-+ endif()
- _qt5_Help_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::qhelpgenerator PROPERTIES
-diff -Naur qttools-opensource-src-5.7.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in qttools-opensource-src-5.7.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
---- qttools-opensource-src-5.7.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in 2016-11-03 09:31:16.000000000 +0100
-+++ qttools-opensource-src-5.7.1/src/linguist/Qt5LinguistToolsConfig.cmake.in 2017-02-28 16:35:40.470100681 +0100
-@@ -44,11 +44,10 @@
- if (NOT TARGET Qt5::lrelease)
- add_executable(Qt5::lrelease IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
--!!ELSE
-- set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
-+ if(NOT EXISTS \"${imported_location}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
-+ endif()
- _qt5_LinguistTools_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::lrelease PROPERTIES
-@@ -59,11 +58,10 @@
- if (NOT TARGET Qt5::lupdate)
- add_executable(Qt5::lupdate IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
--!!ELSE
-- set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
-+ if(NOT EXISTS \"${imported_location}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
-+ endif()
- _qt5_LinguistTools_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::lupdate PROPERTIES
-@@ -74,11 +72,10 @@
- if (NOT TARGET Qt5::lconvert)
- add_executable(Qt5::lconvert IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
--!!ELSE
-- set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
-+ if(NOT EXISTS \"${imported_location}\")
-+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
-+ endif()
- _qt5_LinguistTools_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::lconvert PROPERTIES
diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/default.nix b/pkgs/development/libraries/qt-5/5.7/qttools/default.nix
deleted file mode 100644
index d72d7b6c64c..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qttools/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ qtSubmodule, lib, copyPathsToStore, qtbase }:
-
-qtSubmodule {
- name = "qttools";
- qtInputs = [ qtbase ];
- patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
- postFixup = ''
- moveToOutput "bin/qdbus" "$out"
- moveToOutput "bin/qtpaths" "$out"
- '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/series b/pkgs/development/libraries/qt-5/5.7/qttools/series
deleted file mode 100644
index 6cc1d3b87bc..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qttools/series
+++ /dev/null
@@ -1 +0,0 @@
-cmake-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.7/qttranslations.nix b/pkgs/development/libraries/qt-5/5.7/qttranslations.nix
deleted file mode 100644
index 50fc8cf6826..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qttranslations.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qttools }:
-
-qtSubmodule {
- name = "qttranslations";
- qtInputs = [ qttools ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwayland.nix b/pkgs/development/libraries/qt-5/5.7/qtwayland.nix
deleted file mode 100644
index 6d887f7c650..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwayland.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ qtSubmodule, qtbase, qtquickcontrols, wayland, pkgconfig }:
-
-qtSubmodule {
- name = "qtwayland";
- qtInputs = [ qtbase qtquickcontrols ];
- buildInputs = [ wayland ];
- nativeBuildInputs = [ pkgconfig ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix
deleted file mode 100644
index fd7a3c52026..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
- name = "qtwebchannel";
- qtInputs = [ qtbase qtdeclarative ];
-}
-
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
deleted file mode 100644
index 3ce7db5a932..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel
-
-, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst
-, fontconfig, freetype, harfbuzz, icu, dbus
-, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus
-, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent
-, alsaLib
-, libcap
-, pciutils
-, systemd
-
-, bison, flex, git, which, gperf
-, coreutils
-, pkgconfig, python2
-, enableProprietaryCodecs ? true
-
-, lib, stdenv # lib.optional, needsPax
-}:
-
-qtSubmodule {
- name = "qtwebengine";
- qtInputs = [ qtquickcontrols qtlocation qtwebchannel ];
- buildInputs = [ bison flex git which gperf ];
- nativeBuildInputs = [ pkgconfig python2 coreutils ];
- doCheck = true;
-
- enableParallelBuilding = true;
-
- preConfigure = ''
- export MAKEFLAGS=-j$NIX_BUILD_CORES
- substituteInPlace ./src/3rdparty/chromium/build/common.gypi \
- --replace /bin/echo ${coreutils}/bin/echo
- substituteInPlace ./src/3rdparty/chromium/v8/build/toolchain.gypi \
- --replace /bin/echo ${coreutils}/bin/echo
- substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \
- --replace /bin/echo ${coreutils}/bin/echo
-
- # Fix library paths
- sed -i \
- -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
- -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \
- -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
- src/core/web_engine_library_info.cpp
-
- sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
- src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
-
- sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
- src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
- '';
-
- qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
-
- propagatedBuildInputs = [
- dbus zlib minizip alsaLib snappy nss protobuf jsoncpp libevent
-
- # Image formats
- libjpeg libpng libtiff libwebp
-
- # Video formats
- srtp libvpx
-
- # Audio formats
- alsaLib libopus
-
- # Text rendering
- fontconfig freetype harfbuzz icu
-
- # X11 libs
- xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst
- xlibs.libXcomposite
-
- libcap
- pciutils
- ];
- patches = lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
- postInstall = ''
- cat > $out/libexec/qt.conf <
-Date: Sun, 23 Aug 2015 09:18:54 -0500
-Subject: [PATCH 1/3] dlopen webkit nsplugin
-
----
- Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +-
- Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +-
- Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-index a923d49..2731d05 100644
---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0)
- }
- }
-
-- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
-+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
- if (library.load()) {
- typedef void *(*gtk_init_check_ptr)(int*, char***);
- gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
-diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-index de06a2f..363bde5 100644
---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-@@ -697,7 +697,7 @@ static Display *getPluginDisplay()
- // support gdk based plugins (like flash) that use a different X connection.
- // The code below has the same effect as this one:
- // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
-- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0);
- if (!library.load())
- return 0;
-
-diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-index d734ff6..62a2197 100644
---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-@@ -64,7 +64,7 @@ static Display* getPluginDisplay()
- // The code below has the same effect as this one:
- // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
-
-- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0);
- if (!library.load())
- return 0;
-
---
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch
deleted file mode 100644
index bb5d1f74364..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Sun, 23 Aug 2015 09:19:16 -0500
-Subject: [PATCH 2/3] dlopen webkit gtk
-
----
- Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-index 8de6521..0b25748 100644
---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr
-
- static bool initializeGtk()
- {
-- QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
-+ QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
- if (!gtkLibrary.load())
- return false;
- typedef void* (*gtk_init_ptr)(void*, void*);
---
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch
deleted file mode 100644
index 1c360cd81aa..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Sun, 23 Aug 2015 09:19:29 -0500
-Subject: [PATCH 3/3] dlopen webkit udev
-
----
- Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp
-index 60ff317..da8ac69 100644
---- a/Source/WebCore/platform/qt/GamepadsQt.cpp
-+++ b/Source/WebCore/platform/qt/GamepadsQt.cpp
-@@ -111,12 +111,12 @@ private:
- bool load()
- {
- m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint);
-- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1);
-+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
- m_loaded = m_libUdev.load();
- if (resolveMethods())
- return true;
-
-- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0);
-+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
- m_loaded = m_libUdev.load();
- return resolveMethods();
- }
---
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix
deleted file mode 100644
index 915a6bcae8a..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors
-, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
-, sqlite, systemd, glib, gst_all_1
-, bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
-, substituteAll
-, flashplayerFix ? false
-}:
-
-with stdenv.lib;
-
-qtSubmodule {
- name = "qtwebkit";
- qtInputs = [ qtdeclarative qtlocation qtsensors ];
- buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
- nativeBuildInputs = [
- bison2 flex gdb gperf perl pkgconfig python2 ruby
- ];
- patches =
- let dlopen-webkit-nsplugin = substituteAll {
- src = ./0001-dlopen-webkit-nsplugin.patch;
- gtk = gtk2.out;
- gdk_pixbuf = gdk_pixbuf.out;
- };
- dlopen-webkit-gtk = substituteAll {
- src = ./0002-dlopen-webkit-gtk.patch;
- gtk = gtk2.out;
- };
- dlopen-webkit-udev = substituteAll {
- src = ./0003-dlopen-webkit-udev.patch;
- libudev = systemd.lib;
- };
- in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
- ++ [ dlopen-webkit-udev ];
- meta.maintainers = with stdenv.lib.maintainers; [ abbradar ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix
deleted file mode 100644
index fbdfbbcf0db..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
- name = "qtwebsockets";
- qtInputs = [ qtbase qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix
deleted file mode 100644
index a765161e2d7..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
- name = "qtx11extras";
- qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix
deleted file mode 100644
index 9a8ddbba2bd..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
- name = "qtxmlpatterns";
- qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.7/srcs.nix b/pkgs/development/libraries/qt-5/5.7/srcs.nix
deleted file mode 100644
index 3fc4fab4ea5..00000000000
--- a/pkgs/development/libraries/qt-5/5.7/srcs.nix
+++ /dev/null
@@ -1,317 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
-{ fetchurl, mirror }:
-
-{
- qt3d = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qt3d-opensource-src-5.7.1.tar.xz";
- sha256 = "1sh7yz8nb9iqz3bp6bfc2kmji70zq39d9c0sfxnhif3p2x1wyx0x";
- name = "qt3d-opensource-src-5.7.1.tar.xz";
- };
- };
- qtactiveqt = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtactiveqt-opensource-src-5.7.1.tar.xz";
- sha256 = "1md14jdgwsdczpfvc0qkk5agxqk7a9qs91k41zj15ykkw86r428c";
- name = "qtactiveqt-opensource-src-5.7.1.tar.xz";
- };
- };
- qtandroidextras = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtandroidextras-opensource-src-5.7.1.tar.xz";
- sha256 = "1wq9m7a3dh9k8z006cw6m96awc53yf5vnq3wdqf5yfclfz696lhg";
- name = "qtandroidextras-opensource-src-5.7.1.tar.xz";
- };
- };
- qtbase = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz";
- sha256 = "0zjmcrmnnmaz1lr9wc5i6y565hsvl8ycn790ivqaz62dv54zbkgd";
- name = "qtbase-opensource-src-5.7.1.tar.xz";
- };
- };
- qtcanvas3d = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtcanvas3d-opensource-src-5.7.1.tar.xz";
- sha256 = "1d5xpq3mhjg4ipxzap7s2vnlfcd02d3yq720npv10xxp2ww0i1x8";
- name = "qtcanvas3d-opensource-src-5.7.1.tar.xz";
- };
- };
- qtcharts = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtcharts-opensource-src-5.7.1.tar.xz";
- sha256 = "1qrzcddwff2hxsbxrraff16j4abah2zkra2756s1mvydj9lyxzl5";
- name = "qtcharts-opensource-src-5.7.1.tar.xz";
- };
- };
- qtconnectivity = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtconnectivity-opensource-src-5.7.1.tar.xz";
- sha256 = "0rmr7bd4skby7bax9hpj2sid2bq3098nkw7xm02mdp04hc3bks5k";
- name = "qtconnectivity-opensource-src-5.7.1.tar.xz";
- };
- };
- qtdatavis3d = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdatavis3d-opensource-src-5.7.1.tar.xz";
- sha256 = "1y00p0wyj5cw9c2925y537vpmmg9q3kpf7qr1s7sv67dvvf8bzqv";
- name = "qtdatavis3d-opensource-src-5.7.1.tar.xz";
- };
- };
- qtdeclarative = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz";
- sha256 = "0mjxfwnplpx60jc6y94krg00isddl9bfwc7dayl981njb4qds4zx";
- name = "qtdeclarative-opensource-src-5.7.1.tar.xz";
- };
- };
- qtdeclarative-render2d = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-render2d-opensource-src-5.7.1.tar.xz";
- sha256 = "0zwch9vn17f3bpy300jcfxx6cx9qymk5j7khx0x9k1xqid4166c3";
- name = "qtdeclarative-render2d-opensource-src-5.7.1.tar.xz";
- };
- };
- qtdoc = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdoc-opensource-src-5.7.1.tar.xz";
- sha256 = "1nyrgfw3d8ja2cqb12vyq5mwryw89976f3xkpdhy49mvsws03ysm";
- name = "qtdoc-opensource-src-5.7.1.tar.xz";
- };
- };
- qtgamepad = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtgamepad-opensource-src-5.7.1.tar.xz";
- sha256 = "10lijbsg9xx5ddbbjymdgl41nxz99yn1qgiww2kkggxwwdjj2axv";
- name = "qtgamepad-opensource-src-5.7.1.tar.xz";
- };
- };
- qtgraphicaleffects = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtgraphicaleffects-opensource-src-5.7.1.tar.xz";
- sha256 = "1j2drnx7zp3w6cgvy7bn00fyk5v7vw1j1hidaqcg78lzb6zgls1c";
- name = "qtgraphicaleffects-opensource-src-5.7.1.tar.xz";
- };
- };
- qtimageformats = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtimageformats-opensource-src-5.7.1.tar.xz";
- sha256 = "1x3p1xmw7spxa4bwriyrwsfrq31jabsdjsi5fras9y39naia55sg";
- name = "qtimageformats-opensource-src-5.7.1.tar.xz";
- };
- };
- qtlocation = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtlocation-opensource-src-5.7.1.tar.xz";
- sha256 = "17zkzffzwbg6aqhsggs23cmwzq4y45m938842lsc423hfm7fdsgr";
- name = "qtlocation-opensource-src-5.7.1.tar.xz";
- };
- };
- qtmacextras = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtmacextras-opensource-src-5.7.1.tar.xz";
- sha256 = "0rr6nl1j6bq47lcq87zsqyma3cdqysamnngwbaccxvpznpcx7jhx";
- name = "qtmacextras-opensource-src-5.7.1.tar.xz";
- };
- };
- qtmultimedia = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtmultimedia-opensource-src-5.7.1.tar.xz";
- sha256 = "1vvxmgmvjnz9w1h2ph1j2fy77ij141ycx5fric60lq02pxzifax5";
- name = "qtmultimedia-opensource-src-5.7.1.tar.xz";
- };
- };
- qtpurchasing = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtpurchasing-opensource-src-5.7.1.tar.xz";
- sha256 = "0hkvrgafz1hx9q4yc3nskv3pd3fszghvvd5a7mj33ynf55wpb57n";
- name = "qtpurchasing-opensource-src-5.7.1.tar.xz";
- };
- };
- qtquickcontrols = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols-opensource-src-5.7.1.tar.xz";
- sha256 = "17cyfyqzjbm9dhq9pjscz36y84y16rmxwk6h826gjfprddrimsvg";
- name = "qtquickcontrols-opensource-src-5.7.1.tar.xz";
- };
- };
- qtquickcontrols2 = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols2-opensource-src-5.7.1.tar.xz";
- sha256 = "1v77ydy4k15lksp3bi2kgha2h7m79g4n7c2qhbr09xnvpb8ars7j";
- name = "qtquickcontrols2-opensource-src-5.7.1.tar.xz";
- };
- };
- qtscript = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtscript-opensource-src-5.7.1.tar.xz";
- sha256 = "09m41n95448pszr7inlg03ycb66s1a9hzfylaka92382acf1myav";
- name = "qtscript-opensource-src-5.7.1.tar.xz";
- };
- };
- qtscxml = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtscxml-opensource-src-5.7.1.tar.xz";
- sha256 = "135kknqdmib2cjryfmvfgv7a2qx9pyba3m7i7nkbc5d742r4mbcx";
- name = "qtscxml-opensource-src-5.7.1.tar.xz";
- };
- };
- qtsensors = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtsensors-opensource-src-5.7.1.tar.xz";
- sha256 = "041v1x8pwfzpyk6y0sy5zgm915pi15xdhiy18fd5wqayvcp99cyc";
- name = "qtsensors-opensource-src-5.7.1.tar.xz";
- };
- };
- qtserialbus = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtserialbus-opensource-src-5.7.1.tar.xz";
- sha256 = "0mxi43l2inpbar8rmg21qjg33bv3f1ycxjgvzjf12ncnybhdnzkj";
- name = "qtserialbus-opensource-src-5.7.1.tar.xz";
- };
- };
- qtserialport = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtserialport-opensource-src-5.7.1.tar.xz";
- sha256 = "09jsryc0z49cz9783kq48rkn42f10c6krzivp812ddwjsfdy3mbn";
- name = "qtserialport-opensource-src-5.7.1.tar.xz";
- };
- };
- qtsvg = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtsvg-opensource-src-5.7.1.tar.xz";
- sha256 = "0irr9h566hl9nx8p919rz276zbfvvd6vqdb6i9g6b3piikdigw5h";
- name = "qtsvg-opensource-src-5.7.1.tar.xz";
- };
- };
- qttools = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz";
- sha256 = "1b6zqa5690b8lqms7rrhb8rcq0xg5hp117v3m08qngbcd0i706b4";
- name = "qttools-opensource-src-5.7.1.tar.xz";
- };
- };
- qttranslations = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qttranslations-opensource-src-5.7.1.tar.xz";
- sha256 = "1rsq0bp6p8yf41h1nxrbclxr4xq8v025cbi0lq7yh917ac4xpv0n";
- name = "qttranslations-opensource-src-5.7.1.tar.xz";
- };
- };
- qtvirtualkeyboard = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz";
- sha256 = "1p9acm75am5lybmn8j2339vck808dmayk4xwbr67jpfigs9qp2xj";
- name = "qtvirtualkeyboard-opensource-src-5.7.1.tar.xz";
- };
- };
- qtwayland = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwayland-opensource-src-5.7.1.tar.xz";
- sha256 = "1iq1c89y4ggq0dxjlf62jyhh8a9l3x7y914x84w5pby8h3hwagzj";
- name = "qtwayland-opensource-src-5.7.1.tar.xz";
- };
- };
- qtwebchannel = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebchannel-opensource-src-5.7.1.tar.xz";
- sha256 = "16rij92dxy4k5231l3dpmhy7cnz0cjkn50cpzaf014zrdz3kmav3";
- name = "qtwebchannel-opensource-src-5.7.1.tar.xz";
- };
- };
- qtwebengine = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebengine-opensource-src-5.7.1.tar.xz";
- sha256 = "0ayc3j17nampy7pg464nbi09wr2d3pfbpqql789m0av37lz8h091";
- name = "qtwebengine-opensource-src-5.7.1.tar.xz";
- };
- };
- qtwebkit = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/community_releases/5.7/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz";
- sha256 = "00szgcra6pf2myfjrdbsr1gmrxycpbjqlzkplna5yr1rjg4gfv54";
- name = "qtwebkit-opensource-src-5.7.1.tar.xz";
- };
- };
- qtwebkit-examples = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/community_releases/5.7/5.7.1/qtwebkit-examples-opensource-src-5.7.1.tar.xz";
- sha256 = "09c2ni3nf7vdsw1y9yhpbal9zs8jgvi1wndnva6mgdbcnm8h23fm";
- name = "qtwebkit-examples-opensource-src-5.7.1.tar.xz";
- };
- };
- qtwebsockets = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebsockets-opensource-src-5.7.1.tar.xz";
- sha256 = "1laj0slwibs0bg69kgrdhc9k1s6yisq3pcsr0r9rhbkzisv7aajw";
- name = "qtwebsockets-opensource-src-5.7.1.tar.xz";
- };
- };
- qtwebview = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebview-opensource-src-5.7.1.tar.xz";
- sha256 = "17qmyayy67ji4d3i3cq0wb8s7hqjrw224zr2blzjc1827rlzkg5k";
- name = "qtwebview-opensource-src-5.7.1.tar.xz";
- };
- };
- qtwinextras = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwinextras-opensource-src-5.7.1.tar.xz";
- sha256 = "1k7kiq0k7qwsn06p6sg13lr8hnnz7lvvsx18gas46dggkyj66514";
- name = "qtwinextras-opensource-src-5.7.1.tar.xz";
- };
- };
- qtx11extras = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtx11extras-opensource-src-5.7.1.tar.xz";
- sha256 = "09z49jm70f5i0gcdz9a16z00pg96x8pz7vri5wpirh3fqqn0qnjz";
- name = "qtx11extras-opensource-src-5.7.1.tar.xz";
- };
- };
- qtxmlpatterns = {
- version = "5.7.1";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtxmlpatterns-opensource-src-5.7.1.tar.xz";
- sha256 = "1rgqnpg64gn5agmvjwy0am8hp5fpxl3cdkixr1yrsdxi5a6961d8";
- name = "qtxmlpatterns-opensource-src-5.7.1.tar.xz";
- };
- };
-}
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 85b38c6fc6c..eb26f88f725 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -18,7 +18,7 @@ top-level attribute to `top-level/all-packages.nix`.
newScope,
stdenv, fetchurl, makeSetupHook, makeWrapper,
bison, cups ? null, harfbuzz, mesa, perl,
- gstreamer, gst-plugins-base,
+ gstreamer, gst-plugins-base, gtk3, dconf,
# options
developerBuild ? false,
@@ -106,13 +106,13 @@ let
makeQtWrapper =
makeSetupHook
- { deps = [ makeWrapper ]; }
- ../make-qt-wrapper.sh;
+ { deps = [ makeWrapper ] ++ optionals (!stdenv.isDarwin) [ dconf.lib gtk3 ]; }
+ (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
qmakeHook =
makeSetupHook
{ deps = [ self.qtbase.dev ]; }
- ../qmake-hook.sh;
+ (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
};
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch
similarity index 91%
rename from pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch
rename to pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch
index 2fda5ed8cf0..da7f36542ef 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch
@@ -1,11 +1,11 @@
-Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
===================================================================
---- qtbase-opensource-src-5.7.1.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
endif()
!!ENDIF
-
+
-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
@@ -35,7 +35,7 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cm
set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
+
!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
+ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
@@ -48,7 +48,7 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cm
@@ -74,45 +53,17 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
\"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
)
-
+
-!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
@@ -64,9 +64,9 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cm
-!!ENDIF
endmacro()
!!ENDIF
-
+
if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-
+
!!IF !no_module_headers
-!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
@@ -103,7 +103,7 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cm
include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
!!ENDIF
@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
-
+
!!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
!!IF isEmpty(CMAKE_DEBUG_TYPE)
-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -135,14 +135,14 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cm
!!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
!!ENDIF // CMAKE_RELEASE_TYPE
-
+
!!IF !isEmpty(CMAKE_DEBUG_TYPE)
-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
-!!ELSE
_populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
-
+
!!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
!!IF isEmpty(CMAKE_RELEASE_TYPE)
-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -175,7 +175,7 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cm
@@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
+
-!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
-!!ELSE
@@ -185,13 +185,13 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cm
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
set_target_properties(Qt5::${Plugin} PROPERTIES
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-Index: qtbase-opensource-src-5.7.1/src/gui/Qt5GuiConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.8.0/src/gui/Qt5GuiConfigExtras.cmake.in
===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/gui/Qt5GuiConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.1/src/gui/Qt5GuiConfigExtras.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in
++++ qtbase-opensource-src-5.8.0/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -2,7 +2,7 @@
!!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
-
+
!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
+set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\")
@@ -200,40 +200,40 @@ Index: qtbase-opensource-src-5.7.1/src/gui/Qt5GuiConfigExtras.cmake.in
!!ENDIF
@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert
set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
+
!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
+ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
!!ELSE
set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
!!ENDIF
-
+
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
+ set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
!!ELSE
set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
!!ENDIF
-Index: qtbase-opensource-src-5.7.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.8.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
++++ qtbase-opensource-src-5.8.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
add_executable(Qt5::uic IMPORTED)
-
+
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
!!ELSE
set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
!!ENDIF
-Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtras.cmake.in
===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
++++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
add_executable(Qt5::qmake IMPORTED)
-
+
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
@@ -242,7 +242,7 @@ Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in
!!ENDIF
@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
add_executable(Qt5::moc IMPORTED)
-
+
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
@@ -251,7 +251,7 @@ Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in
!!ENDIF
@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)
add_executable(Qt5::rcc IMPORTED)
-
+
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
@@ -269,44 +269,44 @@ Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in
!!ENDIF
@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain)
set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-
+
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
!!ELSE
set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
!!ENDIF
-Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-+++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
++++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
@@ -1,6 +1,6 @@
-
+
!!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
!!ELSE
set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
!!ENDIF
-Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-+++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
++++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
@@ -1,6 +1,6 @@
-
+
!!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
!!ELSE
set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
!!ENDIF
-Index: qtbase-opensource-src-5.7.1/src/dbus/Qt5DBusConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.8.0/src/dbus/Qt5DBusConfigExtras.cmake.in
===================================================================
---- qtbase-opensource-src-5.7.1.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.7.1/src/dbus/Qt5DBusConfigExtras.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
++++ qtbase-opensource-src-5.8.0/src/dbus/Qt5DBusConfigExtras.cmake.in
@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
add_executable(Qt5::qdbuscpp2xml IMPORTED)
-
+
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
@@ -315,19 +315,19 @@ Index: qtbase-opensource-src-5.7.1/src/dbus/Qt5DBusConfigExtras.cmake.in
!!ENDIF
@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
add_executable(Qt5::qdbusxml2cpp IMPORTED)
-
+
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
!!ELSE
set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
!!ENDIF
-Index: qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf
+Index: qtbase-opensource-src-5.8.0/mkspecs/features/create_cmake.prf
===================================================================
---- qtbase-opensource-src-5.7.1.orig/mkspecs/features/create_cmake.prf
-+++ qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf
+--- qtbase-opensource-src-5.8.0.orig/mkspecs/features/create_cmake.prf
++++ qtbase-opensource-src-5.8.0/mkspecs/features/create_cmake.prf
@@ -136,28 +136,28 @@ contains(CONFIG, plugin) {
-
+
win32 {
isEmpty(CMAKE_STATIC_TYPE) {
- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll
@@ -349,7 +349,7 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf
mac {
isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
else: CMAKE_PlUGIN_EXT = .a
-
+
- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
@@ -357,7 +357,7 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf
} else {
isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so
else: CMAKE_PlUGIN_EXT = .a
-
+
- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
@@ -365,13 +365,13 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf
}
}
cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
-Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
===================================================================
---- qtbase-opensource-src-5.7.1.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-+++ qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+--- qtbase-opensource-src-5.8.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
++++ qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
@@ -2,10 +2,10 @@
add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
-
+
!!IF !isEmpty(CMAKE_RELEASE_TYPE)
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
@@ -380,5 +380,5 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5PluginTarget.c
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
!!ENDIF
-
+
list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 7da02525f2d..f881c76c3ad 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -4,6 +4,8 @@
coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2,
ruby,
+ # darwin support
+ darwin, libiconv, libcxx,
dbus, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite,
libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
@@ -15,7 +17,8 @@
cups ? null, mysql ? null, postgresql ? null,
# options
- mesaSupported, mesa,
+ mesaSupported ? (!stdenv.isDarwin),
+ mesa,
buildExamples ? false,
buildTests ? false,
developerBuild ? false,
@@ -35,6 +38,7 @@ stdenv.mkDerivation {
patches =
copyPathsToStore (lib.readPathsFromFile ./. ./series)
+ ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)]
++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
@@ -54,11 +58,11 @@ stdenv.mkDerivation {
substituteInPlace src/network/kernel/qhostinfo_unix.cpp \
--replace "@glibc@" "${stdenv.cc.libc.out}"
- substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \
- --replace "@libXcursor@" "${libXcursor.out}"
-
substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \
--replace "@openssl@" "${openssl.out}"
+ '' + lib.optionalString stdenv.isLinux ''
+ substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \
+ --replace "@libXcursor@" "${libXcursor.out}"
substituteInPlace src/dbus/qdbus_symbols.cpp \
--replace "@dbus_libs@" "${dbus.lib}"
@@ -74,8 +78,23 @@ stdenv.mkDerivation {
substituteInPlace mkspecs/common/linux.conf \
--replace "@mesa_lib@" "${mesa.out}" \
--replace "@mesa_inc@" "${mesa.dev or mesa}"
- '';
-
+ ''+ lib.optionalString stdenv.isDarwin ''
+ sed -i \
+ -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \
+ -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \
+ -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \
+ -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \
+ -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \
+ -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
+ -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \
+ ./configure
+ sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf
+ sed -i '26,$d' ./mkspecs/features/mac/default_post.prf
+ sed -i '1,$d' ./mkspecs/features/mac/sdk.prf
+ sed -i 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' ./mkspecs/common/mac.conf
+ '';
+ # Note on the above: \x27 is a way if including a single-quote
+ # character in the sed string arguments.
setOutputFlags = false;
preConfigure = ''
@@ -102,7 +121,7 @@ stdenv.mkDerivation {
-shared
${lib.optionalString developerBuild "-developer-build"}
-accessibility
- -rpath
+ -optimized-qmake
-strip
-no-reduce-relocations
-system-proxies
@@ -114,15 +133,6 @@ stdenv.mkDerivation {
-qml-debug
-icu
-pch
- -glib
- -xcb
- -qpa xcb
- -${lib.optionalString (cups == null) "no-"}cups
-
- -no-eglfs
- -no-directfb
- -no-linuxfb
- -no-kms
${lib.optionalString (!system-x86_64) "-no-sse2"}
-no-sse3
@@ -135,16 +145,10 @@ stdenv.mkDerivation {
-no-mips_dspr2
-system-zlib
- -system-libpng
-system-libjpeg
-system-harfbuzz
- -system-xcb
- -system-xkbcommon
-system-pcre
-openssl-linked
- -dbus-linked
- -libinput
- -gtk
-system-sqlite
-${if mysql != null then "plugin" else "no"}-sql-mysql
@@ -155,6 +159,31 @@ stdenv.mkDerivation {
-${lib.optionalString (buildExamples == false) "no"}make examples
-${lib.optionalString (buildTests == false) "no"}make tests
-v
+ '' + lib.optionalString (!stdenv.isDarwin) ''
+ -rpath
+ -glib
+ -xcb
+ -qpa xcb
+
+ -${lib.optionalString (cups == null) "no-"}cups
+
+ -no-eglfs
+ -no-directfb
+ -no-linuxfb
+ -no-kms
+
+ -libinput
+ -gtk
+ -system-libpng
+ -system-xcb
+ -system-xkbcommon
+ -dbus-linked
+ '' + lib.optionalString stdenv.isDarwin ''
+ -platform macx-clang
+ -no-use-gold-linker
+ -no-fontconfig
+ -qt-freetype
+ -qt-libpng
'';
# PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
@@ -163,32 +192,44 @@ stdenv.mkDerivation {
PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
propagatedBuildInputs = [
- dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib
+ libxml2 libxslt openssl pcre16 sqlite zlib
+
+ # Text rendering
+ harfbuzz icu
# Image formats
libjpeg libpng libtiff
+ ]
+ ++ lib.optional mesaSupported mesa
+ ++ lib.optionals (!stdenv.isDarwin) [
+ dbus glib udev
# Text rendering
- fontconfig freetype harfbuzz icu
+ fontconfig freetype
# X11 libs
libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil
xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm
- ]
- ++ lib.optional mesaSupported mesa;
+ ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ ApplicationServices Foundation CoreServices AppKit Carbon OpenGL AGL Cocoa
+ DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk
+ ]);
- buildInputs =
- [ gtk3 libinput ]
+ buildInputs = [ ]
+ ++ lib.optionals (!stdenv.isDarwin) [ gtk3 libinput ]
++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups
++ lib.optional (mysql != null) mysql.lib
++ lib.optional (postgresql != null) postgresql;
- nativeBuildInputs =
- [ bison flex gperf lndir patchelf perl pkgconfig python2 ];
+ nativeBuildInputs = [ bison flex gperf lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf;
# freetype-2.5.4 changed signedness of some struct fields
- NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
+ NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"
+ + lib.optionalString stdenv.isDarwin " -D__MAC_OS_X_VERSION_MAX_ALLOWED=1090 -D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))";
+ # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is
+ # 10.9 which necessitates the above macro definition that mentions
+ # 10.10
postInstall = ''
find "$out" -name "*.cmake" | while read file; do
@@ -218,7 +259,7 @@ stdenv.mkDerivation {
# Move libtool archives and qmake projects
if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
pushd "''${!outputLib}"
- find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \
+ find lib -name '*.a' -o -name '*.la'${if stdenv.isDarwin then "" else "-o -name '*.prl'"} | \
while read -r file; do
mkdir -p "''${!outputDev}/$(dirname "$file")"
mv "''${!outputLib}/$file" "''${!outputDev}/$file"
@@ -226,14 +267,12 @@ stdenv.mkDerivation {
popd
fi
''
-
# fixup .pc file (where to find 'moc' etc.)
+ lib.optionalString (!stdenv.isDarwin) ''
sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
-e "/^host_bins=/ c host_bins=$dev/bin"
''
-
- # Don't move .prl files on darwin because they end up in
+ # Don' move .prl files on darwin because they end up in
# "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent
# use of lndir in the qtbase setup-hook. On Linux, the .prl files
# are in lib, and so do not cause a subsequent recreation of deep
@@ -265,8 +304,8 @@ stdenv.mkDerivation {
homepage = http://www.qt.io;
description = "A cross-platform application framework for C++";
license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
- maintainers = with maintainers; [ qknight ttuegel ];
- platforms = platforms.linux;
+ maintainers = with maintainers; [ qknight ttuegel periklis ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index 44e2d904080..2196d838375 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -7,4 +7,3 @@ xdg-config-dirs.patch
nix-profiles-library-paths.patch
compose-search-path.patch
libressl.patch
-cmake-paths.patch
diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
index d716a876526..8f42682fa23 100644
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
+++ b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
@@ -7,6 +7,7 @@ wrapQtProgram() {
--set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
--prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
--prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
+ --prefix GIO_EXTRA_MODULES : "$GIO_EXTRA_MODULES" \
"$@"
}
@@ -21,6 +22,7 @@ makeQtWrapper() {
--set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
--prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
--prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
+ --prefix GIO_EXTRA_MODULES : "$GIO_EXTRA_MODULES" \
"$@"
}
@@ -29,8 +31,16 @@ _makeQtWrapperSetup() {
export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins"
export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports"
export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml"
- export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share"
+ export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share${GSETTINGS_SCHEMAS_PATH:+:$GSETTINGS_SCHEMAS_PATH}"
export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
}
prePhases+=(_makeQtWrapperSetup)
+
+_findGioModules() {
+ if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then
+ export GIO_EXTRA_MODULES="$GIO_EXTRA_MODULES${GIO_EXTRA_MODULES:+:}$1/lib/gio/modules"
+ fi
+}
+
+envHooks+=(_findGioModules)
diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix
index 3221fec4b4b..103b495f8e2 100644
--- a/pkgs/development/libraries/qtscriptgenerator/default.nix
+++ b/pkgs/development/libraries/qtscriptgenerator/default.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation {
description = "QtScript bindings generator";
homepage = http://code.google.com/p/qtscriptgenerator/;
inherit (qt4.meta) platforms;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index 99f54cebddd..10fc7bf10ac 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, gfortran, openblas }:
+{ stdenv, fetchurl, gfortran, openblas
+, enableCuda ? false, cudatoolkit
+}:
let
version = "4.4.4";
@@ -28,6 +30,21 @@ stdenv.mkDerivation {
+ stdenv.lib.optionalString stdenv.isDarwin ''
sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
-e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/'
+ ''
+ + stdenv.lib.optionalString enableCuda ''
+ sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+ -e 's|^[[:space:]]*\(CUDA_ROOT =\)|CUDA_ROOT = ${cudatoolkit}|' \
+ -e 's|^[[:space:]]*\(GPU_BLAS_PATH =\)|GPU_BLAS_PATH = $(CUDA_ROOT)|' \
+ -e 's|^[[:space:]]*\(GPU_CONFIG =\)|GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=$(NIX_BUILD_CORES) |' \
+ -e 's|^[[:space:]]*\(CUDA_PATH =\)|CUDA_PATH = $(CUDA_ROOT)|' \
+ -e 's|^[[:space:]]*\(CUDART_LIB =\)|CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so|' \
+ -e 's|^[[:space:]]*\(CUBLAS_LIB =\)|CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so|' \
+ -e 's|^[[:space:]]*\(CUDA_INC_PATH =\)|CUDA_INC_PATH = $(CUDA_ROOT)/include/|' \
+ -e 's|^[[:space:]]*\(NV_20 =\)|NV_20 = -arch=sm_20 -Xcompiler -fPIC|' \
+ -e 's|^[[:space:]]*\(NV_30 =\)|NV_30 = -arch=sm_30 -Xcompiler -fPIC|' \
+ -e 's|^[[:space:]]*\(NV_35 =\)|NV_35 = -arch=sm_35 -Xcompiler -fPIC|' \
+ -e 's|^[[:space:]]*\(NVCC =\) echo|NVCC = $(CUDA_ROOT)/bin/nvcc|' \
+ -e 's|^[[:space:]]*\(NVCCFLAGS =\)|NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_60,code=sm_60|'
'';
makeFlags = [
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 93142c269c2..b87662a6e34 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -2,7 +2,7 @@
let
- version = "2.3.9.0";
+ version = "2.4.0.1";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/skalibs";
rev = "refs/tags/v${version}";
- sha256 = "1x52mgf39yiijsj63x0ibp6d3nj0d4z9k9lisa4rzsxs7846za4a";
+ sha256 = "1sdzm2vd9mxlwxbmjajb6n1n13dpsavdap2nbbnyx4wnzixxx9k7";
};
dontDisableStatic = true;
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
# Explicitly setting target ensures code can be compiled against a skalibs
# binary built on a different version of darwin.
# http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
- ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
+ ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
meta = {
homepage = http://skarnet.org/software/skalibs/;
diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index c4db48248f3..553ddb7d3b7 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline, libiconv }:
stdenv.mkDerivation rec {
- name = "slang-2.3.0";
+ name = "slang-2.3.1a";
src = fetchurl {
- url = "http://www.jedsoft.org/releases/slang/${name}.tar.gz";
- sha256 = "0aqd2cjabj6nhd4r3dc4vhqif2bf3dmqnrn2gj0xm4gqyfd177jy";
+ url = "http://www.jedsoft.org/releases/slang/${name}.tar.bz2";
+ sha256 = "0dlcy0hn0j6cj9qj5x6hpb0axifnvzzmv5jqq0wq14fygw0c7w2l";
};
outputs = [ "out" "dev" "doc" ];
diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix
index 7736eab511e..4739c736397 100644
--- a/pkgs/development/libraries/soprano/default.nix
+++ b/pkgs/development/libraries/soprano/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
homepage = http://soprano.sourceforge.net/;
description = "An object-oriented C++/Qt4 framework for RDF data";
license = "LGPL";
- maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+ maintainers = with stdenv.lib.maintainers; [ sander ];
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index faba57d155f..1961160cbc9 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
homepage = http://strigi.sourceforge.net;
description = "A very fast and efficient crawler to index data on your harddrive";
license = "LGPL";
- maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+ maintainers = with stdenv.lib.maintainers; [ sander ];
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix
index 41087044e49..71b8a764eed 100644
--- a/pkgs/development/libraries/taglib/1.9.nix
+++ b/pkgs/development/libraries/taglib/1.9.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
description = "A library for reading and editing the meta-data of several popular audio formats";
inherit (cmake.meta) platforms;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index 0937b2fe8cf..602aab852cc 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
description = "A library for reading and editing the meta-data of several popular audio formats";
inherit (cmake.meta) platforms;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/tclgpg/default.nix b/pkgs/development/libraries/tclgpg/default.nix
deleted file mode 100644
index d8bea7f14e3..00000000000
--- a/pkgs/development/libraries/tclgpg/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchsvn, autoconf, automake, tcl, tcllib, gnupg }:
-
-stdenv.mkDerivation rec {
- name = "tclgpg-${version}";
- version = "1.0pre";
-
- src = fetchsvn {
- url = "http://tclgpg.googlecode.com/svn/trunk";
- rev = 74;
- sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4f97c7e7b54ec27c5";
- };
-
- configureFlags = "--with-tcl=" + tcl + "/lib "
- + "--with-tclinclude=" + tcl + "/include ";
-
- preConfigure = ''
- configureFlags="--exec_prefix=$prefix $configureFlags"
- sed -i -e 's|dtplite|TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" &|' Makefile.in
- autoreconf -vfi
- '';
-
- prePatch = ''
- sed -i -e 's|\[auto_execok gpg\]|"${gnupg}/bin/gpg2"|' tclgpg.tcl
- '';
-
- passthru = {
- libPrefix = "gpg1.0";
- };
-
- buildInputs = [ autoconf automake tcl tcllib ];
-
- meta = {
- homepage = http://code.google.com/p/tclgpg/;
- description = "A Tcl interface to GNU Privacy Guard";
- license = stdenv.lib.licenses.bsd2;
- };
-}
diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix
index 09909f6546a..8fa974a95e2 100644
--- a/pkgs/development/libraries/udunits/default.nix
+++ b/pkgs/development/libraries/udunits/default.nix
@@ -3,10 +3,10 @@
}:
stdenv.mkDerivation rec {
- name = "udunits-2.2.23";
+ name = "udunits-2.2.24";
src = fetchurl {
url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz";
- sha256 = "0ya93jrv8qzfkdj77grl4dpyb0ap4jccmqx3rkkgaggnklhjfwkr";
+ sha256 = "15bz2wv46wiwdzai8770gzy05prgj120x6j2hmihavv5y89cbfi0";
};
nativeBuildInputs = [ bison flex file ];
diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix
index 95ba2a05ad9..931d4064400 100644
--- a/pkgs/development/libraries/xbase/default.nix
+++ b/pkgs/development/libraries/xbase/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
homepage = http://linux.techass.com/projects/xdb/;
description = "C++ class library formerly known as XDB";
platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/lisp-modules/asdf/2.26.nix b/pkgs/development/lisp-modules/asdf/2.26.nix
new file mode 100644
index 00000000000..01cfca0d1fd
--- /dev/null
+++ b/pkgs/development/lisp-modules/asdf/2.26.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchurl, texinfo, texLive, perl}:
+let
+ s = # Generated upstream information
+ rec {
+ baseName="asdf";
+ version="2.26";
+ name="${baseName}-${version}";
+ url="http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz";
+ sha256="1qzp444rgnqf1cz9v48nh0yvz7wjq9fjdpimifsfcjswaqi2xrdn";
+ };
+ buildInputs = [
+ texinfo texLive perl
+ ];
+in
+stdenv.mkDerivation {
+ inherit (s) name version;
+ inherit buildInputs;
+ src = fetchurl {
+ inherit (s) url sha256;
+ };
+
+ buildPhase = ''
+ make asdf.lisp
+ mkdir build
+ ln -s ../asdf.lisp build
+ '';
+ installPhase = ''
+ mkdir -p "$out"/lib/common-lisp/asdf/
+ mkdir -p "$out"/share/doc/asdf/
+ cp -r ./* "$out"/lib/common-lisp/asdf/
+ cp -r doc/* "$out"/share/doc/asdf/
+ '';
+ meta = {
+ inherit (s) version;
+ description = ''Standard software-system definition library for Common Lisp'';
+ license = stdenv.lib.licenses.mit ;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/lisp-modules/asdf/3.1.nix b/pkgs/development/lisp-modules/asdf/3.1.nix
new file mode 100644
index 00000000000..f3da61e286e
--- /dev/null
+++ b/pkgs/development/lisp-modules/asdf/3.1.nix
@@ -0,0 +1,39 @@
+{stdenv, fetchurl, texinfo, texLive, perl}:
+let
+ s = # Generated upstream information
+ rec {
+ baseName="asdf";
+ version="3.1.7";
+ name="${baseName}-${version}";
+ url="http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz";
+ sha256="1g8wp3vi7gwrs22gnjy9lvrxqag3m8apxnryfs8n5bv6rln8bzzq";
+ };
+ buildInputs = [
+ texinfo texLive perl
+ ];
+in
+stdenv.mkDerivation {
+ inherit (s) name version;
+ inherit buildInputs;
+ src = fetchurl {
+ inherit (s) url sha256;
+ };
+
+ buildPhase = ''
+ make build/asdf.lisp
+ make -C doc asdf.info asdf.html
+ '';
+ installPhase = ''
+ mkdir -p "$out"/lib/common-lisp/asdf/
+ mkdir -p "$out"/share/doc/asdf/
+ cp -r ./* "$out"/lib/common-lisp/asdf/
+ cp -r doc/* "$out"/share/doc/asdf/
+ '';
+ meta = {
+ inherit (s) version;
+ description = ''Standard software-system definition library for Common Lisp'';
+ license = stdenv.lib.licenses.mit ;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
index 5bf375a4eff..d7485936941 100755
--- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
+++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!@stdenv_shell@
# Part of NixPkgs package collection
# This script can be used at your option under the same license as NixPkgs or
# under MIT/X11 license
@@ -15,38 +15,51 @@ export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_
test -n "$NIX_LISP_LD_LIBRARY_PATH" &&
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH+:}$NIX_LISP_LD_LIBRARY_PATH"
+declare -a NIX_LISP_FINAL_PARAMETERS;
+
case "$NIX_LISP" in
sbcl)
NIX_LISP_LOAD_FILE="--load"
NIX_LISP_EXEC_CODE="--eval"
NIX_LISP_QUIT="(quit)"
+ NIX_LISP_NODEBUG='--non-interactive'
NIX_LISP_FINAL_PARAMETERS=
;;
ecl)
NIX_LISP_LOAD_FILE="-load"
NIX_LISP_EXEC_CODE="-eval"
NIX_LISP_QUIT="(quit)"
+ NIX_LISP_NODEBUG='--nodebug'
NIX_LISP_FINAL_PARAMETERS=
;;
clisp)
NIX_LISP_LOAD_FILE="-c -l"
NIX_LISP_EXEC_CODE="-x"
NIX_LISP_QUIT="(quit)"
+ NIX_LISP_NODEBUG='-on-error exit'
NIX_LISP_FINAL_PARAMETERS="-repl"
;;
esac
NIX_LISP_ASDF_REGISTRY_CODE="
(progn
- (setf asdf:*default-source-registries* '(asdf/source-registry:environment-source-registry))
+ #+asdf3 (setf asdf:*default-source-registries*
+ '(asdf/source-registry:environment-source-registry))
(asdf:initialize-source-registry)
)
"
NIX_LISP_ASDF="${NIX_LISP_ASDF:-@asdf@}"
+nix_lisp_run_single_form(){
+ NIX_LISP_FINAL_PARAMETERS=("$NIX_LISP_EXEC_CODE" "$1"
+ "$NIX_LISP_EXEC_CODE" "$NIX_LISP_QUIT" $NIX_LISP_NODEBUG)
+}
+
+eval "$NIX_LISP_PRELAUNCH_HOOK"
+
[ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \
- $NIX_LISP_EXEC_CODE "(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")" \
+ $NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")"}" \
$NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \
- $NIX_LISP_FINAL_PARAMETERS \
+ "${NIX_LISP_FINAL_PARAMETERS[@]}" \
"$@"
diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index 172af31f834..978e16fd998 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation {
'';
inherit asdf lisp;
+ stdenv_shell = stdenv.shell;
setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index 8623032ed37..a3368e336e6 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -6,6 +6,7 @@ let
mkdir -p "$(dirname "$config_script")"
touch "$config_script"
chmod a+x "$config_script"
+ echo "export NIX_CFLAGS_COMPILE='$NIX_CFLAGS_COMPILE'\"\''${NIX_CFLAGS_COMPILE:+ $NIX_CFLAGS_COMPILE}\"" >> "$config_script"
echo "export NIX_LISP_COMMAND='$NIX_LISP_COMMAND'" >> "$config_script"
echo "export NIX_LISP_ASDF='$NIX_LISP_ASDF'" >> "$config_script"
echo "export CL_SOURCE_REGISTRY="\$CL_SOURCE_REGISTRY\''${CL_SOURCE_REGISTRY:+:}"'$CL_SOURCE_REGISTRY:$out/lib/common-lisp/${args.baseName}/'" >> "$config_script"
@@ -46,6 +47,7 @@ basePackage = {
++ (args.propagatedBuildInputs or []);
buildInputs = buildInputs;
dontStrip=true;
+
meta = {
inherit description version;
} // meta;
diff --git a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
index 8693a304899..d2d846b78f2 100755
--- a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
+++ b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh
@@ -34,7 +34,7 @@ url="${ql_src##* }"
[ "$ql_src_type" = "kmr-git" ] && {
ql_src_type=git
- url="http://git.b9.com/$url.git"
+ url="http://git.kpe.io/$url.git"
export NIX_PREFETCH_GIT_DEEP_CLONE=1
}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/agnostic-lizard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/agnostic-lizard.nix
new file mode 100644
index 00000000000..8da74224ae2
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/agnostic-lizard.nix
@@ -0,0 +1,14 @@
+{ fetchurl }:
+rec {
+ baseName = ''agnostic-lizard'';
+ version = ''20170227-git'';
+
+ description = ''A portable code walker that makes a best effort to be correct in most cases'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/agnostic-lizard/2017-02-27/agnostic-lizard-20170227-git.tgz'';
+ sha256 = ''0gnbxfdz35z9kznnhnj9x5zzn25k1x2ifv4v9rkzb0xmi7xkx9wi'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
new file mode 100644
index 00000000000..34173f0ac4b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''alexandria'';
+ version = ''20170227-git'';
+
+ description = ''Alexandria is a collection of portable public domain utilities.'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/alexandria/2017-02-27/alexandria-20170227-git.tgz'';
+ sha256 = ''0gnn4ysyvqf8wfi94kh6x23iwx3czaicam1lz9pnwsv40ws5fwwh'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
new file mode 100644
index 00000000000..392912d77e4
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''babel'';
+ version = ''20150608-git'';
+
+ description = ''Babel, a charset conversion library.'';
+
+ deps = [ args."trivial-features" args."alexandria" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz'';
+ sha256 = ''0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
new file mode 100644
index 00000000000..26313457010
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''bordeaux-threads'';
+ version = ''v0.8.5'';
+
+ description = ''Bordeaux Threads makes writing portable multi-threaded apps simple'';
+
+ deps = [ args."alexandria" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz'';
+ sha256 = ''09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
new file mode 100644
index 00000000000..582b0c39493
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cffi'';
+ version = ''cffi_0.18.0'';
+
+ description = ''The Common Foreign Function Interface'';
+
+ deps = [ args."uiop" args."alexandria" args."trivial-features" args."babel" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
+ sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
new file mode 100644
index 00000000000..02d8ba70baf
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''chipz'';
+ version = ''20160318-git'';
+
+ description = ''A library for decompressing deflate, zlib, and gzip data'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz'';
+ sha256 = ''1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
new file mode 100644
index 00000000000..e737843d167
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''chunga'';
+ version = ''1.1.6'';
+
+ description = '''';
+
+ deps = [ args."trivial-gray-streams" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz'';
+ sha256 = ''1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
new file mode 100644
index 00000000000..bd4f4b58fb1
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl+ssl'';
+ version = ''cl+ssl-20161208-git'';
+
+ description = ''Common Lisp interface to OpenSSL.'';
+
+ deps = [ args."cffi" args."trivial-gray-streams" args."flexi-streams" args."bordeaux-threads" args."trivial-garbage" args."uiop" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl+ssl/2016-12-08/cl+ssl-20161208-git.tgz'';
+ sha256 = ''0x9xa2rdfh9gxp5m27cj0wvzjqccz4w5cvm7nbk5shwsz5xgr7hs'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
new file mode 100644
index 00000000000..c9d62c62b01
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-base64'';
+ version = ''20150923-git'';
+
+ description = ''Base64 encoding and decoding with URI support.'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz'';
+ sha256 = ''0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
new file mode 100644
index 00000000000..9fea4c0f01d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-fad'';
+ version = ''0.7.4'';
+
+ description = ''Portable pathname library'';
+
+ deps = [ args."bordeaux-threads" args."alexandria" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz'';
+ sha256 = ''1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
new file mode 100644
index 00000000000..2f44fbc416b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-fuse'';
+ version = ''20160318-git'';
+
+ description = ''CFFI bindings to FUSE (Filesystem in user space)'';
+
+ deps = [ args."cffi" args."cl-utilities" args."bordeaux-threads" args."trivial-backtrace" args."iterate" args."trivial-utf-8" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz'';
+ sha256 = ''1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
new file mode 100644
index 00000000000..5e9f1a6e473
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-ppcre'';
+ version = ''2.0.11'';
+
+ description = ''Perl-compatible regular expression library'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz'';
+ sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
new file mode 100644
index 00000000000..2d24e2d87e3
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-utilities'';
+ version = ''1.2.4'';
+
+ description = '''';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz'';
+ sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
new file mode 100644
index 00000000000..1611b7b74fe
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''clx'';
+ version = ''20170227-git'';
+
+ description = ''An implementation of the X Window System protocol in Lisp.'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/clx/2017-02-27/clx-20170227-git.tgz'';
+ sha256 = ''0zgp1yqy0lm528bhil93ap7df01qdyfhnbxhckjv87xk8rs0g5nx'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
new file mode 100644
index 00000000000..a64a62078ec
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''drakma'';
+ version = ''2.0.2'';
+
+ description = ''Full-featured http/https client based on usocket'';
+
+ deps = [ args."puri" args."cl-base64" args."chunga" args."flexi-streams" args."cl-ppcre" args."chipz" args."usocket" args."cl+ssl" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz'';
+ sha256 = ''1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
new file mode 100644
index 00000000000..e05713da15b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''esrap'';
+ version = ''20170124-git'';
+
+ description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.'';
+
+ deps = [ args."alexandria" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/esrap/2017-01-24/esrap-20170124-git.tgz'';
+ sha256 = ''1182011bbhvkw2qsdqrccl879vf5k7bcda318n0xskk35hzircp8'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
new file mode 100644
index 00000000000..1b8378d5d55
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''external-program'';
+ version = ''20160825-git'';
+
+ description = '''';
+
+ deps = [ args."trivial-features" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz'';
+ sha256 = ''0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
new file mode 100644
index 00000000000..12da2cbacb9
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''flexi-streams'';
+ version = ''1.0.15'';
+
+ description = ''Flexible bivalent streams for Common Lisp'';
+
+ deps = [ args."trivial-gray-streams" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz'';
+ sha256 = ''0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
new file mode 100644
index 00000000000..0eadf54320a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -0,0 +1,17 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''hunchentoot'';
+ version = ''1.2.35'';
+
+ description = ''Hunchentoot is a HTTP server based on USOCKET and
+ BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a
+ simple framework for user-defined handlers and can be extended
+ through subclassing.'';
+
+ deps = [ args."chunga" args."cl-base64" args."cl-fad" args."cl-ppcre" args."flexi-streams" args."cl+ssl" args."md5" args."rfc2388" args."trivial-backtrace" args."usocket" args."bordeaux-threads" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz'';
+ sha256 = ''0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
new file mode 100644
index 00000000000..feacb1264af
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''idna'';
+ version = ''20120107-git'';
+
+ description = ''IDNA (international domain names) string encoding and decoding routines'';
+
+ deps = [ args."split-sequence" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz'';
+ sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
new file mode 100644
index 00000000000..5badc04f201
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''iolib'';
+ version = ''v0.8.1'';
+
+ description = ''I/O library.'';
+
+ deps = [ args."iolib/base" args."iolib/multiplex" args."iolib/streams" args."iolib/sockets" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+ sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_asdf.nix
new file mode 100644
index 00000000000..f6a78c85da9
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_asdf.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''iolib_slash_asdf'';
+ version = ''iolib-v0.8.1'';
+
+ description = ''A few ASDF component classes.'';
+
+ deps = [ args."alexandria" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+ sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_base.nix
new file mode 100644
index 00000000000..642e26e278a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_base.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''iolib_slash_base'';
+ version = ''iolib-v0.8.1'';
+
+ description = ''Base IOlib package, used instead of CL.'';
+
+ deps = [ args."iolib/common-lisp" args."alexandria" args."split-sequence" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+ sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_common-lisp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_common-lisp.nix
new file mode 100644
index 00000000000..59fdbdc85d0
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_common-lisp.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''iolib_slash_common-lisp'';
+ version = ''iolib-v0.8.1'';
+
+ description = ''Slightly modified Common Lisp.'';
+
+ deps = [ args."alexandria" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+ sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_conf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_conf.nix
new file mode 100644
index 00000000000..0a0631caf44
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_conf.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''iolib_slash_conf'';
+ version = ''iolib-v0.8.1'';
+
+ description = ''Compile-time configuration for IOLib.'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+ sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_grovel.nix
new file mode 100644
index 00000000000..e7c2d780f4e
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_grovel.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''iolib_slash_grovel'';
+ version = ''iolib-v0.8.1'';
+
+ description = ''The CFFI Groveller'';
+
+ deps = [ args."iolib/asdf" args."iolib/base" args."iolib/conf" args."alexandria" args."split-sequence" args."cffi" args."uiop" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+ sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix
new file mode 100644
index 00000000000..07324035052
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_multiplex.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''iolib_slash_multiplex'';
+ version = ''iolib-v0.8.1'';
+
+ description = ''I/O multiplexing library.'';
+
+ deps = [ args."iolib/base" args."iolib/syscalls" args."cffi" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+ sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix
new file mode 100644
index 00000000000..b956d3ece21
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_sockets.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''iolib_slash_sockets'';
+ version = ''iolib-v0.8.1'';
+
+ description = ''Socket library.'';
+
+ deps = [ args."iolib/base" args."iolib/syscalls" args."iolib/streams" args."babel" args."cffi" args."iolib/grovel" args."bordeaux-threads" args."idna" args."swap-bytes" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+ sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix
new file mode 100644
index 00000000000..267dbd8e6de
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_streams.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''iolib_slash_streams'';
+ version = ''iolib-v0.8.1'';
+
+ description = ''Gray streams.'';
+
+ deps = [ args."iolib/base" args."iolib/multiplex" args."cffi" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+ sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix
new file mode 100644
index 00000000000..395b3d53934
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_slash_syscalls.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''iolib_slash_syscalls'';
+ version = ''iolib-v0.8.1'';
+
+ description = ''Syscalls and foreign types.'';
+
+ deps = [ args."trivial-features" args."cffi" args."iolib/base" args."iolib/grovel" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
+ sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
new file mode 100644
index 00000000000..469c8439246
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''iterate'';
+ version = ''20160825-darcs'';
+
+ description = ''Jonathan Amsterdam's iterator/gatherer/accumulator facility'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz'';
+ sha256 = ''0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
new file mode 100644
index 00000000000..275dd3577dd
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''md5'';
+ version = ''20150804-git'';
+
+ description = ''The MD5 Message-Digest Algorithm RFC 1321'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/md5/2015-08-04/md5-20150804-git.tgz'';
+ sha256 = ''1sf79pjip19sx7zmznz1wm4563qc208lq49m0jnhxbv09wmm4vc5'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
new file mode 100644
index 00000000000..b86c4205407
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''puri'';
+ version = ''20150923-git'';
+
+ description = ''Portable Universal Resource Indentifier Library'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz'';
+ sha256 = ''099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
new file mode 100644
index 00000000000..82b31efea27
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''rfc2388'';
+ version = ''20130720-git'';
+
+ description = ''Implementation of RFC 2388'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz'';
+ sha256 = ''1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
new file mode 100644
index 00000000000..085e215e024
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -0,0 +1,15 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''split-sequence'';
+ version = ''1.2'';
+
+ description = ''Splits a sequence into a list of subsequences
+ delimited by objects satisfying a test.'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz'';
+ sha256 = ''12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
new file mode 100644
index 00000000000..910cce74f8a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''stumpwm'';
+ version = ''20170227-git'';
+
+ description = ''A tiling, keyboard driven window manager'';
+
+ deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/stumpwm/2017-02-27/stumpwm-20170227-git.tgz'';
+ sha256 = ''0w1arw1x5hsw0w6rc1ls4bf7gf8cjcm6ar68kp74zczp0y35fign'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
new file mode 100644
index 00000000000..cb1e293919b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''swap-bytes'';
+ version = ''v1.1'';
+
+ description = ''Optimized byte-swapping primitives.'';
+
+ deps = [ args."trivial-features" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz'';
+ sha256 = ''0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
new file mode 100644
index 00000000000..fc83804f5e1
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''trivial-backtrace'';
+ version = ''20160531-git'';
+
+ description = ''trivial-backtrace'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz'';
+ sha256 = ''1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
new file mode 100644
index 00000000000..97d6b0cf2c0
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''trivial-features'';
+ version = ''20161204-git'';
+
+ description = ''Ensures consistent *FEATURES* across multiple CLs.'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz'';
+ sha256 = ''0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
new file mode 100644
index 00000000000..6a057bdcc10
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''trivial-garbage'';
+ version = ''20150113-git'';
+
+ description = ''Portable finalizers, weak hash-tables and weak pointers.'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz'';
+ sha256 = ''1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
new file mode 100644
index 00000000000..b234da11c37
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''trivial-gray-streams'';
+ version = ''20140826-git'';
+
+ description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz'';
+ sha256 = ''1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
new file mode 100644
index 00000000000..110edbb9f18
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''trivial-utf-8'';
+ version = ''20111001-darcs'';
+
+ description = '''';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz'';
+ sha256 = ''1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
new file mode 100644
index 00000000000..e80cbc99e8c
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''uiop'';
+ version = ''3.2.0'';
+
+ description = '''';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz'';
+ sha256 = ''1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
new file mode 100644
index 00000000000..7797cb4e797
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''usocket'';
+ version = ''0.7.0.1'';
+
+ description = ''Universal socket library for Common Lisp'';
+
+ deps = [ args."split-sequence" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz'';
+ sha256 = ''1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
new file mode 100644
index 00000000000..1c6b1e05adf
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -0,0 +1,28 @@
+{pkgs, buildLispPackage, quicklisp-to-nix-packages}:
+{
+ iterate = x: {
+ overrides = x: {
+ configurePhase="buildPhase(){ true; }";
+ };
+ };
+ cl-fuse = x: {
+ propagatedBuildInputs = [pkgs.fuse];
+ overrides = x : {
+ configurePhase = ''
+ export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD"
+ export makeFlags="$makeFlags LISP=common-lisp.sh"
+ '';
+ };
+ };
+ hunchentoot = x: {
+ propagatedBuildInputs = [pkgs.openssl];
+ };
+ iolib = x: {
+ propagatedBuildInputs = [pkgs.libfixposix pkgs.gcc];
+ overrides = y: {
+ postBuild = ''
+ NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(asdf:load-system :iolib)"' common-lisp.sh ""
+ '';
+ };
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
new file mode 100644
index 00000000000..12ec2d1f4e5
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -0,0 +1,7 @@
+stumpwm
+cl-fuse
+esrap
+hunchentoot
+external-program
+drakma
+iolib
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
new file mode 100644
index 00000000000..0f7f58df4b8
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -0,0 +1,447 @@
+{stdenv, fetchurl, pkgs, clwrapper}:
+let quicklisp-to-nix-packages = rec {
+ inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages;
+
+ callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages;
+ buildLispPackage = callPackage ./define-package.nix;
+ qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
+
+ "iolib/conf" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib/conf" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_slash_conf.nix {
+ inherit fetchurl;
+ }));
+ "iolib_slash_conf" = quicklisp-to-nix-packages."iolib/conf";
+
+
+ "iolib/asdf" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib/asdf" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_slash_asdf.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ }));
+ "iolib_slash_asdf" = quicklisp-to-nix-packages."iolib/asdf";
+
+
+ "swap-bytes" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."swap-bytes" or (x: {}))
+ (import ./quicklisp-to-nix-output/swap-bytes.nix {
+ inherit fetchurl;
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ }));
+
+
+ "idna" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."idna" or (x: {}))
+ (import ./quicklisp-to-nix-output/idna.nix {
+ inherit fetchurl;
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ }));
+
+
+ "iolib/grovel" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib/grovel" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_slash_grovel.nix {
+ inherit fetchurl;
+ "iolib/asdf" = quicklisp-to-nix-packages."iolib/asdf";
+ "iolib/base" = quicklisp-to-nix-packages."iolib/base";
+ "iolib/conf" = quicklisp-to-nix-packages."iolib/conf";
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ }));
+ "iolib_slash_grovel" = quicklisp-to-nix-packages."iolib/grovel";
+
+
+ "iolib/syscalls" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib/syscalls" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_slash_syscalls.nix {
+ inherit fetchurl;
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "iolib/base" = quicklisp-to-nix-packages."iolib/base";
+ "iolib/grovel" = quicklisp-to-nix-packages."iolib/grovel";
+ }));
+ "iolib_slash_syscalls" = quicklisp-to-nix-packages."iolib/syscalls";
+
+
+ "iolib/common-lisp" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib/common-lisp" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_slash_common-lisp.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ }));
+ "iolib_slash_common-lisp" = quicklisp-to-nix-packages."iolib/common-lisp";
+
+
+ "split-sequence" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."split-sequence" or (x: {}))
+ (import ./quicklisp-to-nix-output/split-sequence.nix {
+ inherit fetchurl;
+ }));
+
+
+ "trivial-garbage" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-garbage" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-garbage.nix {
+ inherit fetchurl;
+ }));
+
+
+ "trivial-gray-streams" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-gray-streams" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-gray-streams.nix {
+ inherit fetchurl;
+ }));
+
+
+ "babel" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."babel" or (x: {}))
+ (import ./quicklisp-to-nix-output/babel.nix {
+ inherit fetchurl;
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ }));
+
+
+ "uiop" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."uiop" or (x: {}))
+ (import ./quicklisp-to-nix-output/uiop.nix {
+ inherit fetchurl;
+ }));
+
+
+ "iolib/sockets" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib/sockets" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_slash_sockets.nix {
+ inherit fetchurl;
+ "iolib/base" = quicklisp-to-nix-packages."iolib/base";
+ "iolib/syscalls" = quicklisp-to-nix-packages."iolib/syscalls";
+ "iolib/streams" = quicklisp-to-nix-packages."iolib/streams";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "iolib/grovel" = quicklisp-to-nix-packages."iolib/grovel";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "idna" = quicklisp-to-nix-packages."idna";
+ "swap-bytes" = quicklisp-to-nix-packages."swap-bytes";
+ }));
+ "iolib_slash_sockets" = quicklisp-to-nix-packages."iolib/sockets";
+
+
+ "iolib/streams" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib/streams" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_slash_streams.nix {
+ inherit fetchurl;
+ "iolib/base" = quicklisp-to-nix-packages."iolib/base";
+ "iolib/multiplex" = quicklisp-to-nix-packages."iolib/multiplex";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ }));
+ "iolib_slash_streams" = quicklisp-to-nix-packages."iolib/streams";
+
+
+ "iolib/multiplex" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib/multiplex" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_slash_multiplex.nix {
+ inherit fetchurl;
+ "iolib/base" = quicklisp-to-nix-packages."iolib/base";
+ "iolib/syscalls" = quicklisp-to-nix-packages."iolib/syscalls";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ }));
+ "iolib_slash_multiplex" = quicklisp-to-nix-packages."iolib/multiplex";
+
+
+ "iolib/base" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib/base" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib_slash_base.nix {
+ inherit fetchurl;
+ "iolib/common-lisp" = quicklisp-to-nix-packages."iolib/common-lisp";
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ }));
+ "iolib_slash_base" = quicklisp-to-nix-packages."iolib/base";
+
+
+ "chipz" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."chipz" or (x: {}))
+ (import ./quicklisp-to-nix-output/chipz.nix {
+ inherit fetchurl;
+ }));
+
+
+ "puri" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."puri" or (x: {}))
+ (import ./quicklisp-to-nix-output/puri.nix {
+ inherit fetchurl;
+ }));
+
+
+ "trivial-features" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-features" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-features.nix {
+ inherit fetchurl;
+ }));
+
+
+ "usocket" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."usocket" or (x: {}))
+ (import ./quicklisp-to-nix-output/usocket.nix {
+ inherit fetchurl;
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ }));
+
+
+ "rfc2388" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."rfc2388" or (x: {}))
+ (import ./quicklisp-to-nix-output/rfc2388.nix {
+ inherit fetchurl;
+ }));
+
+
+ "md5" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."md5" or (x: {}))
+ (import ./quicklisp-to-nix-output/md5.nix {
+ inherit fetchurl;
+ }));
+
+
+ "cl+ssl" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl+ssl" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl+ssl.nix {
+ inherit fetchurl;
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ }));
+
+
+ "flexi-streams" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."flexi-streams" or (x: {}))
+ (import ./quicklisp-to-nix-output/flexi-streams.nix {
+ inherit fetchurl;
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ }));
+
+
+ "cl-fad" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-fad" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-fad.nix {
+ inherit fetchurl;
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ }));
+
+
+ "cl-base64" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-base64" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-base64.nix {
+ inherit fetchurl;
+ }));
+
+
+ "chunga" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."chunga" or (x: {}))
+ (import ./quicklisp-to-nix-output/chunga.nix {
+ inherit fetchurl;
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ }));
+
+
+ "trivial-utf-8" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-utf-8" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-utf-8.nix {
+ inherit fetchurl;
+ }));
+
+
+ "iterate" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iterate" or (x: {}))
+ (import ./quicklisp-to-nix-output/iterate.nix {
+ inherit fetchurl;
+ }));
+
+
+ "trivial-backtrace" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-backtrace" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-backtrace.nix {
+ inherit fetchurl;
+ }));
+
+
+ "bordeaux-threads" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."bordeaux-threads" or (x: {}))
+ (import ./quicklisp-to-nix-output/bordeaux-threads.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ }));
+
+
+ "cl-utilities" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-utilities" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-utilities.nix {
+ inherit fetchurl;
+ }));
+
+
+ "cffi" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cffi" or (x: {}))
+ (import ./quicklisp-to-nix-output/cffi.nix {
+ inherit fetchurl;
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "babel" = quicklisp-to-nix-packages."babel";
+ }));
+
+
+ "clx" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clx" or (x: {}))
+ (import ./quicklisp-to-nix-output/clx.nix {
+ inherit fetchurl;
+ }));
+
+
+ "cl-ppcre" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-ppcre" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-ppcre.nix {
+ inherit fetchurl;
+ }));
+
+
+ "alexandria" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."alexandria" or (x: {}))
+ (import ./quicklisp-to-nix-output/alexandria.nix {
+ inherit fetchurl;
+ }));
+
+
+ "iolib" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."iolib" or (x: {}))
+ (import ./quicklisp-to-nix-output/iolib.nix {
+ inherit fetchurl;
+ "iolib/base" = quicklisp-to-nix-packages."iolib/base";
+ "iolib/multiplex" = quicklisp-to-nix-packages."iolib/multiplex";
+ "iolib/streams" = quicklisp-to-nix-packages."iolib/streams";
+ "iolib/sockets" = quicklisp-to-nix-packages."iolib/sockets";
+ }));
+
+
+ "drakma" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."drakma" or (x: {}))
+ (import ./quicklisp-to-nix-output/drakma.nix {
+ inherit fetchurl;
+ "puri" = quicklisp-to-nix-packages."puri";
+ "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+ "chunga" = quicklisp-to-nix-packages."chunga";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "chipz" = quicklisp-to-nix-packages."chipz";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+ }));
+
+
+ "external-program" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."external-program" or (x: {}))
+ (import ./quicklisp-to-nix-output/external-program.nix {
+ inherit fetchurl;
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ }));
+
+
+ "hunchentoot" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."hunchentoot" or (x: {}))
+ (import ./quicklisp-to-nix-output/hunchentoot.nix {
+ inherit fetchurl;
+ "chunga" = quicklisp-to-nix-packages."chunga";
+ "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+ "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+ "md5" = quicklisp-to-nix-packages."md5";
+ "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+ "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ }));
+
+
+ "esrap" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."esrap" or (x: {}))
+ (import ./quicklisp-to-nix-output/esrap.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ }));
+
+
+ "cl-fuse" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-fuse" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-fuse.nix {
+ inherit fetchurl;
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
+ }));
+
+
+ "stumpwm" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."stumpwm" or (x: {}))
+ (import ./quicklisp-to-nix-output/stumpwm.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "clx" = quicklisp-to-nix-packages."clx";
+ }));
+
+
+}; in quicklisp-to-nix-packages
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
new file mode 100644
index 00000000000..a13cedf3dfe
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
@@ -0,0 +1,8 @@
+ "<% @var name %>" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."<% @var name %>" or (x: {}))
+ (import ./quicklisp-to-nix-output/<% @var filename %>.nix {
+ inherit fetchurl;<% @loop deps %>
+ "<% @var name %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endloop %>
+ }));<% @ifequal name filename %><% @else %>
+ "<% @var filename %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endif %>
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
new file mode 100644
index 00000000000..1be5345b327
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
@@ -0,0 +1,14 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''<% @var filename %>'';
+ version = ''<% @var version %>'';
+
+ description = ''<% @var description %>'';
+
+ deps = [ <% @loop deps %>args."<% @var name %>" <% @endloop %>];
+
+ src = fetchurl {
+ url = ''<% @var url %>'';
+ sha256 = ''<% @var sha256 %>'';
+ };
+}
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
new file mode 100644
index 00000000000..dc4b14c1f60
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
@@ -0,0 +1,137 @@
+; QuickLisp-to-Nix export
+; Requires QuickLisp to be loaded
+; Installs the QuickLisp version of all the packages processed (in the
+; QuickLisp instance it uses)
+
+(ql:quickload :cl-emb)
+(ql:quickload :external-program)
+(ql:quickload :cl-ppcre)
+(ql:quickload :md5)
+(ql:quickload :alexandria)
+
+(defun nix-prefetch-url (url)
+ (let*
+ ((stdout nil)
+ (stderr nil))
+ (setf
+ stdout
+ (with-output-to-string (so)
+ (setf
+ stderr
+ (with-output-to-string (se)
+ (external-program:run
+ "nix-prefetch-url"
+ (list url)
+ :search t :output so :error se)))))
+ (let*
+ ((path-line (first (last (cl-ppcre:split (format nil "~%") stderr))))
+ (path (cl-ppcre:regex-replace-all "path is .(.*)." path-line "\\1")))
+ (list
+ :sha256 (first (cl-ppcre:split (format nil "~%") stdout))
+ :path path
+ :md5 (string-downcase
+ (format nil "~{~16,2,'0r~}"
+ (map 'list 'identity (md5:md5sum-file path))))))))
+
+(defun escape-filename (s)
+ (format nil "~{~a~}"
+ (loop
+ for x in (map 'list 'identity s)
+ collect
+ (case x
+ (#\/ "_slash_")
+ (#\\ "_backslash_")
+ (#\_ "__")
+ (t x)))))
+
+(defun system-data (system)
+ (ql:quickload system)
+ (let*
+ ((asdf-system (asdf:find-system system))
+ (ql-system (ql-dist:find-system system))
+ (ql-release (ql-dist:release ql-system))
+ (url (ql-dist:archive-url ql-release))
+ (local-archive (ql-dist:local-archive-file ql-release))
+ (local-url (format nil "file://~a" (pathname local-archive)))
+ (archive-data
+ (progn
+ (ql-dist:ensure-local-archive-file ql-release)
+ (nix-prefetch-url local-url)))
+ (ideal-md5 (ql-dist:archive-md5 ql-release))
+ (file-md5 (getf archive-data :md5))
+ (raw-dependencies (asdf:system-depends-on asdf-system))
+ (dependencies (remove-if-not 'ql-dist:find-system raw-dependencies))
+ (deps (mapcar (lambda (x) (list :name x)) dependencies))
+ (name (string-downcase (format nil "~a" system)))
+ (description (asdf:system-description asdf-system))
+ (release-name (ql-dist:short-description ql-release))
+ (version (cl-ppcre:regex-replace-all
+ (format nil "~a-" name) release-name "")))
+ (assert (equal ideal-md5 file-md5))
+ (list
+ :system system
+ :description description
+ :sha256 (getf archive-data :sha256)
+ :url url
+ :md5 file-md5
+ :name name
+ :filename (escape-filename name)
+ :deps deps
+ :dependencies dependencies
+ :version version)))
+
+(defmacro this-file ()
+ (or *compile-file-truename*
+ *load-truename*))
+
+(defun nix-expression (system)
+ (cl-emb:execute-emb
+ (merge-pathnames #p"nix-package.emb" (this-file))
+ :env (system-data system)))
+(defun nix-invocation (system)
+ (cl-emb:execute-emb
+ (merge-pathnames #p"invocation.emb" (this-file))
+ :env (system-data system)))
+
+(defun systems-closure (systems)
+ (let*
+ ((seen (make-hash-table :test 'equal)))
+ (loop
+ with queue := systems
+ with res := nil
+ while queue
+ for next := (pop queue)
+ for deps := (getf (system-data next) :dependencies)
+ unless (gethash next seen) do
+ (progn
+ (push next res)
+ (setf queue (append queue deps)))
+ do (setf (gethash next seen) t)
+ finally (return res))))
+
+(defun ql-to-nix (target-directory)
+ (let*
+ ((systems
+ (cl-ppcre:split
+ (format nil "~%")
+ (alexandria:read-file-into-string
+ (format nil "~a/quicklisp-to-nix-systems.txt" target-directory))))
+ (closure (systems-closure systems))
+ (invocations
+ (loop for s in closure
+ collect (list :code (nix-invocation s)))))
+ (loop
+ for s in closure
+ do (alexandria:write-string-into-file
+ (nix-expression s)
+ (format nil "~a/quicklisp-to-nix-output/~a.nix"
+ target-directory (escape-filename s))
+ :if-exists :supersede))
+ (alexandria:write-string-into-file
+ (cl-emb:execute-emb
+ (merge-pathnames
+ #p"top-package.emb"
+ (this-file))
+ :env (list :invocations invocations))
+ (format nil "~a/quicklisp-to-nix.nix" target-directory)
+ :if-exists :supersede)))
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
new file mode 100644
index 00000000000..2cbe73c89ca
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, pkgs, clwrapper}:
+let quicklisp-to-nix-packages = rec {
+ inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages;
+
+ callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages;
+ buildLispPackage = callPackage ./define-package.nix;
+ qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
+<% @loop invocations %>
+<% @var code %>
+<% @endloop %>
+}; in quicklisp-to-nix-packages
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 52a2ab8f36a..7587fb3e0c4 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -7,7 +7,7 @@
}:
{ platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }:
-with { inherit (stdenv.lib) makeLibraryPath; };
+let inherit (stdenv.lib) makeLibraryPath; in
stdenv.mkDerivation rec {
name = "android-sdk-${version}";
diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix
index 755724bc8b8..fadb55907bf 100644
--- a/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib, ocaml_oasis }:
stdenv.mkDerivation rec {
- version = "0.3.0";
+ version = "0.4.0";
name = "ocaml-angstrom-${version}";
src = fetchFromGitHub {
owner = "inhabitedtype";
repo = "angstrom";
rev = "${version}";
- sha256 = "1x9pvy5vw98ns4pspj7i10pmgqyngn4v4cdlz5pbvwbrpwpn090q";
+ sha256 = "019s3jwhnswa914bgj1fa6q67k0bl2ahqdaqfnavcbyii8763kh2";
};
createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/async_ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix
deleted file mode 100644
index 2bace35aa8b..00000000000
--- a/pkgs/development/ocaml-modules/async_ssl/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{stdenv, buildOcaml, fetchurl, async_p4, comparelib, core_p4, ctypes, openssl,
- fieldslib_p4, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib_p4}:
-
-buildOcaml rec {
- name = "async_ssl";
- version = "112.24.03";
-
- minimumSupportedOcamlVersion = "4.02";
-
- src = fetchurl {
- url = "https://github.com/janestreet/async_ssl/archive/${version}.tar.gz";
- sha256 = "1b0bea92142eef11da6bf649bbe229bd4b8d9cc807303d8142406908c0d28c68";
- };
-
- buildInputs = [ pa_bench pa_test ];
- propagatedBuildInputs = [ ctypes async_p4 comparelib core_p4 fieldslib_p4 pa_ounit
- herelib pipebang sexplib_p4 openssl ];
-
- meta = with stdenv.lib; {
- homepage = https://github.com/janestreet/async_ssl;
- description = "Async wrappers for ssl";
- license = licenses.asl20;
- maintainers = [ maintainers.ericbmerritt ];
- };
-}
diff --git a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix b/pkgs/development/ocaml-modules/bitstring/2.0.4.nix
deleted file mode 100644
index 68ce28c40bd..00000000000
--- a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{stdenv, fetchurl, buildOcaml, time}:
-
-buildOcaml rec {
- name = "bitstring";
- version = "2.0.4";
- src = fetchurl {
- url = "http://bitstring.googlecode.com/files/ocaml-bitstring-${version}.tar.gz";
- sha256 = "0mapzn2ls5qcrzjm1az50lqjj76ldkmz4fbv2phc9w6smab50qy5";
- };
-
- patches = [ ./camlp4.patch ./meta.patch ./srcdir.patch ];
-
- buildInputs = [time];
- doCheck = true;
-
- createFindlibDestdir = true;
- hasSharedObjects = true;
-
- meta = with stdenv.lib; {
- description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml";
- homepage = http://code.google.com/p/bitstring/;
- license = licenses.lgpl21Plus;
- maintainers = [ maintainers.maurer ];
- };
-}
diff --git a/pkgs/development/ocaml-modules/bitstring/camlp4.patch b/pkgs/development/ocaml-modules/bitstring/camlp4.patch
deleted file mode 100644
index 920c78007bb..00000000000
--- a/pkgs/development/ocaml-modules/bitstring/camlp4.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -rupN ocaml-bitstring-2.0.4.orig/camlp4.patch ocaml-bitstring-2.0.4/camlp4.patch
---- ocaml-bitstring-2.0.4.orig/camlp4.patch 1970-01-01 00:00:00.000000000 +0000
-+++ ocaml-bitstring-2.0.4/camlp4.patch 2015-06-10 18:06:54.016000000 +0000
-@@ -0,0 +1,31 @@
-+--- Makefile.in 2015-06-10 20:05:26.603000000 +0200
-++++ ../bs-old/Makefile.in 2013-05-14 17:42:32.000000000 +0200
-+@@ -40,10 +40,10 @@
-+ enable_coverage = @enable_coverage@
-+
-+ OCAMLCFLAGS = -g
-+-OCAMLCPACKAGES = -package camlp4
-++OCAMLCPACKAGES =
-+ OCAMLCLIBS = -linkpkg
-+ OCAMLOPTFLAGS =
-+-OCAMLOPTPACKAGES = -package camlp4
-++OCAMLOPTPACKAGES =
-+ OCAMLOPTLIBS = -linkpkg
-+
-+ ifneq ($(enable_coverage),no)
-+@@ -110,13 +110,12 @@
-+ -I +camlp4 -pp camlp4of -c $<
-+
-+ pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma
-+- $(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) \
-+- bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
-++ $(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
-+ -pp camlp4of -c $< -o $@
-+
-+ bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
-+ $(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \
-+- $(OCAMLCPACKAGES) $(OCAMLCLIBS) \
-++ $(OCAMLCLIBS) \
-+ bitstring.cma bitstring_persistent.cma \
-+ $< -o $@
-+
-diff -rupN ocaml-bitstring-2.0.4.orig/Makefile.in ocaml-bitstring-2.0.4/Makefile.in
---- ocaml-bitstring-2.0.4.orig/Makefile.in 2013-05-14 15:42:32.000000000 +0000
-+++ ocaml-bitstring-2.0.4/Makefile.in 2015-06-25 20:05:52.759000000 +0000
-@@ -40,10 +40,10 @@ pkg_extlib = @OCAML_PKG_extlib@
- enable_coverage = @enable_coverage@
-
- OCAMLCFLAGS = -g
--OCAMLCPACKAGES =
-+OCAMLCPACKAGES = -package camlp4
- OCAMLCLIBS = -linkpkg
- OCAMLOPTFLAGS =
--OCAMLOPTPACKAGES =
-+OCAMLOPTPACKAGES = -package camlp4
- OCAMLOPTLIBS = -linkpkg
-
- ifneq ($(enable_coverage),no)
-@@ -110,12 +110,13 @@ bitstring_persistent.cmi: bitstring_pers
- -I +camlp4 -pp camlp4of -c $<
-
- pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma
-- $(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
-+ $(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) \
-+ bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
- -pp camlp4of -c $< -o $@
-
- bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
- $(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \
-- $(OCAMLCLIBS) \
-+ $(OCAMLCPACKAGES) $(OCAMLCLIBS) \
- bitstring.cma bitstring_persistent.cma \
- $< -o $@
-
-@@ -158,13 +159,13 @@ tests/test.bmpp: create_test_pattern
-
- create_test_pattern: create_test_pattern.cmo
- $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
-- unix.cma -I +camlp4 dynlink.cma camlp4lib.cma \
-- $(OCAMLCLIBS) \
-+ unix.cma -I `$(OCAMLFIND) query camlp4` dynlink.cma camlp4lib.cma \
-+ $(OCAMLCLIBS) $(OCAMLCPACKAGES) \
- -I . bitstring.cma bitstring_persistent.cma $< -o $@
-
- create_test_pattern.cmo: create_test_pattern.ml
- $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
-- unix.cma -I +camlp4 \
-+ unix.cma -I `$(OCAMLFIND) query camlp4` $(OCAMLCPACKAGES) \
- -I . -c $< -o $@
-
- # Coverage of tests.
diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
index 26b41a75146..d6909efe4a6 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchzip, buildOcaml, time, autoconf, automake }:
+{ stdenv, fetchurl, buildOcaml, time, autoconf, automake }:
buildOcaml rec {
name = "bitstring";
- version = "f1673f8";
- src = fetchzip {
- url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/bitstring/source-archive.zip;
- sha256 = "03343yggwp3y483zj5axaalxlnl698xrjiv3hmd4c2s05g53iwas";
+ version = "2.1.0";
+ src = fetchurl {
+ url = http://github.com/xguerin/bitstring/archive/v2.1.0.tar.gz;
+ sha256 = "0miw4banfpmx4kxrckpqr57b1fcmsqdmspyjx6gqjd4kghm4l7xj";
};
- patches = [ ./camlp4-git.patch ./meta.patch ./srcdir.patch ];
+ patches = [ ./camlp4-git.patch ./srcdir.patch ];
buildInputs = [time autoconf automake];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/bitstring/meta.patch b/pkgs/development/ocaml-modules/bitstring/meta.patch
deleted file mode 100644
index 78f44cbe15f..00000000000
--- a/pkgs/development/ocaml-modules/bitstring/meta.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -rupN ocaml-bitstring-2.0.4/META.in ocaml-bitstring-2.0.4.new/META.in
---- ocaml-bitstring-2.0.4/META.in 2013-05-14 17:42:32.000000000 +0200
-+++ ocaml-bitstring-2.0.4.new/META.in 2015-06-11 17:26:11.674000000 +0200
-@@ -15,8 +15,8 @@ package "persistent" (
-
- package "syntax" (
- version = "@PACKAGE_VERSION@"
-- requires = "camlp4"
-+ requires = "camlp4, bitstring.persistent, bitstring"
- description = "Syntax extension: bitstring operators"
-- archive(syntax,preprocessor) = "-parser o -parser op -printer p unix.cma bitstring.cma bitstring_persistent.cma pa_bitstring.cmo"
-- archive(syntax,toploop) = "unix.cma bitstring.cma bitstring_persistent.cma pa_bitstring.cmo"
-+ archive(syntax,preprocessor) = "-parser o -parser op -printer p pa_bitstring.cmo"
-+ archive(syntax,toploop) = "pa_bitstring.cmo"
- )
diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix
index 731d66974c6..c1490c3bf19 100644
--- a/pkgs/development/ocaml-modules/camlzip/default.nix
+++ b/pkgs/development/ocaml-modules/camlzip/default.nix
@@ -4,16 +4,17 @@ let
param =
if stdenv.lib.versionAtLeast ocaml.version "4.02"
then {
- version = "1.06";
- url = "1616";
- sha256 = "0m6gyjw46w3qnhxfsyqyag42znl5lwargks7w7rfchr9jzwpff68";
- patch = ./makefile_1_06.patch;
+ version = "1.07";
+ url = "https://github.com/xavierleroy/camlzip/archive/rel107.tar.gz";
+ sha256 = "1pdz3zyiczm6c46zfgag2frwq3ljlq044p3a2y4wm2wb4pgz8k9g";
+ patches = [];
installTargets = "install-findlib";
} else {
version = "1.05";
- url = "1037";
+ download_id = "1037";
+ url = "http://forge.ocamlcore.org/frs/download.php/${param.download_id}/camlzip-${param.version}.tar.gz";
sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b";
- patch = ./makefile_1_05.patch;
+ patches = [./makefile_1_05.patch];
installTargets = "install";
};
in
@@ -22,13 +23,15 @@ stdenv.mkDerivation {
name = "camlzip-${param.version}";
src = fetchurl {
- url = "http://forge.ocamlcore.org/frs/download.php/${param.url}/camlzip-${param.version}.tar.gz";
+ inherit (param) url;
inherit (param) sha256;
};
- buildInputs = [zlib ocaml findlib];
+ buildInputs = [ocaml findlib];
- patches = [ param.patch ];
+ propagatedBuildInputs = [zlib];
+
+ inherit (param) patches;
createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/camlzip/makefile_1_06.patch b/pkgs/development/ocaml-modules/camlzip/makefile_1_06.patch
deleted file mode 100644
index ab0d3528c8c..00000000000
--- a/pkgs/development/ocaml-modules/camlzip/makefile_1_06.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile 2016-06-10 14:37:48.000000000 +0200
-+++ b/Makefile 2016-06-23 05:10:26.000000000 +0200
-@@ -4,17 +4,13 @@
- ZLIB_LIB=-lz
-
- # The directory containing the Zlib library (libz.a or libz.so)
--ZLIB_LIBDIR=/usr/lib
-+ZLIB_LIBDIR=@ZLIB_LIBDIR@
- # ZLIB_LIBDIR=/usr/local/lib
-
- # The directory containing the Zlib header file (zlib.h)
--ZLIB_INCLUDE=/usr/include
-+ZLIB_INCLUDE=@ZLIB_INCLUDE@
- # ZLIB_INCLUDE=/usr/local/include
-
--# Where to install the library. By default: sub-directory 'zip' of
--# OCaml's standard library directory.
--INSTALLDIR=`$(OCAMLC) -where`/zip
--
- ### End of configuration section
-
- OCAMLC=ocamlc -g -safe-string
diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index eb148311be0..0278b0f2655 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -6,7 +6,7 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01";
let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02"
- then { version = "2.3.0"; sha256 = "19spsgkry41dhsbm6ij71kws90bqp7wiggc6lsqdl43xxvbgdmys"; }
+ then { version = "2.3.2"; sha256 = "1fykack86hvvqhwngddyxxqlwm3xjljfaszsjbdrvjlrd1nlg079"; }
else { version = "1.9.0"; sha256 = "1c1j21zgmxi9spq23imy7byn50qr7hlds1cfpzxlsx9dp309jngy"; };
in
diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix
index e64310f6db8..aaddc7b08d5 100644
--- a/pkgs/development/ocaml-modules/ctypes/default.nix
+++ b/pkgs/development/ocaml-modules/ctypes/default.nix
@@ -2,13 +2,13 @@
buildOcaml rec {
name = "ctypes";
- version = "0.4.1";
+ version = "0.11.2";
minimumSupportedOcamlVersion = "4";
src = fetchurl {
url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz";
- sha256 = "74564e049de5d3c0e76ea284c225cb658ac1a2b483345be1efb9be4b3c1702f5";
+ sha256 = "1ml80i8j5lpg3qwc074fks2hgxjq5cfdm9r6cznv605s05ajr3kh";
};
buildInputs = [ ncurses pkgconfig ];
diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
index 492b10bb09b..6c2cb894b54 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -1,16 +1,16 @@
-{stdenv, fetchurl, ocaml, findlib, camlp4, minimal ? true}:
+{ stdenv, fetchurl, ocaml, findlib, cppo, minimal ? true }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
stdenv.mkDerivation {
- name = "ocaml-extlib-1.6.1";
+ name = "ocaml-extlib-1.7.2";
src = fetchurl {
- url = http://ocaml-extlib.googlecode.com/files/extlib-1.6.1.tar.gz;
- sha256 = "1jmfj2w0f3ap0swz8k3qqmrl6x2y4gkmg88vv024xnmliiiv7m48";
+ url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.2.tar.gz;
+ sha256 = "0r7mhfgh6n5chj9r12s2x1fxrzvh6nm8h80ykl1mr75j86za41bm";
};
- buildInputs = [ocaml findlib camlp4];
+ buildInputs = [ ocaml findlib cppo ];
createFindlibDestdir = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
installPhase = "make ${if minimal then "minimal=1" else ""} install";
meta = {
- homepage = http://code.google.com/p/ocaml-extlib/;
+ homepage = https://github.com/ygrek/ocaml-extlib;
description = "Enhancements to the OCaml Standard Library modules";
license = stdenv.lib.licenses.lgpl21;
platforms = ocaml.meta.platforms or [];
diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix
index 9dfffbf48c5..6265a4b90ca 100644
--- a/pkgs/development/ocaml-modules/fileutils/default.nix
+++ b/pkgs/development/ocaml-modules/fileutils/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
stdenv.mkDerivation {
- name = "ocaml-fileutils-0.5.0";
+ name = "ocaml-fileutils-0.5.1";
src = fetchurl {
- url = https://forge.ocamlcore.org/frs/download.php/1531/ocaml-fileutils-0.5.0.tar.gz;
- sha256 = "0xs96nlrrm335mcsgsxnqzspiqyfn26b0jjxm72br7c7ax534n47";
+ url = https://forge.ocamlcore.org/frs/download.php/1651/ocaml-fileutils-0.5.1.tar.gz;
+ sha256 = "0g6zx2rcvacklxyli19ixcf6ich9ipxsps4k3jz98f5zlaab0a7g";
};
buildInputs = [ ocaml findlib ocamlbuild ounit ];
diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix
index 9994d156a4c..469f808947a 100644
--- a/pkgs/development/ocaml-modules/fmt/default.nix
+++ b/pkgs/development/ocaml-modules/fmt/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, cmdliner }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, cmdliner, result, uchar }:
stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-fmt-0.8.0";
+ name = "ocaml${ocaml.version}-fmt-0.8.2";
src = fetchurl {
- url = http://erratique.ch/software/fmt/releases/fmt-0.8.0.tbz;
- sha256 = "16y7ibndnairb53j8a6qgipyqwjxncn4pl9jiw5bxjfjm59108px";
+ url = http://erratique.ch/software/fmt/releases/fmt-0.8.2.tbz;
+ sha256 = "020qz74cm65bzrywf6kylm93gr5x1ayl6hfmxaql995f6whb388i";
};
unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild opam topkg cmdliner ];
+ propagatedBuildInputs = [ result uchar ];
inherit (topkg) buildPhase installPhase;
diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix
new file mode 100644
index 00000000000..1e3a9713406
--- /dev/null
+++ b/pkgs/development/ocaml-modules/higlo/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }:
+
+stdenv.mkDerivation rec {
+ name = "higlo-${version}";
+ version = "0.6";
+ src = fetchFromGitHub {
+ owner = "zoggy";
+ repo = "higlo";
+ rev = "release-${version}";
+ sha256 = "0m0qyk2ydivai54502s45sdw9w4xr0j3jpwyc4vqk62a7iz9ihxh";
+ };
+
+ buildInputs = [ ocaml findlib ];
+ propagatedBuildInputs = [ xtmpl ulex ];
+
+ createFindlibDestdir = true;
+
+ patches = ./install.patch;
+
+ meta = with stdenv.lib; {
+ description = "OCaml library for syntax highlighting";
+ homepage = "https://zoggy.github.io/higlo/";
+ license = licenses.lgpl3;
+ platforms = ocaml.meta.platforms or [];
+ maintainers = with maintainers; [ regnat ];
+ };
+}
+
+
diff --git a/pkgs/development/ocaml-modules/higlo/install.patch b/pkgs/development/ocaml-modules/higlo/install.patch
new file mode 100644
index 00000000000..bbdaace293b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/higlo/install.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index b8c2e01..fcd07ed 100644
+--- a/Makefile
++++ b/Makefile
+@@ -149,7 +149,8 @@ webdoc:
+ install: install-lib install-bin
+
+ install-bin:
+- $(CP) $(HIGLO) $(HIGLO_BYTE) $(MK_HIGLO) `dirname \`which ocamlfind\``/
++ mkdir -p $(out)/bin
++ $(CP) $(HIGLO) $(HIGLO_BYTE) $(MK_HIGLO) $(out)/bin
+
+ install-lib: higlo.cmo higlo.cmx higlo.cmxs $(HIGLO) $(HIGLO_BYTE)
+ ocamlfind install higlo META LICENSE \
diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix
index ed058d82a0e..24aa2557082 100644
--- a/pkgs/development/ocaml-modules/io-page/default.nix
+++ b/pkgs/development/ocaml-modules/io-page/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cstruct }:
-let version = "1.5.1"; in
+let version = "1.6.1"; in
stdenv.mkDerivation {
name = "ocaml-io-page-${version}";
src = fetchzip {
url = "https://github.com/mirage/io-page/archive/v${version}.tar.gz";
- sha256 = "0y92wbvi129d0i7wr4lpk1ps9l247zaf1ibqqz0i6spgl28dyq79";
+ sha256 = "1djwks3ss12m55q6h4jsvfsy848cxfnpaxkilw10h26xj6jchflz";
};
buildInputs = [ ocaml findlib ocamlbuild ];
diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
new file mode 100644
index 00000000000..5cd4c6064e0
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
@@ -0,0 +1,16 @@
+{stdenv, buildOcamlJane, fetchurl, async, comparelib, core, ctypes, openssl,
+ fieldslib, herelib, pipebang, sexplib, ocaml_oasis}:
+
+buildOcamlJane rec {
+ name = "async_ssl";
+ version = "113.33.07";
+ hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs";
+ propagatedBuildInputs = [ ctypes async comparelib core fieldslib
+ herelib pipebang sexplib openssl ocaml_oasis ];
+ meta = with stdenv.lib; {
+ homepage = https://github.com/janestreet/async_ssl;
+ description = "Async wrappers for ssl";
+ license = licenses.asl20;
+ maintainers = [ maintainers.ericbmerritt ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix b/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix
new file mode 100644
index 00000000000..7d7e44ab9cc
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, jbuilder, findlib }:
+
+stdenv.mkDerivation {
+ name = "ocaml${ocaml.version}-ocaml-compiler-libs-0.9.0";
+ src = fetchurl {
+ url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ocaml-compiler-libs-v0.9.0.tar.gz;
+ sha256 = "0ipi56vg227924ahi9vv926jn16br9zfipm6a3xd4xrl5pxkvzaz";
+ };
+
+ buildInputs = [ ocaml jbuilder findlib ];
+
+ inherit (jbuilder) installPhase;
+
+ meta = {
+ description = "OCaml compiler libraries repackaged";
+ homepage = https://github.com/janestreet/ocaml-compiler-libs;
+ license = stdenv.lib.licenses.asl20;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ inherit (ocaml.meta) platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix b/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix
new file mode 100644
index 00000000000..33f1766cb4a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, ocaml, jbuilder, findlib
+, ocaml-compiler-libs, ocaml-migrate-parsetree
+}:
+
+stdenv.mkDerivation {
+ name = "ocaml${ocaml.version}-ppx_ast-0.9.0";
+ src = fetchurl {
+ url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ppx_ast-v0.9.0.tar.gz;
+ sha256 = "1hirfmxr8hkf3p39k1pqidabxxhd541d6ddfaqpgxbl51bw9ddmz";
+ };
+
+ buildInputs = [ ocaml jbuilder findlib ];
+ propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ];
+
+ inherit (jbuilder) installPhase;
+
+ meta = {
+ description = "OCaml AST used by Jane Street ppx rewriters";
+ homepage = https://github.com/janestreet/ppx_ast;
+ license = stdenv.lib.licenses.asl20;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ inherit (ocaml.meta) platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix b/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix
new file mode 100644
index 00000000000..d84983ed634
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, jbuilder, findlib }:
+
+stdenv.mkDerivation {
+ name = "ocaml${ocaml.version}-ppx_traverse_builtins-0.9.0";
+ src = fetchurl {
+ url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ppx_traverse_builtins-v0.9.0.tar.gz;
+ sha256 = "0zmf9kybll0xn8dsj10v260l0zwjyykimqml9rl7xqyjyl1rmnx6";
+ };
+
+ buildInputs = [ ocaml jbuilder findlib ];
+
+ inherit (jbuilder) installPhase;
+
+ meta = {
+ description = "Builtins for Ppx_traverse";
+ homepage = https://github.com/janestreet/ppx_traverse_builtins;
+ license = stdenv.lib.licenses.asl20;
+ inherit (ocaml.meta) platforms;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ };
+}
diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix
index 9eafa055b24..3fa8e9d46b4 100644
--- a/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/pkgs/development/ocaml-modules/mysql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, mysql, camlp4 }:
+{ stdenv, fetchurl, ocaml, findlib, mysql }:
# TODO: la versione stabile da' un errore di compilazione dovuto a
# qualche cambiamento negli header .h
@@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
- version = "1.1.1";
+ version = "1.2.1";
src = fetchurl {
- url = "https://forge.ocamlcore.org/frs/download.php/870/${pname}-${version}.tar.gz";
- sha256 = "f896fa101a05d81b85af8122fe1c2809008a5e5fdca00f9ceeb7eec356369e3a";
+ url = "http://ygrek.org.ua/p/release/ocaml-mysql/${name}.tar.gz";
+ sha256 = "06mb2bq7v37wn0lza61917zqgb4bsg1xxb73myjyn88p6khl6yl2";
};
configureFlags = [
@@ -22,17 +22,12 @@ stdenv.mkDerivation rec {
"--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql"
];
- buildInputs = [ocaml findlib camlp4 ];
+ buildInputs = [ ocaml findlib ];
createFindlibDestdir = true;
propagatedBuildInputs = [ mysql.client ];
- buildPhase = ''
- make
- make opt
- '';
-
meta = {
homepage = http://ocaml-mysql.forge.ocamlcore.org;
description = "Bindings for interacting with MySQL databases from ocaml";
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index 4f7c7914201..f6379c8b5a7 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -1,24 +1,22 @@
-{stdenv, fetchurl, ocaml, findlib, ocamlPackages }:
+{stdenv, fetchurl, ocaml, findlib, lablgtk}:
stdenv.mkDerivation rec {
name = "ocamlgraph-${version}";
- version = "1.8.5";
+ version = "1.8.7";
src = fetchurl {
url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz";
- sha256 = "0bxqxzd5sd7siz57vhzb8bmiz1ddhgdv49gcsmwwfmd16mj4cryi";
+ sha256 = "1845r537swjil2fcj7lgbibc2zybfwqqasrd2s7bncajs83cl1nz";
};
- buildInputs = [ ocaml findlib ocamlPackages.lablgtk ocamlPackages.camlp4 ];
+ buildInputs = [ ocaml findlib lablgtk ];
+
+ patches = ./destdir.patch;
- # some patching is required so that the lablgtk2 library is taken into account. It
- # does not reside in a subdirectory of the default library path, hence:
- # * configure looked in the wrong path
- # * ocaml needs that directory and the stubs directory as -I flag
postPatch = ''
- sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(prefix)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in
- sed -i 's@$OCAMLLIB/lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2@' configure Makefile.in
- sed -i 's@+lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile
+ sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in
+ sed -i 's@OCAMLFINDDEST := -destdir $(DESTDIR)@@' Makefile.in
+ sed -i 's@+lablgtk2@${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile
'';
createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix
new file mode 100644
index 00000000000..11be8a13a57
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocf/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ppx_tools, yojson }:
+
+if stdenv.lib.versionOlder ocaml.version "4.03"
+then throw "ocf not supported for ocaml ${ocaml.version}"
+else
+stdenv.mkDerivation rec {
+ name = "ocf-${version}";
+ version = "0.5.0";
+ src = fetchFromGitHub {
+ owner = "zoggy";
+ repo = "ocf";
+ rev = "release-${version}";
+ sha256 = "1fhq9l2nmr39hxzpavc0jssmba71nnmhsncdn4dsbh2ylv29w56y";
+ };
+
+ buildInputs = [ ocaml findlib ppx_tools ];
+ propagatedBuildInputs = [ yojson ];
+
+ createFindlibDestdir = true;
+
+ patches = [(fetchpatch {
+ url = "https://github.com/zoggy/ocf/commit/3a231c7a6c5e535a77c25e207af8952793436444.patch";
+ sha256 = "0nc8cggc5gxhch9amaz3s71lxs1xbgi7fs9p90cng04dsgr64xk5";
+ })
+ ];
+ meta = with stdenv.lib; {
+ description = "OCaml library to read and write configuration options in JSON syntax";
+ homepage = "https://zoggy.github.io/ocf/";
+ license = licenses.lgpl3;
+ platforms = ocaml.meta.platforms or [];
+ maintainers = with maintainers; [ regnat ];
+ };
+}
+
diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index 488a13ecf16..165a566b1b7 100644
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, base64, camlp4}:
+{ stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, camlp4 }:
stdenv.mkDerivation rec {
version = "0.7.5";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv";
};
- buildInputs = [ocaml findlib piqi base64 camlp4];
+ buildInputs = [ ocaml findlib piqi camlp4 ];
createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index 273cd8f1862..f8126f91d87 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -9,13 +9,18 @@ stdenv.mkDerivation rec {
sha256 = "1whqr2bb3gds2zmrzqnv8vqka9928w4lx6mi6g244kmbwb2h8d8l";
};
- buildInputs = [ocaml findlib camlp4 which ocaml_optcomp base64];
- propagatedBuildInputs = [ulex xmlm easy-format];
+ buildInputs = [ocaml findlib camlp4 which ocaml_optcomp];
+ propagatedBuildInputs = [ulex xmlm easy-format base64];
patches = [ ./no-ocamlpath-override.patch ];
createFindlibDestdir = true;
+ buildPhase = ''
+ make
+ make -C piqilib piqilib.cma
+ '';
+
installPhase = ''
make install;
make ocaml-install;
diff --git a/pkgs/development/ocaml-modules/stdio/default.nix b/pkgs/development/ocaml-modules/stdio/default.nix
new file mode 100644
index 00000000000..87382330022
--- /dev/null
+++ b/pkgs/development/ocaml-modules/stdio/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, ocaml, jbuilder, findlib, base }:
+
+stdenv.mkDerivation {
+ name = "ocaml${ocaml.version}-stdio-0.9.0";
+
+ src = fetchurl {
+ url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/stdio-v0.9.0.tar.gz;
+ sha256 = "008b5y03223107gfv8qawdfyjvf5g97l472i5p5v8mp512wr7kj5";
+ };
+
+ buildInputs = [ ocaml jbuilder findlib ];
+ propagatedBuildInputs = [ base ];
+
+ inherit (jbuilder) installPhase;
+
+ meta = {
+ license = stdenv.lib.licenses.asl20;
+ description = "Standard IO library for OCaml";
+ homepage = https://github.com/janestreet/stdio;
+ inherit (ocaml.meta) platforms;
+ };
+}
diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix
new file mode 100644
index 00000000000..c3d7637e870
--- /dev/null
+++ b/pkgs/development/ocaml-modules/xtmpl/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, uutf, sedlex, ppx_tools, js_of_ocaml
+, re }:
+
+if stdenv.lib.versionOlder ocaml.version "4.03"
+then throw "xtmpl not supported for ocaml ${ocaml.version}"
+else
+stdenv.mkDerivation rec {
+ name = "xtmpl-${version}";
+ version = "0.16.0";
+ src = fetchFromGitHub {
+ owner = "zoggy";
+ repo = "xtmpl";
+ rev = version;
+ sha256 = "1dj5b4b266y4d8q3v1g0xsivz4vkhj0gi0jis37w84xcnlgiik8k";
+ };
+
+ buildInputs = [ ocaml findlib ppx_tools js_of_ocaml ];
+ propagatedBuildInputs = [ sedlex uutf re ];
+
+ createFindlibDestdir = true;
+
+ meta = with stdenv.lib; {
+ description = "Xml template library for OCaml";
+ homepage = "https://zoggy.github.io/xtmpl/";
+ license = licenses.lgpl3;
+ platforms = ocaml.meta.platforms or [];
+ maintainers = with maintainers; [ regnat ];
+ };
+}
+
+
diff --git a/pkgs/development/perl-modules/perl-opengl.patch b/pkgs/development/perl-modules/perl-opengl.patch
index 77bba1efa41..a44dc4f2e42 100644
--- a/pkgs/development/perl-modules/perl-opengl.patch
+++ b/pkgs/development/perl-modules/perl-opengl.patch
@@ -2,12 +2,14 @@ diff --git a/Makefile.PL b/Makefile.PL
index 55c485c..8501c02 100644
--- a/Makefile.PL
+++ b/Makefile.PL
-@@ -116,12 +116,7 @@ if ($^O eq 'MSWin32' || $IS_W32API)
+@@ -124,14 +124,7 @@ if ($^O eq 'MSWin32' || $IS_W32API)
# Look for available libs
our @libdirs = qw
{
- -L/usr/lib
+- -L/usr/lib/i386-linux-gnu
- -L/usr/X11R6/lib
+- -L/opt/X11/lib
- -L/usr/local/lib
- -L/usr/openwin/lib
- -L/opt/csw/lib
diff --git a/pkgs/development/python-modules/btrees-py35.patch b/pkgs/development/python-modules/btrees-py35.patch
deleted file mode 100644
index 77e47d670b9..00000000000
--- a/pkgs/development/python-modules/btrees-py35.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From eee0beef88d135640871050b40844272a3aee790 Mon Sep 17 00:00:00 2001
-From: Tres Seaver
-Date: Tue, 15 Sep 2015 17:20:18 -0400
-Subject: [PATCH 1/2] Ensure that we don't overlook errors in first
- PyObject_RichCompareBool call.
-
-Python 3.5 turns such cases into SystemErrors.
-
-See: https://bugs.python.org/issue23571
-
-Fixes #15.
----
- BTrees/_compat.h | 22 +++++++++++++++++++---
- 1 file changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/BTrees/_compat.h b/BTrees/_compat.h
-index e004d54..19dd377 100644
---- a/BTrees/_compat.h
-+++ b/BTrees/_compat.h
-@@ -27,9 +27,25 @@
- #define TEXT_FROM_STRING PyUnicode_FromString
- #define TEXT_FORMAT PyUnicode_Format
-
--#define COMPARE(lhs, rhs) \
-- PyObject_RichCompareBool((lhs), (rhs), Py_LT) > 0 ? -1 : \
-- (PyObject_RichCompareBool((lhs), (rhs), Py_EQ) > 0 ? 0 : 1)
-+/* Emulate Python2's __cmp__, wrapping PyObject_RichCompareBool(),
-+ * Return -2/-3 for errors, -1 for lhsrhs.
-+ */
-+static inline
-+int __compare(PyObject *lhs, PyObject *rhs) {
-+ int less, equal;
-+
-+ less = PyObject_RichCompareBool(lhs, rhs, Py_LT);
-+ if ( less == -1 ) {
-+ return -2;
-+ }
-+ equal = PyObject_RichCompareBool(lhs, rhs, Py_EQ);
-+ if ( equal == -1 ) {
-+ return -3;
-+ }
-+ return less ? -1 : (equal ? 0 : 1);
-+}
-+
-+#define COMPARE(lhs, rhs) __compare((lhs), (rhs))
-
-
- #else
-
-From ff4c3309fe471f2b9bdd642b8f7d1c2fe0f5e458 Mon Sep 17 00:00:00 2001
-From: Tres Seaver
-Date: Sun, 20 Sep 2015 11:07:10 -0400
-Subject: [PATCH 2/2] Avoid unnecessary comparison for 'Py_EQ' if 'Py_LT'
- returned True.
-
----
- BTrees/_compat.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/BTrees/_compat.h b/BTrees/_compat.h
-index 19dd377..ece2bf9 100644
---- a/BTrees/_compat.h
-+++ b/BTrees/_compat.h
-@@ -38,11 +38,14 @@ int __compare(PyObject *lhs, PyObject *rhs) {
- if ( less == -1 ) {
- return -2;
- }
-+ if (less) {
-+ return -1;
-+ }
- equal = PyObject_RichCompareBool(lhs, rhs, Py_EQ);
- if ( equal == -1 ) {
- return -3;
- }
-- return less ? -1 : (equal ? 0 : 1);
-+ return equal ? 0 : 1;
- }
-
- #define COMPARE(lhs, rhs) __compare((lhs), (rhs))
diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
new file mode 100644
index 00000000000..8e69a207628
--- /dev/null
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchPypi, buildPythonPackage, persistent, zope_interface, transaction }:
+
+buildPythonPackage rec {
+ pname = "BTrees";
+ version = "4.3.1";
+ name = "${pname}-${version}";
+
+ propagatedBuildInputs = [ persistent zope_interface transaction ];
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "15as34f9sa4nnd62nnjkik2jd4rg1byp0i4kwaqwdpv0ab9vfr95";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Scalable persistent components";
+ homepage = http://packages.python.org/BTrees;
+ license = licenses.zpt21;
+ };
+}
diff --git a/pkgs/development/python-modules/django/1_10.nix b/pkgs/development/python-modules/django/1_10.nix
new file mode 100644
index 00000000000..271f8a5467b
--- /dev/null
+++ b/pkgs/development/python-modules/django/1_10.nix
@@ -0,0 +1,35 @@
+{ stdenv, buildPythonPackage, fetchurl, substituteAll,
+ pythonOlder,
+ geos, gdal
+}:
+buildPythonPackage rec {
+ name = "Django-${version}";
+ version = "1.10.6";
+ disabled = pythonOlder "2.7";
+
+ src = fetchurl {
+ url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
+ sha256 = "0q9c7hx720vc0jzq4xlxwhnxmmm8kh0qsqj3l46m29mi98jvwvks";
+ };
+
+ patches = [
+ (substituteAll {
+ src = ./1.10-gis-libs.template.patch;
+ geos = geos;
+ gdal = gdal;
+ })
+ ];
+
+ # patch only $out/bin to avoid problems with starter templates (see #3134)
+ postFixup = ''
+ wrapPythonProgramsIn $out/bin "$out $pythonPath"
+ '';
+
+ # too complicated to setup
+ doCheck = false;
+
+ meta = {
+ description = "A high-level Python Web framework";
+ homepage = https://www.djangoproject.com/;
+ };
+}
diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix
new file mode 100644
index 00000000000..e79cdede092
--- /dev/null
+++ b/pkgs/development/python-modules/hieroglyph/default.nix
@@ -0,0 +1,26 @@
+{ stdenv , fetchurl , buildPythonPackage , sphinx }:
+
+buildPythonPackage rec {
+ version = "0.7.1";
+ name = "hieroglyph-${version}";
+
+ src = fetchurl {
+ url = "mirror://pypi/h/hieroglyph/${name}.tar.gz";
+ sha256 = "0rswfk7x6zlj1z8388f153k3zn2h52k5h9b6p57pn7kqagsjilcb";
+ };
+
+ propagatedBuildInputs = [ sphinx ];
+
+ # all tests fail; don't know why:
+ # test_absolute_paths_made_relative (hieroglyph.tests.test_path_fixing.PostProcessImageTests) ... ERROR
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Generate HTML presentations from plain text sources";
+ homepage = https://github.com/nyergler/hieroglyph/;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ juliendehos ];
+ platforms = platforms.unix;
+ };
+}
+
diff --git a/pkgs/development/python-modules/pyudev.nix b/pkgs/development/python-modules/pyudev.nix
index 98607501e03..e9a3ecaac5b 100644
--- a/pkgs/development/python-modules/pyudev.nix
+++ b/pkgs/development/python-modules/pyudev.nix
@@ -1,5 +1,5 @@
{ lib, fetchurl, buildPythonPackage
-, six, systemd
+, six, systemd, pytest, mock, hypothesis, docutils
}:
buildPythonPackage rec {
@@ -12,12 +12,21 @@ buildPythonPackage rec {
};
postPatch = ''
- substituteInPlace src/pyudev/_ctypeslib/libudev.py \
- --replace "find_library('udev')" "'${systemd.lib}/lib/libudev.so'"
+ substituteInPlace src/pyudev/_ctypeslib/utils.py \
+ --replace "find_library(name)" "'${systemd.lib}/lib/libudev.so'"
'';
+ buildInputs = [ pytest mock hypothesis docutils ];
propagatedBuildInputs = [ systemd six ];
+ checkPhase = ''
+ py.test
+ '';
+
+ # Bunch of failing tests
+ # https://github.com/pyudev/pyudev/issues/187
+ doCheck = false;
+
meta = {
homepage = "http://pyudev.readthedocs.org/";
description = "Pure Python libudev binding";
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 29295de66b7..76652954cf0 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -19,7 +19,7 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" el
description = "Creates C++ bindings for Python modules";
homepage = "http://www.riverbankcomputing.co.uk/";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ lovek323 sander urkud ];
+ maintainers = with maintainers; [ lovek323 sander ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index 14efe29442b..ee36a9be43b 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -8,17 +8,17 @@ in
stdenv.mkDerivation rec {
name = "frama-c-${version}";
- version = "20160501";
- slang = "Aluminium";
+ version = "20161101";
+ slang = "Silicon";
src = fetchurl {
url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz";
- sha256 = "02z4d1lg2cs4hgbjx74crfrabv39dyhdrq5lvhv0q3hx5c8w7p90";
+ sha256 = "1qq045ymz1mx4m9dsypigrcagqyb2k78wk13nqlbykcs5xbihfdh";
};
why2 = fetchurl {
- url = "http://why.lri.fr/download/why-2.34.tar.gz";
- sha256 = "1335bhq9v3h46m8aba2c5myi9ghm87q41in0m15xvdrwq5big1jg";
+ url = "http://why.lri.fr/download/why-2.37.tar.gz";
+ sha256 = "00xr8aq6zwln0ccfs1ng610j70r6ia6wqdyaqs9iqibqfa1scr3m";
};
nativeBuildInputs = [ makeWrapper ];
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
];
- enableParallelBuilding = true;
+ # Experimentally, the build segfaults with high core counts
+ enableParallelBuilding = false;
unpackPhase = ''
tar xf $src
@@ -39,7 +40,8 @@ stdenv.mkDerivation rec {
buildPhase = ''
cd frama*
./configure --prefix=$out
- make -j$NIX_BUILD_CORES
+ # It is not parallel safe
+ make
make install
cd ../why*
FRAMAC=$out/bin/frama-c ./configure --prefix=$out
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
index 865b3ad6797..64bb39aaf45 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt, qmakeHook, makeQtWrapper, perl, python, php }:
+{ stdenv, fetchurl, cmake, qmakeHook, makeQtWrapper, qtbase, perl, python, php }:
stdenv.mkDerivation rec {
name = "qcachegrind-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "109y94nz96izzsjjdpj9c6g344rcr86srp5w0433mssbyvym4x7q";
};
- buildInputs = [ qt.qtbase perl python php ];
+ buildInputs = [ qtbase perl python php ];
nativeBuildInputs = [ qmakeHook makeQtWrapper ];
diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix
index 6ecf6546e36..cfd8c03af6d 100644
--- a/pkgs/development/tools/boomerang/default.nix
+++ b/pkgs/development/tools/boomerang/default.nix
@@ -46,5 +46,6 @@ stdenv.mkDerivation rec {
homepage = "http://boomerang.sourceforge.net/";
license = stdenv.lib.licenses.bsd3;
description = "A general, open source, retargetable decompiler";
+ broken = true;
};
}
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index a197c69edff..590de68d52f 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -76,6 +76,6 @@ stdenv.mkDerivation rec {
homepage = http://www.cmake.org/;
description = "Cross-Platform Makefile Generator";
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers; [ urkud mornfall ];
+ maintainers = with stdenv.lib.maintainers; [ mornfall ];
};
}
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 9f607a60b59..00d76fbff9f 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -73,6 +73,6 @@ stdenv.mkDerivation rec {
homepage = http://www.cmake.org/;
description = "Cross-Platform Makefile Generator";
platforms = if useQt4 then qt4.meta.platforms else platforms.all;
- maintainers = with maintainers; [ urkud mornfall ttuegel lnl7 ];
+ maintainers = with maintainers; [ mornfall ttuegel lnl7 ];
};
}
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 5e46b079aaa..97e195f592e 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
let
- version = "1.11.0";
+ version = "9.0.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
- sha256 = "082slksd0fs0gpwi7kzmk2i71y52xccsn2r2j6qxmbzxwhpwli83";
+ sha256 = "1f170akb7j7imgr18m32fy6v3rk98inrjl5a4xymfpivwwqyv9p8";
};
docker_arm = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
- sha256 = "1c0awx4q27bckk4xpnw7357d5422iz971jkrfin17wrya4dshg64";
+ sha256 = "15mlix8j7bqjg5y07c439d7s197c16zxffknx42z1i3qxcz2mpa4";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-ci-multi-runner";
rev = "v${version}";
- sha256 = "0fvkdiyfp1bf68j3kq721msfhmv8snf968yxgm7d1y6shidghrqb";
+ sha256 = "1csha30lcwm1mk6hqbh0j8bb25apyni23szw79l8xjhmiw2ch619";
};
buildInputs = [ go-bindata ];
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
new file mode 100644
index 00000000000..d49221d6e6a
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
@@ -0,0 +1,66 @@
+{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
+
+let
+ version = "1.11.1";
+ # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
+ docker_x86_64 = fetchurl {
+ url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
+ sha256 = "1fahwvwdli6glxsljrd030x15y18jwk72lg1xmrgms409r9y308m";
+ };
+
+ docker_arm = fetchurl {
+ url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
+ sha256 = "0nqda27qcb6r1p2xc2973g08fwb8cnmyc9rswy6776r8ypagn2zw";
+ };
+in
+buildGoPackage rec {
+ inherit version;
+ name = "gitlab-runner-${version}";
+ goPackagePath = "gitlab.com/gitlab-org/gitlab-ci-multi-runner";
+ commonPackagePath = "${goPackagePath}/common";
+ buildFlagsArray = ''
+ -ldflags=
+ -X ${commonPackagePath}.NAME=gitlab-runner
+ -X ${commonPackagePath}.VERSION=${version}
+ -X ${commonPackagePath}.REVISION=v${version}
+ '';
+
+ src = fetchFromGitLab {
+ owner = "gitlab-org";
+ repo = "gitlab-ci-multi-runner";
+ rev = "v${version}";
+ sha256 = "0ix00p9f01fg8m6p3b1c20hqrcv7pivh6hq92pb9qyiyzmcfap47";
+ };
+
+ buildInputs = [ go-bindata ];
+
+ preBuild = ''
+ (
+ # go-bindata names the assets after the filename thus we create a symlink with the name we want
+ cd go/src/${goPackagePath}
+ ln -sf ${docker_x86_64} prebuilt-x86_64.tar.xz
+ ln -sf ${docker_arm} prebuilt-arm.tar.xz
+ go-bindata \
+ -pkg docker \
+ -nocompress \
+ -nomemcopy \
+ -o executors/docker/bindata.go \
+ prebuilt-x86_64.tar.xz \
+ prebuilt-arm.tar.xz
+ )
+ '';
+
+ postInstall = ''
+ install -d $out/bin
+ # The recommended name is gitlab-runner so we create a symlink with that name
+ ln -sf gitlab-ci-multi-runner $bin/bin/gitlab-runner
+ '';
+
+ meta = with lib; {
+ description = "GitLab Runner the continuous integration executor of GitLab";
+ license = licenses.mit;
+ homepage = "https://about.gitlab.com/gitlab-ci/";
+ platforms = platforms.unix;
+ maintainers = [ lib.maintainers.bachp ];
+ };
+}
diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix
index 156def09187..7ca54365be5 100644
--- a/pkgs/development/tools/guile/guile-lint/default.nix
+++ b/pkgs/development/tools/guile/guile-lint/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
description = "Guile-Lint checks syntax and semantics in a Guile program or module";
homepage = http://user42.tuxfamily.org/guile-lint/index.html;
license = "GPL";
+ broken = true;
};
}
diff --git a/pkgs/development/tools/java/jclasslib/builder.sh b/pkgs/development/tools/java/jclasslib/builder.sh
deleted file mode 100755
index 35e94d0fab9..00000000000
--- a/pkgs/development/tools/java/jclasslib/builder.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-source $stdenv/setup || exit 1
-
-tar zxf $src || exit 1
-cd jclasslib || exit 1
-
-xpf-rm -f build.xml "//taskdef"
-
-ant clean || exit 1
-ant jar || exit 1
-
-mkdir -p $out/bin
-mv build/jclasslib.jar $out/bin/ || exit 1
-
-cat >> $out/bin/jclasslib <"
- )
-
-- if( APPLE )
-+ #if( APPLE )
- # In OS X El Capitan, Apple introduced System Integrity Protection.
- # Amongst other things, this introduces features to the dynamic loader
- # (dyld) which cause it to "sanitise" (and complain about) embedded
-@@ -354,15 +354,15 @@
- # simply strip the rpath entry from the dylib. There's no way any
- # @executable_path that python might have could be in any way useful to
- # libclang.dylib, so this seems perfectly safe.
-- get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME )
-- add_custom_command( TARGET ${PROJECT_NAME}
-- POST_BUILD
-- COMMAND install_name_tool
-- "-delete_rpath"
-- "@executable_path/../lib"
-- "$/${LIBCLANG_TAIL}"
-- )
-- endif()
-+ # get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME )
-+ #add_custom_command( TARGET ${PROJECT_NAME}
-+ # POST_BUILD
-+ # COMMAND install_name_tool
-+ # "-delete_rpath"
-+ # "@executable_path/../lib"
-+ # "$/${LIBCLANG_TAIL}"
-+ # )
-+ # endif()
- endif()
- endif()
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 9ac227ac006..eb02d0e79dd 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
name = "ycmd-${version}";
- version = "2017-02-03";
+ version = "2017-03-27";
src = fetchgit {
url = "git://github.com/Valloric/ycmd.git";
- rev = "ec7a154f8fe50c071ecd0ac6841de8a50ce92f5d";
- sha256 = "0rzxgqqqmmrv9r4k2ji074iprhw6sb0jkvh84wvi45yfyphsh0xi";
+ rev = "2ef1ae0d00a06a47fed3aacfd465a310e8bdb0d2";
+ sha256 = "0p5knlxgy66zi229ns1lfdhz5lram93vahmmk54w98fr3h8b1yfj";
};
buildInputs = [ cmake boost ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
${python.interpreter} build.py --clang-completer --system-boost
'';
- patches = [ ./2-ycm-cmake.patch ];
+ patches = [ ./dont-symlink-clang.patch ];
configurePhase = ":";
diff --git a/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch b/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch
new file mode 100644
index 00000000000..6af691426bb
--- /dev/null
+++ b/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch
@@ -0,0 +1,16 @@
+diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt
+index 00e4882..8f29797 100644
+--- a/cpp/ycm/CMakeLists.txt
++++ b/cpp/ycm/CMakeLists.txt
+@@ -310,11 +310,6 @@ if ( EXTERNAL_LIBCLANG_PATH OR USE_SYSTEM_LIBCLANG )
+ # our libraries require, in particular the Python one (from pyenv for
+ # instance).
+ set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE )
+- # When loading our library, the dynamic linker will look for
+- # libclang.so.4, not libclang.so.4.x.
+- file( RENAME
+- ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION}.${CLANG_MINOR_VERSION}
+- ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION} )
+ endif()
+ endif()
+
diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix
index b1b9a6dee4e..1706b5448e1 100644
--- a/pkgs/development/tools/parsing/peg/default.nix
+++ b/pkgs/development/tools/parsing/peg/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://piumarta.com/software/peg/;
platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
index e636c72b420..a7164b14d3f 100644
--- a/pkgs/development/tools/rust/rustfmt/default.nix
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -1,19 +1,17 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
name = "rustfmt-${version}";
- version = "0.8";
+ version = "0.8.1";
src = fetchFromGitHub {
owner = "rust-lang-nursery";
repo = "rustfmt";
- rev = version;
- sha256 = "0a613x1ckwl30yamba9m7xi3xrn8pg92p2w3v7k723whyivmjk1s";
+ rev = "v${version}";
+ sha256 = "05rjx7i4wn3z3j8bgqsn146a9vbni6xhxaim9nq13c6dm4nrx96b";
};
- depsSha256 = "1vach2xf0cs7nivbakhmrm2aqdif3i5vg1syffrs2ghcix9hd21p";
+ depsSha256 = "1rnk33g85r1hkw9l9c52dzr4zka5kghbci9qwni3ph19rfqf0a73";
meta = with stdenv.lib; {
description = "A tool for formatting Rust code according to style guidelines";
diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix
new file mode 100644
index 00000000000..f3967b0d923
--- /dev/null
+++ b/pkgs/development/tools/vogl/default.nix
@@ -0,0 +1,47 @@
+{ fetchFromGitHub, stdenv
+, cmake, git, pkgconfig, wget, zip
+, makeQtWrapper, qtbase, qtx11extras
+, libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11
+, SDL2, SDL2_gfx, SDL2_image, SDL2_ttf
+, freeglut, mesa, mesa_glu
+}:
+stdenv.mkDerivation rec {
+ name = "vogl-${version}";
+ version = "2016-05-13";
+
+ src = fetchFromGitHub {
+ owner = "deepfire";
+ repo = "vogl";
+ rev = "cbc5f1853e294b363f16c4e00b3e0c49dbf74559";
+ sha256 = "17gwd73x3lnqv6ccqs48pzqwbzjhbn41c0x0l5zzirhiirb3yh0n";
+ };
+
+ nativeBuildInputs = [
+ cmake makeQtWrapper pkgconfig
+ ];
+
+ buildInputs = [
+ git wget zip
+ qtbase qtx11extras
+ libdwarf libjpeg_turbo libunwind lzma tinyxml libX11
+ SDL2 SDL2_gfx SDL2_image SDL2_ttf
+ freeglut mesa mesa_glu
+ ];
+
+ enableParallelBuilding = true;
+
+ dontUseCmakeBuildDir = true;
+ preConfigure = ''
+ cmakeDir=$PWD
+ mkdir -p vogl/vogl_build/release64 && cd $_
+ '';
+ cmakeFlags = '' -DCMAKE_VERBOSE=On -DCMAKE_BUILD_TYPE=Release -DBUILD_X64=On'';
+
+ meta = with stdenv.lib; {
+ description = "OpenGL capture / playback debugger.";
+ homepage = https://github.com/ValveSoftware/vogl;
+ license = licenses.mit;
+ maintainers = [ maintainers.deepfire ];
+ platforms = [ "x86_64-linux" "i686-linux" ];
+ };
+}
diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index 9a142a89677..edef6f7663c 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -10,11 +10,11 @@ let
baseName = if enableNpm then "nodejs" else "nodejs-slim";
in
stdenv.mkDerivation (nodejs // rec {
- version = "4.6.2";
+ version = "4.8.1";
name = "${baseName}-${version}";
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
- sha256 = "17ick2r2biyxs5zf83i8q8844fbcphm0d5g1z70mcrb86yrmi545";
+ sha256 = "0kcalypjf1036gr4mv1gy682hc1rp18ms3cv7mz0941qnizkzrms";
};
})
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index f038673f4c0..3a50196456c 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -96,6 +96,6 @@ stdenv.mkDerivation rec {
gpl2 lgpl21 mit cc-by-sa-30
licenses.zlib # otherwise masked by pkgs.zlib
];
- platforms = platforms.linux;
+ platforms = subtractLists platforms.i686 platforms.linux;
};
}
diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix
index 4b9b097bbb7..05b645ee326 100644
--- a/pkgs/games/atanks/default.nix
+++ b/pkgs/games/atanks/default.nix
@@ -2,20 +2,16 @@
stdenv.mkDerivation rec {
name = "atanks-${version}";
- version = "6.2";
+ version = "6.5";
src = fetchurl {
url = "mirror://sourceforge/project/atanks/atanks/${name}/${name}.tar.gz";
- sha256 = "1s1lb87ind0y9d6hmfaf1b9wks8q3hd6w5n9dibq75rxqmcfvlpy";
+ sha256 = "0bijsbd51j4wsnmdxj54r92m7h8zqnvh9z3qqdig6zx7a8kjn61j";
};
buildInputs = [ allegro ];
- patchPhase = ''
- substituteInPlace Makefile --replace /usr $out
- '';
-
- makeFlags = [ "PREFIX=$(out)/" "INSTALL=install" ];
+ makeFlags = [ "PREFIX=$(out)/" "INSTALL=install" "CXX=g++" ];
meta = with stdenv.lib; {
description = "Atomic Tanks ballistics game";
diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix
index 5cb79fa9299..4c3d22571b1 100644
--- a/pkgs/games/hawkthorne/default.nix
+++ b/pkgs/games/hawkthorne/default.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.reddit.com/r/hawkthorne";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ campadrenalin ];
+ broken = true;
};
}
diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix
index 7a23c4dc966..d637c159595 100644
--- a/pkgs/games/oilrush/default.nix
+++ b/pkgs/games/oilrush/default.nix
@@ -1,7 +1,7 @@
{ stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr
, libXrender, fontconfig, freetype, openal }:
-with { inherit (stdenv.lib) makeLibraryPath; };
+let inherit (stdenv.lib) makeLibraryPath; in
stdenv.mkDerivation {
name = "oilrush";
diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix
index 5027abedcf4..9810d5186b0 100644
--- a/pkgs/games/ultrastardx/default.nix
+++ b/pkgs/games/ultrastardx/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
homepage = http://ultrastardx.sourceforge.net/;
description = "Free and open source karaoke game";
license = stdenv.lib.licenses.gpl2Plus;
+ broken = true;
};
}
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 38440bac81a..a8f7d00b6b6 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
homepage = https://cups.org/;
description = "A standards-based printing system for UNIX";
license = licenses.gpl2; # actually LGPL for the library and GPL for the rest
- maintainers = with maintainers; [ urkud jgeerds ];
+ maintainers = with maintainers; [ jgeerds ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix
index b2801c7ae67..9c187a8f378 100644
--- a/pkgs/misc/cups/drivers/dymo/default.nix
+++ b/pkgs/misc/cups/drivers/dymo/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [ cups ];
+ patches = [ ./fix-includes.patch ];
+
makeFlags = [ "cupsfilterdir=$(out)/lib/cups/filter" "cupsmodeldir=$(out)/share/cups/model" ];
meta = {
diff --git a/pkgs/misc/cups/drivers/dymo/fix-includes.patch b/pkgs/misc/cups/drivers/dymo/fix-includes.patch
new file mode 100644
index 00000000000..fa7df5591dd
--- /dev/null
+++ b/pkgs/misc/cups/drivers/dymo/fix-includes.patch
@@ -0,0 +1,67 @@
+diff -rp dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h dymo-cups-drivers-1.4.0.5-fix/src/common/CupsFilter.h
+*** dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h 2012-02-07 14:22:37.000000000 +0100
+--- dymo-cups-drivers-1.4.0.5-fix/src/common/CupsFilter.h 2017-03-27 23:10:17.638976126 +0200
+***************
+*** 22,29 ****
+--- 22,31 ----
+ #define hfc4bbdea_8a1b_427c_9ab5_50b84576b19e
+
+ #include
++ #include
+ #include
+ #include
++ #include
+ #include
+ #include "CupsPrintEnvironment.h"
+ #include "ErrorDiffusionHalftoning.h"
+diff -rp dymo-cups-drivers-1.4.0.5/src/common/CupsPrintEnvironment.h dymo-cups-drivers-1.4.0.5-fix/src/common/CupsPrintEnvironment.h
+*** dymo-cups-drivers-1.4.0.5/src/common/CupsPrintEnvironment.h 2012-02-07 14:22:37.000000000 +0100
+--- dymo-cups-drivers-1.4.0.5-fix/src/common/CupsPrintEnvironment.h 2017-03-27 23:10:17.638976126 +0200
+***************
+*** 22,27 ****
+--- 22,28 ----
+ #define h952b1c81_8931_433a_8479_7ae6d8e85a86
+
+ #include "PrinterDriver.h"
++ #include
+
+ namespace DymoPrinterDriver
+ {
+diff -rp dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h dymo-cups-drivers-1.4.0.5-fix/src/lm/CupsFilterLabelManager.h
+*** dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h 2012-02-07 14:22:38.000000000 +0100
+--- dymo-cups-drivers-1.4.0.5-fix/src/lm/CupsFilterLabelManager.h 2017-03-27 23:10:17.635976126 +0200
+***************
+*** 22,27 ****
+--- 22,28 ----
+ #define he780684b_6efc_428d_bfdb_c5422b1ed982
+
+ #include
++ #include
+ #include
+ #include "LabelManagerDriver.h"
+ #include "LabelManagerLanguageMonitor.h"
+*************** public:
+*** 50,53 ****
+
+ /*
+ * End of "$Id: CupsFilterLabelManager.h 14880 2011-03-31 16:29:05Z aleksandr $".
+! */
+\ No newline at end of file
+--- 51,54 ----
+
+ /*
+ * End of "$Id: CupsFilterLabelManager.h 14880 2011-03-31 16:29:05Z aleksandr $".
+! */
+diff -rp dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h dymo-cups-drivers-1.4.0.5-fix/src/lw/CupsFilterLabelWriter.h
+*** dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h 2012-02-07 14:22:37.000000000 +0100
+--- dymo-cups-drivers-1.4.0.5-fix/src/lw/CupsFilterLabelWriter.h 2017-03-27 23:10:17.632976126 +0200
+***************
+*** 22,27 ****
+--- 22,28 ----
+ #define hd8574b83_b264_47b2_8d33_a46ae75691d2
+
+ #include
++ #include
+ #include
+ #include "LabelWriterDriver.h"
+ #include "LabelWriterLanguageMonitor.h"
diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix
index 36b580bb16d..14ceb405d68 100644
--- a/pkgs/misc/drivers/foo2zjs/default.nix
+++ b/pkgs/misc/drivers/foo2zjs/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
description = "ZjStream printer drivers";
maintainers = with maintainers;
[
- raskin urkud
+ raskin
];
platforms = platforms.linux;
license = licenses.gpl2Plus;
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index 3f02304c0d4..611cc84325c 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -5,7 +5,7 @@
assert withGamepads -> (SDL != null);
let
- version = "1.1.0";
+ version = "1.3";
fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF");
in
with stdenv.lib;
@@ -14,14 +14,16 @@ stdenv.mkDerivation rec{
src = fetchgit {
url = "https://github.com/hrydgard/ppsspp.git";
- rev = "8c8e5de89d52b8bcb968227d96cbf049d04d1241";
+ rev = "refs/tags/v${version}";
fetchSubmodules = true;
- sha256 = "1q21qskzni0nvz2yi2m17gjh4i9nrs2l4fm4y2dww9m29xpvzw3x";
+ sha256 = "0l8vgdlw657r8gv7rz8iqa6zd9zrbzw10pwhcnahzil7w9qrd03g";
};
- buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ]
+ buildInputs = [ zlib libpng qt4 ]
++ (if withGamepads then [ SDL ] else [ ]);
+ nativeBuildInputs = [ pkgconfig qmake4Hook ];
+
qmakeFlags = [ "PPSSPPQt.pro" ];
preConfigure = "cd Qt";
@@ -31,7 +33,7 @@ stdenv.mkDerivation rec{
homepage = "http://www.ppsspp.org/";
description = "A PSP emulator, the Qt4 version";
license = licenses.gpl2Plus;
- maintainers = [ maintainers.fuuzetsu maintainers.AndersonTorres ];
+ maintainers = with maintainers; [ fuuzetsu AndersonTorres ];
platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin;
};
}
diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix
index aec498b899e..e13abb6fe2b 100644
--- a/pkgs/misc/emulators/wxmupen64plus/default.nix
+++ b/pkgs/misc/emulators/wxmupen64plus/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
url = "https://bitbucket.org/auria/wxmupen64plus/get/0.3.tar.bz2";
sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c";
};
-
+
buildInputs = [ python wxGTK29 SDL libX11 mesa ];
configurePhase = ''
@@ -19,10 +19,11 @@ stdenv.mkDerivation {
buildPhase = "python waf";
installPhase = "python waf install";
-
+
meta = {
description = "GUI for the Mupen64Plus 2.0 emulator";
license = stdenv.lib.licenses.gpl2Plus;
homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home;
+ broken = true;
};
}
diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix
index 02f93eb931d..ae94c3de41b 100644
--- a/pkgs/misc/emulators/zsnes/default.nix
+++ b/pkgs/misc/emulators/zsnes/default.nix
@@ -57,6 +57,6 @@ in stdenv.mkDerivation {
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.sander ];
homepage = http://www.zsnes.com;
- platforms = stdenv.lib.platforms.unix;
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix
index 231b8eabb07..6d022220794 100644
--- a/pkgs/misc/freestyle/default.nix
+++ b/pkgs/misc/freestyle/default.nix
@@ -45,9 +45,10 @@ stdenv.mkDerivation {
installPhase = ":";
- meta = {
+ meta = {
description = "Non-Photorealistic Line Drawing rendering from 3D scenes";
homepage = http://freestyle.sourceforge.net;
- license = stdenv.lib.licenses.gpl2;
+ license = stdenv.lib.licenses.gpl2;
+ broken = true;
};
}
diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix
index 2873225b26f..735e73d5d49 100644
--- a/pkgs/misc/mxt-app/default.nix
+++ b/pkgs/misc/mxt-app/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool }:
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool }:
stdenv.mkDerivation rec{
- version="1.26";
+ version="1.27";
name = "mxt-app-${version}";
src = fetchFromGitHub {
owner = "atmel-maxtouch";
repo = "mxt-app";
rev = "v${version}";
- sha256 = "07afdgh8pnhgh2372cf5pqy6p7l6w3ing2hwnvz6db8wxw59n48h";
+ sha256 = "0m1qxsdkwgajyd0sdw909l4w31csa26nw0xzr9ldddnvzb1va05h";
};
- buildInputs = [ autoconf automake libtool ];
- preConfigure = "./autogen.sh";
-
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ libtool ];
+
hardeningDisable = [ "fortify" ];
meta = with stdenv.lib; {
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 276c311fa45..cd437bfe452 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.jwz.org/xscreensaver/";
description = "A set of screensavers";
- maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+ maintainers = with stdenv.lib.maintainers; [ raskin ];
platforms = with stdenv.lib.platforms; allBut cygwin;
inherit version;
downloadPage = "http://www.jwz.org/xscreensaver/download.html";
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 9e133e9f332..d2fadad8852 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -10,17 +10,21 @@ let
stdenv.mkDerivation (rec {
name = "uboot-${defconfig}-${version}";
- version = "2017.01";
+ version = "2017.03";
src = fetchurl {
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
- sha256 = "1wpc51jm3zyibgcr78jng2yksqvrya76bxgsr4pcyjrsz5sm2hkc";
+ sha256 = "0gqihplap05dlpwdb971wsqyv01nz2vabwq5g5649gr5jczsyjzm";
};
nativeBuildInputs = [ bc dtc python2 ];
hardeningDisable = [ "all" ];
+ postPatch = ''
+ patchShebangs tools
+ '';
+
configurePhase = ''
make ${defconfig}
'';
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index a0d04638504..90559742057 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -647,11 +647,11 @@ rec {
};
vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-elixir-2017-02-21";
+ name = "vim-elixir-2017-03-29";
src = fetchgit {
url = "https://github.com/elixir-lang/vim-elixir";
- rev = "9524e66ee03a36ef1d5913c7f42c3dd9b235146e";
- sha256 = "0n7v2kfzqifm527pbh8d08xmdzj8rmbhnnvs22hyxv2ij06lzzn2";
+ rev = "9482415ab27fddf8125524f54d9e500bb9541756";
+ sha256 = "1layanqayf2arg8cvpsx768p544znwsvwispnk01d0c73d2p5llq";
};
dependencies = [];
@@ -702,11 +702,11 @@ rec {
};
vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-go-2017-02-19";
+ name = "vim-go-1.12";
src = fetchgit {
url = "https://github.com/fatih/vim-go";
- rev = "b9c81562630e9dfc098d25814c16bedcfcf9ffa9";
- sha256 = "0r5r4laqd4jwqc14lkjyccz3ijjzz366r0zgqw5cybspnf622f9a";
+ rev = "26362e4bfcd7601da5b8fcf0041744962766ef0c";
+ sha256 = "19073xxam34vkwdsrqv170f6f6vc9yy8m4034r1l8m9lf67zqla9";
};
dependencies = [];
@@ -1528,11 +1528,11 @@ rec {
};
youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "youcompleteme-2017-02-27";
+ name = "youcompleteme-2017-03-28";
src = fetchgit {
url = "https://github.com/valloric/youcompleteme";
- rev = "39659caf34c664c7419cadb41cb813158e0749fa";
- sha256 = "0rl8fxcwcj61bj8b2qcnwfipcnf1nb47bvb52sv68sf9v78qa7sx";
+ rev = "03ba8a80cd04e2e051bb85eacaea802ca3c4d025";
+ sha256 = "1f44bxl4phk79p4n19p0qx5506hkhms77zi4x0sh0gh389xwxmv5";
};
dependencies = [];
buildPhase = ''
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 22098b68a55..87b2f9d3e18 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -412,11 +412,16 @@ rec {
} // a);
requiredPlugins = {
- knownPlugins ? vimPlugins,
+ givenKnownPlugins ? null,
vam ? null,
pathogen ? null, ...
}:
let
+ # This is probably overcomplicated, but I don't understand this well enough to know what's necessary.
+ knownPlugins = if givenKnownPlugins != null then givenKnownPlugins else
+ if vam != null && vam ? knownPlugins then vam.knownPlugins else
+ if pathogen != null && pathogen ? knownPlugins then pathogen.knownPlugins else
+ vimPlugins;
pathogenNames = map (name: knownPlugins.${name}) (findDependenciesRecursively { inherit knownPlugins; names = pathogen.pluginNames; });
vamNames = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; };
names = (lib.optionals (pathogen != null) pathogenNames) ++
diff --git a/pkgs/os-specific/darwin/command-line-tools/default.nix b/pkgs/os-specific/darwin/command-line-tools/default.nix
deleted file mode 100644
index 2d1eb7b6b3c..00000000000
--- a/pkgs/os-specific/darwin/command-line-tools/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, xar, gzip, cpio }:
-
-let
- pkg = { name, sha256 }: stdenv.mkDerivation {
- inherit name;
-
- src = fetchurl {
- # Magic url found in:
- # https://swscan.apple.com/content/catalogs/others/index-10.9-1.sucatalog
- url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/${name}.pkg";
- inherit sha256;
- };
-
- buildInputs = [ xar gzip cpio ];
-
- phases = [ "unpackPhase" "installPhase" ];
-
- unpackPhase = ''
- xar -x -f $src
- '';
-
- installPhase = ''
- start="$(pwd)"
- mkdir -p $out
- cd $out
- cat $start/Payload | gzip -d | cpio -idm
- '';
-
- meta = with stdenv.lib; {
- description = "Apple developer tools ${name}";
- maintainers = with maintainers; [ copumpkin ];
- platforms = platforms.darwin;
- };
- };
-in rec {
- tools = pkg {
- name = "CLTools_Executables_OSX109";
- sha256 = "1cjdnnjny6h0dc1cc994pgrkmsa5cvk7pi5dpkxyslyicwf260fx";
- };
-
- sdk = pkg {
- name = "DevSDK_OSX109";
- sha256 = "16b7aplha5573yl1d44nl2yxzp0w2hafihbyh7930wrcvba69iy4";
- };
-}
diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix
index 0768f5a12e0..8a2f4f46e03 100644
--- a/pkgs/os-specific/darwin/khd/default.nix
+++ b/pkgs/os-specific/darwin/khd/default.nix
@@ -13,11 +13,6 @@ stdenv.mkDerivation rec {
buildInputs = [ Carbon Cocoa ];
- prePatch = ''
- substituteInPlace makefile \
- --replace g++ clang++
- '';
-
buildPhase = ''
make install
'';
diff --git a/pkgs/os-specific/darwin/osx-sdk/default.nix b/pkgs/os-specific/darwin/osx-sdk/default.nix
deleted file mode 100644
index 235eadfd255..00000000000
--- a/pkgs/os-specific/darwin/osx-sdk/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv }:
-
-let
- version = "10.9";
-in stdenv.mkDerivation rec {
- name = "MacOSX10.9.sdk";
-
- src = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk";
-
- unpackPhase = "true";
- dontBuild = true;
-
- installPhase = ''
- mkdir -p $out/Developer/SDKs/
- echo "Source is: $src"
- cp -r $src $out/Developer/SDKs/
- '';
-
- meta = with stdenv.lib; {
- description = "The Mac OS ${version} SDK";
- maintainers = with maintainers; [ copumpkin ];
- platforms = platforms.darwin;
- license = licenses.unfree;
- };
-}
diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix
index 9bcfcf392f4..d1cb7221615 100644
--- a/pkgs/os-specific/linux/915resolution/default.nix
+++ b/pkgs/os-specific/linux/915resolution/default.nix
@@ -1,15 +1,19 @@
{stdenv, fetchurl}:
-stdenv.mkDerivation {
- name = "915resolution-0.5.2";
+stdenv.mkDerivation rec {
+ name = "915resolution-0.5.3";
+
src = fetchurl {
- url = http://www.geocities.com/stomljen/915resolution-0.5.2.tar.gz;
- sha256 = "1m5nfzgwaglqabpm2l2mjqvigz1z0dj87cmj2pjbbzxmmpapv0lq";
+ url = "http://915resolution.mango-lang.org/${name}.tar.gz";
+ sha256 = "0hmmy4kkz3x6yigz6hk99416ybznd67dpjaxap50nhay9f1snk5n";
};
- buildPhase = "rm *.o 915resolution; make";
+
+ patchPhase = "rm *.o";
installPhase = "mkdir -p $out/sbin; cp 915resolution $out/sbin/";
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ homepage = http://915resolution.mango-lang.org/;
+ description = "A tool to modify Intel 800/900 video BIOS";
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix
index 260bf412062..824bc3f9a18 100644
--- a/pkgs/os-specific/linux/jool/default.nix
+++ b/pkgs/os-specific/linux/jool/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchzip, kernel }:
-assert stdenv.lib.versionOlder kernel.version "4.10";
+assert stdenv.lib.versionOlder kernel.version "4.11";
let
sourceAttrs = (import ./source.nix) { inherit fetchzip; };
diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix
index ee47ee11855..2de2aeeff8f 100644
--- a/pkgs/os-specific/linux/jool/source.nix
+++ b/pkgs/os-specific/linux/jool/source.nix
@@ -1,9 +1,9 @@
{ fetchzip }:
rec {
- version = "3.5.2";
+ version = "3.5.3";
src = fetchzip {
url = "https://github.com/NICMx/releases/raw/master/Jool/Jool-${version}.zip";
- sha256 = "0gmjdi50c9wfapikniy2i1cfhz124pp7q02a0vbwxw7f21llcv8x";
+ sha256 = "1dh8qcb3grjpsk7j5d8p5dncrh4fljkrfd9b8sxd2c3kirczckmp";
};
}
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
deleted file mode 100644
index f82eb073de9..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
- version = "3.12.71";
- extraMeta.branch = "3.12";
-
- src = fetchurl {
- url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "11wmrj2zqb3x2az22q7ggdp6ibhqmlngy7v01fm8vrhz7f6lwf87";
- };
-
- kernelPatches = args.kernelPatches;
-
- features.iwlwifi = true;
- features.efiBootStub = true;
- features.needsCifsUtils = true;
- features.netfilterRPFilter = true;
-})
diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
deleted file mode 100644
index 30c5ce7e569..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
- version = "4.1.39";
- extraMeta.branch = "4.1";
-
- src = fetchurl {
- url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0m48slb13ipnjnw4inhyb74xxpla94344wbc2y5lzb402n5jrs58";
- };
-
- kernelPatches = args.kernelPatches;
-
- features.iwlwifi = true;
- features.efiBootStub = true;
- features.needsCifsUtils = true;
- features.netfilterRPFilter = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
index 0311ea518c5..01fa2a8fb63 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.10.4";
+ version = "4.10.6";
extraMeta.branch = "4.10";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "18cglngl42hcm0578hrsn962g2r1z9x6p5h9c6d3g0ac8siascqp";
+ sha256 = "1vjdd0i4k6m8nx5npwz5p3czg61j93wchw5amggrqfaarwy2j6j5";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index dd6bba4567a..c6a220b9c52 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.4.55";
+ version = "4.4.57";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "14inh7ps6zkvkwifqgxnwj02a7907ighdj96dv66ydckwqcmyj4j";
+ sha256 = "1jmjb7pmk8mjy7pyz58a3xs5rx2m7p6kzy4n9mp000b4zqb2kzwj";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 688a08ceb8e..586627c5925 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.9.17";
+ version = "4.9.18";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0zxcz7h8sy58qibqh1n1f39diywmdl8hd9vr16z9rbpba1jw35ch";
+ sha256 = "1lb18b29ykia9v2ryj1w6chwh19hmv6ynfjhl9p66rsnm09fl3m1";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index b17209bca0e..70cda750279 100644
--- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
+++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.9.17";
+ version = "4.9.19";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha512 = "35mcvjl686xjgnbxrz2z84gg4q1m9y7wp541sg9k3jadlgsdyqrynz09j3lx3f5v40a83xmr5j3clavjaij16bl4imi716z7vjkfryx";
+ sha512 = "13wzalzrhgvs6jfzrh8y9c90scliw6rl1vpyyh95va5wph5b8fczr136pbzpwzjaql7x5xyn3s57rmakpc5k8b34ng8hr6jzj6kiyq0";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 5f0d2db27f2..4606fc922a6 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.11-rc3";
- modDirVersion = "4.11.0-rc3";
+ version = "4.11-rc4";
+ modDirVersion = "4.11.0-rc4";
extraMeta.branch = "4.11";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
- sha256 = "07y54bl2i4qsz36hwbp3k56k8hzjyvs82cimrg0hnp2xca537vxz";
+ sha256 = "0kvp5zkq54ahxp59d33fpzf3jpr5k0jjfbxc1kfqwxvlkgznmd7h";
};
features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 0520a0425bf..ee4c161d739 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -95,9 +95,9 @@ rec {
};
grsecurity_testing = grsecPatch
- { kver = "4.9.17";
- grrev = "201703221829";
- sha512 = "3br0xdjj95k8qnri83jj67s1lb4q6ws6irhdlr9kcyxj1384kipkfz8ciafs7zd3vqyfgsmdc56lmfpiyq5cx4dggy95qykx86ip787";
+ { kver = "4.9.19";
+ grrev = "201703300917";
+ sha512 = "04fyrxyxa817qw2fbpdrw2z5xmfhjaf9kgzrfdqg1rnxnwwp1x9alm3qwkvlw0s9hcph3jln7z19jiw0fh6s82pb337cnhr1iiikax4";
};
# This patch relaxes grsec constraints on the location of usermode helpers,
diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index 4bf243c4f03..dc0dadf92e0 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
inherit version;
homepage = "http://www.infradead.org/~tgr/libnl/";
description = "Linux NetLink interface library";
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/pkgs/os-specific/linux/msr-tools/default.nix
new file mode 100644
index 00000000000..128f3eac263
--- /dev/null
+++ b/pkgs/os-specific/linux/msr-tools/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+ name = "msr-tools-${version}";
+ version = "1.3";
+
+ src = fetchurl {
+ url = "https://01.org/sites/default/files/downloads/msr-tools/${name}.zip";
+ sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr";
+ };
+
+ buildInputs = [ unzip ];
+
+ preInstall = ''
+ mkdir -p $out/bin
+ substituteInPlace Makefile \
+ --replace /usr/sbin $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Tool to read/write from/to MSR CPU registers on Linux";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+}
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index c6065dbfca2..52d7446e48c 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -2,7 +2,7 @@
let
- version = "2.0.2.3";
+ version = "2.2.0.0";
in stdenv.mkDerivation rec {
@@ -10,12 +10,13 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz";
- sha256 = "1hwc3dmqh4cyhx9b4gd48yvjrwmfkz968rncpqc511krpfwzyngr";
+ sha256 = "1y9mva7wk1ca2djq3qjh7hz756zk57yv7ljdnldn7k7jzfmlaxsq";
};
dontDisableStatic = true;
configureFlags = [
+ "--enable-absolute-paths"
"--includedir=\${prefix}/include"
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include"
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 435653c19fd..68966dd0399 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18";
let
name = "wireguard-${version}";
- version = "0.0.20170320.1";
+ version = "0.0.20170324";
src = fetchurl {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
- sha256 = "19rcsmwcb9jp4lrfrkf1x78y4i6dcqx5p7kmcbjnbwl0nkc48vr8";
+ sha256 = "2ec08a5d74cb3a63576f06d3cae695b6b8995acd9665e2fa4da91927b467ca51";
};
meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index fe0d2ca28f9..1cac0911b24 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
homepage = http://hostap.epitest.fi/wpa_supplicant/;
description = "A tool for connecting to WPA and WPA2-protected wireless networks";
license = licenses.bsd3;
- maintainers = with maintainers; [ marcweber urkud wkennington ];
+ maintainers = with maintainers; [ marcweber wkennington ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index b308a5ec3c3..e231e3a5989 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
CFLAGS = "-I${pixman}/include/pixman-1";
meta = with stdenv.lib; {
- maintainers = [ maintainers.goibhniu maintainers.urkud ];
+ maintainers = [ maintainers.goibhniu ];
description = "Wacom digitizer driver for X11";
homepage = http://linuxwacom.sourceforge.net;
license = licenses.gpl2;
diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix
index 8dc062b7504..ab14ee92a24 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/pkgs/servers/coturn/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, openssl, libevent }:
-with { inherit (stdenv.lib) optional; };
+let inherit (stdenv.lib) optional; in
stdenv.mkDerivation rec {
name = "coturn-${version}";
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 94d5ee9f5c7..97c0da86ec9 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -2,16 +2,16 @@
, systemd, nettle, libedit, zlib, libiconv, fetchpatch
}:
-with { inherit (stdenv.lib) optional optionals; };
+let inherit (stdenv.lib) optional optionals; in
# Note: ATM only the libraries have been tested in nixpkgs.
stdenv.mkDerivation rec {
name = "knot-dns-${version}";
- version = "2.4.1";
+ version = "2.4.2";
src = fetchurl {
url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
- sha256 = "c064ddf99bf5fc24dd3c6a3a523394760357e204c8b69f0e691e49bc0d9b704c";
+ sha256 = "37da7fcf1f194bd6376c63d8c4fa28a21899b56a3f3b63dba7095740a5752c52";
};
outputs = [ "bin" "out" "dev" ];
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
new file mode 100644
index 00000000000..3b3f2e0cc0f
--- /dev/null
+++ b/pkgs/servers/jackett/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, mono, curl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "jackett-${version}";
+ version = "0.7.1197";
+
+ src = fetchurl {
+ url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
+ sha256 = "0p9xdfbb8pda5a3knnw6145jky3bf10y1dj2clgsbbygi2xnam2v";
+ };
+
+ buildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ mkdir -p $out/{bin,share/${name}}
+ cp -r * $out/share/${name}
+
+ makeWrapper "${mono}/bin/mono" $out/bin/Jackett \
+ --add-flags "$out/share/${name}/JackettConsole.exe" \
+ --prefix LD_LIBRARY_PATH ':' "${curl.out}/lib"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "API Support for your favorite torrent trackers.";
+ homepage = https://github.com/Jackett/Jackett/;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ edwtjo ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index bc2bbb13c44..28b6136d90e 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "minio-${shortVersion}";
- shortVersion = "20170125";
- longVersion = "2017-01-25T03-14-52Z";
+ shortVersion = "20170316";
+ longVersion = "2017-03-16T21-50-32Z";
src = fetchurl {
url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz";
- sha256 = "0yh8fdgl50sza182kl4jly0apf0dw0ya954ky6j8a8hmdcmk6wzk";
+ sha256 = "1331lxsfr22x1sh7cyh9xz3aa70715wm1bk1f1r053kyz03q903c";
};
buildInputs = [ go ];
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index e3938ec71a8..1883764e24f 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, systemd, boost, darwin
+{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, systemd, boost, darwin
, alsaSupport ? true, alsaLib
, avahiSupport ? true, avahi, dbus
, flacSupport ? true, flac
@@ -42,6 +42,8 @@ in stdenv.mkDerivation rec {
sha256 = "0isbpa79m7zf09w3s1ry638cw96rxasy1ch66zl01k75i48mw1gl";
};
+ patches = [ ./x86.patch ];
+
buildInputs = [ pkgconfig glib boost ]
++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit
++ opt stdenv.isLinux systemd
diff --git a/pkgs/servers/mpd/x86.patch b/pkgs/servers/mpd/x86.patch
new file mode 100644
index 00000000000..3e4c036418d
--- /dev/null
+++ b/pkgs/servers/mpd/x86.patch
@@ -0,0 +1,12 @@
+--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
++++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+@@ -20,8 +20,8 @@
+ /* necessary because libavutil/common.h uses UINT64_C */
+ #define __STDC_CONSTANT_MACROS
+
+-#include "lib/ffmpeg/Time.hxx"
+ #include "config.h"
++#include "lib/ffmpeg/Time.hxx"
+ #include "FfmpegDecoderPlugin.hxx"
+ #include "lib/ffmpeg/Domain.hxx"
+ #include "lib/ffmpeg/Error.hxx"
diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
new file mode 100644
index 00000000000..446927745a9
--- /dev/null
+++ b/pkgs/servers/radarr/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, mono, libmediainfo, sqlite, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "radarr-${version}";
+ version = "0.2.0.535";
+
+ src = fetchurl {
+ url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
+ sha256 = "1ccvblklqn5iki7gc16bzzbwms28mv4kxzv1nwhlm9vf0cw4qxbr";
+ };
+
+ buildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ mkdir -p $out/{bin,share/${name}}
+ cp -r * $out/share/${name}/.
+
+ makeWrapper "${mono}/bin/mono" $out/bin/Radarr \
+ --add-flags "$out/share/${name}/Radarr.exe" \
+ --prefix LD_LIBRARY_PATH ':' "${sqlite.out}/lib" \
+ --prefix LD_LIBRARY_PATH ':' "${libmediainfo}/lib"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A Usenet/BitTorrent movie downloader.";
+ homepage = https://radarr.video/;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ edwtjo ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix
index 5f6b3904155..b0b8f926d9e 100644
--- a/pkgs/servers/sql/virtuoso/6.x.nix
+++ b/pkgs/servers/sql/virtuoso/6.x.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
description = "SQL/RDF database used by, e.g., KDE-nepomuk";
homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/;
platforms = platforms.linux;
- maintainers = [ maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix
index 2087829084f..a24daa70812 100644
--- a/pkgs/servers/sql/virtuoso/7.x.nix
+++ b/pkgs/servers/sql/virtuoso/7.x.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/;
#configure: The current version [...] can only be built on 64bit platforms
platforms = [ "x86_64-linux" ];
- maintainers = [ maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index f32e6d68452..3285456a348 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -19,12 +19,12 @@ let
in
stdenv.mkDerivation rec {
- version = "0.9.10";
+ version = "0.9.12";
name = "prosody-${version}";
src = fetchurl {
url = "http://prosody.im/downloads/source/${name}.tar.gz";
- sha256 = "0bv6s5c0iizz015hh1lxlwlw1iwvisywajm2rcrbdfyrskzfwdj8";
+ sha256 = "139yxqpinajl32ryrybvilh54ddb1q6s0ajjhlcs4a0rnwia6n8s";
};
communityModules = fetchhg {
diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix
index 83a73eb388f..d75b50bca1a 100644
--- a/pkgs/tools/archivers/dar/default.nix
+++ b/pkgs/tools/archivers/dar/default.nix
@@ -1,15 +1,17 @@
{ stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs, gpgme, xz }:
+with stdenv.lib;
+
stdenv.mkDerivation rec {
- name = "dar-2.5.3";
+ name = "dar-2.5.9";
src = fetchurl {
url = "mirror://sourceforge/dar/${name}.tar.gz";
- sha256 = "0myakyfgv2mhazwvbbwwncn9j7c9b4g3szs0aqlclmp01naaqmj5";
+ sha256 = "0bm91d82amh5h2sla2ngbpxd0l64alcdjhxz35bhj3cpz9562wv9";
};
buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
- ++ stdenv.lib.optionals stdenv.isLinux [ attr e2fsprogs ];
+ ++ optionals stdenv.isLinux [ attr e2fsprogs ];
configureFlags = [ "--disable-dar-static" ];
@@ -20,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://dar.linux.free.fr/;
description = "Disk ARchiver, allows backing up files into indexed archives";
- maintainers = [ stdenv.lib.maintainers.viric ];
- platforms = stdenv.lib.platforms.unix;
+ maintainers = [ maintainers.viric ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 145b81c95bc..3c841aa621f 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation {
description = "Compressor/archiver for creating and modifying zipfiles";
homepage = http://www.info-zip.org;
platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index b08bb0768f2..313167b1ae2 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,37 +1,43 @@
-{ stdenv, fetchurl, python2Packages, librsync, ncftp, gnupg, rsync, makeWrapper
-}:
+{ stdenv, fetchurl, python2Packages, librsync, ncftp, gnupg, rsync, makeWrapper }:
-let
- version = "0.7.07.1";
-in python2Packages.buildPythonApplication {
+python2Packages.buildPythonApplication rec {
name = "duplicity-${version}";
+ version = "0.7.12";
src = fetchurl {
- url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/duplicity-${version}.tar.gz";
- sha256 = "594c6d0e723e56f8a7114d57811c613622d535cafdef4a3643a4d4c89c1904f8";
+ url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/${name}.tar.gz";
+ sha256 = "1rhgrz2lm9vbfdp2raykrih1c6n2lw5jd572z4dsz488m52avjqi";
};
+ buildInputs = [ librsync makeWrapper python2Packages.wrapPython ];
+ propagatedBuildInputs = with python2Packages; [
+ boto cffi cryptography ecdsa enum idna
+ ipaddress lockfile paramiko pyasn1 pycrypto six
+ ];
+ checkInputs = with python2Packages; [ lockfile mock pexpect ];
+
+ # lots of tests are failing, although we get a little further now with the bits in preCheck
+ doCheck = false;
+
postInstall = ''
wrapProgram $out/bin/duplicity \
--prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}"
+
+ wrapPythonPrograms
'';
- buildInputs = [ librsync makeWrapper ];
+ preCheck = ''
+ patchShebangs testing
- # Inputs for tests. These are added to buildInputs when doCheck = true
- checkInputs = with python2Packages; [ lockfile mock pexpect ];
+ substituteInPlace testing/__init__.py \
+ --replace 'mkdir testfiles' 'mkdir -p testfiles'
+ '';
- # Many problematic tests
- doCheck = false;
-
- propagatedBuildInputs = with python2Packages; [ boto cffi cryptography ecdsa enum idna
- ipaddress lockfile paramiko pyasn1 pycrypto six ];
-
- meta = {
+ meta = with stdenv.lib; {
description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
- homepage = "http://www.nongnu.org/duplicity";
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric peti];
- platforms = stdenv.lib.platforms.unix;
+ homepage = http://www.nongnu.org/duplicity;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ viric peti ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix
index 5737f1eca15..2f4b56ffcaf 100644
--- a/pkgs/tools/compression/advancecomp/default.nix
+++ b/pkgs/tools/compression/advancecomp/default.nix
@@ -1,31 +1,26 @@
-{stdenv, fetchurl, zlib}:
-let
- s = # Generated upstream information
- rec {
- baseName="advancecomp";
- version="1.19";
- name="${baseName}-${version}";
- url="http://prdownloads.sourceforge.net/advancemame/advancecomp-1.19.tar.gz?download";
- sha256="0irhmwcn9r4jc29442skqr1f3lafiaahxc3m3ybalmm37l6cb56m";
+{ stdenv, fetchFromGitHub
+, autoreconfHook, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "advancecomp-${version}";
+ version = "1.23";
+
+ src = fetchFromGitHub {
+ owner = "amadvance";
+ repo = "advancecomp";
+ rev = "v${version}";
+ sha256 = "1mrgmpjd9f7x16g847h1588mgryl26hlzfl40bc611259bb0bq7w";
};
- buildInputs = [
- zlib
- ];
-in
-stdenv.mkDerivation {
- inherit (s) name version;
- inherit buildInputs;
- src = fetchurl {
- inherit (s) url sha256;
- };
- meta = {
- inherit (s) version;
+
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ zlib ];
+
+ meta = with stdenv.lib; {
description = ''A set of tools to optimize deflate-compressed files'';
- license = stdenv.lib.licenses.gpl2 ;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
- updateWalker = true;
- homepage = "http://advancemame.sourceforge.net/comp-readme.html";
- downloadPage = "http://advancemame.sourceforge.net/comp-download.html";
+ license = licenses.gpl2 ;
+ maintainers = [ maintainers.raskin ];
+ platforms = platforms.linux;
+ homepage = https://github.com/amadvance/advancecomp;
+
};
}
diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix
index fca1a433ff3..0bf15580798 100644
--- a/pkgs/tools/compression/lzfse/default.nix
+++ b/pkgs/tools/compression/lzfse/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "lzfse-${version}";
- version = "2016-06-21";
+ version = "2017-03-08";
src = fetchFromGitHub {
owner = "lzfse";
repo = "lzfse";
- rev = "45912281e3945a09c6ebfa8c6629f6906a99fc29";
- sha256 = "1wbh3x874fjn548g1hw4bm7lkk60vlvy8ph0wsjkzcx8873hwj7h";
+ rev = "88e2d27";
+ sha256 = "1mfh6y6vpvxsdwmqmfbkqkwvxc0pz2dqqc72c6fk9sbsrxxaghd5";
};
makeFlags = [ "INSTALL_PREFIX=$(out)" ];
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index 01d9b81d038..a5c858ecbae 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://www.tuxera.com/community/open-source-ntfs-3g/;
description = "FUSE-based NTFS driver with full write support";
- maintainers = with maintainers; [ urkud dezgeg ];
+ maintainers = with maintainers; [ dezgeg ];
platforms = platforms.linux;
license = licenses.gpl2Plus; # and (lib)fuse-lite under LGPL2+
};
diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix
index b8cdb64da87..66d3a110080 100644
--- a/pkgs/tools/graphics/dcraw/default.nix
+++ b/pkgs/tools/graphics/dcraw/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
description = "Decoder for many camera raw picture formats";
license = stdenv.lib.licenses.free;
platforms = with stdenv.lib.platforms; allBut cygwin;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/tools/graphics/panomatic/default.nix b/pkgs/tools/graphics/panomatic/default.nix
deleted file mode 100644
index f14c16775f8..00000000000
--- a/pkgs/tools/graphics/panomatic/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, boost, zlib}:
-
-stdenv.mkDerivation {
- name = "panomatic-0.9.4";
-
- src = fetchurl {
- url = http://aorlinsk2.free.fr/panomatic/bin/panomatic-0.9.4-src.tar.bz2;
- sha256 = "0vfkj3k3y8narwwijh996q2zzprjxbr2fhym15nm4fkq14yw4wwn";
- };
-
- buildInputs = [ boost zlib ];
-
- meta = {
- homepage = http://aorlinsk2.free.fr/panomatic/;
- description = "Tool that automates the creation of control points in Hugin";
- license = stdenv.lib.licenses.gpl2Plus;
- };
-}
diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix
index 936956cbd17..40f61253306 100644
--- a/pkgs/tools/graphics/qrencode/default.nix
+++ b/pkgs/tools/graphics/qrencode/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
homepage = http://fukuchi.org/works/qrencode/;
description = "QR code encoder";
platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 50059e9477a..5d130d7ad80 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig
-, anthy, ibus, glib, gobjectIntrospection, gtk3, python3, pygobject3
+, anthy, ibus, glib, gobjectIntrospection, gtk3, python3
}:
stdenv.mkDerivation rec {
@@ -15,15 +15,16 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ gebner ericsagnes ];
};
- configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t";
+ configureFlags = [ "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t" ];
buildInputs = [
- anthy glib gobjectIntrospection gtk3 ibus python3 pygobject3
+ anthy glib gobjectIntrospection gtk3 ibus python3
];
- nativeBuildInputs = [ intltool pkgconfig ];
+ nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ];
postFixup = ''
+ wrapPythonPrograms
substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out
'';
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index 1ada62580db..74253fa09fc 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig
-, gtk3, ibus, libhangul, librsvg, python3, pygobject3
+, gtk3, ibus, libhangul, librsvg, python3
}:
stdenv.mkDerivation rec {
@@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2";
};
- buildInputs = [ gtk3 ibus libhangul python3 pygobject3 ];
+ buildInputs = [ gtk3 ibus libhangul ];
- nativeBuildInputs = [ intltool pkgconfig ];
+ nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ];
+
+ postFixup = "wrapPythonPrograms";
meta = with stdenv.lib; {
isIbusEngine = true;
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
index 799d66aac9b..6293fa30d7a 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook
, intltool, pkgconfig, sqlite, libpinyin, db
-, ibus, glib, gtk3, python3, pygobject3
+, ibus, glib, gtk3, python3
}:
stdenv.mkDerivation rec {
@@ -15,12 +15,14 @@ stdenv.mkDerivation rec {
};
buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ];
- nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
+ nativeBuildInputs = [ autoreconfHook intltool pkgconfig python3.pkgs.wrapPython ];
postAutoreconf = ''
intltoolize
'';
+ postFixup = "wrapPythonPrograms";
+
meta = with stdenv.lib; {
isIbusEngine = true;
description = "IBus interface to the libpinyin input method";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index 2dbab712955..2d25e6bf430 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub
, autoreconfHook, pkgconfig
-, ibus, m17n_lib, m17n_db, gettext, python3, pygobject3
+, ibus, m17n_lib, m17n_db, gettext, python3
}:
stdenv.mkDerivation rec {
@@ -16,10 +16,12 @@ stdenv.mkDerivation rec {
buildInputs = [
ibus m17n_lib m17n_db gettext
- python3 pygobject3
+ python3
];
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig python3.pkgs.wrapPython ];
+
+ postFixup = "wrapPythonPrograms";
meta = with stdenv.lib; {
isIbusEngine = true;
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
index 644725c2910..aa346f45274 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
@@ -1,4 +1,4 @@
-{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese }:
+{ clangStdenv, fetchFromGitHub, fetchsvn, which, ninja, python2, pkgconfig, protobuf, ibus, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese }:
let
japanese_usage_dictionary = fetchsvn {
@@ -19,7 +19,7 @@ in clangStdenv.mkDerivation rec {
maintainers = with maintainers; [ gebner ericsagnes ];
};
- nativeBuildInputs = [ gyp which ninja python pkgconfig ];
+ nativeBuildInputs = [ which ninja python2 python2.pkgs.gyp pkgconfig ];
buildInputs = [ protobuf ibus gtk2 zinnia qt4 libxcb ];
src = fetchFromGitHub {
@@ -36,8 +36,8 @@ in clangStdenv.mkDerivation rec {
configurePhase = ''
export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc"
- python src/build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc \
- python src/unix/fcitx/fcitx.gyp gyp --gypdir=${gyp}/bin
+ python src/build_mozc.py gyp --gypdir=${python2.pkgs.gyp}/bin --server_dir=$out/lib/mozc \
+ python src/unix/fcitx/fcitx.gyp gyp --gypdir=${python2.pkgs.gyp}/bin
'';
preBuildPhase = ''
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index c5090e5b949..8900ebc120c 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub
, autoreconfHook, docbook2x, pkgconfig
, gtk3, dconf, gobjectIntrospection
-, ibus, python3, pygobject3 }:
+, ibus, python3 }:
stdenv.mkDerivation rec {
name = "ibus-table-${version}";
@@ -29,16 +29,18 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
- dconf gtk3 gobjectIntrospection ibus python3 pygobject3
+ dconf gtk3 gobjectIntrospection ibus python3
];
- nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig ];
+ nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig python3.pkgs.wrapPython ];
postUnpack = ''
substituteInPlace $sourceRoot/engine/Makefile.am \
--replace "docbook2man" "docbook2man --sgml"
'';
+ postFixup = "wrapPythonPrograms";
+
meta = with stdenv.lib; {
isIbusEngine = true;
description = "An IBus framework for table-based input methods";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
index 161982ac618..1ea7ef4251f 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
@@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein ];
+ nativeBuildInputs = [ python3Packages.wrapPython ];
+
+ postFixup = ''
+ buildPythonPath $out
+ patchPythonScript $out/share/ibus-uniemoji/uniemoji.py
+ '';
+
makeFlags = [ "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc"
"PYTHON=${python3Packages.python.interpreter}"
];
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index de375ed4529..1654f57c8ed 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, makeWrapper
+{ stdenv, fetchurl, wrapGAppsHook
, intltool, isocodes, pkgconfig
-, python3, pygobject3
+, python3
, gtk2, gtk3, atk, dconf, glib, json_glib
, dbus, libnotify, gobjectIntrospection, wayland
, nodePackages
@@ -34,19 +34,21 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- python3 pygobject3
+ python3
intltool isocodes pkgconfig
gtk2 gtk3 dconf
json_glib
dbus libnotify gobjectIntrospection wayland
];
- propagatedBuildInputs = [ glib ];
+ propagatedBuildInputs = [ glib python3.pkgs.pygobject3 ];
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ wrapGAppsHook python3.pkgs.wrapPython ];
outputs = [ "out" "dev" ];
+ enableParallelBuilding = true;
+
preConfigure = ''
# Fix hard-coded installation paths, so make does not try to overwrite our
# Python installation.
@@ -59,14 +61,9 @@ stdenv.mkDerivation rec {
substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo"
'';
- preFixup = ''
- for f in "$out/bin"/*; do #*/
- wrapProgram "$f" \
- --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
- --prefix PYTHONPATH : "$PYTHONPATH" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
- --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
- done
+ postFixup = ''
+ buildPythonPath $out
+ patchPythonScript $out/share/ibus/setup/main.py
'';
doInstallCheck = true;
diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
index 710641281e5..02d65597f74 100644
--- a/pkgs/tools/misc/antimicro/default.nix
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }:
+{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, makeQtWrapper, xorg, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "antimicro-${version}";
@@ -12,9 +12,13 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- cmake pkgconfig SDL2 qtbase qttools xorg.libXtst
+ cmake pkgconfig SDL2 qtbase qttools xorg.libXtst makeQtWrapper
];
+ postInstall = ''
+ wrapQtProgram $out/bin/antimicro
+ '';
+
meta = with stdenv.lib; {
description = "GUI for mapping keyboard and mouse controls to a gamepad";
inherit (src.meta) homepage;
diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix
index 7db7ebf96d6..6a76906a805 100644
--- a/pkgs/tools/misc/convmv/default.nix
+++ b/pkgs/tools/misc/convmv/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Converts filenames from one encoding to another";
platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin;
- maintainers = [ maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix
index 98b91964e64..15701d3c429 100644
--- a/pkgs/tools/misc/cpulimit/default.nix
+++ b/pkgs/tools/misc/cpulimit/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "cpulimit-${version}";
- version = "2.4";
+ version = "2.5";
src = fetchurl {
url = "mirror://sourceforge/limitcpu/${name}.tar.gz";
- sha256 = "1fr4rgi5vdbjxsn04j99g1qyr7n5169hrv6lp3lli030alvkfbm2";
+ sha256 = "1w1l3r9ini78s8idxlzmgljpfgl1n4y4qhp3q2s8y6wq4bfx41lp";
};
buildFlags = with stdenv;
diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix
index b32f8f43146..e2f2f51ccfb 100644
--- a/pkgs/tools/misc/dynamic-colors/default.nix
+++ b/pkgs/tools/misc/dynamic-colors/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "dynamic-colors-${version}";
- version = "0.2.1";
+ version = "0.2.2.1";
src = fetchFromGitHub {
- owner = "peterhoeg";
- repo = "dynamic-colors";
- rev = "v${version}";
- sha256 = "061lh4qjk4671hwzmj55n3gy5hsi4p3hb30hj5bg3s6glcsbjpr5";
+ owner = "peterhoeg";
+ repo = "dynamic-colors";
+ rev = "v${version}";
+ sha256 = "0qz76n5sspgpz6bz66jfkyr42da3skbpw9wbvxgm3ha343azfaiw";
};
dontBuild = true;
@@ -17,24 +17,24 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p \
$out/bin \
- $out/share/colorschemes \
+ $out/share/dynamic-colors/colorschemes \
$out/share/bash-completion/completions \
$out/share/zsh/site-packages
install -m755 bin/dynamic-colors $out/bin/
install -m644 completions/dynamic-colors.bash $out/share/bash-completion/completions/dynamic-colors
install -m644 completions/dynamic-colors.zsh $out/share/zsh/site-packages/_dynamic-colors
- install -m644 colorschemes/* -t $out/share/colorschemes
+ install -m644 colorschemes/* -t $out/share/dynamic-colors/colorschemes
- sed -e "s|/usr/share/dynamic-colors|$out/share|g" \
- -i $out/bin/dynamic-colors
+ substituteInPlace $out/bin/dynamic-colors \
+ --replace /usr/share/dynamic-colors $out/share/dynamic-colors
'';
- meta = {
- homepage = https://github.com/peterhoeg/dynamic-colors;
- license = stdenv.lib.licenses.mit;
+ meta = with stdenv.lib; {
description = "Change terminal colors on the fly";
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.peterhoeg ];
+ homepage = https://github.com/peterhoeg/dynamic-colors;
+ license = licenses.mit;
+ maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index f34c9b6db23..5010343d3c7 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -2,7 +2,7 @@
let
- version = "2.1.4.5";
+ version = "2.2.0.0";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/execline";
rev = "refs/tags/v${version}";
- sha256 = "01hfh2gmap3qd9qc5ncp1sxagrsi8q6cdjxxspwpmrc4d4cmzcr0";
+ sha256 = "1795n6s0sp9hw8amx2hs9r395gv4c5sn63g077g1gal1vcpkcssn";
};
dontDisableStatic = true;
@@ -19,6 +19,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = [
+ "--enable-absolute-paths"
"--libdir=\${prefix}/lib"
"--includedir=\${prefix}/include"
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
@@ -27,7 +28,7 @@ in stdenv.mkDerivation rec {
"--with-dynlib=${skalibs}/lib"
]
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
- ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
+ ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
meta = {
homepage = http://skarnet.org/software/execline/;
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 2cccee0a4e3..cecd2ef3cf3 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -57,6 +57,7 @@ stdenv.mkDerivation rec {
description = "A font editor";
homepage = http://fontforge.github.io;
platforms = stdenv.lib.platforms.all;
+ license = stdenv.lib.licenses.bsd3;
};
}
diff --git a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
new file mode 100644
index 00000000000..046c1d44920
--- /dev/null
+++ b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
@@ -0,0 +1,24 @@
+{stdenv, fontforge, zlib}:
+stdenv.mkDerivation rec {
+ name = "fontforge-fonttools-${fontforge.version}";
+ src = fontforge.src;
+
+ buildInputs = [zlib];
+
+ setSourceRoot = ''export sourceRoot="$(echo */contrib/fonttools)"'';
+
+ installPhase = ''
+ mkdir -p "$out"/{bin,share/doc/fontforge-fonttools}
+ for i in *.c; do
+ gcc "$i" -lz -lm --std=c99 -o "$out"/bin/$(basename "$i" .c)
+ done
+ cp README* "$out/share/doc/fontforge-fonttools"
+ '';
+
+ meta = with stdenv.lib; {
+ description = ''Small font tools shipped in FontForge contrib'';
+ license = fontforge.meta.license;
+ maintainers = with maintainers; [ raskin ];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 7215cccbfed..176f8aa1f51 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -12,7 +12,7 @@
# (--enable-unsupported could be used to force the build)
assert !cpp || mpi == null;
-with { inherit (stdenv.lib) optional optionals; };
+let inherit (stdenv.lib) optional optionals; in
stdenv.mkDerivation rec {
version = "1.8.18";
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index b16806139b4..bf5a158625c 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, skalibs, gcc }:
+{ stdenv, fetchurl, skalibs, gcc }:
with stdenv.lib;
@@ -6,25 +6,26 @@ stdenv.mkDerivation rec {
name = "s6-portable-utils-${version}";
version = "2.1.0.0";
- src = fetchFromGitHub {
- owner = "skarnet";
- repo = "s6-portable-utils";
- rev = "v${version}";
- sha256 = "0k5pcwc45jw5l8ycz03wx2w4pds0wp4ll47d3i5i1j02i9v0rhc9";
+ src = fetchurl {
+ url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
+ sha256 = "0khw5ljmlghvl4hyrf4vd0hl5rrmsspchi8w4xgniwfip6vlbqfd";
};
dontDisableStatic = true;
- nativeBuildInputs = []
- ++ optional stdenv.isDarwin gcc;
-
configureFlags = [
+ "--enable-absolute-paths"
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include"
"--with-lib=${skalibs}/lib"
"--with-dynlib=${skalibs}/lib"
- ];
-
+ ]
+ # On darwin, the target triplet from -dumpmachine includes version number, but
+ # skarnet.org software uses the triplet to test binary compatibility.
+ # Explicitly setting target ensures code can be compiled against a skalibs
+ # binary built on a different version of darwin.
+ # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
+ ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
meta = {
homepage = http://www.skarnet.org/software/s6-portable-utils/;
diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index 04b42f6d722..c254490555c 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -2,13 +2,13 @@
pythonPackages.buildPythonApplication rec {
name = "tmuxp-${version}";
- version = "1.2.2";
+ version = "1.2.7";
namePrefix = "";
src = fetchurl {
url = "mirror://pypi/t/tmuxp/${name}.tar.gz";
- sha256 = "1g37pdxs0wmnskqm7qsqm0ygwpc1dxk1d7lrzpgs717zxaak8vln";
+ sha256 = "19s17frgyjvyvmr16fs0gl5mnbaxbmdffmkckadwhd5mg0pz2i4s";
};
patchPhase = ''
diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix
index accd3b8070a..fc8c40ea4e0 100644
--- a/pkgs/tools/misc/usbmuxd/default.nix
+++ b/pkgs/tools/misc/usbmuxd/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
talking to your iPhone or iPod Touch over USB and coordinating access to
its services by other applications.'';
platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index fa18e6c0ce5..10b7b47b3f4 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -20,6 +20,7 @@ let
ipaddress
backports_ssl_match_hostname
docker_pycreds
+ uptime
];
# due to flake8
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index b7527cf97ce..7f7d68fd575 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
name = pname + "-" + version;
pname = "i2pd";
- version = "2.11.0";
+ version = "2.12.0";
src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
- sha256 = "1ky4ckv5p86xxgjkgxdi48c9q9h4pff2blilg03bxks8f8dxfy9f";
+ sha256 = "1m97s3c1fvhq6ql3zr2a2ia2n06cl8jgf28gjn4k3xg8m7s984dz";
};
buildInputs = [ boost zlib openssl ];
diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix
index 13f8cedc673..c0fd6c973cd 100644
--- a/pkgs/tools/networking/iperf/2.nix
+++ b/pkgs/tools/networking/iperf/2.nix
@@ -1,19 +1,19 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "iperf-2.0.5";
+ name = "iperf-2.0.9";
src = fetchurl {
- url = "mirror://sourceforge/iperf/${name}.tar.gz";
- sha256 = "0nr6c81x55ihs7ly2dwq19v9i1n6wiyad1gacw3aikii0kzlwsv3";
+ url = "mirror://sourceforge/iperf2/files/${name}.tar.gz";
+ sha256 = "1gzh8dk2myqgxznxrryib4zsw23ffvx0s5j7sa780vk86lgr20nv";
};
hardeningDisable = [ "format" ];
meta = with stdenv.lib; {
- homepage = "http://sourceforge.net/projects/iperf/";
+ homepage = "http://sourceforge.net/projects/iperf/";
description = "Tool to measure IP bandwidth using UDP or TCP";
platforms = platforms.unix;
- license = "as-is";
+ license = licenses.mit;
};
}
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 258a81570c0..303204c9c21 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "minio-client-${shortVersion}";
- shortVersion = "20160821";
- longVersion = "2016-08-21T03:02:49Z";
+ shortVersion = "20170206";
+ longVersion = "2017-02-06T20-16-19Z";
src = fetchurl {
url = "https://github.com/minio/mc/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz";
- sha256 = "1qnslwfspbvzawxrrym27agw79x8sgcafk7d0yakncjyg6vmdkka";
+ sha256 = "0k66kr7x669jvydcxp3rpvg8p9knhmcihpnjiqynhqgrdy16mr1f";
};
buildInputs = [ go ];
diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix
index 9fe4b4421a7..dc4e246c02f 100644
--- a/pkgs/tools/networking/modemmanager/default.nix
+++ b/pkgs/tools/networking/modemmanager/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
meta = {
description = "WWAN modem manager, part of NetworkManager";
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index cca111db67d..d2240984d9f 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
homepage = http://projects.gnome.org/NetworkManager/;
description = "NetworkManager control applet for GNOME";
license = licenses.gpl2;
- maintainers = with maintainers; [ phreedom urkud rickynils ];
+ maintainers = with maintainers; [ phreedom rickynils ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 1ad1e54e7fb..cac37bce280 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
homepage = http://projects.gnome.org/NetworkManager/;
description = "Network configuration and management tool";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ phreedom urkud rickynils domenkozar obadz ];
+ maintainers = with maintainers; [ phreedom rickynils domenkozar obadz ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix
index 66028a973b3..552cda93bcc 100644
--- a/pkgs/tools/networking/pcapc/default.nix
+++ b/pkgs/tools/networking/pcapc/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchFromGitHub, libpcap }:
+{ stdenv, fetchFromGitHub, libpcap, cmake }:
stdenv.mkDerivation rec {
name = "pcapc-${version}";
- version = "2015-03-06";
+ version = "1.0.0";
src = fetchFromGitHub {
- sha256 = "02j45wmxy8qcji0giwx3364pbqb6849s8y0xfvzx40g98mssl027";
- rev = "9dddf52e65c8cff72c7c11758a951b31bf083436";
+ sha256 = "137crs0bb7kh9a8p9g168yj2jrp0h3j3073nwh31jy4nk0g5hlfp";
+ rev = "v${version}";
repo = "pcapc";
owner = "pfactum";
};
+ nativeBuildInputs = [ cmake ];
buildInputs = [ libpcap ];
makeFlags = [ "PREFIX=$(out)" ];
@@ -19,12 +20,8 @@ stdenv.mkDerivation rec {
doCheck = false;
- postInstall = ''
- install -Dm644 {.,$out/share/doc/pcapc}/README.md
- '';
-
meta = with stdenv.lib; {
- inherit (src.meta) homepage;
+ homepage = "https://github.com/pfactum/pcapc";
description = "Compile libpcap filter expressions into BPF opcodes";
license = licenses.gpl3;
platforms = platforms.linux;
diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix
index 8fcdb49b2b1..c2c41d92acb 100644
--- a/pkgs/tools/networking/pptp/default.nix
+++ b/pkgs/tools/networking/pptp/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
description = "PPTP client for Linux";
homepage = http://pptpclient.sourceforge.net/;
platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index a8bbe8b71ab..8ea134843c3 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -2,7 +2,7 @@
let
- version = "2.0.0.7";
+ version = "2.1.0.0";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6-dns";
rev = "refs/tags/v${version}";
- sha256 = "1f9a4bjpsqhs9aq0zam74mj6zn1ffaljgp98hqj9j83d2jlvqpv5";
+ sha256 = "126ikznsw0hlk4mmf03yxzfnvcw823g5il1vfs3a5fa9q26xyc72";
};
dontDisableStatic = true;
@@ -19,6 +19,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = [
+ "--enable-absolute-paths"
"--includedir=\${prefix}/include"
"--libdir=\${prefix}/lib"
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
@@ -27,7 +28,7 @@ in stdenv.mkDerivation rec {
"--with-dynlib=${skalibs}/lib"
]
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
- ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
+ ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
meta = {
homepage = http://www.skarnet.org/software/s6-dns/;
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index fa7994e8f8f..6574a02bb92 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -2,7 +2,7 @@
let
- version = "2.1.0.4";
+ version = "2.2.1.0";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6-networking";
rev = "refs/tags/v${version}";
- sha256 = "0rm0vpfshayhi5qwsvkgzdjmg43lvslp74h7lda964p72wr6gahg";
+ sha256 = "0msfssd42pdwch0z8rhrm7hd4ps9d730az92vg0pnz769xs8kjx0";
};
dontDisableStatic = true;
@@ -19,6 +19,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = [
+ "--enable-absolute-paths"
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include"
"--with-include=${execline}/include"
@@ -33,7 +34,7 @@ in stdenv.mkDerivation rec {
"--with-dynlib=${s6}/lib"
"--with-dynlib=${s6Dns}/lib"
]
- ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
+ ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
meta = {
homepage = http://www.skarnet.org/software/s6-networking/;
diff --git a/pkgs/tools/networking/sitecopy/default.nix b/pkgs/tools/networking/sitecopy/default.nix
deleted file mode 100644
index 5667744ef22..00000000000
--- a/pkgs/tools/networking/sitecopy/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, neon, zlib, openssl, autoreconfHook }:
-
-stdenv.mkDerivation rec {
- name = "sitecopy-0.16.6";
-
- src = fetchurl {
- url = "http://www.manyfish.co.uk/sitecopy/${name}.tar.gz";
- sha256 = "1bsqfhfq83g1qambqf8i1ivvggz5d2byg94hmrpxqkg50yhdsvz0";
- };
-
- patches = [ ./neon-29.patch ];
-
- buildInputs = [ openssl neon zlib autoreconfHook ];
-
- configureFlags= "--with-ssl=openssl";
-}
diff --git a/pkgs/tools/networking/sitecopy/neon-29.patch b/pkgs/tools/networking/sitecopy/neon-29.patch
deleted file mode 100644
index bddcbde95e1..00000000000
--- a/pkgs/tools/networking/sitecopy/neon-29.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru sitecopy-0.16.6-orig/configure.in sitecopy-0.16.6/configure.in
---- sitecopy-0.16.6-orig/configure.in 2008-04-02 13:59:30.000000000 +0200
-+++ sitecopy-0.16.6/configure.in 2010-08-26 15:07:04.000000000 +0200
-@@ -112,8 +112,8 @@
- AC_LIBOBJ(lib/fnmatch)
- fi
-
--# Support neon 0.24 through 0.28
--NE_REQUIRE_VERSIONS([0], [24 25 26 27 28])
-+# Support neon 0.24 through 0.29
-+#NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29])
-
- dnl But we don't use zlib or ACL support
- NEON_WITHOUT_ZLIB
-Only in sitecopy-0.16.6/: configure.in~
diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix
new file mode 100644
index 00000000000..17150c75466
--- /dev/null
+++ b/pkgs/tools/package-management/cde/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "cde-${version}";
+ version = "0.1";
+
+ src = fetchFromGitHub {
+ owner = "pgbovine";
+ repo = "CDE";
+ sha256 = "0raiz7pczkbnzxpg7g59v7gdp1ipkwgms2vh3431snw1va1gjzmk";
+ rev = "v${version}";
+ };
+
+ # The build is small, so there should be no problem
+ # running this locally. There is also a use case for
+ # older systems, where modern binaries might not be
+ # useful.
+ preferLocalBuild = true;
+
+ patchBuild = ''
+ sed '/install/d' $src/Makefile > $src/Makefile
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp cde $out/bin
+ cp cde-exec $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/pgbovine/CDE;
+ description = "A packaging tool for building portable packages";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.rlupton20 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 3aa555f1916..dbd6a352132 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz
-, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp
+, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
@@ -21,6 +21,7 @@ let
buildInputs = [ curl openssl sqlite xz ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
+ ++ lib.optional fromGit brotli # Since 1.12
++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && lib.versionAtLeast version "1.12pre")
(aws-sdk-cpp.override {
apis = ["s3"];
@@ -112,12 +113,12 @@ in rec {
nixUnstable = lib.lowPrio (common rec {
name = "nix-1.12${suffix}";
- suffix = "pre5073_1cf4801";
+ suffix = "pre5122_c60715e";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "1cf480110879ffc8aee94b4b75999da405b71d7c";
- sha256 = "1iwpddz0yni7cz2g9asj6nmrwhaai3rhfmkq954hph8nx02c3l02";
+ rev = "c60715e937e3773bbb8a114fc9b9c6577f8c5cb5";
+ sha256 = "0hkc4g7i3z06y3rsdxqzdnx5rz77jb8ij1j13bdskbvpp7vfm60p";
};
fromGit = true;
});
diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix
index 0dbea652959..9c4f98a740b 100644
--- a/pkgs/tools/security/gnupg/1.nix
+++ b/pkgs/tools/security/gnupg/1.nix
@@ -12,10 +12,21 @@ stdenv.mkDerivation rec {
doCheck = true;
- meta = {
- description = "Free implementation of the OpenPGP standard for encrypting and signing data";
- homepage = http://www.gnupg.org/;
- license = stdenv.lib.licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+ meta = with stdenv.lib; {
+ homepage = "https://gnupg.org";
+ description = "Classic (1.4) release of the GNU Privacy Guard, a GPL OpenPGP implementation";
+ license = licenses.gpl3Plus;
+ longDescription = ''
+ The GNU Privacy Guard is the GNU project's complete and free
+ implementation of the OpenPGP standard as defined by RFC4880. GnuPG
+ "classic" (1.4) is the old standalone version which is most suitable for
+ older or embedded platforms. GnuPG allows to encrypt and sign your data
+ and communication, features a versatile key management system as well as
+ access modules for all kind of public key directories. GnuPG, also known
+ as GPG, is a command line tool with features for easy integration with
+ other applications. A wealth of frontend applications and libraries are
+ available.
+ '';
+ platforms = platforms.gnu; # arbitrary choice
};
}
diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix
index 0fe294e5a11..c4cc68dcca3 100644
--- a/pkgs/tools/security/gnupg/1compat.nix
+++ b/pkgs/tools/security/gnupg/1compat.nix
@@ -1,7 +1,7 @@
{ stdenv, gnupg, coreutils, writeScript }:
stdenv.mkDerivation {
- name = "gnupg1compat-0";
+ name = "gnupg1compat-${gnupg.version}";
builder = writeScript "gnupg1compat-builder" ''
# First symlink all top-level dirs
@@ -18,7 +18,8 @@ stdenv.mkDerivation {
${coreutils}/bin/ln -s gpgv2 $out/bin/gpgv
'';
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = gnupg.meta // {
+ description = gnupg.meta.description +
+ " with symbolic links for gpg and gpgv";
};
}
diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index fd79419d82a..6b011a00eb7 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -44,24 +44,22 @@ stdenv.mkDerivation rec {
doCheck = true;
- meta = {
- homepage = "http://gnupg.org/";
- description = "Free implementation of the OpenPGP standard for encrypting and signing data";
- license = stdenv.lib.licenses.gpl3Plus;
-
+ meta = with stdenv.lib; {
+ homepage = "https://gnupg.org";
+ description = "Stable (2.0) release of the GNU Privacy Guard, a GPL OpenPGP implementation";
+ license = licenses.gpl3Plus;
longDescription = ''
- GnuPG is the GNU project's complete and free implementation of
- the OpenPGP standard as defined by RFC4880. GnuPG allows to
- encrypt and sign your data and communication, features a
- versatile key management system as well as access modules for all
- kind of public key directories. GnuPG, also known as GPG, is a
- command line tool with features for easy integration with other
- applications. A wealth of frontend applications and libraries
- are available. Version 2 of GnuPG also provides support for
- S/MIME.
+ The GNU Privacy Guard is the GNU project's complete and free
+ implementation of the OpenPGP standard as defined by RFC4880. GnuPG
+ "stable" (2.0) is the current stable version for general use. This is
+ what most users are still using. GnuPG allows to encrypt and sign your
+ data and communication, features a versatile key management system as well
+ as access modules for all kind of public key directories. GnuPG, also
+ known as GPG, is a command line tool with features for easy integration
+ with other applications. A wealth of frontend applications and libraries
+ are available. Version 2 of GnuPG also provides support for S/MIME.
'';
-
- maintainers = with stdenv.lib.maintainers; [ roconnor urkud ];
- platforms = stdenv.lib.platforms.all;
+ maintainers = with maintainers; [ roconnor ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index 0f021c6b4a1..72786247af4 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -48,9 +48,20 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://gnupg.org;
- description = "A complete and free implementation of the OpenPGP standard";
+ homepage = "https://gnupg.org";
+ description = "Modern (2.1) release of the GNU Privacy Guard, a GPL OpenPGP implementation";
license = licenses.gpl3Plus;
+ longDescription = ''
+ The GNU Privacy Guard is the GNU project's complete and free
+ implementation of the OpenPGP standard as defined by RFC4880. GnuPG
+ "modern" (2.1) is the latest development with a lot of new features.
+ GnuPG allows to encrypt and sign your data and communication, features a
+ versatile key management system as well as access modules for all kind of
+ public key directories. GnuPG, also known as GPG, is a command line tool
+ with features for easy integration with other applications. A wealth of
+ frontend applications and libraries are available. Version 2 of GnuPG
+ also provides support for S/MIME.
+ '';
maintainers = with maintainers; [ wkennington peti fpletz vrthra ];
platforms = platforms.all;
};
diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix
index 38d47e742a2..e8709130015 100644
--- a/pkgs/tools/security/polkit-gnome/default.nix
+++ b/pkgs/tools/security/polkit-gnome/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
homepage = http://hal.freedesktop.org/docs/PolicyKit/;
description = "A dbus session bus service that is used to bring up authentication dialogs";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ urkud phreedom ];
+ maintainers = with stdenv.lib.maintainers; [ phreedom ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix
index ea6b7411c4e..7be136944c6 100644
--- a/pkgs/tools/security/signing-party/default.nix
+++ b/pkgs/tools/security/signing-party/default.nix
@@ -1,73 +1,223 @@
-{ stdenv, fetchurl, makeWrapper, autoconf, automake
-, gnupg, perl, python, libmd, qprint, coreutils, gnused, glibc, gnupg1compat
-, perlPackages }:
+{ stdenv, fetchurl, autoconf, automake, makeWrapper
+, python, perl, perlPackages
+, libmd, gnupg1, which, getopt, libpaper, nettools, qprint
+, sendmailPath ? "/run/wrappers/bin/sendmail" }:
+let
+ # All runtime dependencies from the CPAN graph:
+ # https://widgets.stratopan.com/wheel?q=GnuPG-Interface-0.52&runtime=1&fs=1
+ # TODO: XSLoader seems optional
+ GnuPGInterfaceRuntimeDependencies = with perlPackages; [
+ strictures ClassMethodModifiers DataPerl DevelGlobalDestruction ExporterTiny
+ GnuPGInterface ListMoreUtils ModuleRuntime Moo MooXHandlesVia MooXlate
+ RoleTiny SubExporterProgressive SubQuote TypeTiny XSLoader
+ ];
+in
stdenv.mkDerivation rec {
+ pname = "signing-party";
version = "2.5";
- basename = "signing-party";
- name = "${basename}-${version}";
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://debian/pool/main/s/${basename}/${basename}_${version}.orig.tar.gz";
+ url = "mirror://debian/pool/main/s/${pname}/${pname}_${version}.orig.tar.gz";
sha256 = "1y2bxk01qiwaqaily0s6zi10ssv7l35vksib6fxzyl76pp693nv2";
};
sourceRoot = ".";
+ # TODO: Get this patch upstream...
patches = [ ./gpgwrap_makefile.patch ];
postPatch = ''
- substituteInPlace gpg-mailkeys/gpg-mailkeys --replace "/usr/sbin/sendmail" "sendmail"
+ substituteInPlace gpg-mailkeys/gpg-mailkeys --replace \
+ "/usr/sbin/sendmail" "${sendmailPath}"
'';
+ # One can use the following command to find all relevant Makefiles:
+ # grep -R '$(DESTDIR)/usr' | cut -d: -f1 | sort -u | grep -v 'debian/rules'
preBuild = ''
- substituteInPlace sig2dot/Makefile --replace "\$(DESTDIR)/usr" "$out"
- substituteInPlace gpgsigs/Makefile --replace "\$(DESTDIR)/usr" "$out"
- substituteInPlace keylookup/Makefile --replace "\$(DESTDIR)/usr" "$out"
- substituteInPlace springgraph/Makefile --replace "\$(DESTDIR)/usr" "$out"
- substituteInPlace keyanalyze/Makefile --replace "\$(DESTDIR)/usr" "$out"
+ substituteInPlace gpgsigs/Makefile --replace '$(DESTDIR)/usr' "$out"
+ substituteInPlace keyanalyze/Makefile --replace '$(DESTDIR)/usr' "$out"
+ substituteInPlace keylookup/Makefile --replace '$(DESTDIR)/usr' "$out"
+ substituteInPlace sig2dot/Makefile --replace '$(DESTDIR)/usr' "$out"
+ substituteInPlace springgraph/Makefile --replace '$(DESTDIR)/usr' "$out"
'';
+ # Perl is required for it's pod2man.
+ # Python and Perl are required for patching the script interpreter paths.
nativeBuildInputs = [ autoconf automake makeWrapper ];
- buildInputs = [ gnupg perl python libmd ] ++
- (with perlPackages; [ GnuPGInterface TextTemplate MIMEtools NetIDNEncode MailTools ]);
-
- installFlags = [ "DESTDIR=\${out}" ];
+ buildInputs = [ python perl perlPackages.GnuPGInterface libmd gnupg1 ];
postInstall = ''
- install -m 755 \
- caff/caff caff/pgp-clean caff/pgp-fixkey \
- gpglist/gpglist \
- gpgparticipants/gpgparticipants \
- gpgparticipants/gpgparticipants-prefill \
- gpgsigs/gpgsigs \
- gpg-key2ps/gpg-key2ps \
- gpg-mailkeys/gpg-mailkeys \
- keyart/keyart \
- $out/bin
+ # Install all tools which aren't handled by 'make install'.
+ # TODO: Fix upstream...!
- install -m 644 \
- caff/caff.1 caff/pgp-clean.1 caff/pgp-fixkey.1 \
- gpglist/gpglist.1 \
- gpgparticipants/gpgparticipants-prefill.1 \
- gpgparticipants/gpgparticipants.1 \
- gpgsigs/gpgsigs.1 \
- gpg-key2ps/gpg-key2ps.1 \
- gpg-mailkeys/gpg-mailkeys.1 \
- $out/share/man/man1
+ # caff: CA - Fire and Forget signs and mails a key
+ install -D -m555 caff/caff $out/bin/caff;
+ install -D -m444 caff/caff.1 $out/share/man/man1/caff.1;
- wrapProgram $out/bin/caff --prefix PERL5LIB ":" "$PERL5LIB" \
- --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat ]}"
- wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" "${stdenv.lib.makeBinPath [ qprint coreutils gnused glibc gnupg1compat ]}"
+ # pgp-clean: removes all non-self signatures from key
+ install -D -m555 caff/pgp-clean $out/bin/pgp-clean;
+ install -D -m444 caff/pgp-clean.1 $out/share/man/man1/pgp-clean.1;
+
+ # pgp-fixkey: removes broken packets from keys
+ install -D -m555 caff/pgp-fixkey $out/bin/pgp-fixkey;
+ install -D -m444 caff/pgp-fixkey.1 $out/share/man/man1/pgp-fixkey.1;
+
+ # gpg-mailkeys: simply mail out a signed key to its owner
+ install -D -m555 gpg-mailkeys/gpg-mailkeys $out/bin/gpg-mailkeys;
+ install -D -m444 gpg-mailkeys/gpg-mailkeys.1 $out/share/man/man1/gpg-mailkeys.1;
+
+ # gpg-key2ps: generate PostScript file with fingerprint paper slips
+ install -D -m555 gpg-key2ps/gpg-key2ps $out/bin/gpg-key2ps;
+ install -D -m444 gpg-key2ps/gpg-key2ps.1 $out/share/man/man1/gpg-key2ps.1;
+
+ # gpgdir: recursive directory encryption tool
+ install -D -m555 gpgdir/gpgdir $out/bin/gpgdir;
+ install -D -m444 gpgdir/gpgdir.1 $out/share/man/man1/gpgdir.1;
+
+ # gpglist: show who signed which of your UIDs
+ install -D -m555 gpglist/gpglist $out/bin/gpglist;
+ install -D -m444 gpglist/gpglist.1 $out/share/man/man1/gpglist.1;
+
+ # gpgsigs: annotates list of GnuPG keys with already done signatures
+ # The manual page is not handled by 'make install'
+ install -D -m444 gpgsigs/gpgsigs.1 $out/share/man/man1/gpgsigs.1;
+
+ # gpgparticipants: create list of party participants for the organiser
+ install -D -m555 gpgparticipants/gpgparticipants $out/bin/gpgparticipants;
+ install -D -m444 gpgparticipants/gpgparticipants.1 $out/share/man/man1/gpgparticipants.1;
+ install -D -m555 gpgparticipants/gpgparticipants-prefill $out/bin/gpgparticipants-prefill;
+ install -D -m444 gpgparticipants/gpgparticipants-prefill.1 $out/share/man/man1/gpgparticipants-prefill.1;
+
+ # gpgwrap: a passphrase wrapper
+ install -D -m555 gpgwrap/bin/gpgwrap $out/bin/gpgwrap;
+ install -D -m444 gpgwrap/doc/gpgwrap.1 $out/share/man/man1/gpgwrap.1;
+
+ # keyanalyze: minimum signing distance (MSD) analysis on keyrings
+ # Only the binaries are handled by 'make install'
+ install -D -m444 keyanalyze/keyanalyze.1 $out/share/man/man1/keyanalyze.1;
+ install -D -m444 keyanalyze/pgpring/pgpring.1 $out/share/man/man1/pgpring.1;
+ install -D -m444 keyanalyze/process_keys.1 $out/share/man/man1/process_keys.1;
+
+ # keylookup: ncurses wrapper around gpg --search
+ # Handled by 'make install'
+
+ # sig2dot: converts a list of GnuPG signatures to a .dot file
+ # Handled by 'make install'
+
+ # springgraph: creates a graph from a .dot file
+ # Handled by 'make install'
+
+ # keyart: creates a random ASCII art of a PGP key file
+ install -D -m555 keyart/keyart $out/bin/keyart;
+ install -D -m444 keyart/doc/keyart.1 $out/share/man/man1/keyart.1;
+
+ # gpg-key2latex: generate LaTeX file with fingerprint paper slips
+ install -D -m555 gpg-key2latex/gpg-key2latex $out/bin/gpg-key2latex;
+ install -D -m444 gpg-key2latex/gpg-key2latex.1 $out/share/man/man1/gpg-key2latex.1;
'';
- doCheck = false; # no tests
+ postFixup = ''
+ # Add the runtime dependencies for all programs (but mainly for the Perl
+ # scripts)
- meta = {
- description = "A collection for all kinds of pgp related things, including signing scripts, party preparation scripts etc";
- homepage = http://pgp-tools.alioth.debian.org;
- platforms = gnupg.meta.platforms;
- license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ fpletz ];
+ wrapProgram $out/bin/caff --set PERL5LIB \
+ ${with perlPackages; stdenv.lib.makePerlPath ([
+ TextTemplate MIMEtools MailTools TimeDate NetIDNEncode ]
+ ++ GnuPGInterfaceRuntimeDependencies)} \
+ --prefix PATH ":" \
+ "${stdenv.lib.makeBinPath [ nettools gnupg1 ]}"
+
+ wrapProgram $out/bin/gpg-key2latex --set PERL5LIB \
+ ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \
+ --prefix PATH ":" \
+ "${stdenv.lib.makeBinPath [ gnupg1 libpaper ]}"
+
+ wrapProgram $out/bin/gpg-key2ps --prefix PATH ":" \
+ "${stdenv.lib.makeBinPath [ which gnupg1 libpaper ]}"
+
+ wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" \
+ "${stdenv.lib.makeBinPath [ gnupg1 qprint ]}"
+
+ wrapProgram $out/bin/gpgdir --set PERL5LIB \
+ ${with perlPackages; stdenv.lib.makePerlPath ([
+ TermReadKey ]
+ ++ GnuPGInterfaceRuntimeDependencies)} \
+ --prefix PATH ":" \
+ "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+ wrapProgram $out/bin/gpglist --prefix PATH ":" \
+ "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+ wrapProgram $out/bin/gpgparticipants --prefix PATH ":" \
+ "${stdenv.lib.makeBinPath [ getopt gnupg1 ]}"
+
+# wrapProgram $out/bin/gpgparticipants-prefill
+
+ wrapProgram $out/bin/gpgsigs --set PERL5LIB \
+ ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \
+ --prefix PATH ":" \
+ "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+ wrapProgram $out/bin/gpgwrap --prefix PATH ":" \
+ "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+# wrapProgram $out/bin/keyanalyze --set PERL5LIB \
+
+ wrapProgram $out/bin/keyart --prefix PATH ":" \
+ "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+ wrapProgram $out/bin/keylookup --prefix PATH ":" \
+ "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+ wrapProgram $out/bin/pgp-clean --set PERL5LIB \
+ ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \
+ --prefix PATH ":" \
+ "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+ wrapProgram $out/bin/pgp-fixkey --set PERL5LIB \
+ ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \
+ --prefix PATH ":" \
+ "${stdenv.lib.makeBinPath [ gnupg1 ]}"
+
+# wrapProgram $out/bin/pgpring
+
+# wrapProgram $out/bin/process_keys
+
+ # Upstream-Bug: Seems like sig2dot doesn't work with 2.1 (modern) anymore,
+ # please use 2.0 (stable) instead.
+# wrapProgram $out/bin/sig2dot
+
+ wrapProgram $out/bin/springgraph --set PERL5LIB \
+ ${with perlPackages; stdenv.lib.makePerlPath [ GD ]}
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://pgp-tools.alioth.debian.org/";
+ description = "A collection of several projects relating to OpenPGP";
+ longDescription = ''
+ This is a collection of several projects relating to OpenPGP.
+
+ * caff: CA - Fire and Forget signs and mails a key
+ * pgp-clean: removes all non-self signatures from key
+ * pgp-fixkey: removes broken packets from keys
+ * gpg-mailkeys: simply mail out a signed key to its owner
+ * gpg-key2ps: generate PostScript file with fingerprint paper slips
+ * gpgdir: recursive directory encryption tool
+ * gpglist: show who signed which of your UIDs
+ * gpgsigs: annotates list of GnuPG keys with already done signatures
+ * gpgparticipants: create list of party participants for the organiser
+ * gpgwrap: a passphrase wrapper
+ * keyanalyze: minimum signing distance (MSD) analysis on keyrings
+ * keylookup: ncurses wrapper around gpg --search
+ * sig2dot: converts a list of GnuPG signatures to a .dot file
+ * springgraph: creates a graph from a .dot file
+ * keyart: creates a random ASCII art of a PGP key file
+ * gpg-key2latex: generate LaTeX file with fingerprint paper slips
+ '';
+ license = with licenses; [ bsd2 bsd3 gpl2 gpl2Plus gpl3Plus ];
+ maintainers = with maintainers; [ fpletz primeos ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
deleted file mode 100644
index 80a92b4a932..00000000000
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ stdenv, fetchurl, makeDesktopItem
-, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2
-, atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib
-, gstreamer, gst-plugins-base, gst-plugins-good, gst-ffmpeg, gmp, ffmpeg
-, libpulseaudio
-, mediaSupport ? false
-}:
-
-let
- libPath = stdenv.lib.makeLibraryPath ([
- stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype
- fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt
- ] ++ stdenv.lib.optionals mediaSupport [
- gstreamer gst-plugins-base gmp ffmpeg
- libpulseaudio
- ]);
-
- # Ignored if !mediaSupport
- gstPlugins = [ gstreamer gst-plugins-base gst-plugins-good gst-ffmpeg ];
-
- gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x:
- "${x}/lib/gstreamer-0.10") gstPlugins;
-in
-
-stdenv.mkDerivation rec {
- name = "tor-browser-${version}";
- version = "6.5.1";
-
- src = fetchurl {
- url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz";
- sha256 = if stdenv.is64bit then
- "1p2bgavvyzahqpjg9vp14c0s50rmha3v1hs1c8zvz6fj8fgrhn0i" else
- "1zfghr01bhpn39wqaw7hyx7yap7xyla4m3mrgz2vi9a5qsyxmbcr";
- };
-
- preferLocalBuild = true;
-
- desktopItem = makeDesktopItem {
- name = "torbrowser";
- exec = "tor-browser";
- icon = "torbrowser";
- desktopName = "Tor Browser";
- genericName = "Tor Browser";
- comment = meta.description;
- categories = "Network;WebBrowser;Security;";
- };
-
- patchPhase = ''
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/firefox
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor
-
- sed -e "s,./TorBrowser,$out/share/tor-browser/Browser/TorBrowser,g" -i Browser/TorBrowser/Data/Tor/torrc-defaults
- '';
-
- doCheck = true;
- checkPhase = ''
- echo "Checking firefox..."
- LD_LIBRARY_PATH=${libPath} Browser/firefox --help 1> /dev/null
- echo "Checking tor..."
- LD_LIBRARY_PATH=${libPath}:Browser/TorBrowser/Tor Browser/TorBrowser/Tor/tor --help 1> /dev/null
- '';
-
- installPhase = ''
- mkdir -p $out/share/tor-browser
- mkdir -p $out/bin
- cp -R * $out/share/tor-browser
-
- cat > "$out/bin/tor-browser" << EOF
- #! ${stdenv.shell}
- unset SESSION_MANAGER
- export HOME="\$HOME/.torbrowser4"
- if [ ! -d \$HOME ]; then
- mkdir -p \$HOME && cp -R $out/share/tor-browser/Browser/TorBrowser/Data \$HOME/ && chmod -R +w \$HOME
- echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \
- ~/Data/Browser/profile.default/preferences/extension-overrides.js
- echo "pref(\"extensions.torlauncher.torrc-defaults_path\", \"\$HOME/Data/Tor/torrc-defaults\");" >> \
- ~/Data/Browser/profile.default/preferences/extension-overrides.js
- echo "pref(\"extensions.torlauncher.tor_path\", \"$out/share/tor-browser/Browser/TorBrowser/Tor/tor\");" >> \
- ~/Data/Browser/profile.default/preferences/extension-overrides.js
- fi
- export FONTCONFIG_PATH=\$HOME/Data/fontconfig
- export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
- ${stdenv.lib.optionalString mediaSupport ''
- export GST_PLUGIN_SYSTEM_PATH=${gstPluginsPath}
- ''}
- exec $out/share/tor-browser/Browser/firefox --class "Tor Browser" -no-remote -profile ~/Data/Browser/profile.default "\$@"
- EOF
- chmod +x $out/bin/tor-browser
-
- mkdir -p $out/share/applications
- cp $desktopItem/share/applications"/"* $out/share/applications
-
- mkdir -p $out/share/pixmaps
- cp Browser/browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png
- '';
-
- meta = with stdenv.lib; {
- description = "Tor Browser Bundle";
- homepage = https://www.torproject.org/;
- platforms = platforms.linux;
- maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ];
- };
-}
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
new file mode 100644
index 00000000000..55defd68090
--- /dev/null
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, pythonPackages, fetchurl, callPackage, nix, }:
+
+let
+ external = callPackage ./requirements.nix {
+ inherit pythonPackages;
+ };
+in pythonPackages.buildPythonApplication rec{
+ name = "${pname}-${version}";
+ pname = "vulnix";
+ version = "1.2.2";
+
+ src = pythonPackages.fetchPypi {
+ inherit pname version;
+ sha256 = "1ia9plziwach0bxnlcd33q30kcsf8sv0nf2jc78gsmrqnxjabr12";
+ };
+
+ buildInputs = with pythonPackages; [ flake8 pytest pytestcov ];
+
+ postPatch = ''
+ sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py
+ '';
+
+ propagatedBuildInputs = [
+ nix
+ ] ++ (with pythonPackages; [
+ click
+ colorama
+ lxml
+ pyyaml
+ requests2
+ external.zodb
+ ]);
+
+ checkPhase = "py.test";
+
+ meta = with stdenv.lib; {
+ description = "NixOS vulnerability scanner";
+ homepage = https://github.com/flyingcircusio/vulnix;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ plumps ];
+ };
+}
diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix
new file mode 100644
index 00000000000..952dc1ce652
--- /dev/null
+++ b/pkgs/tools/security/vulnix/requirements.nix
@@ -0,0 +1,131 @@
+{ pythonPackages, fetchurl, stdenv }:
+
+rec {
+ BTrees = pythonPackages.buildPythonPackage {
+ name = "BTrees-4.3.1";
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/24/76/cd6f225f2180c22af5cdb6656f51aec5fca45e45bdc4fa75c0a32f161a61/BTrees-4.3.1.tar.gz";
+ sha256 = "2565b7d35260dfc6b1e2934470fd0a2f9326c58c535a2b4cb396289d1c195a95";
+ };
+ propagatedBuildInputs = [
+ persistent
+ transaction
+ zope_interface
+ ] ++ (with pythonPackages; [ coverage ]);
+
+ meta = with stdenv.lib; {
+ homepage = "";
+ license = licenses.zpt21;
+ description = "Scalable persistent object containers";
+ };
+ };
+
+ ZConfig = pythonPackages.buildPythonPackage {
+ name = "ZConfig-3.1.0";
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/52/b3/a96d62711a26d8cfbe546519975dc9ed54d2eb50b3238d2e6de045764796/ZConfig-3.1.0.tar.gz";
+ sha256 = "c21fa3a073a56925a8098036d46717392994a92cffea1b3cda3176b70c0a842e";
+ };
+ meta = with stdenv.lib; {
+ homepage = "";
+ license = licenses.zpt21;
+ description = "Structured Configuration Library";
+ };
+ };
+
+ zodb = pythonPackages.buildPythonPackage {
+ name = "ZODB-5.2.0";
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/1e/47/2f17075ca94a4a537ebd8e195c458456ef49aa67355ec805e478b8ad1959/ZODB-5.2.0.tar.gz";
+ sha256 = "11l495lyym2fpvalj18yvcqwnsp8gyp18sgv5v575k4s2035lz0x";
+ };
+ doCheck = false;
+ propagatedBuildInputs = [
+ BTrees
+ persistent
+ transaction
+ ZConfig
+ zc.lockfile
+ zodbpickle
+ ] ++ (with pythonPackages; [ six wheel zope_interface ]);
+ meta = with stdenv.lib; {
+ homepage = "";
+ license = licenses.zpt21;
+ description = "Zope Object Database: object database and persistence";
+ };
+ };
+
+ persistent = pythonPackages.buildPythonPackage {
+ name = "persistent-4.2.2";
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/3d/71/3302512282b606ec4d054e09be24c065915518903b29380b6573bff79c24/persistent-4.2.2.tar.gz";
+ sha256 = "52ececc6dbba5ef572d3435189318b4dff07675bafa9620e32f785e147c6563c";
+ };
+ propagatedBuildInputs = [
+ zope_interface
+ ] ++ (with pythonPackages; [ six wheel ]);
+ meta = with stdenv.lib; {
+ homepage = "";
+ license = licenses.zpt21;
+ description = "Translucent persistent objects";
+ };
+ };
+
+ transaction = pythonPackages.buildPythonPackage {
+ name = "transaction-2.0.3";
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz";
+ sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f";
+ };
+ propagatedBuildInputs = [
+ zope_interface
+ ] ++ (with pythonPackages; [ six wheel ]);
+ meta = with stdenv.lib; {
+ homepage = "";
+ license = licenses.zpt21;
+ description = "Transaction management for Python";
+ };
+ };
+
+ zc.lockfile = pythonPackages.buildPythonPackage {
+ name = "zc.lockfile-1.2.1";
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/bd/84/0299bbabbc9d3f84f718ba1039cc068030d3ad723c08f82a64337edf901e/zc.lockfile-1.2.1.tar.gz";
+ sha256 = "11db91ada7f22fe8aae268d4bfdeae012c4fe655f66bbb315b00822ec00d043e";
+ };
+ meta = with stdenv.lib; {
+ homepage = "";
+ license = licenses.zpt21;
+ description = "Basic inter-process locks";
+ };
+ };
+
+ zodbpickle = pythonPackages.buildPythonPackage {
+ name = "zodbpickle-0.6.0";
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/7a/fc/f6f437a5222b330735eaf8f1e67a6845bd1b600e9a9455e552d3c13c4902/zodbpickle-0.6.0.tar.gz";
+ sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665";
+ };
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = "";
+ license = licenses.zpt21;
+ description = "Fork of Python 3 pickle module.";
+ };
+ };
+
+ zope_interface = pythonPackages.buildPythonPackage {
+ name = "zope.interface-4.3.3";
+ src = fetchurl {
+ url = "https://pypi.python.org/packages/44/af/cea1e18bc0d3be0e0824762d3236f0e61088eeed75287e7b854d65ec9916/zope.interface-4.3.3.tar.gz";
+ sha256 = "8780ef68ca8c3fe1abb30c058a59015129d6e04a6b02c2e56b9c7de6078dfa88";
+ };
+ propagatedBuildInputs = [ ];
+ meta = with stdenv.lib; {
+ homepage = "";
+ license = licenses.zpt21;
+ description = "Interfaces for Python";
+ };
+ };
+}
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index 02c76798fd7..763d4406668 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -2,7 +2,7 @@
let
- version = "0.0.2.1";
+ version = "0.1.0.0";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6-rc";
rev = "refs/tags/v${version}";
- sha256 = "1gh72q1h1ds53yrzp481nvzaxkhhpm2kv59pfx4x564gxwdvq3a6";
+ sha256 = "1izjss1vfmkrkbgpzxlh0krkd2zin9d77ykr6i08rhixz7c2am0r";
};
dontDisableStatic = true;
@@ -19,6 +19,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = [
+ "--enable-absolute-paths"
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include"
"--with-include=${execline}/include"
@@ -31,7 +32,7 @@ in stdenv.mkDerivation rec {
"--with-dynlib=${s6}/lib"
]
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
- ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
+ ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
meta = {
homepage = http://skarnet.org/software/s6-rc/;
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix
index 84e79442ffa..67acb8ac3dc 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/tools/system/s6/default.nix
@@ -2,7 +2,7 @@
let
- version = "2.2.4.3";
+ version = "2.4.0.0";
in stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.skarnet.org/s6";
rev = "refs/tags/v${version}";
- sha256 = "1jlavi3q6wmcxdcwsy42qcgfkl0ag6hwcgmi4g67dvqs9nqjq2a3";
+ sha256 = "0yf9apl05g1gxqwh01yd1iyg0xm50ywnlwp4szd08sg0srmvys16";
};
dontDisableStatic = true;
@@ -19,6 +19,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = [
+ "--enable-absolute-paths"
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include"
"--with-include=${execline}/include"
@@ -28,12 +29,7 @@ in stdenv.mkDerivation rec {
"--with-dynlib=${execline}/lib"
]
++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
- ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
-
- preBuild = ''
- substituteInPlace "src/daemontools-extras/s6-log.c" \
- --replace '"execlineb"' '"${execline}/bin/execlineb"'
- '';
+ ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
meta = {
homepage = http://www.skarnet.org/software/s6/;
diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix
index e0f30b2db73..c1c4527d0a0 100644
--- a/pkgs/tools/system/sg3_utils/default.nix
+++ b/pkgs/tools/system/sg3_utils/default.nix
@@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
homepage = http://sg.danny.cz/sg/;
description = "Utilities that send SCSI commands to devices";
platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix
index b9db2eba5cd..fb0309e7532 100644
--- a/pkgs/tools/text/catdoc/default.nix
+++ b/pkgs/tools/text/catdoc/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
description = "MS-Word/Excel/PowerPoint to text converter";
platforms = platforms.all;
license = licenses.gpl2;
- maintainers = with maintainers; [ urkud ndowens ];
+ maintainers = with maintainers; [ ndowens ];
};
}
diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix
index 2fafec02d81..da246832b93 100644
--- a/pkgs/tools/text/ebook-tools/default.nix
+++ b/pkgs/tools/text/ebook-tools/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://ebook-tools.sourceforge.net";
description = "Tools and library for dealing with various ebook file formats";
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index a35e09cfcda..4303fe82a45 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -30,7 +30,7 @@ let
homepage = http://kdiff3.sourceforge.net/;
license = licenses.gpl2Plus;
description = "Compares and merges 2 or 3 files or directories";
- maintainers = with maintainers; [ viric urkud peterhoeg ];
+ maintainers = with maintainers; [ viric peterhoeg ];
platforms = with platforms; linux;
};
};
diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix
index 85f0f24b387..42f80f29073 100644
--- a/pkgs/tools/text/odt2txt/default.nix
+++ b/pkgs/tools/text/odt2txt/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = http://stosberg.net/odt2txt;
platforms = stdenv.lib.platforms.all;
lincense = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.urkud ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 382219a0a3a..2c34a9aff32 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig
+{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig
, harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem
, fontconfig, lua, libiconv
}:
@@ -26,7 +26,15 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [pkgconfig makeWrapper];
- buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ];
+ buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ]
+ ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit
+ ;
+
+ preConfigure = optionalString stdenv.isDarwin ''
+ sed -i -e 's|@import AppKit;|#import |' src/macfonts.m
+ '';
+
+ NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework AppKit";
LUA_PATH = luaPath;
LUA_CPATH = luaCPath;
@@ -49,8 +57,8 @@ stdenv.mkDerivation rec {
technologies and borrowing some ideas from graphical systems
such as InDesign.
'';
- homepage = "http://www.sile-typesetter.org";
- platforms = stdenv.lib.platforms.unix;
- license = stdenv.lib.licenses.mit;
+ homepage = http://www.sile-typesetter.org;
+ platforms = platforms.unix;
+ license = licenses.mit;
};
}
diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index abfe951a33f..c783316c6d5 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -111,6 +111,7 @@ in buildEnv {
-e "s,\$SELFAUTODIR,$out/share,g" \
-e "s,\$SELFAUTOPARENT,$out/share,g" \
-e "s,\$SELFAUTOGRANDPARENT,$out/share,g" \
+ -e "/^mpost,/d" `# CVE-2016-10243` \
"$cnfOrig" > ./texmf.cnf
patchCnfLua "./texmfcnf.lua"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f790bbf29ed..324e2d35cfd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -61,6 +61,7 @@ doNotDisplayTwice rec {
gupnptools = gupnp-tools; # added 2015-12-19
gnustep-make = gnustep.make; # added 2016-7-6
htmlTidy = html-tidy; # added 2014-12-06
+ iana_etc = iana-etc; # added 2017-03-08
inherit (haskell.compiler) jhc uhc; # 2015-05-15
inotifyTools = inotify-tools;
joseki = apache-jena-fuseki; # added 2016-02-28
@@ -95,6 +96,7 @@ doNotDisplayTwice rec {
nfsUtils = nfs-utils; # added 2014-12-06
opencl-icd = ocl-icd; # added 2017-01-20
owncloudclient = owncloud-client; # added 2016-08
+ pgp-tools = signing-party; # added 2017-03-26
pidgin-with-plugins = pidgin; # added 2016-06
pidginlatexSF = pidginlatex; # added 2014-11-02
poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6237b07f98a..51bf8bb4dba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -170,6 +170,8 @@ with pkgs;
inherit curl stdenv;
};
+ fetchRepoProject = callPackage ../build-support/fetchrepoproject { };
+
# fetchurlBoot is used for curl and its dependencies in order to
# prevent a cyclic dependency (curl depends on curl.tar.bz2,
# curl.tar.bz2 depends on fetchurl, fetchurl depends on curl). It
@@ -271,14 +273,16 @@ with pkgs;
kdeDerivation = import ../build-support/kde/derivation.nix { inherit stdenv lib; };
- kdeWrapper = import ../build-support/kde/wrapper.nix {
- inherit stdenv lib makeWrapper buildEnv;
+ kdeWrapper = callPackage ../build-support/kde/wrapper.nix {
+ inherit (gnome3) dconf;
};
nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; };
pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
+ setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { };
+
singularity-tools = callPackage ../build-support/singularity-tools { };
srcOnly = args: callPackage ../build-support/src-only args;
@@ -321,7 +325,7 @@ with pkgs;
findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh;
wrapGAppsHook = makeSetupHook {
- deps = [ makeWrapper ];
+ deps = [ gnome3.dconf.lib gnome3.gtk makeWrapper ];
} ../build-support/setup-hooks/wrap-gapps-hook.sh;
separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;
@@ -430,7 +434,7 @@ with pkgs;
withGui = false;
};
- apitrace = libsForQt55.callPackage ../applications/graphics/apitrace {};
+ apitrace = libsForQt56.callPackage ../applications/graphics/apitrace {};
argus = callPackage ../tools/networking/argus {};
@@ -736,6 +740,8 @@ with pkgs;
catclock = callPackage ../applications/misc/catclock { };
+ cde = callPackage ../tools/package-management/cde { };
+
cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { };
cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { };
@@ -1030,6 +1036,8 @@ with pkgs;
mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
+ msr-tools = callPackage ../os-specific/linux/msr-tools { };
+
mstflint = callPackage ../tools/misc/mstflint { };
mcelog = callPackage ../os-specific/linux/mcelog {
@@ -1258,37 +1266,25 @@ with pkgs;
m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };
ibus = callPackage ../tools/inputmethods/ibus {
- inherit (python3Packages) pygobject3;
inherit (gnome3) dconf glib;
};
ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
ibus-engines = recurseIntoAttrs {
+ anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { };
- anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy {
- inherit (python3Packages) pygobject3;
- };
+ hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { };
- hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul {
- inherit (python3Packages) pygobject3;
- };
+ libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { };
- libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin {
- inherit (python3Packages) pygobject3;
- };
-
- m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n {
- inherit (python3Packages) pygobject3;
- };
+ m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
- inherit (pythonPackages) gyp;
protobuf = protobuf.override { stdenv = clangStdenv; };
};
table = callPackage ../tools/inputmethods/ibus-engines/ibus-table {
- inherit (python3Packages) pygobject3;
inherit (gnome3) dconf;
};
@@ -1344,7 +1340,7 @@ with pkgs;
convoy = callPackage ../tools/filesystems/convoy { };
- cool-retro-term = libsForQt55.callPackage ../applications/misc/cool-retro-term { };
+ cool-retro-term = libsForQt56.callPackage ../applications/misc/cool-retro-term { };
coreutils = callPackage ../tools/misc/coreutils {
aclSupport = stdenv.isLinux;
@@ -1818,6 +1814,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
};
+ fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix {};
+
fontmatrix = callPackage ../applications/graphics/fontmatrix {};
foremost = callPackage ../tools/system/foremost { };
@@ -1961,6 +1959,7 @@ with pkgs;
gitlab = callPackage ../applications/version-management/gitlab { };
gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { };
+ gitlab-runner_1_11 = callPackage ../development/tools/continuous-integration/gitlab-runner/v1.nix { };
gitlab-shell = callPackage ../applications/version-management/gitlab-shell { };
@@ -2426,6 +2425,8 @@ with pkgs;
jaaa = callPackage ../applications/audio/jaaa { };
+ jackett = callPackage ../servers/jackett { };
+
jade = callPackage ../tools/text/sgml/jade { };
jd-gui = callPackage_i686 ../tools/security/jd-gui { };
@@ -3345,8 +3346,6 @@ with pkgs;
buildTools = drv.buildTools or [] ++ [haskellPackages.hsb2hs];
});
- panomatic = callPackage ../tools/graphics/panomatic { };
-
pamtester = callPackage ../tools/security/pamtester { };
paper-gtk-theme = callPackage ../misc/themes/paper { };
@@ -3658,6 +3657,8 @@ with pkgs;
radamsa = callPackage ../tools/security/radamsa { };
+ radarr = callPackage ../servers/radarr { };
+
radvd = callPackage ../tools/networking/radvd { };
rambox = callPackage ../applications/networking/instant-messengers/rambox { };
@@ -3891,13 +3892,15 @@ with pkgs;
shellinabox = callPackage ../servers/shellinabox { };
+ shrikhand = callPackage ../data/fonts/shrikhand { };
+
sic = callPackage ../applications/networking/irc/sic { };
siege = callPackage ../tools/networking/siege {};
- sigil = libsForQt55.callPackage ../applications/editors/sigil { };
+ sigil = libsForQt56.callPackage ../applications/editors/sigil { };
- # aka., gpg-tools
+ # aka., pgp-tools
signing-party = callPackage ../tools/security/signing-party { };
silc_client = callPackage ../applications/networking/instant-messengers/silc-client { };
@@ -4078,8 +4081,6 @@ with pkgs;
pythonPackages = python3Packages;
};
- sitecopy = callPackage ../tools/networking/sitecopy { };
-
stricat = callPackage ../tools/security/stricat { };
staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; };
@@ -4179,7 +4180,7 @@ with pkgs;
tor-arm = callPackage ../tools/security/tor/tor-arm.nix { };
- torbrowser = callPackage ../tools/security/tor/torbrowser.nix { };
+ torbrowser = callPackage ../applications/networking/browsers/torbrowser { };
touchegg = callPackage ../tools/inputmethods/touchegg { };
@@ -4418,8 +4419,6 @@ with pkgs;
time = callPackage ../tools/misc/time { };
- tkabber = callPackage ../applications/networking/instant-messengers/tkabber { };
-
qfsm = callPackage ../applications/science/electronics/qfsm { };
tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { };
@@ -5325,7 +5324,7 @@ with pkgs;
jre = jre8;
jre_headless = jre8_headless;
- openshot-qt = callPackage ../applications/video/openshot-qt { };
+ openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { };
oraclejdk = pkgs.jdkdistro true false;
@@ -5537,7 +5536,9 @@ with pkgs;
};
rust = rustStable;
- rustStable = callPackage ../development/compilers/rust {};
+ rustStable = callPackage ../development/compilers/rust {
+ inherit (llvmPackages_39) llvm;
+ };
rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {}));
rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix {
rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta);
@@ -5615,6 +5616,8 @@ with pkgs;
metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { };
+ swift = callPackage ../development/compilers/swift { };
+
swiProlog = callPackage ../development/compilers/swi-prolog { };
tbb = callPackage ../development/libraries/tbb { };
@@ -6102,7 +6105,7 @@ with pkgs;
ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
- supercollider = callPackage ../development/interpreters/supercollider {
+ supercollider = libsForQt56.callPackage ../development/interpreters/supercollider {
fftw = fftwSinglePrec;
};
@@ -6509,9 +6512,7 @@ with pkgs;
ocaml = ocaml_4_02;
};
- framac = callPackage ../development/tools/analysis/frama-c {
- coq = coq_8_4;
- };
+ framac = callPackage ../development/tools/analysis/frama-c { };
frame = callPackage ../development/libraries/frame { };
@@ -6945,9 +6946,7 @@ with pkgs;
valkyrie = callPackage ../development/tools/analysis/valkyrie { };
- qcachegrind = libsForQt57.callPackage ../development/tools/analysis/qcachegrind {
- qt = qt57;
- };
+ qcachegrind = libsForQt56.callPackage ../development/tools/analysis/qcachegrind {};
verasco = ocaml-ng.ocamlPackages_4_02.verasco.override {
coq = coq_8_4;
@@ -6957,6 +6956,10 @@ with pkgs;
vultr = callPackage ../development/tools/vultr { };
+ vulnix = callPackage ../tools/security/vulnix {
+ pythonPackages = python3Packages;
+ };
+
xc3sprog = callPackage ../development/tools/misc/xc3sprog { };
xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix {
@@ -6978,7 +6981,7 @@ with pkgs;
ycmd = callPackage ../development/tools/misc/ycmd {
inherit (darwin.apple_sdk.frameworks) Cocoa;
- llvmPackages = llvmPackages_39;
+ llvmPackages = llvmPackages_4;
python = python2;
};
@@ -7289,6 +7292,8 @@ with pkgs;
dlib = callPackage ../development/libraries/dlib { };
+ docopt_cpp = callPackage ../development/libraries/docopt_cpp { };
+
dotconf = callPackage ../development/libraries/dotconf { };
dssi = callPackage ../development/libraries/dssi {};
@@ -8074,6 +8079,8 @@ with pkgs;
libbdplus = callPackage ../development/libraries/libbdplus { };
+ libblocksruntime = callPackage ../development/libraries/libblocksruntime { };
+
libbluray = callPackage ../development/libraries/libbluray { };
libbs2b = callPackage ../development/libraries/audio/libbs2b { };
@@ -9314,6 +9321,8 @@ with pkgs;
pocketsphinx = callPackage ../development/libraries/pocketsphinx { };
+ poco = callPackage ../development/libraries/poco { };
+
podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; };
poker-eval = callPackage ../development/libraries/poker-eval { };
@@ -9421,20 +9430,6 @@ with pkgs;
developerBuild = true;
});
- qt55 = recurseIntoAttrs (import ../development/libraries/qt-5/5.5 {
- inherit newScope;
- inherit stdenv fetchurl makeSetupHook makeWrapper;
- bison = bison2; # error: too few arguments to function 'int yylex(...
- cups = if stdenv.isLinux then cups else null;
- harfbuzz = harfbuzz-icu;
- mesa = mesa_noglu;
- inherit perl;
- inherit (gnome2) libgnomeui GConf gnome_vfs;
- inherit (gst_all_1) gstreamer gst-plugins-base;
- });
-
- libsForQt55 = recurseIntoAttrs (lib.makeScope qt55.newScope mkLibsForQt5);
-
qt56 = recurseIntoAttrs (import ../development/libraries/qt-5/5.6 {
inherit newScope;
inherit stdenv fetchurl makeSetupHook makeWrapper;
@@ -9448,19 +9443,6 @@ with pkgs;
libsForQt56 = recurseIntoAttrs (lib.makeScope qt56.newScope mkLibsForQt5);
- qt57 = recurseIntoAttrs (import ../development/libraries/qt-5/5.7 {
- inherit newScope;
- inherit stdenv fetchurl makeSetupHook makeWrapper;
- bison = bison2; # error: too few arguments to function 'int yylex(...
- cups = if stdenv.isLinux then cups else null;
- harfbuzz = harfbuzz-icu;
- mesa = mesa_noglu;
- inherit perl;
- inherit (gst_all_1) gstreamer gst-plugins-base;
- });
-
- libsForQt57 = recurseIntoAttrs (lib.makeScope qt57.newScope mkLibsForQt5);
-
qt58 = recurseIntoAttrs (import ../development/libraries/qt-5/5.8 {
inherit newScope;
inherit stdenv fetchurl makeSetupHook makeWrapper;
@@ -9470,6 +9452,7 @@ with pkgs;
mesa = mesa_noglu;
inherit perl;
inherit (gst_all_1) gstreamer gst-plugins-base;
+ inherit (gnome3) gtk3 dconf;
});
libsForQt58 = recurseIntoAttrs (lib.makeScope qt58.newScope mkLibsForQt5);
@@ -9528,6 +9511,8 @@ with pkgs;
libktorrent = callPackage ../development/libraries/libktorrent { };
+ libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix {};
+
mlt = callPackage ../development/libraries/mlt/qt-5.nix {
ffmpeg = ffmpeg_2;
};
@@ -9884,8 +9869,6 @@ with pkgs;
tclap = callPackage ../development/libraries/tclap {};
- tclgpg = callPackage ../development/libraries/tclgpg { };
-
tcllib = callPackage ../development/libraries/tcllib { };
tcltls = callPackage ../development/libraries/tcltls { };
@@ -10315,8 +10298,6 @@ with pkgs;
javaCup = callPackage ../development/libraries/java/cup { };
- jclasslib = callPackage ../development/tools/java/jclasslib { };
-
jdom = callPackage ../development/libraries/java/jdom { };
jflex = callPackage ../development/libraries/java/jflex { };
@@ -10390,6 +10371,15 @@ with pkgs;
texLive = null;
};
+ # QuickLisp minimal version
+ asdf_2_26 = callPackage ../development/lisp-modules/asdf/2.26.nix {
+ texLive = null;
+ };
+ # Currently most popular
+ asdf_3_1 = callPackage ../development/lisp-modules/asdf/3.1.nix {
+ texLive = null;
+ };
+
clwrapperFunction = callPackage ../development/lisp-modules/clwrapper;
wrapLisp = lisp: clwrapperFunction { inherit lisp; };
@@ -10402,6 +10392,14 @@ with pkgs;
lispPackagesSBCL = lispPackagesFor (wrapLisp sbcl);
lispPackages = recurseIntoAttrs lispPackagesSBCL;
+ quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules/quicklisp-to-nix.nix {
+ inherit clwrapper;
+ };
+ quicklispPackagesClisp = quicklispPackagesFor (wrapLisp clisp);
+ quicklispPackagesSBCL = quicklispPackagesFor (wrapLisp sbcl);
+ quicklispPackages = quicklispPackagesSBCL;
+ quicklispPackages_asdf_3_1 = quicklispPackagesFor
+ ((wrapLisp sbcl).override { asdf = asdf_3_1; });
### DEVELOPMENT / PERL MODULES
@@ -11231,7 +11229,6 @@ with pkgs;
crda = callPackage ../os-specific/linux/crda { };
darwin = let
- cmdline = callPackage ../os-specific/darwin/command-line-tools {};
apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };
in apple-source-releases // rec {
cctools_cross = callPackage (forcedNativePackages.callPackage ../os-specific/darwin/cctools/port.nix {}).cross {
@@ -11264,7 +11261,6 @@ with pkgs;
xcode = callPackage ../os-specific/darwin/xcode {};
- osx_sdk = callPackage ../os-specific/darwin/osx-sdk {};
osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk {};
security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool {
@@ -11273,9 +11269,6 @@ with pkgs;
binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; };
- cmdline_sdk = cmdline.sdk;
- cmdline_tools = cmdline.tools;
-
apple_sdk = callPackage ../os-specific/darwin/apple-sdk {};
libobjc = apple-source-releases.objc4;
@@ -11538,29 +11531,6 @@ with pkgs;
];
};
- linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix {
- kernelPatches = with kernelPatches;
- [ bridge_stp_helper
- ]
- ++ lib.optionals ((platform.kernelArch or null) == "mips")
- [ kernelPatches.mips_fpureg_emu
- kernelPatches.mips_fpu_sigill
- kernelPatches.mips_ext3_n32
- ];
- };
-
- linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix {
- kernelPatches =
- [ kernelPatches.bridge_stp_helper
- kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
- ]
- ++ lib.optionals ((platform.kernelArch or null) == "mips")
- [ kernelPatches.mips_fpureg_emu
- kernelPatches.mips_fpu_sigill
- kernelPatches.mips_ext3_n32
- ];
- };
-
linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
@@ -11788,8 +11758,6 @@ with pkgs;
linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp;
linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi;
linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10);
- linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12);
- linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1);
linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10);
@@ -12610,7 +12578,7 @@ with pkgs;
inherit (callPackages ../data/fonts/gdouros { })
symbola aegyptus akkadian anatolian maya unidings musica analecta;
- iana_etc = callPackage ../data/misc/iana-etc { };
+ iana-etc = callPackage ../data/misc/iana-etc { };
poppler_data = callPackage ../data/misc/poppler-data { };
@@ -13134,7 +13102,7 @@ with pkgs;
cutecom = callPackage ../tools/misc/cutecom { };
cutegram =
- let callpkg = libsForQt55.callPackage;
+ let callpkg = libsForQt56.callPackage;
in callpkg ../applications/networking/instant-messengers/telegram/cutegram rec {
libqtelegram-aseman-edition = callpkg ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { };
telegram-qml = callpkg ../applications/networking/instant-messengers/telegram/telegram-qml {
@@ -13548,7 +13516,7 @@ with pkgs;
fbreader = callPackage ../applications/misc/fbreader { };
- fdr = qt57.callPackage ../applications/science/programming/fdr { };
+ fdr = libsForQt56.callPackage ../applications/science/programming/fdr { };
fehlstart = callPackage ../applications/misc/fehlstart { };
@@ -13613,7 +13581,7 @@ with pkgs;
gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { };
- goldendict = libsForQt55.callPackage ../applications/misc/goldendict { };
+ goldendict = libsForQt56.callPackage ../applications/misc/goldendict { };
inherit (ocamlPackages) google-drive-ocamlfuse;
@@ -13774,10 +13742,6 @@ with pkgs;
ffmpeg = ffmpeg_1;
};
- freicoin = callPackage ../applications/misc/freicoin {
- boost = boost155;
- };
-
fte = callPackage ../applications/editors/fte { };
game-music-emu = callPackage ../applications/audio/game-music-emu { };
@@ -14449,7 +14413,7 @@ with pkgs;
lrzsz = callPackage ../tools/misc/lrzsz { };
- luminanceHDR = libsForQt55.callPackage ../applications/graphics/luminance-hdr { };
+ luminanceHDR = libsForQt56.callPackage ../applications/graphics/luminance-hdr { };
lxdvdrip = callPackage ../applications/video/lxdvdrip { };
@@ -14474,7 +14438,7 @@ with pkgs;
lynx = callPackage ../applications/networking/browsers/lynx { };
- lyx = libsForQt57.callPackage ../applications/misc/lyx { };
+ lyx = libsForQt56.callPackage ../applications/misc/lyx { };
mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {};
@@ -14694,7 +14658,7 @@ with pkgs;
avahi = avahi.override {
withLibdnssdCompat = true;
};
- qt5 = qt55; # Mumble doesn't work with newer Qt versions.
+ qt5 = qt56; # Mumble doesn't work with Qt > 5.5
jackSupport = config.mumble.jackSupport or false;
speechdSupport = config.mumble.speechdSupport or false;
pulseSupport = config.pulseaudio or false;
@@ -14711,7 +14675,7 @@ with pkgs;
if stdenv.isDarwin then
callPackage ../applications/audio/musescore/darwin.nix { }
else
- libsForQt55.callPackage ../applications/audio/musescore { };
+ libsForQt56.callPackage ../applications/audio/musescore { };
mutt = callPackage ../applications/networking/mailreaders/mutt { };
mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt {
@@ -14765,7 +14729,7 @@ with pkgs;
smplayer = libsForQt5.callPackage ../applications/video/smplayer { };
- smtube = libsForQt55.callPackage ../applications/video/smtube {};
+ smtube = libsForQt56.callPackage ../applications/video/smtube {};
sudolikeaboss = callPackage ../tools/security/sudolikeaboss { };
@@ -14838,9 +14802,7 @@ with pkgs;
nedit = callPackage ../applications/editors/nedit { };
- notepadqq = callPackage ../applications/editors/notepadqq {
- qtbase = qt55;
- };
+ notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { };
notmuch = callPackage ../applications/networking/mailreaders/notmuch { };
@@ -15125,7 +15087,7 @@ with pkgs;
qgis = callPackage ../applications/gis/qgis {};
- qgroundcontrol = libsForQt55.callPackage ../applications/science/robotics/qgroundcontrol { };
+ qgroundcontrol = libsForQt56.callPackage ../applications/science/robotics/qgroundcontrol { };
qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { };
@@ -15218,7 +15180,7 @@ with pkgs;
demo = false;
};
- rapcad = libsForQt55.callPackage ../applications/graphics/rapcad { boost = boost159; };
+ rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; };
rapidsvn = callPackage ../applications/version-management/rapidsvn { };
@@ -15260,7 +15222,7 @@ with pkgs;
retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { });
- ricochet = libsForQt55.callPackage ../applications/networking/instant-messengers/ricochet { };
+ ricochet = libsForQt56.callPackage ../applications/networking/instant-messengers/ricochet { };
ripser = callPackage ../applications/science/math/ripser { };
@@ -15546,6 +15508,8 @@ with pkgs;
stalonetray = callPackage ../applications/window-managers/stalonetray {};
+ inherit (ocamlPackages_4_03) stog;
+
stp = callPackage ../applications/science/logic/stp {};
stumpwm = callPackage ../applications/window-managers/stumpwm {
@@ -15625,7 +15589,7 @@ with pkgs;
gconf = gnome2.GConf;
};
- teamspeak_client = libsForQt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
+ teamspeak_client = libsForQt56.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
taskjuggler = callPackage ../applications/misc/taskjuggler { ruby = ruby_2_0; };
@@ -15652,8 +15616,6 @@ with pkgs;
telepathy_mission_control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { };
- telepathy_rakia = callPackage ../applications/networking/instant-messengers/telepathy/rakia { };
-
telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {};
telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {};
@@ -15753,8 +15715,7 @@ with pkgs;
tribler = callPackage ../applications/networking/p2p/tribler { };
- # We need QtWebkit which was deprecated in Qt 5.6 although it can still be build
- trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { };
+ trojita = libsForQt56.callPackage ../applications/networking/mailreaders/trojita { };
tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { };
@@ -15939,6 +15900,8 @@ with pkgs;
vnstat = callPackage ../applications/networking/vnstat { };
+ vogl = qt56.callPackage ../development/tools/vogl { };
+
volnoti = callPackage ../applications/misc/volnoti { };
vorbis-tools = callPackage ../applications/audio/vorbis-tools { };
@@ -15972,6 +15935,8 @@ with pkgs;
imlib2 = imlib2-nox;
};
+ way-cooler = callPackage ../applications/window-managers/way-cooler {};
+
wayv = callPackage ../tools/X11/wayv {};
weechat = callPackage ../applications/networking/irc/weechat {
@@ -17541,7 +17506,9 @@ with pkgs;
caneda = callPackage ../applications/science/electronics/caneda { };
- geda = callPackage ../applications/science/electronics/geda { };
+ geda = callPackage ../applications/science/electronics/geda {
+ guile = guile_2_0;
+ };
gerbv = callPackage ../applications/science/electronics/gerbv { };
@@ -17632,7 +17599,7 @@ with pkgs;
yacas = callPackage ../applications/science/math/yacas { };
- speedcrunch = libsForQt5.callPackage ../applications/science/math/speedcrunch { };
+ speedcrunch = libsForQt56.callPackage ../applications/science/math/speedcrunch { };
### SCIENCE / MISC
@@ -17654,8 +17621,8 @@ with pkgs;
gravit = callPackage ../applications/science/astronomy/gravit { };
- golly = callPackage ../applications/science/misc/golly { };
- golly-beta = callPackage ../applications/science/misc/golly/beta.nix { };
+ golly = callPackage ../applications/science/misc/golly { wxGTK = wxGTK30; };
+ golly-beta = callPackage ../applications/science/misc/golly/beta.nix { wxGTK = wxGTK30; };
megam = callPackage ../applications/science/misc/megam { };
@@ -18007,7 +17974,7 @@ with pkgs;
pcre = pcre-cpp;
});
- redis-desktop-manager = libsForQt55.callPackage ../applications/misc/redis-desktop-manager { };
+ redis-desktop-manager = libsForQt56.callPackage ../applications/misc/redis-desktop-manager { };
robomongo = libsForQt5.callPackage ../applications/misc/robomongo { };
@@ -18417,8 +18384,6 @@ with pkgs;
zuki-themes = callPackage ../misc/themes/zuki { };
- zoom-us = libsForQt55.callPackage ../applications/networking/instant-messengers/zoom-us {};
-
tora = libsForQt5.callPackage ../development/tools/tora {};
xulrunner = firefox-unwrapped;
@@ -18434,4 +18399,6 @@ with pkgs;
hy = callPackage ../development/interpreters/hy {};
ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; };
+
+ messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {};
}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bad483f0237..2f21d2a5d74 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -8,6 +8,7 @@ let # These are attributes in compiler and packages that don't support integer-s
"ghc6104"
"ghc6123"
"ghc704"
+ "ghc763"
"ghcjs"
"ghcjsHEAD"
"ghcCross"
@@ -166,11 +167,13 @@ in rec {
};
ghcjs = callPackage ../development/haskell-modules {
ghc = compiler.ghcjs;
- compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+ compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
+ packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
};
ghcjsHEAD = callPackage ../development/haskell-modules {
ghc = compiler.ghcjsHEAD;
- compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+ compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
+ packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
};
ghcHaLVM240 = callPackage ../development/haskell-modules {
ghc = compiler.ghcHaLVM240;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 8471d1a1ced..232f1331865 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -36,8 +36,6 @@ let
async_shell = callPackage ../development/ocaml-modules/async_shell { };
- async_ssl = callPackage ../development/ocaml-modules/async_ssl { };
-
async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { };
async_p4 =
@@ -53,15 +51,12 @@ let
base64 = callPackage ../development/ocaml-modules/base64 { };
+ bitstring = callPackage ../development/ocaml-modules/bitstring { };
+
bolt = callPackage ../development/ocaml-modules/bolt { };
bos = callPackage ../development/ocaml-modules/bos { };
- bitstring =
- if lib.versionOlder "4.02" ocaml.version
- then callPackage ../development/ocaml-modules/bitstring { }
- else callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { };
-
camlidl = callPackage ../development/tools/ocaml/camlidl { };
camlp4 =
@@ -208,6 +203,8 @@ let
herelib = callPackage ../development/ocaml-modules/herelib { };
+ higlo = callPackage ../development/ocaml-modules/higlo { };
+
io-page = callPackage ../development/ocaml-modules/io-page { };
ipaddr_p4 = callPackage ../development/ocaml-modules/ipaddr/2.6.1.nix { };
@@ -376,6 +373,8 @@ let
ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { };
+ ocf = callPackage ../development/ocaml-modules/ocf { };
+
ocpBuild = callPackage ../development/tools/ocaml/ocp-build { };
ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { };
@@ -516,6 +515,10 @@ let
sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
+ stdio = callPackage ../development/ocaml-modules/stdio { };
+
+ stog = callPackage ../applications/misc/stog { };
+
stringext = callPackage ../development/ocaml-modules/stringext { };
topkg = callPackage ../development/ocaml-modules/topkg { };
@@ -556,6 +559,8 @@ let
xml-light = callPackage ../development/ocaml-modules/xml-light { };
+ xtmpl = callPackage ../development/ocaml-modules/xtmpl { };
+
yojson = callPackage ../development/ocaml-modules/yojson { };
zarith = callPackage ../development/ocaml-modules/zarith { };
@@ -571,6 +576,10 @@ let
buildOcamlJane = callPackage ../development/ocaml-modules/janestreet/buildOcamlJane.nix {};
+ ocaml-compiler-libs = callPackage ../development/ocaml-modules/janestreet/ocaml-compiler-libs.nix {};
+
+ ppx_ast = callPackage ../development/ocaml-modules/janestreet/ppx_ast.nix {};
+
ppx_core =
if lib.versionOlder "4.03" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/ppx_core-113_33_01.nix {}
@@ -678,6 +687,8 @@ let
then callPackage ../development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix {}
else callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {};
+ ppx_traverse_builtins = callPackage ../development/ocaml-modules/janestreet/ppx_traverse_builtins.nix {};
+
# Core sublibs
typerep =
@@ -762,6 +773,8 @@ let
then callPackage ../development/ocaml-modules/janestreet/async.nix {}
else async_p4;
+ async_ssl = callPackage ../development/ocaml-modules/janestreet/async_ssl.nix { };
+
# Apps / from all-packages
wyrd = callPackage ../tools/misc/wyrd { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 72b80afebbb..f0414b1b1ae 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9966,10 +9966,10 @@ let self = _self // overrides; _self = with self; {
};
OpenGL = buildPerlPackage rec {
- name = "OpenGL-0.6703";
+ name = "OpenGL-0.70";
src = fetchurl {
url = "mirror://cpan/authors/id/C/CH/CHM/${name}.tar.gz";
- sha256 = "0k2k8zg84qj1ry77i9dvmfdfpg13s6117wy5bc4nvnzv37qcvy32";
+ sha256 = "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj";
};
buildInputs = with pkgs; [ mesa mesa_glu freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ];
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index e07930a94db..221427e0851 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -235,11 +235,11 @@ let
composer = pkgs.stdenv.mkDerivation rec {
name = "composer-${version}";
- version = "1.3.2";
+ version = "1.4.1";
src = pkgs.fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar";
- sha256 = "0s85zglzwx5i0hw9zlpwy1385jink1g1lhdwhv59zdjblcd7ckva";
+ sha256 = "1g2wsnjcx1ysbw1ps2xwyhgcl8kl3yfzxgwcnh5rigjk6k67glmb";
};
phases = [ "installPhase" ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d7147d76527..8fd95ea65d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -816,19 +816,23 @@ in {
python-gnupg = buildPythonPackage rec {
name = "python-gnupg-${version}";
- version = "0.3.8";
+ version = "0.4.0";
src = pkgs.fetchurl {
url = "mirror://pypi/p/python-gnupg/${name}.tar.gz";
- sha256 = "0nkbs9c8f30lra7ca39kg91x8cyxn0jb61vih4qky839gpbwwwiq";
+ sha256 = "1yd88acafs9nwk6gzpbxjzpx0zd04qrvc6hmwhj1i89ghm2g7ap6";
};
+ propagatedBuildInputs = [ pkgs.gnupg1 ];
+
# Let's make the library default to our gpg binary
patchPhase = ''
substituteInPlace gnupg.py \
--replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg1}/bin/gpg'"
'';
+ doCheck = false;
+
meta = {
description = "A wrapper for the Gnu Privacy Guard";
homepage = "https://pypi.python.org/pypi/python-gnupg";
@@ -3837,11 +3841,11 @@ in {
};
click = buildPythonPackage rec {
- name = "click-6.6";
+ name = "click-6.7";
src = pkgs.fetchurl {
url = "mirror://pypi/c/click/${name}.tar.gz";
- sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
+ sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
};
buildInputs = with self; [ pytest ];
@@ -5755,11 +5759,11 @@ in {
libtmux = buildPythonPackage rec {
name = "libtmux-${version}";
- version = "0.6.0";
+ version = "0.6.4";
src = pkgs.fetchurl {
url = "mirror://pypi/l/libtmux/${name}.tar.gz";
- sha256 = "117savw47c2givq9vxr5m02nyxmsk34l2ihxyy5axlaiqyxyf20s";
+ sha256 = "0kmw7x8cxb2hj2mzibmg9nxaijhsm1kcm0vdihn99fhm5kw1phh5";
};
buildInputs = with self; [ pytest_29 ];
@@ -10316,36 +10320,8 @@ in {
django = self.django_1_10;
- django_1_10 = buildPythonPackage rec {
- name = "Django-${version}";
- version = "1.10.5";
- disabled = pythonOlder "2.7";
-
- src = pkgs.fetchurl {
- url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
- sha256 = "12szjsmnfhh2yr54sfynyjr8vl0q9gb6qak3ayqcifcinrs97f0d";
- };
-
- patches = [
- (pkgs.substituteAll {
- src = ../development/python-modules/django/1.10-gis-libs.template.patch;
- geos = pkgs.geos;
- gdal = self.gdal;
- })
- ];
-
- # patch only $out/bin to avoid problems with starter templates (see #3134)
- postFixup = ''
- wrapPythonProgramsIn $out/bin "$out $pythonPath"
- '';
-
- # too complicated to setup
- doCheck = false;
-
- meta = {
- description = "A high-level Python Web framework";
- homepage = https://www.djangoproject.com/;
- };
+ django_1_10 = callPackage ../development/python-modules/django/1_10.nix {
+ gdal = self.gdal;
};
django_1_9 = buildPythonPackage rec {
@@ -24773,6 +24749,8 @@ in {
doCheck = false;
};
+ hieroglyph = callPackage ../development/python-modules/hieroglyph { };
+
sphinx_rtd_theme = buildPythonPackage (rec {
name = "sphinx_rtd_theme-0.1.9";
@@ -26641,6 +26619,23 @@ in {
};
};
+ uptime = buildPythonPackage rec {
+ name = "uptime-${version}";
+ version = "3.0.1";
+
+ src = pkgs.fetchurl {
+ url = "mirror://pypi/u/uptime/${name}.tar.gz";
+ sha256 = "0wr9jkixprlywz0plyn5p42a5fd31aiwvjrxdvj7r02vfxa04c3w";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/Cairnarvon/uptime;
+ description = "Cross-platform way to retrieve system uptime and boot time";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ rob ];
+ };
+ };
+
urlgrabber = buildPythonPackage rec {
name = "urlgrabber-3.9.1";
disabled = isPy3k;
@@ -27555,25 +27550,7 @@ EOF
};
};
-
- BTrees = self.buildPythonPackage rec {
- name = "BTrees-4.1.4";
-
- propagatedBuildInputs = with self; [ persistent zope_interface transaction ];
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/B/BTrees/${name}.tar.gz";
- sha256 = "1avvhkd7rvp3rzhw20v6ank8a8m9a1lmh99c4gjjsa1ry0zsri3y";
- };
-
- patches = [ ../development/python-modules/btrees-py35.patch ];
-
- meta = {
- description = "Scalable persistent components";
- homepage = http://packages.python.org/BTrees;
- };
- };
-
+ BTrees = callPackage ../development/python-modules/btrees {};
persistent = self.buildPythonPackage rec {
name = "persistent-4.0.8";
@@ -29083,13 +29060,13 @@ EOF
};
libvirt = let
- version = "3.0.0";
+ version = "3.1.0";
in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec {
name = "libvirt-python-${version}";
src = pkgs.fetchurl {
url = "http://libvirt.org/sources/python/${name}.tar.gz";
- sha256 = "1ha4bqf029si1lla1z7ca786w571fh3wfs4h7zaglfk4gb2w39wl";
+ sha256 = "06524dhm27fjfnmr5bqdxlmm1g9ixvzaaq572hgyy5dqwfn64spk";
};
buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];
@@ -30721,12 +30698,11 @@ EOF
propagatedBuildInputs = with self; [ scipy ];
buildInputs = with self; [ nose ];
- # Cannot be installed with Python 2.x, most likely due to the patch below.
- disabled = !isPy3k;
-
postPatch = ''
cd python-package
+ sed "s/CURRENT_DIR = os.path.dirname(__file__)/CURRENT_DIR = os.path.abspath(os.path.dirname(__file__))/g" -i setup.py
+ sed "/^LIB_PATH.*/a LIB_PATH = [os.path.relpath(LIB_PATH[0], CURRENT_DIR)]" -i setup.py
cat <xgboost/libpath.py
def find_lib_path():
return ["${pkgs.xgboost}/lib/libxgboost.so"]
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 86fbb0bf1b8..8872d7c676e 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -68,7 +68,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
hdparm = linux;
hello = all;
host = linux;
- iana_etc = linux;
+ iana-etc = linux;
icewm = linux;
idutils = all;
inetutils = linux;
diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 6fcd0fca17a..6ca18ed4668 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
{ runCommand, fetchFromGitHub, git }:
let
- version = "2017-03-22";
- rev = "2458be6157706b6c92e37baa19703c15d89f6b3a";
- sha256 = "19ij0fqy5j4lz73w4p29wv4gsxhs345ajxm4bxpq6gx2h4x6qk06";
+ version = "2017-03-29";
+ rev = "d9dbb2fc117bf730d1f54b090b3af407e8e5ff20";
+ sha256 = "1vrzr4v8qp5jy3xmqrcyk9naik3rngk8hzxif42y687ncppzrsdl";
src = fetchFromGitHub {
inherit rev;