Merge branch 'master' into aria2.service

This commit is contained in:
Kirill 2017-04-27 17:50:13 +03:00 committed by GitHub
commit 64a7be7f3c
163 changed files with 5517 additions and 4781 deletions

View File

@ -215,6 +215,7 @@
heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>";
henrytill = "Henry Till <henrytill@gmail.com>";
hinton = "Tom Hinton <t@larkery.com>";
hodapp = "Chris Hodapp <hodapp87@gmail.com>";
hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
iand675 = "Ian Duncan <ian@iankduncan.com>";
ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
@ -388,6 +389,7 @@
paholg = "Paho Lurie-Gregg <paho@paholg.com>";
pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";
palo = "Ingolf Wanger <palipalo9@googlemail.com>";
panaeon = "Vitalii Voloshyn <vitalii.voloshyn@gmail.com";
paperdigits = "Mica Semrick <mica@silentumbrella.com>";
pashev = "Igor Pashev <pashev.igor@gmail.com>";
patternspandemic = "Brad Christensen <patternspandemic@live.com>";

View File

@ -89,6 +89,8 @@ rec {
msvc = {};
eabi = {};
androideabi = {};
gnueabi = {};
gnueabihf = {};
unknown = {};
};

View File

@ -38,7 +38,7 @@ rec {
/* Merge two attribute sets shallowly, right side trumps left
Example:
mergeAttrs { a = 1; b = 2; } // { b = 3; c = 4; }
mergeAttrs { a = 1; b = 2; } { b = 3; c = 4; }
=> { a = 1; b = 3; c = 4; }
*/
mergeAttrs = x: y: x // y;

View File

@ -29,8 +29,10 @@ line. For instance, to create a container that has
<literal>root</literal>:
<screen>
# nixos-container create foo --config 'services.openssh.enable = true; \
users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];'
# nixos-container create foo --config '
services.openssh.enable = true;
users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];
'
</screen>
</para>
@ -97,8 +99,11 @@ This will build and activate the new configuration. You can also
specify a new configuration on the command line:
<screen>
# nixos-container update foo --config 'services.httpd.enable = true; \
services.httpd.adminAddr = "foo@example.org";'
# nixos-container update foo --config '
services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org";
networking.firewall.allowedTCPPorts = [ 80 ];
'
# curl http://$(nixos-container show-ip foo)/
&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…

View File

@ -1,5 +1,5 @@
{
x86_64-linux = "/nix/store/j6q3pb75q1sbk0xsa5x6a629ph98ycdl-nix-1.11.8";
i686-linux = "/nix/store/4m6ps568l988bbr1p2k3w9raq3rblppi-nix-1.11.8";
x86_64-darwin = "/nix/store/cc5q944yn3j2hrs8k0kxx9r2mk9mni8a-nix-1.11.8";
x86_64-linux = "/nix/store/71im965h634iy99zsmlncw6qhx5jcclx-nix-1.11.9";
i686-linux = "/nix/store/cgvavixkayc36l6kl92i8mxr6k0p2yhy-nix-1.11.9";
x86_64-darwin = "/nix/store/w1c96v5yxvdmq4nvqlxjvg6kp7xa2lag-nix-1.11.9";
}

View File

@ -2,16 +2,6 @@
{
_module.args = {
pkgs_i686 = import ../../.. {
system = "i686-linux";
# FIXME: we enable config.allowUnfree to make packages like
# nvidia-x11 available. This isn't a problem because if the user has
# nixpkgs.config.allowUnfree = false, then evaluation will fail on
# the 64-bit package anyway. However, it would be cleaner to respect
# nixpkgs.config here.
config.allowUnfree = true;
};
utils = import ../../lib/utils.nix pkgs;
};
}

View File

@ -289,7 +289,10 @@
rpc = 271;
geoip = 272;
fcron = 273;
aria2 = 274;
sonarr = 274;
radarr = 275;
jackett = 276;
aria2 = 277;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@ -548,7 +551,10 @@
#rpc = 271; # unused
#geoip = 272; # unused
fcron = 273;
aria2 = 274;
sonarr = 274;
radarr = 275;
jackett = 276;
aria2 = 277;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal

View File

@ -42,6 +42,8 @@ let
merge = lib.mergeOneOption;
};
_pkgs = import ../../.. config.nixpkgs;
in
{
@ -97,6 +99,9 @@ in
};
config = {
_module.args.pkgs = import ../../.. config.nixpkgs;
_module.args = {
pkgs = _pkgs;
pkgs_i686 = _pkgs.pkgsi686Linux;
};
};
}

View File

@ -22,14 +22,14 @@ in
echo "Creating jackett data directory in /var/lib/jackett/"
mkdir -p /var/lib/jackett/
}
chown -R jackett /var/lib/jackett/
chown -R jackett:jackett /var/lib/jackett/
chmod 0700 /var/lib/jackett/
'';
serviceConfig = {
Type = "simple";
User = "jackett";
Group = "nogroup";
Group = "jackett";
PermissionsStartOnly = "true";
ExecStart = "${pkgs.jackett}/bin/Jackett";
Restart = "on-failure";
@ -37,8 +37,11 @@ in
};
users.extraUsers.jackett = {
uid = config.ids.uids.jackett;
home = "/var/lib/jackett";
group = "jackett";
};
users.extraGroups.jackett.gid = config.ids.gids.jackett;
};
}

View File

@ -22,14 +22,14 @@ in
echo "Creating radarr data directory in /var/lib/radarr/"
mkdir -p /var/lib/radarr/
}
chown -R radarr /var/lib/radarr/
chown -R radarr:radarr /var/lib/radarr/
chmod 0700 /var/lib/radarr/
'';
serviceConfig = {
Type = "simple";
User = "radarr";
Group = "nogroup";
Group = "radarr";
PermissionsStartOnly = "true";
ExecStart = "${pkgs.radarr}/bin/Radarr";
Restart = "on-failure";
@ -37,8 +37,11 @@ in
};
users.extraUsers.radarr = {
uid = config.ids.uids.radarr;
home = "/var/lib/radarr";
group = "radarr";
};
users.extraGroups.radarr.gid = config.ids.gids.radarr;
};
}

View File

@ -22,14 +22,14 @@ in
echo "Creating sonarr data directory in /var/lib/sonarr/"
mkdir -p /var/lib/sonarr/
}
chown -R sonarr /var/lib/sonarr/
chown -R sonarr:sonarr /var/lib/sonarr/
chmod 0700 /var/lib/sonarr/
'';
serviceConfig = {
Type = "simple";
User = "sonarr";
Group = "nogroup";
Group = "sonarr";
PermissionsStartOnly = "true";
ExecStart = "${pkgs.sonarr}/bin/NzbDrone --no-browser";
Restart = "on-failure";
@ -37,8 +37,11 @@ in
};
users.extraUsers.sonarr = {
uid = config.ids.uids.sonarr;
home = "/var/lib/sonarr";
group = "sonarr";
};
users.extraGroups.sonarr.gid = config.ids.gids.sonarr;
};
}

View File

@ -33,6 +33,9 @@ let
publish-hinfo=${yesNo publish.hinfo}
publish-workstation=${yesNo publish.workstation}
publish-domain=${yesNo publish.domain}
[reflector]
enable-reflector=${yesNo reflector}
'';
in
@ -113,6 +116,11 @@ in
description = ''Whether to enable wide-area service discovery.'';
};
reflector = mkOption {
default = false;
description = ''Reflect incoming mDNS requests to all allowed network interfaces.'';
};
publish = {
enable = mkOption {
default = false;

View File

@ -8,8 +8,6 @@ let
homeDir = "/var/lib/i2pd";
extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sLf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')";
mkEndpointOpt = name: addr: port: {
enable = mkEnableOption name;
name = mkOption {
@ -152,9 +150,8 @@ let
i2pdSh = pkgs.writeScriptBin "i2pd" ''
#!/bin/sh
${if isNull cfg.extIp then extip else ""}
${pkgs.i2pd}/bin/i2pd \
--host=${if isNull cfg.extIp then "$EXTIP" else cfg.extIp} \
${if isNull cfg.extIp then "" else "--host="+cfg.extIp} \
--conf=${i2pdConf} \
--tunconf=${i2pdTunnelConf}
'';

View File

@ -239,6 +239,12 @@ in
menuentry "Windows 7" {
chainloader (hd0,4)+1
}
# GRUB 2 with UEFI example, chainloading another distro
menuentry "Fedora" {
set root=(hd1,1)
chainloader /efi/fedora/grubx64.efi
}
'';
description = ''
Any additional entries you want added to the GRUB boot menu.

View File

@ -2,93 +2,19 @@
with lib;
let
diskSize = "30720";
diskSize = 30720;
in
{
system.build.azureImage =
pkgs.vmTools.runInLinuxVM (
pkgs.runCommand "azure-image"
{ preVM =
''
mkdir $out
diskImage=$out/$diskImageBase
cyl=$(((${diskSize}*1024*1024)/(512*63*255)))
size=$(($cyl*255*63*512))
roundedsize=$((($size/(1024*1024)+1)*(1024*1024)))
${pkgs.vmTools.qemu-220}/bin/qemu-img create -f raw $diskImage $roundedsize
mv closure xchg/
'';
postVM =
''
mkdir -p $out
${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd
rm $diskImage
'';
diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";
buildInputs = [ pkgs.utillinux pkgs.perl ];
exportReferencesGraph =
[ "closure" config.system.build.toplevel ];
}
''
# Create partition table
${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}M
${pkgs.parted}/sbin/parted /dev/vda print
. /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR
# Create an empty filesystem and mount it.
${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
mkdir /mnt
mount /dev/vda1 /mnt
# The initrd expects these directories to exist.
mkdir /mnt/dev /mnt/proc /mnt/sys
mount --bind /proc /mnt/proc
mount --bind /dev /mnt/dev
mount --bind /sys /mnt/sys
# Copy all paths in the closure to the filesystem.
storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
mkdir -p /mnt/nix/store
echo "copying everything (will take a while)..."
cp -prd $storePaths /mnt/nix/store/
echo Register the paths in the Nix database.
printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""
echo Create the system profile to allow nixos-rebuild to work.
chroot /mnt ${config.nix.package.out}/bin/nix-env \
-p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} --option build-users-group ""
echo nixos-rebuild requires an /etc/NIXOS.
mkdir -p /mnt/etc
touch /mnt/etc/NIXOS
echo switch-to-configuration requires a /bin/sh
mkdir -p /mnt/bin
ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
echo Install a configuration.nix.
mkdir -p /mnt/etc/nixos /mnt/boot/grub
cp ${./azure-config-user.nix} /mnt/etc/nixos/configuration.nix
echo Generate the GRUB menu.
ln -s vda /dev/sda
chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
echo Almost done
umount /mnt/proc /mnt/dev /mnt/sys
umount /mnt
''
);
system.build.azureImage = import ../../lib/make-disk-image.nix {
name = "azure-image";
postVM = ''
${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd
'';
configFile = ./azure-config-user.nix;
format = "raw";
inherit diskSize;
inherit config lib pkgs;
};
imports = [ ./azure-common.nix ];

View File

@ -7,8 +7,7 @@ with lib;
let
cfg = config.virtualisation.docker;
pro = config.networking.proxy.default;
proxy_env = optionalAttrs (pro != null) { Environment = "\"http_proxy=${pro}\""; };
proxy_env = config.networking.proxy.envVars;
in
@ -106,6 +105,7 @@ in
systemd.services.docker = {
wantedBy = optional cfg.enableOnBoot "multi-user.target";
environment = proxy_env;
serviceConfig = {
ExecStart = [
""
@ -122,7 +122,7 @@ in
""
"${pkgs.procps}/bin/kill -s HUP $MAINPID"
];
} // proxy_env;
};
path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs);
};

View File

@ -2,7 +2,7 @@
with lib;
let
diskSize = "1G";
diskSize = 1024; # MB
in
{
imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ./grow-partition.nix ];
@ -10,89 +10,21 @@ in
# https://cloud.google.com/compute/docs/tutorials/building-images
networking.firewall.enable = mkDefault false;
system.build.googleComputeImage =
pkgs.vmTools.runInLinuxVM (
pkgs.runCommand "google-compute-image"
{ preVM =
''
mkdir $out
diskImage=$out/$diskImageBase
truncate $diskImage --size ${diskSize}
mv closure xchg/
'';
postVM =
''
PATH=$PATH:${pkgs.stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
pushd $out
mv $diskImageBase disk.raw
tar -Szcf $diskImageBase.tar.gz disk.raw
rm $out/disk.raw
popd
'';
diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";
buildInputs = [ pkgs.utillinux pkgs.perl ];
exportReferencesGraph =
[ "closure" config.system.build.toplevel ];
}
''
# Create partition table
${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}
${pkgs.parted}/sbin/parted /dev/vda print
. /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR
# Create an empty filesystem and mount it.
${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
mkdir /mnt
mount /dev/vda1 /mnt
# The initrd expects these directories to exist.
mkdir /mnt/dev /mnt/proc /mnt/sys
mount --bind /proc /mnt/proc
mount --bind /dev /mnt/dev
mount --bind /sys /mnt/sys
# Copy all paths in the closure to the filesystem.
storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
mkdir -p /mnt/nix/store
echo "copying everything (will take a while)..."
${pkgs.rsync}/bin/rsync -a $storePaths /mnt/nix/store/
# Register the paths in the Nix database.
printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
chroot /mnt ${config.nix.package.out}/bin/nix-store --load-db --option build-users-group ""
# Create the system profile to allow nixos-rebuild to work.
chroot /mnt ${config.nix.package.out}/bin/nix-env \
-p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \
--option build-users-group ""
# `nixos-rebuild' requires an /etc/NIXOS.
mkdir -p /mnt/etc
touch /mnt/etc/NIXOS
# `switch-to-configuration' requires a /bin/sh
mkdir -p /mnt/bin
ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
# Install a configuration.nix.
mkdir -p /mnt/etc/nixos /mnt/boot/grub
cp ${./google-compute-config.nix} /mnt/etc/nixos/configuration.nix
# Generate the GRUB menu.
ln -s vda /dev/sda
chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
umount /mnt/proc /mnt/dev /mnt/sys
umount /mnt
''
);
system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
name = "google-compute-image";
postVM = ''
PATH=$PATH:${pkgs.stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
pushd $out
mv $diskImage disk.raw
tar -Szcf nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw.tar.gz disk.raw
rm $out/disk.raw
popd
'';
configFile = ./google-compute-config.nix;
format = "raw";
inherit diskSize;
inherit config lib pkgs;
};
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";

View File

@ -75,6 +75,7 @@ let
exec ${qemu}/bin/qemu-kvm \
-name ${vmName} \
-m ${toString config.virtualisation.memorySize} \
-smp ${toString config.virtualisation.cores} \
${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \
${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \
-virtfs local,path=/nix/store,security_model=none,mount_tag=store \
@ -244,6 +245,18 @@ in
'';
};
virtualisation.cores =
mkOption {
default = 1;
type = types.int;
description =
''
Specify the number of cores the guest is permitted to use.
The number can be higher than the available cores on the
host system.
'';
};
virtualisation.pathsInNixDB =
mkOption {
default = [];

View File

@ -56,11 +56,19 @@ in
testScript = ''
$master->start;
$master->waitForUnit("mysql");
$master->waitForOpenPort(3306);
$slave1->start;
$slave2->start;
$slave1->waitForUnit("mysql");
$slave1->waitForOpenPort(3306);
$slave2->waitForUnit("mysql");
$slave2->sleep(100); # Hopefully this is long enough!!
$slave2->waitForOpenPort(3306);
$slave2->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
$slave2->succeed("systemctl stop mysql");
$master->succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N");
$slave2->succeed("systemctl start mysql");
$slave2->waitForUnit("mysql");
$slave2->waitForOpenPort(3306);
$slave2->succeed("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456");
'';
})

View File

@ -175,10 +175,10 @@
}) {};
auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auctex";
version = "11.90.1";
version = "11.90.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-11.90.1.tar";
sha256 = "0bn5pg6v7zgqxs080bzrsx6789nzdx4622m3020ymzl66017nf0r";
url = "https://elpa.gnu.org/packages/auctex-11.90.2.tar";
sha256 = "1hid8srj64nwbxcjvdma1xy07bh0v8ndhhsi3nmx9vdi3167khz6";
};
packageRequires = [];
meta = {
@ -644,10 +644,10 @@
el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
elpaBuild {
pname = "el-search";
version = "1.3.1";
version = "1.3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/el-search-1.3.1.tar";
sha256 = "01f5pyalw60dr36w007mvvxry548zrhixzmba1sad19531bry7fc";
url = "https://elpa.gnu.org/packages/el-search-1.3.2.tar";
sha256 = "0lf0hk2pvy9yrb02sa3bg0hipshbgl9m4hx7db46jvmz5bf15nfq";
};
packageRequires = [ emacs stream ];
meta = {
@ -1769,10 +1769,10 @@
}) {};
stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "stream";
version = "2.2.3";
version = "2.2.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/stream-2.2.3.el";
sha256 = "1y9nh5473p0dd149g675nybsdnzp8c4mq3wdql066nir7scz6rhy";
url = "https://elpa.gnu.org/packages/stream-2.2.4.tar";
sha256 = "1fdjjxfnpzfv5jsy0wmmnrsk821bg8d3magsng609fb2pkwvk1ij";
};
packageRequires = [ emacs ];
meta = {

File diff suppressed because it is too large Load Diff

View File

@ -1157,12 +1157,12 @@
all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
melpaBuild {
pname = "all-the-icons";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
rev = "4f7c556167e42c02d2f840aec345b8f60b71c477";
sha256 = "0vhmw6z6q5a3abxphxxq5yd37hz5x9hs61vgx4wfyk2853701ks0";
rev = "2169d831731d206902114de3fc1b075b9e6b4ed4";
sha256 = "125qw96rzbkv39skxk5511jrcx9hxm0fqcmny6213wzswgdn37z3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@ -1564,12 +1564,12 @@
anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "anything-tramp";
version = "0.3.3";
version = "0.4.3";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-anything-tramp";
rev = "08bf0752e5b885a0492fbd0d7790668683c87797";
sha256 = "13026l259vbbgi7q0lb6jb7d54z6jgapv0d2qlprh9mlqjf32xic";
rev = "c4629201a63047f9094be0d9150f201dd5be18ad";
sha256 = "0fr4brysc7sk89jp1ggl68r3r6ikrhipb2h5kc1b2a8vz7i05bq9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@ -2680,6 +2680,27 @@
license = lib.licenses.free;
};
}) {};
binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "binclock";
version = "1.10";
src = fetchFromGitHub {
owner = "davep";
repo = "binclock.el";
rev = "2e529ace67a04e6872a2328769782ef33b0e463a";
sha256 = "0ldyx90lrhfn7qypxsmaf2yhpamjiqzvsk0b0jlgg09ars1fvhns";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
sha256 = "1s0072kcd1xp8355j8aph94gb3a1wqmzx1hhfp9d6bzqf6cij8gk";
name = "binclock";
};
packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/binclock";
license = lib.licenses.free;
};
}) {};
bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bind-key";
@ -2893,12 +2914,12 @@
boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "boxquote";
version = "2.0";
version = "2.1";
src = fetchFromGitHub {
owner = "davep";
repo = "boxquote.el";
rev = "b0239fb7b7a9d75d4ac3c66f9b96abd911dbf4e0";
sha256 = "0agnsghxf35b6g49radxigw81bmvw1ggljzzmy771nmwl44q2dbb";
rev = "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883";
sha256 = "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote";
@ -5028,6 +5049,27 @@
license = lib.licenses.free;
};
}) {};
company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-shell";
version = "1.0";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "company-shell";
rev = "40599df46a7e4b7b1ef5ad6e23764dda8510bbf4";
sha256 = "1qnlqwifrlbzcsi1lf1s7c32v6szpi5n6ngmj2lmdyic2b3pv1id";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell";
sha256 = "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz";
name = "company-shell";
};
packageRequires = [ cl-lib company dash ];
meta = {
homepage = "https://melpa.org/#/company-shell";
license = lib.licenses.free;
};
}) {};
company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
melpaBuild {
pname = "company-sourcekit";
@ -7890,11 +7932,11 @@
}) {};
eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "eide";
version = "2.1.1";
version = "2.1.2";
src = fetchgit {
url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
rev = "524494fd2b23217c6807b30b43bb95b5724f809e";
sha256 = "0w9j5q5pzw55nwsw5wic7dl7psvg75vk1cxhrz2isgra6gissh9z";
rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3";
sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide";
@ -8390,22 +8432,22 @@
license = lib.licenses.free;
};
}) {};
elpa-clone = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
elpa-clone = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elpa-clone";
version = "0.0.4";
version = "0.0.5";
src = fetchFromGitHub {
owner = "dochang";
repo = "elpa-clone";
rev = "8d0827b03b08eb4844e2b8465c27d5aa0e12101d";
sha256 = "1ik2k6ngzg3znfp4a36f7m5ca6p3iivfb7w280w3gm5x1ja8as2a";
rev = "144bee09445b30cbf4f60b371a289f0d75a387aa";
sha256 = "1k80y3wcqvhdbc0w5ybicn2hqjldp7b4jwraca2b99676c0yiq25";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone";
sha256 = "172gpmpwf75y41n3v05l47w34x83vy63bqk97fd8a6b4dkj91lqa";
name = "elpa-clone";
};
packageRequires = [ cl-lib ];
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/elpa-clone";
license = lib.licenses.free;
@ -9014,22 +9056,22 @@
license = lib.licenses.free;
};
}) {};
enh-ruby-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "enh-ruby-mode";
version = "20150711";
version = "20170417";
src = fetchFromGitHub {
owner = "zenspider";
repo = "enhanced-ruby-mode";
rev = "f945cff5e784e23e0028bf0a5221f4f47a822fac";
sha256 = "1f6zyz5jmbrvv37mbzsvwb3ycmq105p4ryz8p65b76jz3ps8yq5w";
rev = "2e483fe316ff993c80eafcf4ce4defd87d97776d";
sha256 = "1xzhgmbc9iplxmqm7gc4hqk6nfdhqcrxz8g9kkf5ww3dx1czhiv7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns";
name = "enh-ruby-mode";
};
packageRequires = [];
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/enh-ruby-mode";
license = lib.licenses.free;
@ -9381,12 +9423,12 @@
erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
version = "19.3.1";
version = "19.3.2";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
rev = "d25ad84195ca42969fbfb017a52aab8c8effc246";
sha256 = "06jxpypw8i13gjiq006p0ahy0mlkxhmpq8fhn4pp7hi2n4ycnfj1";
rev = "6acb7d6fb8d23c0b0b78d30a618d2636ad463e6e";
sha256 = "1a3yk18sr3y524jl8icp8qh5j143ykxs51xdwz2bzxac2y78k0xk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@ -9965,22 +10007,22 @@
license = lib.licenses.free;
};
}) {};
evil-colemak-basics = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
evil-colemak-basics = callPackage ({ emacs, evil, evil-snipe, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-colemak-basics";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "wbolster";
repo = "evil-colemak-basics";
rev = "f976bda20098c43be1418c36520a57467c8c6c13";
sha256 = "18f1k4z7lkh237sz4p1xz4sxzs41ywmvd6dj7k9b6d9dscv3yxws";
rev = "7844079b47f47bb1dc24c885b0ac2e67524fa960";
sha256 = "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics";
sha256 = "1sbbli0hdmpc23f3g5n95svqfdg3rlvf71plyvpv1a6va9jhi83k";
name = "evil-colemak-basics";
};
packageRequires = [ emacs evil ];
packageRequires = [ emacs evil evil-snipe ];
meta = {
homepage = "https://melpa.org/#/evil-colemak-basics";
license = lib.licenses.free;
@ -10699,6 +10741,27 @@
license = lib.licenses.free;
};
}) {};
exsqlaim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "exsqlaim-mode";
version = "0.0.1";
src = fetchFromGitHub {
owner = "ahmadnazir";
repo = "exsqlaim-mode";
rev = "e77d2a07addffd7df4393019d9c3dad1ab1925d9";
sha256 = "19v5sf3nf6dciakvs7ksbg66b5z1hybc4ivs24hm6k3fziblfzzs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f660d7629bc27144c99ebcba45f1b06b14c5745/recipes/exsqlaim-mode";
sha256 = "0ssn48wcn3x066nsl8y78y57ndasqv5x6ifxbifdxl3f5vjhyvg7";
name = "exsqlaim-mode";
};
packageRequires = [ s ];
meta = {
homepage = "https://melpa.org/#/exsqlaim-mode";
license = lib.licenses.free;
};
}) {};
extend-dnd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "extend-dnd";
@ -10720,6 +10783,27 @@
license = lib.licenses.free;
};
}) {};
exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
melpaBuild {
pname = "exwm-x";
version = "0.6";
src = fetchFromGitHub {
owner = "tumashu";
repo = "exwm-x";
rev = "87715a6891b31bc19954ea9fe1c1a9bf57bdbbce";
sha256 = "0x9gg3fy5xw3vf8gyfa5j5k08gnnfpsyjh4dk80sbbnf0z7cwycw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3";
name = "exwm-x";
};
packageRequires = [ cl-lib exwm swiper switch-window ];
meta = {
homepage = "https://melpa.org/#/exwm-x";
license = lib.licenses.free;
};
}) {};
eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eyebrowse";
@ -10993,22 +11077,22 @@
license = lib.licenses.free;
};
}) {};
finalize = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
finalize = callPackage ({ cl-generic, cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "finalize";
version = "1.0.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elisp-finalize";
rev = "72c8eaab3deb150ee2cf7f1473114cecffb5204a";
sha256 = "1r9y9zschavi28c5ysrlh56vxszjfyhh5r36fhn74i0b5iiy15rx";
rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27";
sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize";
sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
name = "finalize";
};
packageRequires = [ cl-lib eieio emacs ];
packageRequires = [ cl-generic cl-lib eieio emacs ];
meta = {
homepage = "https://melpa.org/#/finalize";
license = lib.licenses.free;
@ -11273,6 +11357,27 @@
license = lib.licenses.free;
};
}) {};
flatui-dark-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flatui-dark-theme";
version = "0.3.0";
src = fetchFromGitHub {
owner = "theasp";
repo = "flatui-dark-theme";
rev = "af5c84e2a2810748cc71a68ec7ba333097cc1f63";
sha256 = "0c0pm67d8w9jdraap0sswvx7ywly9ifimij2c5w9p4hiph8gisr9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5f9dc5abeb37422c63cac74f9a006d54c4a7c5a5/recipes/flatui-dark-theme";
sha256 = "1mswmkhi43fm0cmdgf0ywpy9lmapy0syl65kqh68sa3jqbznhm6y";
name = "flatui-dark-theme";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/flatui-dark-theme";
license = lib.licenses.free;
};
}) {};
floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "floobits";
@ -11294,24 +11399,24 @@
license = lib.licenses.free;
};
}) {};
flow-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
flow-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flow-mode";
pname = "flow-minor-mode";
version = "0.1";
src = fetchFromGitHub {
owner = "an-sh";
repo = "flow-mode";
repo = "flow-minor-mode";
rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458";
sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode";
sha256 = "0hq1lkn4mn6r8ih74d52hba1a6gb6pg4qcv60sfsiga4b737yla8";
name = "flow-mode";
url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
sha256 = "190dv225sb37jawzrasd7qkbznrmkrdnb90l44il63vrlmjv3r1s";
name = "flow-minor-mode";
};
packageRequires = [ emacs web-mode ];
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/flow-mode";
homepage = "https://melpa.org/#/flow-minor-mode";
license = lib.licenses.free;
};
}) {};
@ -11696,12 +11801,12 @@
flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-objc-clang";
version = "1.0.6";
version = "1.1.0";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-objc-clang";
rev = "11805f1d420e297db0346a6657f144b08e2ca556";
sha256 = "1s9bk3k7ys79m2iww4yf1abfy01d08z9x9pfq8l045q0snsh64il";
rev = "b16b77f95e4e53a8951ebee6209a5de311748447";
sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@ -12725,12 +12830,12 @@
fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fountain-mode";
version = "2.2.2";
version = "2.3.0";
src = fetchFromGitHub {
owner = "rnkn";
repo = "fountain-mode";
rev = "4e88b7525c2f39c3d25f689b394b0ece7c6eed6d";
sha256 = "1vcc8sdm0b3kss3g47wggc6mv28pr474559d3786fhncp5mxl1qq";
rev = "37289bb68f01dd49b1192032ade6b0741d024a54";
sha256 = "06bqnyx2h0ypyxy5vxrh3v75qqfcmfgx31xkip7w6sj6pbfc8dq5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@ -12835,6 +12940,25 @@
license = lib.licenses.free;
};
}) {};
fuel = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "fuel";
version = "0.96";
src = fetchgit {
url = "git://factorcode.org/git/factor.git";
rev = "905ec06d864537fb6be9c46ad98f1b6d101dfbf0";
sha256 = "0ip7azxi5nvp8vvi15ds46mgs0fmi7gq97f2iz1c7m67ml5wi2g7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
name = "fuel";
};
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/fuel";
license = lib.licenses.free;
};
}) {};
full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "full-ack";
@ -13423,6 +13547,27 @@
license = lib.licenses.free;
};
}) {};
git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }:
melpaBuild {
pname = "git-commit-insert-issue";
version = "0.3";
src = fetchFromGitLab {
owner = "emacs-stuff";
repo = "git-commit-insert-issue";
rev = "7ee9dc88acc1e766700a6170a2ba6b0b853220db";
sha256 = "1fi0gy0093dwdcsl7ikzdjxklqrf1p6f99bpxi4xzk2waca70klf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue";
sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax";
name = "git-commit-insert-issue";
};
packageRequires = [ bitbucket github-issues gitlab helm projectile s ];
meta = {
homepage = "https://melpa.org/#/git-commit-insert-issue";
license = lib.licenses.free;
};
}) {};
git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-gutter";
@ -16311,12 +16456,12 @@
helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-org-rifle";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
rev = "c8ad1d86dd375f1be433b95e2bc40876f663663f";
sha256 = "1ia960sqkbc5bqljjb0arw54q90x36lhp0230s75xcg6m47bxpw3";
rev = "6d467b82d8c7584b7ab839bbaaac701af393209b";
sha256 = "1mmwms4s52537sq17zhm8sakyq1mkf4nqcxgydsg4zlmvzzxpz8l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@ -16773,12 +16918,12 @@
helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-tramp";
version = "0.3.3";
version = "0.4.3";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-helm-tramp";
rev = "68d4c614830970e9eaf929882e1d395a61872bea";
sha256 = "0zfhdlzpy6w7prdh60nd98cwgzfqfsn87xh2kb5hi40dh8gsccfb";
rev = "0885339369b65bc5d06829d82af734560dc45555";
sha256 = "088bpikbnsaxsjfq896fcg7y9qgvfbq7iwxsh391yc6h46zgarkk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@ -16941,12 +17086,12 @@
hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hierarchy";
version = "0.2.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "hierarchy";
rev = "d44d60d85cbeaf81d5e02ba154f4fcdca9faf7fd";
sha256 = "14zww0174vwf08fl9fv23faqn2byapb80rn72z4iv54p6pqykc2f";
rev = "ca919a4c71c187e1fbbad7e814aac1cf662ec51a";
sha256 = "0rrrj44ml2ymvxmg8igpn2irdhihv3djy5dfm6p6499cm64mawai";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@ -19539,6 +19684,27 @@
license = lib.licenses.free;
};
}) {};
kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kaolin-theme";
version = "0.6";
src = fetchFromGitHub {
owner = "0rdy";
repo = "kaolin-theme";
rev = "041cc6637a58a3a24086d1c2b8c3eb113434127e";
sha256 = "1qx6568s8wj6ha8wfy8hih1qwwcdiybdb83w3fr9lqwh0lyhjp0f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
sha256 = "1316sn1xpli9aqbhn8sldyvsc2fwk1ql9aw4l0rgkfbivvcklp7c";
name = "kaolin-theme";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/kaolin-theme";
license = lib.licenses.free;
};
}) {};
karma = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "karma";
@ -19899,12 +20065,12 @@
kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "kubernetes";
version = "0.6.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "kubernetes-el";
rev = "494dae923b96a10853ba26f405059e8c04e72d22";
sha256 = "03lnflyyqags7im9gp7cq3q6fnfr9a65s62m333aydbg7dzk5pzh";
rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@ -19920,12 +20086,12 @@
kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
melpaBuild {
pname = "kubernetes-evil";
version = "0.6.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "kubernetes-el";
rev = "494dae923b96a10853ba26f405059e8c04e72d22";
sha256 = "03lnflyyqags7im9gp7cq3q6fnfr9a65s62m333aydbg7dzk5pzh";
rev = "68dd3c2184e72b7a669e5706d1a3d95a220276d1";
sha256 = "163kx407jj08ifbpvvw1cp24qb4rm6l89ikgzqha01lc0bjglax5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@ -20096,8 +20262,8 @@
sha256 = "12q6wblwnb6y5c1882jz14742fqbm6p5jpzlvz7p90ylqfl7h989";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode";
sha256 = "19vljgprgfpb9bkbdvkqnwc5pjn1rl0rniwav08a2c6kd2g59xaf";
url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
sha256 = "10asbcb5syv3b75bngsab3c84dp2xmc0q7s29im6kf4mzv5zcfcf";
name = "ledger-mode";
};
packageRequires = [];
@ -20494,12 +20660,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
version = "2.14.0";
version = "2.15.0";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
rev = "51b1e177f115ab527cc47baf98abe09d43d9a95f";
sha256 = "0rcxrq3r4vbr9zb844andy1zj246gs8s1ksqp1f092fiiyqpllnx";
rev = "f5603fb6bcfbae1e6950da7f91c3a15cf5250bb1";
sha256 = "1zzk3rc86xrkys3rcqiz61mnp00jkvb05f8p21av52h19axm4nn8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@ -20921,12 +21087,12 @@
magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
melpaBuild {
pname = "magit-gitflow";
version = "2.2.1";
version = "2.2.2";
src = fetchFromGitHub {
owner = "jtatarik";
repo = "magit-gitflow";
rev = "a2b7b85134784317445faee13d647fb62401ea23";
sha256 = "1m6hnds12gpj66hcpaxgncapvslh0dml99r1vhg0r8rlmnmf0b9p";
rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b";
sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow";
@ -21324,6 +21490,27 @@
license = lib.licenses.free;
};
}) {};
markup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "markup";
version = "2.0.1";
src = fetchFromGitHub {
owner = "leoc";
repo = "markup.el";
rev = "876da2d3f23473475bb0fd0a1480ae11d2671291";
sha256 = "0rggadka5aqgrik3qky6s75s5yb5bfj6fcpxjz1iyrwi0fka0akd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a75c955ad6b2f68b8933329e545625d948f6f8f4/recipes/markup";
sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf";
name = "markup";
};
packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/markup";
license = lib.licenses.free;
};
}) {};
markup-faces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "markup-faces";
@ -21366,6 +21553,27 @@
license = lib.licenses.free;
};
}) {};
mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mastodon";
version = "0.6.0";
src = fetchFromGitHub {
owner = "jdenen";
repo = "mastodon.el";
rev = "9b9e0bb7c4d414ffc26a0547d1e76cd106cc58b6";
sha256 = "1cjx022zrn7jbcq1x7x61xayhlpik2bm6vs37hh382ad7bnqgcyb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
sha256 = "1bsyf4j6zs9gin0k7p22yv5gaqd6m3vdc2fiagfbs7gxsmhb6p4i";
name = "mastodon";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/mastodon";
license = lib.licenses.free;
};
}) {};
material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "material-theme";
@ -21600,12 +21808,12 @@
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "merlin";
version = "2.5.3";
version = "2.5.4";
src = fetchFromGitHub {
owner = "the-lambda-church";
repo = "merlin";
rev = "89f9643c08211a770454919551a7fd8605d1fca8";
sha256 = "13x0zjd297ssqmbvba32zk2p588kznd5ag4wh3nqb6fdgyzy4d63";
rev = "420416f182d2ea2a2285ab4bd22e5898dfb20a83";
sha256 = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@ -23317,12 +23525,12 @@
nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nyan-mode";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitHub {
owner = "TeMPOraL";
repo = "nyan-mode";
rev = "b5db3a612bba35c8f54f44c300ebc879db6b3288";
sha256 = "199ii1658k4sp5krha77n9l5jblyvnvvvr28g2nbc74lfybckjwq";
rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a";
sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode";
@ -23653,12 +23861,12 @@
omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "omni-log";
version = "0.1.2";
version = "0.3.3";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-log.el";
rev = "7eb30e42cc89064abb7acbec63cb9644c2ad7c9b";
sha256 = "030f983n19n64f8irif102nncvam04xpx020vfgja9886wlj40pk";
rev = "e86c80065030306645e28badcb0c25c549560106";
sha256 = "10nsl45z3a1mvagffcsqj501x8wk3avmsncyn9laq3k4z1hjgdz5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log";
@ -23674,12 +23882,12 @@
omni-quotes = callPackage ({ dash, f, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, omni-log, s }:
melpaBuild {
pname = "omni-quotes";
version = "0.3.0";
version = "0.4.22";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-quotes.el";
rev = "be1e719c046ca468275ed844989320f48358f2cd";
sha256 = "0sc4mhvxj91rs4h1vg3x759fq77cmlzkqyn5wv456w3w3g2narxw";
rev = "a10eca089dd87389c99f5c5ef8e3f8779f2652d2";
sha256 = "0i2xnpa6jickpp2i47c5l7c6djxz2lli8lcx402sijzmn1lx44sj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes";
@ -24910,12 +25118,12 @@
orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
melpaBuild {
pname = "orgit";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "magit";
repo = "orgit";
rev = "cbce5871fe267fef725631b0b7365952c35ae401";
sha256 = "00iwp3bajr9hxs55rj3ka5bymhp5icsq8m44z514sb8h54fwapb7";
rev = "c91e662ace7e3ce992269cbf755f378bc6742511";
sha256 = "0x7d8wjfg61gzi6ghq4cfkizzjcpiz56j797h6kmbri73yb7xf16";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit";
@ -25330,12 +25538,12 @@
package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-lint";
version = "0.4";
version = "0.5";
src = fetchFromGitHub {
owner = "purcell";
repo = "package-lint";
rev = "de08b846b3a031838b79445bb7a254c9de4a80f6";
sha256 = "0mvs4afjp5ab89vdz3bd9pca55brn57lxvjqjjyc6cyqxpclh06j";
rev = "1cee5135bd9a12e1b28e515a28093a751b4f7dd1";
sha256 = "1qvvdr5wx37x5jrw4hkx5vl4jmi3l1bjn97nnvwlsmzi6sgkcwsr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@ -26397,12 +26605,12 @@
pinyinlib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pinyinlib";
version = "0.1.0";
version = "0.1.1";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "pinyinlib.el";
rev = "f1e6c86f47e16c2bd48436630286bae8d6f8cb8c";
sha256 = "13q95z0j1mpk2yrrq0amc2jjhajaz4884bfliy2h8adh109j4q1d";
rev = "39943d226c2a42a9013421a0b4b6d5d3696bf234";
sha256 = "1nwj4c3y0kdlkf3jqd2dnibaiazrq6qcj533xk2qw4wmx072yij0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib";
@ -27297,12 +27505,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protobuf-mode";
version = "3.2.1";
version = "3.3.0pre1";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
rev = "b50c9ec1223895973d0e2fa6b6cb74ec3c8f3ce8";
sha256 = "17drjxry365als0drs56gzdpdjhkhjwg9jwvrhmq5dp9ly0rb2f4";
rev = "fba2acd72e8cbf138912295df227ee2c914158c3";
sha256 = "1862lp6br6ngfd13gz8m1x2glkz02qxbp6vj261ricbvc7fgkyd7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@ -28830,12 +29038,12 @@
rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "rjsx-mode";
version = "0.1.0";
version = "0.1.2";
src = fetchFromGitHub {
owner = "felipeochoa";
repo = "rjsx-mode";
rev = "20c7bd0e704dfc1c391edf78765c8b0ec4f5b3c0";
sha256 = "142zihjqgdq4bfy1hp0pz6k109ngii4kyc8xrdvd9yvzc0y5vp8a";
rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749";
sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@ -30529,12 +30737,12 @@
smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smartparens";
version = "1.9.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "smartparens";
rev = "253afc49ff30a19ea1a7af10e1e8abdb46546ac1";
sha256 = "0ml0fdvgx60vqansh4j17ihkrnyjdndkijysqhqx1q78d97vnhi4";
rev = "7841b2f02a1a99e1cb166d595f24f16a514ccbb5";
sha256 = "062g6y8an4kvfym2w56qy2iqd4ngxdxba38136ph0ckkzl0yrl7l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@ -30967,6 +31175,27 @@
license = lib.licenses.free;
};
}) {};
spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spaceline }:
melpaBuild {
pname = "spaceline-all-the-icons";
version = "1.0.5";
src = fetchFromGitHub {
owner = "domtronn";
repo = "spaceline-all-the-icons.el";
rev = "be53e5bde0e855c012bc99602830984a7008604a";
sha256 = "19xwy2dqlp585vi2ihr85rhf609lc57l133gc3bcz09aii24lfkb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
sha256 = "1h6clkr2f29k2vw0jcrmnfbjpphaxm7s3zai6pn6qag32bgm3jq6";
name = "spaceline-all-the-icons";
};
packageRequires = [ all-the-icons emacs spaceline ];
meta = {
homepage = "https://melpa.org/#/spaceline-all-the-icons";
license = lib.licenses.free;
};
}) {};
sparkline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sparkline";
@ -30991,12 +31220,12 @@
sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sparql-mode";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "ljos";
repo = "sparql-mode";
rev = "33da09b3895e03e64959005678d448ab82e527b6";
sha256 = "17fpfc0hc39y9h12mj62fwfga4mhk0c9fm2qnbnzf4i3ajhp7r2w";
rev = "a51d4e57974e8d06f7d49ada0fdca656b7470642";
sha256 = "0ywhqk6n5k0l85zjwbnrivnvxjzqipqrggv06lify6yv18qmyl6s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@ -32664,15 +32893,36 @@
license = lib.licenses.free;
};
}) {};
theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "theme-looper";
version = "1.0.0";
src = fetchFromGitHub {
owner = "myTerminal";
repo = "theme-looper";
rev = "5e3a3ea7ad31d4b38efa2cc08f0063b230736da9";
sha256 = "06khrrjlhnzckr2zisdbx4pj6r8kmv7dbdzvzh74qz79x337lvzn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper";
sha256 = "018bixcbzri3zsasy1pp2qfvgd679ylpi9gq26qv9iwlfhlrpwgf";
name = "theme-looper";
};
packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/theme-looper";
license = lib.licenses.free;
};
}) {};
thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "thinks";
version = "1.10";
version = "1.11";
src = fetchFromGitHub {
owner = "davep";
repo = "thinks.el";
rev = "370d399703d232010599d24a242b5f91e25a1b9d";
sha256 = "1kac32mgk2gcchh9lvnny81xq03h4656v05xyd3fpkpr30sisyrq";
rev = "f5a339b21cd5044f7b66beafab7c2d822c36f9e5";
sha256 = "1qjwzr9q98da25rf8hjgancb0k2kgr8xllhb4lhnqc8jsc4qnn5v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
@ -33428,12 +33678,12 @@
uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "uptimes";
version = "3.3";
version = "3.5";
src = fetchFromGitHub {
owner = "davep";
repo = "uptimes.el";
rev = "2be31db3508513478d3f27f4eff2ff1094786b4e";
sha256 = "177d1h84w9rr6x3hsq9z7sbr8s8pippgy0l99gpdhycbff6a7cwg";
rev = "07bcd6517243c9c9f61172202d33718bd9b2a850";
sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
@ -33659,12 +33909,12 @@
vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
melpaBuild {
pname = "vhdl-tools";
version = "5.4";
version = "5.5";
src = fetchFromGitHub {
owner = "csantosb";
repo = "vhdl-tools";
rev = "6f3f8ba58432dfdac59122164c732ccc0dfc475b";
sha256 = "076v5zafalv1r14ms90zs1p7yq11fzff4vywrda6dh63i0yk2vxs";
rev = "af4ff24ae4489e0a3bfbbddf6bc934f66b0af527";
sha256 = "1z88wy7m6rj028dqxzyyyf67gw4jqd72dgsvlr8inwimds2iplbv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@ -34121,12 +34371,12 @@
webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "webpaste";
version = "1.1.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "etu";
repo = "webpaste.el";
rev = "f6583397a4f8c9cde6b556175a6e05303d6238de";
sha256 = "0z7pkqfli1lqvfjjaf8p1sbbwf0f7xgz87k3rqqav9xyc9iqh0ni";
rev = "69f94520035282c3eb838e6f240a6db93e54b99c";
sha256 = "0qxcx2pns77s4mgr1cfzvlhxmfvzckx52phq63b2wmxkijkbwpba";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@ -34541,12 +34791,12 @@
winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "winum";
version = "1.0.0";
version = "1.0.2";
src = fetchFromGitHub {
owner = "deb0ch";
repo = "emacs-winum";
rev = "e89791b90e45f588f9e8c11884ea1daf3dc98518";
sha256 = "1gd0byijl5cyn6gkf5pkadzqvczshgizfrr3ddg6czvgblf1vgl9";
rev = "8e886302c7e1d8fd521a95e0f00d6efab295a883";
sha256 = "19rf806v3yv6qy6p8mf54g1whdrh7vc107z31kqaqdwq681fhi37";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";

View File

@ -17,6 +17,7 @@
, kparts
, ktexteditor
, kwindowsystem
, okular
, poppler
}:
@ -48,6 +49,7 @@ let
kparts
ktexteditor
kwindowsystem
okular.unwrapped
poppler
qtscript
];
@ -64,5 +66,5 @@ kdeWrapper
{
inherit unwrapped;
targets = [ "bin/kile" ];
paths = [ konsole.unwrapped ];
paths = [ konsole.unwrapped okular.unwrapped ];
}

View File

@ -4,7 +4,7 @@
extra-cmake-modules, kdoctools, makeWrapper,
karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
kservice, kpty, kwidgetsaddons, libarchive,
kservice, kpty, kwidgetsaddons, libarchive, kitemmodels,
# Archive tools
p7zip, unzipNLS, zip,
@ -22,7 +22,7 @@ let
];
propagatedBuildInputs = [
khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
kpty kwidgetsaddons libarchive
kpty kwidgetsaddons libarchive kitemmodels
];
postInstall =
let

View File

@ -1 +1 @@
WGET_ARGS=( http://download.kde.org/stable/applications/16.12.3/ -A '*.tar.xz' )
WGET_ARGS=( http://download.kde.org/stable/applications/17.04.0/ -A '*.tar.xz' )

View File

@ -1,7 +1,8 @@
{
kdeApp, lib, kdeWrapper,
cmake, automoc4,
kdelibs, perl, python, php
extra-cmake-modules, kdoctools,
kio, ki18n,
perl, python, php
}:
kdeWrapper {
@ -11,8 +12,8 @@ kdeWrapper {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ orivej ];
};
nativeBuildInputs = [ cmake automoc4 ];
buildInputs = [ kdelibs perl python php ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ perl python php kio ki18n ];
enableParallelBuilding = true;
};

View File

@ -1,6 +1,8 @@
{ kdeApp, lib, kdeWrapper
, extra-cmake-modules, qtscript, qtsvg, qtquickcontrols
, gpsd
, extra-cmake-modules, kdoctools
, qtscript, qtsvg, qtquickcontrols, qtwebkit
, krunner, shared_mime_info, kparts, knewstuff
, gpsd, perl
}:
let
@ -9,9 +11,10 @@ let
name = "marble";
meta.license = with lib.licenses; [ lgpl21 gpl3 ];
nativeBuildInputs = [ extra-cmake-modules ];
nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
propagatedBuildInputs = [
qtscript qtsvg qtquickcontrols
qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info
krunner kparts knewstuff
gpsd
];
@ -20,6 +23,6 @@ let
in
kdeWrapper {
inherit unwrapped;
targets = [ "bin/marble-qt" ];
targets = [ "bin/marble-qt" "bin/marble" ];
paths = [ unwrapped ];
}

File diff suppressed because it is too large Load Diff

View File

@ -1,32 +0,0 @@
{ stdenv, fetchgit, python3 }:
stdenv.mkDerivation {
name = "cortex-2015-08-23";
src = fetchgit {
url = "https://github.com/gglucas/cortex";
rev = "ff10ff860479fe2f50590c0f8fcfc6dc34446639";
sha256 = "0pa2kkkcnmf56d5d5kknv0gfahddym75xripd4kgszaj6hsib3zg";
};
buildInputs = [ stdenv python3 ];
prePatch = ''
substituteInPlace cortex --replace "/usr/bin/env python3" "${python3}/bin/python3"
'';
installPhase = ''
mkdir -p $out/bin
cp cortex $out/bin/
chmod +x $out/bin/cortex
'';
meta = with stdenv.lib; {
homepage = "http://cortex.glacicle.org";
description = "An ncurses reddit browser and monitor";
license = licenses.mit;
maintainers = with maintainers; [ matthiasbeyer ];
platforms = with platforms; unix;
};
}

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
version = "0.4.1";
version = "0.4.2";
name = "haxor-news-${version}";
src = fetchurl {
url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz";
sha256 = "0d3an7by33hjl8zg48y7ig6r258ghgbdkpp1psa9jr6n2nk2w9mr";
sha256 = "0543k5ys044f2a1q8k36djnnq2h2dffnwbkva9snjjy30nlwwdgs";
};
propagatedBuildInputs = with pythonPackages; [
@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
colorama
requests2
pygments
prompt_toolkit_52
prompt_toolkit
six
];

View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "hugo-${version}";
version = "0.20.2";
version = "0.20.5";
goPackagePath = "github.com/spf13/hugo";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "spf13";
repo = "hugo";
rev = "v${version}";
sha256 = "1dvd9kiqp87cbf027kvyqb282pxs8qm16r1dk74l5drranfvkszy";
sha256 = "0gsxsxri5jivvc862a1dapij667726vs55vjqas84lsg1066q5p2";
};
goDeps = ./deps.nix;

View File

@ -3,12 +3,12 @@
with python3Packages;
buildPythonApplication rec {
version = "0.9.2";
version = "0.9.5";
name = "khal-${version}";
src = fetchurl {
url = "mirror://pypi/k/khal/khal-${version}.tar.gz";
sha256 = "1ryh5c7408w8gpql5s9mkxkvz1ngnds3xm43p7r96ynx8prr9swp";
sha256 = "0fvv0kjym9q8v20zbpr5m8ig65b8hva4p0c935qsdvgdni68jidr";
};
LC_ALL = "en_US.UTF-8";

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pythonPackages }:
stdenv.mkDerivation rec {
version = "0.7.2";
version = "0.7.3";
name = "mwic-${version}";
src = fetchurl {
url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz";
sha256 = "1linpagf0i0ggicq02fcvz4rpx7xdpy80ys49wx7fnmz7f3jc6jy";
sha256 = "0baa2pnaba954k169p9rpzc66mhz9zqdd3lz9q95rp9dgygvchzn";
};
makeFlags=["PREFIX=\${out}"];

View File

@ -36,9 +36,14 @@ stdenv.mkDerivation rec {
'';
installPhase = let qst = "qsyncthingtray"; in ''
runHook preInstall
mkdir -p $out/bin
install -m755 QSyncthingTray $out/bin/${qst}
ln -s $out/bin/${qst} $out/bin/QSyncthingTray
wrapQtProgram $out/bin/qsyncthingtray
runHook postInstall
'';
meta = with stdenv.lib; {
@ -52,6 +57,7 @@ stdenv.mkDerivation rec {
license = licenses.lgpl3;
maintainers = with maintainers; [ zraexy peterhoeg ];
platforms = platforms.all;
broken = builtins.compareVersions qtbase.version "5.7.0" >= 0;
# 0.5.7 segfaults when opening the main panel with qt 5.7 but qt 5.8 is OK
broken = builtins.compareVersions qtbase.version "5.7.0" == 0;
};
}

View File

@ -1,28 +1,47 @@
{ stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
{ stdenv, fetchFromGitHub, pkgs, pythonPackages }:
pythonPackages.buildPythonApplication rec {
version = "1.14.1";
with pythonPackages;
buildPythonApplication rec {
version = "1.15.1";
name = "rtv-${version}";
src = fetchFromGitHub {
owner = "michael-lazar";
repo = "rtv";
rev = "v${version}";
sha256 = "03106sdsvj4zjjaqqg7qvm3n959plvy08a6n28ir1yf67kwzsx8a";
sha256 = "037dhds1prxj7vsq15dr46wk3pfk3ixr0d60m3h796b6nbc1spya";
};
propagatedBuildInputs = with pythonPackages; [
checkPhase = ''
py.test
'';
buildInputs = [
coverage
coveralls
docopt
mock
pylint
pytest
vcrpy
];
propagatedBuildInputs = [
backports_functools_lru_cache
beautifulsoup4
configparser
contextlib2
decorator
kitchen
mailcap-fix
tornado
mccabe
requests2
six
praw
kitchen
praw
] ++ lib.optional (!pythonPackages.isPy3k) futures;
tornado
pyyaml
];
meta = with lib; {
meta = with stdenv.lib; {
homepage = https://github.com/michael-lazar/rtv;
description = "Browse Reddit from your Terminal";
license = licenses.mit;

View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }:
stdenv.mkDerivation rec {
version = "0.5.0";
version = "0.6.0";
name = "sc-im-${version}";
src = fetchFromGitHub {
owner = "andmarti1424";
repo = "sc-im";
rev = "v${version}";
sha256 = "1vdn9p9srvdksxznrn65pfigwrd7brlq8bac3pjfqsvf8gjnzq61";
sha256 = "02ak3b0vv72mv38cwvy7qp0y6hgrzcgahkv1apgks3drpnz5w1sj";
};
buildInputs = [ yacc ncurses libxml2 libzip libxls pkgconfig ];

View File

@ -74,11 +74,8 @@ in buildPythonApplication rec {
'';
postFixup = ''
mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath
makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser \
wrapQtProgram $out/bin/qutebrowser \
${lib.optionalString withWebEngineDefault ''--add-flags "--backend webengine"''}
sed -i 's/\.qutebrowser-wrapped/qutebrowser/g' $out/bin/..qutebrowser-wrapped-wrapped
'';
meta = {

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "marathon-${version}";
version = "1.4.1";
version = "1.4.2";
src = fetchurl {
url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz";
sha256 = "1wpzsvvmk19qrwzwj7k12rngry1qriiqnjzq2q2pbpv5w0zb1fz5";
sha256 = "6eab65a95c87a989e922aca2b49ba872b50a94e46a8fd4831d1ab41f319d6932";
};
buildInputs = [ makeWrapper jdk mesos ];

View File

@ -23,11 +23,11 @@
let
# NOTE: When updating, please also update in current stable,
# as older versions stop working
version = "24.4.16";
version = "24.4.17";
sha256 =
{
"x86_64-linux" = "01hnx52ag7wfclxnqzs9m09pnmisz9lczxgg3wm47qmwhagnb8la";
"i686-linux" = "1cr0vfjwn60xdv2kh6kmmgf6g0s2y9mqklbfah59pm7k2yr2pvnf";
"x86_64-linux" = "1wjr92vrbxyjbwyqf134h8fp1zi4d5wyyirii545wqadbgg9grh9";
"i686-linux" = "1qsdidpy251irzkv0hx0ch0xnrwq6wq6b22g0n8b9d0a7xi08k7h";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch =

View File

@ -0,0 +1,24 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook }:
buildGoPackage rec {
name = "coyim-${version}";
version = "v0.3.7_1";
goPackagePath = "github.com/twstrike/coyim";
src = fetchFromGitHub {
owner = "twstrike";
repo = "coyim";
rev = "df2c52fe865d38fa27e8a7af1d87612e8c048805";
sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ];
meta = {
description = "a safe and secure chat client";
homepage = https://coy.im/;
license = stdenv.lib.licenses.gpl3;
};
}

View File

@ -0,0 +1,101 @@
{ stdenv, fetchurl, dpkg, makeWrapper
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2
, libnotify, nspr, nss, systemd, xorg }:
let
version = "5.1.0.1";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
atk
cairo
cups
curl
dbus
expat
fontconfig
freetype
glib
gnome2.GConf
gnome2.gdk_pixbuf
gnome2.gtk
gnome2.pango
gnome2.gnome_keyring
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
xorg.libxcb
] + ":${stdenv.cc.cc.lib}/lib64";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/latest/skypeforlinux-64.deb";
sha256 = "18v861x0n2q2jaglap8193sia476dwkwr0ccfzl29mi5ijma24ml";
}
else
throw "Skype for linux is not supported on ${stdenv.system}";
in stdenv.mkDerivation {
name = "skypeforlinux-${version}";
system = "x86_64-linux";
inherit src;
buildInputs = [ dpkg makeWrapper ];
unpackPhase = "true";
installPhase = ''
mkdir -p $out
dpkg -x $src $out
cp -av $out/usr/* $out
rm -rf $out/opt $out/usr
rm $out/bin/skypeforlinux
# Otherwise it looks "suspicious"
chmod -R g-w $out
'';
postFixup = ''
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/share/skypeforlinux:${rpath}" "$out/share/skypeforlinux/skypeforlinux"
ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
# Fix the desktop link
substituteInPlace $out/share/applications/skypeforlinux.desktop \
--replace /usr/bin/ $out/bin/ \
--replace /usr/share/ $out/share/
'';
meta = with stdenv.lib; {
description = "Linux client for skype";
homepage = "https://www.skype.com";
license = licenses.unfree;
maintainers = with stdenv.lib.maintainers; [ panaeon ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -2,7 +2,7 @@
, curl, dbus, dbus_glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor_icon_theme
, libarchive, libcanberra_gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager
, openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2
, glib_networking, gsettings_desktop_schemas
, glib_networking, gsettings_desktop_schemas, libSM, libytnef
# Build options
# TODO: A flag to build the manual.
@ -32,23 +32,27 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "claws-mail-${version}";
version = "3.14.1";
version = "3.15.0";
src = fetchurl {
url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
sha256 = "0df34gj4r5cbb92834hph19gnh7ih9rgmmw47rliyg8b9z01v6mp";
sha256 = "0bnwd3l04y6j1nw3h861rdy6k6lyjzsi51j04d33vbpq8c6jskaf";
};
patches = [ ./mime.patch ];
hardeningDisable = [ "format" ];
postPatch = ''
substituteInPlace src/procmime.c \
--subst-var-by MIMEROOTDIR ${shared_mime_info}/share
'';
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs =
[ curl dbus dbus_glib gtk2 gnutls gsettings_desktop_schemas hicolor_icon_theme
libetpan perl pkgconfig python wrapGAppsHook glib_networking
libetpan perl python glib_networking libSM libytnef
]
++ optional enableSpellcheck enchant
++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ]

View File

@ -1,5 +1,6 @@
{ stdenv, autoconf, automake, libtool, makeWrapper, fetchFromGitHub, pkgconfig
, intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib }:
{ stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig
, intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib
, hicolor_icon_theme }:
stdenv.mkDerivation rec {
@ -15,18 +16,12 @@ stdenv.mkDerivation rec {
preConfigure = "./autogen.sh";
nativeBuildInputs= [
autoconf automake libtool makeWrapper
pkgconfig intltool autoconf-archive
nativeBuildInputs= [
autoconf automake libtool wrapGAppsHook
pkgconfig intltool autoconf-archive
appstream-glib
];
buildInputs = [ gtk3 json_glib curl glib ];
preFixup = ''
wrapProgram "$out/bin/transmission-remote-gtk" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
rm $out/share/icons/hicolor/icon-theme.cache
'';
buildInputs = [ gtk3 json_glib curl glib hicolor_icon_theme ];
meta = with stdenv.lib;
{ description = "GTK remote control for the Transmission BitTorrent client";

View File

@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, python3Packages }:
stdenv.mkDerivation rec {
name = "bean-add-2017-01-20";
name = "bean-add-2017-04-06";
src = fetchFromGitHub {
owner = "simon-v";
repo = "bean-add";
rev = "752674259fb9512e076ef2048927fb791ad21507";
sha256 = "1ja26dgl2j25873s5nav57pjaqb9rr3mdbmkawajz2gdkk9r7n61";
rev = "67c3cd345dc370f8cd967a31549c1d0b86b07024";
sha256 = "0902lvwmf7k1h6gn3ilwzk20pxphbxsa3rn68jfhhfqpr6xpqf93";
};
propagatedBuildInputs = with python3Packages; [ python ];

View File

@ -107,7 +107,8 @@ stdenv.mkDerivation (rec {
# We want to do this before getting prefetched stuff to speed things up
# (prefetched stuff has lots of files)
find . -type f | xargs sed -i 's@/usr/bin/\(python\|perl\)@/usr/bin/env \1@g'
find . -type f | xargs sed -i 's@/bin/bash@/bin/sh@g'
find . -type f -not -path "./tools/hotplug/Linux/xendomains.in" \
| xargs sed -i 's@/bin/bash@/bin/sh@g'
# Get prefetched stuff
${withXenfiles (name: x: ''
@ -171,6 +172,11 @@ stdenv.mkDerivation (rec {
${config.postPatch or ""}
'';
postConfigure = ''
substituteInPlace tools/hotplug/Linux/xendomains \
--replace /bin/ls ls
'';
# TODO: Flask needs more testing before enabling it by default.
#makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ]

View File

@ -1,10 +1,13 @@
{stdenv, darcs, nix}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:
{stdenv, darcs, nix, cacert}:
{url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:
if md5 != "" then
throw "fetchdarcs does not support md5 anymore, please use sha256"
else
stdenv.mkDerivation {
name = "fetchdarcs";
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
builder = ./builder.sh;
buildInputs = [darcs];

View File

@ -0,0 +1,29 @@
{ stdenv, runCommand, awscli }:
{ s3url
, sha256
, region ? "us-east-1"
, credentials ? null # Default to looking at local EC2 metadata service
, executable ? false
, recursiveHash ? false
, postFetch ? null
}:
let
credentialAttrs = stdenv.lib.optionalAttrs (credentials != null) {
AWS_ACCESS_KEY_ID = credentials.access_key_id;
AWS_SECRET_ACCESS_KEY = credentials.secret_access_key;
AWS_SESSION_TOKEN = credentials.session_token ? null;
};
in runCommand "foo" ({
buildInputs = [ awscli ];
outputHashAlgo = "sha256";
outputHash = sha256;
outputHashMode = if recursiveHash then "recursive" else "flat";
} // credentialAttrs) (if postFetch != null then ''
downloadedFile="$(mktemp)"
aws s3 cp ${s3url} $downloadedFile
${postFetch}
'' else ''
aws s3 cp ${s3url} $out
'')

View File

@ -132,6 +132,9 @@ wrapProgram() {
local prog="$1"
local hidden
hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
while [ -e "$hidden" ]; do
hidden="${hidden}_"
done
mv "$prog" "$hidden"
# Silence warning about unexpanded $0:
# shellcheck disable=SC2016

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, python, ... }:
let
rev = "1.37.9";
rev = "1.37.10";
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in
stdenv.mkDerivation rec {
@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "kripken";
repo = "emscripten-fastcomp";
sha256 = "0dvay98hlajhwgl5s58sh8s79i4nbcl3gajssgzimk0id8fa0ifx";
sha256 = "0zl55jaas3cibjscr5q1q6rgw63wqwyc9iffhvs4xi9g1bk5cnx9";
inherit rev;
};
srcFL = fetchFromGitHub {
owner = "kripken";
repo = "emscripten-fastcomp-clang";
sha256 = "1ilrb6p3vybjz0hj8hc80hpm0y01794v488dywwj81khhqahnhcv";
sha256 = "0cdvld0lfl3cl7m6yax7f87ip9iq4rmz8icr68l2g8bl2w8qd89j";
inherit rev;
};

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
let
rev = "1.37.9";
rev = "1.37.10";
appdir = "share/emscripten";
in
@ -11,7 +11,7 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "kripken";
repo = "emscripten";
sha256 = "0dmvhw4j9bdqbdknz7ibg2fwzynw4w8ksnj8rkswdmp660889krp";
sha256 = "08f3zagxzsj96i09gjg1djd1bmy1gr1ar8n96mzg3ykaygf82d0s";
inherit rev;
};

View File

@ -20,12 +20,12 @@
, enableMultilib ? false
, name ? "gcc"
, cross ? null
, binutilsCross ? null
, libcCross ? null
, crossStageStatic ? true
, gnat ? null
, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd
, stripped ? true
, buildPlatform, hostPlatform, targetPlatform
}:
assert langJava -> zip != null && unzip != null
@ -224,7 +224,7 @@ stdenv.mkDerivation ({
++ (optional langJava boehmgc)
++ (optionals langJava [zip unzip])
++ (optionals javaAwtGtk ([gtk2 pkgconfig libart_lgpl] ++ xlibs))
++ (optionals (cross != null) [binutilsCross])
++ (optionals (cross != null) [binutils])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])
;
@ -271,15 +271,15 @@ stdenv.mkDerivation ({
targetConfig = if cross != null then cross.config else null;
crossAttrs = {
AR = "${stdenv.cross.config}-ar";
LD = "${stdenv.cross.config}-ld";
CC = "${stdenv.cross.config}-gcc";
CXX = "${stdenv.cross.config}-gcc";
AR_FOR_TARGET = "${stdenv.cross.config}-ar";
LD_FOR_TARGET = "${stdenv.cross.config}-ld";
CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
NM_FOR_TARGET = "${stdenv.cross.config}-nm";
CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
AR = "${targetPlatform.config}-ar";
LD = "${targetPlatform.config}-ld";
CC = "${targetPlatform.config}-gcc";
CXX = "${targetPlatform.config}-gcc";
AR_FOR_TARGET = "${targetPlatform.config}-ar";
LD_FOR_TARGET = "${targetPlatform.config}-ld";
CC_FOR_TARGET = "${targetPlatform.config}-gcc";
NM_FOR_TARGET = "${targetPlatform.config}-nm";
CXX_FOR_TARGET = "${targetPlatform.config}-g++";
# If we are making a cross compiler, cross != null
NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
dontStrip = true;
@ -311,7 +311,7 @@ stdenv.mkDerivation ({
${if langAda then " --enable-libada" else ""}
${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""}
--target=${stdenv.cross.config}
--target=${targetPlatform.config}
'';
};

View File

@ -26,7 +26,6 @@
, enablePlugin ? true # whether to support user-supplied plug-ins
, name ? "gcc"
, cross ? null
, binutilsCross ? null
, libcCross ? null
, crossStageStatic ? true
, gnat ? null
@ -34,6 +33,7 @@
, stripped ? true
, gnused ? null
, darwin ? null
, buildPlatform, hostPlatform, targetPlatform
}:
assert langJava -> zip != null && unzip != null
@ -123,12 +123,12 @@ let version = "4.8.5";
crossMingw = cross != null && cross.libc == "msvcrt";
crossDarwin = cross != null && cross.libc == "libSystem";
crossConfigureFlags = let
gccArch = stdenv.cross.gcc.arch or null;
gccCpu = stdenv.cross.gcc.cpu or null;
gccAbi = stdenv.cross.gcc.abi or null;
gccFpu = stdenv.cross.gcc.fpu or null;
gccFloat = stdenv.cross.gcc.float or null;
gccMode = stdenv.cross.gcc.mode or null;
gccArch = targetPlatform.gcc.arch or null;
gccCpu = targetPlatform.gcc.cpu or null;
gccAbi = targetPlatform.gcc.abi or null;
gccFpu = targetPlatform.gcc.fpu or null;
gccFloat = targetPlatform.gcc.float or null;
gccMode = targetPlatform.gcc.mode or null;
withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@ -170,8 +170,8 @@ let version = "4.8.5";
else " --with-headers=${libcCross.dev}/include") +
# Ensure that -print-prog-name is able to find the correct programs.
(stdenv.lib.optionalString (crossMingw || crossDarwin) (
" --with-as=${binutilsCross}/bin/${cross.config}-as" +
" --with-ld=${binutilsCross}/bin/${cross.config}-ld"
" --with-as=${binutils}/bin/${cross.config}-as" +
" --with-ld=${binutils}/bin/${cross.config}-ld"
)) +
" --enable-__cxa_atexit" +
" --enable-long-long" +
@ -293,7 +293,7 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (cross != null) [binutilsCross])
++ (optionals (cross != null) [binutils])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])
@ -382,26 +382,26 @@ stdenv.mkDerivation ({
else "install";
crossAttrs = let
xgccArch = stdenv.cross.gcc.arch or null;
xgccCpu = stdenv.cross.gcc.cpu or null;
xgccAbi = stdenv.cross.gcc.abi or null;
xgccFpu = stdenv.cross.gcc.fpu or null;
xgccFloat = stdenv.cross.gcc.float or null;
xgccArch = targetPlatform.gcc.arch or null;
xgccCpu = targetPlatform.gcc.cpu or null;
xgccAbi = targetPlatform.gcc.abi or null;
xgccFpu = targetPlatform.gcc.fpu or null;
xgccFloat = targetPlatform.gcc.float or null;
xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
in {
AR = "${stdenv.cross.config}-ar";
LD = "${stdenv.cross.config}-ld";
CC = "${stdenv.cross.config}-gcc";
CXX = "${stdenv.cross.config}-gcc";
AR_FOR_TARGET = "${stdenv.cross.config}-ar";
LD_FOR_TARGET = "${stdenv.cross.config}-ld";
CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
NM_FOR_TARGET = "${stdenv.cross.config}-nm";
CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
AR = "${targetPlatform.config}-ar";
LD = "${targetPlatform.config}-ld";
CC = "${targetPlatform.config}-gcc";
CXX = "${targetPlatform.config}-gcc";
AR_FOR_TARGET = "${targetPlatform.config}-ar";
LD_FOR_TARGET = "${targetPlatform.config}-ld";
CC_FOR_TARGET = "${targetPlatform.config}-gcc";
NM_FOR_TARGET = "${targetPlatform.config}-nm";
CXX_FOR_TARGET = "${targetPlatform.config}-g++";
# If we are making a cross compiler, cross != null
NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
dontStrip = true;
@ -431,7 +431,7 @@ stdenv.mkDerivation ({
)
}
${if langAda then " --enable-libada" else ""}
--target=${stdenv.cross.config}
--target=${targetPlatform.config}
${xwithArch}
${xwithCpu}
${xwithAbi}

View File

@ -26,7 +26,6 @@
, enablePlugin ? true # whether to support user-supplied plug-ins
, name ? "gcc"
, cross ? null
, binutilsCross ? null
, libcCross ? null
, crossStageStatic ? true
, gnat ? null
@ -34,6 +33,7 @@
, stripped ? true
, gnused ? null
, darwin ? null
, buildPlatform, hostPlatform, targetPlatform
}:
assert langJava -> zip != null && unzip != null
@ -125,12 +125,12 @@ let version = "4.9.4";
crossMingw = cross != null && cross.libc == "msvcrt";
crossDarwin = cross != null && cross.libc == "libSystem";
crossConfigureFlags = let
gccArch = stdenv.cross.gcc.arch or null;
gccCpu = stdenv.cross.gcc.cpu or null;
gccAbi = stdenv.cross.gcc.abi or null;
gccFpu = stdenv.cross.gcc.fpu or null;
gccFloat = stdenv.cross.gcc.float or null;
gccMode = stdenv.cross.gcc.mode or null;
gccArch = targetPlatform.gcc.arch or null;
gccCpu = targetPlatform.gcc.cpu or null;
gccAbi = targetPlatform.gcc.abi or null;
gccFpu = targetPlatform.gcc.fpu or null;
gccFloat = targetPlatform.gcc.float or null;
gccMode = targetPlatform.gcc.mode or null;
withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@ -171,8 +171,8 @@ let version = "4.9.4";
else " --with-headers=${libcCross.dev}/include") +
# Ensure that -print-prog-name is able to find the correct programs.
(stdenv.lib.optionalString (crossMingw || crossDarwin) (
" --with-as=${binutilsCross}/bin/${cross.config}-as" +
" --with-ld=${binutilsCross}/bin/${cross.config}-ld"
" --with-as=${binutils}/bin/${cross.config}-as" +
" --with-ld=${binutils}/bin/${cross.config}-ld"
)) +
" --enable-__cxa_atexit" +
" --enable-long-long" +
@ -298,7 +298,7 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (cross != null) [binutilsCross])
++ (optionals (cross != null) [binutils])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])
@ -389,26 +389,26 @@ stdenv.mkDerivation ({
else "install";
crossAttrs = let
xgccArch = stdenv.cross.gcc.arch or null;
xgccCpu = stdenv.cross.gcc.cpu or null;
xgccAbi = stdenv.cross.gcc.abi or null;
xgccFpu = stdenv.cross.gcc.fpu or null;
xgccFloat = stdenv.cross.gcc.float or null;
xgccArch = targetPlatform.gcc.arch or null;
xgccCpu = targetPlatform.gcc.cpu or null;
xgccAbi = targetPlatform.gcc.abi or null;
xgccFpu = targetPlatform.gcc.fpu or null;
xgccFloat = targetPlatform.gcc.float or null;
xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
in {
AR = "${stdenv.cross.config}-ar";
LD = "${stdenv.cross.config}-ld";
CC = "${stdenv.cross.config}-gcc";
CXX = "${stdenv.cross.config}-gcc";
AR_FOR_TARGET = "${stdenv.cross.config}-ar";
LD_FOR_TARGET = "${stdenv.cross.config}-ld";
CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
NM_FOR_TARGET = "${stdenv.cross.config}-nm";
CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
AR = "${targetPlatform.config}-ar";
LD = "${targetPlatform.config}-ld";
CC = "${targetPlatform.config}-gcc";
CXX = "${targetPlatform.config}-gcc";
AR_FOR_TARGET = "${targetPlatform.config}-ar";
LD_FOR_TARGET = "${targetPlatform.config}-ld";
CC_FOR_TARGET = "${targetPlatform.config}-gcc";
NM_FOR_TARGET = "${targetPlatform.config}-nm";
CXX_FOR_TARGET = "${targetPlatform.config}-g++";
# If we are making a cross compiler, cross != null
NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
dontStrip = true;
@ -438,7 +438,7 @@ stdenv.mkDerivation ({
)
}
${if langAda then " --enable-libada" else ""}
--target=${stdenv.cross.config}
--target=${targetPlatform.config}
${xwithArch}
${xwithCpu}
${xwithAbi}

View File

@ -26,7 +26,6 @@
, enablePlugin ? true # whether to support user-supplied plug-ins
, name ? "gcc"
, cross ? null
, binutilsCross ? null
, libcCross ? null
, crossStageStatic ? true
, gnat ? null
@ -36,6 +35,7 @@
, binutils ? null
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
, darwin ? null
, buildPlatform, hostPlatform, targetPlatform
}:
assert langJava -> zip != null && unzip != null
@ -129,12 +129,12 @@ let version = "5.4.0";
crossMingw = cross != null && cross.libc == "msvcrt";
crossDarwin = cross != null && cross.libc == "libSystem";
crossConfigureFlags = let
gccArch = stdenv.cross.gcc.arch or null;
gccCpu = stdenv.cross.gcc.cpu or null;
gccAbi = stdenv.cross.gcc.abi or null;
gccFpu = stdenv.cross.gcc.fpu or null;
gccFloat = stdenv.cross.gcc.float or null;
gccMode = stdenv.cross.gcc.mode or null;
gccArch = targetPlatform.gcc.arch or null;
gccCpu = targetPlatform.gcc.cpu or null;
gccAbi = targetPlatform.gcc.abi or null;
gccFpu = targetPlatform.gcc.fpu or null;
gccFloat = targetPlatform.gcc.float or null;
gccMode = targetPlatform.gcc.mode or null;
withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@ -175,8 +175,8 @@ let version = "5.4.0";
else " --with-headers=${getDev libcCross}/include") +
# Ensure that -print-prog-name is able to find the correct programs.
(stdenv.lib.optionalString (crossMingw || crossDarwin) (
" --with-as=${binutilsCross}/bin/${cross.config}-as" +
" --with-ld=${binutilsCross}/bin/${cross.config}-ld"
" --with-as=${binutils}/bin/${cross.config}-as" +
" --with-ld=${binutils}/bin/${cross.config}-ld"
)) +
" --enable-__cxa_atexit" +
" --enable-long-long" +
@ -237,10 +237,16 @@ stdenv.mkDerivation ({
# This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths.
prePatch = if stdenv.isDarwin then ''
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace gcc/config/darwin-c.c \
--replace 'if (stdinc)' 'if (0)'
'' else null;
substituteInPlace libgcc/config/t-slibgcc-darwin \
--replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)"
substituteInPlace libgfortran/configure \
--replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname"
'';
postPatch =
if (stdenv.isGNU
@ -308,7 +314,7 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (cross != null) [binutilsCross])
++ (optionals (cross != null) [binutils])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])
@ -398,26 +404,26 @@ stdenv.mkDerivation ({
else "install";
crossAttrs = let
xgccArch = stdenv.cross.gcc.arch or null;
xgccCpu = stdenv.cross.gcc.cpu or null;
xgccAbi = stdenv.cross.gcc.abi or null;
xgccFpu = stdenv.cross.gcc.fpu or null;
xgccFloat = stdenv.cross.gcc.float or null;
xgccArch = targetPlatform.gcc.arch or null;
xgccCpu = targetPlatform.gcc.cpu or null;
xgccAbi = targetPlatform.gcc.abi or null;
xgccFpu = targetPlatform.gcc.fpu or null;
xgccFloat = targetPlatform.gcc.float or null;
xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
in {
AR = "${stdenv.cross.config}-ar";
LD = "${stdenv.cross.config}-ld";
CC = "${stdenv.cross.config}-gcc";
CXX = "${stdenv.cross.config}-gcc";
AR_FOR_TARGET = "${stdenv.cross.config}-ar";
LD_FOR_TARGET = "${stdenv.cross.config}-ld";
CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
NM_FOR_TARGET = "${stdenv.cross.config}-nm";
CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
AR = "${targetPlatform.config}-ar";
LD = "${targetPlatform.config}-ld";
CC = "${targetPlatform.config}-gcc";
CXX = "${targetPlatform.config}-gcc";
AR_FOR_TARGET = "${targetPlatform.config}-ar";
LD_FOR_TARGET = "${targetPlatform.config}-ld";
CC_FOR_TARGET = "${targetPlatform.config}-gcc";
NM_FOR_TARGET = "${targetPlatform.config}-nm";
CXX_FOR_TARGET = "${targetPlatform.config}-g++";
# If we are making a cross compiler, cross != null
NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
dontStrip = true;
@ -446,7 +452,7 @@ stdenv.mkDerivation ({
)
}
${if langAda then " --enable-libada" else ""}
--target=${stdenv.cross.config}
--target=${targetPlatform.config}
${xwithArch}
${xwithCpu}
${xwithAbi}

View File

@ -26,7 +26,6 @@
, enablePlugin ? true # whether to support user-supplied plug-ins
, name ? "gcc"
, cross ? null
, binutilsCross ? null
, libcCross ? null
, crossStageStatic ? true
, gnat ? null
@ -36,6 +35,7 @@
, binutils ? null
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
, darwin ? null
, buildPlatform, hostPlatform, targetPlatform
}:
assert langJava -> zip != null && unzip != null
@ -125,12 +125,12 @@ let version = "6.3.0";
crossMingw = cross != null && cross.libc == "msvcrt";
crossDarwin = cross != null && cross.libc == "libSystem";
crossConfigureFlags = let
gccArch = stdenv.cross.gcc.arch or null;
gccCpu = stdenv.cross.gcc.cpu or null;
gccAbi = stdenv.cross.gcc.abi or null;
gccFpu = stdenv.cross.gcc.fpu or null;
gccFloat = stdenv.cross.gcc.float or null;
gccMode = stdenv.cross.gcc.mode or null;
gccArch = targetPlatform.gcc.arch or null;
gccCpu = targetPlatform.gcc.cpu or null;
gccAbi = targetPlatform.gcc.abi or null;
gccFpu = targetPlatform.gcc.fpu or null;
gccFloat = targetPlatform.gcc.float or null;
gccMode = targetPlatform.gcc.mode or null;
withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@ -171,8 +171,8 @@ let version = "6.3.0";
else " --with-headers=${getDev libcCross}/include") +
# Ensure that -print-prog-name is able to find the correct programs.
(stdenv.lib.optionalString (crossMingw || crossDarwin) (
" --with-as=${binutilsCross}/bin/${cross.config}-as" +
" --with-ld=${binutilsCross}/bin/${cross.config}-ld"
" --with-as=${binutils}/bin/${cross.config}-as" +
" --with-ld=${binutils}/bin/${cross.config}-ld"
)) +
" --enable-__cxa_atexit" +
" --enable-long-long" +
@ -296,7 +296,7 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (cross != null) [binutilsCross])
++ (optionals (cross != null) [binutils])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])
@ -386,26 +386,26 @@ stdenv.mkDerivation ({
else "install";
crossAttrs = let
xgccArch = stdenv.cross.gcc.arch or null;
xgccCpu = stdenv.cross.gcc.cpu or null;
xgccAbi = stdenv.cross.gcc.abi or null;
xgccFpu = stdenv.cross.gcc.fpu or null;
xgccFloat = stdenv.cross.gcc.float or null;
xgccArch = targetPlatform.gcc.arch or null;
xgccCpu = targetPlatform.gcc.cpu or null;
xgccAbi = targetPlatform.gcc.abi or null;
xgccFpu = targetPlatform.gcc.fpu or null;
xgccFloat = targetPlatform.gcc.float or null;
xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
in {
AR = "${stdenv.cross.config}-ar";
LD = "${stdenv.cross.config}-ld";
CC = "${stdenv.cross.config}-gcc";
CXX = "${stdenv.cross.config}-gcc";
AR_FOR_TARGET = "${stdenv.cross.config}-ar";
LD_FOR_TARGET = "${stdenv.cross.config}-ld";
CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
NM_FOR_TARGET = "${stdenv.cross.config}-nm";
CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
AR = "${targetPlatform.config}-ar";
LD = "${targetPlatform.config}-ld";
CC = "${targetPlatform.config}-gcc";
CXX = "${targetPlatform.config}-gcc";
AR_FOR_TARGET = "${targetPlatform.config}-ar";
LD_FOR_TARGET = "${targetPlatform.config}-ld";
CC_FOR_TARGET = "${targetPlatform.config}-gcc";
NM_FOR_TARGET = "${targetPlatform.config}-nm";
CXX_FOR_TARGET = "${targetPlatform.config}-g++";
# If we are making a cross compiler, cross != null
NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
dontStrip = true;
@ -434,7 +434,7 @@ stdenv.mkDerivation ({
)
}
${if langAda then " --enable-libada" else ""}
--target=${stdenv.cross.config}
--target=${targetPlatform.config}
${xwithArch}
${xwithCpu}
${xwithAbi}

View File

@ -212,6 +212,7 @@ postInstall() {
# Move runtime libraries to $lib.
moveToOutput "lib/lib*.so*" "$lib"
moveToOutput "lib/lib*.la" "$lib"
moveToOutput "lib/lib*.dylib" "$lib"
moveToOutput "share/gcc-*/python" "$lib"
for i in "$lib"/lib/*.{la,py}; do
@ -221,6 +222,7 @@ postInstall() {
if [ -n "$enableMultilib" ]; then
moveToOutput "lib64/lib*.so*" "$lib"
moveToOutput "lib64/lib*.la" "$lib"
moveToOutput "lib64/lib*.dylib" "$lib"
for i in "$lib"/lib64/*.{la,py}; do
substituteInPlace "$i" --replace "$out" "$lib"
@ -251,6 +253,16 @@ postInstall() {
done
fi
if type "install_name_tool"; then
for i in "$lib"/lib/*.*.dylib; do
install_name_tool -id "$i" "$i" || true
for old_path in $(otool -L "$i" | grep "$out" | awk '{print $1}'); do
new_path=`echo "$old_path" | sed "s,$out,$lib,"`
install_name_tool -change "$old_path" "$new_path" "$i" || true
done
done
fi
# Get rid of some "fixed" header files
rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux}

View File

@ -26,7 +26,6 @@
, enablePlugin ? true # whether to support user-supplied plug-ins
, name ? "gcc"
, cross ? null
, binutilsCross ? null
, libcCross ? null
, crossStageStatic ? true
, gnat ? null
@ -37,6 +36,7 @@
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
, darwin ? null
, flex ? null
, buildPlatform, hostPlatform, targetPlatform
}:
assert langJava -> zip != null && unzip != null
@ -125,12 +125,12 @@ let version = "7-20170409";
crossMingw = cross != null && cross.libc == "msvcrt";
crossDarwin = cross != null && cross.libc == "libSystem";
crossConfigureFlags = let
gccArch = stdenv.cross.gcc.arch or null;
gccCpu = stdenv.cross.gcc.cpu or null;
gccAbi = stdenv.cross.gcc.abi or null;
gccFpu = stdenv.cross.gcc.fpu or null;
gccFloat = stdenv.cross.gcc.float or null;
gccMode = stdenv.cross.gcc.mode or null;
gccArch = targetPlatform.gcc.arch or null;
gccCpu = targetPlatform.gcc.cpu or null;
gccAbi = targetPlatform.gcc.abi or null;
gccFpu = targetPlatform.gcc.fpu or null;
gccFloat = targetPlatform.gcc.float or null;
gccMode = targetPlatform.gcc.mode or null;
withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
@ -171,8 +171,8 @@ let version = "7-20170409";
else " --with-headers=${getDev libcCross}/include") +
# Ensure that -print-prog-name is able to find the correct programs.
(stdenv.lib.optionalString (crossMingw || crossDarwin) (
" --with-as=${binutilsCross}/bin/${cross.config}-as" +
" --with-ld=${binutilsCross}/bin/${cross.config}-ld"
" --with-as=${binutils}/bin/${cross.config}-as" +
" --with-ld=${binutils}/bin/${cross.config}-ld"
)) +
" --enable-__cxa_atexit" +
" --enable-long-long" +
@ -296,7 +296,7 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (cross != null) [binutilsCross])
++ (optionals (cross != null) [binutils])
++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])
@ -386,26 +386,26 @@ stdenv.mkDerivation ({
else "install";
crossAttrs = let
xgccArch = stdenv.cross.gcc.arch or null;
xgccCpu = stdenv.cross.gcc.cpu or null;
xgccAbi = stdenv.cross.gcc.abi or null;
xgccFpu = stdenv.cross.gcc.fpu or null;
xgccFloat = stdenv.cross.gcc.float or null;
xgccArch = targetPlatform.gcc.arch or null;
xgccCpu = targetPlatform.gcc.cpu or null;
xgccAbi = targetPlatform.gcc.abi or null;
xgccFpu = targetPlatform.gcc.fpu or null;
xgccFloat = targetPlatform.gcc.float or null;
xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
in {
AR = "${stdenv.cross.config}-ar";
LD = "${stdenv.cross.config}-ld";
CC = "${stdenv.cross.config}-gcc";
CXX = "${stdenv.cross.config}-gcc";
AR_FOR_TARGET = "${stdenv.cross.config}-ar";
LD_FOR_TARGET = "${stdenv.cross.config}-ld";
CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
NM_FOR_TARGET = "${stdenv.cross.config}-nm";
CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
AR = "${targetPlatform.config}-ar";
LD = "${targetPlatform.config}-ld";
CC = "${targetPlatform.config}-gcc";
CXX = "${targetPlatform.config}-gcc";
AR_FOR_TARGET = "${targetPlatform.config}-ar";
LD_FOR_TARGET = "${targetPlatform.config}-ld";
CC_FOR_TARGET = "${targetPlatform.config}-gcc";
NM_FOR_TARGET = "${targetPlatform.config}-nm";
CXX_FOR_TARGET = "${targetPlatform.config}-g++";
# If we are making a cross compiler, cross != null
NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
dontStrip = true;
@ -434,7 +434,7 @@ stdenv.mkDerivation ({
)
}
${if langAda then " --enable-libada" else ""}
--target=${stdenv.cross.config}
--target=${targetPlatform.config}
${xwithArch}
${xwithCpu}
${xwithAbi}

View File

@ -99,17 +99,17 @@ in stdenv.mkDerivation (rec {
configureFlags = [
"CC=${stdenv.ccCross}/bin/${cross.config}-cc"
"LD=${stdenv.binutilsCross}/bin/${cross.config}-ld"
"AR=${stdenv.binutilsCross}/bin/${cross.config}-ar"
"NM=${stdenv.binutilsCross}/bin/${cross.config}-nm"
"RANLIB=${stdenv.binutilsCross}/bin/${cross.config}-ranlib"
"LD=${stdenv.binutils}/bin/${cross.config}-ld"
"AR=${stdenv.binutils}/bin/${cross.config}-ar"
"NM=${stdenv.binutils}/bin/${cross.config}-nm"
"RANLIB=${stdenv.binutils}/bin/${cross.config}-ranlib"
"--target=${cross.config}"
"--enable-bootstrap-with-devel-snapshot"
] ++
# fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space";
buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutilsCross ];
buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ];
dontSetConfigureCross = true;
@ -118,6 +118,6 @@ in stdenv.mkDerivation (rec {
cc = "${stdenv.ccCross}/bin/${cross.config}-cc";
ld = "${stdenv.binutilsCross}/bin/${cross.config}-ld";
ld = "${stdenv.binutils}/bin/${cross.config}-ld";
};
})

View File

@ -46,7 +46,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://github.com/GaloisInc/HaLVM";
description = "The Haskell Lightweight Virtual Machine (HaLVM): GHC running on Xen";
platforms = ["x86_64-linux"]; # other platforms don't have Xen
maintainers = with stdenv.lib.maintainers; [ dmjio ];
inherit (bootPkgs.ghc.meta) license platforms;
inherit (bootPkgs.ghc.meta) license;
};
}

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
stdenv.mkDerivation rec {
version = "1.1.1";
version = "1.1.2";
name = "kotlin-${version}";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
sha256 = "1c96l1bkll0l8c82cfzmph0z38f96r3x68zmggq4s8hhdqgwk8mc";
sha256 = "0kngyv5qjjpd93i1b8gn1vw6r8p52lfjrqa2f13nf06v9aqk0vfb";
};
propagatedBuildInputs = [ jre ] ;

View File

@ -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 = subtractLists platforms.i686 (platforms.linux ++ platforms.darwin);
platforms = platforms.linux ++ platforms.darwin;
};
}

View File

@ -456,16 +456,6 @@ self: super: {
apiary-session = dontCheck super.apiary-session;
apiary-websockets = dontCheck super.apiary-websockets;
# See instructions provided by Peti in https://github.com/NixOS/nixpkgs/issues/23036
purescript = super.purescript.overrideScope (self: super: {
# TODO: Re-evaluate the following overrides after the 0.11 release.
aeson = self.aeson_0_11_3_0;
http-client = self.http-client_0_4_31_2;
http-client-tls = self.http-client-tls_0_2_4_1;
pipes = self.pipes_4_2_0;
websockets = self.websockets_0_9_8_2;
});
# HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence)
unlambda = dontHyperlinkSource super.unlambda;

View File

@ -37,7 +37,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 8.11
# LTS Haskell 8.12
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Vector ==2.3.2
@ -167,7 +167,7 @@ default-package-overrides:
- app-settings ==0.2.0.11
- appar ==0.1.4
- apportionment ==0.0.0.2
- arbtt ==0.9.0.12
- arbtt ==0.9.0.13
- arithmoi ==0.4.3.0
- array-memoize ==0.6.0
- arrow-extras ==0.1.0.1
@ -189,6 +189,7 @@ default-package-overrides:
- attoparsec ==0.13.1.0
- attoparsec-binary ==0.2
- attoparsec-expr ==0.1.1.2
- attoparsec-iso8601 ==1.0.0.0
- audacity ==0.0.1.1
- authenticate ==1.3.3.2
- authenticate-oauth ==1.6
@ -222,7 +223,7 @@ default-package-overrides:
- bento ==0.1.0
- between ==0.11.0.0
- bibtex ==0.1.0.6
- bifunctors ==5.4.1
- bifunctors ==5.4.2
- bimap ==0.3.2
- bimap-server ==0.1.0.1
- binary-bits ==0.5
@ -319,7 +320,7 @@ default-package-overrides:
- camfort ==0.901
- carray ==0.1.6.6
- cartel ==0.18.0.2
- case-insensitive ==1.2.0.8
- case-insensitive ==1.2.0.9
- cased ==0.1.0.0
- cases ==0.1.3.2
- casing ==0.1.2.1
@ -327,7 +328,7 @@ default-package-overrides:
- cassava-conduit ==0.3.5.1
- cassava-megaparsec ==0.1.0
- cassette ==0.1.0
- cayley-client ==0.4.0
- cayley-client ==0.4.1
- cereal ==0.5.4.0
- cereal-conduit ==0.7.3
- cereal-text ==0.1.0.2
@ -391,7 +392,7 @@ default-package-overrides:
- colour ==2.3.3
- comfort-graph ==0.0.2
- commutative ==0.0.1.4
- comonad ==5
- comonad ==5.0.1
- comonad-transformers ==4.0
- comonads-fd ==4.0
- compactmap ==0.1.4.2
@ -402,7 +403,7 @@ default-package-overrides:
- concurrent-output ==1.7.9
- concurrent-split ==0.0.1
- concurrent-supply ==0.1.8
- conduit ==1.2.9.1
- conduit ==1.2.10
- conduit-combinators ==1.1.1
- conduit-connection ==0.1.0.3
- conduit-extra ==1.1.15
@ -564,7 +565,7 @@ default-package-overrides:
- dockerfile ==0.1.0.1
- docopt ==0.7.0.5
- doctemplates ==0.1.0.2
- doctest ==0.11.1
- doctest ==0.11.2
- doctest-discover ==0.1.0.7
- dotenv ==0.3.1.0
- dotnet-timespan ==0.0.1.0
@ -595,11 +596,11 @@ default-package-overrides:
- effin ==0.3.0.2
- either ==4.4.1.1
- either-unwrap ==1.1
- ekg ==0.4.0.12
- ekg ==0.4.0.13
- ekg-core ==0.1.1.1
- ekg-json ==0.1.0.4
- ekg-json ==0.1.0.5
- ekg-statsd ==0.2.1.0
- ekg-wai ==0.1.0.0
- ekg-wai ==0.1.0.1
- elerea ==2.9.0
- elm-bridge ==0.4.0
- elm-core-sources ==1.0.0
@ -616,7 +617,7 @@ default-package-overrides:
- enummapset ==0.5.2.1
- enummapset-th ==0.6.1.1
- enumset ==0.0.4
- envelope ==0.2.1.0
- envelope ==0.2.2.0
- envparse ==0.4
- envy ==1.3.0.2
- epub-metadata ==4.5
@ -705,13 +706,13 @@ default-package-overrides:
- format-numbers ==0.1.0.0
- formatting ==6.2.4
- fortran-src ==0.1.0.4
- foundation ==0.0.6
- foundation ==0.0.7
- Frames ==0.1.9
- free ==4.12.4
- free-vl ==0.1.4
- freenect ==1.2.1
- freer ==0.2.4.1
- freer-effects ==0.3.0.0
- freer-effects ==0.3.0.1
- friendly-time ==0.4
- frisby ==0.2
- from-sum ==0.2.1.0
@ -730,7 +731,7 @@ default-package-overrides:
- generic-xmlpickler ==0.1.0.5
- GenericPretty ==1.2.1
- generics-eot ==0.2.1.1
- generics-sop ==0.2.4.0
- generics-sop ==0.2.5.0
- generics-sop-lens ==0.1.2.1
- geniplate-mirror ==0.7.4
- getopt-generics ==0.13
@ -764,11 +765,11 @@ default-package-overrides:
- gi-webkit ==3.0.11
- ginger ==0.3.9.1
- gio ==0.13.3.1
- gipeda ==0.3.3.1
- gipeda ==0.3.3.2
- giphy-api ==0.5.2.0
- git ==0.2.0
- github ==0.15.0
- github-release ==1.0.1
- github-release ==1.0.2
- github-types ==0.2.1
- github-webhook-handler ==0.0.8
- github-webhook-handler-snap ==0.0.7
@ -778,7 +779,7 @@ default-package-overrides:
- gitrev ==1.2.0
- gitson ==0.5.2
- gl ==0.8.0
- glabrous ==0.3.1
- glabrous ==0.3.2
- glaze ==0.2.0.2
- glazier ==0.7.0.0
- glazier-pipes ==0.1.4.0
@ -899,11 +900,11 @@ default-package-overrides:
- graphviz ==2999.18.1.2
- gravatar ==0.8.0
- graylog ==0.1.0.1
- groom ==0.1.2
- groom ==0.1.2.1
- groundhog ==0.8
- groundhog-inspector ==0.8
- groundhog-mysql ==0.8
- groundhog-postgresql ==0.8
- groundhog-postgresql ==0.8.0.1
- groundhog-sqlite ==0.8
- groundhog-th ==0.8
- grouped-list ==0.2.1.2
@ -918,7 +919,7 @@ default-package-overrides:
- hackage-security ==0.5.2.2
- hackernews ==1.1.1.0
- haddock-library ==1.4.3
- hailgun ==0.4.1.2
- hailgun ==0.4.1.3
- hailgun-simple ==0.1.0.0
- hakyll ==4.9.5.1
- half ==0.2.2.3
@ -941,7 +942,7 @@ default-package-overrides:
- hashable-time ==0.2.0.1
- hashmap ==1.3.2
- hashtables ==1.2.1.1
- haskeline ==0.7.3.1
- haskeline ==0.7.4.0
- haskell-gi ==0.20.1
- haskell-gi-base ==0.20.2
- haskell-import-graph ==1.0.1
@ -1015,7 +1016,7 @@ default-package-overrides:
- hjpath ==3.0.1
- hjsmin ==0.2.0.2
- hjson ==1.3.2
- hjsonpointer ==1.1.0.2
- hjsonpointer ==1.1.1
- hjsonschema ==1.5.0.1
- hlibgit2 ==0.18.0.16
- hlibsass ==0.1.6.0
@ -1038,7 +1039,7 @@ default-package-overrides:
- hostname ==1.0
- hostname-validate ==1.0.0
- hourglass ==0.2.10
- hpc-coveralls ==1.0.8
- hpc-coveralls ==1.0.9
- hPDB ==1.2.0.9
- hPDB-examples ==1.2.0.7
- HPDF ==1.4.10
@ -1065,10 +1066,10 @@ default-package-overrides:
- hsinstall ==1.5
- hslogger ==1.2.10
- hslua ==0.4.1
- hslua-aeson ==0.1.0.3
- hslua-aeson ==0.1.0.4
- hsndfile ==0.8.0
- hsndfile-vector ==0.5.2
- HsOpenSSL ==0.11.4.6
- HsOpenSSL ==0.11.4.7
- HsOpenSSL-x509-system ==0.1.0.3
- hsp ==0.10.0
- hspec ==2.4.3
@ -1101,7 +1102,7 @@ default-package-overrides:
- html-email-validate ==0.2.0.0
- htoml ==1.0.0.3
- HTTP ==4000.3.6
- http-api-data ==0.3.6
- http-api-data ==0.3.7
- http-client ==0.5.6.1
- http-client-openssl ==0.2.0.5
- http-client-tls ==0.3.4.1
@ -1110,7 +1111,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.3
- http-reverse-proxy ==0.4.4
- http-streams ==0.8.4.0
- http-types ==0.9.1
- http2 ==1.6.3
@ -1180,7 +1181,7 @@ default-package-overrides:
- IntervalMap ==0.5.2.0
- intervals ==0.7.2
- intro ==0.1.0.10
- invariant ==0.4
- invariant ==0.4.1
- invertible ==0.2.0.2
- io-choice ==0.0.6
- io-machine ==0.2.0.0
@ -1214,8 +1215,8 @@ default-package-overrides:
- jmacro-rpc-happstack ==0.3.2
- jmacro-rpc-snap ==0.3
- jni ==0.2.3
- jose ==0.5.0.2
- jose-jwt ==0.7.5
- jose ==0.5.0.3
- jose-jwt ==0.7.6
- js-flot ==0.8.3
- js-jquery ==3.1.1
- json ==0.9.1
@ -1234,7 +1235,7 @@ default-package-overrides:
- kansas-comet ==0.4
- katip ==0.3.1.4
- katip-elasticsearch ==0.3.0.2
- kawhi ==0.2.1
- kawhi ==0.2.2
- kdt ==0.2.4
- keter ==1.4.3.2
- keycode ==0.2.2
@ -1334,13 +1335,13 @@ default-package-overrides:
- mainland-pretty ==0.4.1.4
- makefile ==0.1.1.0
- managed ==1.0.5
- mandrill ==0.5.3.1
- mandrill ==0.5.3.2
- markdown ==0.1.16
- markdown-unlit ==0.4.0
- markov-chain ==0.0.3.4
- markup ==3.1.0
- marvin ==0.2.3
- marvin-interpolate ==1.1
- marvin-interpolate ==1.1.1
- math-functions ==0.2.1.0
- mathexpr ==0.3.0.0
- matplotlib ==0.4.3
@ -1351,7 +1352,7 @@ default-package-overrides:
- mbox ==0.3.3
- mbox-utility ==0.0
- mcmc-types ==1.0.3
- mediabus ==0.3.2.1
- mediabus ==0.3.3.0
- mediabus-rtp ==0.3.2.1
- median-stream ==0.7.0.0
- mega-sdist ==0.3.0.2
@ -1368,7 +1369,7 @@ default-package-overrides:
- microbench ==0.1
- microformats2-parser ==1.0.1.6
- microlens ==0.4.8.0
- microlens-aeson ==2.2.0
- microlens-aeson ==2.2.0.1
- microlens-contra ==0.1.0.1
- microlens-ghc ==0.4.8.0
- microlens-mtl ==0.1.10.0
@ -1508,7 +1509,7 @@ default-package-overrides:
- oanda-rest-api ==0.3.0.0
- objective ==1.1.1
- ObjectName ==1.1.0.1
- octane ==0.18.2
- octane ==0.18.3
- Octree ==0.5.4.3
- oeis ==0.3.9
- ofx ==0.4.2.0
@ -1593,7 +1594,7 @@ default-package-overrides:
- pinboard ==0.9.12.4
- pinch ==0.3.0.2
- pinchot ==0.24.0.0
- pipes ==4.3.2
- pipes ==4.3.3
- pipes-attoparsec ==0.5.1.5
- pipes-bytestring ==2.1.4
- pipes-cacophony ==0.4.1
@ -1718,7 +1719,7 @@ default-package-overrides:
- rank1dynamic ==0.3.3.0
- Rasterific ==0.7.2.1
- rasterific-svg ==0.3.2.1
- ratel ==0.3.2
- ratel ==0.3.3
- ratel-wai ==0.2.0
- rattletrap ==2.1.5
- raw-strings-qq ==1.1
@ -1872,7 +1873,7 @@ default-package-overrides:
- SHA ==1.6.4.2
- shake ==0.15.11
- shake-language-c ==0.10.1
- shakespeare ==2.0.12.1
- shakespeare ==2.0.13
- shell-conduit ==4.5.2
- shelly ==1.6.8.3
- shortcut-links ==0.4.2.0
@ -1899,7 +1900,7 @@ default-package-overrides:
- slug ==0.1.6
- smallcaps ==0.6.0.4
- smallcheck ==1.1.1
- smoothie ==0.4.2.6
- smoothie ==0.4.2.7
- smtLib ==1.0.8
- smtp-mail ==0.1.4.6
- snap-blaze ==0.2.1.5
@ -1942,7 +1943,7 @@ default-package-overrides:
- stack-run-auto ==0.1.1.4
- stack-type ==0.1.0.0
- stackage-curator ==0.14.5
- state-plus ==0.1.2
- state-plus ==0.1.3
- stateref ==0.3
- statestack ==0.2.0.5
- StateVar ==1.1.0.4
@ -1993,7 +1994,7 @@ default-package-overrides:
- stripe-haskell ==2.2.1
- stripe-http-streams ==2.2.1
- stripe-tests ==2.2.1
- strive ==3.0.2
- strive ==3.0.3
- stylish-haskell ==0.7.1.0
- success ==0.2.6
- sundown ==0.6
@ -2059,7 +2060,7 @@ default-package-overrides:
- termcolor ==0.2.0.0
- terminal-progress-bar ==0.1.1
- terminal-size ==0.3.2.1
- terminfo ==0.4.0.2
- terminfo ==0.4.1.0
- test-fixture ==0.5.0.0
- test-framework ==0.8.1.1
- test-framework-hunit ==0.3.0.2
@ -2091,9 +2092,9 @@ default-package-overrides:
- tfp ==1.0.0.2
- th-data-compat ==0.0.2.2
- th-desugar ==1.6
- th-expand-syns ==0.4.2.0
- th-expand-syns ==0.4.3.0
- th-extras ==0.0.0.4
- th-lift ==0.7.6
- th-lift ==0.7.7
- th-lift-instances ==0.1.11
- th-orphans ==0.13.3
- th-reify-compat ==0.0.1.1
@ -2140,7 +2141,7 @@ default-package-overrides:
- true-name ==0.1.0.2
- tsv2csv ==0.1.0.2
- ttrie ==0.1.2.1
- tttool ==1.7.0.1
- tttool ==1.7.0.2
- tuple ==0.3.0.2
- tuple-th ==0.2.5
- tuples-homogenous-h98 ==0.1.1.0
@ -2224,7 +2225,7 @@ default-package-overrides:
- validate-input ==0.4.0.0
- validation ==0.5.4
- varying ==0.7.0.3
- vault ==0.3.0.6
- vault ==0.3.0.7
- vcswrapper ==0.1.5
- vector ==0.11.0.0
- vector-algorithms ==0.7.0.1
@ -2289,7 +2290,7 @@ default-package-overrides:
- web-routes-hsp ==0.24.6.1
- web-routes-th ==0.22.6.1
- web-routes-wai ==0.24.3
- webdriver ==0.8.4
- webdriver ==0.8.5
- webdriver-angular ==0.1.11
- webkitgtk3 ==0.14.2.1
- webkitgtk3-javascriptcore ==0.14.2.1
@ -2297,7 +2298,7 @@ default-package-overrides:
- webrtc-vad ==0.1.0.3
- websockets ==0.10.0.0
- websockets-rpc ==0.0.2
- websockets-snap ==0.10.2.0
- websockets-snap ==0.10.2.1
- weigh ==0.0.3
- wikicfp-scraper ==0.1.0.8
- wild-bind ==0.1.0.3
@ -2331,7 +2332,7 @@ default-package-overrides:
- writer-cps-morph ==0.1.0.2
- writer-cps-mtl ==0.1.1.3
- writer-cps-transformers ==0.1.1.2
- wuss ==1.1.3
- wuss ==1.1.4
- X11 ==1.8
- X11-xft ==0.3.1
- x509 ==1.6.5
@ -2374,7 +2375,7 @@ default-package-overrides:
- yesod-auth ==1.4.17
- yesod-auth-account ==1.4.3
- yesod-auth-basic ==0.1.0.2
- yesod-auth-hashdb ==1.6.0.1
- yesod-auth-hashdb ==1.6.1
- yesod-bin ==1.5.2.2
- yesod-core ==1.4.33
- yesod-eventsource ==1.4.1
@ -2469,9 +2470,7 @@ package-maintainers:
- git-annex
- hackage-db
- hledger
- hledger-diff
- hledger-interest
- hledger-irr
- hledger-ui
- hledger-web
- hopenssl
@ -2517,15 +2516,34 @@ package-maintainers:
dont-distribute-packages:
# hard restrictions that really belong into meta.platforms
alsa-mixer: [ i686-linux, x86_64-linux ]
alsa-pcm: [ i686-linux, x86_64-linux ]
alsa-seq: [ i686-linux, x86_64-linux ]
AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin ]
bindings-directfb: [ i686-linux, x86_64-linux ]
d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin ]
DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin ]
dx9base: [ i686-linux, x86_64-linux, x86_64-darwin ]
dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin ]
dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin ]
freenect: [ i686-linux, x86_64-linux ]
FTGL: [ i686-linux, x86_64-linux ]
gi-ostree: [ i686-linux, x86_64-linux ]
hcwiid: [ i686-linux, x86_64-linux ]
hfsevents: [ i686-linux, x86_64-linux ]
HFuse: [ i686-linux, x86_64-linux ]
hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin ]
lio-fs: [ i686-linux, x86_64-linux ]
midi-alsa: [ i686-linux, x86_64-linux ]
pam: [ i686-linux, x86_64-linux ]
PortMidi: [ i686-linux, x86_64-linux ]
Raincat: [ i686-linux, x86_64-linux ]
reactivity: [ i686-linux, x86_64-linux, x86_64-darwin ]
rtlsdr: [ i686-linux, x86_64-linux ]
rubberband: [ i686-linux, x86_64-linux ]
sdl2-mixer: [ i686-linux, x86_64-linux ]
sdl2-ttf: [ i686-linux, x86_64-linux ]
tokyotyrant-haskell: [ i686-linux, x86_64-linux ]
Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin ]
Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2536,7 +2554,9 @@ dont-distribute-packages:
Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin ]
Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin ]
Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin ]
xattr: [ i686-linux, x86_64-linux ]
XInput: [ i686-linux, x86_64-linux, x86_64-darwin ]
xmobar: [ i686-linux, x86_64-linux ]
# Depens on shine, which is a ghcjs project.
shine-varying: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2580,6 +2600,8 @@ dont-distribute-packages:
accelerate-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ]
accelerate-fourier: [ i686-linux, x86_64-linux, x86_64-darwin ]
accelerate-io: [ i686-linux, x86_64-linux, x86_64-darwin ]
accelerate-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ]
accelerate-llvm-native: [ i686-linux, x86_64-linux, x86_64-darwin ]
accelerate-random: [ i686-linux, x86_64-linux, x86_64-darwin ]
accelerate-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ]
accelerate-utility: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3042,6 +3064,7 @@ dont-distribute-packages:
bliplib: [ i686-linux, x86_64-linux, x86_64-darwin ]
Blobs: [ i686-linux, x86_64-linux, x86_64-darwin ]
blockhash: [ i686-linux, x86_64-linux, x86_64-darwin ]
Blogdown: [ i686-linux, x86_64-linux, x86_64-darwin ]
blogination: [ i686-linux, x86_64-linux, x86_64-darwin ]
BlogLiterately-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ]
BlogLiterately: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3221,6 +3244,8 @@ dont-distribute-packages:
cctools-workqueue: [ i686-linux, x86_64-linux, x86_64-darwin ]
c-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ]
cedict: [ i686-linux, x86_64-linux, x86_64-darwin ]
cef3-raw: [ i686-linux, x86_64-linux, x86_64-darwin ]
cef3-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
ceilometer-common: [ i686-linux, x86_64-linux, x86_64-darwin ]
cellrenderer-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ]
cerberus: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3338,6 +3363,7 @@ dont-distribute-packages:
closure: [ i686-linux, x86_64-linux, x86_64-darwin ]
cloudfront-signer: [ i686-linux, x86_64-linux, x86_64-darwin ]
cloud-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
cloudi: [ i686-linux, x86_64-linux, x86_64-darwin ]
cloudyfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
clua: [ i686-linux, x86_64-linux, x86_64-darwin ]
cluss: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3377,6 +3403,7 @@ dont-distribute-packages:
collections: [ i686-linux, x86_64-linux, x86_64-darwin ]
colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ]
color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ]
colour-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ]
colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ]
coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ]
combinat-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3387,6 +3414,7 @@ dont-distribute-packages:
combobuffer: [ i686-linux, x86_64-linux, x86_64-darwin ]
comfort-graph: [ i686-linux, x86_64-linux, x86_64-darwin ]
com: [ i686-linux, x86_64-linux, x86_64-darwin ]
comic: [ i686-linux, x86_64-linux, x86_64-darwin ]
commander: [ i686-linux, x86_64-linux, x86_64-darwin ]
Commando: [ i686-linux, x86_64-linux, x86_64-darwin ]
commodities: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3999,6 +4027,10 @@ dont-distribute-packages:
Eternal10Seconds: [ i686-linux, x86_64-linux, x86_64-darwin ]
eternal: [ i686-linux, x86_64-linux, x86_64-darwin ]
Etherbunny: [ i686-linux, x86_64-linux, x86_64-darwin ]
ethereum-analyzer-cli: [ i686-linux, x86_64-linux, x86_64-darwin ]
ethereum-analyzer-deps: [ i686-linux, x86_64-linux, x86_64-darwin ]
ethereum-analyzer: [ i686-linux, x86_64-linux, x86_64-darwin ]
ethereum-analyzer-webui: [ i686-linux, x86_64-linux, x86_64-darwin ]
ethereum-client-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
ethereum-merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ]
eurofxref: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4095,6 +4127,7 @@ dont-distribute-packages:
fficxx: [ i686-linux, x86_64-linux, x86_64-darwin ]
ffmpeg-tutorials: [ i686-linux, x86_64-linux, x86_64-darwin ]
fibon: [ i686-linux, x86_64-linux, x86_64-darwin ]
ficketed: [ i686-linux, x86_64-linux, x86_64-darwin ]
fields: [ i686-linux, x86_64-linux, x86_64-darwin ]
FieldTrip: [ i686-linux, x86_64-linux, x86_64-darwin ]
fieldwise: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4308,6 +4341,7 @@ dont-distribute-packages:
genvalidity-containers: [ i686-linux, x86_64-linux, x86_64-darwin ]
genvalidity-hspec-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
genvalidity-hspec-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ]
genvalidity-hspec-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ]
genvalidity-hspec: [ i686-linux, x86_64-linux, x86_64-darwin ]
genvalidity-path: [ i686-linux, x86_64-linux, x86_64-darwin ]
genvalidity-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4473,6 +4507,7 @@ dont-distribute-packages:
gogol-safebrowsing: [ i686-linux, x86_64-linux, x86_64-darwin ]
gogol-servicecontrol: [ i686-linux, x86_64-linux, x86_64-darwin ]
gogol-servicemanagement: [ i686-linux, x86_64-linux, x86_64-darwin ]
gogol-sheets: [ i686-linux, x86_64-linux, x86_64-darwin ]
gogol-slides: [ i686-linux, x86_64-linux, x86_64-darwin ]
gooey: [ i686-linux, x86_64-linux, x86_64-darwin ]
GoogleDirections: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4500,6 +4535,7 @@ dont-distribute-packages:
GPipe-Collada: [ i686-linux, x86_64-linux, x86_64-darwin ]
GPipe-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
GPipe-GLFW: [ i686-linux, x86_64-linux, x86_64-darwin ]
GPipe: [ i686-linux, x86_64-linux, x86_64-darwin ]
GPipe-TextureLoad: [ i686-linux, x86_64-linux, x86_64-darwin ]
gps2htmlReport: [ i686-linux, x86_64-linux, x86_64-darwin ]
gps: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4544,6 +4580,7 @@ dont-distribute-packages:
greg-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
gremlin-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
Grempa: [ i686-linux, x86_64-linux, x86_64-darwin ]
grenade: [ i686-linux, x86_64-linux, x86_64-darwin ]
gridbounds: [ i686-linux, x86_64-linux, x86_64-darwin ]
gridfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
grid: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4664,6 +4701,7 @@ dont-distribute-packages:
halfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ]
halive: [ i686-linux, x86_64-linux, x86_64-darwin ]
halma-gui: [ i686-linux, x86_64-linux, x86_64-darwin ]
halma: [ i686-linux, x86_64-linux, x86_64-darwin ]
hamilton: [ i686-linux, x86_64-linux, x86_64-darwin ]
HaMinitel: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4788,6 +4826,7 @@ dont-distribute-packages:
haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-go-checkers: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-igraph: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-import-graph: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-kubernetes: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4941,6 +4980,7 @@ dont-distribute-packages:
heaps: [ i686-linux, x86_64-linux, x86_64-darwin ]
hecc: [ i686-linux, x86_64-linux, x86_64-darwin ]
heckle: [ i686-linux, x86_64-linux, x86_64-darwin ]
hedgehog: [ i686-linux, x86_64-linux, x86_64-darwin ]
Hedi: [ i686-linux, x86_64-linux, x86_64-darwin ]
hedis-pile: [ i686-linux, x86_64-linux, x86_64-darwin ]
hedis-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5097,10 +5137,12 @@ dont-distribute-packages:
HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-irr: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlibsass: [ i686-linux, x86_64-linux, x86_64-darwin ]
HList: [ i686-linux, x86_64-linux, x86_64-darwin ]
HListPP: [ i686-linux, x86_64-linux, x86_64-darwin ]
hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5114,6 +5156,7 @@ dont-distribute-packages:
hmatrix-glpk: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmatrix-nlopt: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmatrix-repa: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmatrix-special: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5236,6 +5279,7 @@ dont-distribute-packages:
hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ]
Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ]
hS3: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsass: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsay: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsbackup: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsbencher-codespeed: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5329,6 +5373,7 @@ dont-distribute-packages:
hspec-expectations-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-golden-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-hedgehog: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-jenkins: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-monad-control: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5612,6 +5657,7 @@ dont-distribute-packages:
ipopt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
iptables-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ]
iptadmin: [ i686-linux, x86_64-linux, x86_64-darwin ]
IPv6DB: [ i686-linux, x86_64-linux, x86_64-darwin ]
ipython-kernel: [ i686-linux, x86_64-linux, x86_64-darwin ]
ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ]
irc-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5664,6 +5710,7 @@ dont-distribute-packages:
jalaali: [ i686-linux, x86_64-linux, x86_64-darwin ]
jalla: [ i686-linux, x86_64-linux, x86_64-darwin ]
jarfind: [ i686-linux, x86_64-linux, x86_64-darwin ]
jarify: [ i686-linux, x86_64-linux, x86_64-darwin ]
jason: [ i686-linux, x86_64-linux, x86_64-darwin ]
java-bridge-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
java-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5755,6 +5802,7 @@ dont-distribute-packages:
kansas-lava-papilio: [ i686-linux, x86_64-linux, x86_64-darwin ]
kansas-lava-shake: [ i686-linux, x86_64-linux, x86_64-darwin ]
karakuri: [ i686-linux, x86_64-linux, x86_64-darwin ]
karps: [ i686-linux, x86_64-linux, x86_64-darwin ]
katip-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ]
katip: [ i686-linux, x86_64-linux, x86_64-darwin ]
katt: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -5910,6 +5958,7 @@ dont-distribute-packages:
legion-extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
legion: [ i686-linux, x86_64-linux, x86_64-darwin ]
leksah: [ i686-linux, x86_64-linux, x86_64-darwin ]
leksah-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
lendingclub: [ i686-linux, x86_64-linux, x86_64-darwin ]
lenses: [ i686-linux, x86_64-linux, x86_64-darwin ]
lens-properties: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6097,6 +6146,7 @@ dont-distribute-packages:
lui: [ i686-linux, x86_64-linux, x86_64-darwin ]
luis-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
luka: [ i686-linux, x86_64-linux, x86_64-darwin ]
luminance: [ i686-linux, x86_64-linux, x86_64-darwin ]
luminance-samples: [ i686-linux, x86_64-linux, x86_64-darwin ]
lushtags: [ i686-linux, x86_64-linux, x86_64-darwin ]
luthor: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6553,6 +6603,7 @@ dont-distribute-packages:
nix-eval: [ i686-linux, x86_64-linux, x86_64-darwin ]
nixfromnpm: [ i686-linux, x86_64-linux, x86_64-darwin ]
nkjp: [ i686-linux, x86_64-linux, x86_64-darwin ]
nlopt-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
nlp-scores-scripts: [ i686-linux, x86_64-linux, x86_64-darwin ]
nme: [ i686-linux, x86_64-linux, x86_64-darwin ]
n-m: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6594,6 +6645,8 @@ dont-distribute-packages:
numerals-base: [ i686-linux, x86_64-linux, x86_64-darwin ]
numerals: [ i686-linux, x86_64-linux, x86_64-darwin ]
numeric-ranges: [ i686-linux, x86_64-linux, x86_64-darwin ]
numhask: [ i686-linux, x86_64-linux, x86_64-darwin ]
numhask-range: [ i686-linux, x86_64-linux, x86_64-darwin ]
Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ]
Nutri: [ i686-linux, x86_64-linux, x86_64-darwin ]
nvim-hs-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6787,6 +6840,7 @@ dont-distribute-packages:
peparser: [ i686-linux, x86_64-linux, x86_64-darwin ]
perceptron: [ i686-linux, x86_64-linux, x86_64-darwin ]
perdure: [ i686-linux, x86_64-linux, x86_64-darwin ]
peregrin: [ i686-linux, x86_64-linux, x86_64-darwin ]
perfecthash: [ i686-linux, x86_64-linux, x86_64-darwin ]
PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ]
period: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6878,6 +6932,7 @@ dont-distribute-packages:
playlists: [ i686-linux, x86_64-linux, x86_64-darwin ]
plist-buddy: [ i686-linux, x86_64-linux, x86_64-darwin ]
plivo: [ i686-linux, x86_64-linux, x86_64-darwin ]
plocketed: [ i686-linux, x86_64-linux, x86_64-darwin ]
plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ]
plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ]
PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6924,6 +6979,7 @@ dont-distribute-packages:
PortFusion: [ i686-linux, x86_64-linux, x86_64-darwin ]
ports: [ i686-linux, x86_64-linux, x86_64-darwin ]
posix-acl: [ i686-linux, x86_64-linux, x86_64-darwin ]
posix-pty: [ i686-linux, x86_64-linux, x86_64-darwin ]
posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ]
postcodes: [ i686-linux, x86_64-linux, x86_64-darwin ]
PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -6935,6 +6991,7 @@ dont-distribute-packages:
postgresql-simple-sop: [ i686-linux, x86_64-linux, x86_64-darwin ]
postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ]
postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ]
postgresql-typed-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ]
postgrest: [ i686-linux, x86_64-linux, x86_64-darwin ]
postgrest-ws: [ i686-linux, x86_64-linux, x86_64-darwin ]
postie: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7038,6 +7095,7 @@ dont-distribute-packages:
pure-priority-queue-tests: [ i686-linux, x86_64-linux, x86_64-darwin ]
purescript-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ]
purescript-bundle-fast: [ i686-linux, x86_64-linux, x86_64-darwin ]
purescript: [ i686-linux, x86_64-linux, x86_64-darwin ]
pure-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ]
pusher-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
pusher-http-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7260,6 +7318,7 @@ dont-distribute-packages:
rei: [ i686-linux, x86_64-linux, x86_64-darwin ]
reinterpret-cast: [ i686-linux, x86_64-linux, x86_64-darwin ]
relapse: [ i686-linux, x86_64-linux, x86_64-darwin ]
relational-record-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
relation: [ i686-linux, x86_64-linux, x86_64-darwin ]
relative-date: [ i686-linux, x86_64-linux, x86_64-darwin ]
reload: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7380,6 +7439,7 @@ dont-distribute-packages:
rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ]
rss: [ i686-linux, x86_64-linux, x86_64-darwin ]
rtcm: [ i686-linux, x86_64-linux, x86_64-darwin ]
rtnetlink: [ i686-linux, x86_64-linux, x86_64-darwin ]
rtorrent-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ]
rtorrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ]
rts-loader: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7585,6 +7645,7 @@ dont-distribute-packages:
shaker: [ i686-linux, x86_64-linux, x86_64-darwin ]
shakers: [ i686-linux, x86_64-linux, x86_64-darwin ]
shakespeare-babel: [ i686-linux, x86_64-linux, x86_64-darwin ]
shakespeare-sass: [ i686-linux, x86_64-linux, x86_64-darwin ]
shapely-data: [ i686-linux, x86_64-linux, x86_64-darwin ]
shared-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ]
shared-fields: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -7760,6 +7821,7 @@ dont-distribute-packages:
SoccerFunGL: [ i686-linux, x86_64-linux, x86_64-darwin ]
SoccerFun: [ i686-linux, x86_64-linux, x86_64-darwin ]
sock2stream: [ i686-linux, x86_64-linux, x86_64-darwin ]
socketed: [ i686-linux, x86_64-linux, x86_64-darwin ]
socket-io: [ i686-linux, x86_64-linux, x86_64-darwin ]
socketio: [ i686-linux, x86_64-linux, x86_64-darwin ]
socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8312,6 +8374,7 @@ dont-distribute-packages:
type-ord-spine-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ]
typeparams: [ i686-linux, x86_64-linux, x86_64-darwin ]
type-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
typesafe-precure: [ i686-linux, x86_64-linux, x86_64-darwin ]
types-compat: [ i686-linux, x86_64-linux, x86_64-darwin ]
typescript-docs: [ i686-linux, x86_64-linux, x86_64-darwin ]
type-settheory: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8538,6 +8601,7 @@ dont-distribute-packages:
webkit: [ i686-linux, x86_64-linux, x86_64-darwin ]
webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ]
web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ]
web-output: [ i686-linux, x86_64-linux, x86_64-darwin ]
web-page: [ i686-linux, x86_64-linux, x86_64-darwin ]
web-push: [ i686-linux, x86_64-linux, x86_64-darwin ]
Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -8714,6 +8778,7 @@ dont-distribute-packages:
yeller: [ i686-linux, x86_64-linux, x86_64-darwin ]
yeshql: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-angular-ui: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-articles: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-auth-account-fork: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-auth-basic: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-auth-bcrypt: [ i686-linux, x86_64-linux, x86_64-darwin ]

View File

@ -37,7 +37,6 @@ stdenv.mkDerivation (args // {
configurePhase = args.configurePhase or ''
export STACK_ROOT=$NIX_BUILD_TOP/.stack
stack setup
'';
buildPhase = args.buildPhase or "stack build";

File diff suppressed because it is too large Load Diff

View File

@ -44,9 +44,35 @@ self: let
mkDerivation = makeOverridable mkDerivationImpl;
callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // {
overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args;
};
# manualArgs are the arguments that were explictly passed to `callPackage`, like:
#
# callPackage foo { bar = null; };
#
# here `bar` is a manual argument.
callPackageWithScope = scope: fn: manualArgs:
let
# this code is copied from callPackage in lib/customisation.nix
#
# we cannot use `callPackage` here because we want to call `makeOverridable`
# on `drvScope` (we cannot add `overrideScope` after calling `callPackage` because then it is
# lost on `.override`) but determine the auto-args based on `drv` (the problem here
# is that nix has no way to "passthrough" args while preserving the reflection
# info that callPackage uses to determine the arguments).
drv = if builtins.isFunction fn then fn else import fn;
auto = builtins.intersectAttrs (builtins.functionArgs drv) scope;
# this wraps the `drv` function to add a `overrideScope` function to the result.
drvScope = allArgs: drv allArgs // {
overrideScope = f:
let newScope = mkScope (fix' (extends f scope.__unfix__));
# note that we have to be careful here: `allArgs` includes the auto-arguments that
# weren't manually specified. If we would just pass `allArgs` to the recursive call here,
# then we wouldn't look up any packages in the scope in the next interation, because it
# appears as if all arguments were already manually passed, so the scope change would do
# nothing.
in callPackageWithScope newScope drv manualArgs;
};
in stdenv.lib.makeOverridable drvScope (auto // manualArgs);
mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope;
defaultScope = mkScope self;

View File

@ -36,7 +36,7 @@ let
./no-sys-dirs.patch
]
++ optional stdenv.isSunOS ./ld-shared.patch
++ optional stdenv.isDarwin [ ./cpp-precomp.patch ];
++ optional stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ];
postPatch = ''
pwd="$(type -P pwd)"
@ -121,17 +121,16 @@ let
in rec {
perl = perl522;
perl520 = common {
version = "5.20.3";
sha256 = "0jlvpd5l5nk7lzfd4akdg1sw6vinbkj6izclyyr0lrbidfky691m";
};
perl = perl524;
perl522 = common {
version = "5.22.2";
sha256 = "1hl3v85ggm027v9h2ycas4z5i3401s2k2l3qpnw8q5mahmiikbc1";
version = "5.22.3";
sha256 = "10q087l1ffdy3gpryr8z540jcnsr0dhm37raicyfqqkyvys1yd8v";
};
perl524 = common {
version = "5.24.1";
sha256 = "1bqqb5ghfj4486nqr77kgsd8aff6a289jy7n2cdkznwvn34qbhg6";
};
}

View File

@ -0,0 +1,13 @@
diff --git a/hints/darwin.sh b/hints/darwin.sh
index afadf53..80b7533 100644
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -329,7 +329,7 @@ EOM
# sw_vers output what we want
# "ProductVersion: 10.10.5" "10.10"
# "ProductVersion: 10.11" "10.11"
- prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
+ prodvers="10.10"
case "$prodvers" in
10.*)
add_macosx_version_min ccflags $prodvers

View File

@ -50,7 +50,17 @@ in stdenv.mkDerivation {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
postPatch = optionalString (x11Support && (tix != null)) ''
# Determinism: The interpreter is patched to write null timestamps when compiling python files.
# This way python doesn't try to update them when we freeze timestamps in nix store.
DETERMINISTIC_BUILD=1;
# Determinism: We fix the hashes of str, bytes and datetime objects.
PYTHONHASHSEED=0;
postPatch = ''
# Determinism
substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
# # We do not patch `Lib/importlib/_bootstrap_external.py` because it does not exist.
'' + optionalString (x11Support && (tix != null)) ''
substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
'';
@ -80,12 +90,17 @@ in stdenv.mkDerivation {
fi
done
touch $out/lib/python${majorVersion}/test/__init__.py
ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
paxmark E $out/bin/python${majorVersion}
# Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
# Determinism: Windows installers were not deterministic.
# We're also not interested in building Windows installers.
find "$out" -name 'wininst*.exe' | xargs -r rm -f
# Use Python3 as default python
ln -s "$out/bin/idle3" "$out/bin/idle"
ln -s "$out/bin/pip3" "$out/bin/pip"
@ -93,18 +108,20 @@ in stdenv.mkDerivation {
ln -s "$out/bin/python3" "$out/bin/python"
ln -s "$out/bin/python3-config" "$out/bin/python-config"
ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
'';
postFixup = ''
# Get rid of retained dependencies on -dev packages, and remove
# some $TMPDIR references to improve binary reproducibility.
# Note that the .pyc file of _sysconfigdata.py should be regenerated!
for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
done
# FIXME: should regenerate this.
rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython*
# Determinism: rebuild all bytecode
# We exclude lib2to3 because that's Python 2 code which fails
# We rebuild three times, once for each optimization level
find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i -
find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i -
find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
'';
passthru = let

View File

@ -132,6 +132,13 @@ in stdenv.mkDerivation {
ln -s "$out/bin/python3-config" "$out/bin/python-config"
ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
# Get rid of retained dependencies on -dev packages, and remove
# some $TMPDIR references to improve binary reproducibility.
# Note that the .pyc file of _sysconfigdata.py should be regenerated!
for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
done
# Determinism: rebuild all bytecode
# We exclude lib2to3 because that's Python 2 code which fails
# We rebuild three times, once for each optimization level
@ -140,18 +147,6 @@ in stdenv.mkDerivation {
find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
'';
postFixup = ''
# Get rid of retained dependencies on -dev packages, and remove
# some $TMPDIR references to improve binary reproducibility.
for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
done
# FIXME: should regenerate this.
rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython*
'';
passthru = let
pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
in rec {

View File

@ -134,6 +134,13 @@ in stdenv.mkDerivation {
ln -s "$out/bin/python3-config" "$out/bin/python-config"
ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
# Get rid of retained dependencies on -dev packages, and remove
# some $TMPDIR references to improve binary reproducibility.
# Note that the .pyc file of _sysconfigdata.py should be regenerated!
for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
done
# Determinism: rebuild all bytecode
# We exclude lib2to3 because that's Python 2 code which fails
# We rebuild three times, once for each optimization level
@ -142,17 +149,6 @@ in stdenv.mkDerivation {
find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
'';
postFixup = ''
# Get rid of retained dependencies on -dev packages, and remove
# some $TMPDIR references to improve binary reproducibility.
for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
done
# FIXME: should regenerate this.
rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython*
'';
passthru = let
pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
in rec {

View File

@ -126,6 +126,13 @@ in stdenv.mkDerivation {
ln -s "$out/bin/python3-config" "$out/bin/python-config"
ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
# Get rid of retained dependencies on -dev packages, and remove
# some $TMPDIR references to improve binary reproducibility.
# Note that the .pyc file of _sysconfigdata.py should be regenerated!
for i in $out/lib/python${majorVersion}/_sysconfigdata*.py $out/lib/python${majorVersion}/config-${majorVersion}m*/Makefile; do
sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
done
# Determinism: rebuild all bytecode
# We exclude lib2to3 because that's Python 2 code which fails
# We rebuild three times, once for each optimization level

View File

@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
&& libSM != null;
let
version = "1.10.16";
sha256 = "121kqkjsd3vgf8vca8364xl44qa5086h7qy5zs5f1l78ldpbmc57";
version = "1.10.18";
sha256 = "0jjirhw6xwz2ffmbg5kr79108l8i1bdaw7szc67n3qpkygaxsjb0";
self = stdenv.mkDerivation {
name = "dbus-${version}";

View File

@ -42,8 +42,8 @@ let
ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
'';
ver_maj = "2.50";
ver_min = "3";
ver_maj = "2.52";
ver_min = "1";
in
stdenv.mkDerivation rec {
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
sha256 = "82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999";
sha256 = "948c26b817f2d77e2a6cdd5082c60a51bf5dea854890286a1d5d4ccde5ce586f";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;

View File

@ -13,7 +13,7 @@ with stdenv.lib;
let
ver_maj = "3.22";
ver_min = "11";
ver_min = "12";
version = "${ver_maj}.${ver_min}";
in
stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
sha256 = "db440670cb6f3c098b076df3735fbc4e69359bd605385e87c90ee48344a804ca";
sha256 = "84fae0cefb6a11ee2b4e86b8ac42fe46a3d30b4ad16661d5fc51e8ae03e2a98c";
};
outputs = [ "out" "dev" ];

View File

@ -5,7 +5,7 @@
}:
let
version = "1.4.4";
version = "1.4.5";
inherit (stdenv.lib) optional optionals optionalString;
in
@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
sha256 = "0mfj37qr8fw9mzsvk4296fq8vzq909mwlkl2xrjfrfvc8z5gilim";
sha256 = "d0e05438165884f21658154c709075feaf98c93ee5c694b951533ac425a9a711";
};
outputs = [ "out" "dev" ];

View File

@ -1 +1 @@
WGET_ARGS=( http://download.kde.org/stable/frameworks/5.32/ -A '*.tar.xz' )
WGET_ARGS=( http://download.kde.org/stable/frameworks/5.33/ -A '*.tar.xz' )

View File

@ -3,595 +3,595 @@
{
attica = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/attica-5.32.0.tar.xz";
sha256 = "16vl3gpwqcvfms82grv1bvqlxj085bqssv5ixjx007826pd8qhp5";
name = "attica-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/attica-5.33.0.tar.xz";
sha256 = "1dr5yhg0cy4b6k91mk6w090zjizgxaa808h799m14jqzgj63z5d6";
name = "attica-5.33.0.tar.xz";
};
};
baloo = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/baloo-5.32.0.tar.xz";
sha256 = "0a4qwinkp4gmcbx4j0qxbj5qb40h7594s39za7sc7bymadicasy1";
name = "baloo-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/baloo-5.33.0.tar.xz";
sha256 = "174my99i5mggab98l38y2bk27xp25mpz58rl8rhnb3wsbgxcx7iz";
name = "baloo-5.33.0.tar.xz";
};
};
bluez-qt = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/bluez-qt-5.32.0.tar.xz";
sha256 = "0pl6cp0rgjkh7d06ik35rw7qd96j5sh2flgjx4vi21zl5vf3vgyh";
name = "bluez-qt-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/bluez-qt-5.33.0.tar.xz";
sha256 = "0cpkdv4k68f0rcg3j91418i59dmc94qlnv3xk1chq0fdi0cssrri";
name = "bluez-qt-5.33.0.tar.xz";
};
};
breeze-icons = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/breeze-icons-5.32.0.tar.xz";
sha256 = "1n51kahzk09v52yhi7k4kqgavqlz3ghqv5cx2ssz2djpyavs18r3";
name = "breeze-icons-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/breeze-icons-5.33.0.tar.xz";
sha256 = "07nb4xq00fw50r4vf10npa2z690rwkmlxdy42lxx3ixci4qw4204";
name = "breeze-icons-5.33.0.tar.xz";
};
};
extra-cmake-modules = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/extra-cmake-modules-5.32.0.tar.xz";
sha256 = "1iqakxzr6bcs9wgyi8if1smpq6px0bvlcyddyk0hxhindzl7pn5i";
name = "extra-cmake-modules-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/extra-cmake-modules-5.33.0.tar.xz";
sha256 = "013adgrz8s0w7a7z2ahkv28cq4c2cy00cw6y8akpkxazqhv5xzzk";
name = "extra-cmake-modules-5.33.0.tar.xz";
};
};
frameworkintegration = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/frameworkintegration-5.32.0.tar.xz";
sha256 = "022scc4pgl68973wq29l1kc9j9lspvlmpr3bc6zlyg57m8agapwa";
name = "frameworkintegration-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/frameworkintegration-5.33.0.tar.xz";
sha256 = "01c1jq77hm3v5xi84gn5hymlnnn1igcpz9v49yxgyvnihlblb1ll";
name = "frameworkintegration-5.33.0.tar.xz";
};
};
kactivities = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kactivities-5.32.0.tar.xz";
sha256 = "0xin4shaj0zsfsww84mwk5n4ldaqy730jhc369px2j2nq57sg9g7";
name = "kactivities-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kactivities-5.33.0.tar.xz";
sha256 = "092gk0zn15qm4pihxf1h4qn2n618wp43k67ffy3saw4fadqmxpsz";
name = "kactivities-5.33.0.tar.xz";
};
};
kactivities-stats = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kactivities-stats-5.32.0.tar.xz";
sha256 = "1b3z7bcap3vjc0155y0a9xkbd477fklmpj8dr3rs0ccyc6qxxbvw";
name = "kactivities-stats-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kactivities-stats-5.33.0.tar.xz";
sha256 = "1269nh4l94b3yxyvzdjw6vb8pxjylrvnrv28vnar8dmx0sbh5jpf";
name = "kactivities-stats-5.33.0.tar.xz";
};
};
kapidox = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kapidox-5.32.0.tar.xz";
sha256 = "1z6hdsppwrmqkcanrppxhqcrjvblg9i02rh3bz5m3pn66wwz0sdw";
name = "kapidox-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kapidox-5.33.0.tar.xz";
sha256 = "162x868dwl92361ss1dxv0gqh8g4apshcgb1ww4nizy239mfj8h0";
name = "kapidox-5.33.0.tar.xz";
};
};
karchive = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/karchive-5.32.0.tar.xz";
sha256 = "1dzvphqnc09mmaydqggpxg6zwwyr56p6l4jdf1rf6ns90fzxy0m4";
name = "karchive-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/karchive-5.33.0.tar.xz";
sha256 = "0i5grm0dhm9z6fd63ppykd6vl45k5nam4q8w1psrz7vjmr6sd924";
name = "karchive-5.33.0.tar.xz";
};
};
kauth = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kauth-5.32.0.tar.xz";
sha256 = "00kdq16n9w6nf1bpwzl5lp5c2xq74g8nn6081kvnjcd4ld66ncmq";
name = "kauth-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kauth-5.33.0.tar.xz";
sha256 = "1lfi4w4jgc9m83q6v3jf8p91x12vvcc3g59dlg7dh2agrh07r9y7";
name = "kauth-5.33.0.tar.xz";
};
};
kbookmarks = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kbookmarks-5.32.0.tar.xz";
sha256 = "03a024phcjv46afbp5lbmj2p8hb6srfzyaslc6ln6ms473bf5k4w";
name = "kbookmarks-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kbookmarks-5.33.0.tar.xz";
sha256 = "186difbzrpqlbi140ylkzb50d3fmn2pdz8i0r3gbc71726fqld82";
name = "kbookmarks-5.33.0.tar.xz";
};
};
kcmutils = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kcmutils-5.32.0.tar.xz";
sha256 = "1mr9h7wc22bfrbm92ajsjfcs16c5xpkrxbxzcma3a0s7jhy6qrm9";
name = "kcmutils-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kcmutils-5.33.0.tar.xz";
sha256 = "0n0cmjxlp0kkgrxng2ympnl1v5a1bjr2d9c20hf31xhvmya3y9nd";
name = "kcmutils-5.33.0.tar.xz";
};
};
kcodecs = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kcodecs-5.32.0.tar.xz";
sha256 = "0yybkp52i8nm4qjady6jqswn6v70cqbvjqwgrghjnc88b2cly253";
name = "kcodecs-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kcodecs-5.33.0.tar.xz";
sha256 = "1pdijdlrl9p5w6dixqx0lmkzwsk5xarzjhpwh616j2sinfra0w31";
name = "kcodecs-5.33.0.tar.xz";
};
};
kcompletion = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kcompletion-5.32.0.tar.xz";
sha256 = "0fn8imr3m219r38a0rafbnylcpjq4rqhz1w66mx80sc7l10mhcni";
name = "kcompletion-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kcompletion-5.33.0.tar.xz";
sha256 = "13mv5mm90jv4k56h4n6d7r2a0pax2mhdrm51xd99fjynad129lhi";
name = "kcompletion-5.33.0.tar.xz";
};
};
kconfig = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kconfig-5.32.0.tar.xz";
sha256 = "1pajh1l08b995shp6l75ri9z4vr6wjapvrkmrmv8hksnxvfi97dp";
name = "kconfig-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kconfig-5.33.0.tar.xz";
sha256 = "1inhpil19pv3jjf7mz4f5g367n1ciiixndij10p1zxk5zy46zzmf";
name = "kconfig-5.33.0.tar.xz";
};
};
kconfigwidgets = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kconfigwidgets-5.32.0.tar.xz";
sha256 = "1cq0a3k6pvl9f098ssqqk2rddxh0xn1kk4p5kfyd7w0m3c604zw3";
name = "kconfigwidgets-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kconfigwidgets-5.33.0.tar.xz";
sha256 = "0sd974r7xrpnhyqabgix0zb1rlis32ijj0wiabbqi4ns0nhhi3qf";
name = "kconfigwidgets-5.33.0.tar.xz";
};
};
kcoreaddons = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kcoreaddons-5.32.0.tar.xz";
sha256 = "1n1xzvwwji9pwyxrvwp4rmpc7qzp9nlis26xmn81k607jn587ksx";
name = "kcoreaddons-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kcoreaddons-5.33.0.tar.xz";
sha256 = "1906jscfc2kpd22d7yk88ziy3ky3hcfxy5y593pfzjl41gyhsiyl";
name = "kcoreaddons-5.33.0.tar.xz";
};
};
kcrash = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kcrash-5.32.0.tar.xz";
sha256 = "1zrkjrpj88ymdy5vbn9db73vxppswvmbn2gkn4gpx773dsmflhz3";
name = "kcrash-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kcrash-5.33.0.tar.xz";
sha256 = "136wlvaf4r54k8x0z0jvs7l35m0v22y6zqkhc8f91dr1y2ym2jnk";
name = "kcrash-5.33.0.tar.xz";
};
};
kdbusaddons = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kdbusaddons-5.32.0.tar.xz";
sha256 = "1a15jjsrkza0ll2viyk834pgdxsdgdacm0982xxwl5z937f75609";
name = "kdbusaddons-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kdbusaddons-5.33.0.tar.xz";
sha256 = "1xxbmr88w7hqxsrhjbgic0pn4adkydhv9xd77vwbzjj47123mph2";
name = "kdbusaddons-5.33.0.tar.xz";
};
};
kdeclarative = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kdeclarative-5.32.0.tar.xz";
sha256 = "1y5g3yi1l0g1mkqhhakg265r25zm23qc2fqg55rq0g7l9ss7w7g9";
name = "kdeclarative-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kdeclarative-5.33.0.tar.xz";
sha256 = "1333vv6kbdk4sdkkc8lnncgmm3203ca8ybn9nj6ch3zqwyxcaagk";
name = "kdeclarative-5.33.0.tar.xz";
};
};
kded = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kded-5.32.0.tar.xz";
sha256 = "0pmmsvqwkw86yvxxf9i6lg13vg80m0kmhjjs88lbm60cgvr5jhq6";
name = "kded-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kded-5.33.0.tar.xz";
sha256 = "02g66ip0d0cwb8grb6f3z1j7178w76pfs2f8d2dl1rax4hnjppd0";
name = "kded-5.33.0.tar.xz";
};
};
kdelibs4support = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/portingAids/kdelibs4support-5.32.0.tar.xz";
sha256 = "1wan5ad5rhhrwvwjjjd87n790r6d8r118gs2kw49s91pdj3iv9pb";
name = "kdelibs4support-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/portingAids/kdelibs4support-5.33.0.tar.xz";
sha256 = "1gyyvp4kqnjaf764y2z24jk68h5h0ax1z9h25msczy6bd4ify5v9";
name = "kdelibs4support-5.33.0.tar.xz";
};
};
kdesignerplugin = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kdesignerplugin-5.32.0.tar.xz";
sha256 = "1hapj8x8nky3m6lx2ianmxwprf00jqyjsknjz3pi4vk3i714vhnf";
name = "kdesignerplugin-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kdesignerplugin-5.33.0.tar.xz";
sha256 = "1f4f53xag6xbvacpn5j0zrsdwimksnckdza6kswcri5q258yb6ks";
name = "kdesignerplugin-5.33.0.tar.xz";
};
};
kdesu = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kdesu-5.32.0.tar.xz";
sha256 = "0zsy1hivy5bbczrpkpgj72mlx0km2nm53kpgrj2hfdy3ss0vn3hl";
name = "kdesu-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kdesu-5.33.0.tar.xz";
sha256 = "06scns6jgs372xx7fssdj63110nrnvy9dmm1k7gc0pyhn0a5yk8a";
name = "kdesu-5.33.0.tar.xz";
};
};
kdewebkit = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kdewebkit-5.32.0.tar.xz";
sha256 = "0y7262pqzdx0hxkyqrbawgx99rn6q85m1slr4nbn914kn350xpy0";
name = "kdewebkit-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kdewebkit-5.33.0.tar.xz";
sha256 = "0lxca56ib5pldc6f3z2gw05jbi2kyd9rqp52pgzfs4kgvvs6gblh";
name = "kdewebkit-5.33.0.tar.xz";
};
};
kdnssd = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kdnssd-5.32.0.tar.xz";
sha256 = "1xakbs2wm627zn01ni8fyrz64xl5jw4by0pdrb70aad7w37dijrw";
name = "kdnssd-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kdnssd-5.33.0.tar.xz";
sha256 = "11pnh18z030zzkiibvd9lfp5i194qwk3pccncc9968nnc0bgghxa";
name = "kdnssd-5.33.0.tar.xz";
};
};
kdoctools = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kdoctools-5.32.0.tar.xz";
sha256 = "0i7zgg7iw6w0sdr6cv3yf4blcr61i8zczgmyqa964ka6p3ywwjs9";
name = "kdoctools-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kdoctools-5.33.0.tar.xz";
sha256 = "04d48gi5d273x3p7572szlpyiz8iyw1ic53b9jblhyfyp93gvpb9";
name = "kdoctools-5.33.0.tar.xz";
};
};
kemoticons = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kemoticons-5.32.0.tar.xz";
sha256 = "1ncjs9iy6z6rhk83ff7fj1b68rkylnry0h698rh4jvs98gpw8sgj";
name = "kemoticons-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kemoticons-5.33.0.tar.xz";
sha256 = "0p9320zln553wi055ql04j8kk329l3wiksprg9rkgzya2gynflyl";
name = "kemoticons-5.33.0.tar.xz";
};
};
kfilemetadata = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kfilemetadata-5.32.0.tar.xz";
sha256 = "01d91gmrxlax0g13ib841vc4qwmv6r4qdr10wfs77rrxsvw7z08f";
name = "kfilemetadata-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kfilemetadata-5.33.0.tar.xz";
sha256 = "1bbw1h8kml8glnck8hh4s13abbksw2fa7g93p25vbhdcyr7zgkr0";
name = "kfilemetadata-5.33.0.tar.xz";
};
};
kglobalaccel = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kglobalaccel-5.32.0.tar.xz";
sha256 = "0dxwjznnqlgnvn15pl34rxlzk3i21cvzn8xbgqmxakny8qiib9ry";
name = "kglobalaccel-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kglobalaccel-5.33.0.tar.xz";
sha256 = "0hc46vwiz81iqzkrc0qahd7gn71kh5wc32kjvh6h4ijlnfmdih07";
name = "kglobalaccel-5.33.0.tar.xz";
};
};
kguiaddons = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kguiaddons-5.32.0.tar.xz";
sha256 = "0rbfd0rykmwl9hs1q22pqg2by8vi9y1pgs2ishgnan4sc4w87wjb";
name = "kguiaddons-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kguiaddons-5.33.0.tar.xz";
sha256 = "171lvykvznrrqdi1frm9akzx5rsrj04vvav3sv64x7hfsas0a7p1";
name = "kguiaddons-5.33.0.tar.xz";
};
};
khtml = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/portingAids/khtml-5.32.0.tar.xz";
sha256 = "1bkxfldw55khycbpcqpwi86rpv6qyqsndvjncfd5a5knnsynwdyf";
name = "khtml-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/portingAids/khtml-5.33.0.tar.xz";
sha256 = "0j9viw8fydh1x548wx39bphk5bf11fyrghshxz14a79rll8w7qmc";
name = "khtml-5.33.0.tar.xz";
};
};
ki18n = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/ki18n-5.32.0.tar.xz";
sha256 = "068xvw2hy4hlpj85wgjjdj0nc37fygpd8wb1dnpqcvzzy8rc1rsf";
name = "ki18n-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/ki18n-5.33.0.tar.xz";
sha256 = "02xf9q3vnw8nn2if6a3pfj8v96414j7gnc6097k0wxfyis9i46k1";
name = "ki18n-5.33.0.tar.xz";
};
};
kiconthemes = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kiconthemes-5.32.0.tar.xz";
sha256 = "00azbyk5y3jgdqv03a2nd0627kdkhq1bkghvw7w62kcnih9k8lq5";
name = "kiconthemes-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kiconthemes-5.33.0.tar.xz";
sha256 = "1zys55d7jjjjllyi9p4difnr6xg9580bgcg5pnm966ak6zhj6682";
name = "kiconthemes-5.33.0.tar.xz";
};
};
kidletime = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kidletime-5.32.0.tar.xz";
sha256 = "0rkxx3bnspjwm4vcy4rdfahk6vcfpkh8fldww0zfdn7s7pigqwch";
name = "kidletime-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kidletime-5.33.0.tar.xz";
sha256 = "0z6i224kmj9l15x923pa30mlhjw66chm9v8qvzg1vhmk36jyw789";
name = "kidletime-5.33.0.tar.xz";
};
};
kimageformats = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kimageformats-5.32.0.tar.xz";
sha256 = "05hn8n4sc3rj5c30ki068f76k1gfgvq19zcw5jlqpnn1l5db5fvz";
name = "kimageformats-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kimageformats-5.33.0.tar.xz";
sha256 = "1m9d51pvrc7fa38mp4jn4cdn558nd6kvik3ry6gvv8im67qyq4ga";
name = "kimageformats-5.33.0.tar.xz";
};
};
kinit = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kinit-5.32.0.tar.xz";
sha256 = "0103lflppdw55l9xiqs68lzaq9897m5qnkmy6fp7dm9wfh9aplqn";
name = "kinit-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kinit-5.33.0.tar.xz";
sha256 = "0v3dcgbi5qwg9nmn668r2v1b257qhmkdb2l3p7hhx06ygypk4yjp";
name = "kinit-5.33.0.tar.xz";
};
};
kio = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kio-5.32.0.tar.xz";
sha256 = "19da02l0aj0l07x9bbklhvx9slci3v1d8q80jvam4vyzs4qdyjin";
name = "kio-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kio-5.33.0.tar.xz";
sha256 = "1pls5yjkhz7fkawks4c0lmsix0nafv7hyp33yh7dm4hijd8zy5cf";
name = "kio-5.33.0.tar.xz";
};
};
kitemmodels = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kitemmodels-5.32.0.tar.xz";
sha256 = "0lxld7jdixpq23sycv8n4ckzmdr34aycrsf2zffziw6r59f0mzki";
name = "kitemmodels-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kitemmodels-5.33.0.tar.xz";
sha256 = "1ma21qydbmj2qr4ib4qv13wip99lq3lm8d6p137bg9x6nqfa4qzn";
name = "kitemmodels-5.33.0.tar.xz";
};
};
kitemviews = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kitemviews-5.32.0.tar.xz";
sha256 = "1h1zgawdi4vbgymdl5215lx7hpcx9jqxy7vjf5hwgs6b2cls1sws";
name = "kitemviews-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kitemviews-5.33.0.tar.xz";
sha256 = "1nc07lxh37l1fwz6xmsrcplimgmrna9ij2dq3pnfrxr319c29890";
name = "kitemviews-5.33.0.tar.xz";
};
};
kjobwidgets = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kjobwidgets-5.32.0.tar.xz";
sha256 = "0lhv3mg2liija0g8x14jpv1mdhb0zjh868p1cs24bs9xrw1l8984";
name = "kjobwidgets-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kjobwidgets-5.33.0.tar.xz";
sha256 = "01adg7axi1bp59z1c7xnxg2p1ahhrzxwxrjn3ci805m8ns6d40cz";
name = "kjobwidgets-5.33.0.tar.xz";
};
};
kjs = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/portingAids/kjs-5.32.0.tar.xz";
sha256 = "022n2hl1s5kap3pqaz4y28wn5z5qh6jcypz5kini2ic94xf7ydrg";
name = "kjs-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/portingAids/kjs-5.33.0.tar.xz";
sha256 = "1w0kdxnzcwmgskl4qsw6aq5189yxqyhq9qajihr2yga0hyglf3iv";
name = "kjs-5.33.0.tar.xz";
};
};
kjsembed = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/portingAids/kjsembed-5.32.0.tar.xz";
sha256 = "0h0p4mcvmdgvjv2xd8s4x2i554nh08mc258gxhb41bs6vm3yhiz4";
name = "kjsembed-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/portingAids/kjsembed-5.33.0.tar.xz";
sha256 = "1vk2m8i315nrys9c4kk3hdlp8hdn2ils0lb8v4nnkvbj3s1f4a8p";
name = "kjsembed-5.33.0.tar.xz";
};
};
kmediaplayer = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/portingAids/kmediaplayer-5.32.0.tar.xz";
sha256 = "1s86dfzrqxrmbqmxq4yyyy1p507d9ns6d7sy6z67dhykgahacqf4";
name = "kmediaplayer-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/portingAids/kmediaplayer-5.33.0.tar.xz";
sha256 = "13xpvi0vxd3vva2d64x8l1knj270al4329kwf9xaays66g6gshgs";
name = "kmediaplayer-5.33.0.tar.xz";
};
};
knewstuff = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/knewstuff-5.32.0.tar.xz";
sha256 = "1i3ldy9wwnjhpgdd2d0bg4304k88riin89zqzdl52lpqa6hjl3fp";
name = "knewstuff-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/knewstuff-5.33.0.tar.xz";
sha256 = "1j4jj2k6jngcp98mfxq1cdp7x0j43rgr5gxn9viqp92liak68lsh";
name = "knewstuff-5.33.0.tar.xz";
};
};
knotifications = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/knotifications-5.32.0.tar.xz";
sha256 = "06ap7m8c2py49pqrnhadbyl69y3nsyamzahbpwipqgh9k62sy34y";
name = "knotifications-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/knotifications-5.33.0.tar.xz";
sha256 = "17ppfwhl3mqd3l4r56whqcxagx6br02hdwlqy7npn32g797hkayd";
name = "knotifications-5.33.0.tar.xz";
};
};
knotifyconfig = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/knotifyconfig-5.32.0.tar.xz";
sha256 = "14qc6wj4j5i45vzqsvl2wlc07c6x30hb2680gwfqsvwgiaszkzv4";
name = "knotifyconfig-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/knotifyconfig-5.33.0.tar.xz";
sha256 = "0m9fdvbakv0plq3m7sj6wj980wfd3m37cabximz9gmi0zkcadzmw";
name = "knotifyconfig-5.33.0.tar.xz";
};
};
kpackage = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kpackage-5.32.0.tar.xz";
sha256 = "070zasl5c58n01fk18mjgccfizymc9griwicxizqjgzzbgvkns3r";
name = "kpackage-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kpackage-5.33.0.tar.xz";
sha256 = "03ls567fj54fzibc8fafffas97abyanl0sn041z51sr7mjp425cs";
name = "kpackage-5.33.0.tar.xz";
};
};
kparts = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kparts-5.32.0.tar.xz";
sha256 = "0hrx0mdvw301nbdyw5fkvgkw60ya6kmfw6hfzmj48bws8mi33rs5";
name = "kparts-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kparts-5.33.0.tar.xz";
sha256 = "0fd0dqmaf8ksx3czzihjd4z0yg682a9bcy09vdhj2grki7w9fxha";
name = "kparts-5.33.0.tar.xz";
};
};
kpeople = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kpeople-5.32.0.tar.xz";
sha256 = "1xqi8zr76hajgyv016iaqlmnr5b84s71fbx412q153g92jglp4mk";
name = "kpeople-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kpeople-5.33.0.tar.xz";
sha256 = "19vag6ci82jh5lw5c7734rlp89wr7xb0d8as98ykz2wmkk0mqql7";
name = "kpeople-5.33.0.tar.xz";
};
};
kplotting = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kplotting-5.32.0.tar.xz";
sha256 = "0a0pfmdlx84526lb2jvx94i2pf85km57fm2ygis4z5mjgbzsmb6v";
name = "kplotting-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kplotting-5.33.0.tar.xz";
sha256 = "0niqhj270l36il3ql6xljg9gbb0yw25ky8wsc7l0021mxvhficri";
name = "kplotting-5.33.0.tar.xz";
};
};
kpty = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kpty-5.32.0.tar.xz";
sha256 = "0h4318rc9902cvqj69capb8lh7s84y44jd59d11fyhq21jhy152s";
name = "kpty-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kpty-5.33.0.tar.xz";
sha256 = "0xcmqdphqy2a44bksqiv8cjlzfkjpbpazfk5f8ml97vdqvwa6qp5";
name = "kpty-5.33.0.tar.xz";
};
};
kross = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/portingAids/kross-5.32.0.tar.xz";
sha256 = "0mgicb2rfhzp0hr1zckp1qzqzbdx0zy82mcjibrlsp7spmvynw5a";
name = "kross-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/portingAids/kross-5.33.0.tar.xz";
sha256 = "13dldb4df4spsqr3878bimv009fzq4pdvmwlaw753c0lrp97pd9l";
name = "kross-5.33.0.tar.xz";
};
};
krunner = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/krunner-5.32.0.tar.xz";
sha256 = "1k4rg9vqr6h5aj7v51fx3i5z9kxlfpacahs81hkwksi6if8ik4kr";
name = "krunner-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/krunner-5.33.0.tar.xz";
sha256 = "0za052rsqf5kaz1c48k63a905b3x953wi6f07m44m6dm38p5ixq8";
name = "krunner-5.33.0.tar.xz";
};
};
kservice = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kservice-5.32.0.tar.xz";
sha256 = "02xk3ajspprmx964zhwh2l3axm4gns9h0m0pvcb1v5j8pfh9v70q";
name = "kservice-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kservice-5.33.0.tar.xz";
sha256 = "0jqq4ahscnqvzv8inhfzb9s6x97s60c4w8chpg16qwc7dqag887h";
name = "kservice-5.33.0.tar.xz";
};
};
ktexteditor = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/ktexteditor-5.32.0.tar.xz";
sha256 = "1sybw8k3f36mcs5qh3b51v7ynbqn4pbiiabkyxfmyi82i09m2jgw";
name = "ktexteditor-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/ktexteditor-5.33.0.tar.xz";
sha256 = "12fcqcxamkxv38w4j9waqmim7k801v6r6izlyg59iiy56yks4ms5";
name = "ktexteditor-5.33.0.tar.xz";
};
};
ktextwidgets = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/ktextwidgets-5.32.0.tar.xz";
sha256 = "1s2fd4n4hfkzscxv0cdfjynjzi1f57pfi9a3fp6rrm5c5645zk7r";
name = "ktextwidgets-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/ktextwidgets-5.33.0.tar.xz";
sha256 = "09rjr3655pbzwgjsmwbjsm7jwrxydl2jwhgbk8ziv1bgcg6cjrjy";
name = "ktextwidgets-5.33.0.tar.xz";
};
};
kunitconversion = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kunitconversion-5.32.0.tar.xz";
sha256 = "0crc8riwafcx6fwhgrc8vfbwmdygd6vlz1fbbgni09gamm8mbcin";
name = "kunitconversion-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kunitconversion-5.33.0.tar.xz";
sha256 = "0bflic2va9bc17q0smc4dzmgh72cjfjjaahhsvvnj54g2qggznkq";
name = "kunitconversion-5.33.0.tar.xz";
};
};
kwallet = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kwallet-5.32.0.tar.xz";
sha256 = "0psc4n6lck9gbx2nn7mgv33x4z2r0xp1mx1xcsgy8smvalrfv5xa";
name = "kwallet-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kwallet-5.33.0.tar.xz";
sha256 = "1jpybsksai9gm2bihcgl5m56rjfd0crj9i8j0l2s4vmmzxyflczj";
name = "kwallet-5.33.0.tar.xz";
};
};
kwayland = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kwayland-5.32.0.tar.xz";
sha256 = "1kzvq7qx102rfdv975x5sd37lsl6wn0mzm2m1f9fnnn2rvii3h5d";
name = "kwayland-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kwayland-5.33.0.tar.xz";
sha256 = "18nvdhfijnvzjiy0vjmqvf2nwz64ymxpnhlhs75y1d2ib8rm8qfq";
name = "kwayland-5.33.0.tar.xz";
};
};
kwidgetsaddons = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kwidgetsaddons-5.32.0.tar.xz";
sha256 = "1aksy326ppdfcx20zl9hxsd8j0br32j6dlx4i1xxbd976csys9b2";
name = "kwidgetsaddons-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kwidgetsaddons-5.33.0.tar.xz";
sha256 = "1dnspi7zf57lsihdynbik2iwvnhv8098vqyz0rps8s8pnjl7x8k4";
name = "kwidgetsaddons-5.33.0.tar.xz";
};
};
kwindowsystem = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kwindowsystem-5.32.0.tar.xz";
sha256 = "1c3kd23c4wwzdhfcyhv41czw3y2kk1492xn6ah9n3r98akrhgar1";
name = "kwindowsystem-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kwindowsystem-5.33.0.tar.xz";
sha256 = "1dj18774rlpxh9p8a07shhb4dzc0zpv4qvmh4j2y4c1g6v7n6b3p";
name = "kwindowsystem-5.33.0.tar.xz";
};
};
kxmlgui = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kxmlgui-5.32.0.tar.xz";
sha256 = "1pxi4z7z3bzwcnfwq0pvjsmds401fkisyr353lyxf4rvcpwj3a65";
name = "kxmlgui-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kxmlgui-5.33.0.tar.xz";
sha256 = "1q89xsrdhrsz7jb68hq8r3xdmhz0s19zwvd06skn6cfqx7r32ng0";
name = "kxmlgui-5.33.0.tar.xz";
};
};
kxmlrpcclient = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/kxmlrpcclient-5.32.0.tar.xz";
sha256 = "1kaczibdfdph5mpg1dldsmqb1six57w7ch3v0v7av5h6j6sx0xaq";
name = "kxmlrpcclient-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/kxmlrpcclient-5.33.0.tar.xz";
sha256 = "1zc6pn412day923k22br82xypvk24znb0ns1qsdlmrd2cnmv8l28";
name = "kxmlrpcclient-5.33.0.tar.xz";
};
};
modemmanager-qt = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/modemmanager-qt-5.32.0.tar.xz";
sha256 = "0ywyiq1kj4ya5knn0r12j9m1ig9mlyfypnrzihlvipddjrqs7jyd";
name = "modemmanager-qt-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/modemmanager-qt-5.33.0.tar.xz";
sha256 = "098l3plck45bn7lph7mfkm03q18zxl1s8aa3pyh6b69wk45r7j54";
name = "modemmanager-qt-5.33.0.tar.xz";
};
};
networkmanager-qt = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/networkmanager-qt-5.32.0.tar.xz";
sha256 = "0bcy7nzfvx2xah3kxklmrjn08qbjddiny7wf7nkxsbc3kkhrxqyd";
name = "networkmanager-qt-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/networkmanager-qt-5.33.0.tar.xz";
sha256 = "0pc4n4m93ypx1ryasw8n3bqll7v4yqa3749ir0qi096y5vysdd2m";
name = "networkmanager-qt-5.33.0.tar.xz";
};
};
oxygen-icons5 = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/oxygen-icons5-5.32.0.tar.xz";
sha256 = "05v3blgs4qbjl8s6470baahy9a98cfi3mplzp462axcgkqdj1nwf";
name = "oxygen-icons5-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/oxygen-icons5-5.33.0.tar.xz";
sha256 = "17kp66hra0vfkcvd7fh5q23wr040h0z6di4gdrm2zi1w5jbhw9kn";
name = "oxygen-icons5-5.33.0.tar.xz";
};
};
plasma-framework = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/plasma-framework-5.32.0.tar.xz";
sha256 = "1hrnmilc30d1kh20cky329i5ji3qyy7m4f8jzax5cgl7nrjca31h";
name = "plasma-framework-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/plasma-framework-5.33.0.tar.xz";
sha256 = "0rqm773n2r6vwmv41x27lr2zmx26s5s27ym3a6qy0w18fr86fxsd";
name = "plasma-framework-5.33.0.tar.xz";
};
};
prison = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/prison-5.32.0.tar.xz";
sha256 = "0q5cs60293bdm3mynhx39rjsh87mfxngxsqa2fqm2gsqjvlciyvr";
name = "prison-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/prison-5.33.0.tar.xz";
sha256 = "0hh065294s7sjj34vfwwb8zgagf1sa09l9filadl1ly0ig9f6h1r";
name = "prison-5.33.0.tar.xz";
};
};
solid = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/solid-5.32.0.tar.xz";
sha256 = "1jhymivravgix0sa0szkax50j09l5fl55xi3fbyjxlb4cil114v5";
name = "solid-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/solid-5.33.0.tar.xz";
sha256 = "0jb8jjv6mhwriqxfkd9fj0b7y1ab6vnwqi53sk4w4vw53d0wkqxm";
name = "solid-5.33.0.tar.xz";
};
};
sonnet = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/sonnet-5.32.0.tar.xz";
sha256 = "17sjv48b3z5fgplsy16ilcw6p7mlqjs61ib6jqd1mqzv4xrr27yi";
name = "sonnet-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/sonnet-5.33.0.tar.xz";
sha256 = "096ybf95rx5ybvl74nlnn9x2yb2j1akn8g8ywv1vwi2ckfpnp3sd";
name = "sonnet-5.33.0.tar.xz";
};
};
syntax-highlighting = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/syntax-highlighting-5.32.0.tar.xz";
sha256 = "1d9m7x53mwggwmhhba1c7b8v4f8qjql889y674ldpzs2nrk5y7x3";
name = "syntax-highlighting-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/syntax-highlighting-5.33.0.tar.xz";
sha256 = "0nn078sw0bkw1m5vsv02n46sc05blg3qnhxpmph2cikz5y86x9jq";
name = "syntax-highlighting-5.33.0.tar.xz";
};
};
threadweaver = {
version = "5.32.0";
version = "5.33.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.32/threadweaver-5.32.0.tar.xz";
sha256 = "1qpy2rzqyd4ap5fibkfk87z66ijh2h79cd7f0h506jh2dbx20g0h";
name = "threadweaver-5.32.0.tar.xz";
url = "${mirror}/stable/frameworks/5.33/threadweaver-5.33.0.tar.xz";
sha256 = "16y7irjyyp4smy7nm7j4zc3gk9a046bwxvv51l7rfs7n4z0550ki";
name = "threadweaver-5.33.0.tar.xz";
};
};
}

View File

@ -27,7 +27,7 @@ let inherit (stdenv.lib) optional optionals hasPrefix; in
let
result = {
libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f";
libav_11 = libavFun "11.8" "d0e93f6b229ae46c49d13ec183b13cfee70a51f0";
libav_11 = libavFun "11.9" "36ed1329099676ff3c970576e03c6a21f2da2e15";
libav_12 = libavFun "12" "4ecde7274621c82a6882b7614d907b28de25cc4e";
};
@ -41,7 +41,7 @@ let
patches = []
++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch
++ optional (vpxSupport && hasPrefix "11." version) ./vpxenc-11.6-libvpx-1.5.patch;
;
preConfigure = "patchShebangs doc/texi2pod.pl";

View File

@ -1,22 +0,0 @@
--- a/libavcodec/libvpxenc.c 2016-05-01 17:53:17.974517377 +0200
+++ b/libavcodec/libvpxenc.c 2016-05-01 17:54:30.564923297 +0200
@@ -70,19 +70,11 @@
/** String mappings for enum vp8e_enc_control_id */
static const char *const ctlidstr[] = {
- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP",
- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP",
- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE",
[VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED",
[VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF",
[VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS",
[VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD",
[VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS",
- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER",
[VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES",
[VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
[VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",

View File

@ -1,15 +1,15 @@
{stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}:
stdenv.mkDerivation rec {
major = "0.2";
minor = "10";
major = "0.4";
minor = "2";
version = "${major}.${minor}";
name = "libhttpseverywhere-${version}";
src = fetchurl {
url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz";
sha256 = "235f5b7f96188d800470871774e31696fbde085b63f65bd71434af8e9e6ac8aa";
sha256 = "0n850a4adsla6di8dylnadg07wblkdl28abrjvk6fzy8a1kjlx02";
};
nativeBuildInputs = [ gnome3.vala valadoc gobjectIntrospection meson ninja pkgconfig ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
configurePhase = ''
mkdir build
cd build
meson.py --prefix "$out" ..
meson --prefix "$out" ..
'';
buildPhase = ''

View File

@ -3,11 +3,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libidn2-0.16";
name = "libidn2-${version}";
version = "2.0.1";
src = fetchurl {
url = "https://alpha.gnu.org/gnu/libidn/${name}.tar.gz";
sha256 = "13v8kh4d5nfkymai88zlw3h7k4x9khrpdpv97waf4ah8ykzrxb9g";
url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
sha256 = "1lzi4wng22gyzlgkr8jk75d03f2bnnch5yhmiwb0hram2la6a8qd";
};
outputs = [ "bin" "dev" "out" "info" "devdoc" ];

View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
stdenv.mkDerivation rec {
name = "libssh-0.7.4";
name = "libssh-0.7.5";
src = fetchurl {
url = "https://red.libssh.org/attachments/download/210/${name}.tar.xz";
sha256 = "03bcp9ksqp0s1pmwfmzhcknvkxay5k0mjzzxp3rjlifbng1vxq9r";
url = "https://red.libssh.org/attachments/download/218/${name}.tar.xz";
sha256 = "15bh6dm9c50ndddzh3gqcgw7axp3ghrspjpkb1z3dr90vkanvs2l";
};
postPatch = ''

View File

@ -0,0 +1,25 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook }:
with lib;
stdenv.mkDerivation rec {
name = "libytnef-${version}";
version = "1.9.2";
src = fetchFromGitHub {
owner = "Yeraze";
repo = "ytnef";
rev = "v${version}";
sha256 = "1aavckl7rjbiakwcf4rrkhchrl450p3vq3dy78cxfmgg0jqnvxqy";
};
nativeBuildInputs = [ autoreconfHook ];
meta = {
inherit (src.meta) homepage;
description = "Yeraze's TNEF Stream Reader - for winmail.dat files";
license = licenses.gpl2Plus;
platform = platforms.all;
maintainers = with maintainers; [ fpletz ];
};
}

View File

@ -67,7 +67,7 @@ let
in
let
version = "17.0.3";
version = "17.0.4";
branch = head (splitString "." version);
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
in
@ -82,7 +82,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
];
sha256 = "ca646f5075a002d60ef9123c8a4331cede155c01712ef945a65c59a5e69fe7ed";
sha256 = "1269dc8545a193932a0779b2db5bce9be4a5f6813b98c38b93b372be8362a346";
};
prePatch = "patchShebangs .";

View File

@ -6,14 +6,14 @@ with stdenv.lib;
let
ver_maj = "1.40";
ver_min = "4";
ver_min = "5";
in
stdenv.mkDerivation rec {
name = "pango-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
sha256 = "f8fdc5fc66356dc4edf915048cceeee065a0e0cb70b3b2598f62bda320129a3e";
sha256 = "24748140456c42360b07b2c77a1a2e1216d07c056632079557cd4e815b9d01c9";
};
outputs = [ "bin" "dev" "out" "devdoc" ];

View File

@ -214,7 +214,7 @@ stdenv.mkDerivation {
AGL AppKit ApplicationServices Carbon Cocoa
CoreAudio CoreBluetooth CoreLocation CoreServices
DiskArbitration Foundation OpenGL
darwin.cf-private darwin.apple_sdk.sdk darwin.libobjc libiconv
darwin.cf-private darwin.libobjc libiconv
]);
buildInputs = [ ]

View File

@ -10,11 +10,11 @@ assert xor (openssl != null) (gnutls != null);
assert !(xor (openssl != null) (zlib != null));
stdenv.mkDerivation rec {
name = "ucommon-6.3.1";
name = "ucommon-7.0.0";
src = fetchurl {
url = "mirror://gnu/commoncpp/${name}.tar.gz";
sha256 = "1marbwbqnllhm9nh22lvyfjy802pgy1wx7j7kkpkasbm9r0sb6mm";
sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7";
};
buildInputs = [ pkgconfig ];

View File

@ -1,6 +1,10 @@
{ stdenv, fetchurl, xercesc }:
{ stdenv, fetchurl, xercesc, getopt }:
stdenv.mkDerivation rec {
let
platform = if stdenv.isLinux then "linux" else
if stdenv.isDarwin then "macosx" else
throw "Unsupported platform";
in stdenv.mkDerivation rec {
name = "xalan-c-${version}";
version = "1.11";
@ -9,20 +13,21 @@ stdenv.mkDerivation rec {
sha256 = "0a3a2b15vpacnqgpp6fiy1pwyc8q6ywzvyb5445f6wixfdspypjg";
};
# TODO: should we really be putting outputs in $out/usr? I'd expect -P$out below
configurePhase = ''
export XALANCROOT=`pwd`/c
cd `pwd`/c
mkdir -p $out/usr
./runConfigure -p linux -c gcc -x g++ -P$out/usr
./runConfigure -p ${platform} -c cc -x c++ -P$out/usr
'';
buildInputs = [ xercesc ];
buildInputs = [ xercesc getopt ];
meta = {
homepage = http://xalan.apache.org/;
description = "A XSLT processor for transforming XML documents";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = [ stdenv.lib.maintainers.jagajaga ];
};
}

View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
homepage = http://santuario.apache.org/;
description = "C++ Implementation of W3C security standards for XML";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.jagajaga ];
};
}

View File

@ -0,0 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "asn1crypto";
version = "0.22.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a";
};
# No tests included
doCheck = false;
meta = {
description = "Fast ASN.1 parser and serializer with definitions for private keys, public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8, PKCS#12, PKCS#5, X.509 and TSP";
license = lib.licenses.mit;
homepage = https://github.com/wbond/asn1crypto;
};
}

View File

@ -0,0 +1,51 @@
{ buildPythonPackage
, lib
, fetchPypi
, mock
, pytest_27
, sh
, coverage
, docopt
, requests2
, git
}:
buildPythonPackage rec {
pname = "coveralls";
name = "${pname}-python-${version}";
version = "1.1";
# wanted by tests
src = fetchPypi {
inherit pname version;
sha256 = "0238hgdwbvriqxrj22zwh0rbxnhh9c6hh75i39ll631vq62h65il";
};
buildInputs = [
mock
sh
pytest_27
git
];
# FIXME: tests requires .git directory to be present
doCheck = false;
checkPhase = ''
python setup.py test
'';
propagatedBuildInputs = [
coverage
docopt
requests2
];
meta = {
description = "Show coverage stats online via coveralls.io";
homepage = https://github.com/coveralls-clients/coveralls-python;
license = lib.licenses.mit;
};
}

View File

@ -0,0 +1,26 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pyparsing, pytest }:
buildPythonPackage rec {
version = "0.8.1";
name = "ezdxf-${version}";
src = fetchFromGitHub {
owner = "mozman";
repo = "ezdxf";
rev = "v${version}";
sha256 = "1c20j96n3rsgzaakfjl0wnydaj2qr69gbnnjs6mfa1hz2fjqri22";
};
buildInputs = [ pytest ];
checkPhase = "python -m unittest discover -s tests";
propagatedBuildInputs = [ pyparsing ];
meta = with stdenv.lib; {
description = "Python package to read and write DXF drawings (interface to the DXF file format)";
homepage = https://github.com/mozman/ezdxf/;
license = licenses.mit;
maintainers = with maintainers; [ hodapp ];
platforms = platforms.unix;
};
}

View File

@ -0,0 +1,27 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, flask
, markupsafe
, decorator
, itsdangerous
, six }:
buildPythonPackage rec {
pname = "httpbin";
version = "0.5.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "6b57f563900ecfe126015223a259463848daafbdc2687442317c0992773b9054";
};
propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ];
meta = with stdenv.lib; {
homepage = https://github.com/kennethreitz/httpbin;
description = "HTTP Request & Response Service";
license = licenses.mit;
};
}

View File

@ -10,14 +10,14 @@ buildPythonPackage rec {
# If you need these, you can just add them to your environment.
name = "hypothesis-${version}";
version = "3.6.1";
version = "3.7.0";
# Upstream prefers github tarballs
src = fetchFromGitHub {
owner = "HypothesisWorks";
repo = "hypothesis";
rev = "${version}";
sha256 = "1zwr9g4h4jizbvm2d7fywdpcxmw8i1m85h8g72kizah07gk12aq1";
sha256 = "1zsv1ggf3g9rrigxl3zd1z8qc6fcj8lmszm8ib1ya4ar6r64x0yz";
};
buildInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ];

View File

@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
, isPy27
, mock
, ipython
, jupyter_client
, pexpect
, traitlets
, tornado
}:
buildPythonPackage rec {
pname = "ipykernel";
version = "4.6.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "2e1825aca4e2585b5adb7953ea16e53f53a62159ed49952a564b1e23507205db";
};
buildInputs = [ nose ] ++ lib.optional isPy27 mock;
propagatedBuildInputs = [
ipython
jupyter_client
pexpect
traitlets
tornado
];
# Tests require backends.
# I don't want to add all supported backends as propagatedBuildInputs
doCheck = false;
meta = {
description = "IPython Kernel for Jupyter";
homepage = http://ipython.org/;
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fridh ];
};
}

View File

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
, dateutil
, ipython_genutils
, decorator
, pyzmq
, ipython
, jupyter_client
, ipykernel
, tornado
, isPy3k
, futures
}:
buildPythonPackage rec {
pname = "ipyparallel";
version = "6.0.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "7eea4780266252fcc987b220a302d589fbb4d6b0569bd131115a20b31891103d";
};
buildInputs = [ nose ];
propagatedBuildInputs = [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado
] ++ lib.optionals (!isPy3k) [ futures ];
# Requires access to cluster
doCheck = false;
meta = {
description = "Interactive Parallel Computing with IPython";
homepage = http://ipython.org/;
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fridh ];
};
}

View File

@ -0,0 +1,71 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, pythonOlder
# Build dependencies
, glibcLocales
# Test dependencies
, nose
, pygments
, isPy27
, mock
# Runtime dependencies
, jedi
, decorator
, pickleshare
, simplegeneric
, traitlets
, prompt_toolkit
, pexpect
, appnope
}:
buildPythonPackage rec {
pname = "ipython";
version = "6.0.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "f429b82b8d9807068da734b15965768bd21b15d0b706340b6d1b4d6f6f5b98a4";
};
prePatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace setup.py --replace "'gnureadline'" " "
'';
buildInputs = [ glibcLocales ];
checkInputs = [ nose pygments ] ++ lib.optional isPy27 mock;
propagatedBuildInputs = [
jedi
decorator
pickleshare
simplegeneric
traitlets
prompt_toolkit
pexpect
] ++ lib.optionals stdenv.isDarwin [appnope];
LC_ALL="en_US.UTF-8";
doCheck = false; # Circular dependency with ipykernel
checkPhase = ''
nosetests
'';
# IPython 6.0.0 and above does not support Python < 3.3.
# The last IPython version to support older Python versions
# is 5.3.x.
disabled = pythonOlder "3.3";
meta = {
description = "IPython: Productive Interactive Computing";
homepage = http://ipython.org/;
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ bjornfor jgeerds fridh ];
};
}

View File

@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, fetchPypi
, python
, nose
, pytest
, mock
, ipython
, ipykernel
, traitlets
, notebook
, widgetsnbextension
}:
buildPythonPackage rec {
pname = "ipywidgets";
version = "6.0.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "afa6248850cff14ef86117db87aeab0b12237e4eaf740e73716460ed593a43a7";
};
# Tests are not distributed
# doCheck = false;
buildInputs = [ nose pytest mock ];
propagatedBuildInputs = [
ipython
ipykernel
traitlets
notebook
widgetsnbextension
];
checkPhase = ''
${python.interpreter} -m unittest discover
'';
meta = {
description = "IPython HTML widgets for Jupyter";
homepage = http://ipython.org/;
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fridh ];
};
}

View File

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
}:
buildPythonPackage rec {
pname = "jedi";
version = "0.10.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "7abb618cac6470ebbd142e59c23daec5e6e063bfcecc8a43a037d2ab57276f4e";
};
checkInputs = [ pytest ];
checkPhase = ''
py.test test
'';
# 7 failed
#doCheck = false;
meta = {
homepage = https://github.com/davidhalter/jedi;
description = "An autocompletion tool for Python that can be used for text editors";
license = lib.licenses.lgpl3Plus;
maintainers = with lib.maintainers; [ garbas ];
};
}

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