From f0e3775f2e93dee4a3fa455631ea78acf6fd884f Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 24 Apr 2014 14:03:18 +0200 Subject: [PATCH 001/254] linux: Add support for zram --- pkgs/os-specific/linux/kernel/common-config.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index db654fc0505c..02e361fde129 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -317,6 +317,12 @@ with stdenv.lib; TRANSPARENT_HUGEPAGE_ALWAYS? n TRANSPARENT_HUGEPAGE_MADVISE? y + # zram support (e.g for in-memory compressed swap) + ${optionalString (versionAtLeast version "3.4") '' + ZSMALLOC y + ''} + ZRAM m + ${kernelPlatform.kernelExtraConfig or ""} ${extraConfig} '' From 2eeba3a30057d3a60cc86a9414a08ad93ac28e73 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 25 Apr 2014 18:48:04 -0500 Subject: [PATCH 002/254] rxvt-unicode: add 256-color resources patch --- .../misc/rxvt_unicode/default.nix | 5 +- .../rxvt-unicode-256-color-resources.patch | 255 ++++++++++++++++++ 2 files changed, 259 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 2e3ef9f0d10e..60e79ff204bc 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -24,7 +24,10 @@ stdenv.mkDerivation (rec { outputs = [ "out" "terminfo" ]; - patches = [ ./rxvt-unicode-9.06-font-width.patch ]; + patches = [ + ./rxvt-unicode-9.06-font-width.patch + ./rxvt-unicode-256-color-resources.patch + ]; preConfigure = '' diff --git a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch b/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch new file mode 100644 index 000000000000..c8d2acfbdc51 --- /dev/null +++ b/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch @@ -0,0 +1,255 @@ +diff --git a/src/xdefaults.C b/src/xdefaults.C +index 23b6822..382f3b1 100644 +--- a/src/xdefaults.C ++++ b/src/xdefaults.C +@@ -155,6 +155,250 @@ optList[] = { + RSTRG (Rs_color + minCOLOR + 5, "color5", "color"), + RSTRG (Rs_color + minCOLOR + 6, "color6", "color"), + RSTRG (Rs_color + minCOLOR + 7, "color7", "color"), ++ // 88 xterm colors ++ RSTRG (Rs_color + minCOLOR + 16, "color16", "color"), ++ RSTRG (Rs_color + minCOLOR + 17, "color17", "color"), ++ RSTRG (Rs_color + minCOLOR + 18, "color18", "color"), ++ RSTRG (Rs_color + minCOLOR + 19, "color19", "color"), ++ RSTRG (Rs_color + minCOLOR + 20, "color20", "color"), ++ RSTRG (Rs_color + minCOLOR + 21, "color21", "color"), ++ RSTRG (Rs_color + minCOLOR + 22, "color22", "color"), ++ RSTRG (Rs_color + minCOLOR + 23, "color23", "color"), ++ RSTRG (Rs_color + minCOLOR + 24, "color24", "color"), ++ RSTRG (Rs_color + minCOLOR + 25, "color25", "color"), ++ RSTRG (Rs_color + minCOLOR + 26, "color26", "color"), ++ RSTRG (Rs_color + minCOLOR + 27, "color27", "color"), ++ RSTRG (Rs_color + minCOLOR + 28, "color28", "color"), ++ RSTRG (Rs_color + minCOLOR + 29, "color29", "color"), ++ RSTRG (Rs_color + minCOLOR + 30, "color30", "color"), ++ RSTRG (Rs_color + minCOLOR + 31, "color31", "color"), ++ RSTRG (Rs_color + minCOLOR + 32, "color32", "color"), ++ RSTRG (Rs_color + minCOLOR + 33, "color33", "color"), ++ RSTRG (Rs_color + minCOLOR + 34, "color34", "color"), ++ RSTRG (Rs_color + minCOLOR + 35, "color35", "color"), ++ RSTRG (Rs_color + minCOLOR + 36, "color36", "color"), ++ RSTRG (Rs_color + minCOLOR + 37, "color37", "color"), ++ RSTRG (Rs_color + minCOLOR + 38, "color38", "color"), ++ RSTRG (Rs_color + minCOLOR + 39, "color39", "color"), ++ RSTRG (Rs_color + minCOLOR + 40, "color40", "color"), ++ RSTRG (Rs_color + minCOLOR + 41, "color41", "color"), ++ RSTRG (Rs_color + minCOLOR + 42, "color42", "color"), ++ RSTRG (Rs_color + minCOLOR + 43, "color43", "color"), ++ RSTRG (Rs_color + minCOLOR + 44, "color44", "color"), ++ RSTRG (Rs_color + minCOLOR + 45, "color45", "color"), ++ RSTRG (Rs_color + minCOLOR + 46, "color46", "color"), ++ RSTRG (Rs_color + minCOLOR + 47, "color47", "color"), ++ RSTRG (Rs_color + minCOLOR + 48, "color48", "color"), ++ RSTRG (Rs_color + minCOLOR + 49, "color49", "color"), ++ RSTRG (Rs_color + minCOLOR + 50, "color50", "color"), ++ RSTRG (Rs_color + minCOLOR + 51, "color51", "color"), ++ RSTRG (Rs_color + minCOLOR + 52, "color52", "color"), ++ RSTRG (Rs_color + minCOLOR + 53, "color53", "color"), ++ RSTRG (Rs_color + minCOLOR + 54, "color54", "color"), ++ RSTRG (Rs_color + minCOLOR + 55, "color55", "color"), ++ RSTRG (Rs_color + minCOLOR + 56, "color56", "color"), ++ RSTRG (Rs_color + minCOLOR + 57, "color57", "color"), ++ RSTRG (Rs_color + minCOLOR + 58, "color58", "color"), ++ RSTRG (Rs_color + minCOLOR + 59, "color59", "color"), ++ RSTRG (Rs_color + minCOLOR + 60, "color60", "color"), ++ RSTRG (Rs_color + minCOLOR + 61, "color61", "color"), ++ RSTRG (Rs_color + minCOLOR + 62, "color62", "color"), ++ RSTRG (Rs_color + minCOLOR + 63, "color63", "color"), ++ RSTRG (Rs_color + minCOLOR + 64, "color64", "color"), ++ RSTRG (Rs_color + minCOLOR + 65, "color65", "color"), ++ RSTRG (Rs_color + minCOLOR + 66, "color66", "color"), ++ RSTRG (Rs_color + minCOLOR + 67, "color67", "color"), ++ RSTRG (Rs_color + minCOLOR + 68, "color68", "color"), ++ RSTRG (Rs_color + minCOLOR + 69, "color69", "color"), ++ RSTRG (Rs_color + minCOLOR + 70, "color70", "color"), ++ RSTRG (Rs_color + minCOLOR + 71, "color71", "color"), ++ RSTRG (Rs_color + minCOLOR + 72, "color72", "color"), ++ RSTRG (Rs_color + minCOLOR + 73, "color73", "color"), ++ RSTRG (Rs_color + minCOLOR + 74, "color74", "color"), ++ RSTRG (Rs_color + minCOLOR + 75, "color75", "color"), ++ RSTRG (Rs_color + minCOLOR + 76, "color76", "color"), ++ RSTRG (Rs_color + minCOLOR + 77, "color77", "color"), ++ RSTRG (Rs_color + minCOLOR + 78, "color78", "color"), ++ RSTRG (Rs_color + minCOLOR + 79, "color79", "color"), ++ RSTRG (Rs_color + minCOLOR + 80, "color80", "color"), ++ RSTRG (Rs_color + minCOLOR + 81, "color81", "color"), ++ RSTRG (Rs_color + minCOLOR + 82, "color82", "color"), ++ RSTRG (Rs_color + minCOLOR + 83, "color83", "color"), ++ RSTRG (Rs_color + minCOLOR + 84, "color84", "color"), ++ RSTRG (Rs_color + minCOLOR + 85, "color85", "color"), ++ RSTRG (Rs_color + minCOLOR + 86, "color86", "color"), ++ RSTRG (Rs_color + minCOLOR + 87, "color87", "color"), ++#if USE_256_COLORS ++ // 256 xterm colors ++ RSTRG (Rs_color + minCOLOR + 88, "color88", "color"), ++ RSTRG (Rs_color + minCOLOR + 89, "color89", "color"), ++ RSTRG (Rs_color + minCOLOR + 90, "color90", "color"), ++ RSTRG (Rs_color + minCOLOR + 91, "color91", "color"), ++ RSTRG (Rs_color + minCOLOR + 92, "color92", "color"), ++ RSTRG (Rs_color + minCOLOR + 93, "color93", "color"), ++ RSTRG (Rs_color + minCOLOR + 94, "color94", "color"), ++ RSTRG (Rs_color + minCOLOR + 95, "color95", "color"), ++ RSTRG (Rs_color + minCOLOR + 96, "color96", "color"), ++ RSTRG (Rs_color + minCOLOR + 97, "color97", "color"), ++ RSTRG (Rs_color + minCOLOR + 98, "color98", "color"), ++ RSTRG (Rs_color + minCOLOR + 99, "color99", "color"), ++ RSTRG (Rs_color + minCOLOR + 100, "color100", "color"), ++ RSTRG (Rs_color + minCOLOR + 101, "color101", "color"), ++ RSTRG (Rs_color + minCOLOR + 102, "color102", "color"), ++ RSTRG (Rs_color + minCOLOR + 103, "color103", "color"), ++ RSTRG (Rs_color + minCOLOR + 104, "color104", "color"), ++ RSTRG (Rs_color + minCOLOR + 105, "color105", "color"), ++ RSTRG (Rs_color + minCOLOR + 106, "color106", "color"), ++ RSTRG (Rs_color + minCOLOR + 107, "color107", "color"), ++ RSTRG (Rs_color + minCOLOR + 108, "color108", "color"), ++ RSTRG (Rs_color + minCOLOR + 109, "color109", "color"), ++ RSTRG (Rs_color + minCOLOR + 110, "color110", "color"), ++ RSTRG (Rs_color + minCOLOR + 111, "color111", "color"), ++ RSTRG (Rs_color + minCOLOR + 112, "color112", "color"), ++ RSTRG (Rs_color + minCOLOR + 113, "color113", "color"), ++ RSTRG (Rs_color + minCOLOR + 114, "color114", "color"), ++ RSTRG (Rs_color + minCOLOR + 115, "color115", "color"), ++ RSTRG (Rs_color + minCOLOR + 116, "color116", "color"), ++ RSTRG (Rs_color + minCOLOR + 117, "color117", "color"), ++ RSTRG (Rs_color + minCOLOR + 118, "color118", "color"), ++ RSTRG (Rs_color + minCOLOR + 119, "color119", "color"), ++ RSTRG (Rs_color + minCOLOR + 120, "color120", "color"), ++ RSTRG (Rs_color + minCOLOR + 121, "color121", "color"), ++ RSTRG (Rs_color + minCOLOR + 122, "color122", "color"), ++ RSTRG (Rs_color + minCOLOR + 123, "color123", "color"), ++ RSTRG (Rs_color + minCOLOR + 124, "color124", "color"), ++ RSTRG (Rs_color + minCOLOR + 125, "color125", "color"), ++ RSTRG (Rs_color + minCOLOR + 126, "color126", "color"), ++ RSTRG (Rs_color + minCOLOR + 127, "color127", "color"), ++ RSTRG (Rs_color + minCOLOR + 128, "color128", "color"), ++ RSTRG (Rs_color + minCOLOR + 129, "color129", "color"), ++ RSTRG (Rs_color + minCOLOR + 130, "color130", "color"), ++ RSTRG (Rs_color + minCOLOR + 131, "color131", "color"), ++ RSTRG (Rs_color + minCOLOR + 132, "color132", "color"), ++ RSTRG (Rs_color + minCOLOR + 133, "color133", "color"), ++ RSTRG (Rs_color + minCOLOR + 134, "color134", "color"), ++ RSTRG (Rs_color + minCOLOR + 135, "color135", "color"), ++ RSTRG (Rs_color + minCOLOR + 136, "color136", "color"), ++ RSTRG (Rs_color + minCOLOR + 137, "color137", "color"), ++ RSTRG (Rs_color + minCOLOR + 138, "color138", "color"), ++ RSTRG (Rs_color + minCOLOR + 139, "color139", "color"), ++ RSTRG (Rs_color + minCOLOR + 140, "color140", "color"), ++ RSTRG (Rs_color + minCOLOR + 141, "color141", "color"), ++ RSTRG (Rs_color + minCOLOR + 142, "color142", "color"), ++ RSTRG (Rs_color + minCOLOR + 143, "color143", "color"), ++ RSTRG (Rs_color + minCOLOR + 144, "color144", "color"), ++ RSTRG (Rs_color + minCOLOR + 145, "color145", "color"), ++ RSTRG (Rs_color + minCOLOR + 146, "color146", "color"), ++ RSTRG (Rs_color + minCOLOR + 147, "color147", "color"), ++ RSTRG (Rs_color + minCOLOR + 148, "color148", "color"), ++ RSTRG (Rs_color + minCOLOR + 149, "color149", "color"), ++ RSTRG (Rs_color + minCOLOR + 150, "color150", "color"), ++ RSTRG (Rs_color + minCOLOR + 151, "color151", "color"), ++ RSTRG (Rs_color + minCOLOR + 152, "color152", "color"), ++ RSTRG (Rs_color + minCOLOR + 153, "color153", "color"), ++ RSTRG (Rs_color + minCOLOR + 154, "color154", "color"), ++ RSTRG (Rs_color + minCOLOR + 155, "color155", "color"), ++ RSTRG (Rs_color + minCOLOR + 156, "color156", "color"), ++ RSTRG (Rs_color + minCOLOR + 157, "color157", "color"), ++ RSTRG (Rs_color + minCOLOR + 158, "color158", "color"), ++ RSTRG (Rs_color + minCOLOR + 159, "color159", "color"), ++ RSTRG (Rs_color + minCOLOR + 160, "color160", "color"), ++ RSTRG (Rs_color + minCOLOR + 161, "color161", "color"), ++ RSTRG (Rs_color + minCOLOR + 162, "color162", "color"), ++ RSTRG (Rs_color + minCOLOR + 163, "color163", "color"), ++ RSTRG (Rs_color + minCOLOR + 164, "color164", "color"), ++ RSTRG (Rs_color + minCOLOR + 165, "color165", "color"), ++ RSTRG (Rs_color + minCOLOR + 166, "color166", "color"), ++ RSTRG (Rs_color + minCOLOR + 167, "color167", "color"), ++ RSTRG (Rs_color + minCOLOR + 168, "color168", "color"), ++ RSTRG (Rs_color + minCOLOR + 169, "color169", "color"), ++ RSTRG (Rs_color + minCOLOR + 170, "color170", "color"), ++ RSTRG (Rs_color + minCOLOR + 171, "color171", "color"), ++ RSTRG (Rs_color + minCOLOR + 172, "color172", "color"), ++ RSTRG (Rs_color + minCOLOR + 173, "color173", "color"), ++ RSTRG (Rs_color + minCOLOR + 174, "color174", "color"), ++ RSTRG (Rs_color + minCOLOR + 175, "color175", "color"), ++ RSTRG (Rs_color + minCOLOR + 176, "color176", "color"), ++ RSTRG (Rs_color + minCOLOR + 177, "color177", "color"), ++ RSTRG (Rs_color + minCOLOR + 178, "color178", "color"), ++ RSTRG (Rs_color + minCOLOR + 179, "color179", "color"), ++ RSTRG (Rs_color + minCOLOR + 180, "color180", "color"), ++ RSTRG (Rs_color + minCOLOR + 181, "color181", "color"), ++ RSTRG (Rs_color + minCOLOR + 182, "color182", "color"), ++ RSTRG (Rs_color + minCOLOR + 183, "color183", "color"), ++ RSTRG (Rs_color + minCOLOR + 184, "color184", "color"), ++ RSTRG (Rs_color + minCOLOR + 185, "color185", "color"), ++ RSTRG (Rs_color + minCOLOR + 186, "color186", "color"), ++ RSTRG (Rs_color + minCOLOR + 187, "color187", "color"), ++ RSTRG (Rs_color + minCOLOR + 188, "color188", "color"), ++ RSTRG (Rs_color + minCOLOR + 189, "color189", "color"), ++ RSTRG (Rs_color + minCOLOR + 190, "color190", "color"), ++ RSTRG (Rs_color + minCOLOR + 191, "color191", "color"), ++ RSTRG (Rs_color + minCOLOR + 192, "color192", "color"), ++ RSTRG (Rs_color + minCOLOR + 193, "color193", "color"), ++ RSTRG (Rs_color + minCOLOR + 194, "color194", "color"), ++ RSTRG (Rs_color + minCOLOR + 195, "color195", "color"), ++ RSTRG (Rs_color + minCOLOR + 196, "color196", "color"), ++ RSTRG (Rs_color + minCOLOR + 197, "color197", "color"), ++ RSTRG (Rs_color + minCOLOR + 198, "color198", "color"), ++ RSTRG (Rs_color + minCOLOR + 199, "color199", "color"), ++ RSTRG (Rs_color + minCOLOR + 200, "color200", "color"), ++ RSTRG (Rs_color + minCOLOR + 201, "color201", "color"), ++ RSTRG (Rs_color + minCOLOR + 202, "color202", "color"), ++ RSTRG (Rs_color + minCOLOR + 203, "color203", "color"), ++ RSTRG (Rs_color + minCOLOR + 204, "color204", "color"), ++ RSTRG (Rs_color + minCOLOR + 205, "color205", "color"), ++ RSTRG (Rs_color + minCOLOR + 206, "color206", "color"), ++ RSTRG (Rs_color + minCOLOR + 207, "color207", "color"), ++ RSTRG (Rs_color + minCOLOR + 208, "color208", "color"), ++ RSTRG (Rs_color + minCOLOR + 209, "color209", "color"), ++ RSTRG (Rs_color + minCOLOR + 210, "color210", "color"), ++ RSTRG (Rs_color + minCOLOR + 211, "color211", "color"), ++ RSTRG (Rs_color + minCOLOR + 212, "color212", "color"), ++ RSTRG (Rs_color + minCOLOR + 213, "color213", "color"), ++ RSTRG (Rs_color + minCOLOR + 214, "color214", "color"), ++ RSTRG (Rs_color + minCOLOR + 215, "color215", "color"), ++ RSTRG (Rs_color + minCOLOR + 216, "color216", "color"), ++ RSTRG (Rs_color + minCOLOR + 217, "color217", "color"), ++ RSTRG (Rs_color + minCOLOR + 218, "color218", "color"), ++ RSTRG (Rs_color + minCOLOR + 219, "color219", "color"), ++ RSTRG (Rs_color + minCOLOR + 220, "color220", "color"), ++ RSTRG (Rs_color + minCOLOR + 221, "color221", "color"), ++ RSTRG (Rs_color + minCOLOR + 222, "color222", "color"), ++ RSTRG (Rs_color + minCOLOR + 223, "color223", "color"), ++ RSTRG (Rs_color + minCOLOR + 224, "color224", "color"), ++ RSTRG (Rs_color + minCOLOR + 225, "color225", "color"), ++ RSTRG (Rs_color + minCOLOR + 226, "color226", "color"), ++ RSTRG (Rs_color + minCOLOR + 227, "color227", "color"), ++ RSTRG (Rs_color + minCOLOR + 228, "color228", "color"), ++ RSTRG (Rs_color + minCOLOR + 229, "color229", "color"), ++ RSTRG (Rs_color + minCOLOR + 230, "color230", "color"), ++ RSTRG (Rs_color + minCOLOR + 231, "color231", "color"), ++ RSTRG (Rs_color + minCOLOR + 232, "color232", "color"), ++ RSTRG (Rs_color + minCOLOR + 233, "color233", "color"), ++ RSTRG (Rs_color + minCOLOR + 234, "color234", "color"), ++ RSTRG (Rs_color + minCOLOR + 235, "color235", "color"), ++ RSTRG (Rs_color + minCOLOR + 236, "color236", "color"), ++ RSTRG (Rs_color + minCOLOR + 237, "color237", "color"), ++ RSTRG (Rs_color + minCOLOR + 238, "color238", "color"), ++ RSTRG (Rs_color + minCOLOR + 239, "color239", "color"), ++ RSTRG (Rs_color + minCOLOR + 240, "color240", "color"), ++ RSTRG (Rs_color + minCOLOR + 241, "color241", "color"), ++ RSTRG (Rs_color + minCOLOR + 242, "color242", "color"), ++ RSTRG (Rs_color + minCOLOR + 243, "color243", "color"), ++ RSTRG (Rs_color + minCOLOR + 244, "color244", "color"), ++ RSTRG (Rs_color + minCOLOR + 245, "color245", "color"), ++ RSTRG (Rs_color + minCOLOR + 246, "color246", "color"), ++ RSTRG (Rs_color + minCOLOR + 247, "color247", "color"), ++ RSTRG (Rs_color + minCOLOR + 248, "color248", "color"), ++ RSTRG (Rs_color + minCOLOR + 249, "color249", "color"), ++ RSTRG (Rs_color + minCOLOR + 250, "color250", "color"), ++ RSTRG (Rs_color + minCOLOR + 251, "color251", "color"), ++ RSTRG (Rs_color + minCOLOR + 252, "color252", "color"), ++ RSTRG (Rs_color + minCOLOR + 253, "color253", "color"), ++ RSTRG (Rs_color + minCOLOR + 254, "color254", "color"), ++ RSTRG (Rs_color + minCOLOR + 255, "color255", "color"), ++#endif + RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"), + RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"), + RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"), From 22f73bfd85f7dc5d458fe65439b6ad967e1ec75a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sat, 26 Apr 2014 23:26:23 +0200 Subject: [PATCH 003/254] Enable encrypted backing devices in fileystem configurations --- nixos/modules/module-list.nix | 1 + nixos/modules/tasks/encrypted-devices.nix | 69 +++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 nixos/modules/tasks/encrypted-devices.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a769914499d1..58d3478afb40 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -311,6 +311,7 @@ ./tasks/filesystems/vfat.nix ./tasks/filesystems/xfs.nix ./tasks/filesystems/zfs.nix + ./tasks/encrypted-devices.nix ./tasks/kbd.nix ./tasks/lvm.nix ./tasks/network-interfaces.nix diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix new file mode 100644 index 000000000000..e80762a170c4 --- /dev/null +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -0,0 +1,69 @@ +{ config, pkgs, modulesPath, ... }: + +with pkgs.lib; + +let + fileSystems = attrValues config.fileSystems ++ config.swapDevices; + encDevs = filter (dev: dev.encrypted.enable) fileSystems; + keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs; + isIn = needle: haystack: filter (p: p == needle) haystack != []; + anyEncrypted = + fold (j: v: v || j.encrypted.enable) false encDevs; + + encryptedFSOptions = { + + encrypted = { + enable = mkOption { + default = false; + type = types.bool; + description = "The block device is backed by an encrypted one, adds this device as a initrd luks entry"; + }; + + blkDev = mkOption { + default = null; + example = "/dev/sda1"; + type = types.uniq (types.nullOr types.string); + description = "Location of the backing encrypted device"; + }; + + label = mkOption { + default = null; + example = "rootfs"; + type = types.uniq (types.nullOr types.string); + description = "Label of the backing encrypted device"; + }; + + keyFile = mkOption { + default = null; + example = "/root/.swapkey"; + type = types.uniq (types.nullOr types.string); + description = "File system location of keyfile"; + }; + }; + }; +in + +{ + + options = { + fileSystems = mkOption { + options = [encryptedFSOptions]; + }; + swapDevices = mkOption { + options = [encryptedFSOptions]; + }; + }; + + config = mkIf anyEncrypted { + boot.initrd = { + luks = { + devices = + map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) encDevs; + cryptoModules = [ "aes" "sha256" "sha1" "xts" ]; + }; + postMountCommands = + concatMapStrings (dev: "cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.label};\n") keyedEncDevs; + }; + }; +} + From 9683c6e80611e142ca657e106d0eea97f119d488 Mon Sep 17 00:00:00 2001 From: robberer Date: Thu, 1 May 2014 16:37:14 +0200 Subject: [PATCH 004/254] add nvidia-uvm module which is necessary for blender GPU support --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 51144bc10519..47fb7a4d90ee 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -20,6 +20,9 @@ buildPhase() { sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile make SYSSRC=$sysSrc SYSOUT=$sysOut module + cd uvm + make SYSSRC=$sysSrc SYSOUT=$sysOut module + cd .. cd .. fi } @@ -56,6 +59,7 @@ installPhase() { # Install the kernel module. mkdir -p $out/lib/modules/$kernelVersion/misc cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc + cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc # Install the X driver. mkdir -p $out/lib/xorg/modules From 78c33177ce93cf0ce4142b1e19e7583ebd96e7b9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 27 Apr 2014 17:01:06 -0500 Subject: [PATCH 005/254] ssh: Support knownHost public keys as strings --- .../modules/services/networking/ssh/sshd.nix | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 554cc6a1c3fc..4a60e59b20b6 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -18,9 +18,9 @@ let knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts); knownHostsFile = pkgs.writeText "ssh_known_hosts" ( - flip concatMapStrings knownHosts (h: - "${concatStringsSep "," h.hostNames} ${readFile h.publicKeyFile}" - ) + flip concatMapStrings knownHosts (h: '' + ${concatStringsSep "," h.hostNames} ${if h.publicKey != null then h.publicKey else readFile h.publicKeyFile} + '') ); userOptions = { @@ -218,7 +218,18 @@ in the host's ssh service. ''; }; + publicKey = mkOption { + default = null; + type = types.nullOr types.string; + description = '' + The public key data for the host. You can fetch a public key + from a running SSH server with the ssh-keyscan + command. + ''; + }; publicKeyFile = mkOption { + default = null; + type = types.nullOr types.unspecified; description = '' The path to the public key file for the host. The public key file is read at build time and saved in the Nix store. @@ -367,7 +378,12 @@ in ''; assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; - message = "cannot enable X11 forwarding without setting xauth location";}]; + message = "cannot enable X11 forwarding without setting xauth location";}] + ++ flip mapAttrsToList cfg.knownHosts (name: data: { + assertion = (data.publicKey == null && data.publicKeyFile != null) || + (data.publicKey != null && data.publicKeyFile == null); + message = "knownHost ${name} must contain either a publicKey or publicKeyFile"; + }); }; From 1396f624f46b406e82fcea825962af3f50c747c1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 1 May 2014 16:27:16 -0500 Subject: [PATCH 006/254] sshd: Fix typing for options which take paths --- nixos/modules/services/networking/ssh/sshd.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 4a60e59b20b6..e4b29a0b9090 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -39,7 +39,7 @@ let }; keyFiles = mkOption { - type = types.listOf types.unspecified; + type = types.listOf types.path; default = []; description = '' A list of files each containing one OpenSSH public key that should be @@ -182,7 +182,7 @@ in }; authorizedKeysFiles = mkOption { - type = types.listOf types.unspecified; + type = types.listOf types.str; default = []; description = "Files from with authorized keys are read."; }; @@ -220,7 +220,7 @@ in }; publicKey = mkOption { default = null; - type = types.nullOr types.string; + type = types.nullOr types.str; description = '' The public key data for the host. You can fetch a public key from a running SSH server with the ssh-keyscan @@ -229,7 +229,7 @@ in }; publicKeyFile = mkOption { default = null; - type = types.nullOr types.unspecified; + type = types.nullOr types.path; description = '' The path to the public key file for the host. The public key file is read at build time and saved in the Nix store. From ead35d9d042db1cc85394a69039238453708600e Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Sun, 4 May 2014 01:55:46 +0200 Subject: [PATCH 007/254] Add wmertens to maintainers --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cf0743fa403a..f64b087e55df 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -91,6 +91,7 @@ vlstill = "Vladimír Štill "; winden = "Antonio Vargas Gonzalez "; wizeman = "Ricardo M. Correia "; + wmertens = "Wout Mertens "; z77z = "Marco Maggesi "; zef = "Zef Hemel "; zimbatm = "zimbatm "; From ac80d4541997132d55b5af3707257f605dd897fd Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Sun, 4 May 2014 01:15:16 +0200 Subject: [PATCH 008/254] a52dec: Add patches from Handbrake project this project hasn't been updated in 10 years, so adding patches that don't break the API should be ok. Patches: - A00: Make a52-state-t public - A01: Make it thread-safe (changing internal API by adding state objects) - A02: Quell common error - A03: Fix for automake vs autoconf --- .../a52dec/A00-a52-state-t-public.patch | 152 ++++++ .../libraries/a52dec/A01-thread-safe.patch | 462 ++++++++++++++++++ .../libraries/a52dec/A02-imdct-shutup.patch | 11 + .../libraries/a52dec/A03-automake.patch | 12 + pkgs/development/libraries/a52dec/default.nix | 10 +- 5 files changed, 646 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch create mode 100644 pkgs/development/libraries/a52dec/A01-thread-safe.patch create mode 100644 pkgs/development/libraries/a52dec/A02-imdct-shutup.patch create mode 100644 pkgs/development/libraries/a52dec/A03-automake.patch diff --git a/pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch b/pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch new file mode 100644 index 000000000000..5e0af3577d6a --- /dev/null +++ b/pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch @@ -0,0 +1,152 @@ +diff -Naur a52dec.old/include/a52.h a52dec.new/include/a52.h +--- a52dec.old/include/a52.h 2002-01-28 06:37:54.000000000 +0100 ++++ a52dec.new/include/a52.h 2012-07-16 14:13:35.000000000 +0200 +@@ -30,7 +30,71 @@ + typedef double sample_t; + #endif + +-typedef struct a52_state_s a52_state_t; ++typedef struct { ++ uint8_t bai; /* fine SNR offset, fast gain */ ++ uint8_t deltbae; /* delta bit allocation exists */ ++ int8_t deltba[50]; /* per-band delta bit allocation */ ++} ba_t; ++ ++typedef struct { ++ uint8_t exp[256]; /* decoded channel exponents */ ++ int8_t bap[256]; /* derived channel bit allocation */ ++} expbap_t; ++ ++typedef struct { ++ uint8_t fscod; /* sample rate */ ++ uint8_t halfrate; /* halfrate factor */ ++ uint8_t acmod; /* coded channels */ ++ uint8_t lfeon; /* coded lfe channel */ ++ sample_t clev; /* centre channel mix level */ ++ sample_t slev; /* surround channels mix level */ ++ ++ int output; /* type of output */ ++ sample_t level; /* output level */ ++ sample_t bias; /* output bias */ ++ ++ int dynrnge; /* apply dynamic range */ ++ sample_t dynrng; /* dynamic range */ ++ void * dynrngdata; /* dynamic range callback funtion and data */ ++ sample_t (* dynrngcall) (sample_t range, void * dynrngdata); ++ ++ uint8_t chincpl; /* channel coupled */ ++ uint8_t phsflginu; /* phase flags in use (stereo only) */ ++ uint8_t cplstrtmant; /* coupling channel start mantissa */ ++ uint8_t cplendmant; /* coupling channel end mantissa */ ++ uint32_t cplbndstrc; /* coupling band structure */ ++ sample_t cplco[5][18]; /* coupling coordinates */ ++ ++ /* derived information */ ++ uint8_t cplstrtbnd; /* coupling start band (for bit allocation) */ ++ uint8_t ncplbnd; /* number of coupling bands */ ++ ++ uint8_t rematflg; /* stereo rematrixing */ ++ ++ uint8_t endmant[5]; /* channel end mantissa */ ++ ++ uint16_t bai; /* bit allocation information */ ++ ++ uint32_t * buffer_start; ++ uint16_t lfsr_state; /* dither state */ ++ uint32_t bits_left; ++ uint32_t current_word; ++ ++ uint8_t csnroffst; /* coarse SNR offset */ ++ ba_t cplba; /* coupling bit allocation parameters */ ++ ba_t ba[5]; /* channel bit allocation parameters */ ++ ba_t lfeba; /* lfe bit allocation parameters */ ++ ++ uint8_t cplfleak; /* coupling fast leak init */ ++ uint8_t cplsleak; /* coupling slow leak init */ ++ ++ expbap_t cpl_expbap; ++ expbap_t fbw_expbap[5]; ++ expbap_t lfe_expbap; ++ ++ sample_t * samples; ++ int downmixed; ++} a52_state_t; + + #define A52_CHANNEL 0 + #define A52_MONO 1 +diff -Naur a52dec.old/liba52/a52_internal.h a52dec.new/liba52/a52_internal.h +--- a52dec.old/liba52/a52_internal.h 2002-07-28 03:52:06.000000000 +0200 ++++ a52dec.new/liba52/a52_internal.h 2012-07-16 14:11:47.000000000 +0200 +@@ -21,72 +21,6 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-typedef struct { +- uint8_t bai; /* fine SNR offset, fast gain */ +- uint8_t deltbae; /* delta bit allocation exists */ +- int8_t deltba[50]; /* per-band delta bit allocation */ +-} ba_t; +- +-typedef struct { +- uint8_t exp[256]; /* decoded channel exponents */ +- int8_t bap[256]; /* derived channel bit allocation */ +-} expbap_t; +- +-struct a52_state_s { +- uint8_t fscod; /* sample rate */ +- uint8_t halfrate; /* halfrate factor */ +- uint8_t acmod; /* coded channels */ +- uint8_t lfeon; /* coded lfe channel */ +- sample_t clev; /* centre channel mix level */ +- sample_t slev; /* surround channels mix level */ +- +- int output; /* type of output */ +- sample_t level; /* output level */ +- sample_t bias; /* output bias */ +- +- int dynrnge; /* apply dynamic range */ +- sample_t dynrng; /* dynamic range */ +- void * dynrngdata; /* dynamic range callback funtion and data */ +- sample_t (* dynrngcall) (sample_t range, void * dynrngdata); +- +- uint8_t chincpl; /* channel coupled */ +- uint8_t phsflginu; /* phase flags in use (stereo only) */ +- uint8_t cplstrtmant; /* coupling channel start mantissa */ +- uint8_t cplendmant; /* coupling channel end mantissa */ +- uint32_t cplbndstrc; /* coupling band structure */ +- sample_t cplco[5][18]; /* coupling coordinates */ +- +- /* derived information */ +- uint8_t cplstrtbnd; /* coupling start band (for bit allocation) */ +- uint8_t ncplbnd; /* number of coupling bands */ +- +- uint8_t rematflg; /* stereo rematrixing */ +- +- uint8_t endmant[5]; /* channel end mantissa */ +- +- uint16_t bai; /* bit allocation information */ +- +- uint32_t * buffer_start; +- uint16_t lfsr_state; /* dither state */ +- uint32_t bits_left; +- uint32_t current_word; +- +- uint8_t csnroffst; /* coarse SNR offset */ +- ba_t cplba; /* coupling bit allocation parameters */ +- ba_t ba[5]; /* channel bit allocation parameters */ +- ba_t lfeba; /* lfe bit allocation parameters */ +- +- uint8_t cplfleak; /* coupling fast leak init */ +- uint8_t cplsleak; /* coupling slow leak init */ +- +- expbap_t cpl_expbap; +- expbap_t fbw_expbap[5]; +- expbap_t lfe_expbap; +- +- sample_t * samples; +- int downmixed; +-}; +- + #define LEVEL_PLUS6DB 2.0 + #define LEVEL_PLUS3DB 1.4142135623730951 + #define LEVEL_3DB 0.7071067811865476 diff --git a/pkgs/development/libraries/a52dec/A01-thread-safe.patch b/pkgs/development/libraries/a52dec/A01-thread-safe.patch new file mode 100644 index 000000000000..4ca2d1a08734 --- /dev/null +++ b/pkgs/development/libraries/a52dec/A01-thread-safe.patch @@ -0,0 +1,462 @@ +diff -Naur a52dec.old/include/a52.h a52dec.new/include/a52.h +--- a52dec.old/include/a52.h 2012-07-16 14:24:14.000000000 +0200 ++++ a52dec.new/include/a52.h 2012-07-16 14:31:37.000000000 +0200 +@@ -42,6 +42,11 @@ + } expbap_t; + + typedef struct { ++ sample_t real; ++ sample_t imag; ++} complex_t; ++ ++typedef struct { + uint8_t fscod; /* sample rate */ + uint8_t halfrate; /* halfrate factor */ + uint8_t acmod; /* coded channels */ +@@ -94,6 +99,20 @@ + + sample_t * samples; + int downmixed; ++ ++ /* Root values for IFFT */ ++ sample_t * roots16; // size 3 ++ sample_t * roots32; // size 7 ++ sample_t * roots64; // size 15 ++ sample_t * roots128; // size 31 ++ ++ /* Twiddle factors for IMDCT */ ++ complex_t * pre1; // size 128 ++ complex_t * post1; // size 64 ++ complex_t * pre2; // size 64 ++ complex_t * post2; // size 32 ++ ++ sample_t * a52_imdct_window; // size 256 + } a52_state_t; + + #define A52_CHANNEL 0 +diff -Naur a52dec.old/liba52/a52_internal.h a52dec.new/liba52/a52_internal.h +--- a52dec.old/liba52/a52_internal.h 2012-07-16 14:24:14.000000000 +0200 ++++ a52dec.new/liba52/a52_internal.h 2012-07-16 14:28:33.000000000 +0200 +@@ -49,6 +49,6 @@ + sample_t clev, sample_t slev); + void a52_upmix (sample_t * samples, int acmod, int output); + +-void a52_imdct_init (uint32_t mm_accel); +-void a52_imdct_256 (sample_t * data, sample_t * delay, sample_t bias); +-void a52_imdct_512 (sample_t * data, sample_t * delay, sample_t bias); ++void a52_imdct_init (a52_state_t * state, uint32_t mm_accel); ++void a52_imdct_256 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias); ++void a52_imdct_512 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias); +diff -Naur a52dec.old/liba52/imdct.c a52dec.new/liba52/imdct.c +--- a52dec.old/liba52/imdct.c 2012-07-16 14:24:14.000000000 +0200 ++++ a52dec.new/liba52/imdct.c 2012-07-16 14:33:00.000000000 +0200 +@@ -40,11 +40,6 @@ + #include "a52_internal.h" + #include "mm_accel.h" + +-typedef struct complex_s { +- sample_t real; +- sample_t imag; +-} complex_t; +- + static uint8_t fftorder[] = { + 0,128, 64,192, 32,160,224, 96, 16,144, 80,208,240,112, 48,176, + 8,136, 72,200, 40,168,232,104,248,120, 56,184, 24,152,216, 88, +@@ -56,22 +51,8 @@ + 6,134, 70,198, 38,166,230,102,246,118, 54,182, 22,150,214, 86 + }; + +-/* Root values for IFFT */ +-static sample_t roots16[3]; +-static sample_t roots32[7]; +-static sample_t roots64[15]; +-static sample_t roots128[31]; +- +-/* Twiddle factors for IMDCT */ +-static complex_t pre1[128]; +-static complex_t post1[64]; +-static complex_t pre2[64]; +-static complex_t post2[32]; +- +-static sample_t a52_imdct_window[256]; +- +-static void (* ifft128) (complex_t * buf); +-static void (* ifft64) (complex_t * buf); ++static void (* ifft128) (a52_state_t * state, complex_t * buf); ++static void (* ifft64) (a52_state_t * state, complex_t * buf); + + static inline void ifft2 (complex_t * buf) + { +@@ -167,7 +148,7 @@ + a1.imag += tmp4; \ + } while (0) + +-static inline void ifft8 (complex_t * buf) ++static inline void ifft8 (a52_state_t * state, complex_t * buf) + { + double tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8; + +@@ -175,7 +156,7 @@ + ifft2 (buf + 4); + ifft2 (buf + 6); + BUTTERFLY_ZERO (buf[0], buf[2], buf[4], buf[6]); +- BUTTERFLY_HALF (buf[1], buf[3], buf[5], buf[7], roots16[1]); ++ BUTTERFLY_HALF (buf[1], buf[3], buf[5], buf[7], state->roots16[1]); + } + + static void ifft_pass (complex_t * buf, sample_t * weight, int n) +@@ -205,66 +186,66 @@ + } while (--i); + } + +-static void ifft16 (complex_t * buf) ++static void ifft16 (a52_state_t * state, complex_t * buf) + { +- ifft8 (buf); ++ ifft8 (state, buf); + ifft4 (buf + 8); + ifft4 (buf + 12); +- ifft_pass (buf, roots16 - 4, 4); ++ ifft_pass (buf, state->roots16 - 4, 4); + } + +-static void ifft32 (complex_t * buf) ++static void ifft32 (a52_state_t * state, complex_t * buf) + { +- ifft16 (buf); +- ifft8 (buf + 16); +- ifft8 (buf + 24); +- ifft_pass (buf, roots32 - 8, 8); ++ ifft16 (state, buf); ++ ifft8 (state, buf + 16); ++ ifft8 (state, buf + 24); ++ ifft_pass (buf, state->roots32 - 8, 8); + } + +-static void ifft64_c (complex_t * buf) ++static void ifft64_c (a52_state_t * state, complex_t * buf) + { +- ifft32 (buf); +- ifft16 (buf + 32); +- ifft16 (buf + 48); +- ifft_pass (buf, roots64 - 16, 16); ++ ifft32 (state, buf); ++ ifft16 (state, buf + 32); ++ ifft16 (state, buf + 48); ++ ifft_pass (buf, state->roots64 - 16, 16); + } + +-static void ifft128_c (complex_t * buf) ++static void ifft128_c (a52_state_t * state, complex_t * buf) + { +- ifft32 (buf); +- ifft16 (buf + 32); +- ifft16 (buf + 48); +- ifft_pass (buf, roots64 - 16, 16); ++ ifft32 (state, buf); ++ ifft16 (state, buf + 32); ++ ifft16 (state, buf + 48); ++ ifft_pass (buf, state->roots64 - 16, 16); + +- ifft32 (buf + 64); +- ifft32 (buf + 96); +- ifft_pass (buf, roots128 - 32, 32); ++ ifft32 (state, buf + 64); ++ ifft32 (state, buf + 96); ++ ifft_pass (buf, state->roots128 - 32, 32); + } + +-void a52_imdct_512 (sample_t * data, sample_t * delay, sample_t bias) ++void a52_imdct_512 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias) + { + int i, k; + sample_t t_r, t_i, a_r, a_i, b_r, b_i, w_1, w_2; +- const sample_t * window = a52_imdct_window; ++ const sample_t * window = state->a52_imdct_window; + complex_t buf[128]; + + for (i = 0; i < 128; i++) { + k = fftorder[i]; +- t_r = pre1[i].real; +- t_i = pre1[i].imag; ++ t_r = state->pre1[i].real; ++ t_i = state->pre1[i].imag; + + buf[i].real = t_i * data[255-k] + t_r * data[k]; + buf[i].imag = t_r * data[255-k] - t_i * data[k]; + } + +- ifft128 (buf); ++ ifft128 (state, buf); + + /* Post IFFT complex multiply plus IFFT complex conjugate*/ + /* Window and convert to real valued signal */ + for (i = 0; i < 64; i++) { + /* y[n] = z[n] * (xcos1[n] + j * xsin1[n]) ; */ +- t_r = post1[i].real; +- t_i = post1[i].imag; ++ t_r = state->post1[i].real; ++ t_i = state->post1[i].imag; + + a_r = t_r * buf[i].real + t_i * buf[i].imag; + a_i = t_i * buf[i].real - t_r * buf[i].imag; +@@ -285,18 +266,18 @@ + } + } + +-void a52_imdct_256(sample_t * data, sample_t * delay, sample_t bias) ++void a52_imdct_256(a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias) + { + int i, k; + sample_t t_r, t_i, a_r, a_i, b_r, b_i, c_r, c_i, d_r, d_i, w_1, w_2; +- const sample_t * window = a52_imdct_window; ++ const sample_t * window = state->a52_imdct_window; + complex_t buf1[64], buf2[64]; + + /* Pre IFFT complex multiply plus IFFT cmplx conjugate */ + for (i = 0; i < 64; i++) { + k = fftorder[i]; +- t_r = pre2[i].real; +- t_i = pre2[i].imag; ++ t_r = state->pre2[i].real; ++ t_i = state->pre2[i].imag; + + buf1[i].real = t_i * data[254-k] + t_r * data[k]; + buf1[i].imag = t_r * data[254-k] - t_i * data[k]; +@@ -305,15 +286,15 @@ + buf2[i].imag = t_r * data[255-k] - t_i * data[k+1]; + } + +- ifft64 (buf1); +- ifft64 (buf2); ++ ifft64 (state, buf1); ++ ifft64 (state, buf2); + + /* Post IFFT complex multiply */ + /* Window and convert to real valued signal */ + for (i = 0; i < 32; i++) { + /* y1[n] = z1[n] * (xcos2[n] + j * xs in2[n]) ; */ +- t_r = post2[i].real; +- t_i = post2[i].imag; ++ t_r = state->post2[i].real; ++ t_i = state->post2[i].imag; + + a_r = t_r * buf1[i].real + t_i * buf1[i].imag; + a_i = t_i * buf1[i].real - t_r * buf1[i].imag; +@@ -362,7 +343,7 @@ + return bessel; + } + +-void a52_imdct_init (uint32_t mm_accel) ++void a52_imdct_init (a52_state_t * state, uint32_t mm_accel) + { + int i, k; + double sum; +@@ -371,50 +352,50 @@ + sum = 0; + for (i = 0; i < 256; i++) { + sum += besselI0 (i * (256 - i) * (5 * M_PI / 256) * (5 * M_PI / 256)); +- a52_imdct_window[i] = sum; ++ state->a52_imdct_window[i] = sum; + } + sum++; + for (i = 0; i < 256; i++) +- a52_imdct_window[i] = sqrt (a52_imdct_window[i] / sum); ++ state->a52_imdct_window[i] = sqrt (state->a52_imdct_window[i] / sum); + + for (i = 0; i < 3; i++) +- roots16[i] = cos ((M_PI / 8) * (i + 1)); ++ state->roots16[i] = cos ((M_PI / 8) * (i + 1)); + + for (i = 0; i < 7; i++) +- roots32[i] = cos ((M_PI / 16) * (i + 1)); ++ state->roots32[i] = cos ((M_PI / 16) * (i + 1)); + + for (i = 0; i < 15; i++) +- roots64[i] = cos ((M_PI / 32) * (i + 1)); ++ state->roots64[i] = cos ((M_PI / 32) * (i + 1)); + + for (i = 0; i < 31; i++) +- roots128[i] = cos ((M_PI / 64) * (i + 1)); ++ state->roots128[i] = cos ((M_PI / 64) * (i + 1)); + + for (i = 0; i < 64; i++) { + k = fftorder[i] / 2 + 64; +- pre1[i].real = cos ((M_PI / 256) * (k - 0.25)); +- pre1[i].imag = sin ((M_PI / 256) * (k - 0.25)); ++ state->pre1[i].real = cos ((M_PI / 256) * (k - 0.25)); ++ state->pre1[i].imag = sin ((M_PI / 256) * (k - 0.25)); + } + + for (i = 64; i < 128; i++) { + k = fftorder[i] / 2 + 64; +- pre1[i].real = -cos ((M_PI / 256) * (k - 0.25)); +- pre1[i].imag = -sin ((M_PI / 256) * (k - 0.25)); ++ state->pre1[i].real = -cos ((M_PI / 256) * (k - 0.25)); ++ state->pre1[i].imag = -sin ((M_PI / 256) * (k - 0.25)); + } + + for (i = 0; i < 64; i++) { +- post1[i].real = cos ((M_PI / 256) * (i + 0.5)); +- post1[i].imag = sin ((M_PI / 256) * (i + 0.5)); ++ state->post1[i].real = cos ((M_PI / 256) * (i + 0.5)); ++ state->post1[i].imag = sin ((M_PI / 256) * (i + 0.5)); + } + + for (i = 0; i < 64; i++) { + k = fftorder[i] / 4; +- pre2[i].real = cos ((M_PI / 128) * (k - 0.25)); +- pre2[i].imag = sin ((M_PI / 128) * (k - 0.25)); ++ state->pre2[i].real = cos ((M_PI / 128) * (k - 0.25)); ++ state->pre2[i].imag = sin ((M_PI / 128) * (k - 0.25)); + } + + for (i = 0; i < 32; i++) { +- post2[i].real = cos ((M_PI / 128) * (i + 0.5)); +- post2[i].imag = sin ((M_PI / 128) * (i + 0.5)); ++ state->post2[i].real = cos ((M_PI / 128) * (i + 0.5)); ++ state->post2[i].imag = sin ((M_PI / 128) * (i + 0.5)); + } + + #ifdef LIBA52_DJBFFT +diff -Naur a52dec.old/liba52/parse.c a52dec.new/liba52/parse.c +--- a52dec.old/liba52/parse.c 2012-07-16 14:24:14.000000000 +0200 ++++ a52dec.new/liba52/parse.c 2012-07-16 14:33:00.000000000 +0200 +@@ -56,16 +56,53 @@ + a52_state_t * state; + int i; + +- state = malloc (sizeof (a52_state_t)); ++ state = calloc (1, sizeof (a52_state_t)); + if (state == NULL) + return NULL; + + state->samples = memalign (16, 256 * 12 * sizeof (sample_t)); + if (state->samples == NULL) { +- free (state); +- return NULL; ++ goto fail; + } + ++ /* Root values for IFFT */ ++ state->roots16 = memalign (16, 3 * sizeof (sample_t)); ++ if (state->roots16 == NULL) ++ goto fail; ++ ++ state->roots32 = memalign (16, 7 * sizeof (sample_t)); ++ if (state->roots32 == NULL) ++ goto fail; ++ ++ state->roots64 = memalign (16, 15 * sizeof (sample_t)); ++ if (state->roots64 == NULL) ++ goto fail; ++ ++ state->roots128 = memalign (16, 31 * sizeof (sample_t)); ++ if (state->roots128 == NULL) ++ goto fail; ++ ++ /* Twiddle factors for IMDCT */ ++ state->pre1 = memalign (16, 128 * sizeof (complex_t)); ++ if (state->pre1 == NULL) ++ goto fail; ++ ++ state->post1 = memalign (16, 64 * sizeof (complex_t)); ++ if (state->post1 == NULL) ++ goto fail; ++ ++ state->pre2 = memalign (16, 64 * sizeof (complex_t)); ++ if (state->pre2 == NULL) ++ goto fail; ++ ++ state->post2 = memalign (16, 32 * sizeof (complex_t)); ++ if (state->post2 == NULL) ++ goto fail; ++ ++ state->a52_imdct_window = memalign (16, 256 * sizeof (sample_t)); ++ if (state->a52_imdct_window == NULL) ++ goto fail; ++ + for (i = 0; i < 256 * 12; i++) + state->samples[i] = 0; + +@@ -73,9 +110,27 @@ + + state->lfsr_state = 1; + +- a52_imdct_init (mm_accel); ++ a52_imdct_init (state, mm_accel); + + return state; ++ ++fail: ++ if ( state ) ++ { ++ free (state->a52_imdct_window); ++ free (state->post2); ++ free (state->pre2); ++ free (state->post1); ++ free (state->pre1); ++ free (state->roots128); ++ free (state->roots64); ++ free (state->roots32); ++ free (state->roots16); ++ free (state->samples); ++ free (state); ++ } ++ return NULL; ++ + } + + sample_t * a52_samples (a52_state_t * state) +@@ -825,7 +880,7 @@ + state->dynrng, 0, 7); + for (i = 7; i < 256; i++) + (samples-256)[i] = 0; +- a52_imdct_512 (samples - 256, samples + 1536 - 256, state->bias); ++ a52_imdct_512 (state, samples - 256, samples + 1536 - 256, state->bias); + } else { + /* just skip the LFE coefficients */ + coeff_get (state, samples + 1280, &state->lfe_expbap, &quantizer, +@@ -854,10 +909,10 @@ + + if (coeff[i]) { + if (blksw[i]) +- a52_imdct_256 (samples + 256 * i, samples + 1536 + 256 * i, ++ a52_imdct_256 (state, samples + 256 * i, samples + 1536 + 256 * i, + bias); + else +- a52_imdct_512 (samples + 256 * i, samples + 1536 + 256 * i, ++ a52_imdct_512 (state, samples + 256 * i, samples + 1536 + 256 * i, + bias); + } else { + int j; +@@ -883,11 +938,11 @@ + + if (blksw[0]) + for (i = 0; i < nfchans; i++) +- a52_imdct_256 (samples + 256 * i, samples + 1536 + 256 * i, ++ a52_imdct_256 (state, samples + 256 * i, samples + 1536 + 256 * i, + state->bias); + else + for (i = 0; i < nfchans; i++) +- a52_imdct_512 (samples + 256 * i, samples + 1536 + 256 * i, ++ a52_imdct_512 (state, samples + 256 * i, samples + 1536 + 256 * i, + state->bias); + } + +@@ -896,6 +951,15 @@ + + void a52_free (a52_state_t * state) + { ++ free (state->a52_imdct_window); ++ free (state->post2); ++ free (state->pre2); ++ free (state->post1); ++ free (state->pre1); ++ free (state->roots128); ++ free (state->roots64); ++ free (state->roots32); ++ free (state->roots16); + free (state->samples); + free (state); + } diff --git a/pkgs/development/libraries/a52dec/A02-imdct-shutup.patch b/pkgs/development/libraries/a52dec/A02-imdct-shutup.patch new file mode 100644 index 000000000000..a22e5979e665 --- /dev/null +++ b/pkgs/development/libraries/a52dec/A02-imdct-shutup.patch @@ -0,0 +1,11 @@ +diff -Naur a52dec_original/liba52/imdct.c a52dec_patched/liba52/imdct.c +--- a52dec.old/liba52/imdct.c 2002-07-28 03:52:07.000000000 +0200 ++++ a52dec.new/liba52/imdct.c 2011-07-15 20:29:09.000000000 +0200 +@@ -425,7 +425,6 @@ + } else + #endif + { +- fprintf (stderr, "No accelerated IMDCT transform found\n"); + ifft128 = ifft128_c; + ifft64 = ifft64_c; + } diff --git a/pkgs/development/libraries/a52dec/A03-automake.patch b/pkgs/development/libraries/a52dec/A03-automake.patch new file mode 100644 index 000000000000..142091dc6957 --- /dev/null +++ b/pkgs/development/libraries/a52dec/A03-automake.patch @@ -0,0 +1,12 @@ +diff -Naur a52dec.orig/configure.in a52dec/configure.in +--- a52dec.orig/configure.in 2002-07-27 23:50:20.000000000 -0400 ++++ a52dec/configure.in 2013-01-28 21:06:27.000000000 -0500 +@@ -6,7 +6,7 @@ + AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile + doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile]) + AM_INIT_AUTOMAKE([a52dec],[0.7.4]) +-AM_CONFIG_HEADER(include/config.h) ++AC_CONFIG_HEADER(include/config.h) + AM_MAINTAINER_MODE + AC_CANONICAL_HOST + diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index 84a87df03e40..7d5c5fab3934 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "a52dec-0.7.4"; + name = "a52dec-0.7.4p4"; src = fetchurl { url = "${meta.homepage}/files/a52dec-0.7.4.tar.gz"; @@ -10,6 +10,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpic"; + # From Handbrake + patches = [ + ./A00-a52-state-t-public.patch + ./A01-thread-safe.patch + ./A02-imdct-shutup.patch + ./A03-automake.patch + ]; + meta = { description = "ATSC A/52 stream decoder"; homepage = http://liba52.sourceforge.net/; From 66216ea6db71c59505b1144432233f6fbb1d1561 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Sun, 4 May 2014 01:17:40 +0200 Subject: [PATCH 009/254] libbluray: Add patch from Handbrake project - A01: Make it smarter about filtering duplicates --- .../libraries/libbluray/A01-filter-dup.patch | 80 +++++++++++++++++++ .../libraries/libbluray/default.nix | 5 +- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libbluray/A01-filter-dup.patch diff --git a/pkgs/development/libraries/libbluray/A01-filter-dup.patch b/pkgs/development/libraries/libbluray/A01-filter-dup.patch new file mode 100644 index 000000000000..608f8dd1b49e --- /dev/null +++ b/pkgs/development/libraries/libbluray/A01-filter-dup.patch @@ -0,0 +1,80 @@ +diff --git a/src/libbluray/bdnav/navigation.c b/src/libbluray/bdnav/navigation.c +index c8dc307..26d0000 100644 +--- a/src/libbluray/bdnav/navigation.c ++++ b/src/libbluray/bdnav/navigation.c +@@ -32,9 +32,25 @@ + #include + #include + ++static int _stream_cmp(MPLS_STREAM *a, MPLS_STREAM *b) ++{ ++ if (a->stream_type == b->stream_type && ++ a->coding_type == b->coding_type && ++ a->pid == b->pid && ++ a->subpath_id == b->subpath_id && ++ a->subclip_id == b->subclip_id && ++ a->format == b->format && ++ a->rate == b->rate && ++ a->char_code == b->char_code && ++ memcmp(a->lang, b->lang, 4) == 0) { ++ return 1; ++ } ++ return 0; ++} ++ + static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl) + { +- unsigned ii, jj; ++ unsigned ii, jj, kk; + + for (ii = 0; ii < count; ii++) { + if (pl->list_count != pl_list[ii]->list_count) { +@@ -54,7 +70,48 @@ static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl) + pi1->out_time != pi2->out_time) { + break; + } ++ if (pi1->stn.num_video != pi2->stn.num_video || ++ pi1->stn.num_audio != pi2->stn.num_audio || ++ pi1->stn.num_pg != pi2->stn.num_pg || ++ pi1->stn.num_ig != pi2->stn.num_ig || ++ pi1->stn.num_secondary_audio != pi2->stn.num_secondary_audio || ++ pi1->stn.num_secondary_video != pi2->stn.num_secondary_video) { ++ break; ++ } ++ for (kk = 0; kk < pi1->stn.num_video; kk++) { ++ if (!_stream_cmp(&pi1->stn.video[kk], &pi2->stn.video[kk])) { ++ goto next; ++ } ++ } ++ for (kk = 0; kk < pi1->stn.num_audio; kk++) { ++ if (!_stream_cmp(&pi1->stn.audio[kk], &pi2->stn.audio[kk])) { ++ goto next; ++ } ++ } ++ for (kk = 0; kk < pi1->stn.num_pg; kk++) { ++ if (!_stream_cmp(&pi1->stn.pg[kk], &pi2->stn.pg[kk])) { ++ goto next; ++ } ++ } ++ for (kk = 0; kk < pi1->stn.num_ig; kk++) { ++ if (!_stream_cmp(&pi1->stn.ig[kk], &pi2->stn.ig[kk])) { ++ goto next; ++ } ++ } ++ for (kk = 0; kk < pi1->stn.num_secondary_audio; kk++) { ++ if (!_stream_cmp(&pi1->stn.secondary_audio[kk], ++ &pi2->stn.secondary_audio[kk])) { ++ goto next; ++ } ++ } ++ for (kk = 0; kk < pi1->stn.num_secondary_video; kk++) { ++ if (!_stream_cmp(&pi1->stn.secondary_video[kk], ++ &pi2->stn.secondary_video[kk])) { ++ goto next; ++ } ++ } + } ++next: + if (jj != pl->list_count) { + continue; + } diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 6c139242f3e7..f0eea80e89d2 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -11,7 +11,7 @@ let baseName = "libbluray"; in stdenv.mkDerivation { - name = "${baseName}-${version}"; + name = "${baseName}-${version}p1"; src = fetchgit { url = git://git.videolan.org/libbluray.git; @@ -26,6 +26,9 @@ stdenv.mkDerivation { preConfigure = "./bootstrap"; configureFlags = ["--disable-static"] ++ stdenv.lib.optionals withAACS ["--enable-bdjava" "--with-jdk=${jdk}"]; + # From Handbrake + patches = [ ./A01-filter-dup.patch ]; + meta = { homepage = http://www.videolan.org/developers/libbluray.html; description = "Library to access Blu-Ray disks for video playback"; From c02f80375f9bcc550f3e8b530262c85e585e516a Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Sun, 4 May 2014 01:23:13 +0200 Subject: [PATCH 010/254] libdvd{read,nav}: Version bump and patch from Handbrake project - API-compatible version bumps to latest upstream Patches: - A08: Adds API call to duplicate a DVD VM to libdvdnav - P00: Skip making examples --- .../libraries/libdvdnav/A08-dvdnav-dup.patch | 137 ++++++++++++++++++ .../libdvdnav/P00-mingw-no-examples.patch | 21 +++ .../libraries/libdvdnav/default.nix | 16 +- .../libraries/libdvdread/default.nix | 16 +- 4 files changed, 175 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch create mode 100644 pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch diff --git a/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch b/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch new file mode 100644 index 000000000000..c0991b43555a --- /dev/null +++ b/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch @@ -0,0 +1,137 @@ +Index: src/dvdnav.c +=================================================================== +--- libdvdnav.orig/src/dvdnav.c (revision 1168) ++++ libdvdnav/src/dvdnav.c (working copy) +@@ -71,6 +71,67 @@ + return DVDNAV_STATUS_OK; + } + ++dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src) { ++ dvdnav_t *this; ++ ++ (*dest) = NULL; ++ this = (dvdnav_t*)malloc(sizeof(dvdnav_t)); ++ if(!this) ++ return DVDNAV_STATUS_ERR; ++ ++ memcpy(this, src, sizeof(dvdnav_t)); ++ this->file = NULL; ++ ++ pthread_mutex_init(&this->vm_lock, NULL); ++ ++ this->vm = vm_new_copy(src->vm); ++ if(!this->vm) { ++ printerr("Error initialising the DVD VM."); ++ pthread_mutex_destroy(&this->vm_lock); ++ free(this); ++ return DVDNAV_STATUS_ERR; ++ } ++ ++ /* Start the read-ahead cache. */ ++ this->cache = dvdnav_read_cache_new(this); ++ ++ (*dest) = this; ++ return DVDNAV_STATUS_OK; ++} ++ ++dvdnav_status_t dvdnav_free_dup(dvdnav_t *this) { ++ ++#ifdef LOG_DEBUG ++ fprintf(MSG_OUT, "libdvdnav: free_dup:called\n"); ++#endif ++ ++ if (this->file) { ++ pthread_mutex_lock(&this->vm_lock); ++ DVDCloseFile(this->file); ++#ifdef LOG_DEBUG ++ fprintf(MSG_OUT, "libdvdnav: close:file closing\n"); ++#endif ++ this->file = NULL; ++ pthread_mutex_unlock(&this->vm_lock); ++ } ++ ++ /* Free the VM */ ++ if(this->vm) ++ vm_free_copy(this->vm); ++ ++ pthread_mutex_destroy(&this->vm_lock); ++ ++ /* We leave the final freeing of the entire structure to the cache, ++ * because we don't know, if there are still buffers out in the wild, ++ * that must return first. */ ++ if(this->cache) ++ dvdnav_read_cache_free(this->cache); ++ else ++ free(this); ++ ++ return DVDNAV_STATUS_OK; ++} ++ + dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) { + dvdnav_t *this; + struct timeval time; +Index: src/dvdnav/dvdnav.h +=================================================================== +--- libdvdnav.orig/src/dvdnav/dvdnav.h (revision 1168) ++++ libdvdnav/src/dvdnav.h (working copy) +@@ -89,6 +89,9 @@ + */ + dvdnav_status_t dvdnav_open(dvdnav_t **dest, const char *path); + ++dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src); ++dvdnav_status_t dvdnav_free_dup(dvdnav_t *this); ++ + /* + * Closes a dvdnav_t previously opened with dvdnav_open(), freeing any + * memory associated with it. +Index: src/vm/vm.c +=================================================================== +--- libdvdnav.orig/src/vm/vm.c (revision 1168) ++++ libdvdnav/src/vm/vm.c (working copy) +@@ -96,6 +98,7 @@ + + static pgcit_t* get_MENU_PGCIT(vm_t *vm, ifo_handle_t *h, uint16_t lang); + static pgcit_t* get_PGCIT(vm_t *vm); ++static void vm_close(vm_t *vm); + + + /* Helper functions */ +@@ -262,7 +265,7 @@ + } + + void vm_free_vm(vm_t *vm) { +- vm_stop(vm); ++ vm_close(vm); + free(vm); + } + +@@ -289,12 +292,20 @@ + + int vm_start(vm_t *vm) { + /* Set pgc to FP (First Play) pgc */ ++ if (vm->stopped) { ++ vm_reset(vm, NULL); ++ vm->stopped = 0; ++ } + set_FP_PGC(vm); + process_command(vm, play_PGC(vm)); + return !vm->stopped; + } + + void vm_stop(vm_t *vm) { ++ vm->stopped = 1; ++} ++ ++static void vm_close(vm_t *vm) { + if(vm->vmgi) { + ifoClose(vm->vmgi); + vm->vmgi=NULL; +@@ -346,7 +357,7 @@ + + if (vm->dvd && dvdroot) { + /* a new dvd device has been requested */ +- vm_stop(vm); ++ vm_close(vm); + } + if (!vm->dvd) { + vm->dvd = DVDOpen(dvdroot); diff --git a/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch b/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch new file mode 100644 index 000000000000..0e0618617359 --- /dev/null +++ b/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch @@ -0,0 +1,21 @@ +diff -Naur libdvdnav.orig/Makefile.am libdvdnav/Makefile.am +--- libdvdnav.orig/Makefile.am 2008-10-03 16:11:46.000000000 -0400 ++++ libdvdnav/Makefile.am 2009-04-24 02:53:15.000000000 -0400 +@@ -1,7 +1,7 @@ + include $(top_srcdir)/misc/Makefile.common + + +-SUBDIRS = src examples doc misc m4 ++SUBDIRS = src doc misc m4 + + EXTRA_DIST = autogen.sh \ + AUTHORS \ +diff -Naur libdvdnav.orig/configure.ac libdvdnav/configure.ac +--- libdvdnav.orig/configure.ac 2009-01-08 17:57:11.000000000 -0500 ++++ libdvdnav/configure.ac 2009-04-24 02:52:34.000000000 -0400 +@@ -252,5 +252,4 @@ + misc/relchk.sh + m4/Makefile + doc/Makefile +-examples/Makefile + ]) diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 4ba938911a41..9b4e912772b5 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchurl, libdvdread}: +{stdenv, fetchurl, pkgconfig, libdvdread}: stdenv.mkDerivation { - name = "libdvdnav-4.1.3"; + name = "libdvdnav-4.2.1"; src = fetchurl { - url = http://www2.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-4.1.3.tar.bz2; - sha1 = "d1b95eb8a7caee1fa7580a1abad84d6cb3cad046"; + url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz; + sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [libdvdread]; configureScript = "./configure2"; # wtf? @@ -16,9 +17,14 @@ stdenv.mkDerivation { mkdir -p $out ''; + # From Handbrake + patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ]; + meta = { - homepage = http://www.mplayerhq.hu/; + homepage = http://dvdnav.mplayerhq.hu/; description = "A library that implements DVD navigation features such as DVD menus"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.wmertens ]; }; passthru = { inherit libdvdread; }; diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 2593274d89bb..eb5a48a99f12 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -1,29 +1,25 @@ {stdenv, fetchurl, libdvdcss}: stdenv.mkDerivation { - name = "libdvdread-4.2.1"; + name = "libdvdread-4.9.9"; src = fetchurl { - url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.2.1.tar.xz; - sha256 = "af9b98f049580a6521d56c978b736d3d609562dd12955e11d50e26d97542dcd4"; + url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz; + sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a"; }; buildInputs = [libdvdcss]; NIX_LDFLAGS = "-ldvdcss"; - configureScript = "./configure2"; # wtf? - - preConfigure = '' - mkdir -p $out - ''; - postInstall = '' ln -s dvdread $out/include/libdvdread ''; meta = { - homepage = http://www.mplayerhq.hu/; + homepage = http://dvdnav.mplayerhq.hu/; description = "A library for reading DVDs"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.wmertens ]; }; } From ccb065a08cf06a77e7861d6e855fa953b9daef2b Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Sun, 4 May 2014 01:34:24 +0200 Subject: [PATCH 011/254] libmpeg2: Add patches from Handbrake project libmpeg2 is abandoned upstream. Patches: - A00: Fix tag handling on frames --- .../libraries/libmpeg2/A00-tags.patch | 27 +++++++++++++++++++ .../libraries/libmpeg2/default.nix | 7 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libmpeg2/A00-tags.patch diff --git a/pkgs/development/libraries/libmpeg2/A00-tags.patch b/pkgs/development/libraries/libmpeg2/A00-tags.patch new file mode 100644 index 000000000000..0b5d7d7da12b --- /dev/null +++ b/pkgs/development/libraries/libmpeg2/A00-tags.patch @@ -0,0 +1,27 @@ +diff -ru mpeg2dec.orig/libmpeg2/decode.c mpeg2dec/libmpeg2/decode.c +--- mpeg2dec.orig/libmpeg2/decode.c 2008-07-09 12:16:05.000000000 -0700 ++++ mpeg2dec/libmpeg2/decode.c 2009-07-03 16:29:48.000000000 -0700 +@@ -212,7 +212,7 @@ + + mpeg2_state_t mpeg2_parse_header (mpeg2dec_t * mpeg2dec) + { +- static int (* process_header[]) (mpeg2dec_t * mpeg2dec) = { ++ static int (* process_header[]) (mpeg2dec_t *) = { + mpeg2_header_picture, mpeg2_header_extension, mpeg2_header_user_data, + mpeg2_header_sequence, NULL, NULL, NULL, NULL, mpeg2_header_gop + }; +@@ -368,6 +368,14 @@ + + void mpeg2_tag_picture (mpeg2dec_t * mpeg2dec, uint32_t tag, uint32_t tag2) + { ++ if (mpeg2dec->num_tags == 0 && mpeg2dec->state == STATE_PICTURE && mpeg2dec->picture) { ++ // since tags got processed when we entered this state we ++ // have to set them directly or they'll end up on the next frame. ++ mpeg2dec->picture->tag = tag; ++ mpeg2dec->picture->tag2 = tag2; ++ mpeg2dec->picture->flags |= PIC_FLAG_TAGS; ++ return; ++ } + mpeg2dec->tag_previous = mpeg2dec->tag_current; + mpeg2dec->tag2_previous = mpeg2dec->tag2_current; + mpeg2dec->tag_current = tag; diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index 1d04eea89f6b..e651a932efe3 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -1,13 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmpeg2-0.5.1"; + name = "libmpeg2-0.5.1p4"; src = fetchurl { url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz"; sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny"; }; + # From Handbrake - Project seems unmaintained + patches = [ + ./A00-tags.patch + ]; + meta = { homepage = http://libmpeg2.sourceforge.net/; description = "A free library for decoding mpeg-2 and mpeg-1 video streams"; From d1ebc1a2b3dc988264f8585c2bec3b7bf9063a1e Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Sun, 4 May 2014 01:44:16 +0200 Subject: [PATCH 012/254] mp4v2: Add patches from Handbrake project mp4v2 seems abandoned upstream. Patches: - A00: Add API call for subpicture subtitles - A01: Fix divide by zero - A02: Give a meaningfull error when hitting 4GB limit - P00: Fix compilation with mingw32 --- .../libraries/mp4v2/A00-nero-vobsub.patch | 142 ++++++++++++++++++ .../libraries/mp4v2/A01-divide-zero.patch | 22 +++ .../mp4v2/A02-meaningful-4gb-warning.patch | 14 ++ .../libraries/mp4v2/P00-mingw-dllimport.patch | 11 ++ pkgs/development/libraries/mp4v2/default.nix | 8 +- 5 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/mp4v2/A00-nero-vobsub.patch create mode 100644 pkgs/development/libraries/mp4v2/A01-divide-zero.patch create mode 100644 pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch create mode 100644 pkgs/development/libraries/mp4v2/P00-mingw-dllimport.patch diff --git a/pkgs/development/libraries/mp4v2/A00-nero-vobsub.patch b/pkgs/development/libraries/mp4v2/A00-nero-vobsub.patch new file mode 100644 index 000000000000..beb8be6d892d --- /dev/null +++ b/pkgs/development/libraries/mp4v2/A00-nero-vobsub.patch @@ -0,0 +1,142 @@ +diff -Naur mp4v2-trunk-r355/include/mp4v2/general.h mp4v2-trunk-r355/include/mp4v2/general.h +--- mp4v2-trunk-r355/include/mp4v2/general.h 2009-05-23 06:09:58.000000000 -0700 ++++ mp4v2-trunk-r355/include/mp4v2/general.h 2010-05-23 14:22:21.949288657 -0700 +@@ -75,6 +75,7 @@ + #define MP4_CNTL_TRACK_TYPE "cntl" /**< Constant: control track. */ + #define MP4_TEXT_TRACK_TYPE "text" /**< Constant: text track. */ + #define MP4_SUBTITLE_TRACK_TYPE "sbtl" /**< Constant: subtitle track. */ ++#define MP4_SUBPIC_TRACK_TYPE "subp" /**< Constant: subtitle track. */ + /* + * This second set of track types should be created + * via MP4AddSystemsTrack(type) +diff -Naur mp4v2-trunk-r355/include/mp4v2/track.h mp4v2-trunk-r355/include/mp4v2/track.h +--- mp4v2-trunk-r355/include/mp4v2/track.h 2009-05-23 06:21:49.000000000 -0700 ++++ mp4v2-trunk-r355/include/mp4v2/track.h 2010-05-23 15:43:47.249286008 -0700 +@@ -310,6 +310,13 @@ + uint16_t height ); + + MP4V2_EXPORT ++MP4TrackId MP4AddSubpicTrack( ++ MP4FileHandle hFile, ++ uint32_t timescale, ++ uint16_t width, ++ uint16_t height ); ++ ++MP4V2_EXPORT + MP4TrackId MP4AddPixelAspectRatio( + MP4FileHandle hFile, + MP4TrackId refTrackId, +diff -Naur mp4v2-trunk-r355/src/descriptors.h mp4v2-trunk-r355/src/descriptors.h +--- mp4v2-trunk-r355/src/descriptors.h 2009-05-20 19:52:32.000000000 -0700 ++++ mp4v2-trunk-r355/src/descriptors.h 2010-05-23 16:29:34.800935677 -0700 +@@ -119,6 +119,7 @@ + // ES objectTypeId + const uint8_t MP4SystemsV1ObjectType = 0x01; + const uint8_t MP4SystemsV2ObjectType = 0x02; ++const uint8_t MP4SubpicObjectType = 0xe0; + + // ES streamType + const uint8_t MP4ObjectDescriptionStreamType = 0x01; +@@ -131,6 +132,7 @@ + const uint8_t MP4OCIStreamType = 0x08; + const uint8_t MP4MPEGJStreamType = 0x09; + const uint8_t MP4UserPrivateStreamType = 0x20; ++const uint8_t MP4NeroSubpicStreamType = 0x38; + + /////////////////////////////////////////////////////////////////////////////// + +diff -Naur mp4v2-trunk-r355/src/mp4.cpp mp4v2-trunk-r355/src/mp4.cpp +--- mp4v2-trunk-r355/src/mp4.cpp 2009-05-23 06:29:37.000000000 -0700 ++++ mp4v2-trunk-r355/src/mp4.cpp 2010-05-23 15:45:28.852222074 -0700 +@@ -1174,6 +1174,23 @@ + return MP4_INVALID_TRACK_ID; + } + ++ MP4TrackId MP4AddSubpicTrack(MP4FileHandle hFile, ++ uint32_t timescale, ++ uint16_t width, ++ uint16_t height) ++ { ++ if (MP4_IS_VALID_FILE_HANDLE(hFile)) { ++ try { ++ return ((MP4File*)hFile)->AddSubpicTrack(timescale, width, height); ++ } ++ catch (MP4Error* e) { ++ PRINT_ERROR(e); ++ delete e; ++ } ++ } ++ return MP4_INVALID_TRACK_ID; ++ } ++ + MP4TrackId MP4AddChapterTextTrack( + MP4FileHandle hFile, MP4TrackId refTrackId, uint32_t timescale) + { +diff -Naur mp4v2-trunk-r355/src/mp4file.cpp mp4v2-trunk-r355/src/mp4file.cpp +--- mp4v2-trunk-r355/src/mp4file.cpp 2009-05-26 19:34:56.000000000 -0700 ++++ mp4v2-trunk-r355/src/mp4file.cpp 2010-05-23 16:32:52.654220633 -0700 +@@ -2095,6 +2095,50 @@ + return trackId; + } + ++MP4TrackId MP4File::AddSubpicTrack(uint32_t timescale, ++ uint16_t width, ++ uint16_t height) ++{ ++ MP4TrackId trackId = ++ AddTrack(MP4_SUBPIC_TRACK_TYPE, timescale); ++ ++ InsertChildAtom(MakeTrackName(trackId, "mdia.minf"), "nmhd", 0); ++ ++ (void)AddChildAtom(MakeTrackName(trackId, "mdia.minf.stbl.stsd"), "mp4s"); ++ ++ SetTrackFloatProperty(trackId, "tkhd.width", width); ++ SetTrackFloatProperty(trackId, "tkhd.height", height); ++ SetTrackIntegerProperty(trackId, "tkhd.layer", 0); ++ ++ // stsd is a unique beast in that it has a count of the number ++ // of child atoms that needs to be incremented after we add the mp4s atom ++ MP4Integer32Property* pStsdCountProperty; ++ FindIntegerProperty( ++ MakeTrackName(trackId, "mdia.minf.stbl.stsd.entryCount"), ++ (MP4Property**)&pStsdCountProperty); ++ pStsdCountProperty->IncrementValue(); ++ ++ SetTrackIntegerProperty(trackId, ++ "mdia.minf.stbl.stsd.mp4s.esds.ESID", ++#if 0 ++ // note - for a file, these values need to ++ // be 0 - wmay - 04/16/2003 ++ trackId ++#else ++ 0 ++#endif ++ ); ++ ++ SetTrackIntegerProperty(trackId, ++ "mdia.minf.stbl.stsd.mp4s.esds.decConfigDescr.objectTypeId", ++ MP4SubpicObjectType); ++ ++ SetTrackIntegerProperty(trackId, ++ "mdia.minf.stbl.stsd.mp4s.esds.decConfigDescr.streamType", ++ MP4NeroSubpicStreamType); ++ return trackId; ++} ++ + MP4TrackId MP4File::AddChapterTextTrack(MP4TrackId refTrackId, uint32_t timescale) + { + // validate reference track id +diff -Naur mp4v2-trunk-r355/src/mp4file.h mp4v2-trunk-r355/src/mp4file.h +--- mp4v2-trunk-r355/src/mp4file.h 2009-05-23 06:29:37.000000000 -0700 ++++ mp4v2-trunk-r355/src/mp4file.h 2010-05-23 15:44:57.568026299 -0700 +@@ -388,6 +388,10 @@ + uint16_t width, + uint16_t height); + ++ MP4TrackId AddSubpicTrack(uint32_t timescale, ++ uint16_t width, ++ uint16_t height); ++ + MP4TrackId AddPixelAspectRatio(MP4TrackId trackId, uint32_t hSpacing, uint32_t vSpacing); + MP4TrackId AddColr(MP4TrackId trackId, uint16_t pri, uint16_t tran, uint16_t mat); + diff --git a/pkgs/development/libraries/mp4v2/A01-divide-zero.patch b/pkgs/development/libraries/mp4v2/A01-divide-zero.patch new file mode 100644 index 000000000000..4d6aa4d2a394 --- /dev/null +++ b/pkgs/development/libraries/mp4v2/A01-divide-zero.patch @@ -0,0 +1,22 @@ +--- mp4v2-r355/src/mp4track.cpp 2012-01-05 15:44:29.000000000 +0100 ++++ mp4v2-r355/src/mp4track.cpp 2012-01-05 15:47:34.000000000 +0100 +@@ -819,13 +819,14 @@ + (thisSecStart + timeScale) - lastSampleTime; + // calculate the duration of the last sample + MP4Duration lastSampleDur = sampleTime - lastSampleTime; +- uint32_t overflow_bytes; + // now, calculate the number of bytes we overflowed. Round up. +- overflow_bytes = +- ((lastSampleSize * overflow_dur) + (lastSampleDur - 1)) / lastSampleDur; ++ if( lastSampleDur > 0 ) { ++ uint32_t overflow_bytes = 0; ++ overflow_bytes = ((lastSampleSize * overflow_dur) + (lastSampleDur - 1)) / lastSampleDur; + +- if (bytesThisSec - overflow_bytes > maxBytesPerSec) { +- maxBytesPerSec = bytesThisSec - overflow_bytes; ++ if (bytesThisSec - overflow_bytes > maxBytesPerSec) { ++ maxBytesPerSec = bytesThisSec - overflow_bytes; ++ } + } + + // now adjust the values for this sample. Remove the bytes diff --git a/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch b/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch new file mode 100644 index 000000000000..987298bd5b00 --- /dev/null +++ b/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch @@ -0,0 +1,14 @@ +diff -Naur mp4v2-trunk-r355/src/mp4atom.cpp mp4v2-trunk-r355/src/mp4atom.cpp +--- mp4v2-trunk-r355/src/mp4atom.cpp 2012-02-21 19:40:03.000000000 +0100 ++++ mp4v2-trunk-r355/src/mp4atom.cpp 2012-02-21 19:36:38.000000000 +0100 +@@ -543,6 +543,10 @@ + m_pFile->SetPosition(m_start + 8); + m_pFile->WriteUInt64(m_size); + } else { ++ if (!(m_size <= (uint64_t)0xFFFFFFFF)) { ++ // Let the user know what the following assert is all about ++ fprintf(stderr, "MP4ERROR: File size exceeded 4 GB; output unplayable. Enable \"Large file size\" to fix it.\n"); ++ } + ASSERT(m_size <= (uint64_t)0xFFFFFFFF); + m_pFile->SetPosition(m_start); + m_pFile->WriteUInt32(m_size); diff --git a/pkgs/development/libraries/mp4v2/P00-mingw-dllimport.patch b/pkgs/development/libraries/mp4v2/P00-mingw-dllimport.patch new file mode 100644 index 000000000000..5b7f1a300bd8 --- /dev/null +++ b/pkgs/development/libraries/mp4v2/P00-mingw-dllimport.patch @@ -0,0 +1,11 @@ +--- mp4v2-trunk-r355/include/mp4v2/platform.h 2009-05-20 19:52:26.000000000 -0700 ++++ xxx/include/mp4v2/platform.h 2010-09-11 09:36:20.881523832 -0700 +@@ -24,7 +24,7 @@ + #if defined( _WIN32 ) || defined( __MINGW32__ ) + # if defined( _WINDLL ) || defined( DLL_EXPORT ) + # define MP4V2_EXPORT __declspec(dllexport) +-# elif defined( _DLL ) || defined( DLL_IMPORT ) ++# elif defined( DLL_IMPORT ) + # define MP4V2_EXPORT __declspec(dllimport) + # else + # define MP4V2_EXPORT diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 7b0dd9382115..06e8c8e5ac35 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -1,13 +1,19 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mp4v2-1.9.1"; + name = "mp4v2-1.9.1p4"; src = fetchurl { url = "http://mp4v2.googlecode.com/files/${name}.tar.bz2"; sha256 = "1d73qbi0faqad3bpmjfr4kk0mfmqpl1f43ysrx4gq9i3mfp1qf2w"; }; + # From Handbrake + # mp4v2 doesn't seem to be actively maintained any more :-/ + patches = [ + ./A00-nero-vobsub.patch ./A01-divide-zero.patch ./A02-meaningful-4gb-warning.patch + ./P00-mingw-dllimport.patch + ]; # `faac' expects `mp4.h'. postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h"; From 3a7b7a8499e8fed3f8d19334a8fd865d0bbd609b Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Sun, 4 May 2014 01:52:45 +0200 Subject: [PATCH 013/254] libmkv: from Handbrake project Libmkv was started from Handbrake but is now unmaintained upstream. Patches: - A01: add constant to header file - A02: Breaks API: Allow changing output sampling frequency - P00: Fix accessing large files on Mingw32 --- .../libraries/libmkv/A01-hbmv-pgs.patch | 12 ++++++++ .../libmkv/A02-audio-out-sampling-freq.patch | 28 ++++++++++++++++++ .../libmkv/P00-mingw-large-file.patch | 24 +++++++++++++++ pkgs/development/libraries/libmkv/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 95 insertions(+) create mode 100644 pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch create mode 100644 pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch create mode 100644 pkgs/development/libraries/libmkv/P00-mingw-large-file.patch create mode 100644 pkgs/development/libraries/libmkv/default.nix diff --git a/pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch b/pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch new file mode 100644 index 000000000000..9f863cac4122 --- /dev/null +++ b/pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch @@ -0,0 +1,12 @@ +diff --git a/include/libmkv.h b/include/libmkv.h +index 146a91f..f03d608 100644 +--- a/include/libmkv.h ++++ b/include/libmkv.h +@@ -94,6 +94,7 @@ extern "C" { + #define MK_SUBTITLE_USF "S_TEXT/USF" + #define MK_SUBTITLE_VOBSUB "S_VOBSUB" + #define MK_SUBTITLE_BMP "S_IMAGE/BMP" ++#define MK_SUBTITLE_PGS "S_HDMV/PGS" + + /* Official Tags */ + #define MK_TAG_TITLE "TITLE" diff --git a/pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch b/pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch new file mode 100644 index 000000000000..ea31957c1d29 --- /dev/null +++ b/pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch @@ -0,0 +1,28 @@ +diff --git a/include/libmkv.h b/include/libmkv.h +index 146a91f..f03d608 100644 +--- a/include/libmkv.h ++++ b/include/libmkv.h +@@ -203,6 +204,7 @@ struct mk_TrackConfig_s { + } video; + struct { + float samplingFreq; /* Sampling Frequency in Hz */ ++ float outputSamplingFreq; /* Playback Sampling Frequency in Hz (e.g. for AAC w/SBR) */ + unsigned channels; /* Number of channels for this track */ + unsigned bitDepth; /* Bits per sample (PCM) */ + } audio; +diff --git a/src/tracks.c b/src/tracks.c +index f9c7e48..a2a60ca 100644 +--- a/src/tracks.c ++++ b/src/tracks.c +@@ -174,6 +174,11 @@ mk_Track *mk_createTrack(mk_Writer *w, mk_TrackConfig *tc) + /* SamplingFrequency */ + if (mk_writeFloat(v, MATROSKA_ID_AUDIOSAMPLINGFREQ, tc->extra.audio.samplingFreq) < 0) + return NULL; ++ if (tc->extra.audio.outputSamplingFreq) { ++ /* Output SamplingFrequency */ ++ if (mk_writeFloat(v, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, tc->extra.audio.outputSamplingFreq) < 0) ++ return NULL; ++ } + /* Channels */ + if (mk_writeUInt(v, MATROSKA_ID_AUDIOCHANNELS, tc->extra.audio.channels) < 0) + return NULL; diff --git a/pkgs/development/libraries/libmkv/P00-mingw-large-file.patch b/pkgs/development/libraries/libmkv/P00-mingw-large-file.patch new file mode 100644 index 000000000000..6a83eacca83e --- /dev/null +++ b/pkgs/development/libraries/libmkv/P00-mingw-large-file.patch @@ -0,0 +1,24 @@ +--- libmkv.orig/src/matroska.c 2009-01-12 23:14:26.000000000 -0800 ++++ libmkv/src/matroska.c 2009-03-25 15:22:30.000000000 -0700 +@@ -27,6 +27,11 @@ + + #include + ++#if defined( __MINGW32__ ) ++#undef fseeko ++#define fseeko fseeko64 ++#endif ++ + #define RESERVED_SEEKHEAD 0x100 + /* 256 bytes should be enough room for our Seek entries. */ + #define RESERVED_CHAPTERS 0x800 +@@ -34,7 +39,7 @@ + + int mk_seekFile(mk_Writer *w, uint64_t pos) + { +- if (fseek(w->fp, pos, SEEK_SET)) ++ if (fseeko(w->fp, pos, SEEK_SET)) + return -1; + + w->f_pos = pos; + diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix new file mode 100644 index 000000000000..c4b98d956bba --- /dev/null +++ b/pkgs/development/libraries/libmkv/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, libtool, autoconf, automake }: + +stdenv.mkDerivation rec { + name = "libmkv-0.6.5.1p2"; + + src = fetchgit { + url = https://github.com/saintdev/libmkv.git; + rev = "refs/tags/0.6.5.1"; + sha256 = "1b0441x5rl5dbwrc0hq9jih111iil7ckqws3hcdj63jx2ma3s4hi"; + }; + + nativeBuildInputs = [ libtool autoconf automake ]; + + # TODO fix library version + preConfigure = "sh bootstrap.sh"; + + # From Handbrake + patches = [ + ./A01-hbmv-pgs.patch + ./A02-audio-out-sampling-freq.patch + ./P00-mingw-large-file.patch + ]; + + meta = { + homepage = https://github.com/saintdev/libmkv; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.wmertens ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54c61561da8d..5b574c1f8af7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5142,6 +5142,8 @@ let libmilter = callPackage ../development/libraries/libmilter { }; + libmkv = callPackage ../development/libraries/libmkv { }; + libmms = callPackage ../development/libraries/libmms { }; libmowgli = callPackage ../development/libraries/libmowgli { }; From d93b1f80c034290cc49836030f4f803af70a8f69 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Sun, 4 May 2014 01:55:36 +0200 Subject: [PATCH 014/254] Add Handbrake 0.9.9: DVD ripper This packaging splices off the unfree faac library and forces handbrake to use the (more recent/patched) versions of libraries in Nixpkgs. Produces the CLI HandbrakeCLI and optionally the GTK+ version ghb. --- pkgs/applications/video/handbrake/default.nix | 99 +++++++++++++++++ .../video/handbrake/disable-unfree.patch | 101 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 202 insertions(+) create mode 100644 pkgs/applications/video/handbrake/default.nix create mode 100644 pkgs/applications/video/handbrake/disable-unfree.patch diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix new file mode 100644 index 000000000000..34aa8ff65de8 --- /dev/null +++ b/pkgs/applications/video/handbrake/default.nix @@ -0,0 +1,99 @@ +# Handbrake normally uses its own copies of the libraries it uses, for better +# control over library patches. +# +# This derivation patches HB so it doesn't do that. The relevant patches +# are added to the Nix packages and proposed upstream instead. In several cases +# upstream already incorporated these patches. +# This has the benefits of providing improvements to other packages, +# making licenses more clear and reducing compile time/install size. +# +# For compliance, the unfree codec faac is optionally spliced out. +# +# Only tested on Linux +# +# TODO: package and use libappindicator + +{ stdenv, config, fetchurl, + python, pkgconfig, yasm, + autoconf, automake, libtool, m4, + libass, libsamplerate, fribidi, libxml2, bzip2, + libogg, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac, + lame, faac, ffmpeg, libdvdread, libdvdnav, libbluray, + mp4v2, mpeg2dec, x264, libmkv, + fontconfig, freetype, + glib, gtk, webkitgtk, intltool, libnotify, + gst_all_1, dbus_glib, udev, + useGtk ? true, + useWebKitGtk ? false # This prevents ghb from starting in my tests +}: + +stdenv.mkDerivation rec { + version = "0.9.9"; + name = "handbrake-${version}"; + + allowUnfree = config.allowUnfree or false; + + buildInputsX = stdenv.lib.optionals useGtk [ + glib gtk intltool libnotify + gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev + ] ++ stdenv.lib.optionals useWebKitGtk [ webkitgtk ]; + + # Did not test compiling with it + unfreeInputs = stdenv.lib.optionals allowUnfree [ faac ]; + + nativeBuildInputs = [ python pkgconfig yasm autoconf automake libtool m4 ]; + buildInputs = [ + fribidi fontconfig freetype + libass libsamplerate libxml2 bzip2 + libogg libtheora libvorbis libdvdcss a52dec libmkv fdk_aac + lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 + ] ++ buildInputsX ++ unfreeInputs; + + + src = fetchurl { + name = "HandBrake-${version}.tar.bz2"; + url = "http://handbrake.fr/rotation.php?file=HandBrake-${version}.tar.bz2"; + sha256 = "1crmm1c32vx60jfl2bqzg59q4qqx6m83b08snp7h1njc21sdf7d7"; + }; + + patches = stdenv.lib.optionals (! allowUnfree) [ ./disable-unfree.patch ]; + + preConfigure = '' + # Fake wget to prevent downloads + mkdir wget + echo "#!/bin/sh" > wget/wget + echo "echo ===== Not fetching \$*" >> wget/wget + echo "exit 1" >> wget/wget + chmod +x wget/wget + export PATH=$PATH:$PWD/wget + + # Force using nixpkgs dependencies + sed -i '/MODULES += contrib/d' make/include/main.defs + sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules + + # disable faac if non-free + if [ -z "$allowUnfree" ]; then + rm libhb/encfaac.c + fi + ''; + + configureFlags = "--enable-fdk-aac ${if useGtk then "--disable-gtk-update-checks" else "--disable-gtk"}"; + + preBuild = '' + cd build + ''; + + meta = { + homepage = http://handbrake.fr/; + description = "A tool for ripping DVDs into video files"; + longDescription = '' + Handbrake is a versatile transcoding DVD ripper. This package + provides the cli HandbrakeCLI and the GTK+ version ghb. + The faac library is disabled if you're compiling free-only. + ''; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.wmertens ]; + # Not tested on anything else + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/video/handbrake/disable-unfree.patch b/pkgs/applications/video/handbrake/disable-unfree.patch new file mode 100644 index 000000000000..30edcb81c099 --- /dev/null +++ b/pkgs/applications/video/handbrake/disable-unfree.patch @@ -0,0 +1,101 @@ +diff -ru HandBrake-0.9.9-orig/gtk/configure.ac HandBrake-0.9.9/gtk/configure.ac +--- HandBrake-0.9.9-orig/gtk/configure.ac 2014-05-02 22:50:00.047305795 +0200 ++++ HandBrake-0.9.9/gtk/configure.ac 2014-05-02 22:48:57.119304020 +0200 +@@ -203,7 +203,7 @@ + ;; + esac + +-HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2" ++HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2" + + if test "x$use_fdk_aac" = "xyes" ; then + HB_LIBS+=" -lfdk-aac" +diff -ru HandBrake-0.9.9-orig/gtk/src/preset_xlat.c HandBrake-0.9.9/gtk/src/preset_xlat.c +--- HandBrake-0.9.9-orig/gtk/src/preset_xlat.c 2014-05-02 22:50:00.043305794 +0200 ++++ HandBrake-0.9.9/gtk/src/preset_xlat.c 2014-05-02 22:42:20.987292846 +0200 +@@ -260,7 +260,6 @@ + + static value_map_t acodec_xlat[] = + { +- {"AAC (faac)", "faac"}, + {"AC3 Passthru", "ac3"}, + {"MP3 (lame)", "lame"}, + {"Vorbis (vorbis)", "vorbis"}, +diff -ru HandBrake-0.9.9-orig/gtk/src/presets.c HandBrake-0.9.9/gtk/src/presets.c +--- HandBrake-0.9.9-orig/gtk/src/presets.c 2014-05-02 22:50:00.043305794 +0200 ++++ HandBrake-0.9.9/gtk/src/presets.c 2014-05-02 22:42:41.283293419 +0200 +@@ -2029,8 +2029,6 @@ + + static value_map_t acodec_xlat_compat[] = + { +- {"AAC (CoreAudio)", "faac"}, +- {"HE-AAC (CoreAudio)", "faac"}, + {"AC3 (ffmpeg)", "ac3"}, + {"AC3", "ac3"}, + {"MP3 Passthru", "mp3pass"}, +diff -ru HandBrake-0.9.9-orig/libhb/common.c HandBrake-0.9.9/libhb/common.c +--- HandBrake-0.9.9-orig/libhb/common.c 2014-05-02 22:50:00.047305795 +0200 ++++ HandBrake-0.9.9/libhb/common.c 2014-05-02 22:37:24.679284489 +0200 +@@ -126,7 +126,6 @@ + { "AAC (CoreAudio)", "ca_aac", HB_ACODEC_CA_AAC, HB_MUX_MP4|HB_MUX_MKV }, + { "HE-AAC (CoreAudio)", "ca_haac", HB_ACODEC_CA_HAAC, HB_MUX_MP4|HB_MUX_MKV }, + #endif +- { "AAC (faac)", "faac", HB_ACODEC_FAAC, HB_MUX_MP4|HB_MUX_MKV }, + #ifdef USE_FDK_AAC + { "AAC (FDK)", "fdk_aac", HB_ACODEC_FDK_AAC, HB_MUX_MP4|HB_MUX_MKV }, + { "HE-AAC (FDK)", "fdk_haac", HB_ACODEC_FDK_HAAC, HB_MUX_MP4|HB_MUX_MKV }, +diff -ru HandBrake-0.9.9-orig/libhb/common.h HandBrake-0.9.9/libhb/common.h +--- HandBrake-0.9.9-orig/libhb/common.h 2014-05-02 22:50:00.047305795 +0200 ++++ HandBrake-0.9.9/libhb/common.h 2014-05-02 22:39:37.839288245 +0200 +@@ -945,7 +945,6 @@ + extern hb_work_object_t hb_decavcodeca; + extern hb_work_object_t hb_decavcodecv; + extern hb_work_object_t hb_declpcm; +-extern hb_work_object_t hb_encfaac; + extern hb_work_object_t hb_enclame; + extern hb_work_object_t hb_encvorbis; + extern hb_work_object_t hb_muxer; +diff -ru HandBrake-0.9.9-orig/libhb/hb.c HandBrake-0.9.9/libhb/hb.c +--- HandBrake-0.9.9-orig/libhb/hb.c 2014-05-02 22:50:00.047305795 +0200 ++++ HandBrake-0.9.9/libhb/hb.c 2014-05-02 22:39:02.287287242 +0200 +@@ -487,7 +487,6 @@ + hb_register( &hb_decavcodeca ); + hb_register( &hb_decavcodecv ); + hb_register( &hb_declpcm ); +- hb_register( &hb_encfaac ); + hb_register( &hb_enclame ); + hb_register( &hb_encvorbis ); + hb_register( &hb_muxer ); +@@ -588,7 +587,6 @@ + hb_register( &hb_decavcodeca ); + hb_register( &hb_decavcodecv ); + hb_register( &hb_declpcm ); +- hb_register( &hb_encfaac ); + hb_register( &hb_enclame ); + hb_register( &hb_encvorbis ); + hb_register( &hb_muxer ); +diff -ru HandBrake-0.9.9-orig/libhb/module.defs HandBrake-0.9.9/libhb/module.defs +--- HandBrake-0.9.9-orig/libhb/module.defs 2014-05-02 22:50:00.047305795 +0200 ++++ HandBrake-0.9.9/libhb/module.defs 2014-05-02 22:39:25.727287903 +0200 +@@ -95,7 +95,7 @@ + LIBHB.lib = $(LIBHB.build/)hb.lib + + LIBHB.dll.libs = $(foreach n, \ +- a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \ ++ a52 ass avcodec avformat avutil avresample dvdnav dvdread \ + fontconfig freetype mkv mpeg2 mp3lame mp4v2 \ + ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \ + $(CONTRIB.build/)lib/lib$(n).a ) +Only in HandBrake-0.9.9: libhb-orig +diff -ru HandBrake-0.9.9orig/test/module.defs HandBrake-0.9.9/test/module.defs +--- HandBrake-0.9.9-orig/test/module.defs 2014-05-02 23:15:10.575348401 +0200 ++++ HandBrake-0.9.9/test/module.defs 2014-05-02 23:17:00.523351502 +0200 +@@ -14,7 +14,7 @@ + TEST.libs = $(LIBHB.a) + + TEST.GCC.l = \ +- a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \ ++ a52 ass avcodec avformat avutil avresample dvdnav dvdread \ + fontconfig freetype fribidi mkv mpeg2 mp3lame mp4v2 ogg \ + samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \ + bluray xml2 bz2 z diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b574c1f8af7..75092848116b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8704,6 +8704,8 @@ let lxdvdrip = callPackage ../applications/video/lxdvdrip { }; + handbrake = callPackage ../applications/video/handbrake { }; + lynx = callPackage ../applications/networking/browsers/lynx { }; lyx = callPackage ../applications/misc/lyx { }; From 4971bdc930f3dd44162c419a2cfe30f5586ab473 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 24 Mar 2014 17:21:21 -0500 Subject: [PATCH 015/254] hplip version bump 3.11.1 -> 3.14.4 --- pkgs/misc/drivers/hplip/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 5b9ef87a1297..c6bf3b6411c6 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,13 +1,13 @@ -{stdenv, fetchurl, cups, zlib, libjpeg, libusb, pythonPackages, saneBackends, dbus -, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp +{stdenv, fetchurl, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus +, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp, automake }: stdenv.mkDerivation rec { - name = "hplip-3.11.1"; + name = "hplip-3.14.4"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0y68s4xm5d0kv7p5j41qq0xglp4vdbjwbrjs89b4a21wwn69hp9g"; + sha256 = "1j8h44f8igl95wqypj4rk9awcw513hlps980jmcnkx60xghc4l6f"; }; #preBuild='' @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { prePatch = '' sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in sed -i s,/etc/hp/,$out/etc/hp/, base/g.py + substituteInPlace Makefile.in \ + --replace "/usr/include/libusb-1.0" "${libusb1}/include/libusb-1.0" \ + --replace "/usr/lib/systemd/system" "$out/lib/systemd/system" ''; # --disable-network-build Until we have snmp @@ -49,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg cups - libusb + libusb1 pythonPackages.python pythonPackages.wrapPython saneBackends From a0dc20719bbe1cdb8a66841556bf939614f94fb4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 May 2014 17:33:46 -0500 Subject: [PATCH 016/254] hplip: add binary plugin --- pkgs/misc/drivers/hplip/default.nix | 75 +++++++++++++++++++++++------ pkgs/misc/drivers/hplip/hplip.state | 4 ++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 65 insertions(+), 16 deletions(-) create mode 100644 pkgs/misc/drivers/hplip/hplip.state diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index c6bf3b6411c6..90d5967a29c3 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,5 +1,7 @@ -{stdenv, fetchurl, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus -, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp, automake +{ stdenv, fetchurl, automake, pkgconfig +, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus +, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp +, withPlugin ? false }: stdenv.mkDerivation rec { @@ -10,20 +12,23 @@ stdenv.mkDerivation rec { sha256 = "1j8h44f8igl95wqypj4rk9awcw513hlps980jmcnkx60xghc4l6f"; }; - #preBuild='' - # makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model" - #''; + plugin = fetchurl { + url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; + sha256 = "0k1vpmy7babbm3c5v4dcbhq0jgyr8as722nylfs8zx0dy7kr8874"; + }; + + hplip_state = ./hplip.state; prePatch = '' - sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in - sed -i s,/etc/hp/,$out/etc/hp/, base/g.py - substituteInPlace Makefile.in \ - --replace "/usr/include/libusb-1.0" "${libusb1}/include/libusb-1.0" \ - --replace "/usr/lib/systemd/system" "$out/lib/systemd/system" + # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. + find . -type f -exec sed -i s,/etc/hp,$out/etc/hp, {} \; + find . -type f -exec sed -i s,/etc/sane.d,$out/etc/sane.d, {} \; + find . -type f -exec sed -i s,/usr/include/libusb-1.0,${libusb1}/include/libusb-1.0, {} \; + find . -type f -exec sed -i s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, {} \; + find . -type f -exec sed -i s,/usr/lib/systemd/system,$out/lib/systemd/system, {} \; + find . -type f -exec sed -i s,/var/lib/hp,$out/var/lib/hp, {} \; ''; - # --disable-network-build Until we have snmp - preConfigure = '' export configureFlags="$configureFlags --with-cupsfilterdir=$out/lib/cups/filter @@ -36,18 +41,56 @@ stdenv.mkDerivation rec { export makeFlags=" halpredir=$out/share/hal/fdi/preprobe/10osvendor - hplip_statedir=$out/var rulesdir=$out/etc/udev/rules.d policykit_dir=$out/share/polkit-1/actions policykit_dbus_etcdir=$out/etc/dbus-1/system.d policykit_dbus_sharedir=$out/share/dbus-1/system-services hplip_confdir=$out/etc/hp + hplip_statedir=$out/var/lib/hp "; ''; - postInstall = '' + postInstall = + '' wrapPythonPrograms - ''; + '' + + (stdenv.lib.optionalString withPlugin + (let hplip_arch = + if builtins.currentSystem == "i686-linux" + then "x86_32" + else if builtins.currentSystem == "x86_64-linux" + then "x86_64" + else abort "Platform must be i686-linux or x86_64-linux!"; + in + '' + sh ${plugin} --noexec --keep + cd plugin_tmp + + cp plugin.spec $out/share/hplip/ + + mkdir -p $out/share/hplip/data/firmware + cp *.fw.gz $out/share/hplip/data/firmware + + mkdir -p $out/share/hplip/data/plugins + cp license.txt $out/share/hplip/data/plugins + + mkdir -p $out/share/hplip/prnt/plugins + for plugin in lj hbpl1; do + cp $plugin-${hplip_arch}.so $out/share/hplip/prnt/plugins + ln -s $out/share/hplip/prnt/plugins/$plugin-${hplip_arch}.so \ + $out/share/hplip/prnt/plugins/$plugin.so + done + + mkdir -p $out/share/hplip/scan/plugins + for plugin in bb_soap bb_marvell bb_soapht fax_marvell; do + cp $plugin-${hplip_arch}.so $out/share/hplip/scan/plugins + ln -s $out/share/hplip/scan/plugins/$plugin-${hplip_arch}.so \ + $out/share/hplip/scan/plugins/$plugin.so + done + + mkdir -p $out/var/lib/hp + cp ${hplip_state} $out/var/lib/hp/hplip.state + '')); buildInputs = [ libjpeg @@ -70,7 +113,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; homepage = http://hplipopensource.com/; - license = "free"; # MIT/BSD/GPL + license = if withPlugin then licenses.unfree else "free"; # MIT/BSD/GPL platforms = platforms.linux; }; } diff --git a/pkgs/misc/drivers/hplip/hplip.state b/pkgs/misc/drivers/hplip/hplip.state new file mode 100644 index 000000000000..52679963f064 --- /dev/null +++ b/pkgs/misc/drivers/hplip/hplip.state @@ -0,0 +1,4 @@ +[plugin] +installed=1 +eula=1 +version=3.14.4 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fa278924b6a..5ae4e923e6ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10604,6 +10604,8 @@ let hplip = callPackage ../misc/drivers/hplip { }; + hplipWithPlugin = hplip.override { withPlugin = true; }; + # using the new configuration style proposal which is unstable jack1d = callPackage ../misc/jackaudio/jack1.nix { }; From 2666dcd21869658c2d3038c417eb27556b2cd289 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 May 2014 21:56:28 -0500 Subject: [PATCH 017/254] hplip: assume maintainership --- pkgs/misc/drivers/hplip/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 90d5967a29c3..efa0b480319b 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -115,5 +115,6 @@ stdenv.mkDerivation rec { homepage = http://hplipopensource.com/; license = if withPlugin then licenses.unfree else "free"; # MIT/BSD/GPL platforms = platforms.linux; + maintainers = with maintainers; [ ttuegel ]; }; } From 56994ce2ebfac75f0e4bcc06e43b47bdbb51790a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 May 2014 22:16:13 -0500 Subject: [PATCH 018/254] hplip: add pillow and reportlab dependencies --- pkgs/misc/drivers/hplip/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index efa0b480319b..593b346fc3b5 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -105,9 +105,11 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional qtSupport qt4; pythonPath = with pythonPackages; [ + pillow pythonDBus pygobject recursivePthLoader + reportlab ] ++ stdenv.lib.optional qtSupport pyqt4; meta = with stdenv.lib; { From b4c89810648cce7c2c55b06443d9f5373e9d7230 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 11 May 2014 13:30:33 -0500 Subject: [PATCH 019/254] sane: add mkSaneConfig --- pkgs/applications/graphics/sane/config.nix | 27 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/graphics/sane/config.nix diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix new file mode 100644 index 000000000000..fc1cd81ebc6e --- /dev/null +++ b/pkgs/applications/graphics/sane/config.nix @@ -0,0 +1,27 @@ +{ stdenv }: + +{ paths }: + +with stdenv.lib; +let installSanePath = path: '' + find "${path}/lib/sane" -not -type d -maxdepth 1 | while read backend; do + ln -s $backend $out/lib/sane/$(basename $backend) + done + + find "${path}/etc/sane.d" -not -type d -maxdepth 1 | while read conf; do + ln -s $conf $out/etc/sane.d/$(basename $conf) + done + + find "${path}/etc/sane.d/dll.d" -not -type d -maxdepth 1 | while read conf; do + ln -s $conf $out/etc/sane.d/dll.d/$(basename $conf) + done + ''; +in +stdenv.mkDerivation { + name = "sane-config"; + phases = "installPhase"; + + installPhase = '' + mkdir -p $out/etc/sane.d $out/etc/sane.d/dll.d $out/lib/sane + '' + concatMapStrings installSanePath paths; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ae4e923e6ab..fbc3106afce2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10735,6 +10735,8 @@ let hotplugSupport = config.sane.hotplugSupport or true; }; + mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { }; + saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { }; seafile-shared = callPackage ../misc/seafile-shared { }; From 4fb9c3700a2fcb5132994e8ecbbe07dc3574f9ab Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 11 May 2014 13:31:13 -0500 Subject: [PATCH 020/254] hplip: avoid name collision with sane config files --- pkgs/misc/drivers/hplip/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 593b346fc3b5..50106dfb477c 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -90,6 +90,9 @@ stdenv.mkDerivation rec { mkdir -p $out/var/lib/hp cp ${hplip_state} $out/var/lib/hp/hplip.state + + mkdir -p $out/etc/sane.d/dll.d + mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf '')); buildInputs = [ From 8df521bf0f73d2ac6a01aa912725b30d78973bcc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 11 May 2014 13:31:21 -0500 Subject: [PATCH 021/254] sane: use mkSaneConfig to set system environment --- nixos/modules/services/hardware/sane.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index 01d910575bb5..56e28b50350b 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -5,6 +5,8 @@ with lib; let pkg = if config.hardware.sane.snapshot then pkgs.saneBackendsGit else pkgs.saneBackends; + backends = [ pkg ] ++ config.hardware.sane.extraBackends; + saneConfig = pkgs.mkSaneConfig { paths = backends; }; in @@ -26,6 +28,12 @@ in description = "Use a development snapshot of SANE scanner drivers."; }; + hardware.sane.extraBackends = mkOption { + type = types.listOf types.path; + default = []; + description = "Packages providing extra SANE backends to enable."; + }; + }; @@ -33,8 +41,12 @@ in config = mkIf config.hardware.sane.enable { - environment.systemPackages = [ pkg ]; - services.udev.packages = [ pkg ]; + environment.systemPackages = backends; + environment.variables = { + SANE_CONFIG_DIR = "${saneConfig}/etc/sane.d"; + LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ]; + }; + services.udev.packages = backends; users.extraGroups."scanner".gid = config.ids.gids.scanner; From 3c4b9b26cfe9474b2ef6a63431adabe6d7539b50 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Thu, 15 May 2014 09:05:02 +1000 Subject: [PATCH 022/254] Updated some CRAN packages and fixed dependencies --- pkgs/development/r-modules/cran-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 6068fce10d53..52bde8019922 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -2660,7 +2660,7 @@ let self = _self // overrides; _self = with self; { marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; }; margie = derive { name="margie"; version="1.0"; sha256="1jkhg15xdiqjvpzbbc39l8jlfw0yrbarnd3zbgb3p0rh733x5g4j"; depends=[]; }; marginalmodelplots = derive { name="marginalmodelplots"; version="0.4.2"; sha256="0d7m7sddz9rp1mkvirhcmk7hlbxsag3nm3vqfampnr7l2h158baa"; depends=[locfit]; }; - markdown = derive { name="markdown"; version="0.6.5"; sha256="0gixql675hyl38cha2xxklx8x2jin88iqs7mndfqmq7mfms62i31"; depends=[]; }; + markdown = derive { name="markdown"; version="0.7"; sha256="18q1yvzv9fk5j09ngrldm32cnswxhrmqx6g8d17srriis6ng6i5v"; depends=[ mime ]; }; marked = derive { name="marked"; version="1.1.3"; sha256="0nvk7fq2q7yqxmw507bsbss04wggy13kgvcv5v01g8a0wb3ig9ym"; depends=[R2admb truncnorm coda optimx ggplot2 Matrix numDeriv Rcpp plyr]; }; MarkedPointProcess = derive { name="MarkedPointProcess"; version="0.2.21"; sha256="06bypa124raa4vbcvi082vpd8bndnar4p1v18dq261z6j3ixk44k"; depends=[RandomFields R2Cuba]; }; maRketSim = derive { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; }; @@ -2670,7 +2670,7 @@ let self = _self // overrides; _self = with self; { marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; }; MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[nlme mvtnorm KFAS]; }; maSAE = derive { name="maSAE"; version="0.1-2"; sha256="18a1zbfmjhrmi3fgqd7vaicpsca59kp8r1003pwl7l4032p32fxk"; depends=[]; }; - MASS = derive { name="MASS"; version="7.3-32"; sha256="1nmd5b9yillca3gczq82n5kpxslkvdhq0nl3cw2wp9s9vax29ymh"; depends=[]; }; + MASS = derive { name="MASS"; version="7.3-33"; sha256="1bq005zxyc7842z4cz5ilhh917clfdmhg5czfq6plkdgwq8nfhlk"; depends=[]; }; MASSI = derive { name="MASSI"; version="1.1"; sha256="13kavfsm48qq9zyp10scfjcgrk0x2n4my7cz2xy78s14knlrks5y"; depends=[fpc gplots]; }; MASSTIMATE = derive { name="MASSTIMATE"; version="1.1"; sha256="10hs2mprdfa747sz2bjy29jixblbnyb744wxf8gh4jq3d5f5xpiq"; depends=[epicalc]; }; MasterBayes = derive { name="MasterBayes"; version="2.51"; sha256="0mbvhn6yspralmlajimdin14hszh78m0bxb3zdxd73xhjqxl4ixk"; depends=[coda genetics gtools kinship2]; }; @@ -2826,7 +2826,7 @@ let self = _self // overrides; _self = with self; { migui = derive { name="migui"; version="0.00-09"; sha256="0mrvsls9q039pay0vf59xwg6bbr7ahwl4x3iwvar6sbfg8606as8"; depends=[tkrplot mi foreign]; }; MIICD = derive { name="MIICD"; version="1.1"; sha256="0d697mggax1yp7b4dfxdi25rqmwrq25gmmjqsag6sa5raqr96gc9"; depends=[mstate prodlim cmprsk riskRegression MASS survival]; }; MILC = derive { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; }; - mime = derive { name="mime"; version="0.1"; sha256="1qmflb4339mx666ak7h47k5jgvp7prisvpay00b639sg7pwp2hbx"; depends=[]; }; + mime = derive { name="mime"; version="0.1.1"; sha256="1kgm06n9flw2kh9f63h3i20wg663qscfdvs7dpyb68ic3c7aimci"; depends=[]; }; MImix = derive { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; }; MindOnStats = derive { name="MindOnStats"; version="0.8"; sha256="1fsswkbrxd3f0hz3nd25xvp36si292s4q2r52hw6rsps2mx6bgqi"; depends=[]; }; minerva = derive { name="minerva"; version="1.3"; sha256="0ph65jfm05wck3zz0lh3bmaj0p4c9309nzkrjpjxqkcnrfdbw6wf"; depends=[]; }; @@ -4005,7 +4005,7 @@ let self = _self // overrides; _self = with self; { RcppClassicExamples = derive { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; }; RcppCNPy = derive { name="RcppCNPy"; version="0.2.3"; sha256="1baz9272vwc44yab7xb6ig0gd2gj8idrhywir2zq77q8bfhqc9gh"; depends=[Rcpp]; }; RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7dddpykckzw8hmqslsdl7l68wj60qkc"; depends=[Rcpp RcppArmadillo]; }; - RcppEigen = derive { name="RcppEigen"; version="0.3.2.1.1"; sha256="099hrj4r2dh0yfn63lazmqcja1gwxqzy1zlsfia31kkaw6i82g5l"; depends=[Matrix Rcpp]; }; + RcppEigen = derive { name="RcppEigen"; version="0.3.2.1.2"; sha256="010a27jby8c61mgw2qb47zkln1v33gj0xcn8lf7sw0kb2mdh58yl"; depends=[Matrix Rcpp]; }; RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp]; }; RcppGSL = derive { name="RcppGSL"; version="0.2.0"; sha256="0qdm5igjrifw8a0m36k9xrbnaj11j18236a1gvdz689vy6a4hfqz"; depends=[Rcpp]; }; RcppOctave = derive { name="RcppOctave"; version="0.14.1"; sha256="0fdljr0jdnardcm2qm29ibz16xymal8xac3p4grscipa44vm1w0b"; depends=[Rcpp pkgmaker digest stringr]; }; From fec634c25aaca599a087933774303251f9a87451 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Sat, 17 May 2014 16:14:07 +0400 Subject: [PATCH 023/254] mupdf: build with -fpic --- pkgs/applications/misc/mupdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 81bd9e1e97e9..1ea2db812a4d 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preBuild = '' - export makeFlags="prefix=$out build=release" + export makeFlags="prefix=$out build=release XCFLAGS=-fpic" export NIX_CFLAGS_COMPILE=" $NIX_CFLAGS_COMPILE -I$(echo ${openjpeg}/include/openjpeg-*) " ''; From a422c021b66a6dbf21dd3b425ef3d19ea4606671 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Sat, 17 May 2014 16:14:42 +0400 Subject: [PATCH 024/254] mupdf: build a shared library instead --- pkgs/applications/misc/mupdf/default.nix | 30 ++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 1ea2db812a4d..a89735c093f3 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -19,12 +19,42 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + my_soname = "libmupdf.so.1.3"; + my_soname_js_none = "libmupdf-js-none.so.1.3"; preBuild = '' export makeFlags="prefix=$out build=release XCFLAGS=-fpic" export NIX_CFLAGS_COMPILE=" $NIX_CFLAGS_COMPILE -I$(echo ${openjpeg}/include/openjpeg-*) " + + # Copied from Gentoo ebuild + rm -rf thirdparty + sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \ + -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \ + -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \ + -e "\$a\$(MUPDF_JS_NONE_LIB):" \ + -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \ + -e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \ + -i Makefile + + sed -e "s/libopenjpeg1/libopenjp2/" -i Makerules ''; postInstall = '' + ln -s ${my_soname} $out/lib/libmupdf.so + + mkdir -p "$out/lib/pkgconfig" + cat >"$out/lib/pkgconfig/mupdf.pc" < $out/share/applications/mupdf.desktop < Date: Sat, 17 May 2014 16:15:19 +0400 Subject: [PATCH 025/254] openjpeg: provide .pc --- pkgs/development/libraries/openjpeg/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 75999f18d62c..979812184781 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -15,7 +15,21 @@ stdenv.mkDerivation rec { nativebuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libpng libtiff lcms ]; # in closure anyway - postInstall = glib.flattenInclude; + postInstall = glib.flattenInclude + '' + mkdir -p "$out/lib/pkgconfig" + cat >"$out/lib/pkgconfig/libopenjp2.pc" < Date: Sat, 17 May 2014 16:16:50 +0400 Subject: [PATCH 026/254] zathura: mupdf plugin --- pkgs/applications/misc/zathura/default.nix | 8 +++-- .../misc/zathura/pdf-mupdf/config.patch | 17 +++++++++++ .../misc/zathura/pdf-mupdf/default.nix | 29 +++++++++++++++++++ .../misc/zathura/pdf-poppler/default.nix | 8 ++--- pkgs/top-level/all-packages.nix | 5 +++- 5 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/misc/zathura/pdf-mupdf/config.patch create mode 100644 pkgs/applications/misc/zathura/pdf-mupdf/default.nix diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index f943bff7bf0c..1a4ab3d772c5 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -1,4 +1,4 @@ -{ callPackage, pkgs, fetchurl }: +{ callPackage, pkgs, fetchurl, useMupdf }: rec { inherit (pkgs) stdenv; @@ -12,6 +12,10 @@ rec { zathura_pdf_poppler = callPackage ./pdf-poppler { }; + zathura_pdf_mupdf = callPackage ./pdf-mupdf { + gtk = pkgs.gtk3; + }; + zathura_djvu = callPackage ./djvu { gtk = pkgs.gtk3; }; @@ -27,9 +31,9 @@ rec { name = "zathura-${zathura_core.version}"; plugins_path = stdenv.lib.makeSearchPath "lib" [ - zathura_pdf_poppler zathura_djvu zathura_ps + (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler) ]; builder = ./builder.sh; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/config.patch b/pkgs/applications/misc/zathura/pdf-mupdf/config.patch new file mode 100644 index 000000000000..c7d172c92634 --- /dev/null +++ b/pkgs/applications/misc/zathura/pdf-mupdf/config.patch @@ -0,0 +1,17 @@ +--- zathura-pdf-mupdf-0.2.6/config.mk ++++ zathura-pdf-mupdf-0.2.6/config.mk +@@ -32,10 +32,11 @@ + OPENSSL_INC ?= $(shell pkg-config --cflags libcrypto) + OPENSSL_LIB ?= $(shell pkg-config --libs libcrypto) + +-MUPDF_LIB ?= -lmupdf -lmupdf-js-none ++MUPDF_INC ?= $(shell pkg-config --cflags mupdf) ++MUPDF_LIB ?= $(shell pkg-config --libs mupdf) + +-INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC} +-LIBS = ${GTK_LIB} ${GIRARA_LIB} ${MUPDF_LIB} ${OPENSSL_LIB} -ljbig2dec -lopenjp2 -ljpeg ++INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC} ${MUPDF_INC} ++LIBS = ${GTK_LIB} ${GIRARA_LIB} ${OPENSSL_LIB} ${MUPDF_LIB} -ljbig2dec -ljpeg + + # flags + CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix new file mode 100644 index 000000000000..4e585d852a2a --- /dev/null +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, openjpeg, libjpeg, jbig2dec }: + +stdenv.mkDerivation rec { + version = "0.2.6"; + name = "zathura-pdf-mupdf-${version}"; + + src = fetchurl { + url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; + sha256 = "5df94b6f906008b5f3bca770a552da6d2917d6b8d3e4b3049cb7001302041b20"; + }; + + buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf openjpeg libjpeg jbig2dec ]; + + makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib"; + + preConfigure = "patch -p1 < ${./config.patch}"; + + meta = { + homepage = http://pwmt.org/projects/zathura/; + description = "A zathura PDF plugin (mupdf)"; + longDescription = '' + The zathura-pdf-mupdf plugin adds PDF support to zathura by + using the mupdf rendering library. + ''; + license = stdenv.lib.licenses.zlib; + platforms = stdenv.lib.platforms.linux; +# maintainers = [ ]; + }; +} diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index ce4894e6c0f1..6625bf471942 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }: +{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler }: stdenv.mkDerivation rec { version = "0.2.5"; @@ -9,16 +9,16 @@ stdenv.mkDerivation rec { sha256 = "1b0chsds8iwjm4g629p6a67nb6wgra65pw2vvngd7g35dmcjgcv0"; }; - buildInputs = [ pkgconfig poppler gettext zathura_core girara ]; + buildInputs = [ pkgconfig poppler zathura_core girara ]; makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib"; meta = { homepage = http://pwmt.org/projects/zathura/; - description = "A zathura PDF plugin"; + description = "A zathura PDF plugin (poppler)"; longDescription = '' The zathura-pdf-poppler plugin adds PDF support to zathura by - using the poppler rendering engine. + using the poppler rendering library. ''; license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3ee044e9b6b..614381ce2dc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9739,7 +9739,10 @@ let zathuraCollection = recurseIntoAttrs (let callPackage = newScope pkgs.zathuraCollection; in - import ../applications/misc/zathura { inherit callPackage pkgs fetchurl; }); + import ../applications/misc/zathura { + inherit callPackage pkgs fetchurl; + useMupdf = config.zathura.useMupdf or false; + }); zathura = zathuraCollection.zathuraWrapper; From dc6c1423cdef7c1b66422f46257f7c43f30fb551 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Sat, 17 May 2014 13:21:17 -0700 Subject: [PATCH 027/254] build cdecl on darwin --- .../tools/cdecl/cdecl-2.5-lex.patch | 13 +++++++++++++ pkgs/development/tools/cdecl/default.nix | 19 +++++++++++-------- 2 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/tools/cdecl/cdecl-2.5-lex.patch diff --git a/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch b/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch new file mode 100644 index 000000000000..ecdee5d544f6 --- /dev/null +++ b/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 1643b74..8f1ae11 100644 +--- a/Makefile ++++ b/Makefile +@@ -33,7 +33,7 @@ c++decl: cdgram.c cdlex.c cdecl.c + rm -f cdecl + + cdlex.c: cdlex.l +- lex cdlex.l && mv lex.yy.c cdlex.c ++ flex cdlex.l && mv lex.yy.c cdlex.c + + cdgram.c: cdgram.y + yacc cdgram.y && mv y.tab.c cdgram.c diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index a9eb323f9a83..68fa64a01650 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -1,22 +1,25 @@ -{stdenv, fetchurl, yacc, flex, readline, ncurses}: +{stdenv, fetchurl, yacc, flex, readline, ncurses, gnused}: stdenv.mkDerivation { name = "cdecl-2.5"; src = fetchurl { - url = ftp://metalab.unc.edu/pub/linux/devel/lang/c/cdecl-2.5.tar.gz; - md5 = "29895dab52e85b2474a59449e07b7996"; + url = "http://cdecl.org/files/cdecl-blocks-2.5.tar.gz"; + md5 = "c1927e146975b1c7524cbaf07a7c10f8"; }; - patches = [ ./cdecl-2.5-implicit-pointer.patch ./cdecl-2.5.patch ./cdecl-2.5-gentoo.patch ]; - preBuild = " - makeFlags=\"PREFIX=$out\" - "; + patches = [ ./cdecl-2.5-lex.patch ]; + preBuild = '' + ${gnused}/bin/sed 's/getline/cdecl_getline/g' -i cdecl.c; + makeFlagsArray=(CFLAGS="-DBSD -DUSE_READLINE -std=gnu89" LIBS=-lreadline); + makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANDIR=$out/man1 CATDIR=$out/cat1"; + mkdir -p $out/bin; + ''; buildInputs = [yacc flex readline ncurses]; meta = { description = "Translator English -- C/C++ declarations"; license = "Public Domain"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + # platforms = with stdenv.lib.platforms; linux; }; } From 8be662f659a53c477ab4477d914dfaff29b55827 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Sun, 18 May 2014 20:50:40 -0700 Subject: [PATCH 028/254] remove patches --- .../tools/cdecl/cdecl-2.5-gentoo.patch | 29 --------- .../cdecl/cdecl-2.5-implicit-pointer.patch | 12 ---- pkgs/development/tools/cdecl/cdecl-2.5.patch | 64 ------------------- 3 files changed, 105 deletions(-) delete mode 100644 pkgs/development/tools/cdecl/cdecl-2.5-gentoo.patch delete mode 100644 pkgs/development/tools/cdecl/cdecl-2.5-implicit-pointer.patch delete mode 100644 pkgs/development/tools/cdecl/cdecl-2.5.patch diff --git a/pkgs/development/tools/cdecl/cdecl-2.5-gentoo.patch b/pkgs/development/tools/cdecl/cdecl-2.5-gentoo.patch deleted file mode 100644 index b3a67515620c..000000000000 --- a/pkgs/development/tools/cdecl/cdecl-2.5-gentoo.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/cdecl.c 2009-07-07 13:20:37.000000000 +0200 -+++ a/cdecl.c.new 2009-07-07 13:25:00.000000000 +0200 -@@ -91,7 +91,7 @@ - #ifdef USE_READLINE - # include - /* prototypes for functions related to readline() */ -- char * getline(); -+ char * mygetline(); - char ** attempt_completion(char *, int, int); - char * keyword_completion(char *, int); - char * command_completion(char *, int); -@@ -375,7 +375,7 @@ - static char *line_read = NULL; - - /* Read a string, and return a pointer to it. Returns NULL on EOF. */ --char * getline () -+char * mygetline () - { - /* If the buffer has already been allocated, return the memory - to the free pool. */ -@@ -887,7 +887,7 @@ - - if (!quiet) (void) printf("Type `help' or `?' for help\n"); - ret = 0; -- while ((line = getline())) { -+ while ((line = mygetline())) { - if (!strcmp(line, "quit") || !strcmp(line, "exit")) { - free(line); - return ret; diff --git a/pkgs/development/tools/cdecl/cdecl-2.5-implicit-pointer.patch b/pkgs/development/tools/cdecl/cdecl-2.5-implicit-pointer.patch deleted file mode 100644 index ee4949beb6ed..000000000000 --- a/pkgs/development/tools/cdecl/cdecl-2.5-implicit-pointer.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: cdecl-2.5/cdecl.c -=================================================================== ---- cdecl-2.5.orig/cdecl.c -+++ cdecl-2.5/cdecl.c -@@ -204,6 +204,7 @@ int DebugFlag = 0; /* -d, output debugg - #define ANSI 4 /* combo not allowed anymore in ANSI compiler */ - #define A ANSI - -+extern char **completion_matches PARAMS((char *, rl_compentry_func_t *)); - /* This is an lower left triangular array. If we needed */ - /* to save 9 bytes, the "long" row can be removed. */ - char crosscheck[9][9] = { \ No newline at end of file diff --git a/pkgs/development/tools/cdecl/cdecl-2.5.patch b/pkgs/development/tools/cdecl/cdecl-2.5.patch deleted file mode 100644 index 4b00849f372b..000000000000 --- a/pkgs/development/tools/cdecl/cdecl-2.5.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/Makefile b/Makefile -index 9e85686..b8e6e02 100644 ---- a/Makefile -+++ b/Makefile -@@ -15,13 +15,14 @@ - # - # add -DUSE_READLINE To compile in support for the GNU readline library. - --CFLAGS= -s -O2 -DUSE_READLINE -+CFLAGS=-DUSE_READLINE - CC= gcc --LIBS= -lreadline -ltermcap -+LIBS= -lreadline -lncursesw - ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++ --BINDIR= /usr/bin --MANDIR= /usr/man/man1 --CATDIR= /usr/man/cat1 -+PREFIX?= /usr -+BINDIR= $(PREFIX)/bin -+MANDIR= $(PREFIX)/man/man1 -+CATDIR= $(PREFIX)/man/cat1 - INSTALL= install -c - INSTALL_DATA= install -c -m 644 - -@@ -33,7 +34,7 @@ c++decl: cdgram.c cdlex.c cdecl.c - rm -f cdecl - - cdlex.c: cdlex.l -- lex cdlex.l && mv lex.yy.c cdlex.c -+ flex cdlex.l && mv lex.yy.c cdlex.c - - cdgram.c: cdgram.y - yacc cdgram.y && mv y.tab.c cdgram.c -@@ -43,8 +44,10 @@ test: - ./c++decl < testset++ - - install: cdecl -+ $(INSTALL) -d $(BINDIR) - $(INSTALL) cdecl $(BINDIR) - ln $(BINDIR)/cdecl $(BINDIR)/c++decl -+ $(INSTALL) -d $(MANDIR) - $(INSTALL_DATA) cdecl.1 $(MANDIR) - $(INSTALL_DATA) c++decl.1 $(MANDIR) - -diff --git a/cdecl.c b/cdecl.c -index f03f01e..1fdde9f 100644 ---- a/cdecl.c -+++ b/cdecl.c -@@ -67,6 +67,7 @@ char cdeclsccsid[] = "@(#)cdecl.c 2.5 1/15/96"; - # include - # include - # include -+# include - #else - # ifndef NOVARARGS - # include -@@ -124,7 +125,6 @@ char real_prompt[MAX_NAME+3]; - - #if __STDC__ - char *ds(char *), *cat(char *, ...), *visible(int); -- int getopt(int,char **,char *); - int main(int, char **); - int yywrap(void); - int dostdin(void); From 1564af1d991fd9b545be620593a41ac3959d5953 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Sun, 18 May 2014 20:51:08 -0700 Subject: [PATCH 029/254] update constraints and maintainers --- pkgs/development/tools/cdecl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index 68fa64a01650..d923fea8b598 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Translator English -- C/C++ declarations"; license = "Public Domain"; - maintainers = with stdenv.lib.maintainers; [viric]; - # platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [viric joelteon]; + platforms = stdenv.lib.platforms.unix; }; } From d56dcb50f4764c84ec2309ba12978bd71adcd950 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Sun, 18 May 2014 20:52:18 -0700 Subject: [PATCH 030/254] add me to maintainers --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 80d0bed23dce..0bd99856463a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -43,6 +43,7 @@ iElectric = "Domen Kozar "; iyzsong = "Song Wenwu "; jcumming = "Jack Cummings "; + joelteon = "Joel Taylor "; jwiegley = "John Wiegley "; kkallio = "Karn Kallio "; ktosiek = "Tomasz Kontusz "; From 8ffd6af27e6dfae0a3b4d77db03409f62c5b8d98 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 20 May 2014 16:35:30 -0500 Subject: [PATCH 031/254] hplip: don't use udev rules to change device owner --- pkgs/misc/drivers/hplip/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 50106dfb477c..fcec3bf26754 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -93,6 +93,8 @@ stdenv.mkDerivation rec { mkdir -p $out/etc/sane.d/dll.d mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf + + rm $out/etc/udev/rules.d/56-hpmud.rules '')); buildInputs = [ From f211c32e6d998f68d253c0fdf9db41630801a7bd Mon Sep 17 00:00:00 2001 From: Daniel Bergey Date: Thu, 22 May 2014 14:07:25 +0000 Subject: [PATCH 032/254] IMM RSS reader and dependencies --- .../libraries/haskell/imm/default.nix | 27 +++++++ .../imm/latest-feed-http-conduit-tls.patch | 73 +++++++++++++++++++ .../libraries/haskell/opml/default.nix | 13 ++++ .../libraries/haskell/timerep/default.nix | 12 +++ pkgs/top-level/haskell-packages.nix | 6 ++ 5 files changed, 131 insertions(+) create mode 100644 pkgs/development/libraries/haskell/imm/default.nix create mode 100644 pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch create mode 100644 pkgs/development/libraries/haskell/opml/default.nix create mode 100644 pkgs/development/libraries/haskell/timerep/default.nix diff --git a/pkgs/development/libraries/haskell/imm/default.nix b/pkgs/development/libraries/haskell/imm/default.nix new file mode 100644 index 000000000000..38bc9bbfde70 --- /dev/null +++ b/pkgs/development/libraries/haskell/imm/default.nix @@ -0,0 +1,27 @@ +{ cabal, async, caseInsensitive, cond, dataDefault, dyre, feed +, filepath, hslogger, httpConduit, httpTypes, lens, mimeMail +, monadControl, mtl, network, opml, random, resourcet, text +, textIcu, time, timerep, tls, transformers, transformersBase +, utf8String, xdgBasedir, xml +}: + +cabal.mkDerivation (self: { + pname = "imm"; + version = "0.6.0.1"; + sha256 = "11m6937wafl6nic69mbibrjnxib503907y21n9zmsxc8vnjl3pps"; + patches = [ ./latest-feed-http-conduit-tls.patch ]; + isLibrary = true; + isExecutable = true; + buildDepends = [ + async caseInsensitive cond dataDefault dyre feed filepath hslogger + httpConduit httpTypes lens mimeMail monadControl mtl network opml + random resourcet text textIcu time timerep tls transformers + transformersBase utf8String xdgBasedir xml + ]; + meta = { + description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + maintainers = [ "Daniel Bergey " ]; + }; +}) \ No newline at end of file diff --git a/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch b/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch new file mode 100644 index 000000000000..afe72bc83e7a --- /dev/null +++ b/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch @@ -0,0 +1,73 @@ +# HG changeset patch +# User Daniel Bergey +# Date 1398284724 0 +# Wed Apr 23 20:25:24 2014 +0000 +# Node ID 4cc692e7acc4f21ffab9e5572d286495791d22d1 +# Parent 31e3ba1aaaf9efdce66e8ef5c192d0f4214150f4 +Update for feed-0.3.9.2, http-conduit-2.0, tls-1.2 + +diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 Imm/Error.hs +--- a/Imm/Error.hs Sun Jun 16 12:23:40 2013 +0200 ++++ b/Imm/Error.hs Wed Apr 23 20:25:24 2014 +0000 +@@ -41,7 +41,7 @@ + data ImmError = + OtherError String + | HTTPError HttpException +- | TLSError HandshakeFailed ++ | TLSError TLSException + | UnicodeError UnicodeException + | ParseUriError String + | ParseTimeError String +@@ -63,7 +63,7 @@ + "/!\\ Cannot parse date from item: ", + " title: " ++ (show $ getItemTitle item), + " link:" ++ (show $ getItemLink item), +- " publish date:" ++ (show $ getItemPublishDate item), ++ " publish date:" ++ (show (getItemPublishDate item :: Maybe (Maybe UTCTime))), + " date:" ++ (show $ getItemDate item)] + show (ParseTimeError raw) = "/!\\ Cannot parse time: " ++ raw + show (ParseFeedError raw) = "/!\\ Cannot parse feed: " ++ raw +diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 Imm/HTTP.hs +--- a/Imm/HTTP.hs Sun Jun 16 12:23:40 2013 +0200 ++++ b/Imm/HTTP.hs Wed Apr 23 20:25:24 2014 +0000 +@@ -50,13 +50,13 @@ + either throwError return res + + -- | Monad-agnostic version of 'parseUrl' +-parseURL :: (MonadBase IO m, MonadError ImmError m) => String -> m (Request m') ++parseURL :: (MonadBase IO m, MonadError ImmError m) => String -> m Request + parseURL uri = do + result <- io $ (Right <$> parseUrl uri) `catch` (return . Left . HTTPError) + either throwError return result + + -- | Build an HTTP request for given URI +-request :: (MonadBase IO m, MonadError ImmError m) => String -> m (Request a) ++request :: (MonadBase IO m, MonadError ImmError m) => String -> m Request + request uri = do + req <- parseURL uri + return $ req { requestHeaders = [ +diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 imm.cabal +--- a/imm.cabal Sun Jun 16 12:23:40 2013 +0200 ++++ b/imm.cabal Wed Apr 23 20:25:24 2014 +0000 +@@ -46,10 +46,10 @@ + data-default, + directory, + dyre, +- feed, ++ feed == 0.3.9.2, + filepath, + hslogger, +- http-conduit >= 1.9.0, ++ http-conduit >= 2.0 && < 2.2, + http-types, + lens, + mime-mail, +@@ -66,7 +66,7 @@ + transformers, + time, + timerep >= 1.0.3, +- tls, ++ tls >= 1.2 && < 1.3, + utf8-string, + xdg-basedir, + xml diff --git a/pkgs/development/libraries/haskell/opml/default.nix b/pkgs/development/libraries/haskell/opml/default.nix new file mode 100644 index 000000000000..be7cb0606eeb --- /dev/null +++ b/pkgs/development/libraries/haskell/opml/default.nix @@ -0,0 +1,13 @@ +{ cabal, xml }: + +cabal.mkDerivation (self: { + pname = "opml"; + version = "0.4"; + sha256 = "1bnr6lkcf2qs7pvrmd8a5xmklcg67l64b776hzclfvxqy1qil29x"; + buildDepends = [ xml ]; + meta = { + description = "Representing and handling OPML subscription information"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/timerep/default.nix b/pkgs/development/libraries/haskell/timerep/default.nix new file mode 100644 index 000000000000..6ebc44cb8940 --- /dev/null +++ b/pkgs/development/libraries/haskell/timerep/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "timerep"; + version = "1.0.3"; + sha256 = "14lz8nzfy1j7snvifbwjkk1fjc8wy4jk67xk9n87r25v3cva3x0p"; + meta = { + description = "Parse and display time according to some RFCs (RFC3339, RFC2822)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d3d2ae5fea22..1560b7d45576 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1172,6 +1172,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ieee754 = callPackage ../development/libraries/haskell/ieee754 {}; + imm = callPackage ../development/libraries/haskell/imm {}; + indents = callPackage ../development/libraries/haskell/indents {}; indexed = callPackage ../development/libraries/haskell/indexed {}; @@ -1552,6 +1554,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in operational = callPackage ../development/libraries/haskell/operational {}; + opml = callPackage ../development/libraries/haskell/opml {}; + options = callPackage ../development/libraries/haskell/options {}; optparseApplicative = callPackage ../development/libraries/haskell/optparse-applicative {}; @@ -2173,6 +2177,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in time_1_4_2 = callPackage ../development/libraries/haskell/time/1.4.2.nix {}; time = null; # core package since ghc >= 6.12.x + timerep = callPackage ../development/libraries/haskell/timerep {}; + timeparsers = callPackage ../development/libraries/haskell/timeparsers { convertible = self.convertible_1_0_11_1; }; From 0bc17d9fa93ef966f17f589f471ffc0bc5a16ad1 Mon Sep 17 00:00:00 2001 From: Jordan Patterson Date: Thu, 22 May 2014 15:13:25 -0600 Subject: [PATCH 033/254] Add unicode3 option to rxvt_unicode Needed to user fonts patched for powerline. --- pkgs/applications/misc/rxvt_unicode/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 7ba01167c7f5..52f0ef9cde39 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl, - fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf }: + fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf, + unicode3Support }: let name = "rxvt-unicode"; @@ -9,7 +10,7 @@ in stdenv.mkDerivation (rec { - name = "${n}${if perlSupport then "-with-perl" else ""}"; + name = "${n}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}"; src = fetchurl { url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; @@ -29,7 +30,7 @@ stdenv.mkDerivation (rec { preConfigure = '' mkdir -p $terminfo/share/terminfo - configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"}"; + configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"} ${if unicode3Support then "--enable-unicode3" else "--disable-unicode3"}"; export TERMINFO=$terminfo/share/terminfo # without this the terminfo won't be compiled by tic, see man tic NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2" NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender " diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fc5bd53244d..8be68fe36b02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9237,6 +9237,7 @@ let rxvt_unicode = callPackage ../applications/misc/rxvt_unicode { perlSupport = true; gdkPixbufSupport = true; + unicode3Support = true; }; sakura = callPackage ../applications/misc/sakura { From 128636ff242a7eee77cf0b6c640f184e0a2b0a1a Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 23 May 2014 10:18:03 +0200 Subject: [PATCH 034/254] Added an option to configure sensitivity and speed of trackpoints. --- nixos/modules/module-list.nix | 1 + nixos/modules/tasks/trackpoint.nix | 66 ++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 nixos/modules/tasks/trackpoint.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f98b621111fd..a7f121bc7c2b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -317,6 +317,7 @@ ./tasks/network-interfaces.nix ./tasks/scsi-link-power-management.nix ./tasks/swraid.nix + ./tasks/trackpoint.nix ./testing/service-runner.nix ./virtualisation/container-config.nix ./virtualisation/containers.nix diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix new file mode 100644 index 000000000000..4be2c3eb4c47 --- /dev/null +++ b/nixos/modules/tasks/trackpoint.nix @@ -0,0 +1,66 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + ###### interface + + options = { + + hardware.trackpoint = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enable sensitivity and speed configuration for trackpoints. + ''; + }; + + sensitivity = mkOption { + default = 128; + example = 255; + type = types.int; + description = '' + Configure the trackpoint sensitivity. By default, the kernel + configures 128. + ''; + }; + + speed = mkOption { + default = 97; + example = 255; + type = types.int; + description = '' + Configure the trackpoint sensitivity. By default, the kernel + configures 97. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf config.hardware.trackpoint.enable { + + jobs.trackpoint = + { description = "Initialize trackpoint"; + + startOn = "started udev"; + + task = true; + + script = '' + echo -n ${toString config.hardware.trackpoint.sensitivity} \ + > /sys/devices/platform/i8042/serio1/sensitivity + echo -n ${toString config.hardware.trackpoint.speed} \ + > /sys/devices/platform/i8042/serio1/speed + ''; + }; + + }; + +} From 956a01298828079012249c549773c19a89393260 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 24 May 2014 13:19:47 -0300 Subject: [PATCH 035/254] Galculator: add version 2.3.1 Galculator is a GTK full-fledged calculator. --- pkgs/applications/misc/galculator/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/misc/galculator/default.nix diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix new file mode 100644 index 000000000000..010f75a575e6 --- /dev/null +++ b/pkgs/applications/misc/galculator/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl +, intltool, pkgconfig, gtk + }: + +stdenv.mkDerivation rec { + + name = "galculator-${version}"; + version = "2.1.3"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/galculator/${name}.tar.gz"; + sha256 = "12m7dldjk10lpkdxk7zpk98n32ci65zmxidghihb7n1m3rhp3q17"; + }; + + buildInputs = [ intltool pkgconfig gtk ]; + + meta = { + description = "A GTK 2/3 algebraic and RPN calculator"; + longDescription = '' + galculator is a GTK 2 / GTK 3 based calculator. Its main features include: + + - Algebraic, RPN (Reverse Polish Notation), Formula Entry and Paper modes; + - Basic and Scientific Modes + - Decimal, hexadecimal, octal and binary number base + - Radiant, degree and grad support + - User defined constants and functions + - A bunch of common functions + - Binary arithmetic of configurable bit length and signedness + - Quad-precision floating point arithmetic, and 112-bit binary arithmetic + ''; + homepage = http://galculator.sourceforge.net/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aadabfdceb04..43712d497a6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1070,6 +1070,10 @@ let g500-control = callPackage ../tools/misc/g500-control { }; + galculator = callPackage ../applications/misc/galculator { + gtk = gtk3; + }; + gawk = callPackage ../tools/text/gawk { }; gawkInteractive = appendToName "interactive" From 2bfd36fa14ef23b39dd6c401781afa2571e7c330 Mon Sep 17 00:00:00 2001 From: Daniel Bergey Date: Thu, 22 May 2014 17:21:28 +0000 Subject: [PATCH 036/254] Nafees font family (5 fonts) --- pkgs/data/fonts/nafees/default.nix | 59 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/data/fonts/nafees/default.nix diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix new file mode 100644 index 000000000000..aa0c1dbd77ba --- /dev/null +++ b/pkgs/data/fonts/nafees/default.nix @@ -0,0 +1,59 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + name = "nafees"; + + srcs = [(fetchurl { + url = "http://www.cle.org.pk/Downloads/localization/fonts/NafeesNastaleeq/Nafees_Nastaleeq_v1.02.zip"; + sha256 = "1h1k5d74pg2gs782910v7i9rz2633wdacy34ds7ybxbpjiz6pqix"; + }) + + (fetchurl { + url = "http://www.cle.org.pk/Downloads/localization/fonts/NafeesRiqa/Nafees_Riqa_v1.0.zip"; + sha256 = "1liismsyaj69y40vs9a9db4l95n25n8vnjnx7sbk70nxppwngd8i"; + }) + + (fetchurl { + url = "http://www.cle.org.pk/Downloads/localization/fonts/NafeesNaskh/Nafees_Naskh_v2.01.zip"; + sha256 = "1qbbj6w6bvrlymv7z6ld609yhp0l2f27z14180w5n8kzzl720vly"; + }) + + (fetchurl { + url = "http://www.cle.org.pk/Downloads/localization/fonts/NafeesTahreerNaskh/Nafees_Tahreer_Naskh_v1.0.zip"; + sha256 = "006l87drbi4zh52kpvn8wl9wbwm9srfn406rzsnf4gv0spzhqrxl"; + }) + (fetchurl { + url = "http://www.cle.org.pk/Downloads/localization/fonts/NafeesPakistaniNaskh/Nafees_Pakistani_Naskh_v2.01.zip"; + sha256 = "1i5ip60gq1cgc9fc96kvlahdpia8dxdgcisglvbm2d212bz0s5nb"; + }) +]; + + buildInputs = [unzip]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + # cp $riqa/*.ttf $out/share/fonts/truetype + ''; + + meta = { + description = "OpenType Urdu font from the Center for Research in Urdu Language Processing"; + + longDescription = '' The Nafees font family is developed according + to calligraphic rules, following the style of Syed Nafees + Al-Hussaini (Nafees Raqam) one of the finest calligraphers of + Pakistan ''; + + homepage = "http://www.cle.org.pk/software/localization.htm"; + + # Used to be GPLv2. The license distributed with the fonts looks + # more like a modified BSD, but still contains the GPLv2 embedded + # font exception, and some not-for-resale language. + license = "unknown"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ "Daniel Bergey " ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aadabfdceb04..f731f46f5ff9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7760,6 +7760,8 @@ let mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; + nafees = callPackage ../data/fonts/nafees { }; + oldstandard = callPackage ../data/fonts/oldstandard { }; poly = callPackage ../data/fonts/poly { }; From cceea413bc36fae559a6f86dd70e3d63c82ae7c7 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 25 May 2014 03:21:21 -0500 Subject: [PATCH 037/254] Add expression to build the eboard chess client --- pkgs/games/eboard/default.nix | 19 +++++++++++++++++++ pkgs/games/eboard/eboard.patch | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/games/eboard/default.nix create mode 100644 pkgs/games/eboard/eboard.patch diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix new file mode 100644 index 000000000000..1decee4264a4 --- /dev/null +++ b/pkgs/games/eboard/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gtk }: + +stdenv.mkDerivation { + name = "eboard-1.1.1"; + + src = fetchurl { + url = mirror://sourceforge/eboard/eboard-1.1.1.tar.bz2; + sha256 = "0vm25j1s2zg1lipwjv9qrcm877ikfmk1yh34i8f5l3bwd63115xd"; + }; + + patches = [ ./eboard.patch ]; + + buildInputs = [ pkgconfig gtk ]; + + meta = { + homepage = http://www.bergo.eng.br/eboard/; + description = "eboard is a chess interface for Unix-like systems"; + }; +} diff --git a/pkgs/games/eboard/eboard.patch b/pkgs/games/eboard/eboard.patch new file mode 100644 index 000000000000..f80c1b2f78d7 --- /dev/null +++ b/pkgs/games/eboard/eboard.patch @@ -0,0 +1,16 @@ +--- a/cimg.cc 2014-05-25 02:41:58.000000000 -0500 ++++ b/cimg.cc 2014-05-25 02:42:31.000000000 -0500 +@@ -94,11 +94,11 @@ + ct == PNG_COLOR_TYPE_GRAY_ALPHA) + png_set_gray_to_rgb(pngp); + +- alloc(pngp->width,pngp->height); ++ alloc(png_get_image_width(pngp, infp),png_get_image_height(pngp, infp)); + if (!ok) { fclose(f); return; } + ok = 0; + +- for(i=0;iheight;i++) { ++ for(i=0;i Date: Sun, 25 May 2014 03:29:24 -0500 Subject: [PATCH 038/254] Correct patch the rpath for GHC-built executables on Darwin @peti This addresses #2488. --- pkgs/build-support/cabal/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 70fb72f99fb9..7605d863c213 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -197,6 +197,9 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; ${optionalString (self.enableSharedExecutables && self.stdenv.isLinux) '' configureFlags+=" --ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.ghc.name}/${self.pname}-${self.version}"; ''} + ${optionalString (self.enableSharedExecutables && self.stdenv.isDarwin) '' + configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names"; + ''} echo "configure flags: $extraConfigureFlags $configureFlags" ./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' \ @@ -256,6 +259,13 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages fi + ${optionalString (self.enableSharedExecutables && self.isExecutable && self.stdenv.isDarwin) '' + for exe in $out/bin/* ; do + install_name_tool -add_rpath \ + $out/lib/${ghc.ghc.name}/${self.pname}-${self.version} $exe + done + ''} + eval "$postInstall" ''; From dfd96f77a7bacdbf3f2a274dd7c175234b129fb4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 25 May 2014 14:17:23 -0500 Subject: [PATCH 039/254] add lohit-fonts-20140220 --- pkgs/data/fonts/lohit-fonts/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/data/fonts/lohit-fonts/default.nix diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix new file mode 100644 index 000000000000..707d52c8baa0 --- /dev/null +++ b/pkgs/data/fonts/lohit-fonts/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "lohit-fonts-20140220"; + src = fetchurl { + url = https://fedorahosted.org/releases/l/o/lohit/lohit-ttf-20140220.tar.gz; + sha256 = "1rmgr445hw1n851ywy28csfvswz1i6hnc8mzp88qw2xk9j4dn32d"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + homepage = https://fedorahosted.org/lohit/; + description = "Fonts for 21 Indian languages"; + license = licenses.ofl; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aadabfdceb04..83223a66acec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7752,6 +7752,8 @@ let lmodern = callPackage ../data/fonts/lmodern { }; + lohit-fonts = callPackage ../data/fonts/lohit-fonts { }; + manpages = callPackage ../data/documentation/man-pages { }; miscfiles = callPackage ../data/misc/miscfiles { }; From 71522f1ec2c94bef24bf02abeb04b017b56f4e41 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 24 May 2014 21:04:18 -0500 Subject: [PATCH 040/254] ark: wrap for zipinfo --- pkgs/desktops/kde-4.12/kdeutils/ark.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.12/kdeutils/ark.nix b/pkgs/desktops/kde-4.12/kdeutils/ark.nix index eb3e12281d64..99844b909fd7 100644 --- a/pkgs/desktops/kde-4.12/kdeutils/ark.nix +++ b/pkgs/desktops/kde-4.12/kdeutils/ark.nix @@ -1,7 +1,15 @@ -{ kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson }: +{ makeWrapper, kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson +, unzip }: kde { - buildInputs = [ kdelibs kde_baseapps libarchive bzip2 lzma qjson ]; + buildInputs = [ + makeWrapper kdelibs kde_baseapps libarchive bzip2 lzma qjson + ]; + + postInstall = '' + wrapProgram $out/bin/ark \ + --prefix PATH ":" "${unzip}/bin" + ''; meta = { description = "KDE Archiving Tool"; From 4e6ee200cd9fc247bd662e246c241bb10fe346a8 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 26 May 2014 02:03:39 -0500 Subject: [PATCH 041/254] Add three more Haskell expressions --- .../haskell/BlogLiterately/default.nix | 24 +++++++++++++++++++ .../libraries/haskell/bool-extras/default.nix | 13 ++++++++++ .../libraries/haskell/units/default.nix | 14 +++++++++++ pkgs/top-level/haskell-packages.nix | 6 +++++ 4 files changed, 57 insertions(+) create mode 100644 pkgs/development/libraries/haskell/BlogLiterately/default.nix create mode 100644 pkgs/development/libraries/haskell/bool-extras/default.nix create mode 100644 pkgs/development/libraries/haskell/units/default.nix diff --git a/pkgs/development/libraries/haskell/BlogLiterately/default.nix b/pkgs/development/libraries/haskell/BlogLiterately/default.nix new file mode 100644 index 000000000000..e4005ed4ec04 --- /dev/null +++ b/pkgs/development/libraries/haskell/BlogLiterately/default.nix @@ -0,0 +1,24 @@ +{ cabal, blazeHtml, boolExtras, cmdargs, dataDefault, filepath +, HaXml, haxr, highlightingKate, hscolour, lens, mtl, pandoc +, pandocCiteproc, pandocTypes, parsec, split, strict, temporary +, transformers, utf8String +}: + +cabal.mkDerivation (self: { + pname = "BlogLiterately"; + version = "0.7.1.6"; + sha256 = "0mzq0br9jsymml57kcxqyr401lckzm43fy74l3wy25n6grv64hd4"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + blazeHtml boolExtras cmdargs dataDefault filepath HaXml haxr + highlightingKate hscolour lens mtl pandoc pandocCiteproc + pandocTypes parsec split strict temporary transformers utf8String + ]; + meta = { + homepage = "http://byorgey.wordpress.com/blogliterately/"; + description = "A tool for posting Haskelly articles to blogs"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/bool-extras/default.nix b/pkgs/development/libraries/haskell/bool-extras/default.nix new file mode 100644 index 000000000000..20185638b592 --- /dev/null +++ b/pkgs/development/libraries/haskell/bool-extras/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "bool-extras"; + version = "0.4.0"; + sha256 = "008m43f04ncx2c24c241gzwjyyglw8rwpq2gsakqkw0nwz3czs61"; + meta = { + homepage = "http://tom.lokhorst.eu/bool-extras"; + description = "A fold function for Bool"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/units/default.nix b/pkgs/development/libraries/haskell/units/default.nix new file mode 100644 index 000000000000..a386257eaee3 --- /dev/null +++ b/pkgs/development/libraries/haskell/units/default.nix @@ -0,0 +1,14 @@ +{ cabal, singletons }: + +cabal.mkDerivation (self: { + pname = "units"; + version = "2.0"; + sha256 = "1iv0pirhyp7crbkb008k14z57jl8c91r1sl8kqmb778xawb1hx52"; + buildDepends = [ singletons ]; + meta = { + homepage = "http://www.cis.upenn.edu/~eir/packages/units"; + description = "A domain-specific type system for dimensional analysis"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 216037e74cdf..e8bcbf97b29a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -268,6 +268,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {}; + BlogLiterately = callPackage ../development/libraries/haskell/BlogLiterately {}; + bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {}; bmp = callPackage ../development/libraries/haskell/bmp { @@ -276,6 +278,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Boolean = callPackage ../development/libraries/haskell/Boolean {}; + boolExtras = callPackage ../development/libraries/haskell/bool-extras {}; + boundingboxes_0_1_1 = callPackage ../development/libraries/haskell/boundingboxes/0.1.1.nix {}; boundingboxes_0_2 = callPackage ../development/libraries/haskell/boundingboxes/0.2.nix {}; boundingboxes = self.boundingboxes_0_2; @@ -2270,6 +2274,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in uniplate = callPackage ../development/libraries/haskell/uniplate {}; + units = callPackage ../development/libraries/haskell/units {}; + uniqueid = callPackage ../development/libraries/haskell/uniqueid {}; unixBytestring = callPackage ../development/libraries/haskell/unix-bytestring {}; From aea8bff8955e8fc7951507da9bd5ca4c8af7d8bc Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 26 May 2014 02:45:59 -0500 Subject: [PATCH 042/254] Add expression for ChessDB --- pkgs/games/chessdb/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/games/chessdb/default.nix diff --git a/pkgs/games/chessdb/default.nix b/pkgs/games/chessdb/default.nix new file mode 100644 index 000000000000..381e35632a6e --- /dev/null +++ b/pkgs/games/chessdb/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, tcl, tk, libX11, makeWrapper }: + +stdenv.mkDerivation { + name = "chessdb-3.6.19-beta-1"; + + src = fetchurl { + url = mirror://sourceforge/chessdb/ChessDB-3.6.19-beta-1.tar.gz; + sha256 = "0brc3wln3bxp979iqj2w1zxpfd0pch8zzazhdmwf7acww4hrsz62"; + }; + + buildInputs = [ tcl tk libX11 makeWrapper ]; + + makeFlags = [ + "BINDIR=$(out)/bin" + "SHAREDIR=$(out)/share/chessdb" + "SOUNDSDIR=$(out)/share/chessdb/sounds" + "TBDIR=$(out)/share/chessdb/tablebases" + "MANDIR=$(out)/man" + ]; + + postInstall = '' + wrapProgram $out/bin/chessdb --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" + ''; + + meta = { + homepage = http://chessdb.sourceforge.net/; + description = "ChessDB is a free chess database"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0b35e55d47f..3b6a3ddc76eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9858,6 +9858,8 @@ let castle_combat = callPackage ../games/castle-combat { }; + chessdb = callPackage ../games/chessdb { }; + construoBase = lowPrio (callPackage ../games/construo { mesa = null; freeglut = null; From bf1bde8215ebbc04aa872b2804b2415364cc81ca Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 26 May 2014 02:48:28 -0500 Subject: [PATCH 043/254] Wrap yesod-bin so that yesod devel works with Nix --- .../libraries/haskell/yesod-bin/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 23eaa047f8eb..d722d5cd608a 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -23,6 +23,18 @@ cabal.mkDerivation (self: { systemFileio systemFilepath tar text time transformers unixCompat unorderedContainers wai waiExtra warp yaml zlib ]; + + postInstall = '' + mv $out/bin/yesod $out/bin/.yesod-wrapped + cat - > $out/bin/yesod < Date: Mon, 26 May 2014 02:50:14 -0500 Subject: [PATCH 044/254] Add Haskell expression for machines --- .../libraries/haskell/machines/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/machines/default.nix diff --git a/pkgs/development/libraries/haskell/machines/default.nix b/pkgs/development/libraries/haskell/machines/default.nix new file mode 100644 index 000000000000..cd69d9133a6c --- /dev/null +++ b/pkgs/development/libraries/haskell/machines/default.nix @@ -0,0 +1,19 @@ +{ cabal, comonad, doctest, filepath, free, mtl, pointed +, profunctors, semigroups, transformers, void +}: + +cabal.mkDerivation (self: { + pname = "machines"; + version = "0.2.5"; + sha256 = "0745lhmfwq27nna517q7b82q59pda587wgh6840nw65syaj2qfhp"; + buildDepends = [ + comonad free mtl pointed profunctors semigroups transformers void + ]; + testDepends = [ doctest filepath ]; + meta = { + homepage = "http://github.com/ekmett/machines/"; + description = "Networked stream transducers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 216037e74cdf..180f575ccd10 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1362,6 +1362,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in maccatcher = callPackage ../development/libraries/haskell/maccatcher {}; + machines = callPackage ../development/libraries/haskell/machines {}; + markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {}; mathFunctions = callPackage ../development/libraries/haskell/math-functions {}; From b9737cb4ab4ed7de6fc74ac8a399fbe0fc96cd72 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 26 May 2014 11:12:38 +0200 Subject: [PATCH 045/254] Add influxdb, scalable datastore for metrics, events, and real-time analytics --- pkgs/servers/nosql/influxdb/default.nix | 35 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/servers/nosql/influxdb/default.nix diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix new file mode 100644 index 000000000000..fa9c48c6ea92 --- /dev/null +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "influxdb-${version}"; + version = "0.7.0"; + arch = if stdenv.system == "x86_64-linux" then "amd64" else "386"; + + src = fetchurl { + url = "http://s3.amazonaws.com/influxdb/${name}.${arch}.tar.gz"; + sha256 = if arch == "amd64" then + "1mvi21z83abnprzj0n8r64ly9s48i5l7ndcrci7nk96z8xab7w3q" else + "1zgxbfnam4r31g9yfwznhb7l4hf7s5sylhll92zr8q0qjhr4cj2b"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + install -D influxdb $out/bin/influxdb + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/bin/influxdb + wrapProgram "$out/bin/influxdb" \ + --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64" + + ensureDir $out/share/influxdb + cp -R admin scripts config.toml $out/share/influxdb + ''; + + meta = with stdenv.lib; { + description = "Scalable datastore for metrics, events, and real-time analytics"; + homepage = http://influxdb.com/; + license = licenses.mit; + + maintainers = [ maintainers.offline ]; + platforms = ["i686-linux" "x86_64-linux"]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70cab717c169..b2dad91bdbf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6663,6 +6663,8 @@ let riak = callPackage ../servers/nosql/riak/1.3.1.nix { }; + influxdb = callPackage ../servers/nosql/influxdb { }; + mysql51 = import ../servers/sql/mysql/5.1.x.nix { inherit fetchurl ncurses zlib perl openssl stdenv; ps = procps; /* !!! Linux only */ From 1cbcdd515929d242b6934b65798d4c22b041bbb6 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 23 May 2014 04:09:27 +0200 Subject: [PATCH 046/254] cantata: fix build failure (close #2723) We were one directory too high for configure. --- pkgs/applications/audio/cantata/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index f3cba4ca8198..31d5240529f7 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2; unpackPhase = "tar -xvf $src"; + sourceRoot = "cantata-1.3.4"; # Qt4 is implicit when KDE is switched off. cmakeFlags = stdenv.lib.flatten [ From 25ea04f2c98c1ecc538d0aa52815cf68b8a00bb5 Mon Sep 17 00:00:00 2001 From: _1126 Date: Mon, 26 May 2014 18:20:47 +0200 Subject: [PATCH 047/254] ncmpc: propable fix for x86_64-darwin build error @vcunat fixed syntax a bit. Close #2761. --- pkgs/applications/audio/ncmpc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 6db80f39e2cf..f690b914abe0 100755 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib }: +{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }: stdenv.mkDerivation rec { version = "0.21"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "648e846e305c867cb937dcb467393c2f5a30bf460bdf77b63de7af69fba1fd07"; }; - buildInputs = [ pkgconfig glib ncurses mpd_clientlib ]; + buildInputs = [ pkgconfig glib ncurses mpd_clientlib ] + ++ libintlOrEmpty; meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; From 8ad1a0ceaf1b924f9893c45b3e13bcb63d6702af Mon Sep 17 00:00:00 2001 From: wmertens Date: Sun, 20 Apr 2014 07:47:22 +0200 Subject: [PATCH 048/254] swig: enable on Darwin (close #2326) Verified on OS X 10.9.2 to build and check, dependents build fine too. @vcunat enabled doCheck as it works for him on x86_64-linux; also did style nitpick modification, and changed platforms to .all according to the homepage http://www.swig.org/compat.html --- pkgs/development/tools/misc/swig/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index d489feba4dc5..80c6b20e69d0 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost }: +{ stdenv, fetchurl, boost, tcl }: stdenv.mkDerivation rec { name = "swig-1.3.40"; @@ -8,18 +8,9 @@ stdenv.mkDerivation rec { sha256 = "02dc8g8wy75nd2is1974rl24c6mdl0ai1vszs1xpg9nd7dlv6i8r"; }; - #buildInputs = [ boost ]; # needed for `make check' - - /* The test suite fails this way: - - building python_cpp - python: tpp.c:63: __pthread_tpp_change_priority: Assertion `new_prio == -1 || (new_prio >= __sched_fifo_min_prio && new_prio <= __sched_fifo_max_prio)' failed. - /bin/sh: line 1: 32101 Aborted env LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH PYTHONPATH=.:$PYTHONPATH python ./li_boost_shared_ptr_runme.py - make[1]: *** [li_boost_shared_ptr.cpptest] Error 134 - - This may be an uninitialized mutex or mutexattr or something. - */ - doCheck = false; + doCheck = true; + # 'make check' uses boost and tcl + buildInputs = stdenv.lib.optionals doCheck [ boost tcl ]; meta = { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; @@ -39,7 +30,7 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; From ae6b1ce66dcef7f8571cbde6572358fcb08499ae Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 26 May 2014 22:19:22 +0200 Subject: [PATCH 049/254] Fixed link to installation instructions in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8ded8807ede9..e59b15425e96 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Nixpkgs is a collection of packages for [Nix](http://nixos.org/nix/) package manager. Nixpkgs also includes [NixOS](http://nixos.org/nixos/) linux distribution source code. -* [NixOS installation instructions](http://nixos.org/nixos/manual/#installing-nixos) +* [NixOS installation instructions](http://nixos.org/nixos/manual/#ch-installation) * [Manual (How to write packages for Nix)](http://nixos.org/nixpkgs/manual/) * [Manual (NixOS)](http://nixos.org/nixos/manual/) * [Continuous build](http://hydra.nixos.org/jobset/nixos/trunk-combined) From 12d8c020e8494eb8328c38f831df513a88325c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Wed, 14 May 2014 18:11:05 +0800 Subject: [PATCH 050/254] webkitgtk: update to 2.4.3 (close #2640) --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 8497ea9ae942..3b6ef1acd983 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "webkitgtk-2.4.0"; + name = "webkitgtk-2.4.3"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "1fyz6ysw7npy5wa7m1zg05zrj0gi0wdlpjbqix03iq4ym36pflnw"; + sha256 = "1b6fm1c5kk6vl0llalsd605raqs152hn14635kjwcb6iq7mc6qlq"; }; patches = [ ./webcore-svg-libxml-cflags.patch ]; From bd96a4bb43351067f47ac6a150ce7fcdd966463f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 22 May 2014 21:27:37 +0200 Subject: [PATCH 051/254] xorg: maintenance updates of a few modules --- pkgs/servers/x11/xorg/default.nix | 24 ++++++++++++------------ pkgs/servers/x11/xorg/old.list | 4 ++-- pkgs/servers/x11/xorg/tarballs-7.7.list | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 795fa8a60af2..7fca58f54461 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -480,11 +480,11 @@ let })) // {inherit mkfontdir mkfontscale ;}; gccmakedep = (stdenv.mkDerivation ((if overrides ? gccmakedep then overrides.gccmakedep else x: x) { - name = "gccmakedep-1.0.2"; + name = "gccmakedep-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2; - sha256 = "04dfamx3fvkvqfgs6xy2a6yqbxjrj4777ylxp38g60hhbdl4jg86"; + url = mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2; + sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -520,11 +520,11 @@ let })) // {inherit libICE xproto ;}; imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) { - name = "imake-1.0.6"; + name = "imake-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/imake-1.0.6.tar.bz2; - sha256 = "1786k6jsazpr37v2b6qlsznjjp5lgyb869hx5m4ahax7n3yq72gs"; + url = mirror://xorg/individual/util/imake-1.0.7.tar.bz2; + sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; @@ -1370,11 +1370,11 @@ let })) // {inherit ;}; xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) { - name = "xf86-input-evdev-2.8.3"; + name = "xf86-input-evdev-2.8.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.3.tar.bz2; - sha256 = "1c067h0452728s39rb1csw4r26ihdhzs4nr722z6gg9mhvb7zv02"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.4.tar.bz2; + sha256 = "030haki1h0m85h91c91812gdnk6znfamw5kpr010zxwwbsgxxyl5"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; })) // {inherit inputproto udev xorgserver xproto ;}; @@ -1410,11 +1410,11 @@ let })) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { - name = "xf86-input-synaptics-1.7.5"; + name = "xf86-input-synaptics-1.7.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.5.tar.bz2; - sha256 = "1iwiihwbqiq2lxd12ca7j3ajggjbmlk33wsfv2lyyizp3x92710z"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.6.tar.bz2; + sha256 = "0ls8f7gy92f54hdqsa19vypg0xm496jrgdhdn4qphycxwn3gwkbm"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index 7019273dd11a..19cf79ca796b 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -9,7 +9,7 @@ mirror://xorg/individual/lib/libXp-1.0.2.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2 mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2 -mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2 -mirror://xorg/individual/util/imake-1.0.6.tar.bz2 +mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 +mirror://xorg/individual/util/imake-1.0.7.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.5.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 5edff19c4315..512bbbb9eff1 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -115,11 +115,11 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.8.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.8.4.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.7.5.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.7.6.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 From 4a85312295e97725e19323d65ad3dcc0f988ebdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 22 May 2014 21:28:08 +0200 Subject: [PATCH 052/254] mesa: maintenance update 10.1.3 -> .4 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index a25079c5617e..f77dc4a3711a 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -23,7 +23,7 @@ else */ let - version = "10.1.3"; + version = "10.1.4"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -34,7 +34,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256 = "1hzcmpa7ykqm0qrvkm52bkfvf855wb9bs8449fwhypgjdqimwqdj"; + sha256 = "0g2j2zz7yq3i8k8dkji8h7iqfbcm8afb5lrb4dxrcyjl1bh6gibg"; }; prePatch = "patchShebangs ."; From 8bb7c4e766e82ac834244d2a202ae58181592821 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Mon, 26 May 2014 23:59:13 +0200 Subject: [PATCH 053/254] haskell-glutil: add version 0.7.4 --- .../libraries/haskell/GLUtil/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/GLUtil/default.nix diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix new file mode 100644 index 000000000000..507beef06632 --- /dev/null +++ b/pkgs/development/libraries/haskell/GLUtil/default.nix @@ -0,0 +1,16 @@ +{ cabal, cpphs, JuicyPixels, linear, OpenGL, OpenGLRaw, vector }: + +cabal.mkDerivation (self: { + pname = "GLUtil"; + version = "0.7.4"; + sha256 = "0l1w0k3q5g22y90w5frljqh1v4jb7gjzb3scg79zp42pc9v3h4l5"; + buildDepends = [ + cpphs JuicyPixels linear OpenGL OpenGLRaw vector + ]; + buildTools = [ cpphs ]; + meta = { + description = "Miscellaneous OpenGL utilities"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 216037e74cdf..129b96be526f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -895,6 +895,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in }; GLUT = self.GLUT_2_5_1_1; + GLUtil = callPackage ../development/libraries/haskell/GLUtil {}; + gnuidn = callPackage ../development/libraries/haskell/gnuidn {}; gnuplot = callPackage ../development/libraries/haskell/gnuplot {}; From 481f4286048ae8b38edad39441df36ec42322f4d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 May 2014 00:48:30 +0200 Subject: [PATCH 054/254] hipchat: Update to 2.2.1107 --- .../instant-messengers/hipchat/default.nix | 108 ++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 72 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index c0f76602b2bb..857f162d7e47 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,59 +1,93 @@ -{ stdenv -, fetchurl -, libtool -, libXext -, libSM -, libICE -, libX11 -, libXft -, libXau -, libXdmcp -, libXrender -, freetype -, fontconfig -, openssl -}: +{ stdenv, fetchurl, libtool, xlibs, freetype, fontconfig, openssl, glib +, mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid +, libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra, makeWrapper }: let - version = "1.94.407"; + + version = "2.2.1107"; rpath = stdenv.lib.makeSearchPath "lib" [ stdenv.glibc - stdenv.gcc.gcc libtool - libXext - libSM - libICE - libX11 - libXft - libXau - libXdmcp - libXrender + xlibs.libXext + xlibs.libSM + xlibs.libICE + xlibs.libX11 + xlibs.libXft + xlibs.libXau + xlibs.libXdmcp + xlibs.libXrender + xlibs.libXfixes + xlibs.libXcomposite + xlibs.libxcb + xlibs.libXi freetype fontconfig openssl - ]; + glib + mesa + gstreamer + gst_plugins_base + dbus + alsaLib + zlib + libuuid + libxml2 + libxslt + sqlite + libogg + libvorbis + xz + libcanberra + ] + ":${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}"; - src = fetchurl { - url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz"; - sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k"; - }; -in stdenv.mkDerivation { + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz"; + sha256 = "0lf780pxbh40m2i48cki072lrm75924cz3zgkmaxddmar3y13bwa"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz"; + sha256 = "1k33670rpigdpy9jcacryc1i05ykp5yffcplmbm5q29ng54cn0zv"; + } + else + throw "HipChat is not supported on ${stdenv.system}"; + +in + +stdenv.mkDerivation { name = "hipchat-${version}"; + inherit src; + + buildInputs = [ makeWrapper ]; + buildCommand = '' tar xf ${src} - mkdir -p $out - mv opt/HipChat/lib $out - mv opt/HipChat/bin $out + + d=$out/libexec/hipchat + mkdir -p $out/libexec + rm -rfv opt/HipChat/lib/{libstdc++*,libz*,libuuid*,libxml2*,libxslt*,libsqlite*,libogg*,libvorbis*,liblzma*,libcanberra.*,libcanberra-*} + mv opt/HipChat/lib/ $d mv usr/share $out + patchShebangs $out/bin - for file in $(find $out/lib -type f); do - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true - patchelf --set-rpath ${rpath}:$out/lib $file || true + + for file in $(find $d -type f); do + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $file || true + patchelf --set-rpath ${rpath}:\$ORIGIN $file || true done + substituteInPlace $out/share/applications/hipchat.desktop \ --replace /opt/HipChat/bin $out/bin + + makeWrapper $d/hipchat.bin $out/bin/hipchat \ + --set HIPCHAT_LD_LIBRARY_PATH '"$LD_LIBRARY_PATH"' \ + --set HIPCHAT_QT_PLUGIN_PATH '"$QT_PLUGIN_PATH"' + + mv opt/HipChat/bin/linuxbrowserlaunch $out/bin ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0b35e55d47f..fd4161190b65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8620,7 +8620,7 @@ let hexedit = callPackage ../applications/editors/hexedit { }; - hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { }; + hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; homebank = callPackage ../applications/office/homebank { }; From a0072b4d2d4233d29ba6456d20f1d87070fcfad2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 May 2014 01:00:04 +0200 Subject: [PATCH 055/254] hipchat: Fix access to /usr/share/X11/xkb HipChat (or rather its copy of Qt) expects to find keyboard data in /usr/share/X11/xkb. So use a LD_PRELOAD library to intercept and rewrite the Glibc calls that access those paths. We've been doing the same thing with packages like Spotify, but now this functionality has been abstracted into a reusable library, libredirect.so. It uses an environment variable $NIX_REDIRECTS containing a colon-separated list of path prefixes to be rewritten, e.g. "/foo=bar:/xyzzy=/fnord". --- .../instant-messengers/hipchat/default.nix | 13 ++- pkgs/build-support/libredirect/default.nix | 14 +++ pkgs/build-support/libredirect/libredirect.c | 104 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 128 insertions(+), 5 deletions(-) create mode 100644 pkgs/build-support/libredirect/default.nix create mode 100644 pkgs/build-support/libredirect/libredirect.c diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 857f162d7e47..6da12905f560 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, libtool, xlibs, freetype, fontconfig, openssl, glib , mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid -, libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra, makeWrapper }: +, libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra +, makeWrapper, libredirect, xkeyboard_config }: let @@ -67,8 +68,8 @@ stdenv.mkDerivation { buildCommand = '' tar xf ${src} - d=$out/libexec/hipchat - mkdir -p $out/libexec + mkdir -p $out/libexec/hipchat/bin + d=$out/libexec/hipchat/lib rm -rfv opt/HipChat/lib/{libstdc++*,libz*,libuuid*,libxml2*,libxslt*,libsqlite*,libogg*,libvorbis*,liblzma*,libcanberra.*,libcanberra-*} mv opt/HipChat/lib/ $d mv usr/share $out @@ -85,9 +86,11 @@ stdenv.mkDerivation { makeWrapper $d/hipchat.bin $out/bin/hipchat \ --set HIPCHAT_LD_LIBRARY_PATH '"$LD_LIBRARY_PATH"' \ - --set HIPCHAT_QT_PLUGIN_PATH '"$QT_PLUGIN_PATH"' + --set HIPCHAT_QT_PLUGIN_PATH '"$QT_PLUGIN_PATH"' \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb - mv opt/HipChat/bin/linuxbrowserlaunch $out/bin + mv opt/HipChat/bin/linuxbrowserlaunch $out/libexec/hipchat/bin/ ''; meta = { diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix new file mode 100644 index 000000000000..a8a497d46d73 --- /dev/null +++ b/pkgs/build-support/libredirect/default.nix @@ -0,0 +1,14 @@ +{ stdenv }: + +stdenv.mkDerivation { + name = "libredirect-0"; + + unpackPhase = "cp ${./libredirect.c} libredirect.c"; + + buildPhase = + '' + gcc -Wall -std=c99 -O3 -shared libredirect.c -o libredirect.so -fPIC -ldl + ''; + + installPhase = "mkdir -p $out/lib; cp libredirect.so $out/lib"; +} diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c new file mode 100644 index 000000000000..4afed3add75b --- /dev/null +++ b/pkgs/build-support/libredirect/libredirect.c @@ -0,0 +1,104 @@ +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MAX_REDIRECTS 128 + +static int nrRedirects = 0; +static char * from[MAX_REDIRECTS]; +static char * to[MAX_REDIRECTS]; + +// FIXME: might run too late. +static void init() __attribute__((constructor)); + +static void init() +{ + char * spec = getenv("NIX_REDIRECTS"); + if (!spec) return; + + unsetenv("NIX_REDIRECTS"); + + char * spec2 = malloc(strlen(spec) + 1); + strcpy(spec2, spec); + + char * pos = spec2, * eq; + while ((eq = strchr(pos, '='))) { + *eq = 0; + from[nrRedirects] = pos; + pos = eq + 1; + to[nrRedirects] = pos; + nrRedirects++; + if (nrRedirects == MAX_REDIRECTS) break; + char * end = strchr(pos, ':'); + if (!end) break; + *end = 0; + pos = end + 1; + } + +} + +static const char * rewrite(const char * path, char * buf) +{ + for (int n = 0; n < nrRedirects; ++n) { + int len = strlen(from[n]); + if (strncmp(path, from[n], len) != 0) continue; + if (snprintf(buf, PATH_MAX, "%s%s", to[n], path + len) >= PATH_MAX) + abort(); + return buf; + } + + return path; +} + +/* The following set of Glibc library functions is very incomplete - + it contains only what we needed for programs in Nixpkgs. Just add + more functions as needed. */ + +int open(const char * path, int flags, ...) +{ + int (*open_real) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open"); + mode_t mode = 0; + if (flags & O_CREAT) { + va_list ap; + va_start(ap, flags); + mode = va_arg(ap, mode_t); + va_end(ap); + } + char buf[PATH_MAX]; + return open_real(rewrite(path, buf), flags, mode); +} + +int open64(const char * path, int flags, ...) +{ + int (*open64_real) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64"); + mode_t mode = 0; + if (flags & O_CREAT) { + va_list ap; + va_start(ap, flags); + mode = va_arg(ap, mode_t); + va_end(ap); + } + char buf[PATH_MAX]; + return open64_real(rewrite(path, buf), flags, mode); +} + +FILE * fopen(const char * path, const char * mode) +{ + FILE * (*fopen_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen"); + char buf[PATH_MAX]; + return fopen_real(rewrite(path, buf), mode); +} + +int __xstat(int ver, const char * path, struct stat * st) +{ + int (*__xstat_real) (int ver, const char *, struct stat *) = dlsym(RTLD_NEXT, "__xstat"); + char buf[PATH_MAX]; + return __xstat_real(ver, rewrite(path, buf), st); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd4161190b65..f27efd104df1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -373,6 +373,8 @@ let inherit url; }; + libredirect = callPackage ../build-support/libredirect { }; + makeDesktopItem = import ../build-support/make-desktopitem { inherit stdenv; }; From 400333b9f8e695719704ad2075137d45a6b37cda Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Tue, 27 May 2014 02:24:12 -0400 Subject: [PATCH 056/254] Add haskell/monad-unify Signed-off-by: Ricky Elrod --- .../libraries/haskell/monad-unify/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/monad-unify/default.nix diff --git a/pkgs/development/libraries/haskell/monad-unify/default.nix b/pkgs/development/libraries/haskell/monad-unify/default.nix new file mode 100644 index 000000000000..7ee1f8c87040 --- /dev/null +++ b/pkgs/development/libraries/haskell/monad-unify/default.nix @@ -0,0 +1,13 @@ +{ cabal, mtl, unorderedContainers }: + +cabal.mkDerivation (self: { + pname = "monad-unify"; + version = "0.2.2"; + sha256 = "1icl4jaa4vc4lb75m6wv4vjvf8b2xx7aziqhsg2pshizdkfxmgwp"; + buildDepends = [ mtl unorderedContainers ]; + meta = { + description = "Generic first-order unification"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 216037e74cdf..11f0278c20f8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1442,6 +1442,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in monadsTf = callPackage ../development/libraries/haskell/monads-tf {}; + monadUnify = callPackage ../development/libraries/haskell/monad-unify {}; + monoidExtras = callPackage ../development/libraries/haskell/monoid-extras {}; monoidTransformer = callPackage ../development/libraries/haskell/monoid-transformer {}; From 8228ca04799ab9a6757d29faca45c16d208e125d Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Tue, 27 May 2014 02:27:25 -0400 Subject: [PATCH 057/254] Add haskell/pattern-arrows Signed-off-by: Ricky Elrod --- .../libraries/haskell/pattern-arrows/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/pattern-arrows/default.nix diff --git a/pkgs/development/libraries/haskell/pattern-arrows/default.nix b/pkgs/development/libraries/haskell/pattern-arrows/default.nix new file mode 100644 index 000000000000..a73432fe62bb --- /dev/null +++ b/pkgs/development/libraries/haskell/pattern-arrows/default.nix @@ -0,0 +1,14 @@ +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "pattern-arrows"; + version = "0.0.2"; + sha256 = "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg"; + buildDepends = [ mtl ]; + meta = { + homepage = "http://blog.functorial.com/posts/2013-10-27-Pretty-Printing-Arrows.html"; + description = "Arrows for Pretty Printing"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 11f0278c20f8..ff22b7a9f25f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1627,6 +1627,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pathtype = callPackage ../development/libraries/haskell/pathtype {}; + patternArrows = callPackage ../development/libraries/haskell/pattern-arrows {}; + pbkdf = callPackage ../development/libraries/haskell/pbkdf {}; pcap = callPackage ../development/libraries/haskell/pcap {}; From 03b54bcd5575237f86e92a58c5fd970fcda6ff39 Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Tue, 27 May 2014 03:07:05 -0400 Subject: [PATCH 058/254] Add haskell/purescript :D Signed-off-by: Ricky Elrod --- .../libraries/haskell/purescript/default.nix | 24 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/haskell/purescript/default.nix diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix new file mode 100644 index 000000000000..bbf380f3e73c --- /dev/null +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -0,0 +1,24 @@ +{ cabal, cmdtheline, filepath, haskeline, monadUnify, mtl, parsec +, patternArrows, time, transformers, unorderedContainers +, utf8String, xdgBasedir +}: + +cabal.mkDerivation (self: { + pname = "purescript"; + version = "0.5.2.1"; + sha256 = "1dr34capgjlyjsaghsv11zz6ph5l0y8dz0q398f0f3hplcal3f58"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + cmdtheline filepath haskeline monadUnify mtl parsec patternArrows + time transformers unorderedContainers utf8String xdgBasedir + ]; + # The example don't seem to get packaged in the release. + doCheck = false; + meta = { + homepage = "http://www.purescript.org/"; + description = "PureScript Programming Language Compiler"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ff22b7a9f25f..a5a94e5a101d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1752,6 +1752,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pureMD5 = callPackage ../development/libraries/haskell/pureMD5 {}; + purescript = callPackage ../development/libraries/haskell/purescript {}; + pwstoreFast = callPackage ../development/libraries/haskell/pwstore-fast {}; QuickCheck_1_2_0_0 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.0.nix {}; From c05f252dac1a8f6635a9d96074fba018694ed179 Mon Sep 17 00:00:00 2001 From: Chris Double Date: Tue, 27 May 2014 14:28:09 +1200 Subject: [PATCH 059/254] Definitions for Open Dylan 2013.2 (Dylan Language Implementation) --- pkgs/development/compilers/opendylan/bin.nix | 41 +++++++++++++++++++ .../compilers/opendylan/default.nix | 37 +++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 3 files changed, 84 insertions(+) create mode 100644 pkgs/development/compilers/opendylan/bin.nix create mode 100644 pkgs/development/compilers/opendylan/default.nix diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix new file mode 100644 index 000000000000..bab8e66799b7 --- /dev/null +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -0,0 +1,41 @@ +# Binaries provided by Open Dylan to be used to bootstrap from source. +# The binaries can also be used as is. +{stdenv, fetchurl, patchelf, boehmgc, gnused, gcc, makeWrapper}: + +stdenv.mkDerivation { + name = "opendylan-2013.2"; + + src = if stdenv.system == "x86_64-linux" then fetchurl { + url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2; + sha256 = "035brbw3hm7zrs593q4zc42yglj1gmmkw3b1r7zzlw3ks4i2lg7h"; + } + else if stdenv.system == "i686-linux" then fetchurl { + url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2; + sha256 = "0c61ihvblcsjrw6ncr8x8ylhskcrqs8pajs4mg5di36cvqw12nq5"; + } + else throw "platform ${stdenv.system} not supported."; + + buildInputs = [ patchelf boehmgc gnused makeWrapper ]; + + buildCommand = '' + mkdir -p "$out" + tar --strip-components=1 -xjf "$src" -C "$out" + + interpreter="$(cat "$NIX_GCC"/nix-support/dynamic-linker)" + for a in "$out"/bin/*; do + patchelf --set-interpreter "$interpreter" "$a" + patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a" + done + for a in "$out"/lib/*.so; do + patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a" + done + sed -i -e "s|\-lgc|\-L${boehmgc}\/lib -lgc|" $out/lib/config.jam + wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin + ''; + + meta = { + homepage = http://opendylan.org; + description = "Dylan is a multi-paradigm functional and object-oriented programming language."; + license = "MIT"; + }; +} diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix new file mode 100644 index 000000000000..b1ee1d000c4c --- /dev/null +++ b/pkgs/development/compilers/opendylan/default.nix @@ -0,0 +1,37 @@ +# Build Open Dylan from source using the binary builds to bootstrap. +{stdenv, fetchgit, patchelf, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: + +stdenv.mkDerivation { + name = "opendylan-2013.2"; + + src = fetchgit { + url = https://github.com/dylan-lang/opendylan; + rev = "ce9b14dab6cb9ffedc69fae8c6df524c0c79abd3"; + sha256 = "cec80980b838ac2581dfb6282e25d208e720d475256b75e24b23dbd30b09d21f"; + fetchSubmodules = true; + }; + + buildInputs = (if stdenv.system == "i686-linux" then [ mps ] else [ boehmgc ]) ++ [ + opendylan-bootstrap boehmgc gnused autoconf automake perl makeWrapper + ] ; + + preConfigure = if stdenv.system == "i686-linux" then '' + mkdir -p $TMPDIR/mps + tar --strip-components=1 -xf ${mps.src} -C $TMPDIR/mps + ./autogen.sh + '' + else '' + ./autogen.sh + ''; + + configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc}"; + buildPhase = "make 3-stage-bootstrap"; + + postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin"; + + meta = { + homepage = http://opendylan.org; + description = "Dylan is a multi-paradigm functional and object-oriented programming language."; + license = "MIT"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f27efd104df1..33e5987a6839 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1661,6 +1661,12 @@ let opendkim = callPackage ../development/libraries/opendkim { }; + opendylan = callPackage ../development/compilers/opendylan { + opendylan-bootstrap = opendylan_bin; + }; + + opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; + openjade = callPackage ../tools/text/sgml/openjade { perl = perl510; }; From cfb788471927676e102ed8188e4f03d92274d2d3 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 27 May 2014 09:13:07 +0000 Subject: [PATCH 060/254] Add expression for the YUI compressor --- .../tools/yuicompressor/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/yuicompressor/default.nix diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix new file mode 100644 index 000000000000..5dcc30811e22 --- /dev/null +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "yuicompressor"; + version = "2.4.8"; + src = fetchurl { + url = "http://github.com/yui/yuicompressor/releases/download/v${version}/${name}-${version}.jar"; + sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh"; + }; + + meta = { + description = "A JavaScript and CSS minifier"; + maintainers = [ stdenv.lib.maintainers.jwiegley ]; + platforms = stdenv.lib.platforms.all; + homepage = http://yui.github.io/yuicompressor/; + license = stdenv.lib.licenses.bsd3; + }; + + buildCommand = '' + ensureDir $out/lib + ln -s $src $out/lib/yuicompressor.jar + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6e33a39646d..2b917893d1bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6315,6 +6315,7 @@ let jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { }; + yuicompressor = callPackage ../development/tools/yuicompressor { }; ### DEVELOPMENT / LISP MODULES From d32593a222c4bd589067840d87eaac1da3e610b1 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Tue, 27 May 2014 11:18:02 +0200 Subject: [PATCH 061/254] tibia: 10.41 Also I'm personally done with this game so I will no longer maintain the package. --- pkgs/games/tibia/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index a980aa53f5f9..698653784a7e 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; assert stdenv.isi686; stdenv.mkDerivation { - name = "tibia-10.40"; + name = "tibia-10.41"; src = fetchurl { - url = http://static.tibia.com/download/tibia1040.tgz; - sha256 = "1d6wibwr84cnglnc0c9d6m3nynbg2zwgnxpyy9ykqiiwsz8qgzyg"; + url = http://static.tibia.com/download/tibia1041.tgz; + sha256 = "1hmqn9c6qaa79ldcnl4ws9dm6rd3ymy48fw254pl6g601amn7b8v"; }; shell = stdenv.shell; @@ -52,7 +52,6 @@ stdenv.mkDerivation { description = "Top-down MMORPG set in a fantasy world"; homepage = "http://tibia.com"; license = "unfree"; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; platforms = ["i686-linux"]; }; } From e13d6d36aead1e820d780be4b7732fa0e7e4a3d8 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Tue, 27 May 2014 11:13:47 +0200 Subject: [PATCH 062/254] pythonPackages.pyramid_tm: set doCheck to false --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f0c07bd82db..234a0b396a08 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2189,11 +2189,15 @@ rec { md5 = "6dc917d262c69366630c542bd21859a3"; }; + # tests are failing in version 0.7 but are fixed in trunk + doCheck = false; + propagatedBuildInputs = [ transaction pyramid ]; meta = { maintainers = [ stdenv.lib.maintainers.garbas stdenv.lib.maintainers.iElectric + stdenv.lib.maintainers.matejc ]; platforms = stdenv.lib.platforms.all; }; From 057213902078ccaaf93480a50ab5e1b8bb22b31f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 27 May 2014 10:53:51 +0000 Subject: [PATCH 063/254] Correct the source URL for dovecot-pigeonhole --- pkgs/servers/mail/dovecot-pigeonhole/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mail/dovecot-pigeonhole/default.nix b/pkgs/servers/mail/dovecot-pigeonhole/default.nix index bf56d7b9bfd5..3ee73520d7ad 100644 --- a/pkgs/servers/mail/dovecot-pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot-pigeonhole/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.4.3"; src = fetchurl { - url = "http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz"; + url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz"; sha256 = "0mypnkc980s3kd1bmy4f93dliwg6n8jfsac8r51jrpvv0ymz94nn"; }; From 155de0279e78d04ae6dc6885ae85879bf4aa85da Mon Sep 17 00:00:00 2001 From: Matthew Brown Date: Tue, 27 May 2014 11:50:30 +0100 Subject: [PATCH 064/254] Added goaccess package --- pkgs/tools/misc/goaccess/default.nix | 34 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/goaccess/default.nix diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix new file mode 100644 index 000000000000..56e18227d661 --- /dev/null +++ b/pkgs/tools/misc/goaccess/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pkgconfig, geoip, ncurses, glib }: + +let + version = "0.8"; + mainSrc = fetchurl { + url = "http://tar.goaccess.prosoftcorp.com/goaccess-${version}.tar.gz"; + sha256 = "a61215b1f3e82bdb50c892e843f1a85d6d85f882915d694a5672911fab955eea"; + }; +in + +stdenv.mkDerivation rec { + name = "goaccess-${version}"; + src = mainSrc; + + configureFlags = [ + "--enable-geoip" + "--enable-utf8" + ]; + + buildInputs = [ + pkgconfig + geoip + ncurses + glib + ]; + + meta = { + description = "GoAccess is an open source real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems."; + homepage = http://goaccess.prosoftcorp.com; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ ederoyd46 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5484005f4d7..47f4353cf91d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1150,6 +1150,8 @@ let gnuvd = callPackage ../tools/misc/gnuvd { }; + goaccess = callPackage ../tools/misc/goaccess { }; + googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; gource = callPackage ../applications/version-management/gource {}; From c1bbfbc13e3f6746c726ce2fe24fe2c3c2b426d4 Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Tue, 27 May 2014 07:11:34 -0400 Subject: [PATCH 065/254] add screenfetch Signed-off-by: Ricky Elrod --- pkgs/tools/misc/screenfetch/default.nix | 38 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/misc/screenfetch/default.nix diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix new file mode 100644 index 000000000000..0ebc712fcf0d --- /dev/null +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit, xdpyinfo, xprop }: + +let + version = "2014-05-27"; +in +stdenv.mkDerivation { + name = "screenFetch-${version}"; + pname = "screenfetch"; + + src = fetchgit { + url = git://github.com/KittyKatt/screenFetch.git; + rev = "69c46cb94b5765dbcb36905c5a35c42eb8e6e470"; + sha256 = "0479na831120bpyrg5nb3nb1jr8p8ahkixk1znwg730q3vdcjd6j"; + }; + + installPhase = '' + install -Dm 0755 $pname-dev $out/bin/$pname + install -Dm 0644 $pname.1 $out/man/man1/$pname.1 + ''; + + meta = { + description = "Fetches system/theme information in terminal for Linux desktop screenshots."; + longDescription = '' + screenFetch is a "Bash Screenshot Information Tool". This handy Bash + script can be used to generate one of those nifty terminal theme + information + ASCII distribution logos you see in everyone's screenshots + nowadays. It will auto-detect your distribution and display an ASCII + version of that distribution's logo and some valuable information to the + right. There are options to specify no ascii art, colors, taking a + screenshot upon displaying info, and even customizing the screenshot + command! This script is very easy to add to and can easily be extended. + ''; + license = stdenv.lib.licenses.gpl3; + homepage = http://git.silverirc.com/cgit.cgi/screenfetch-dev.git/; + maintainers = with stdenv.lib.maintainers; [relrod]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f27efd104df1..67b86165bd1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1976,6 +1976,8 @@ let seqdiag = pythonPackages.seqdiag; + screenfetch = callPackage ../tools/misc/screenfetch { }; + sg3_utils = callPackage ../tools/system/sg3_utils { }; sharutils = callPackage ../tools/archivers/sharutils { }; From 31bc96eee7a74ba80fac670372af9a30ed73d5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 27 May 2014 16:54:26 +0200 Subject: [PATCH 066/254] Updating syncthing to 0.8.11. --- .../networking/syncthing/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 72a4a55069af..12aa98758ad6 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "syncthing-${version}"; - version = "0.8.5"; + version = "0.8.11"; src = fetchgit { url = "git://github.com/calmh/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "0525fvar5c22sxg7737ajny80srds1adhi73a8yr12wsjnsqfi6x"; + sha256 = "16dl9sqwhv0n1602pmi10d5j7z2196ijhvz4rfx7732210qbkpnn"; }; buildInputs = [ go ]; @@ -15,17 +15,10 @@ stdenv.mkDerivation rec { buildPhase = '' mkdir -p "./dependencies/src/github.com/calmh/syncthing" - cp -r "./auto" "./dependencies/src/github.com/calmh/syncthing" - cp -r "./buffers" "./dependencies/src/github.com/calmh/syncthing" - cp -r "./cid" "./dependencies/src/github.com/calmh/syncthing" - cp -r "./discover" "./dependencies/src/github.com/calmh/syncthing" - cp -r "./files" "./dependencies/src/github.com/calmh/syncthing" - cp -r "./lamport" "./dependencies/src/github.com/calmh/syncthing" - cp -r "./protocol" "./dependencies/src/github.com/calmh/syncthing" - cp -r "./scanner" "./dependencies/src/github.com/calmh/syncthing" - cp -r "./mc" "./dependencies/src/github.com/calmh/syncthing" - cp -r "./xdr" "./dependencies/src/github.com/calmh/syncthing" - cp -r "./upnp" "./dependencies/src/github.com/calmh/syncthing" + for a in auto buffers cid discover files lamport protocol scanner \ + logger beacon config xdr upnp model osutil versioner; do + cp -r "./$a" "./dependencies/src/github.com/calmh/syncthing" + done export GOPATH="`pwd`/Godeps/_workspace:`pwd`/dependencies" From 4c792e58aafc39ca2c419ab2fcbb3d42223e5928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 27 May 2014 16:54:58 +0200 Subject: [PATCH 067/254] ncmpc: another attempt to fix linkage on darwin --- pkgs/applications/audio/ncmpc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index f690b914abe0..3b1b3154eda1 100755 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib ncurses mpd_clientlib ] ++ libintlOrEmpty; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; homepage = http://www.musicpd.org/clients/ncmpc/; From 4fa451887550588674025822c7d94787fad8da20 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Sat, 29 Mar 2014 11:40:30 +1100 Subject: [PATCH 068/254] Add TeamSpeak 3 server & service module (close #2056) Conflicts (trivial): lib/maintainers.nix nixos/modules/misc/ids.nix --- lib/maintainers.nix | 1 + nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../services/networking/teamspeak3.nix | 142 ++++++++++++++++++ .../instant-messengers/teamspeak/server.nix | 99 ++++++++++++ pkgs/top-level/all-packages.nix | 1 + 6 files changed, 246 insertions(+) create mode 100644 nixos/modules/services/networking/teamspeak3.nix create mode 100644 pkgs/applications/networking/instant-messengers/teamspeak/server.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 80d0bed23dce..109e7956a583 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -14,6 +14,7 @@ AndersonTorres = "Anderson Torres "; andres = "Andres Loeh "; antono = "Antono Vasiljev "; + arobyn = "Alexei Robyn "; astsmtl = "Alexander Tsamutali "; aszlig = "aszlig "; bbenoist = "Baptist BENOIST "; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 207da2a39bfe..13ec502047db 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -131,6 +131,7 @@ starbound = 120; hydra = 122; spiped = 123; + teamspeak = 124; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -236,6 +237,7 @@ grsecurity = 121; hydra = 122; spiped = 123; + teamspeak = 124; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index def4d10f3661..0737da71923d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -222,6 +222,7 @@ ./services/networking/syncthing.nix ./services/networking/ssh/lshd.nix ./services/networking/ssh/sshd.nix + ./services/networking/teamspeak3.nix ./services/networking/tftpd.nix ./services/networking/unbound.nix ./services/networking/vsftpd.nix diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix new file mode 100644 index 000000000000..2d3478d52f83 --- /dev/null +++ b/nixos/modules/services/networking/teamspeak3.nix @@ -0,0 +1,142 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + ts3 = pkgs.teamspeak_server; + cfg = config.services.teamspeak3; + user = "teamspeak"; + group = "teamspeak"; +in + +{ + + ###### interface + + options = { + + services.teamspeak3 = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run the Teamspeak3 voice communication server daemon. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/teamspeak3-server"; + description = '' + Directory to store TS3 database and other state/data files. + ''; + }; + + logPath = mkOption { + type = types.path; + default = "/var/log/teamspeak3-server/"; + description = '' + Directory to store log files in. + ''; + }; + + voiceIP = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + IP on which the server instance will listen for incoming voice connections. Defaults to any IP. + ''; + }; + + defaultVoicePort = mkOption { + type = types.int; + default = 9987; + description = '' + Default UDP port for clients to connect to virtual servers - used for first virtual server, subsequent ones will open on incrementing port numbers by default. + ''; + }; + + fileTransferIP = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + IP on which the server instance will listen for incoming file transfer connections. Defaults to any IP. + ''; + }; + + fileTransferPort = mkOption { + type = types.int; + default = 30033; + description = '' + TCP port opened for file transfers. + ''; + }; + + queryIP = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + IP on which the server instance will listen for incoming ServerQuery connections. Defaults to any IP. + ''; + }; + + queryPort = mkOption { + type = types.int; + default = 10011; + description = '' + TCP port opened for ServerQuery connections. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + users.extraUsers.teamspeak = + { name = "teamspeak"; + description = "Teamspeak3 voice communication server daemon"; + group = group; + uid = config.ids.uids.teamspeak; + }; + + users.extraGroups.teamspeak = + { name = "teamspeak"; + gid = config.ids.gids.teamspeak; + }; + + systemd.services.teamspeak3-server = { + description = "Teamspeak3 voice communication server daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + preStart = '' + mkdir -p ${cfg.dataDir} + mkdir -p ${cfg.logPath} + chown ${user}:${group} ${cfg.dataDir} + chown ${user}:${group} ${cfg.logPath} + ''; + + serviceConfig = + { ExecStart = '' + ${ts3}/bin/ts3server \ + dbsqlpath=${ts3}/lib/teamspeak/sql/ logpath=${cfg.logPath} \ + voice_ip=${cfg.voiceIP} default_voice_port=${toString cfg.defaultVoicePort} \ + filetransfer_ip=${cfg.fileTransferIP} filetransfer_port=${toString cfg.fileTransferPort} \ + query_ip=${cfg.queryIP} query_port=${toString cfg.queryPort} + ''; + WorkingDirectory = cfg.dataDir; + User = user; + Group = group; + PermissionsStartOnly = true; # preStart needs to run with root permissions + }; + }; + + }; + +} diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix new file mode 100644 index 000000000000..7a57cb8ad62c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -0,0 +1,99 @@ +{ stdenv, fetchurl, makeWrapper }: + +let + + version = "3.0.10.3"; + + arch = if stdenv.is64bit then "amd64" else "x86"; + + libDir = if stdenv.is64bit then "lib64" else "lib"; +in + +stdenv.mkDerivation { + name = "teamspeak-server-${version}"; + + src = fetchurl { + urls = [ + "http://dl.4players.de/ts/releases/${version}/teamspeak3-server_linux-${arch}-${version}.tar.gz" + "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux-${arch}-${version}.tar.gz" + ]; + sha256 = if stdenv.is64bit + then "9606dd5c0c3677881b1aab833cb99f4f12ba08cc77ef4a97e9e282d9e10b0702" + else "8b8921e0df04bf74068a51ae06d744f25d759a8c267864ceaf7633eb3f81dbe5"; + }; + + buildInputs = [ makeWrapper ]; + + buildPhase = + '' + mv ts3server_linux_${arch} ts3server + echo "patching ts3server" + patchelf \ + --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $(cat $NIX_GCC/nix-support/orig-gcc)/${libDir} \ + --force-rpath \ + ts3server + ''; + + installPhase = + '' + # Delete unecessary libraries - these are provided by nixos. + #rm *.so* + + # Install files. + mkdir -p $out/lib/teamspeak + mv * $out/lib/teamspeak/ + + # Make a symlink to the binary from bin. + mkdir -p $out/bin/ + ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server + + wrapProgram $out/lib/teamspeak/ts3server --prefix LD_LIBRARY_PATH : $out/lib/teamspeak + ''; + + dontStrip = true; + dontPatchELF = true; + + meta = { + description = "TeamSpeak voice communication server"; + homepage = http://teamspeak.com/; + license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.arobyn ]; + }; +} + +/* +License issues: +Date: Mon, 10 Dec 2007 19:55:16 -0500 +From: TeamSpeak Sales +To: 'Marc Weber' +Subject: RE: teamspeak on nix? + +Yes, that would be fine. As long as you are not renting servers or selling +TeamSpeak then you are more than welcome to distribute it. + +Thank you, + +TeamSpeak Sales Team +________________________________ +e-Mail: sales@tritoncia.com +TeamSpeak: http://www.TeamSpeak.com +Account Login: https://sales.TritonCIA.com/users + + + +-----Original Message----- +From: Marc Weber [mailto:marco-oweber@gmx.de] +Sent: Monday, December 10, 2007 5:03 PM +To: sales@tritoncia.com +Subject: teamspeak on nix? + +Hello, + +nix is very young software distribution system (http://nix.cs.uu.nl/) +I'd like to ask wether you permit us to add teamspeak (server/ client?) + +Sincerly +Marc Weber (small nix contributor) +*/ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45afaec8e34b..d1c66f42a878 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9421,6 +9421,7 @@ let }; teamspeak_client = callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; + teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; taskjuggler = callPackage ../applications/misc/taskjuggler { }; From 23fb83b37ddc6a3cdfe3af50ad358cf040fea266 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 27 May 2014 12:53:26 -0500 Subject: [PATCH 069/254] Correctly locate Haddocks in hoogle-local expression On some versions of GHC, documentation is at, for example: LIB/share/doc/ In others, it is at: LIB/share/doc/x86_64-darwin-ghc7.6.3/ This change will pick up documentation first from the second location, then from the first. --- pkgs/development/libraries/haskell/hoogle/local.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix index 20816d3b2f91..337cd4c8154a 100644 --- a/pkgs/development/libraries/haskell/hoogle/local.nix +++ b/pkgs/development/libraries/haskell/hoogle/local.nix @@ -73,7 +73,8 @@ cabal.mkDerivation (self: rec { for i in $docPackages; do import_dbs $i/share/doc - ln -sf $i/share/doc/* $out/share/hoogle/doc + ln -sf $i/share/doc/*-ghc-*/* $out/share/hoogle/doc 2> /dev/null \ + || ln -sf $i/share/doc/* $out/share/hoogle/doc done import_dbs ${self.ghc}/share/doc/ghc*/html/libraries From 93936fdf8af22e243b367ce616e1efd8ccc76d3a Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 27 May 2014 12:57:50 -0500 Subject: [PATCH 070/254] Add expression for building crafty and craftyFull --- pkgs/games/crafty/default.nix | 665 ++++++++++++++++++++++++++++++++ pkgs/games/crafty/malloc.patch | 11 + pkgs/games/crafty/strcpy.patch | 21 + pkgs/top-level/all-packages.nix | 3 + 4 files changed, 700 insertions(+) create mode 100644 pkgs/games/crafty/default.nix create mode 100644 pkgs/games/crafty/malloc.patch create mode 100644 pkgs/games/crafty/strcpy.patch diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix new file mode 100644 index 000000000000..65cdd14539bd --- /dev/null +++ b/pkgs/games/crafty/default.nix @@ -0,0 +1,665 @@ +{ stdenv, fetchurl, unzip, fullVariant }: + +stdenv.mkDerivation rec { + name = "crafty-23.4"; + + src = fetchurl { + url = http://www.craftychess.com/crafty-23.4.zip; + sha256 = "0rhf4pfxcwj8hqd7bqj98fpdd80v6ss1jnc9kgwx2fw4ksdi37pl"; + }; + + bookBin = fetchurl { + url = http://www.craftychess.com/book.bin; + sha256 = "1j8f33iks4xf19bpv2mpvxrnlm5w1f5fbnxcrxasg9p7w600wyb8"; + }; + + startPgn = fetchurl { + url = http://www.cis.uab.edu/hyatt/crafty/pgn/start.pgn; + sha256 = "08c066acqwgr19jkaizdbzdpcm3ld5nsixv5wp9pnc37b8w9f0vm"; + }; + + enormousPgn = stdenv.lib.optionalString fullVariant (fetchurl { + url = http://www.cis.uab.edu/hyatt/crafty/pgn/enormous.zip; + sha256 = "001574gz3881xfvhlc2wy6pg66c4sh0q2ms42swwvq0l80syz6y2"; + }); + + tableBases345 = + let root = http://www.cis.uab.edu/hyatt/crafty/TB/3-4-5/; + in stdenv.lib.optionals fullVariant (map fetchurl [ + { url = root + "kbbbk.nbb.emd"; + sha256 = "1yssskq32x22ki67ja7azvlglz0vgq6d6awdz4avj1k72nbcs90g"; } + { url = root + "kbbbk.nbw.emd"; + sha256 = "0n0hy09pnp0ldxkrvs1gz1ch7px0hzj1ni7iicfy7y9zhsqaky2r"; } + { url = root + "kbbk.nbb.emd"; + sha256 = "1gyd2p546rapisbzjpqm1kbdlsj77yw46lr5wx28sng11wkz8xnk"; } + { url = root + "kbbk.nbw.emd"; + sha256 = "1gvl0vw9k22wkas8mzdik2ynnykgiisp8smyf97i0v7h1y7bxsx5"; } + { url = root + "kbbkb.nbb.emd"; + sha256 = "0zk12q2d3xfbj7zv9jkk0p1gzj7n640jynx7nkcfhmpz9qvjz5d1"; } + { url = root + "kbbkb.nbw.emd"; + sha256 = "1kw68pbs12cjf0gg40j5b694zdyffprjblf56czgyj8xpfz219x9"; } + { url = root + "kbbkn.nbb.emd"; + sha256 = "0gibrw89zlz93sdi8bkhy0pkfcgl4sswbm3vg6fgp752cwsvksiv"; } + { url = root + "kbbkn.nbw.emd"; + sha256 = "0v781yid5g57y3raw5pqhr2cb8zm0rscim0zszypp4piz22pb60h"; } + { url = root + "kbbkp.nbb.emd"; + sha256 = "1y2nxqqd7fhk7x2fc3dxidqlcrgcbwd9gkk4bggay3xds9m5nhrg"; } + { url = root + "kbbkp.nbw.emd"; + sha256 = "0py5adrciqbs0cdwh1lz5q8ldkyvqbc7rx4995k6kvlq4nh95qam"; } + { url = root + "kbbkq.nbb.emd"; + sha256 = "141jkx0ifb91b5nwps4xssvvcm1fny8ng1zxqsjb1n9dgsigsna7"; } + { url = root + "kbbkq.nbw.emd"; + sha256 = "0iknfd1rjm4ar4gycg0yzw5dbf7hs3y1fnb3s9abypk8pkn8ga9d"; } + { url = root + "kbbkr.nbb.emd"; + sha256 = "0jpp1f0rgglrn7gc36v7y38rivwl68s6gr2p15lqdvngismmyp13"; } + { url = root + "kbbkr.nbw.emd"; + sha256 = "0gqs5bxg6kv4nw0sl0drfs9p043q10ic6d9il0rlvs6qds6d9bv0"; } + { url = root + "kbbnk.nbb.emd"; + sha256 = "0x7q6clkhfv3scqyyj42b8r7jkd99v396pmih2f10a4scca3glxc"; } + { url = root + "kbbnk.nbw.emd"; + sha256 = "1qry3mpl1rjsjasayfxhh6abnm7arfdljnz9q2n5v769kaqx1bx3"; } + { url = root + "kbbpk.nbb.emd"; + sha256 = "1y2vx6i351nbfrbg5qkjyp9ys8vkb45i5101gz8fx1w3pkxq9312"; } + { url = root + "kbbpk.nbw.emd"; + sha256 = "16jkjb1ljyck5k4mr3pwxasxb1l08h7mcc0iigjlgzrnvsc38nrb"; } + { url = root + "kbk.nbb.emd"; + sha256 = "162jy1dm8h35p5yxz9ii5y3bwspgf1xy4m0hhdxzqm3an8f2i7nr"; } + { url = root + "kbk.nbw.emd"; + sha256 = "1lks1fccaikrc455cadkw1h1012jk6nqfmqzi40ilmlckc3i7pnj"; } + { url = root + "kbkb.nbb.emd"; + sha256 = "1hvkp65jp5jd3j7rp9wivrfcwgr42kd4kbj9n2sk68nqbdw5j4h1"; } + { url = root + "kbkb.nbw.emd"; + sha256 = "1hvkp65jp5jd3j7rp9wivrfcwgr42kd4kbj9n2sk68nqbdw5j4h1"; } + { url = root + "kbkn.nbb.emd"; + sha256 = "1cwzqb64q7br94pc1wbp86k4fpcii14wcsj3f7l5n9mmgrzk3y9k"; } + { url = root + "kbkn.nbw.emd"; + sha256 = "17wnagdkc25d6daqa3cmr0923k4d98jjzpw1h4g70r19zrnczjn5"; } + { url = root + "kbkp.nbb.emd"; + sha256 = "05mcmbwwrp4iljlw0ba7d6vgh0w1pl5a1vsmvsg56k4npx6npc95"; } + { url = root + "kbkp.nbw.emd"; + sha256 = "1jsh96mrhshj07x9sv3prl4zzhpl2xmdr6znxshyr461481b6g7m"; } + { url = root + "kbnk.nbb.emd"; + sha256 = "0k6bn47hdj36szqcbh66wcbv3ygxv6cm0zj36rl9n1c7rc9j7p4g"; } + { url = root + "kbnk.nbw.emd"; + sha256 = "0rhkzsw9zw36zckjic6dd95psx90fr4d8rzbhkqskh8l945cyxky"; } + { url = root + "kbnkb.nbb.emd"; + sha256 = "10mblq1n0m0ipfs4zdnnay6dmwafshb8l5mynfrn5wiaf26jysvz"; } + { url = root + "kbnkb.nbw.emd"; + sha256 = "0h90b4a6m7pp0qfc1anm30ffqwmaj3h1zslsbivw4k8i0jnpfqax"; } + { url = root + "kbnkn.nbb.emd"; + sha256 = "009rw6czd9zagly7nz43rd9vq60h57mfrlzx02cchn1ydsr6cnj2"; } + { url = root + "kbnkn.nbw.emd"; + sha256 = "03harm479g91s2lb5ixk27n50kj15qjz8784nn1rmmcicisj4z7c"; } + { url = root + "kbnkp.nbb.emd"; + sha256 = "0y737si4zrf8ac9jmn9sbwylcd1yvcxn5ihn128p2kan3956fpdv"; } + { url = root + "kbnkp.nbw.emd"; + sha256 = "1902fn3pwrslxi4rv8lrahwq3hakz9kfq70b8c0hqshf44h06ggi"; } + { url = root + "kbnkq.nbb.emd"; + sha256 = "112chi9pw5fqrpv4q4a9p8jc5zld8wkiwd9y71rky09z7zng4vy5"; } + { url = root + "kbnkq.nbw.emd"; + sha256 = "1m1pdsq9zl9g2fs2gjp76za3qmdrv0k1ngxvz3cjyh3p08lixca0"; } + { url = root + "kbnkr.nbb.emd"; + sha256 = "13nkcvcn70g3q5fgrhbc8qs0i0fl7k78m5pxdgmijbkax52kpfgl"; } + { url = root + "kbnkr.nbw.emd"; + sha256 = "0kjplgzbza4wp8aqf7b4k9nqg0vzdj0q6nj90sg7ssiw2w95z1jz"; } + { url = root + "kbnnk.nbb.emd"; + sha256 = "1v3a5fi2fnh9mr9j59dv8jw2inx55jsfg9ypn92dgdmmlwg688yr"; } + { url = root + "kbnnk.nbw.emd"; + sha256 = "096l2zpi7ywrqsapkz47pcivkh2igsdmxb8szd9gq8ylylrsma37"; } + { url = root + "kbnpk.nbb.emd"; + sha256 = "1011x2w59fjn89nd8yqhvjcxdwla4chifwvx3hml2g82rfqgmw5r"; } + { url = root + "kbnpk.nbw.emd"; + sha256 = "1nvqwv6akdr5acs9cdcf1zircw351fmf433niyc7blzqa0nng7n1"; } + { url = root + "kbpk.nbb.emd"; + sha256 = "1bbyr59kapp6f2r4mn1b79668b6gf1j0pwh6f3fcym7xms7gg28k"; } + { url = root + "kbpk.nbw.emd"; + sha256 = "0bn70m7g225mpbs1s7vpw5swd12wwziryp25sv2z5xpg03y7zm10"; } + { url = root + "kbpkb.nbb.emd"; + sha256 = "0clwycpzqklasqw5igk74sm9w6wqwx6h8dbqajpccq3l6ipf2ylx"; } + { url = root + "kbpkb.nbw.emd"; + sha256 = "0w7sf6q3m2hn9ix7lyg1c8casz3qxnzqvfvsbsda46xx5chrp7wh"; } + { url = root + "kbpkn.nbb.emd"; + sha256 = "052fi7b56qq46pc4hvr5wpxkr0gv7wq0cnp5550qbr7an446nbri"; } + { url = root + "kbpkn.nbw.emd"; + sha256 = "1lbwj845qff7y51iw4fybqvpcbh9r5jlfphmhidzdkjhd2gflb0j"; } + { url = root + "kbpkp.nbb.emd"; + sha256 = "1ybzqw8fjqal6n6isy2m9rhhykd8g81slvc5m55ccald63zalk43"; } + { url = root + "kbpkp.nbw.emd"; + sha256 = "139dm4709pvzxn6aixfsbv88ly0cjn6dk7khr1sjf2x17c21mj69"; } + { url = root + "kbpkq.nbb.emd"; + sha256 = "0640xw9hasgif9cxyskpp397dzvhwnpkcfyn33d4vbi4r0cbdv81"; } + { url = root + "kbpkq.nbw.emd"; + sha256 = "13yhn55y65pl6bh67hlfjlwj3mm4w6gy1y34qypgc7kck0rrygn6"; } + { url = root + "kbpkr.nbb.emd"; + sha256 = "03avk4igjdyh6ayh3xm0ds8agmqhagyxmv3s8g8830qk3a6frkz3"; } + { url = root + "kbpkr.nbw.emd"; + sha256 = "0vqkywgxkys0dxnx0sv35kzx9fxhqzbnk4qskjzd1fw9ck21pnad"; } + { url = root + "kbppk.nbb.emd"; + sha256 = "0i4zgsp7izp789chl1vlp93dy567schz96my19vgki1y3ifx4wkz"; } + { url = root + "kbppk.nbw.emd"; + sha256 = "0ki9a0f5cp7ma9zrabjrz5alk6d3xihl388j1h9ii4g52g1zci3v"; } + { url = root + "knk.nbb.emd"; + sha256 = "162jy1dm8h35p5yxz9ii5y3bwspgf1xy4m0hhdxzqm3an8f2i7nr"; } + { url = root + "knk.nbw.emd"; + sha256 = "0irmycxkah9j5qf9inmrz6cvjv8i894vzg5378qmazkpgpmzvix8"; } + { url = root + "knkn.nbb.emd"; + sha256 = "0gwxp4q8wk9vsw4zprh3psrjdxkr3rjx0q3k3iqlf9y3rb6yy0hv"; } + { url = root + "knkn.nbw.emd"; + sha256 = "0gwxp4q8wk9vsw4zprh3psrjdxkr3rjx0q3k3iqlf9y3rb6yy0hv"; } + { url = root + "knkp.nbb.emd"; + sha256 = "1cfav9xgsmvs44j4irw1mx04phszlasz96i26ik8lw8wjdl8x6vx"; } + { url = root + "knkp.nbw.emd"; + sha256 = "0p560zfmixmcizy60f13lz5a3yd83w7bz06cac0nj0myv4m4s6yp"; } + { url = root + "knnk.nbb.emd"; + sha256 = "1w1dh6lmmrxjfi6srmznqvc7frzxhrs48f5g0jijb410y2c26y0l"; } + { url = root + "knnk.nbw.emd"; + sha256 = "1a9nvqk0w2xhwx5d2ia35z8g2xcsg2kh59ca1jwbvx9sh438b2xh"; } + { url = root + "knnkb.nbb.emd"; + sha256 = "1r8g6ml0hi6fxmff396wjnff76csrq47si1s0qsy1cdfkvax7yyn"; } + { url = root + "knnkb.nbw.emd"; + sha256 = "1v74lhr44s0plxab7qhn4crf55hhp4j7w2mr090sfxz0bzk7cb78"; } + { url = root + "knnkn.nbb.emd"; + sha256 = "1fy4ksqncjv0iqf0papy8hb353di0k39aq0jqh5jvshl9vmspz15"; } + { url = root + "knnkn.nbw.emd"; + sha256 = "1qgprlkaqfwfjkmc048faz2j8y1n46mqp3dfpdnn9ps1x3iqvs0f"; } + { url = root + "knnkp.nbb.emd"; + sha256 = "1xhsjq79nb7zgqgyjp0v6n0g8r37x2csa5svyz8ndsax9hrxc1r7"; } + { url = root + "knnkp.nbw.emd"; + sha256 = "08pxmb0sdppims2lfl0zi42rsh3dlrdbl7vq2rs8v0b470q4j5jx"; } + { url = root + "knnkq.nbb.emd"; + sha256 = "00y7vv6ajzr9kgwx8gk7wap7ncb9dg086iv3lwki6qcwvy14bxql"; } + { url = root + "knnkq.nbw.emd"; + sha256 = "09brsqvzwx4fmf7a6ljqcabx2isqfv1mmvsjb453wmhx98fkglj3"; } + { url = root + "knnkr.nbb.emd"; + sha256 = "01df21j4zdwb4dfngjrr4797b1ipdajs1730i4gajcbm4hqigi69"; } + { url = root + "knnkr.nbw.emd"; + sha256 = "0q0jxmqc57s22vlbk98dbb7c2zmzs6g6chlg42sw156j9414jdfb"; } + { url = root + "knnnk.nbb.emd"; + sha256 = "0jxlaqkbdxhw45p8y4g5ggryzc6l7s159fdlw0bi5ipcp40afpvg"; } + { url = root + "knnnk.nbw.emd"; + sha256 = "0782r7r4b4qmy3afrdmj5l0vlp5sgr33v0h0cigxghfmf19xhgdl"; } + { url = root + "knnpk.nbb.emd"; + sha256 = "0cxj1mxdz8hmjlzhnc7j4cdi5jkcj1l0xfrz4l4z4az7f4ad91ci"; } + { url = root + "knnpk.nbw.emd"; + sha256 = "13y2picx7c814hfsq3bb95js9s3bng85mblhhb7i12yqhddrzyx0"; } + { url = root + "knpk.nbb.emd"; + sha256 = "03xah0j9n427nvqwym0ay84zg831v26x3gnp1zkpg1072r78d2p2"; } + { url = root + "knpk.nbw.emd"; + sha256 = "10lv54gs3pgqqmndlihvjfbrfiqzgzfl7a127nchfyb12f9y91zz"; } + { url = root + "knpkb.nbb.emd"; + sha256 = "1jiihs0cd5jx2hwv99vb3n3iahqwz6ja60zk5nbr17cxzhw0g2ng"; } + { url = root + "knpkb.nbw.emd"; + sha256 = "19jxzp7v90hd1j6i109z03vdq81cndmlvmbb65fm2mc4ffrwms83"; } + { url = root + "knpkn.nbb.emd"; + sha256 = "1yqjxxhc0fq2jvsqifw8my8lzfs2fgn6z8c2lgvak8ag2mi57ka8"; } + { url = root + "knpkn.nbw.emd"; + sha256 = "1kh8sh9vscig0kkwvz79i3gk582xrgll8f4jlqw219f80ckh2ry6"; } + { url = root + "knpkp.nbb.emd"; + sha256 = "1sd46as18ciml1nyzwh8v5qm5slhchbv15yv4qhcaga7cmljy9w5"; } + { url = root + "knpkp.nbw.emd"; + sha256 = "0p8cwryphz16j2yihg7c1szx20s9mxzbgc7y6ddigvhafa19fc1d"; } + { url = root + "knpkq.nbb.emd"; + sha256 = "03vaswq917maa1wxfkilcxjxvm9srnwzmzq1sq36q3h3dlcv23mp"; } + { url = root + "knpkq.nbw.emd"; + sha256 = "1wmnipmacrbwggr1n63zdivvy9haqs96rkn458xswpmvks5fbyqj"; } + { url = root + "knpkr.nbb.emd"; + sha256 = "1ngpj8iaz6si5i3vxri8k8ajpaim71caldxal28djkpmw91yqil6"; } + { url = root + "knpkr.nbw.emd"; + sha256 = "1hqm6xp361iqdn7ayw6zvdk068iz2mwdz6sr087cr7gc0mim2ndw"; } + { url = root + "knppk.nbb.emd"; + sha256 = "1mphpswq01v7d0pxij12nd1lpiz683gp0zgwnz0nyninwsmpq08v"; } + { url = root + "knppk.nbw.emd"; + sha256 = "1m8l9jy96nxvqk48y73yj8b996q2gza1h448rrl00hjn1apbmjf3"; } + { url = root + "kpk.nbb.emd"; + sha256 = "1xgbahdym0nbj63rc6rwgiwzss8xw3ra4lg03z46666hwykx8gxp"; } + { url = root + "kpk.nbw.emd"; + sha256 = "1clkwzf3nb8lzrrs3gg4m9j5wh7z66ihra8gyz8majpjbhcz86an"; } + { url = root + "kpkp.nbb.emd"; + sha256 = "06jsna3795gjlymnrxmscgxnz9ic1i648hr6v5vfagf8lmqi9nq4"; } + { url = root + "kpkp.nbw.emd"; + sha256 = "1gplq6ksq4kvwramx137ncl6giwcm8rg3q8xmyqk1mq10dwcjfbp"; } + { url = root + "kppk.nbb.emd"; + sha256 = "11xlmyw2hx26mkca4bid4qg62yxd0pspgmb40l9kf6h0yjzq4q07"; } + { url = root + "kppk.nbw.emd"; + sha256 = "0j4dmlsm5i7rwrw7kkiq8j7zmcwvb6w38g41kfslm4sv6nm5mvjs"; } + { url = root + "kppkb.nbb.emd"; + sha256 = "0w2yzi0l3jdnr88my8gcsqy72crkm9ppyiy8wl629lpcbrwj75x6"; } + { url = root + "kppkb.nbw.emd"; + sha256 = "06f1h0x6rcsq9kag1fcz9z47hpffr4w9q171rkspd8ffpfzqq7za"; } + { url = root + "kppkn.nbb.emd"; + sha256 = "0wmkn2i8z7m4j93hid2z2ns31kg4yhn939lfkvglfdvrgqjn1kh9"; } + { url = root + "kppkn.nbw.emd"; + sha256 = "1ky4zcwyv5rn4g0h490s6l8vin6rwdv156ial7iczaq8hf70yhkm"; } + { url = root + "kppkp.nbb.emd"; + sha256 = "1ivfxjphcld71cg4rvvq9rvnkpidh6apd52jf2cv42fvx313d9mq"; } + { url = root + "kppkp.nbw.emd"; + sha256 = "1ymvp0z6jhrqi2hz87c81r54m9sdjpm91pvxwbx061yfbdpv230z"; } + { url = root + "kppkq.nbb.emd"; + sha256 = "018cy2q2dvhxjh80prjxg6fx1lal50qc5mzzbfy0xlkk1l1y4sk5"; } + { url = root + "kppkq.nbw.emd"; + sha256 = "0k4jlzcn213h8303jl3hkdapd9z8dhazsa22zac0bg52488r07gj"; } + { url = root + "kppkr.nbb.emd"; + sha256 = "187pjqvp7kzyxkncp51c3vi26khimabkw5b3nyaj498jqjjlfa23"; } + { url = root + "kppkr.nbw.emd"; + sha256 = "0mkrap8dizwxhhiij2xzlvbn8q9hrlsfvkcfcxajn8azaxnhx3ck"; } + { url = root + "kpppk.nbb.emd"; + sha256 = "10spzc39zks7pwa2qy8aps5hk0z4xsxq1lpfwd61qwm5hazci391"; } + { url = root + "kpppk.nbw.emd"; + sha256 = "1wx48xyb1xl5v7gjrahby8psig1gs9dipsj6iq44d052qr56513j"; } + { url = root + "kqbbk.nbb.emd"; + sha256 = "1zvacin043njqws2nwiylch5dan28yis3ybcjb3zvmkdxyy8qzrh"; } + { url = root + "kqbbk.nbw.emd"; + sha256 = "1s5likpps43bxplsv5yrqqnh2xzakibcknn6jh67xwdvl2v4jfz5"; } + { url = root + "kqbk.nbb.emd"; + sha256 = "1814l1cgfphzl4v7k3hnwi21ydzfzyr7xzbh05dw3mnm0dsg9gzk"; } + { url = root + "kqbk.nbw.emd"; + sha256 = "0xpmqr99qscrqjk5rzb7cgkjpcz4cmp6gngfsy8hq7530a4nknxk"; } + { url = root + "kqbkb.nbb.emd"; + sha256 = "1jpl4nx4ddwnz455433508ibxywsrccb098infn992gs7wqqjsi2"; } + { url = root + "kqbkb.nbw.emd"; + sha256 = "0krx6irqv0gvdy7hknhwa6gj2zwiv9rnjk2qlf2cy6xsldzn6af7"; } + { url = root + "kqbkn.nbb.emd"; + sha256 = "09xsg79xajh1g2d9nvms61pjgb13x6fc0nhw58nnfg28nbvjzz1n"; } + { url = root + "kqbkn.nbw.emd"; + sha256 = "0gb8pdsd77fmjd09h7ri1z8rrparqn5xa56dwi4yd4hhwsb8c4fq"; } + { url = root + "kqbkp.nbb.emd"; + sha256 = "07h1zzaic2qh2140wvcq0hvhmkv0j9h7rchm3avsk7m6ma98d7zi"; } + { url = root + "kqbkp.nbw.emd"; + sha256 = "13lffpplxis2a5949wnq998262idiydg2b2pz5np3mxyppc48r61"; } + { url = root + "kqbkq.nbb.emd"; + sha256 = "09l20wcjcvmncz97j4107q3ch81dgzmx7i86m6pzifhy8mrn2cll"; } + { url = root + "kqbkq.nbw.emd"; + sha256 = "0vra23shpwlsiyzd8wd2m2ayrs4ig2943l90ps9xh1p6igjv1n9d"; } + { url = root + "kqbkr.nbb.emd"; + sha256 = "0gmzhzr1m751djfp6b71yrah04r89lq41nshvw02qp531aqp1xyq"; } + { url = root + "kqbkr.nbw.emd"; + sha256 = "1zz0fdfn463xa76xd8hg2hz8a1kaljka9l01z64vsqvn73nkd5fm"; } + { url = root + "kqbnk.nbb.emd"; + sha256 = "1m7krpj5sd6mvrsks39jyxkg8mvz7g15rwnn55kql2flpsw481q4"; } + { url = root + "kqbnk.nbw.emd"; + sha256 = "1q6jvhxjzcani3ls402n3ylhhmf8kd482in19d2ny0q7pqcimvy7"; } + { url = root + "kqbpk.nbb.emd"; + sha256 = "1pdc8kd3q9f8vgfqxymar3vkg1h9qbsfr614lhgbmpmpmn4zxqdj"; } + { url = root + "kqbpk.nbw.emd"; + sha256 = "0dcyxa92200g0dgq7lk018grhvwxzrhh6wrwqdk6g3v02g63h38d"; } + { url = root + "kqk.nbb.emd"; + sha256 = "1f0cdqyakzck0ng11smhk9kdkch9hbm3azniqv2wjg2wp9aj9s1n"; } + { url = root + "kqk.nbw.emd"; + sha256 = "0gzxgkxzfnlri5ypvx67k2mwq4xnwkm4hn4n9mqpl7fjwdj733w2"; } + { url = root + "kqkb.nbb.emd"; + sha256 = "0j3w39l4mnwm5nrrw0zcd4icdj8hgds792nhick2mfn40injwna6"; } + { url = root + "kqkb.nbw.emd"; + sha256 = "0q30gjvlfmx1ld4i0x2xj97i4i3w6q1vhl2q91w8dd84bw1cy1k8"; } + { url = root + "kqkn.nbb.emd"; + sha256 = "15aivg3vpc6y1g3gcnmssjnww9l7npy3g5xxq3wq99ai1mbgik7p"; } + { url = root + "kqkn.nbw.emd"; + sha256 = "1qqi3r6a5d74108xgdxx9qx4cxv7fkr9jpkrcizirzv30dp3cb4z"; } + { url = root + "kqkp.nbb.emd"; + sha256 = "0hlsmjn9baa1bplnwygxvgnkfn15fm9fhc6k39bfiacy7ai0zkka"; } + { url = root + "kqkp.nbw.emd"; + sha256 = "0ibx6xp2v980626xffb7khz8lfnxb9577w5zc6mlc892kinaf4gf"; } + { url = root + "kqkq.nbb.emd"; + sha256 = "0kc2d1qwlib2v71fhx11frk2a06lx1mvvddw83mmvyzca108ggz3"; } + { url = root + "kqkq.nbw.emd"; + sha256 = "0kc2d1qwlib2v71fhx11frk2a06lx1mvvddw83mmvyzca108ggz3"; } + { url = root + "kqkr.nbb.emd"; + sha256 = "13fabjhiq5psyvg2a1cbx16471g35il0lm3fsfdy4dpl9zr2pw58"; } + { url = root + "kqkr.nbw.emd"; + sha256 = "0hwy21k0a3qa6b1093904krdqrqrz5iwqsb0qxqqnwljpz8kr1zl"; } + { url = root + "kqnk.nbb.emd"; + sha256 = "0dy9d9fwaqvmr3x796a7vq5ynqnpw8b4l0zsm7nkvvd5sak1blxj"; } + { url = root + "kqnk.nbw.emd"; + sha256 = "0zdzqhg0ww4b79w3w3hjpwfar0r8fhk2yc8jknwzcc9q9rv9a78n"; } + { url = root + "kqnkb.nbb.emd"; + sha256 = "04zvc8s2rwcgr9chx3rmvr3shs47i75pwh1wph9wiy33jx5gw846"; } + { url = root + "kqnkb.nbw.emd"; + sha256 = "1v22rln9plikvchdxqii4m9kh9s0mahrxnsqs6i2kzcfphiqp3ns"; } + { url = root + "kqnkn.nbb.emd"; + sha256 = "0kwz1390brs60ri0mrvf3f64ax0yncnp6kpaf7nrw5v29s5cxpyz"; } + { url = root + "kqnkn.nbw.emd"; + sha256 = "0gvsx71nf0bhggk338rsmvbpajwa6j1ja09gchny6i9gvg9l0frs"; } + { url = root + "kqnkp.nbb.emd"; + sha256 = "169llq4dv4fsh8hvvwwrbc2b1iwklnqwqmhzv77q862cxs8rbcsa"; } + { url = root + "kqnkp.nbw.emd"; + sha256 = "1b1mgfh7hgiqv9a0dv1f7vr180g1mjxcg3nlx4zmpj0mzgwka39g"; } + { url = root + "kqnkq.nbb.emd"; + sha256 = "02za7wp2z1h1sd55mmkaa6i0bh3piwiz5ybpdrxk2amm54kvjmsj"; } + { url = root + "kqnkq.nbw.emd"; + sha256 = "0s9c4zfw4slp7lv373nkhlyafn3hpw9pv4543mm69c6cdnl04xhk"; } + { url = root + "kqnkr.nbb.emd"; + sha256 = "0nffvkdfs17b6n2hmy9i7ha793dn8an7ff9nd97z62zxxm63gmyp"; } + { url = root + "kqnkr.nbw.emd"; + sha256 = "1jqmbna1i5wqahqz2lalviv61y6ak379fhjcc9xg651dxfnjnmwh"; } + { url = root + "kqnnk.nbb.emd"; + sha256 = "1dlhfqmv5g3f9lvfgvy4h7x0xfkbn9pcsplb9kjlqg7qhkimcvbg"; } + { url = root + "kqnnk.nbw.emd"; + sha256 = "0zlg34ff2bp88q8bws2isswwa8ls0qncpzyzc3d1j6avkprwkq2i"; } + { url = root + "kqnpk.nbb.emd"; + sha256 = "0i436sxh5093zy03v6rjf6r0ydjmkmfj5fkxqk2qjjps2gc6jwsn"; } + { url = root + "kqnpk.nbw.emd"; + sha256 = "0yf7il0maiw8c9gam9cvnjgvywjk5k3pjvmgcy377yf31hgi209g"; } + { url = root + "kqpk.nbb.emd"; + sha256 = "11vl1p9qwqsdbxdppqg3n73868kd69kqhl6h6q1p47a4dq9lqldy"; } + { url = root + "kqpk.nbw.emd"; + sha256 = "02ik15sm3mdhyn76rnx8jvg7fma1m7njm55h6mqqqgqgbji0zzvi"; } + { url = root + "kqpkb.nbb.emd"; + sha256 = "0s7k9dh87s6msmqpv43csax632i5w5gzc2s4ijiy38kg0d3cgz31"; } + { url = root + "kqpkb.nbw.emd"; + sha256 = "115y0gshq2g6p6mfclxag1lvba3pz2rlyw8b6d5rykkapm299yvb"; } + { url = root + "kqpkn.nbb.emd"; + sha256 = "1i3wx9c7dk1sdig6kv4h3pa2m9ir1gd6qz7jyan9q18wvrpag12l"; } + { url = root + "kqpkn.nbw.emd"; + sha256 = "0iqxrgr1x2k3mfvhgckz9dya92wj8vddpv746gz86yi6n05wp373"; } + { url = root + "kqpkp.nbb.emd"; + sha256 = "0ifxixayrfhdp3yq04h55kjcgbly4390ghrhpvllc3mf6yrcg3sh"; } + { url = root + "kqpkp.nbw.emd"; + sha256 = "1hf8b4lvci0lm4skvxsw83c521q2x1i7yij8ih9j8ijyg64fivp8"; } + { url = root + "kqpkq.nbb.emd"; + sha256 = "0vy9ihcl80q2ml7lilgi007d7zx4r9knsyn8f63fqfa8x3m5rs6b"; } + { url = root + "kqpkq.nbw.emd"; + sha256 = "0xqngdyq8anfz1xqyg24nvwds7k7027j1l5pjwl22x0ipi7hda98"; } + { url = root + "kqpkr.nbb.emd"; + sha256 = "1c3xbrvsmyjz0ydc3xpw5hcxky20742d2jqwf7rrx5q223y11mlv"; } + { url = root + "kqpkr.nbw.emd"; + sha256 = "0fsi0d0czwvi2az56v2a4r0k78drybyqdda264gqjs53j65h02bp"; } + { url = root + "kqppk.nbb.emd"; + sha256 = "0995h6li6ixljxfs4xxy1bvmzj589h675bg8pkhbrmvimhja2nrf"; } + { url = root + "kqppk.nbw.emd"; + sha256 = "18hh8080s90qdacy6svhymfs4nw27x0p0s8km8p090rwk5si860a"; } + { url = root + "kqqbk.nbb.emd"; + sha256 = "15n425kcfjypwbxj1ck9v4rzd24lmd36kczhsi1cp2y6955vz9vp"; } + { url = root + "kqqbk.nbw.emd"; + sha256 = "1mjkgcblgsga7vib0410mdcjqh3dkc3xq8nx17p1hapinj987w8s"; } + { url = root + "kqqk.nbb.emd"; + sha256 = "0ihmqjiqycybci4zczrdv4c3a1bdz7l2qln0g43rbzwbkjsplykx"; } + { url = root + "kqqk.nbw.emd"; + sha256 = "0m0359yb17azb8s482i63fvqqy1b9idgklrj82rpbidasz41gj0m"; } + { url = root + "kqqkb.nbb.emd"; + sha256 = "0b9hm4pw01dal7lazb1qakjbgg5wg3nrn2bdjmkabfjgbrnh4hbm"; } + { url = root + "kqqkb.nbw.emd"; + sha256 = "1msk54xzbn41rhlyx9qkragihmg7yw2r5jc97lkvb7d8lwg6s59r"; } + { url = root + "kqqkn.nbb.emd"; + sha256 = "18d8nc25h33gd1qr6jmsbka3qmd8xjb2q1545959x6b4ch93cbsy"; } + { url = root + "kqqkn.nbw.emd"; + sha256 = "0i2mzllfklvv8bw0g6rjjrjkw71mvn8hsvqg6m7hhdq8lg5ajhyp"; } + { url = root + "kqqkp.nbb.emd"; + sha256 = "14y51vjw0r605pbjz0gvhc0x2w14ijxn3nilvpd5sdcnfh79kaax"; } + { url = root + "kqqkp.nbw.emd"; + sha256 = "11m1034gb608czhzrrj3fgpixq4rlvr92bzv7ga5r8wypwwycbdp"; } + { url = root + "kqqkq.nbb.emd"; + sha256 = "1cxyavw61qqpy15vrq51a0sjsd2lhya60cf33nnh9vb370amwqj9"; } + { url = root + "kqqkq.nbw.emd"; + sha256 = "1lrv2757bivjs9bsyh7ghj53halg3jz29xhnx7xhjrf48rpv6nxw"; } + { url = root + "kqqkr.nbb.emd"; + sha256 = "1m2r0myc2piqn4pcd3b9ngivrjg1j5viwsi9740dlb730dbvkzna"; } + { url = root + "kqqkr.nbw.emd"; + sha256 = "1767n2993dw5akbd3h6w570nbs5bncd8qid1dhgzfs9yxxzjplns"; } + { url = root + "kqqnk.nbb.emd"; + sha256 = "047950dbkh0mzpfb1klm51lmqzx1d90w6j7r4z8mc1nw4knh5cpp"; } + { url = root + "kqqnk.nbw.emd"; + sha256 = "0yd35ra0s0qckqymzi634bxp127arbrqzyj3s3xww82qsn6lbm07"; } + { url = root + "kqqpk.nbb.emd"; + sha256 = "08wbdhpa8vna39i226hg71r8a7ydp2vd2gh5prskr39vqj0k5pa3"; } + { url = root + "kqqpk.nbw.emd"; + sha256 = "1vyd4pvb8mhbdkm85njnqxg755biw0y68ylxfbnar8wna4dl27ds"; } + { url = root + "kqqqk.nbb.emd"; + sha256 = "0l0ichgik395z90h37zj6x4kcxpf0121zw57s8s0y51iwz61ikg9"; } + { url = root + "kqqqk.nbw.emd"; + sha256 = "0jmkd9n96al6sggva1kmdax8vxqprai9hhkxxvsk35wivcp8akk8"; } + { url = root + "kqqrk.nbb.emd"; + sha256 = "02wahvwixy5l3q9h57ayr2mxqs79zg8m2qh8cv3mms39csa9axzh"; } + { url = root + "kqqrk.nbw.emd"; + sha256 = "05rypafy4lgb53x8zx2qlvdrjm91aqr61hc7iwlpfikqqcbiksiw"; } + { url = root + "kqrbk.nbb.emd"; + sha256 = "0bk77dvdg5qx86rss0q9v8zl079g85p7snfgjpr30jpfv2z0a6p6"; } + { url = root + "kqrbk.nbw.emd"; + sha256 = "0mgamh4fqr6g063ic5qapdjng6jw35f82f0wjq8j9gv5w83s0vqs"; } + { url = root + "kqrk.nbb.emd"; + sha256 = "0vsadlphh4b6cgs4pizw44nfw4lhpq65dws44fc9z74sf32q0ibr"; } + { url = root + "kqrk.nbw.emd"; + sha256 = "1qq8jqzqzkcarhnc7ad6xp3s2f8r4crrxgj0ajciz2pkyc98xdh6"; } + { url = root + "kqrkb.nbb.emd"; + sha256 = "0bxmkjmqx7gjdaz78d31sbk7v67crx24dpbhswfg6b3xkhi8cy3f"; } + { url = root + "kqrkb.nbw.emd"; + sha256 = "0hhz4yxrcwvvc4b36ixlh3g8gdm4krhvip80xazcy538dwl26b29"; } + { url = root + "kqrkn.nbb.emd"; + sha256 = "13h7qa2zy9akdrvrwl7wmlpncgljjamc7asa9vpd76bi5mp0wrap"; } + { url = root + "kqrkn.nbw.emd"; + sha256 = "0ihcp5wh61cgq439nh5rn3qqhpyjl5h4xz9ayyma298fm2xw7w89"; } + { url = root + "kqrkp.nbb.emd"; + sha256 = "1wjrcrjgq1gj0jqbw0mi8ah79qv80zp921bzjxsx9vjm35hdbbhl"; } + { url = root + "kqrkp.nbw.emd"; + sha256 = "0qwc76wyy60vicxyxx80gm6f40fw3izs6xndhhkfh86cj7sjl3l5"; } + { url = root + "kqrkq.nbb.emd"; + sha256 = "0drzfjrm6mh8q1vb36ycvfsipp6z4ij4a200zxypaxaimnxssq3x"; } + { url = root + "kqrkq.nbw.emd"; + sha256 = "0n12rixcd2k3bgm00k2z9cnlzx1av5y62r8adnx6h2grlgcyd26j"; } + { url = root + "kqrkr.nbb.emd"; + sha256 = "0zvzx89gp4saggjb062nafy3xncv01fmbymsmnlswmq80xdkcn4d"; } + { url = root + "kqrkr.nbw.emd"; + sha256 = "0by6f36850d4fdraqj8rqv7ryaplqxlmkm00prm0pcmlb3y5czc7"; } + { url = root + "kqrnk.nbb.emd"; + sha256 = "0z5599ci1n7qgpn3inch8zc3ciyy1b5gjbix78k3b5ig4ra2idv6"; } + { url = root + "kqrnk.nbw.emd"; + sha256 = "18a5bm0rlh4wf5im54acq0w0l6lnjjk4dxaxcph67q4smfbfacv3"; } + { url = root + "kqrpk.nbb.emd"; + sha256 = "10rbm2j3rz04jv0s70aink3y7h303zvnf29b9pim8b8pv23pwvy3"; } + { url = root + "kqrpk.nbw.emd"; + sha256 = "1jqvxfj3fnm456livvfbp3v750mm86js2qb7va5nq9wilif13chb"; } + { url = root + "kqrrk.nbb.emd"; + sha256 = "0h2g8v9i6ic2fmjgzwh1hcwaka2m8n8l28nvbbkq3447hrwl8sba"; } + { url = root + "kqrrk.nbw.emd"; + sha256 = "137iicxbws20rv93b5qas6dpk5a7qj18rcbj632117hkiw3ddjly"; } + { url = root + "krbbk.nbb.emd"; + sha256 = "1i0yjbvkrqz4m61qk6flz88zsb3nwskj6rrn3bz4fzv63m0yhcpk"; } + { url = root + "krbbk.nbw.emd"; + sha256 = "00rna709hpxw06sg5cnzn9xzgn2pib4n5yyffjz638sgivgh62k4"; } + { url = root + "krbk.nbb.emd"; + sha256 = "1xq45jiwg96084jm0qkacjmxl86v0mp1nrr6k85dpn99bmyzx5xw"; } + { url = root + "krbk.nbw.emd"; + sha256 = "0jnxrpwad8cpl6yp31bs5g0h89jjr8061lj69n8wdmmwhvjafvk0"; } + { url = root + "krbkb.nbb.emd"; + sha256 = "0gdwy9q7xf35fpb78g02jn07d969p7zzhnn4asbk5y3fmix209l2"; } + { url = root + "krbkb.nbw.emd"; + sha256 = "0kryfbjli1l05nqarz96q6fnviwzgjvmbljbmapirw40ma68nx4r"; } + { url = root + "krbkn.nbb.emd"; + sha256 = "01fll6vvqiyxpmn6qmwhrzd7f3j3irpbdvc2jn2hqzjdmsr0kz59"; } + { url = root + "krbkn.nbw.emd"; + sha256 = "13yipfw7v5w2hcgmnml3ka1rq1g5djcf81nkanrlmrkqaksxbc0m"; } + { url = root + "krbkp.nbb.emd"; + sha256 = "1bpa5x4zm9nap62hf3iiyzzwcp0fsh5bww0sdnvlzaclw9mbc1g8"; } + { url = root + "krbkp.nbw.emd"; + sha256 = "0y157ai66amm5lryigc7nizj79mfbcny925qqcsgbi8l2yhl7hk1"; } + { url = root + "krbkq.nbb.emd"; + sha256 = "199gckvazpsv1f3jkfxw9p3hyfshpvqm2i9wqjgzlm69dckbbj4x"; } + { url = root + "krbkq.nbw.emd"; + sha256 = "1m72pzaxlrppwpaqgdcxcjr9n5cnyxs8p0kxybgkl17vfvpc5jmw"; } + { url = root + "krbkr.nbb.emd"; + sha256 = "04wpcfq3y4nx1q57vina4z75lv3mrzljfzw5s73s5m0fhfq54i9v"; } + { url = root + "krbkr.nbw.emd"; + sha256 = "1wii5h5cyxxxgjp53ap43v0wnpj7amxyd8kg9bxsamcfz3wj1v70"; } + { url = root + "krbnk.nbb.emd"; + sha256 = "0s2jrbyjn4d2kik7ic4i1d4w6yx2841cdwb7lalpw3jf74ag2cv4"; } + { url = root + "krbnk.nbw.emd"; + sha256 = "1py0lnsahky21dvk5kdcfgbrca1cks7ihjslpvins91l58yzldh9"; } + { url = root + "krbpk.nbb.emd"; + sha256 = "1v3j61j125i9hbmqm11ay2ng65djq55mwxfr5v8173whqjk9cjc5"; } + { url = root + "krbpk.nbw.emd"; + sha256 = "1zvinpcr9mzm6jgicq6y6jfl6dsd7pyn648bfayszfgndyr2b125"; } + { url = root + "krk.nbb.emd"; + sha256 = "042qliismf63y6vims4bg31lj1w9r2y45p32frqxgk79hvb567yv"; } + { url = root + "krk.nbw.emd"; + sha256 = "1fam4n038dg4g1nc1zn55lyjagv4j4lkbq28rhiaz7mhj3z4r3zz"; } + { url = root + "krkb.nbb.emd"; + sha256 = "0y44rbly8ggzjg2i5vhxibia551ii28dnpyzls3b74a6078zy0wy"; } + { url = root + "krkb.nbw.emd"; + sha256 = "12bqs411yhv6k0b2jhil1l7hpk4cj3i8x0bcj168jnmikzhprvgq"; } + { url = root + "krkn.nbb.emd"; + sha256 = "1wcghsgr9g09pbyhak1hyxw3rvfis6zplc3zgzx3qphp69rivk3k"; } + { url = root + "krkn.nbw.emd"; + sha256 = "1jkwz4kjl91kxxascg21zj6c6qgx9s0k91jjbic6ybsmpv4wj4qc"; } + { url = root + "krkp.nbb.emd"; + sha256 = "1jmaansnxspb7x2ka8y44vssgk78wfcrmdczj60zyzg1bj3n5fl8"; } + { url = root + "krkp.nbw.emd"; + sha256 = "14yi4fsax0w9sd5bv463ajs6r4q0wxj3n19np9anc1zfvb3yk846"; } + { url = root + "krkr.nbb.emd"; + sha256 = "12y29sgqhxcvilg089766nn14scy8b0dxmla1isjmgq9qb4yi9vy"; } + { url = root + "krkr.nbw.emd"; + sha256 = "12y29sgqhxcvilg089766nn14scy8b0dxmla1isjmgq9qb4yi9vy"; } + { url = root + "krnk.nbb.emd"; + sha256 = "0gvm4y8p5a9769nqhgnx6xj6nlldgrh75k3z8c8hj2xd9cyj01pp"; } + { url = root + "krnk.nbw.emd"; + sha256 = "0p7j4x0xdq5krsvmj44qkcaqmww7rplrjdr08ix3jyjf31kk2x13"; } + { url = root + "krnkb.nbb.emd"; + sha256 = "0w9gybr4i7d8zjpbbyg1m4263bx2gpmnh91vd0xmpwi0ykrxrl57"; } + { url = root + "krnkb.nbw.emd"; + sha256 = "19wp8swng0q2wzxwx89km5fqlqfb4vcamky9h7pvas2sgh8frfmq"; } + { url = root + "krnkn.nbb.emd"; + sha256 = "0g3b48symag31lcgbimpmmqsqdmihsr6g9k5a15l0mfkisfwadlf"; } + { url = root + "krnkn.nbw.emd"; + sha256 = "1vryhaw1aj4bhv2ghb10zxyx930s2f4xqg7v9cxfnr9q5w2qv7xh"; } + { url = root + "krnkp.nbb.emd"; + sha256 = "13b8vahj7hj4f12kiaigx1nphdrf8z30j68zav9n617kpf5s35i0"; } + { url = root + "krnkp.nbw.emd"; + sha256 = "1qcnjwkg0pxp1hq4xws9dgq4bx6pxn0am3mcj1n837qcmv46mf7c"; } + { url = root + "krnkq.nbb.emd"; + sha256 = "150d9z4v6fk16sdxq1w96gl2pl9nsf0jimy8kdgc8a19i1ab1rjc"; } + { url = root + "krnkq.nbw.emd"; + sha256 = "13dn9hgk4i26axwymv0gvdkl0zr5shggvm5lpwa15gigmrva73bh"; } + { url = root + "krnkr.nbb.emd"; + sha256 = "14ja7chmg7aklg6swlc3lpik4akj8zv3x2qppsip0vi3j05lnqyv"; } + { url = root + "krnkr.nbw.emd"; + sha256 = "04qxh0kzk2p7m5zdrzg0faqva91qals4njnwf4vgfr65lmd4hyfn"; } + { url = root + "krnnk.nbb.emd"; + sha256 = "1f35pqprkf1clx0mzzkgx9mn8ncqdiyc2cbxcp5a4x1kzli7zp34"; } + { url = root + "krnnk.nbw.emd"; + sha256 = "16y28mqjl7fbl8rlwv51bn17sx0fpvfi0izyq1f5043l7fmpshfr"; } + { url = root + "krnpk.nbb.emd"; + sha256 = "097rmr9zb550qn41kn11c15qp8l5582wqncg5li46iq9mfxcskiw"; } + { url = root + "krnpk.nbw.emd"; + sha256 = "0hj3bhqvgdd64qa47irwx08nz4fqxhm0ddmpjq0jb757wlqw5f05"; } + { url = root + "krpk.nbb.emd"; + sha256 = "1qz218amn2ii66g2fr2ifq6csr0n5n9ip9jcjxkxgpmawiwjhcm1"; } + { url = root + "krpk.nbw.emd"; + sha256 = "19vh7k73gjyjwqzdpf0pv2i7zrqb2ns6a6r3n4jgwwd2n35inr1i"; } + { url = root + "krpkb.nbb.emd"; + sha256 = "1y6kknnkb0ikk7az6syc3drhp4v3avpffa5pghpr2pm6i8xzx3nm"; } + { url = root + "krpkb.nbw.emd"; + sha256 = "0fnbyhgjlnrnddkpbbyabyg31nmi61w9ra8ylicv6ysgyn4bcps4"; } + { url = root + "krpkn.nbb.emd"; + sha256 = "08cn0pa6y1hxq7clgj70hdxm13a6zi9c8z2mmf3qgsjjkrj2wgc5"; } + { url = root + "krpkn.nbw.emd"; + sha256 = "16ybnwl7sf832z546igrwclahhymp734dcg6rhrakxabrv0y144z"; } + { url = root + "krpkp.nbb.emd"; + sha256 = "125qzj83kc5y5rx6jn078pjj6lph1gslmglx24n5n399382kllkn"; } + { url = root + "krpkp.nbw.emd"; + sha256 = "1kbahpn99r37syb1yypabw55g4diwbp6q99nr6f6rn19wp0b44mk"; } + { url = root + "krpkq.nbb.emd"; + sha256 = "1wsxy8ycz8l6wn6c58w4n0gdsdb8lik6b046q132qjw8mnn07gv1"; } + { url = root + "krpkq.nbw.emd"; + sha256 = "0l8sg8sv6yy2wsrg7p9j2w5s61sd3jak09z1i347k0g0190m77m8"; } + { url = root + "krpkr.nbb.emd"; + sha256 = "1mv4jcgkilsw3d4m879r2cwslz71v0rg5hwk9r6lhpg22qam3kz1"; } + { url = root + "krpkr.nbw.emd"; + sha256 = "1nj906wq21h9xfzihc3wcp9s2bwgy7c68j4a6vlxq3zy1c8k53yx"; } + { url = root + "krppk.nbb.emd"; + sha256 = "0x63qm3zwp70y3a33s29bv7lhg1vjnvi4gkxxgh6s0590y7s8pj4"; } + { url = root + "krppk.nbw.emd"; + sha256 = "1z4nhf2gygbdgk6j3bdxhllx154ajkrrz3j0y715r20m0fxfl6x8"; } + { url = root + "krrbk.nbb.emd"; + sha256 = "0gxam25i89sqmmmd781yyk2k2zyj76l9w9hngqkzagiz0fhh9ycz"; } + { url = root + "krrbk.nbw.emd"; + sha256 = "1v7rfv5b4wjsgfy21fi3xyxbfj76mvkxhfz52612p4rnzp78bb56"; } + { url = root + "krrk.nbb.emd"; + sha256 = "0ms9cjndxiflssymcx7aakf6bjwb5043nz5i4jvix89wvp6lgfa1"; } + { url = root + "krrk.nbw.emd"; + sha256 = "18bh2y3v2ak6j1q1rlnkp02vijbbqr69i4cg1pvj943c83xz18l3"; } + { url = root + "krrkb.nbb.emd"; + sha256 = "0hdr8v5bgybma3sdl8mk0v3msjvdva89zs1wd52m6jbdgwb5hzca"; } + { url = root + "krrkb.nbw.emd"; + sha256 = "1g8bkyzq585az5rrglxd71ydj2fhhgqzdfmkgihbi7ncjym9kpw7"; } + { url = root + "krrkn.nbb.emd"; + sha256 = "0bz8np2sqj8viwszx4jj9wxj774kv548pjzrmc6xh11p0sfjx3rj"; } + { url = root + "krrkn.nbw.emd"; + sha256 = "1qf4d6zlvwlgrq0f732wafpznkqd3qnf7na4bgd4p1pb105ickg4"; } + { url = root + "krrkp.nbb.emd"; + sha256 = "1kw434r77f61b5agly6lqkvn4b1rwssd511lcv16mvvf56xlqnb4"; } + { url = root + "krrkp.nbw.emd"; + sha256 = "1yzqpp01gckk25zjy8j820y37m4vj6rgc6zpphwll45rn1ahwk0p"; } + { url = root + "krrkq.nbb.emd"; + sha256 = "1ynhjzzmjpd6yw0d2w5xhlms3sqjc8gksfqgq3wmx7ym23wya2qq"; } + { url = root + "krrkq.nbw.emd"; + sha256 = "01wil4pbcnrqynj1xpkglk2r36b36cz9gjr2g76rrz5xhdy5q8vj"; } + { url = root + "krrkr.nbb.emd"; + sha256 = "0iyqadmpddy9i330nv1qrsjfkk2vlkxfxjphx3q349lplq6a9s16"; } + { url = root + "krrkr.nbw.emd"; + sha256 = "1fg4byzzmjlzz8hs2vhpysmf8py9ylkf5pdw3rv88dxr4cp1wciq"; } + { url = root + "krrnk.nbb.emd"; + sha256 = "1jb8rq7sy28c9wr7yih8w5bi8jbcf4xzf8sccanz32qxp0159f0h"; } + { url = root + "krrnk.nbw.emd"; + sha256 = "17g7l0szgqczykjgxdhpihs5hh2snc35cy3hggnvah3j8bv6ksb4"; } + { url = root + "krrpk.nbb.emd"; + sha256 = "1q7vk3pawab9nbpdn3cw2kf205yx6lznr6gkd9qbjj3754s9zswh"; } + { url = root + "krrpk.nbw.emd"; + sha256 = "0wl23j0a67mm01655p4ivjrlsacvm7lxglhrg6cni61qkdqr6vqz"; } + { url = root + "krrrk.nbb.emd"; + sha256 = "1ggm5q38wc65rkp87n5d2l71kcl7nqjkvwa31hmlagq2735vd0gd"; } + { url = root + "krrrk.nbw.emd"; + sha256 = "1h7psv25a4wajg6ggk2q0cllf5mng4qjas3yi9nvi7kc766p85ax"; } + ]); + + patches = [ ./strcpy.patch ./malloc.patch ]; + + buildInputs = [ unzip ]; + + buildPhase = + if stdenv.isDarwin + then "make darwin" + else if stdenv.isLinux + then "make linux-amd64" + else "make"; + + installPhase = '' + ensureDir $out/bin + cp -p ./crafty $out/bin + + ensureDir $out/share/crafty + cd $out/share/crafty + + $out/bin/crafty "books create ${startPgn} 60" + rm -f *.001 + + ${if fullVariant then '' + unzip ${enormousPgn} + $out/bin/crafty "book create enormous.pgn 60" + rm -f *.001 enormous.pgn + + ensureDir $out/share/crafty/TB + ${stdenv.lib.fold + (tb: acc: acc + "\nln -s " + + toString tb + + " $out/share/crafty/TB/`echo " + + toString tb + + " | sed 's/.*-//'`") + "" + tableBases345} + '' + else '' + cp -p ${bookBin} $out/share/crafty/book.bin + ''} + + mv $out/bin/crafty $out/bin/.crafty-wrapped + cat - > $out/bin/crafty < + #include + #if !defined(IPHONE) +-# include ++# include + #endif + #include + #if !defined(TYPES_INCLUDED) diff --git a/pkgs/games/crafty/strcpy.patch b/pkgs/games/crafty/strcpy.patch new file mode 100644 index 000000000000..d4d424d23dab --- /dev/null +++ b/pkgs/games/crafty/strcpy.patch @@ -0,0 +1,21 @@ +--- a/utility.c ++++ b/utility.c +@@ -2144,7 +2144,7 @@ int ReadPGN(FILE * input, int option) { + char *skip; + + strcpy(temp, input_buffer); +- skip = strstr(input_buffer, buffer) + strlen(buffer); ++ skip = strstr(temp, buffer) + strlen(buffer); + if (skip) + strcpy(input_buffer, skip); + } +@@ -2241,7 +2241,7 @@ int ReadPGN(FILE * input, int option) { + } + } + strcpy(temp, input_buffer); +- skip = strstr(input_buffer, buffer) + strlen(buffer); ++ skip = strstr(temp, buffer) + strlen(buffer); + strcpy(input_buffer, skip); + } else { + int skip; + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1c66f42a878..3dd6e54f80fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9887,6 +9887,9 @@ let crack_attack = callPackage ../games/crack-attack { }; + crafty = callPackage ../games/crafty { fullVariant = false; }; + craftyFull = appendToName "full" (crafty.override { fullVariant = true; }); + crrcsim = callPackage ../games/crrcsim {}; dhewm3 = callPackage ../games/dhewm3 {}; From 0f65f11d6ec5dfeaa9bf8cdc70e3b41e83812f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Wed, 26 Mar 2014 20:41:11 +0800 Subject: [PATCH 071/254] mono: fix libgdiplus finding --- pkgs/development/compilers/mono/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 4ff2dacff188..1b9e9118d56f 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { find . -name 'config' -type f | while read i; do sed -i "s@libMonoPosixHelper.so@$out/lib/libMonoPosixHelper.so@g" $i sed -i "s@libX11.so.6@${libX11}/lib/libX11.so.6@g" $i - sed -i '2 i\' $i + sed -i "s@/.*libgdiplus.so@${libgdiplus}/lib/libgdiplus.so@g" $i done ''; From ddfd374c40fdb4e15ae208062fe72e505d139d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 6 Apr 2014 17:01:34 +0200 Subject: [PATCH 072/254] Merge #2030: add openra game (C&C RTS engine) Modifications from @vcunat, who tried Dune, but it typically segfaults in mono after a few minutes (IMHO unlikely to be a problem with packaging it). --- pkgs/games/openra/default.nix | 44 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/games/openra/default.nix diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix new file mode 100644 index 000000000000..ec9d4ad39802 --- /dev/null +++ b/pkgs/games/openra/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, mono, makeWrapper +, SDL2, freetype, openal +}: + +let + version = "20131223"; +in stdenv.mkDerivation rec { + name = "openra-${version}"; + + meta = with stdenv.lib; { + description = "Real Time Strategy game engine recreates the C&C titles"; + homepage = "http://www.open-ra.org/"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/OpenRA/OpenRA/archive/release-${version}.tar.gz"; + sha256 = "1gfz6iiccajp86qc7xw5w843bng69k9zplvmipxxbspvr7byhw0c"; + }; + + dontStrip = true; + + nativeBuildInputs = [ mono makeWrapper ]; + + patchPhase = '' + sed -i 's/^VERSION.*/VERSION = release-${version}/g' Makefile + ''; + + preConfigure = '' + makeFlags="prefix=$out" + make version + ''; + + postInstall = with stdenv.lib; let + runtime = makeLibraryPath [ SDL2 freetype openal ]; + in '' + wrapProgram $out/bin/openra \ + --prefix PATH : "${mono}/bin" \ + --prefix LD_LIBRARY_PATH : "${runtime}" + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f138d8c88a26..7e4d2214479e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9993,6 +9993,8 @@ let oilrush = callPackage ../games/oilrush { }; + openra = callPackage ../games/openra { }; + openttd = callPackage ../games/openttd { zlib = zlibStatic; }; From a8a9c78af825ba92aa181e66cfbb3d8fa867d077 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 26 May 2014 16:47:06 +0200 Subject: [PATCH 073/254] Add grafana, A Graphite & InfluxDB Dashboard and Graph Editor --- .../tools/misc/grafana/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/misc/grafana/default.nix diff --git a/pkgs/development/tools/misc/grafana/default.nix b/pkgs/development/tools/misc/grafana/default.nix new file mode 100644 index 000000000000..346c7fb6ad29 --- /dev/null +++ b/pkgs/development/tools/misc/grafana/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, unzip, conf ? null }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "grafana-${version}"; + version = "1.5.4"; + + src = fetchurl { + url = "http://grafanarel.s3.amazonaws.com/${name}.zip"; + sha256 = "fee7334efba967142955be2fa39ecae7bca0cc9b7a76c301430746be4fc7ec6d"; + }; + + buildInputs = [ unzip ]; + + phases = ["unpackPhase" "installPhase"]; + installPhase = '' + ensureDir $out && cp -R * $out + ${optionalString (conf!=null) ''cp ${conf} $out/config.js''} + ''; + + meta = { + description = "A Graphite & InfluxDB Dashboard and Graph Editor"; + homepage = http://grafana.org/; + license = licenses.asl20; + + maintainers = [ maintainers.offline ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70cab717c169..430d3b789da7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1146,6 +1146,8 @@ let gptfdisk = callPackage ../tools/system/gptfdisk { }; + grafana = callPackage ../development/tools/misc/grafana { }; + grafx2 = callPackage ../applications/graphics/grafx2 {}; graphviz = callPackage ../tools/graphics/graphviz { }; From 48458b1c9654509f5bd889f9ec8b395d506140e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 27 May 2014 21:07:59 +0200 Subject: [PATCH 074/254] handbrake: disable unfree faac, as it doesn't build with it --- pkgs/applications/video/handbrake/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 34aa8ff65de8..297da6738ee4 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { version = "0.9.9"; name = "handbrake-${version}"; - allowUnfree = config.allowUnfree or false; + # ToDo: doesn't work (yet) + allowUnfree = false; # config.allowUnfree or false; buildInputsX = stdenv.lib.optionals useGtk [ glib gtk intltool libnotify @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals useWebKitGtk [ webkitgtk ]; # Did not test compiling with it - unfreeInputs = stdenv.lib.optionals allowUnfree [ faac ]; + unfreeInputs = stdenv.lib.optional allowUnfree faac; nativeBuildInputs = [ python pkgconfig yasm autoconf automake libtool m4 ]; buildInputs = [ @@ -49,14 +50,14 @@ stdenv.mkDerivation rec { lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 ] ++ buildInputsX ++ unfreeInputs; - + src = fetchurl { name = "HandBrake-${version}.tar.bz2"; url = "http://handbrake.fr/rotation.php?file=HandBrake-${version}.tar.bz2"; sha256 = "1crmm1c32vx60jfl2bqzg59q4qqx6m83b08snp7h1njc21sdf7d7"; }; - patches = stdenv.lib.optionals (! allowUnfree) [ ./disable-unfree.patch ]; + patches = stdenv.lib.optional (! allowUnfree) ./disable-unfree.patch; preConfigure = '' # Fake wget to prevent downloads From a33cb3769582758b6df4a4eb404f51552669e5bc Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 5 May 2014 10:46:50 +1000 Subject: [PATCH 075/254] perl-file-mimeinfo: update to 0.23 and fix build on darwin Close #2508. The test also fails on x86_64-linux, disabling. --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2b67e2a89d88..4239d6dd7462 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3539,12 +3539,13 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ HTTPDate ]; }; - FileMimeInfo = buildPerlPackage { - name = "File-MimeInfo-0.20"; + FileMimeInfo = buildPerlPackage rec { + name = "File-MimeInfo-0.23"; src = fetchurl { - url = "http://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/File-MimeInfo-0.20.tar.gz"; - sha256 = "1738yi3a0xcbvffqymjb6cyh999q4pryalfwbkmdbjdks2y0bxz0"; + url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; + sha256 = "006i9idnxv9hsz1gykc5bqs05ma5wz9dsjrpmah9293bgdy1ccxj"; }; + doCheck = false; # Failed test 'desktop file is the right one' propagatedBuildInputs = [ FileBaseDir FileDesktopEntry ]; }; From 4d6f2e41d79cb19b68fdd89e668498159d0a52b8 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 27 May 2014 21:16:42 +0200 Subject: [PATCH 076/254] ethtool: update from 3.13 to 3.14 --- pkgs/tools/misc/ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index fe5985b96982..1b6205db7ce7 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ethtool-3.13"; + name = "ethtool-3.14"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "07z7janzj8fbs04sw6nlzr039yh7b5gmzvik7ymg807i2gi5fmjs"; + sha256 = "01v7a757757bk68vvap2x0v6jbqicchnjxvh52w8dccixxq2nkj3"; }; meta = with stdenv.lib; { From 400e85ae1edd539ec6ebe441bdad1584aa6f9bc7 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 27 May 2014 21:17:56 +0200 Subject: [PATCH 077/254] debootstrap: update from 1.0.42 to 1.0.60 --- pkgs/tools/misc/debootstrap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 388cfa14e41e..aac7855827cc 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -32,13 +32,13 @@ in stdenv.mkDerivation { - name = "debootstrap-1.0.42"; + name = "debootstrap-1.0.60"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) - url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.42.tar.gz; - sha256 = "0a5azl22wz1q92b2c91zlpz6krd7wqyi63yk87vyczp363ml0nz0"; + url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.60.tar.xz; + sha256 = "0jyxfmx466fsqak00m4n6b04zsdqym81ybah7yx2l081d0518sw8"; }; buildInputs = [ dpkg gettext gawk perl ]; From 6bfb25b9e870ef080120108e2b1a94ace725a015 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 27 May 2014 21:18:33 +0200 Subject: [PATCH 078/254] dos2unix: update from 6.0.4 to 6.0.5 --- pkgs/tools/text/dos2unix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index a7d5bed6642a..dc61723e5977 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation { - name = "dos2unix-6.0.4"; + name = "dos2unix-6.0.5"; src = fetchurl { - url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.4.tar.gz; - sha256 = "0ymkp55shilzcrn60w1ni92gck7pbqxhi9qsnsii7gkz996j5gb6"; + url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.5.tar.gz; + sha256 = "13w5blhv0i473y9lyrxh4axz4niyrxcpj4v2qiq3w5kamyp20czx"; }; configurePhase = '' From 4dd050b4255f51661d8b7b96ad90201993841475 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 27 May 2014 15:27:17 -0500 Subject: [PATCH 079/254] update znc 1.2 -> 1.4 --- pkgs/applications/networking/znc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index dbf886de9786..fdd02aac0b5e 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "znc-1.2"; + name = "znc-1.4"; src = fetchurl { url = "http://znc.in/releases/${name}.tar.gz"; - sha256 = "07bh306wl5494sqsgz4a526wvyrylkc8vpnbr5pkxwjg90mcv8nr"; + sha256 = "0lkv58pq4d5lzcyx8v8anzinx0sx0zw0js4jij13jb8qxp88zsc6"; }; buildInputs = [ openssl pkgconfig ] From 66456c07989282f63a8425cc3a4554a79f1b6709 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 27 May 2014 22:54:43 +0200 Subject: [PATCH 080/254] nixos: add influxdb module --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/databases/influxdb.nix | 241 ++++++++++++++++++ nixos/release.nix | 1 + nixos/tests/influxdb.nix | 34 +++ 5 files changed, 279 insertions(+) create mode 100644 nixos/modules/services/databases/influxdb.nix create mode 100644 nixos/tests/influxdb.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 13ec502047db..db50a010e7da 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -132,6 +132,7 @@ hydra = 122; spiped = 123; teamspeak = 124; + influxdb = 125; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -238,6 +239,7 @@ hydra = 122; spiped = 123; teamspeak = 124; + influxdb = 125; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0737da71923d..c1b55cb5550e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -98,6 +98,7 @@ ./services/databases/postgresql.nix ./services/databases/virtuoso.nix ./services/databases/monetdb.nix + ./services/databases/influxdb.nix ./services/desktops/accountservice.nix ./services/desktops/geoclue2.nix ./services/desktops/gnome3/at-spi2-core.nix diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix new file mode 100644 index 000000000000..61fe96d5d641 --- /dev/null +++ b/nixos/modules/services/databases/influxdb.nix @@ -0,0 +1,241 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.influxdb; + + influxdbConfig = pkgs.writeText "config.toml" '' + bind-address = "${cfg.bindAddress}" + + [logging] + level = "info" + file = "stdout" + + [admin] + port = ${toString cfg.adminPort} + assets = "${pkgs.influxdb}/share/influxdb/admin" + + [api] + port = ${toString cfg.apiPort} + ${cfg.apiExtraConfig} + + [input_plugins] + ${cfg.inputPluginsConfig} + + [raft] + dir = "${cfg.dataDir}/raft" + ${cfg.raftConfig} + + [storage] + dir = "${cfg.dataDir}/db" + ${cfg.storageConfig} + + [cluster] + ${cfg.clusterConfig} + + [sharding] + ${cfg.shardingConfig} + + [wal] + dir = "${cfg.dataDir}/wal" + ${cfg.walConfig} + + ${cfg.extraConfig} + ''; +in +{ + + ###### interface + + options = { + + services.influxdb = { + + enable = mkOption { + default = false; + description = "Whether to enable the influxdb server"; + type = types.uniq types.bool; + }; + + package = mkOption { + default = pkgs.influxdb; + description = "Which influxdb derivation to use"; + type = types.package; + }; + + user = mkOption { + default = "influxdb"; + description = "User account under which influxdb runs"; + type = types.string; + }; + + group = mkOption { + default = "influxdb"; + description = "Group under which influxdb runs"; + type = types.string; + }; + + dataDir = mkOption { + default = "/var/db/influxdb"; + description = "Data directory for influxd data files."; + type = types.path; + }; + + bindAddress = mkOption { + default = "127.0.0.1"; + description = "Address where influxdb listens"; + type = types.str; + }; + + adminPort = mkOption { + default = 8083; + description = "The port where influxdb admin listens"; + type = types.int; + }; + + apiPort = mkOption { + default = 8086; + description = "The port where influxdb api listens"; + type = types.int; + }; + + apiExtraConfig = mkOption { + default = '' + read-timeout = "5s" + ''; + description = "Extra influxdb api configuration"; + example = '' + ssl-port = 8084 + ssl-cert = /path/to/cert.pem + read-timeout = "5s" + ''; + type = types.lines; + }; + + inputPluginsConfig = mkOption { + default = ""; + description = "Configuration of influxdb extra plugins"; + example = '' + [input_plugins.graphite] + enabled = true + port = 2003 + database = "graphite" + ''; + }; + + raftConfig = mkOption { + default = '' + port = 8090 + ''; + description = "Influxdb raft configuration"; + type = types.lines; + }; + + storageConfig = mkOption { + default = '' + write-buffer-size = 10000 + ''; + description = "Influxdb raft configuration"; + type = types.lines; + }; + + clusterConfig = mkOption { + default = '' + protobuf_port = 8099 + protobuf_timeout = "2s" + protobuf_heartbeat = "200ms" + protobuf_min_backoff = "1s" + protobuf_max_backoff = "10s" + + write-buffer-size = 10000 + max-response-buffer-size = 100 + + concurrent-shard-query-limit = 10 + ''; + description = "Influxdb cluster configuration"; + type = types.lines; + }; + + leveldbConfig = mkOption { + default = '' + max-open-files = 40 + lru-cache-size = "200m" + max-open-shards = 0 + point-batch-size = 100 + write-batch-size = 5000000 + ''; + description = "Influxdb leveldb configuration"; + type = types.lines; + }; + + shardingConfig = mkOption { + default = '' + replication-factor = 1 + + [sharding.short-term] + duration = "7d" + split = 1 + + [sharding.long-term] + duration = "30d" + split = 1 + ''; + description = "Influxdb sharding configuration"; + type = types.lines; + }; + + walConfig = mkOption { + default = '' + flush-after = 1000 + bookmark-after = 1000 + index-after = 1000 + requests-per-logfile = 10000 + ''; + description = "Influxdb write-ahead log configuration"; + type = types.lines; + }; + + extraConfig = mkOption { + default = ""; + description = "Extra configuration options for influxdb"; + type = types.string; + }; + }; + + }; + + + ###### implementation + + config = mkIf config.services.influxdb.enable { + + systemd.services.influxdb = { + description = "InfluxDB Server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" ]; + serviceConfig = { + ExecStart = ''${cfg.package}/bin/influxdb -config "${influxdbConfig}"''; + User = "${cfg.user}"; + Group = "${cfg.group}"; + PermissionsStartOnly = true; + }; + preStart = '' + mkdir -m 0770 -p ${cfg.dataDir} + if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi + ''; + }; + + users.extraUsers = optional (cfg.user == "influxdb") { + name = "influxdb"; + uid = config.ids.uids.influxdb; + description = "Influxdb daemon user"; + }; + + users.extraGroups = optional (cfg.group == "influxdb") { + name = "influxdb"; + gid = config.ids.gids.influxdb; + }; + }; + +} diff --git a/nixos/release.nix b/nixos/release.nix index 06749966cbb7..e5eadb57fe62 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -221,6 +221,7 @@ in rec { tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test); tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test); tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test); + tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; tests.kde4 = callTest tests/kde4.nix {}; diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix new file mode 100644 index 000000000000..278b264170fa --- /dev/null +++ b/nixos/tests/influxdb.nix @@ -0,0 +1,34 @@ +# This test runs influxdb and checks if influxdb is up and running + +import ./make-test.nix { + nodes = { + one = { config, pkgs, ... }: { + services.influxdb.enable = true; + }; + }; + + testScript = '' + startAll; + + $one->waitForUnit("influxdb.service"); + + # Check if admin interface is avalible + $one->waitUntilSucceeds("curl -f 127.0.0.1:8083"); + + # create database + $one->succeed(q~ + curl -X POST 'http://localhost:8086/db?u=root&p=root' \ + -d '{"name": "test"}' + ~); + + # write some points and run simple query + $one->succeed(q~ + curl -X POST 'http://localhost:8086/db/test/series?u=root&p=root' \ + -d '[{"name":"foo","columns":["val"],"points":[[6666]]}]' + ~); + $one->succeed(q~ + curl -G 'http://localhost:8086/db/test/series?u=root&p=root' \ + --data-urlencode 'q=select * from foo limit 1' | grep 6666 + ~); + ''; +} From 57ed344917d909ca6ef76f24b3bb78f75b7ec407 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 27 May 2014 17:22:25 -0400 Subject: [PATCH 081/254] Fix /run/keys permissions --- nixos/modules/system/boot/stage-2-init.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index a64c6cdfa191..ab414e29eb2f 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -121,9 +121,10 @@ fi # written to disk (generally used for NixOps, harmless elsewhere). if ! mountpoint -q /run/keys; then rm -rf /run/keys - mkdir -m 0750 /run/keys - chown 0:96 /run/keys + mkdir /run/keys mount -t ramfs none /run/keys + chown 0:96 /run/keys + chmod 0750 /run/keys fi mkdir -m 0755 -p /run/lock From 66925a57ba3fc393c0ed9cd9bea02e22c4f73edb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 28 May 2014 01:15:59 +0400 Subject: [PATCH 082/254] Updating SBCL to 1.2.0 --- pkgs/development/compilers/sbcl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 36ea8981786e..e1de4c53de50 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -4,11 +4,11 @@ let s= # Generated upstream information rec { baseName="sbcl"; - version="1.1.16"; + version="1.2.0"; name="${baseName}-${version}"; - hash="04631klj02crs82b1i21rpddcgh9x6nnarj5avavy9c7zgvr8cnw"; - url="mirror://sourceforge/project/sbcl/sbcl/1.1.16/sbcl-1.1.16-source.tar.bz2"; - sha256="04631klj02crs82b1i21rpddcgh9x6nnarj5avavy9c7zgvr8cnw"; + hash="13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; + url="mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2"; + sha256="13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; }; buildInputs = with a; [ clisp makeWrapper From f36db74cc4034d478a74ae26efbaf07f95e88eb4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 28 May 2014 01:19:22 +0400 Subject: [PATCH 083/254] Updating libgphoto2 --- pkgs/development/libraries/libgphoto2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index afab21bc4f09..ca8073fbe306 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "18nd2zkgazphgkfdhf8ps7knda8vdnhrq9c02989279x2qxjsci9"; + sha256 = "1h0bwrbc69yq561pw4fjyclwvk0g6rrj3pw6zrdx33isipi15d2z"; }; nativeBuildInputs = [ pkgconfig gettext ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.3.1"; + version = "2.5.4"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; From 736dff5328e738bae153bfa6a1f6f40906202317 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 28 May 2014 01:19:51 +0400 Subject: [PATCH 084/254] Updating libsodium to 0.5.0 --- pkgs/development/libraries/sodium/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix index 027f9e2f2fc9..93f2ff0de6b6 100644 --- a/pkgs/development/libraries/sodium/default.nix +++ b/pkgs/development/libraries/sodium/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="sodium"; - version="0.4.5"; + version="0.5.0"; name="${baseName}-${version}"; - hash="0cmcw479p866r6cjh20wzjr84pdn0mfswr5h57mw1siyylnj1mbs"; - url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.4.5.tar.gz"; - sha256="0cmcw479p866r6cjh20wzjr84pdn0mfswr5h57mw1siyylnj1mbs"; + hash="1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w"; + url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.5.0.tar.gz"; + sha256="1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w"; }; buildInputs = [ ]; From 5c5bae95871113b9954318257a188854a197951c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 28 May 2014 01:20:13 +0400 Subject: [PATCH 085/254] Updatign ASDF to 3.1.2 --- pkgs/development/lisp-modules/asdf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index c0602e2c0284..97e1661544ba 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="asdf"; - version="3.0.3"; + version="3.1.2"; name="${baseName}-${version}"; - hash="0iszin6j0qxw48gkn30rqgwm240177hx06khhgv8041zsf1ivw85"; - url="http://common-lisp.net/project/asdf/archives/asdf-3.0.3.tar.gz"; - sha256="0iszin6j0qxw48gkn30rqgwm240177hx06khhgv8041zsf1ivw85"; + hash="0d427908q4hcspmdhc5ps38dbvz113hy6687l9ypmfl79qfb2qki"; + url="http://common-lisp.net/project/asdf/archives/asdf-3.1.2.tar.gz"; + sha256="0d427908q4hcspmdhc5ps38dbvz113hy6687l9ypmfl79qfb2qki"; }; buildInputs = [ texinfo texLive From 700d332e7d7affe09fd6742bf02eac5e387740c6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 28 May 2014 01:20:40 +0400 Subject: [PATCH 086/254] Updating CL-Launch --- pkgs/development/tools/misc/cl-launch/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index 5d7da48ccede..14a36470bbab 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="cl-launch"; - version="4.0.2.2"; + version="4.0.4"; name="${baseName}-${version}"; - hash="1a7nwm1gkvpypfbhl29gj4gba50r5b069g3c87cfvrk2n4plm65b"; - url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.2.2.tar.gz"; - sha256="1a7nwm1gkvpypfbhl29gj4gba50r5b069g3c87cfvrk2n4plm65b"; + hash="152m834myhcgi4iacfqn81fznlbqxn7pvdlxvk2lbba09h0slm56"; + url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.4.tar.gz"; + sha256="152m834myhcgi4iacfqn81fznlbqxn7pvdlxvk2lbba09h0slm56"; }; buildInputs = [ ]; From 97c61e9a44eaa2453f5433a38c673ff949fb18e3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 28 May 2014 01:21:02 +0400 Subject: [PATCH 087/254] Updating LuaRocks --- pkgs/development/tools/misc/luarocks/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 953035342fd8..c8579ef3831b 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="luarocks"; - version="2.1.2"; + version="2.2"; name="${baseName}-${version}"; - hash="1wwz71ymzjcyw8pz36yiw2x87c6v8nx5vdcd7zibm1n815v5qqk2"; - url="http://luarocks.org/releases/luarocks-2.1.2.tar.gz"; - sha256="1wwz71ymzjcyw8pz36yiw2x87c6v8nx5vdcd7zibm1n815v5qqk2"; + hash="03i46ayimp087288f0bi6g30fi3aixp2bha2jmsbbhwmsxm1yshs"; + url="http://luarocks.org/releases/luarocks-2.2.0beta1.tar.gz"; + sha256="03i46ayimp087288f0bi6g30fi3aixp2bha2jmsbbhwmsxm1yshs"; }; buildInputs = [ lua curl From bc292a5882140338375a7b4a7b2f1c44e2cc230c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 28 May 2014 01:21:47 +0400 Subject: [PATCH 088/254] Updating Wine unstable to 1.7.19 --- pkgs/misc/emulators/wine/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index bf55f93db5b7..b3c68429d6da 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.14"; + version = "1.7.19"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "029y4vsjz2jxy31g5nylpl7wm5qhw37dsbx4f0za6swk51z97w9d"; + sha256 = "1wigncw7xl6ni6kjmhmbzffhf0pav22b50aql93wz7h2r409psn5"; }; gecko = fetchurl { From f769585c95ec284a932b07667b0a440c20d8d07e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 28 May 2014 01:22:44 +0400 Subject: [PATCH 089/254] Updating SlimerJS to 0.9.1 --- pkgs/development/tools/slimerjs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 86c8b923cca5..9741b0930d22 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.9.0"; + version="0.9.1"; name="${baseName}-${version}"; - hash="1b4c299gk20mqb91929jan9ldhwy3jska75wvil9vdmgjrr8496m"; - url="http://download.slimerjs.org/v0.9/0.9.0/slimerjs-0.9.0.zip"; - sha256="1b4c299gk20mqb91929jan9ldhwy3jska75wvil9vdmgjrr8496m"; + hash="1ss69z2794mv40nfa5bfjd8h78jzcjq5xm63hzay1iyvp5rjbl7k"; + url="http://download.slimerjs.org/v0.9/0.9.1/slimerjs-0.9.1.zip"; + sha256="1ss69z2794mv40nfa5bfjd8h78jzcjq5xm63hzay1iyvp5rjbl7k"; }; buildInputs = [ unzip zip From 515a7e78fa77530800b42ca440c981bf0d677ead Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 28 May 2014 01:23:03 +0400 Subject: [PATCH 090/254] Updating conspy --- pkgs/os-specific/linux/conspy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/os-specific/linux/conspy/default.nix index 44689cd5d62d..d252d9ce1621 100644 --- a/pkgs/os-specific/linux/conspy/default.nix +++ b/pkgs/os-specific/linux/conspy/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="conspy"; - version="1.8"; + version="1.9"; name="${baseName}-${version}"; - hash=sha256; - url="http://ace-host.stuart.id.au/russell/files/conspy/conspy-1.8.tar.gz"; - sha256="1jc2maqp4w4mzlr3s8yni03w1p9sir5hb7gha3ffxj4n32nx42dq"; + hash="1ndwdx8x5lnjl6cddy1d8g8m7ndxyj3wrs100w2bp9gnvbxbb8vv"; + url="http://ace-host.stuart.id.au/russell/files/conspy/conspy-1.9.tar.gz"; + sha256="1ndwdx8x5lnjl6cddy1d8g8m7ndxyj3wrs100w2bp9gnvbxbb8vv"; }; buildInputs = [ autoconf automake ncurses From 783fb585bfb1f6a050747e852808cf2187f6b0ed Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 28 May 2014 01:23:28 +0400 Subject: [PATCH 091/254] Updating ZPAQ to 651 --- pkgs/tools/archivers/zpaq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index c77517fa1772..2f44a8dd4db0 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="649"; + version="651"; name="${baseName}-${version}"; - hash="0rspkd8vdp06hyjlrhgqjrv37bwvnzvqw0smlcy5fjbny502s5nn"; - url="http://mattmahoney.net/dc/zpaq649.zip"; - sha256="0rspkd8vdp06hyjlrhgqjrv37bwvnzvqw0smlcy5fjbny502s5nn"; + hash="1n0qq4lia25n62jpa0gg29388xf8r75nv4h1vpc3s5rpymkq2qw5"; + url="http://mattmahoney.net/dc/zpaq651.zip"; + sha256="1n0qq4lia25n62jpa0gg29388xf8r75nv4h1vpc3s5rpymkq2qw5"; }; buildInputs = [ unzip From 5c5cef35cb58af1065b2e762dd9ea51386c4976a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 28 May 2014 01:33:15 +0400 Subject: [PATCH 092/254] Updating Asymptote to 2.32 --- pkgs/tools/graphics/asymptote/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index b4bb49758a42..5109bb45e30c 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -11,11 +11,11 @@ let s = # Generated upstream information rec { baseName="asymptote"; - version="2.24"; - name="asymptote-2.24"; - hash="0iypv3n89h8mx46b0c3msl0ldmg7fxf8v9fl4zy4sxfszazrvivl"; - url="mirror://sourceforge/project/asymptote/2.24/asymptote-2.24.src.tgz"; - sha256="0iypv3n89h8mx46b0c3msl0ldmg7fxf8v9fl4zy4sxfszazrvivl"; + version="2.32"; + name="${baseName}-${version}"; + hash="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90"; + url="mirror://sourceforge/project/asymptote/2.32/asymptote-2.32.src.tgz"; + sha256="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90"; }; buildInputs = with a; [ freeglut ghostscriptX imagemagick fftw boehmgc From 4cb43d2a756449c43e6ce4713b0eb8169591597f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 28 May 2014 01:35:31 -0500 Subject: [PATCH 093/254] Build ppl and gmp correctly for building gcc48 on darwin --- pkgs/development/libraries/gmp/5.1.x.nix | 3 ++- pkgs/development/libraries/ppl/default.nix | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index a25eabbee86e..53d7f4585659 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { # (x86), except on Solaris where some tests crash with "Memory fault". # See , for instance. (stdenv.lib.optional (!stdenv.isSunOS) "--enable-fat") - ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]) + ++ (if cxx then [ "--enable-cxx" "CPPFLAGS=-fexceptions" ] + else [ "--disable-cxx" ]) ++ (if stdenv.is64bit then [ "--with-pic" ] else []); doCheck = true; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index cbdb7b128b45..2c22317a6ca7 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl gnum4 ]; propagatedBuildInputs = [ gmpxx ]; - configureFlags = "--disable-watchdog"; + configureFlags = [ "--disable-watchdog" "CPPFLAGS=-fexceptions" ] ++ + stdenv.lib.optionals stdenv.isDarwin [ + "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips" + ]; patches = [ ./upstream-based.patch ]; From ea23ea00e4fd2b834b06313db2e4604379ab002e Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 28 May 2014 10:40:21 +0200 Subject: [PATCH 094/254] Make fetchhg do the same as nix-prefetch-hg, use hg archive. Fixes #2781. --- pkgs/build-support/fetchhg/builder.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh index 73ec7ec0b362..6e9fbab791f3 100644 --- a/pkgs/build-support/fetchhg/builder.sh +++ b/pkgs/build-support/fetchhg/builder.sh @@ -2,8 +2,9 @@ source $stdenv/setup header "getting $url${tag:+ ($tag)} into $out" -hg clone --insecure ${tag:+-r "$tag"} "$url" "$out" +hg clone --insecure ${tag:+-r "$tag"} "$url" hg-clone -rm -rf "$out/.hg" +hg archive -q -y ${tag:+-r "$tag"} --cwd hg-clone $out +rm -f $out/.hg_archival.txt stopNest From 3ee69912b29c9cb165ec6126edc3dd4087b3adb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 28 May 2014 12:12:26 +0200 Subject: [PATCH 095/254] Adding ocropus, based on an expression from iElectric. --- pkgs/applications/misc/ocropus/default.nix | 63 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/applications/misc/ocropus/default.nix diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix new file mode 100644 index 000000000000..60fd3b2ccb31 --- /dev/null +++ b/pkgs/applications/misc/ocropus/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchhg, fetchurl, pythonPackages, curl }: + +let + getmodel = name: sha256: { + src = fetchurl { + url = "http://iupr1.cs.uni-kl.de/~tmb/ocropus-models/${name}"; + inherit sha256; + }; + inherit name; + }; + + models = [ + (getmodel "en-default.pyrnn.gz" + "1xyi3k3p81mfw0491gb1haisazfyi2i18f1wjs1m34ak39qfqjdp") + (getmodel "en-uw3-linerel-2.cmodel.gz" + "0zdw0db2znxxd4h7aa09506nkbxd1cfqacxzyzlx42bjn951wcpw") + (getmodel "en-mixed-3.ngraphs.gz" + "1fqw7pxmjwapirp9xv3b0gn9pk53q4740qn5dw4wxfxk9dpp9lr4") + (getmodel "en-space.model.gz" + "0w5hnjm6rz5iiw1p2yixj147ifq11s9jfzrxk4v4xxmcyn365096") + (getmodel "en-mixed.lineest.gz" + "0skrziksn3zb3g8588y7jd10pnl2pzrby0119ac0awapzzg9vkvw") + (getmodel "uw3unlv.pyrnn.gz" + "0g08q9cjxxx3mg1jn4654nalxr56y2jq1h33pwxrj5lrckr7grb9") + (getmodel "en-uw3unlv-perchar.cmodel.gz" + "1izvm0wkb2vh58hjp59fw97drv17zdzrw6mz3aanrg5ax6fnfadk") + (getmodel "gradient.lineest.gz" + "1bw9hj9byjxi31rjh2xiysnx8c72jz0npxa54xgjwsqg7ihl8jzw") + (getmodel "en-mixed-round1.lineest.gz" + "1fjkygyrg4ng7kx4iqa4yhgvmw1zq72p3q5p0hcb2xxhqc04vx7c") + (getmodel "frakant.pyrnn.gz" + "0i1k95f2a8qlc6m7qq11pmjfcimyrjsfjvv20nrs2ygp9pwskmxp") + (getmodel "fraktur.pyrnn.gz" + "1wlwvxn91ilgmlri1hj81arl3mbzxc24ycdnkf5icq4hdi4c6y8b") + ]; +in +pythonPackages.buildPythonPackage rec { + name = "ocropus-${version}"; + version = "20130905"; + + src = fetchhg { + url = "https://code.google.com/p/ocropus.ocropy"; + tag = "a6e0fbd820ce"; + sha256 = "1s0v0gd6psfjp6lghwl2dj49h18mgf2n2z8hqzw8430nzhglnlvr"; + }; + + buildInputs = with pythonPackages; [ curl numpy scipy pillow matplotlib ]; + + enableParallelBuilding = true; + + preConfigure = with stdenv.lib; '' + ${concatStrings (map (x: "ln -s ${x.src} models/${x.name};") models)} + ${pythonPackages.python}/bin/${pythonPackages.python.executable} setup.py download_models + ''; + + meta = with stdenv.lib; { + description = "Open source document analysis and OCR system"; + license = licenses.asl20; + homepage = https://code.google.com/p/ocropus/; + maintainers = with maintainers; [ iElectric viric ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3214c110dfc4..04116d388837 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3462,6 +3462,8 @@ let # mercurial (hg) bleeding edge version octaveHG = callPackage ../development/interpreters/octave/hg.nix { }; + + ocropus = callPackage ../applications/misc/ocropus { }; perl58 = callPackage ../development/interpreters/perl/5.8 { impureLibcPath = if stdenv.isLinux then null else "/usr"; From 6a359589364c12df7b5745e0d7d8a81467979fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 28 May 2014 12:39:54 +0200 Subject: [PATCH 096/254] Adding missing dependencies. There is still a matplotlib problem running ocropus-hocr. --- pkgs/applications/misc/ocropus/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index 60fd3b2ccb31..aaf0039305b1 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -44,7 +44,8 @@ pythonPackages.buildPythonPackage rec { sha256 = "1s0v0gd6psfjp6lghwl2dj49h18mgf2n2z8hqzw8430nzhglnlvr"; }; - buildInputs = with pythonPackages; [ curl numpy scipy pillow matplotlib ]; + propagatedBuildInputs = with pythonPackages; [ curl numpy scipy pillow + matplotlib beautifulsoup4 pygtk ]; enableParallelBuilding = true; From 5c3c688f7bc16cdcf57f7c0a4ebb61b369088ef1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 8 Apr 2014 13:17:40 +0200 Subject: [PATCH 097/254] Elm: fix build by ignoring the build instructions provided by upstream Re-apply the build fix from , because apparently the underlying issue has not been fixed. According to , Elm's release archive comes with a Setup.hs that cannot compile an Elm release. Duh! Replacing the custom Setup.hs file with a dummy version fixes this issue. --- pkgs/development/compilers/elm/elm.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix index 3daa1b507b76..622f182e8c56 100644 --- a/pkgs/development/compilers/elm/elm.nix +++ b/pkgs/development/compilers/elm/elm.nix @@ -24,6 +24,10 @@ cabal.mkDerivation (self: { unorderedContainers yaml ]; doCheck = false; + preConfigure = '' + rm -f Setup.hs + echo -e "import Distribution.Simple\nmain=defaultMain\n" > Setup.hs + ''; meta = { homepage = "http://elm-lang.org"; description = "The Elm language module"; From 1d70298e2e203021bafac8708120607e63aa3590 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 28 May 2014 12:39:09 +0200 Subject: [PATCH 098/254] Elm: require binary 0.7.x on ghc <= 7.6.3 --- pkgs/top-level/haskell-defaults.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 3618c0f10ed9..d803883413d8 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -37,6 +37,7 @@ vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_1; }; }; }; + Elm = super.Elm.override { pandoc = self.pandoc.override { zipArchive = self.zipArchive.override { binary = self.binary_0_7_2_1; }; }; }; gloss = null; # requires base >= 4.7 haddock = self.haddock_2_13_2; modularArithmetic = null; # requires base >= 4.7 From c4349c3b17f95ab2c3897dc22d2f852dbc7e27da Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 28 May 2014 13:04:16 +0200 Subject: [PATCH 099/254] crrcsim: Update to 0.9.12 & simplify. --- pkgs/games/crrcsim/default.nix | 54 ++++++++++------------------------ 1 file changed, 15 insertions(+), 39 deletions(-) diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index a080436bbe01..944b67041c26 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -1,48 +1,24 @@ -x@{builderDefsPackage - , mesa, SDL, SDL_mixer, plib, libjpeg - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="crrcsim"; - version="0.9.11"; - name="${baseName}-${version}"; - url="mirror://sourceforge/${baseName}.berlios/${name}.tar.gz"; - hash="16z9gixp60920lqckij8kdw90jys0llls4lw5c8vqgk14ck5hhiz"; - }; +{ stdenv, fetchurl, mesa, SDL, SDL_mixer, plib, libjpeg }: +let + version = "0.9.12"; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "crrcsim-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/crrcsim/${name}.tar.gz"; + sha256 = "1yx3cn7ilwj92v6rk3zm565ap92vmky4r39na814lfglkzn6l5id"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = [ + mesa SDL SDL_mixer plib libjpeg + ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - meta = { description = "A model-airplane flight simulator"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = with stdenv.lib.maintainers; [ raskin the-kenny ]; + platforms = stdenv.lib.platforms.linux; license = "GPLv2"; }; - passthru = { - updateInfo = { - downloadPage = "http://crrcsim.berlios.de/wiki/index.php?n=CRRCsim.DownLoad"; #TODO: berlios shut down - }; - }; -}) x +} From d6f793b4530f7e41c445df02485512bdbedaca82 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 28 May 2014 14:01:14 +0300 Subject: [PATCH 100/254] pythonPackages.gflags: update to 2.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 234a0b396a08..0dc14e5a7145 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3216,11 +3216,11 @@ rec { gflags = buildPythonPackage rec { - name = "gflags-1.5.1"; + name = "gflags-2.0"; src = fetchurl { url = "http://python-gflags.googlecode.com/files/python-${name}.tar.gz"; - sha256 = "1p8blsc3z1wasi9dhbjij7m2czps17dll3cpj37v97fv5ww7al9v"; + sha256 = "1mkc7315bpmh39vbn0jq237jpw34zsrjr1sck98xi36bg8hnc41i"; }; meta = { From 350c96cce998d7f25b27678193af233ebbbeedbe Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 28 May 2014 14:11:37 +0300 Subject: [PATCH 101/254] pythonPackages.iso8601_0_1_4: add package version 0.1.4 for gcutil --- pkgs/top-level/python-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0dc14e5a7145..07d63a0472c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3562,6 +3562,19 @@ rec { propagatedBuildInputs = [ pythonPackages.nose pythonPackages.ipythonLight ]; }; + iso8601_0_1_4 = buildPythonPackage { + name = "iso8601-0.1.4"; + src = fetchurl { + url = https://pypi.python.org/packages/source/i/iso8601/iso8601-0.1.4.tar.gz; + sha256 = "03gnjxpfq0wwimqnsvz32xcngq0hrdqryn3zm8qh95hnnggwqa3s"; + }; + + meta = { + homepage = https://bitbucket.org/micktwomey/pyiso8601/; + description = "Simple module to parse ISO 8601 dates"; + maintainers = [ stdenv.lib.maintainers.phreedom ]; + }; + }; jedi = buildPythonPackage (rec { name = "jedi-0.7.0"; From 7be252bd4f5bf847a53aa63c5a4afc40d1fb7977 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 28 May 2014 14:16:55 +0300 Subject: [PATCH 102/254] pythonPackages.ipaddr: update to 2.1.10 --- pkgs/top-level/python-packages.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07d63a0472c6..62f62012debd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3528,15 +3528,12 @@ rec { ipaddr = buildPythonPackage { - name = "ipaddr-2.1.7"; + name = "ipaddr-2.1.10"; src = fetchurl { - url = "http://ipaddr-py.googlecode.com/files/ipaddr-2.1.7.tar.gz"; - md5 = "71a2be9f1d528d9a945ef555de312685"; + url = "http://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz"; + sha256 = "18ycwkfk3ypb1yd09wg20r7j7zq2a73d7j6j10qpgra7a7abzhyj"; }; - # error: invalid command 'test' - doCheck = false; - meta = { description = "Google's IP address manipulation library"; homepage = http://code.google.com/p/ipaddr-py/; From 4437a90a6f052c9bf87440a3a8095ab735989a87 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 28 May 2014 14:27:51 +0300 Subject: [PATCH 103/254] pythonPackages.google-apputils: add package --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62f62012debd..b4bce4884cf3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3319,6 +3319,22 @@ rec { }; }; + google_apputils = buildPythonPackage rec { + name = "google-apputils-0.4.0"; + + src = fetchurl { + url = http://pypi.python.org/packages/source/g/google-apputils/google-apputils-0.4.0.tar.gz; + sha256 = "18wlivnqxvx1wsw177lckpl32nmr6cq7f5nhk8r72fvjy8wynq5j"; + }; + + propagatedBuildInputs = [ pytz gflags dateutil_1_5 mox ]; + + meta = with stdenv.lib; { + description = "Google Application Utilities for Python"; + homepage = http://code.google.com/p/google-apputils-python; + }; + }; + greenlet = buildPythonPackage rec { name = "greenlet-0.3.1"; From cf32243de50032c400d213ede5b16bb424182b25 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 28 May 2014 14:32:21 +0300 Subject: [PATCH 104/254] pythonPackages.gcutil: add package --- pkgs/top-level/python-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4bce4884cf3..933a073a5aa3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1849,6 +1849,18 @@ rec { }; }; + gcutil = buildPythonPackage rec { + name = "gcutil-1.15.0"; + meta.maintainers = [ stdenv.lib.maintainers.phreedom ]; + + src = fetchurl { + url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.15.0.tar.gz; + sha256 = "12c98ivhjr01iz6lkga574xm8p0bsil6arydvpblyw8sjkgim5sq"; + }; + + propagatedBuildInputs = [ gflags iso8601_0_1_4 ipaddr httplib2 google_apputils google_api_python_client ]; + }; + gitdb = buildPythonPackage rec { name = "gitdb-0.5.4"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; From 089b2930196a95e5111a1d21b06d6c8e76cfd011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Wed, 28 May 2014 20:12:53 +0800 Subject: [PATCH 105/254] better error message in case of missing uids --- nixos/modules/config/users-groups.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 873b6fb424de..5de81a773424 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -509,7 +509,7 @@ in { message = "uids and gids must be unique!"; } { assertion = cfg.mutableUsers || (nonUidUsers == {}); - message = "When mutableUsers is false, no uid can be null"; + message = "When mutableUsers is false, no uid can be null: ${toString (attrNames nonUidUsers)}"; } { assertion = cfg.mutableUsers || (nonGidGroups == {}); message = "When mutableUsers is false, no gid can be null"; From a8c9c11f9ec5b0d0d5eec279b66da84a89008f61 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 28 May 2014 14:38:07 +0200 Subject: [PATCH 106/254] Manual: Note about using a local branch --- nixos/doc/manual/development.xml | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/development.xml b/nixos/doc/manual/development.xml index 6873710205d9..2f0c2a7aa8da 100644 --- a/nixos/doc/manual/development.xml +++ b/nixos/doc/manual/development.xml @@ -39,7 +39,37 @@ This will check out the latest NixOS sources to and the Nixpkgs sources to /my/sources/nixpkgs. (The NixOS source tree lives in a subdirectory of the Nixpkgs -repository.) If you want to rebuild your system using your (modified) +repository.) + +It’s often inconvenient to develop directly on the master +branch, since if somebody has just committed (say) a change to GCC, +then the binary cache may not have caught up yet and you’ll have to +rebuild everything from source. So you may want to create a local +branch based on your current NixOS version: + + +$ nixos-version +14.04.273.ea1952b (Baboon) + +$ git checkout -b local ea1952b + + +Or, to base your local branch on the latest version available in the +NixOS channel: + + +$ curl -sI http://nixos.org/channels/nixos-unstable/ | grep Location +Location: http://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/ + +$ git checkout -b local acaf4a6 + + +You can then use git rebase to sync your local +branch with the upstream branch, and use git +cherry-pick to copy commits from your local branch to the +upstream branch. + +If you want to rebuild your system using your (modified) sources, you need to tell nixos-rebuild about them using the flag: From 338969701c0cbfd868d39278fd36c73cfaa491eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 28 May 2014 15:22:51 +0200 Subject: [PATCH 107/254] Fixing upnp in syncthing --- .../networking/syncthing/default.nix | 2 ++ .../networking/syncthing/upnp.patch | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/networking/syncthing/upnp.patch diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 12aa98758ad6..28603daa9c67 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ go ]; + patches = [ ./upnp.patch ]; + buildPhase = '' mkdir -p "./dependencies/src/github.com/calmh/syncthing" diff --git a/pkgs/applications/networking/syncthing/upnp.patch b/pkgs/applications/networking/syncthing/upnp.patch new file mode 100644 index 000000000000..f4164b4f6bc3 --- /dev/null +++ b/pkgs/applications/networking/syncthing/upnp.patch @@ -0,0 +1,28 @@ +Trying to fix upnp for miniupnpd: +https://github.com/calmh/syncthing/issues/211 + +diff --git a/upnp/upnp.go b/upnp/upnp.go +index 9de719a..9c85b23 100644 +--- a/upnp/upnp.go ++++ b/upnp/upnp.go +@@ -60,14 +60,12 @@ func Discover() (*IGD, error) { + return nil, err + } + +- search := []byte(` +-M-SEARCH * HTTP/1.1 +-Host: 239.255.255.250:1900 +-St: urn:schemas-upnp-org:device:InternetGatewayDevice:1 +-Man: "ssdp:discover" +-Mx: 3 +- +-`) ++ search := []byte("M-SEARCH * HTTP/1.1\r\n" + ++"Host: 239.255.255.250:1900\r\n" + ++"St: urn:schemas-upnp-org:device:InternetGatewayDevice:1\r\n" + ++"Man: \"ssdp:discover\"\r\n" + ++"Mx: 3\r\n" + ++"\r\n") + + _, err = socket.WriteTo(search, ssdp) + if err != nil { From bf6ddc62851f159a04e3d37ae484fb413a1c8220 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 28 May 2014 17:07:40 +0200 Subject: [PATCH 108/254] nautilus 3.12: find extensions --- .../services/x11/desktop-managers/gnome3.nix | 3 +++ .../gnome-3/3.12/core/nautilus/default.nix | 2 ++ .../3.12/core/nautilus/extension_dir.patch | 24 +++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 0b81a3f2d9bb..40787968e035 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -94,6 +94,9 @@ in { # Let gnome-control-center find gnome-shell search providers export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/ + # Let nautilus find extensions + export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/ + # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix index 888f622ef33c..dceb7c817bda 100644 --- a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; + patches = [ ./extension_dir.patch ]; + meta = with stdenv.lib; { platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch new file mode 100644 index 000000000000..317b82579924 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch @@ -0,0 +1,24 @@ +diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c +index 6273a76..4adcc8a 100644 +--- a/libnautilus-private/nautilus-module.c ++++ b/libnautilus-private/nautilus-module.c +@@ -242,11 +242,17 @@ void + nautilus_module_setup (void) + { + static gboolean initialized = FALSE; ++ const gchar* extensiondir = NULL; + + if (!initialized) { + initialized = TRUE; +- +- load_module_dir (NAUTILUS_EXTENSIONDIR); ++ ++ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR"); ++ if (extensiondir == NULL) { ++ extensiondir = NAUTILUS_EXTENSIONDIR; ++ } ++ ++ load_module_dir (extensiondir); + + eel_debug_call_at_shutdown (free_module_objects); + } From a013d00448d70970f26cc36bb37872b9cd7eff1a Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 28 May 2014 17:26:37 +0200 Subject: [PATCH 109/254] nautilus-sendto: new package Integrates Evolution and Pidgin into the Nautilus file manager --- .../services/x11/desktop-managers/gnome3.nix | 1 + .../3.12/apps/nautilus-sendto/default.nix | 22 +++++++++++++++++++ pkgs/desktops/gnome-3/3.12/default.nix | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 40787968e035..df50ca8c905c 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -152,6 +152,7 @@ in { gnome3.gnome-music gnome3.gnome-tweak-tool gnome3.gnome-photos + gnome3.nautilus-sendto ] config.environment.gnome3.excludePackages); # Needed for themes and backgrounds diff --git a/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix new file mode 100644 index 000000000000..5a85e00e4e45 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool +, gobjectIntrospection, makeWrapper }: + +stdenv.mkDerivation rec { + name = "nautilus-sendto-${version}"; + + version = "3.8.1"; + + src = fetchurl { + url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz"; + sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab"; + }; + + buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ]; + + meta = with stdenv.lib; { + description = "Integrates Evolution and Pidgin into the Nautilus file manager"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index baa7113ce90f..b33fad0e41e5 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -203,6 +203,8 @@ rec { gnome-photos = callPackage ./apps/gnome-photos { }; + nautilus-sendto = callPackage ./apps/nautilus-sendto { }; + # scrollkeeper replacement rarian = callPackage ./desktop/rarian { }; From a7d6947343af62282b1048a7cb74f7c0021ecddc Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 28 May 2014 18:16:54 +0200 Subject: [PATCH 110/254] gnome-terminal 3.12: enable nautilus extension --- pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix index 17731444f005..a5b3fb739439 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools - gnome3.dconf itstool ncurses makeWrapper ]; + gnome3.dconf itstool ncurses makeWrapper gnome3.nautilus ]; nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; # FIXME: enable for gnome3 - configureFlags = [ "--disable-search-provider" "--without-nautilus-extension" "--disable-migration" ]; + configureFlags = [ "--disable-search-provider" "--disable-migration" ]; preFixup = '' for f in "$out/libexec/gnome-terminal-server"; do From 3e7f8bce62397d387187a9dcad353856574fec6f Mon Sep 17 00:00:00 2001 From: Matthew Brown Date: Wed, 28 May 2014 13:18:50 +0100 Subject: [PATCH 111/254] maintainers.nix: add missing edeoryd46, fixing channel Close #2783. --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 109e7956a583..228c4494fb8d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -30,6 +30,7 @@ coconnor = "Corey O'Connor "; coroa = "Jonas Hörsch "; cstrahan = "Charles Strahan "; + ederoyd46 = "Matthew Brown "; edwtjo = "Edward Tjörnhammar "; eelco = "Eelco Dolstra "; emery = "Emery Hemingawy "; From 57e0371f125ca83537f69946386b7cc4fc7ba65f Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 28 May 2014 22:36:54 +0200 Subject: [PATCH 112/254] flightgear & simgear: Bump to 3.0.0. --- pkgs/development/libraries/simgear/default.nix | 4 ++-- pkgs/games/flightgear/default.nix | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 0525043b6cf1..f5394fffdaa8 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -13,11 +13,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="simgear"; - version="2.12.1"; + version="3.0.0"; name="${baseName}-${version}"; extension="tar.bz2"; url="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.${extension}"; - hash="0w8drzglgp01019frx96062qcigzfflsyq59f8shpwmzjb2hzli4"; + hash="05l0wvi0s4a98ihmjbpcc66rj6qy3hrsqkjs388bddf2ws3qyi09"; }; in rec { diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index b785908cad99..31ae3aa3aa4a 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -6,17 +6,17 @@ }: stdenv.mkDerivation rec { - version = "2.12.1"; + version = "3.0.0"; name = "flightgear-${version}"; src = fetchurl { url = "http://ftp.linux.kiev.ua/pub/fgfs/Source/${name}.tar.bz2"; - sha256 = "1wj0a9k9pq404lylmv7v5f05vmrqd8fwj61kr78vldf44n44gixw"; + sha256 = "1sd6ic9rrcgrqvc6ywkasj2pnmmmdv1i2rlyac2a882rh8i1kgz4"; }; datasrc = fetchurl { - url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/FlightGear-${version}-data.tar.bz2"; - sha256 = "0hlsvzz12pyzw3mb4xsv4iwblrbf7d27mdprll64kr7p1h9qlmkl"; + url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/FlightGear-data-${version}.tar.bz2"; + sha256 = "0mq5hkh8zgm129mg1ij3rrk7h2xs9ijxa7d7hipjlp6mcyhlk0q4"; }; # Of all the files in the source and data archives, there doesn't seem to be @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { ''; postInstall = '' - mkdir -p "$out/share/FlightGear" - tar xvf "${datasrc}" -C "$out/share/FlightGear/" --strip-components=1 - mkdir -p "$out/share/applications/" cp "${desktopItem}"/share/applications/* "$out/share/applications/" + + mkdir -p "$out/share/FlightGear" + tar xvf "${datasrc}" -C "$out/share/FlightGear/" --strip-components=1 ''; meta = with stdenv.lib; { From 59f98d0d8c33a54997e38a0ca1ba4df942de2514 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Tue, 27 May 2014 05:22:24 +0200 Subject: [PATCH 113/254] PPSSPP: 0.9.8 --- .../ppsspp/bump-version-to-0.9.8.patch | 22 +++++++++++++ pkgs/misc/emulators/ppsspp/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++-- 3 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch create mode 100644 pkgs/misc/emulators/ppsspp/default.nix diff --git a/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch b/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch new file mode 100644 index 000000000000..5e474d6f7477 --- /dev/null +++ b/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch @@ -0,0 +1,22 @@ +From 48f6bf352154511d5acddfe44dd241c6a9ed92d7 Mon Sep 17 00:00:00 2001 +From: Bhavin +Date: Tue, 6 May 2014 22:44:58 +0530 +Subject: [PATCH] Update vaersion to 0.9.8 + +It was 0.9.6 :( +--- + Qt/Settings.pri | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Qt/Settings.pri b/Qt/Settings.pri +index 8b4c1d7..67949f2 100644 +--- a/Qt/Settings.pri ++++ b/Qt/Settings.pri +@@ -1,4 +1,4 @@ +-VERSION = 0.9.6 ++VERSION = 0.9.8 + DEFINES += USING_QT_UI USE_FFMPEG + unix:!qnx:!symbian:!mac: CONFIG += linux + maemo5|contains(MEEGO_EDITION,harmattan): CONFIG += maemo +-- +1.9.3 diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix new file mode 100644 index 000000000000..db5e42e37eac --- /dev/null +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, zlib, libpng, qt4, pkgconfig +, withGamepads ? true, SDL # SDL is used for gamepad functionality +}: + +let + version = "0.9.8"; + fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF"); +in stdenv.mkDerivation { + name = "PPSSPP-${version}"; + + src = fetchgit { + url = "https://github.com/hrydgard/ppsspp.git"; + sha256 = "11sqhb2m3502dzbizahh1w2dl7jv3fipwxyrmryj8fyaqqw0i36q"; + rev = "cbc46be3f91cb8558fbb4b175b14e8e16cbf0243"; + fetchSubmodules = true; + }; + + # Upstream forgot to bump a version in one file. + patches = [ ./bump-version-to-0.9.8.patch ]; + + buildInputs = [ zlib libpng pkgconfig qt4 ] + ++ (if withGamepads then [ SDL ] else [ ]); + + configurePhase = "cd Qt && qmake PPSSPPQt.pro"; + installPhase = "mkdir -p $out/bin && cp PPSSPPQt $out/bin"; + + meta = with stdenv.lib; { + homepage = "http://www.ppsspp.org/"; + description = "A PSP emulator, the Qt4 version."; + license = licenses.gpl2Plus; + maintainers = [ maintainers.fuuzetsu ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04116d388837..e1f957bc195b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1155,7 +1155,7 @@ let gnuvd = callPackage ../tools/misc/gnuvd { }; goaccess = callPackage ../tools/misc/goaccess { }; - + googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; gource = callPackage ../applications/version-management/gource {}; @@ -3462,7 +3462,7 @@ let # mercurial (hg) bleeding edge version octaveHG = callPackage ../development/interpreters/octave/hg.nix { }; - + ocropus = callPackage ../applications/misc/ocropus { }; perl58 = callPackage ../development/interpreters/perl/5.8 { @@ -10867,6 +10867,8 @@ let polytable = callPackage ../tools/typesetting/tex/polytable { }; + PPSSPP = callPackage ../misc/emulators/ppsspp { }; + uae = callPackage ../misc/emulators/uae { }; putty = callPackage ../applications/networking/remote/putty { }; From b793f92233a3f5de29e16b5e3eedba02dfbfeb9a Mon Sep 17 00:00:00 2001 From: Chris Double Date: Thu, 29 May 2014 13:05:30 +1200 Subject: [PATCH 114/254] Alice ML 1.4 programming language --- pkgs/development/compilers/aliceml/builder.sh | 71 +++++++++++++++++++ .../development/compilers/aliceml/default.nix | 70 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 143 insertions(+) create mode 100644 pkgs/development/compilers/aliceml/builder.sh create mode 100644 pkgs/development/compilers/aliceml/default.nix diff --git a/pkgs/development/compilers/aliceml/builder.sh b/pkgs/development/compilers/aliceml/builder.sh new file mode 100644 index 000000000000..e1f5d1b2bed7 --- /dev/null +++ b/pkgs/development/compilers/aliceml/builder.sh @@ -0,0 +1,71 @@ +source $stdenv/setup + +export CXXFLAGS="-m32" + +tar zxvf "$gecodeSrc" +cd gecode-1.3.1 +./configure --prefix="$out" --disable-minimodel --disable-examples +make +make install +cd .. + +PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$out"/lib/pkgconfig + +tar zxvf "$seamSrc" +cd seam-1.4 +./configure --prefix="$out" --with-zlib=$zlib +make +make install +cd .. + +PATH=$PATH:"$out"/bin + +tar zxvf "$aliceSrc" +cd alice-1.4 +sed -i -e 's/bin\/bash/usr\/bin\/env bash/g' bin/alicerun.in +sed -i -e 's/bin\/bash/usr\/bin\/env bash/g' bin/aliceremote +./configure --prefix="$out" --with-gmp=$gmp +make +make install +cd .. + +tar zxvf "$aliceGecodeSrc" +cd alice-gecode-1.4 +make compiledll MUST_GENERATE=no +make installdll MUST_GENERATE=no +cd .. + +tar zxvf "$aliceRegexSrc" +cd alice-regex-1.4 +make compiledll MUST_GENERATE=no +make installdll MUST_GENERATE=no +cd .. + +tar zxvf "$aliceSqliteSrc" +cd alice-sqlite-1.4 +make compiledll MUST_GENERATE=no +make installdll MUST_GENERATE=no +cd .. + +tar zxvf "$aliceXmlSrc" +cd alice-xml-1.4 +make compiledll MUST_GENERATE=no +make installdll MUST_GENERATE=no +cd .. + +tar zxvf "$aliceGtkSrc" +cd alice-gtk-1.4 +sed -i -e 's/PRIVATE_GTK_LEAVE_PENDING/PRIVATE_GTK_HAS_POINTER/g' NativeGtk.cc +sed -i -e 's/bin\/bash/usr\/bin\/env bash/g' myinstall +make compiledll MUST_GENERATE=no +make installdll MUST_GENERATE=no +cd .. + +tar zxvf "$aliceRuntimeSrc" +cd alice-runtime-1.4 +./configure --prefix="$out" +make +make install +cd .. + + diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix new file mode 100644 index 000000000000..5ea470bfc870 --- /dev/null +++ b/pkgs/development/compilers/aliceml/default.nix @@ -0,0 +1,70 @@ +{stdenv, fetchurl, pkgsi686Linux, libtool, gnumake381, autoconf, automake111x, file, which, zsh, m4, pkgconfig, perl}: + +stdenv.mkDerivation { + name = "aliceml-1.4"; + + aliceSrc = fetchurl { + url = http://www.ps.uni-saarland.de/alice/download/sources/alice-1.4.tar.gz; + sha256 = "1ay8r26g7xm9zlrlpigp6y1zmrl93hzkndb5phx7651wx8j2183r"; + }; + + aliceGecodeSrc = fetchurl { + url = http://www.ps.uni-saarland.de/alice/download/sources/alice-gecode-1.4.tar.gz; + sha256 = "0yklpsqnm3wwzfz4vvv69dmm7q7pzpl3z7iw7wg33klng85cidl6"; + }; + + aliceGtkSrc = fetchurl { + url = http://www.ps.uni-saarland.de/alice/download/sources/alice-gtk-1.4.tar.gz; + sha256 = "0zx4ks0pk5wgbcsflcmn0kbpa9j7pjbsc19d1s3jgp4rwb24m1an"; + }; + + aliceRegexSrc = fetchurl { + url = http://www.ps.uni-saarland.de/alice/download/sources/alice-regex-1.4.tar.gz; + sha256 = "0myjzh3295awamghs4c88ypaa41m8sxh5jys876yq6flslw41s02"; + }; + + aliceRuntimeSrc = fetchurl { + url = http://www.ps.uni-saarland.de/alice/download/sources/alice-runtime-1.4.tar.gz; + sha256 = "1cbca71vh16l2h0zjvhgzzs0rzq99nc8nx9a97yzw595355nq57f"; + }; + + aliceSqliteSrc = fetchurl { + url = http://www.ps.uni-saarland.de/alice/download/sources/alice-sqlite-1.4.tar.gz; + sha256 = "0554xbx8zgqmpb7x06d7xvhlbk7bxmc237khgjs6yjcy53yf366b"; + }; + + aliceXmlSrc = fetchurl { + url = http://www.ps.uni-saarland.de/alice/download/sources/alice-xml-1.4.tar.gz; + sha256 = "058a815a0vajjvjlsmd4ryx2bc71q6zwvyjg2c0v1gba2v3pddm0"; + }; + + seamSrc = fetchurl { + url = http://www.ps.uni-saarland.de/alice/download/sources/seam-1.4.tar.gz; + sha256 = "1iz98jdv914whaw426d5406shlqgxqwpy3fbyb472x7d3lfra2dz"; + }; + + gecodeSrc = fetchurl { + url = http://www.gecode.org/download/gecode-1.3.1.tar.gz; + sha256 = "0mgc6llbq166jmlq3alvagqsg3730670zvbwwkdgsqklw70v9355"; + }; + + zlib = pkgsi686Linux.zlib; + gmp = pkgsi686Linux.gmp; + + + buildInputs = [ + stdenv pkgsi686Linux.gcc34 pkgsi686Linux.glibc + libtool gnumake381 autoconf automake111x pkgsi686Linux.zlib + file which zsh pkgsi686Linux.gmp m4 pkgsi686Linux.gnome.gtk + pkgsi686Linux.gnome.libgnomecanvas pkgsi686Linux.pango pkgsi686Linux.sqlite + pkgsi686Linux.libxml2 pkgsi686Linux.lightning pkgconfig perl + ]; + + builder = ./builder.sh; + + meta = { + homepage = http://www.ps.uni-saarland.de/alice/; + description = "Alice ML is a functional programming language based on Standard ML, extended with rich support for concurrent, distributed, and constraint programming."; + license = "BSD"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04116d388837..45beb0efcc27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2487,6 +2487,8 @@ let aldor = callPackage ../development/compilers/aldor { }; + aliceml = callPackage ../development/compilers/aliceml { }; + aspectj = callPackage ../development/compilers/aspectj { }; ats = callPackage ../development/compilers/ats { }; From 82a30be74acf592b374e21cebba51fd99270f880 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 29 May 2014 04:22:34 +0200 Subject: [PATCH 115/254] xboxdrv: 0.8.5 --- pkgs/misc/drivers/xboxdrv/default.nix | 28 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/misc/drivers/xboxdrv/default.nix diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix new file mode 100644 index 000000000000..7164f7d6f15f --- /dev/null +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, scons, libX11, pkgconfig +, libusb1, boost, glib, dbus_glib }: + +let + version = "0.8.5"; +in stdenv.mkDerivation { + name = "xboxdrv-${version}"; + + src = fetchurl { + url = "https://github.com/Grumbel/xboxdrv/archive/v${version}.tar.gz"; + sha256 = "0xg2dhfsk3i693rgwr1pr532b3hk3zmjxlx55g6bplslr94bibi2"; + }; + + patchPhase = '' + substituteInPlace Makefile --replace /usr/local "$out" + ''; + + buildInputs = [ scons libX11 pkgconfig libusb1 boost glib dbus_glib]; + + meta = with stdenv.lib; { + homepage = "http://pingus.seul.org/~grumbel/xboxdrv/"; + description = + "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace."; + license = licenses.gpl3Plus; + maintainers = [ maintainers.fuuzetsu ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04116d388837..7abbae667325 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11041,6 +11041,8 @@ let x2x = callPackage ../tools/X11/x2x { }; + xboxdrv = callPackage ../misc/drivers/xboxdrv { }; + xosd = callPackage ../misc/xosd { }; xsane = callPackage ../applications/graphics/sane/xsane.nix { From a089dbfe8abdbd293652520ff002aff0bdaf85b8 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 29 May 2014 09:06:13 +0200 Subject: [PATCH 116/254] Fix regression in fetchhg. --- pkgs/build-support/fetchhg/builder.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh index 6e9fbab791f3..9699fb69b7fc 100644 --- a/pkgs/build-support/fetchhg/builder.sh +++ b/pkgs/build-support/fetchhg/builder.sh @@ -1,8 +1,7 @@ source $stdenv/setup - header "getting $url${tag:+ ($tag)} into $out" -hg clone --insecure ${tag:+-r "$tag"} "$url" hg-clone +hg clone --insecure "$url" hg-clone hg archive -q -y ${tag:+-r "$tag"} --cwd hg-clone $out rm -f $out/.hg_archival.txt From f4fbda241dc9d956dde3d16da97441e344115722 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 29 May 2014 07:26:40 +0000 Subject: [PATCH 117/254] haskell-compressed: added 3.10 --- .../libraries/haskell/compressed/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/compressed/default.nix diff --git a/pkgs/development/libraries/haskell/compressed/default.nix b/pkgs/development/libraries/haskell/compressed/default.nix new file mode 100644 index 000000000000..40e82f62f695 --- /dev/null +++ b/pkgs/development/libraries/haskell/compressed/default.nix @@ -0,0 +1,19 @@ +{ cabal, comonad, fingertree, hashable, keys, pointed, reducers +, semigroupoids, semigroups, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "compressed"; + version = "3.10"; + sha256 = "1y290n421knfh8k8zbcabhw24hb13xj9pkxx4h4v15yji97p5mcw"; + buildDepends = [ + comonad fingertree hashable keys pointed reducers semigroupoids + semigroups unorderedContainers + ]; + meta = { + homepage = "http://github.com/ekmett/compressed/"; + description = "Compressed containers and reducers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4210cee9adfe..614a989bb74e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -431,6 +431,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in composition = callPackage ../development/libraries/haskell/composition {}; + compressed = callPackage ../development/libraries/haskell/compressed {}; + concatenative = callPackage ../development/libraries/haskell/concatenative {}; concreteTyperep = callPackage ../development/libraries/haskell/concreteTyperep {}; From c0d39ba93aa066dc4c57f05d47751077df50984d Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 29 May 2014 07:28:13 +0000 Subject: [PATCH 118/254] haskell-singletons: fix tests for darwin --- .../libraries/haskell/singletons/default.nix | 1 + .../libraries/haskell/singletons/test.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/libraries/haskell/singletons/test.patch diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix index 77087279edf4..aeace4d3fceb 100644 --- a/pkgs/development/libraries/haskell/singletons/default.nix +++ b/pkgs/development/libraries/haskell/singletons/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ mtl thDesugar ]; testDepends = [ Cabal constraints filepath tasty tastyGolden ]; noHaddock = true; + patches = self.stdenv.lib.optional self.stdenv.isDarwin ./test.patch; meta = { homepage = "http://www.cis.upenn.edu/~eir/packages/singletons"; description = "A framework for generating singleton types"; diff --git a/pkgs/development/libraries/haskell/singletons/test.patch b/pkgs/development/libraries/haskell/singletons/test.patch new file mode 100644 index 000000000000..6979c2c6cb0a --- /dev/null +++ b/pkgs/development/libraries/haskell/singletons/test.patch @@ -0,0 +1,12 @@ +--- a/tests/SingletonsTestSuiteUtils.hs ++++ b/tests/SingletonsTestSuiteUtils.hs +@@ -201,7 +201,7 @@ testCompileAndDumpGroup testDir tests = + filterWithSed :: FilePath -> IO () + filterWithSed file = runProcessWithOpts CreatePipe "sed" + #ifdef darwin_HOST_OS +- [ "-i", "''" ++ [ "-i" + #else + [ "-i" + #endif + From d58370db24611bc58cad4fd7ca418075d49431b0 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 29 May 2014 07:29:20 +0000 Subject: [PATCH 119/254] haskell-process-conduit: temporarily disable tests The tests have not been ported to use conduit-1.1 yet (there is a pull request pending on GitHub). --- pkgs/development/libraries/haskell/process-conduit/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/process-conduit/default.nix b/pkgs/development/libraries/haskell/process-conduit/default.nix index 3ecd88515b2f..8ed966cd05bf 100644 --- a/pkgs/development/libraries/haskell/process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/process-conduit/default.nix @@ -11,6 +11,9 @@ cabal.mkDerivation (self: { text ]; testDepends = [ conduit hspec ]; + # This check is being disabled until process-conduit is updated to properly + # support conduit 1.1.x + doCheck = false; meta = { homepage = "http://github.com/tanakh/process-conduit"; description = "Conduits for processes"; From 27ecc1c9e92a925c3b6f270595724339adf64e09 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 29 May 2014 02:43:10 -0500 Subject: [PATCH 120/254] Change stdenv on darwin to not set NIX_ENFORCE_PURITY --- pkgs/stdenv/nix/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index b16c51f7580b..78e5b84a841e 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -9,6 +9,7 @@ import ../generic rec { export NIX_IGNORE_LD_THROUGH_GCC=1 if [ "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system" = "x86_64-darwin" ]; then + export NIX_ENFORCE_PURITY= export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 dontFixLibtool=1 From caa9007e847102d013203b547d1ce67bcd77e89a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 29 May 2014 09:45:12 +0200 Subject: [PATCH 121/254] Making ocropus-hocr run (matplotlib + gdk backend) I added the gtk backend to matplotlib; if these added dependencies are too much, we can make this optional. --- pkgs/applications/misc/ocropus/default.nix | 5 +++++ pkgs/applications/misc/ocropus/display.patch | 17 +++++++++++++++++ pkgs/top-level/python-packages.nix | 3 ++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/ocropus/display.patch diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index aaf0039305b1..66c0b883c726 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -44,6 +44,8 @@ pythonPackages.buildPythonPackage rec { sha256 = "1s0v0gd6psfjp6lghwl2dj49h18mgf2n2z8hqzw8430nzhglnlvr"; }; + patches = [ ./display.patch ]; + propagatedBuildInputs = with pythonPackages; [ curl numpy scipy pillow matplotlib beautifulsoup4 pygtk ]; @@ -51,6 +53,9 @@ pythonPackages.buildPythonPackage rec { preConfigure = with stdenv.lib; '' ${concatStrings (map (x: "ln -s ${x.src} models/${x.name};") models)} + + sed -i 's|/usr/local|'$out'|' ocrolib/common.py + sed -i 's|/usr/local|'$out'|' ocrolib/default.py ${pythonPackages.python}/bin/${pythonPackages.python.executable} setup.py download_models ''; diff --git a/pkgs/applications/misc/ocropus/display.patch b/pkgs/applications/misc/ocropus/display.patch new file mode 100644 index 000000000000..2b4e63652b7b --- /dev/null +++ b/pkgs/applications/misc/ocropus/display.patch @@ -0,0 +1,17 @@ +http://code.google.com/p/ocropus/issues/detail?id=365 + +diff --git a/setup.py b/setup.py +index c6ade25..a2ad6bf 100644 +--- a/setup.py ++++ b/setup.py +@@ -8,7 +8,10 @@ assert sys.version_info[0]==2 and sys.version_info[1]>=7,\ + from distutils.core import setup, Extension, Command + from distutils.command.install_data import install_data + ++import matplotlib ++matplotlib.use('Agg') + from ocrolib import default ++ + modeldir = "models/" + modelfiles = default.installable + modelprefix = "http://iupr1.cs.uni-kl.de/~tmb/ocropus-models/" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 933a073a5aa3..3e7e38f40ca4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3963,7 +3963,8 @@ rec { (if stdenv.isDarwin then [ pkgs.clangStdenv ] else [ pkgs.stdenv ]); propagatedBuildInputs = - [ dateutil nose numpy pyparsing tornado pkgs.freetype pkgs.libpng pkgs.pkgconfig ]; + [ dateutil nose numpy pyparsing tornado pkgs.freetype pkgs.libpng pkgs.pkgconfig + pygtk ]; meta = with stdenv.lib; { description = "python plotting library, making publication quality plots"; From 9df4bb9d67dd61d56195e3f43e96ade67339fb32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 29 May 2014 10:13:31 +0200 Subject: [PATCH 122/254] ocropus: it was still missing a package: lxml Now "./run-tests" passes. But it can't be run without DISPLAY, so I don't run it in the builder. --- pkgs/applications/misc/ocropus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index 66c0b883c726..fef3209d11a6 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -47,7 +47,7 @@ pythonPackages.buildPythonPackage rec { patches = [ ./display.patch ]; propagatedBuildInputs = with pythonPackages; [ curl numpy scipy pillow - matplotlib beautifulsoup4 pygtk ]; + matplotlib beautifulsoup4 pygtk lxml ]; enableParallelBuilding = true; From fabdb680550e7b1204776ec6c058f7ead8421adc Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Thu, 29 May 2014 12:20:24 +0200 Subject: [PATCH 123/254] almir: add psycopg2 dependency --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e7e38f40ca4..672033cfa718 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -298,6 +298,7 @@ rec { pythonPackages.waitress pythonPackages.webhelpers pythonPackages.zope_sqlalchemy + pythonPackages.psycopg2 ]; postInstall = '' From 4a2936e74d1841d6cd353a0d05e9b860b2bc0842 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 29 May 2014 12:38:43 +0200 Subject: [PATCH 124/254] nautilus-sendto: add to gnome 3.10 --- .../3.10/apps/nautilus-sendto/default.nix | 22 +++++++++++++++++++ pkgs/desktops/gnome-3/3.10/default.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/desktops/gnome-3/3.10/apps/nautilus-sendto/default.nix diff --git a/pkgs/desktops/gnome-3/3.10/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.10/apps/nautilus-sendto/default.nix new file mode 100644 index 000000000000..5a85e00e4e45 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.10/apps/nautilus-sendto/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool +, gobjectIntrospection, makeWrapper }: + +stdenv.mkDerivation rec { + name = "nautilus-sendto-${version}"; + + version = "3.8.1"; + + src = fetchurl { + url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz"; + sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab"; + }; + + buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ]; + + meta = with stdenv.lib; { + description = "Integrates Evolution and Pidgin into the Nautilus file manager"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix index c601a1501a3b..e2b8f414206e 100644 --- a/pkgs/desktops/gnome-3/3.10/default.nix +++ b/pkgs/desktops/gnome-3/3.10/default.nix @@ -171,6 +171,8 @@ rec { gnome-photos = callPackage ./apps/gnome-photos { }; + nautilus-sendto = callPackage ./apps/nautilus-sendto { }; + # scrollkeeper replacement rarian = callPackage ./desktop/rarian { }; From 29da3bce272c7651cf1ebc838da7cbca1f93bc4e Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 29 May 2014 13:38:13 +0200 Subject: [PATCH 125/254] usermount: New Package. A simple tool to automatically mount removable drives using UDisks2 and D-Bus. https://github.com/tom5760/usermount --- pkgs/os-specific/linux/usermount/default.nix | 28 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/os-specific/linux/usermount/default.nix diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix new file mode 100644 index 000000000000..d2b3632d69ae --- /dev/null +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, pkgconfig, dbus, libnotify, udisks2, gdk_pixbuf }: + +stdenv.mkDerivation { + name = "usermount-0.1"; + + src = fetchgit { + url = "https://github.com/tom5760/usermount.git"; + rev = "0d6aba3c1f8fec80de502f5b92fd8b28041cc8e4"; + sha256 = "1bzxwq83ikljnv0f55siyd6rd0gs9v7jl9947lw6s1npa63x3b55"; + }; + + buildInputs = [ pkgconfig dbus libnotify udisks2 gdk_pixbuf ]; + + NIX_CFLAGS_COMPILE = [ "-DENABLE_NOTIFICATIONS" ]; + + installPhase = '' + mkdir -p $out/bin + mv usermount $out/bin/ + ''; + + meta = { + homepage = https://github.com/tom5760/usermount; + description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus."; + license = "MIT"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04116d388837..3e37f9d4afcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7589,6 +7589,8 @@ let usbutils = callPackage ../os-specific/linux/usbutils { }; + usermount = callPackage ../os-specific/linux/usermount { }; + utillinux = lowPrio (callPackage ../os-specific/linux/util-linux { ncurses = null; perl = null; From a1d350287b1e50b209981636f7b706838e13de3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 26 May 2014 19:29:53 +0200 Subject: [PATCH 126/254] Plymouth: update to 0.9.0, fix build, sanitize, enable systemd-integration NOTE: I can start the daemon and ping it, but I haven't been able to get it to do more than that. --- pkgs/os-specific/linux/plymouth/default.nix | 50 +++++++++------------ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 4c51c4fea6cb..a04407ba5c2a 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -1,51 +1,45 @@ -{ stdenv, fetchurl, cairo, gtk, libdrm, libpng, makeWrapper, pango, pkgconfig }: +{ stdenv, fetchurl, autoconf, automake, cairo, docbook_xsl, gtk +, libdrm, libpng , libtool, libxslt, makeWrapper, pango, pkgconfig +, udev +}: stdenv.mkDerivation rec { name = "plymouth-${version}"; - version = "0.8.8"; + version = "0.9.0"; src = fetchurl { url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.bz2"; - sha256 = "16vm3llgci7h63jaclfskj1ii61d8psq7ny2mncml6m3sghs9b8v"; + sha256 = "0kfdwv179brg390ma003pmdqfvqlbybqiyp9fxrxx0wa19sjxqnk"; }; - buildInputs = [ cairo gtk libdrm libpng makeWrapper pango pkgconfig ]; + buildInputs = [ + autoconf automake cairo docbook_xsl gtk libdrm libpng libtool + libxslt makeWrapper pango pkgconfig udev + ]; + + prePatch = '' + sed -e "s#\$(\$PKG_CONFIG --variable=systemdsystemunitdir systemd)#$out/etc/systemd/system#g" \ + -i configure.ac + ''; configurePhase = '' - export DESTDIR=$out ./configure \ + --prefix=$out \ -bindir=$out/bin \ -sbindir=$out/sbin \ - --prefix=$out \ --exec-prefix=$out \ --libdir=$out/lib \ --libexecdir=$out/lib \ - --enable-tracing \ - --sysconfdir=/etc \ + --sysconfdir=$out/etc \ --localstatedir=/var \ + --with-log-viewer \ --without-system-root-install \ + --without-rhgb-compat-link \ + --enable-tracing \ + --enable-systemd-integration \ + --enable-pango \ --enable-gtk ''; -# --enable-systemd-integration -# -datadir=/share \ -# --with-rhgb-compat-link \ - - preInstall = "mkdir -p $out/bin $out/sbin"; - - postInstall = '' - cd $out/$out - mv bin/* $out/bin - mv sbin/* $out/sbin - - rmdir bin - rmdir sbin - mv * $out/ - sed -e "s#> $output##" \ - -e "s#> /dev/stderr##" \ - -i $out/lib/plymouth/plymouth-populate-initrd - wrapProgram $out/lib/plymouth/plymouth-populate-initrd \ - --set PATH $PATH:$out/bin:$out/sbin - ''; meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/Plymouth; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e37f9d4afcf..d64a4de9ed2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7446,7 +7446,9 @@ let config = config.pcmciaUtils.config or null; }; - plymouth = callPackage ../os-specific/linux/plymouth { }; + plymouth = callPackage ../os-specific/linux/plymouth { + automake = automake113x; + }; pmount = callPackage ../os-specific/linux/pmount { }; From 0ddce8db12ad89d0c9a437128ad325322fd519e2 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 20 Apr 2014 11:16:36 -0400 Subject: [PATCH 127/254] unbound: update from 1.4.21 to 1.4.22, service from Upstart to systemd --- lib/maintainers.nix | 2 +- nixos/modules/services/networking/unbound.nix | 119 ++++++++---------- pkgs/tools/networking/unbound/default.nix | 13 +- 3 files changed, 61 insertions(+), 73 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 80d0bed23dce..14f2f86ec5b7 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -31,7 +31,7 @@ cstrahan = "Charles Strahan "; edwtjo = "Edward Tjörnhammar "; eelco = "Eelco Dolstra "; - emery = "Emery Hemingawy "; + emery = "Emery Hemingway "; ertes = "Ertugrul Söylemez "; falsifian = "James Cook "; fuuzetsu = "Mateusz Kowalczyk "; diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 30ce4b49fa8d..415ff13bdda5 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -18,25 +18,25 @@ let "forward-zone:\n name: .\n" + concatMapStrings (x: " forward-addr: ${x}\n") cfg.forwardAddresses; - confFile = pkgs.writeText "unbound.conf" - '' - server: - directory: "${stateDir}" - username: ${username} - # make sure unbound can access entropy from inside the chroot. - # e.g. on linux the use these commands (on BSD, devfs(8) is used): - # mount --bind -n /dev/random /etc/unbound/dev/random - # and mount --bind -n /dev/log /etc/unbound/dev/log - chroot: "${stateDir}" - # logfile: "${stateDir}/unbound.log" #uncomment to use logfile. - pidfile: "${stateDir}/unbound.pid" - verbosity: 1 # uncomment and increase to get more logging. - # listen on all interfaces, answer queries from the local subnet. + confFile = pkgs.writeText "unbound.conf" '' + server: + directory: "${stateDir}" + username: ${username} + # make sure unbound can access entropy from inside the chroot. + # e.g. on linux the use these commands (on BSD, devfs(8) is used): + # mount --bind -n /dev/random /etc/unbound/dev/random + # and mount --bind -n /dev/log /etc/unbound/dev/log + chroot: "${stateDir}" + # logfile: "${stateDir}/unbound.log" #uncomment to use logfile. + pidfile: "${stateDir}/unbound.pid" + verbosity: 1 # uncomment and increase to get more logging. ${interfaces} ${access} - ${forward} - ${cfg.extraConfig} - ''; + + ${forward} + + ${cfg.extraConfig} + ''; in @@ -45,74 +45,61 @@ in ###### interface options = { - services.unbound = { enable = mkOption { - default = false; - description = " - Whether to enable the Unbound domain name server. - "; + default = false; + description = "Whether to enable the Unbound domain name server."; }; allowedAccess = mkOption { - default = ["127.0.0.0/24"]; - description = " - What networks are allowed to use us as a resolver. - "; + default = ["127.0.0.0/24"]; + description = "What networks are allowed to use unbound as a resolver."; }; interfaces = mkOption { - default = [ "127.0.0.0" "::1" ]; - description = " - What addresses the server should listen to. - "; + default = [ "127.0.0.1" "::1" ]; + description = "What addresses the server should listen on."; }; forwardAddresses = mkOption { - default = [ ]; - description = " - What servers to forward the queries to. - "; + default = [ ]; + description = "What servers to forward queries to."; }; extraConfig = mkOption { - default = ""; - description = " - Extra unbound config - "; + default = ""; + description = "Extra lines of unbound config."; }; }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.unbound ]; + + users.extraUsers = singleton { + name = username; + uid = config.ids.uids.unbound; + description = "unbound daemon user"; + home = stateDir; + createHome = true; + }; + + systemd.services.unbound = { + description="Unbound recursive Domain Name Server"; + after = [ "network.target" ]; + before = [ "nss-lookup.target" ]; + wants = [" nss-lookup.target" ]; + wantedBy = [ "multi-user.target" ]; + + path = [ pkgs.unbound ]; + serviceConfig.ExecStart = "${pkgs.unbound}/sbin/unbound -d -c ${confFile}"; + }; }; - - ###### implementation - - config = mkIf config.services.unbound.enable { - environment.systemPackages = [ pkgs.unbound ]; - - users.extraUsers = singleton - { name = username; - uid = config.ids.uids.unbound; - description = "unbound daemon user"; - home = "/tmp"; - }; - - jobs.unbound = - { description = "Unbound name server job"; - - preStart = - '' - ${pkgs.coreutils}/bin/mkdir -p ${stateDir} - ''; - - daemonType = "fork"; - - exec = "${pkgs.unbound}/sbin/unbound -c ${confFile}"; - }; - - }; - } diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index d95c5b5f6bb0..376717bbf7a8 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -1,22 +1,23 @@ -{ stdenv, fetchurl, openssl, expat, libevent, ldns }: +{ stdenv, fetchurl, openssl, expat, libevent }: stdenv.mkDerivation rec { - name = "unbound-1.4.21"; + name = "unbound-1.4.22"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "0w09m2rbn688rsk37k5xm3vkk5h2hxhivsr374j7h7vjf9x82bsh"; + sha256 = "17yjly9c00zfgbzvllqzjh668a4yk6vrinf47yrcs3hrna0m1bqw"; }; - buildInputs = [openssl expat libevent ldns]; + buildInputs = [openssl expat libevent]; configureFlags = [ "--with-ssl=${openssl}" "--with-libexpat=${expat}" "--localstatedir=/var" ]; meta = { description = "Validating, recursive, and caching DNS resolver"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; homepage = http://www.unbound.net; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ stdenv.lib.maintainers.emery ]; + platforms = stdenv.lib.platforms.unix; }; } From fdebea003e43e8df8ffc4c889331f5d28c36880e Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Thu, 29 May 2014 09:46:53 -0700 Subject: [PATCH 128/254] fix getopt path on darwin --- pkgs/tools/security/pass/darwin-getopt.patch | 11 +++++++++++ pkgs/tools/security/pass/default.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/tools/security/pass/darwin-getopt.patch diff --git a/pkgs/tools/security/pass/darwin-getopt.patch b/pkgs/tools/security/pass/darwin-getopt.patch new file mode 100644 index 000000000000..8cdcd67bc658 --- /dev/null +++ b/pkgs/tools/security/pass/darwin-getopt.patch @@ -0,0 +1,11 @@ +diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh +index 1b76c33..fa40104 100644 +--- a/src/platform/darwin.sh ++++ b/src/platform/darwin.sh +@@ -31,5 +31,5 @@ tmpdir() { + mount -t hfs -o noatime -o nobrowse "$ramdisk_dev" "$SECURE_TMPDIR" || exit 1 + } + +-GETOPT="$(brew --prefix gnu-getopt 2>/dev/null || echo /usr/local)/bin/getopt" ++GETOPT="getopt" + SHRED="srm -f -z" diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index cf16e3477edf..505bdd2efc86 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1d32y6k625pv704icmhg46zg02kw5zcyxscgljxgy8bb5wv4lv2j"; }; + patches = [ ./darwin-getopt.patch ]; + buildInputs = [ makeWrapper ]; meta = with stdenv.lib; { From 176797576ccbc924323598cc1886b4f8c0ad330f Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 29 May 2014 20:00:04 -0500 Subject: [PATCH 129/254] Build Haddocks with source hyperlinks unless doHscolour is false --- pkgs/build-support/cabal/default.nix | 11 +++++++++-- .../libraries/haskell/unlambda/default.nix | 1 + .../{libraries => tools}/haskell/hscolour/default.nix | 3 ++- pkgs/top-level/haskell-packages.nix | 6 ++++-- 4 files changed, 16 insertions(+), 5 deletions(-) rename pkgs/development/{libraries => tools}/haskell/hscolour/default.nix (85%) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 70fb72f99fb9..c5fdfe71e3b7 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -1,12 +1,13 @@ # generic builder for Cabal packages { stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, jailbreakCabal, glibcLocales -, gnugrep, coreutils +, gnugrep, coreutils, hscolour , enableLibraryProfiling ? false , enableSharedLibraries ? false , enableSharedExecutables ? false , enableStaticLibraries ? true , enableCheckPhase ? stdenv.lib.versionOlder "7.4" ghc.version +, enableHyperlinkSource ? true , extension ? (self : super : {}) }: @@ -50,6 +51,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; doCheck = enableCheckPhase && x.doCheck; + hyperlinkSource = enableHyperlinkSource && x.hyperlinkSource; }; defaults = @@ -92,6 +94,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; buildInputs = [ghc Cabal] ++ self.extraBuildInputs; extraBuildInputs = self.buildTools ++ (optionals self.doCheck self.testDepends) ++ + (optional self.hyperlinkSource hscolour) ++ (if self.pkgconfigDepends == [] then [] else [pkgconfig]) ++ (if self.isLibrary then [] else self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends); @@ -140,6 +143,9 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; # and run any regression test suites the package might have doCheck = enableCheckPhase; + # pass the '--hyperlink-source' flag to ./Setup haddock + hyperlinkSource = enableHyperlinkSource; + # abort the build if the configure phase detects that the package # depends on multiple versions of the same build input strictConfigurePhase = true; @@ -219,7 +225,8 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; ./Setup build ${self.buildTarget} export GHC_PACKAGE_PATH=$(${ghc.GHCPackages}) - test -n "$noHaddock" || ./Setup haddock --html --hoogle + test -n "$noHaddock" || ./Setup haddock --html --hoogle \ + ${optionalString self.hyperlinkSource "--hyperlink-source"} eval "$postBuild" ''; diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix index 474bb1a8b092..a9e0def2bc70 100644 --- a/pkgs/development/libraries/haskell/unlambda/default.nix +++ b/pkgs/development/libraries/haskell/unlambda/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; + hyperlinkSource = false; meta = { description = "Unlambda interpreter"; license = "GPL"; diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/tools/haskell/hscolour/default.nix similarity index 85% rename from pkgs/development/libraries/haskell/hscolour/default.nix rename to pkgs/development/tools/haskell/hscolour/default.nix index d8bc08b4b33c..88c4545ff6d9 100644 --- a/pkgs/development/libraries/haskell/hscolour/default.nix +++ b/pkgs/development/tools/haskell/hscolour/default.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, hyperlinkSource ? true }: cabal.mkDerivation (self: { pname = "hscolour"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "15ix93sw4p7g5ln2halcgqppdc0i0vmkzcjzxvqzkk9yp9pq3nrs"; isLibrary = true; isExecutable = true; + hyperlinkSource = hyperlinkSource; meta = { homepage = "http://code.haskell.org/~malcolm/hscolour/"; description = "Colourise Haskell code"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 614a989bb74e..41eca6be8fdb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -96,6 +96,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabal = callPackage ../build-support/cabal { Cabal = null; # prefer the Cabal version shipped with the compiler + hscolour = self.hscolourBootstrap; inherit enableLibraryProfiling enableCheckPhase enableStaticLibraries enableSharedLibraries enableSharedExecutables; glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; @@ -1117,8 +1118,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hsBibutils = callPackage ../development/libraries/haskell/hs-bibutils {}; - hscolour = callPackage ../development/libraries/haskell/hscolour {}; - hsdns = callPackage ../development/libraries/haskell/hsdns {}; hsemail = if (pkgs.stdenv.lib.versionOlder ghc.version "7") then null else @@ -2605,6 +2604,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hlint = callPackage ../development/tools/haskell/hlint {}; + hscolour = callPackage ../development/tools/haskell/hscolour {}; + hscolourBootstrap = self.hscolour.override { hyperlinkSource = false; }; + hslogger = callPackage ../development/tools/haskell/hslogger {}; tar = callPackage ../development/libraries/haskell/tar {}; From 5bf076d99be930a0960e889fc672e31c70a7e4a7 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 30 May 2014 10:17:08 +0200 Subject: [PATCH 130/254] sane: Make SANE_CONFIG_DIR overrideable --- nixos/modules/services/hardware/sane.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index 56e28b50350b..f7b25c187877 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -43,7 +43,7 @@ in environment.systemPackages = backends; environment.variables = { - SANE_CONFIG_DIR = "${saneConfig}/etc/sane.d"; + SANE_CONFIG_DIR = mkDefault "${saneConfig}/etc/sane.d"; LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ]; }; services.udev.packages = backends; From 11ac14f31b24b85c97e5ee3a5c386c7e244c57cf Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 30 May 2014 10:18:30 +0200 Subject: [PATCH 131/254] spotify: Update from 0.9.4.183.g644e24e.428 to 0.9.10.17.g4129e1c.78 (only for x86_64) --- pkgs/applications/audio/spotify/default.nix | 23 +++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index a76e71488468..59bea8fc1944 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -6,7 +6,9 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let - version = "0.9.4.183"; + version = if stdenv.system == "i686-linux" + then "0.9.4.183.g644e24e.428" + else "0.9.10.17.g4129e1c.78"; qt4webkit = if stdenv.system == "i686-linux" then @@ -65,13 +67,13 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g644e24e.428-1_i386.deb"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_i386.deb"; sha256 = "1wl6v5x8vm74h5lxp8fhvmih8l122aadsf1qxvpk0k3y6mbx0ifa"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g644e24e.428-1_amd64.deb"; - sha256 = "1yniln6iswrrrny01qr2w5zcvam0vnrvy9mwbnk9i14i2ch0f3fx"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb"; + sha256 = "1a4vn2ij3nghnc0fq3nsyb95gwhaw4zabdq6jd52hxz8iv31pn1z"; } else throw "Spotify not supported on this platform."; @@ -89,13 +91,22 @@ stdenv.mkDerivation { # Work around Spotify referring to a specific minor version of # OpenSSL. mkdir $out/lib - ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.0.9.8 - ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.0.9.8 + ln -s ${nss}/lib/libnss3.so $out/lib/libnss3.so.1d ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d + + ${if stdenv.system == "x86_64-linux" then '' + ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.1.0.0 + ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0 + ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so + ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so + '' else '' + ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.0.9.8 + ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.0.9.8 ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so.0d ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d + ''} # Work around Spotify trying to open libudev.so.0 (which we don't have) ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0 From 2436bb705ceb8bc2b11114dd8edc0fa91c542255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 30 May 2014 11:18:25 +0200 Subject: [PATCH 132/254] libvpx on darwin: attempt to fix build CC @lovek323. --- pkgs/development/libraries/libvpx/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index aa869b4b19d8..45fc442a713f 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, bash, yasm, which, perl}: +{stdenv, fetchurl, bash, yasm, which, perl, binutils}: let version = "1.3.0"; in @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { sed -e '/enable linux/d' -i configure ''; - buildInputs = [ yasm which perl ]; + buildInputs = [ yasm which perl ] + ++ stdenv.lib.optional stdenv.isDarwin binutils; # new asm opcode support preConfigure = '' mkdir -p build From 90f01d6a682322e4911d78180b73cedacaa730e6 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 30 May 2014 04:38:36 -0500 Subject: [PATCH 133/254] arcanist: 20140521 -> 20140530 Signed-off-by: Austin Seipp --- pkgs/development/tools/misc/arcanist/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 5a17ac167f80..add2f8621b07 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -3,18 +3,18 @@ let libphutil = fetchgit { url = "git://github.com/facebook/libphutil.git"; - rev = "1ba1de50e9ee1ca63e472f625282346693eb0a18"; - sha256 = "d571906b6ecb3700f0d57498426d2ab2a5fbed469d739ee1e03d410215738d2f"; + rev = "c4cb6d99c4a5903079350f85fcc71895c0a0ea14"; + sha256 = "a7293aac4fdcfbaead09ee3e6ffb54c5d100b07905b4006194067411061ff994"; }; arcanist = fetchgit { url = "git://github.com/facebook/arcanist.git"; - rev = "c999f3e6b5c7edef82761ed1db00d79683e2e37a"; - sha256 = "d1d9f5ada8ffcb02f03210356c5087019e164f456660469e2825dcbdf5f07d35"; + rev = "50caec620a8ed45c54323cb71fee72fd0d935115"; + sha256 = "dd18ed22375ad1ba058703952be0d339d9c93704e9d75dd7e4e6625236dfe9b0"; }; in stdenv.mkDerivation rec { name = "arcanist-${version}"; - version = "20140521"; + version = "20140530"; src = [ arcanist libphutil ]; buildInputs = [ php ]; From a44fbeeaa4a154a62c1eb1cd1990a0c7ea3b91a5 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Fri, 30 May 2014 13:15:15 +0400 Subject: [PATCH 134/254] samba: install pkg-config files Close #2794, fixes #1341. --- pkgs/servers/samba/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index cacc614e08c4..ade79e2c99cd 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -64,6 +64,9 @@ stdenv.mkDerivation rec { mkdir -p $out mv $TMPDIR/inst/$out/* $out/ + mkdir -p "$out/lib/pkgconfig" + cp pkgconfig/*.pc "$out/lib/pkgconfig" + mkdir -pv $out/lib/cups/backend ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb mkdir -pv $out/etc/openldap/schema From ca092d7b01997d9c61b3fbde17680c2a5b292fc0 Mon Sep 17 00:00:00 2001 From: Pavel Chuprikov Date: Fri, 30 May 2014 16:55:28 +0400 Subject: [PATCH 135/254] udiskie: add version 0.8.0. --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 672033cfa718..6bc99986c9be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9187,6 +9187,26 @@ rec { }; }; + udiskie = buildPythonPackage rec { + name = "udiskie-0.8.0"; + + src = fetchurl { + url = "https://github.com/coldfix/udiskie/archive/0.8.0.tar.gz"; + sha256 = "0yzrnl7bq0dkcd3wh55kbf41c4dbh7dky0mqx0drvnpxlrvzhvp2"; + }; + + propagatedBuildInputs = with pythonPackages; [ pygtk pyyaml dbus notify pkgs.udisks2 ]; + + # tests require dbusmock + doCheck = false; + + meta = with stdenv.lib; { + description = "Removable disk automounter for udisks."; + license = licenses.mit; + homepage = https://github.com/coldfix/udiskie; + }; + }; + # python2.7 specific packages } // optionalAttrs isPy27 ( with pythonPackages; From 2030328fea2d477d32db569e544ad1cde733c949 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 30 May 2014 17:56:05 +0200 Subject: [PATCH 136/254] disk-indicator: Add package A program that will turn a LED into a hard disk indicator. --- .../linux/disk-indicator/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/os-specific/linux/disk-indicator/default.nix diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix new file mode 100644 index 000000000000..57fc9390f61e --- /dev/null +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, libX11 }: + +stdenv.mkDerivation { + name = "disk-indicator"; + + src = fetchgit { + url = git://github.com/MeanEYE/Disk-Indicator.git; + rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da"; + sha256 = "0f8mxl3wqlap8zajdk6r9liliayp8w4xs4jy8jbwanmmppwz0nb9"; + }; + + buildInputs = [ libX11 ]; + + patchPhase = '' + substituteInPlace ./makefile --replace "COMPILER=c99" "COMPILER=gcc -std=c99" + substituteInPlace ./makefile --replace "COMPILE_FLAGS=" "COMPILE_FLAGS=-O2 " + ''; + + buildPhase = "make -f makefile"; + + installPhase = '' + mkdir -p "$out/bin" + cp ./disk_indicator "$out/bin/" + ''; + + meta = { + homepage = https://github.com/MeanEYE/Disk-Indicator; + description = "A program that will turn a LED into a hard disk indicator"; + longDescription = '' + Small program for Linux that will turn your Scroll, Caps or Num Lock LED + or LED on your ThinkPad laptop into a hard disk activity indicator. + ''; + license = "GPLv3"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d64a4de9ed2f..7fa0f77f80af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6962,6 +6962,8 @@ let devicemapper = lvm2; + disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; + dmidecode = callPackage ../os-specific/linux/dmidecode { }; dmtcp = callPackage ../os-specific/linux/dmtcp { }; From b7e99da4a1162750b6bff22b6bd88fe50a26eb0f Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 30 May 2014 18:51:21 +0200 Subject: [PATCH 137/254] perlPackages.DevelTrace: New module Print out each line before it is executed (like sh -x). --- pkgs/top-level/perl-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4239d6dd7462..593203be6d41 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2272,6 +2272,18 @@ let self = _self // overrides; _self = with self; { }; }; + DevelTrace = buildPerlPackage { + name = "Devel-Trace-0.12"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MJ/MJD/Devel-Trace-0.12.tar.gz; + sha256 = "0s1q1a05gk3xvwqkya3k05vqjk13rvb489g0frprhzpzfvvwl0gm"; + }; + meta = { + description = "Print out each line before it is executed (like sh -x)"; + license = "Public Domain"; + }; + }; + DBDSQLite = import ../development/perl-modules/DBD-SQLite { inherit stdenv fetchurl buildPerlPackage DBI; inherit (pkgs) sqlite; From abd0b3f411839ac83896a3a0c9150e3265031c06 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 30 May 2014 21:22:25 +0200 Subject: [PATCH 138/254] nixos.tests.installer: Attempt to fix race condition Attempt to fix race condition in installer tests, especially the grub1 test. The latter was failing when running "parted /dev/sda ..." because /dev/sda didn't exist yet. --- nixos/tests/installer.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 1c3fb148410c..98e8142a0dfd 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -147,6 +147,9 @@ let or die "bad `hello' output"; ''} + # Wait for hard disks to appear in /dev + $machine->succeed("udevadm settle"); + # Partition the disk. ${createPartitions} From a3d747da151711006f3a6c04046d903b2c05762f Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 30 May 2014 21:08:56 +0100 Subject: [PATCH 139/254] Plone: update to 4.3.3 --- pkgs/top-level/python-packages-generated.nix | 3017 +++++++++--------- pkgs/top-level/python-packages.json | 6 +- 2 files changed, 1472 insertions(+), 1551 deletions(-) diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index 193928513cb4..ca980e386373 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -55,7 +55,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -67,15 +67,15 @@ in }; - "Products.Archetypes-1.9.4" = self.buildPythonPackage { - name = "Products.Archetypes-1.9.4"; + "Products.Archetypes-1.9.7" = self.buildPythonPackage { + name = "Products.Archetypes-1.9.7"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.4.zip"; - md5 = "fc5679b10df703a542b58da044f7d9c6"; + url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.7.zip"; + md5 = "35060c0ed8faf76c3c488fa642bb9715"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.folder-1.0.4" self."plone.uuid-1.0.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.Marshall-2.1.2" self."Products.MimetypesRegistry-2.0.5" self."Products.PlacelessTranslationService-2.0.4" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self."Products.validation-2.0" self."Products.ZSQLMethods-2.13.4" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contenttype-3.5.5" self."zope.datetime-3.4.1" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.tal-3.5.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.6" self."plone.folder-1.0.5" self."plone.uuid-1.0.3" self."Products.CMFCalendar-2.2.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.Marshall-2.1.2" self."Products.MimetypesRegistry-2.0.5" self."Products.PlacelessTranslationService-2.0.4" self."Products.PortalTransforms-2.1.3" self."Products.statusmessages-4.0" self."Products.validation-2.0" self."Products.ZSQLMethods-2.13.4" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contenttype-3.5.5" self."zope.datetime-3.4.1" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.tal-3.5.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -87,22 +87,22 @@ in }; - "plone.app.contentlisting-1.0.5" = self.buildPythonPackage { - name = "plone.app.contentlisting-1.0.5"; + "cssselect-0.9.1" = self.buildPythonPackage { + name = "cssselect-0.9.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.5.zip"; - md5 = "9fc15b8ecad1c918778c3ea9a75bf533"; + url = "https://pypi.python.org/packages/source/c/cssselect/cssselect-0.9.1.tar.gz"; + md5 = "c74f45966277dc7a0f768b9b0f3522ac"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - Listing of content for the Plone CMS + cssselect parses CSS3 Selectors and translates them to XPath 1.0 ''; - homepage = "http://pypi.python.org/pypi/plone.app.contentlisting"; - license = "GPL version 2"; + homepage = "http://packages.python.org/cssselect/"; + license = "BSD"; }; }; @@ -115,7 +115,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -127,11 +127,11 @@ in }; - "plone.folder-1.0.4" = self.buildPythonPackage { - name = "plone.folder-1.0.4"; + "plone.folder-1.0.5" = self.buildPythonPackage { + name = "plone.folder-1.0.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.4.zip"; - md5 = "1674ff18b7a9452d0c2063cf11c679b7"; + url = "https://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.5.zip"; + md5 = "2722124a411e2d267b08d6f4d81e262c"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -147,55 +147,15 @@ in }; - "plone.z3cform-0.8.0" = self.buildPythonPackage { - name = "plone.z3cform-0.8.0"; + "Products.CMFPlone-4.3.3" = self.buildPythonPackage { + name = "Products.CMFPlone-4.3.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip"; - md5 = "bdb23dd162544964d2f8f8f5f002e874"; + url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.3.zip"; + md5 = "e6638766d7bf59d27517174e9d67ea6b"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.batching-1.0" self.setuptools self."z3c.form-3.0.2" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF. - ''; - homepage = "http://pypi.python.org/pypi/plone.z3cform"; - license = "ZPL 2.1"; - }; - }; - - - "six-1.4.1" = self.buildPythonPackage { - name = "six-1.4.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/s/six/six-1.4.1.tar.gz"; - md5 = "bdbb9e12d3336c198695aa4cf3a61d62"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Python 2 and 3 compatibility utilities - ''; - homepage = "http://pypi.python.org/pypi/six/"; - license = "UNKNOWN"; - }; - }; - - - "Products.CMFPlone-4.3.2" = self.buildPythonPackage { - name = "Products.CMFPlone-4.3.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.2.zip"; - md5 = "b9948583429d7d90475148d276fa5cf4"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.querywidget-1.0.9" self."archetypes.referencebrowserwidget-2.4.19" self."borg.localrole-3.0.2" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."five.customerize-1.1" self."five.localsitemanager-2.0.5" self."Pillow-1.7.8" self."plone.app.blob-1.5.8" self."plone.app.collection-1.0.11" self."plone.app.content-2.1.3" self."plone.app.contentlisting-1.0.5" self."plone.app.contentmenu-2.0.8" self."plone.app.contentrules-3.0.4" self."plone.app.controlpanel-2.3.7" self."plone.app.customerize-1.2.2" self."plone.app.discussion-2.2.8" self."plone.app.folder-1.0.5" self."plone.app.form-2.2.3" self."plone.app.i18n-2.0.2" self."plone.app.jquery-1.7.2" self."plone.app.jquerytools-1.5.6" self."plone.app.layout-2.3.7" self."plone.app.linkintegrity-1.5.3" self."plone.app.locales-4.3.2" self."plone.app.portlets-2.4.5" self."plone.app.redirector-1.2" self."plone.app.search-1.1.5" self."plone.app.upgrade-1.3.4" self."plone.app.users-1.2a2" self."plone.app.uuid-1.0" self."plone.app.viewletmanager-2.0.4" self."plone.app.vocabularies-2.1.11" self."plone.app.workflow-2.1.6" self."plone.batching-1.0" self."plone.browserlayer-2.1.2" self."plone.contentrules-2.0.3" self."plone.fieldsets-2.0.2" self."plone.i18n-2.0.9" self."plone.indexer-1.0.2" self."plone.intelligenttext-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlet.collection-2.1.5" self."plone.portlet.static-2.0.2" self."plone.portlets-2.2" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."plone.session-3.5.3" self."plone.theme-2.1" self."plonetheme.classic-1.3.2" self."plonetheme.sunburst-1.4.5" self."Products.Archetypes-1.9.4" self."Products.ATContentTypes-2.1.13" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.DCWorkflow-2.2.4" self."Products.ExtendedPathIndex-3.1" self."Products.ExternalEditor-1.1.0" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PasswordResetTool-2.0.15" self."Products.PlacelessTranslationService-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PluginRegistry-1.3" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.statusmessages-4.0" self."Products.TinyMCE-1.3.5" self.setuptools self."transaction-1.1.1" self."z3c.autoinclude-0.3.4" self."ZODB3-3.10.5" self."zope.app.locales-3.6.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.site-3.9.2" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.querywidget-1.0.10" self."archetypes.referencebrowserwidget-2.4.20" self."borg.localrole-3.0.2" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."five.customerize-1.1" self."five.localsitemanager-2.0.5" self."Pillow-2.3.0" self."plone.app.blob-1.5.9" self."plone.app.collection-1.0.11" self."plone.app.content-2.1.4" self."plone.app.contentlisting-1.0.5" self."plone.app.contentmenu-2.0.10" self."plone.app.contentrules-3.0.6" self."plone.app.controlpanel-2.3.8" self."plone.app.customerize-1.2.2" self."plone.app.discussion-2.2.12" self."plone.app.folder-1.0.6" self."plone.app.form-2.2.4" self."plone.app.i18n-2.0.2" self."plone.app.jquery-1.7.2" self."plone.app.jquerytools-1.5.7" self."plone.app.layout-2.3.11" self."plone.app.linkintegrity-1.5.4" self."plone.app.locales-4.3.3" self."plone.app.portlets-2.4.8" self."plone.app.redirector-1.2" self."plone.app.search-1.1.7" self."plone.app.upgrade-1.3.6" self."plone.app.users-1.2" self."plone.app.uuid-1.1" self."plone.app.viewletmanager-2.0.5" self."plone.app.vocabularies-2.1.14" self."plone.app.workflow-2.1.7" self."plone.batching-1.0.1" self."plone.browserlayer-2.1.3" self."plone.contentrules-2.0.4" self."plone.fieldsets-2.0.2" self."plone.i18n-2.0.9" self."plone.indexer-1.0.2" self."plone.intelligenttext-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlet.collection-2.1.5" self."plone.portlet.static-2.0.2" self."plone.portlets-2.2" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."plone.session-3.5.3" self."plone.theme-2.1.1" self."plonetheme.classic-1.3.3" self."plonetheme.sunburst-1.4.6" self."Products.Archetypes-1.9.7" self."Products.ATContentTypes-2.1.14" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDiffTool-2.1" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.9" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.DCWorkflow-2.2.4" self."Products.ExtendedPathIndex-3.1" self."Products.ExternalEditor-1.1.0" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PasswordResetTool-2.0.16" self."Products.PlacelessTranslationService-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self."Products.PluginRegistry-1.3" self."Products.PortalTransforms-2.1.3" self."Products.ResourceRegistries-2.2.10" self."Products.statusmessages-4.0" self."Products.TinyMCE-1.3.6" self.setuptools self."transaction-1.1.1" self."z3c.autoinclude-0.3.5" self."ZODB3-3.10.5" self."zope.app.locales-3.6.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.site-3.9.2" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -207,6 +167,26 @@ in }; + "waitress-0.8.9" = self.buildPythonPackage { + name = "waitress-0.8.9"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.9.tar.gz"; + md5 = "da3f2e62b3676be5dd630703a68e2a04"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Waitress WSGI server + ''; + homepage = "https://github.com/Pylons/waitress"; + license = "ZPL 2.1"; + }; + }; + + "zope.deferredimport-3.5.3" = self.buildPythonPackage { name = "zope.deferredimport-3.5.3"; src = fetchurl { @@ -227,62 +207,42 @@ in }; - "Mako-0.9.0" = self.buildPythonPackage { - name = "Mako-0.9.0"; + "six-1.6.1" = self.buildPythonPackage { + name = "six-1.6.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/M/Mako/Mako-0.9.0.tar.gz"; - md5 = "e2627ba5c65f83dfe39d9a0892ae517d"; - }; - doCheck = true; - buildInputs = [ self."nose-1.3.0" ]; - propagatedBuildInputs = [ self."MarkupSafe-0.18" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - A super-fast templating language that borrows the best ideas from the existing templating languages. - ''; - homepage = "http://www.makotemplates.org/"; - license = "MIT"; - }; - }; - - - "waitress-0.8.7" = self.buildPythonPackage { - name = "waitress-0.8.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.7.tar.gz"; - md5 = "714f3d458d82a47f12fb168460de8366"; + url = "https://pypi.python.org/packages/source/s/six/six-1.6.1.tar.gz"; + md5 = "07d606ac08595d795bf926cc9985674f"; }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Waitress WSGI server - ''; - homepage = "https://github.com/Pylons/waitress"; - license = "ZPL 2.1"; - }; - }; - - - "coverage-3.7" = self.buildPythonPackage { - name = "coverage-3.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/c/coverage/coverage-3.7.tar.gz"; - md5 = "055d82e6849d882ec6cf2ae1faca8e56"; - }; - doCheck = true; - buildInputs = [ ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - Code coverage measurement for Python + Python 2 and 3 compatibility utilities ''; - homepage = "http://nedbatchelder.com/code/coverage"; - license = "BSD"; + homepage = "http://pypi.python.org/pypi/six/"; + license = "MIT"; + }; + }; + + + "zope.deprecation-4.1.1" = self.buildPythonPackage { + name = "zope.deprecation-4.1.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-4.1.1.tar.gz"; + md5 = "ce261b9384066f7e13b63525778430cb"; + }; + doCheck = true; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Zope Deprecation Infrastructure + ''; + homepage = "http://pypi.python.org/pypi/zope.deprecation"; + license = "ZPL 2.1"; }; }; @@ -295,7 +255,7 @@ in }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -307,15 +267,15 @@ in }; - "plone.autoform-1.5" = self.buildPythonPackage { - name = "plone.autoform-1.5"; + "plone.autoform-1.6" = self.buildPythonPackage { + name = "plone.autoform-1.6"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.5.zip"; - md5 = "a62216fb76017077643f5af8b1e17949"; + url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.6.zip"; + md5 = "27412ab43f728064a60e2aeb564726b5"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.supermodel-1.2.3" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0.2" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; + propagatedBuildInputs = [ self."plone.supermodel-1.2.4" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -327,11 +287,11 @@ in }; - "Unidecode-0.04.1" = self.buildPythonPackage { - name = "Unidecode-0.04.1"; + "roman-1.4.0" = self.buildPythonPackage { + name = "roman-1.4.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz"; - md5 = "c4c9ed8d40cff25c390ff5d5112b9308"; + url = "https://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz"; + md5 = "4f8832ed4108174b159c2afb4bd1d1dd"; }; doCheck = false; buildInputs = [ ]; @@ -339,10 +299,30 @@ in installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - US-ASCII transliterations of Unicode text + Integer to Roman numerals converter ''; - homepage = "http://code.zemanta.com/tsolc/unidecode/"; - license = "UNKNOWN"; + homepage = "http://pypi.python.org/pypi/roman"; + license = "Python 2.1.1"; + }; + }; + + + "archetypes.referencebrowserwidget-2.4.20" = self.buildPythonPackage { + name = "archetypes.referencebrowserwidget-2.4.20"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.20.zip"; + md5 = "352ea75e5dbdcdca8897f88fd77ecd3e"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.jquerytools-1.5.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + A referencebrowser implementation for Archetypes + ''; + homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget"; + license = "ZPL 2.1"; }; }; @@ -387,15 +367,35 @@ in }; - "plone.app.blob-1.5.8" = self.buildPythonPackage { - name = "plone.app.blob-1.5.8"; + "nose-1.3.3" = self.buildPythonPackage { + name = "nose-1.3.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.8.zip"; - md5 = "7e575d8df137cd19067cc95845aae604"; + url = "https://pypi.python.org/packages/source/n/nose/nose-1.3.3.tar.gz"; + md5 = "42776061bf5206670cb819176dc78654"; + }; + doCheck = true; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + nose extends unittest to make testing easier + ''; + homepage = "http://readthedocs.org/docs/nose/"; + license = "GNU LGPL"; + }; + }; + + + "plone.app.blob-1.5.9" = self.buildPythonPackage { + name = "plone.app.blob-1.5.9"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.9.zip"; + md5 = "3ac753daa2758e3e8290e1e3a1887183"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."archetypes.schemaextender-2.1.2" self."plone.app.imaging-1.0.9" self."plone.scale__storage-1.3.2" self.setuptools self."ZODB3-3.10.5" self."zope.proxy-3.6.1" ]; + propagatedBuildInputs = [ self."archetypes.schemaextender-2.1.3" self."plone.app.imaging-1.0.10" self."plone.scale__storage-1.3.3" self.setuptools self."ZODB3-3.10.5" self."zope.proxy-3.6.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -407,22 +407,24 @@ in }; - "WebOb-1.2.3" = self.buildPythonPackage { - name = "WebOb-1.2.3"; + "suds" = self."suds-0.4"; + + "suds-0.4" = self.buildPythonPackage { + name = "suds-0.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/W/WebOb/WebOb-1.2.3.tar.gz"; - md5 = "11825b7074ba7043e157805e4e6e0f55"; + url = "https://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz"; + md5 = "b7502de662341ed7275b673e6bd73191"; }; - doCheck = true; - buildInputs = [ self."nose-1.3.0" ]; + doCheck = false; + buildInputs = [ ]; propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - WSGI request and response object + Lightweight SOAP client ''; - homepage = "http://webob.org/"; - license = "MIT"; + homepage = "https://fedorahosted.org/suds"; + license = "UNKNOWN"; }; }; @@ -447,22 +449,42 @@ in }; - "plone.theme-2.1" = self.buildPythonPackage { - name = "plone.theme-2.1"; + "Products.ZCTextIndex-2.13.5" = self.buildPythonPackage { + name = "Products.ZCTextIndex-2.13.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.zip"; - md5 = "c592d0d095e9fc76cc81597cdf6d0c37"; + url = "https://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.5.zip"; + md5 = "9a3717674b33d1d7c11b2c3728663d5b"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Tools for managing themes in CMF and Plone sites + Full text indexing for ZCatalog / Zope 2. ''; - homepage = "http://pypi.python.org/pypi/plone.theme"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/Products.ZCTextIndex"; + license = "ZPL 2.1"; + }; + }; + + + "plone.outputfilters-1.12" = self.buildPythonPackage { + name = "plone.outputfilters-1.12"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.12.zip"; + md5 = "ed76b9cf028cf7e04f3aa408e22b61ca"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.3" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Transformations applied to HTML in Plone text fields as they are rendered + ''; + homepage = "http://github.com/plone/plone.outputfilters"; + license = "GPL"; }; }; @@ -487,22 +509,42 @@ in }; - "plone.batching-1.0" = self.buildPythonPackage { - name = "plone.batching-1.0"; + "plone.app.contentmenu-2.0.10" = self.buildPythonPackage { + name = "plone.app.contentmenu-2.0.10"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0.zip"; - md5 = "cabd58ccfec67cd384602343ce40dc7b"; + url = "https://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.10.zip"; + md5 = "d28bc995bbe5a6f4aeabad07438ffb85"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.content-2.1.4" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Batching facilities used in Plone. + Plone's content menu implementation ''; - homepage = "http://pypi.python.org/pypi/plone.batching"; - license = "GPL"; + homepage = "http://pypi.python.org/pypi/plone.app.contentmenu"; + license = "GPL version 2"; + }; + }; + + + "mechanize-0.2.5" = self.buildPythonPackage { + name = "mechanize-0.2.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz"; + md5 = "32657f139fc2fb75bcf193b63b8c60b2"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Stateful programmatic web browsing. + ''; + homepage = "http://wwwsearch.sourceforge.net/mechanize/"; + license = "BSD"; }; }; @@ -515,7 +557,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."python-gettext-1.2" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."python-gettext-1.2" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -527,34 +569,6 @@ in }; - "Pillow-1.7.8" = self.buildPythonPackage { - name = "Pillow-1.7.8"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Pillow/Pillow-1.7.8.zip"; - md5 = "41d8688d4db72673069a6dc63b5289d6"; - }; - doCheck = false; - buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.unzip ]; - propagatedBuildInputs = [ ]; - configurePhase = '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;' - ''; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Python Imaging Library (fork) - ''; - homepage = "http://github.com/python-imaging/Pillow"; - license = "UNKNOWN"; - }; - }; - - "ZConfig-2.9.1" = self.buildPythonPackage { name = "ZConfig-2.9.1"; src = fetchurl { @@ -603,7 +617,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."zope.tales-3.5.3" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."zope.tales-3.5.3" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -623,7 +637,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -635,11 +649,11 @@ in }; - "zope.event-4.0.2" = self.buildPythonPackage { - name = "zope.event-4.0.2"; + "zope.event-4.0.3" = self.buildPythonPackage { + name = "zope.event-4.0.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-4.0.2.tar.gz"; - md5 = "e08dd299d428d77a1cfcbfe841b81872"; + url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-4.0.3.tar.gz"; + md5 = "9a3780916332b18b8b85f522bcc3e249"; }; doCheck = true; buildInputs = [ ]; @@ -663,7 +677,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self."plone.transformchain-1.0.3" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self."plone.transformchain-1.0.3" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -723,7 +737,7 @@ in }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self."Products.GenericSetup-1.7.4" self."Products.ZSQLMethods-2.13.4" self.setuptools self."zope.app.publication-3.12.0" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self."Products.GenericSetup-1.7.4" self."Products.ZSQLMethods-2.13.4" self.setuptools self."zope.app.publication-3.12.0" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -735,15 +749,15 @@ in }; - "Products.PlonePAS-4.1.1" = self.buildPythonPackage { - name = "Products.PlonePAS-4.1.1"; + "Products.PlonePAS-4.1.3" = self.buildPythonPackage { + name = "Products.PlonePAS-4.1.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.1.1.zip"; - md5 = "32db1808c3ad42e82542b65eb95c3c71"; + url = "https://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.1.3.zip"; + md5 = "785c10242b77bfb0612c76b0262e361e"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.session-3.5.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.session-3.5.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -783,7 +797,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.19" self.setuptools self."zope.deprecation-3.4.1" ]; + propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.20" self.setuptools self."zope.deprecation-3.4.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -823,7 +837,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Record-2.13.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Record-2.13.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -855,28 +869,6 @@ in }; - "plone.recipe.zope2instance" = self."plone.recipe.zope2instance-4.2.13"; - - "plone.recipe.zope2instance-4.2.13" = self.buildPythonPackage { - name = "plone.recipe.zope2instance-4.2.13"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.13.zip"; - md5 = "1ff990a15e77a92a7339b5092bfb9cc3"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."mailinglogger-3.7.0" self.setuptools self."zc.buildout-1.7.1" self."zc.recipe.egg-1.3.2" self."ZODB3-3.10.5" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Buildout recipe for creating a Zope 2 instance - ''; - homepage = "http://pypi.python.org/pypi/plone.recipe.zope2instance"; - license = "ZPL 2.1"; - }; - }; - - "Products.CMFQuickInstallerTool-3.0.6" = self.buildPythonPackage { name = "Products.CMFQuickInstallerTool-3.0.6"; src = fetchurl { @@ -885,7 +877,7 @@ in }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" self."eggtestinfo-0.3" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -897,35 +889,57 @@ in }; - "zope.deprecation-4.0.2" = self.buildPythonPackage { - name = "zope.deprecation-4.0.2"; + "plone.recipe.zope2instance" = self."plone.recipe.zope2instance-4.2.14"; + + "plone.recipe.zope2instance-4.2.14" = self.buildPythonPackage { + name = "plone.recipe.zope2instance-4.2.14"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-4.0.2.tar.gz"; - md5 = "5f8cecce85f2783f9e020f1288e908fd"; + url = "https://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.14.zip"; + md5 = "e5e76023d357592ee7b0236bb9764b9d"; }; - doCheck = true; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."mailinglogger-3.7.0" self.setuptools self."zc.buildout-1.7.1" self."zc.recipe.egg-1.3.2" self."ZODB3-3.10.5" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - Zope Deprecation Infrastructure + Buildout recipe for creating a Zope 2 instance ''; - homepage = "http://pypi.python.org/pypi/zope.deprecation"; + homepage = "http://pypi.python.org/pypi/plone.recipe.zope2instance"; license = "ZPL 2.1"; }; }; - "Products.CMFEditions-2.2.8" = self.buildPythonPackage { - name = "Products.CMFEditions-2.2.8"; + "zope.event-3.5.2" = self.buildPythonPackage { + name = "zope.event-3.5.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.8.zip"; - md5 = "1806f2e17e2527fad9364670b343bd11"; + url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz"; + md5 = "6e8af2a16157a74885d4f0d88137cefb"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Very basic event publishing system + ''; + homepage = "http://pypi.python.org/pypi/zope.event"; + license = "ZPL 2.1"; + }; + }; + + + "Products.CMFEditions-2.2.9" = self.buildPythonPackage { + name = "Products.CMFEditions-2.2.9"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.9.zip"; + md5 = "4cd9db460f4056b14d425ff2fdc34952"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.4" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.4" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -937,46 +951,6 @@ in }; - "plone.app.form-2.2.3" = self.buildPythonPackage { - name = "plone.app.form-2.2.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.3.zip"; - md5 = "4b7dcabcda1407a40185782a4d1f9a01"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.11" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - zope.formlib integration for Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.form"; - license = "GPL version 2"; - }; - }; - - - "Products.CMFDefault-2.2.3" = self.buildPythonPackage { - name = "Products.CMFDefault-2.2.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.3.tar.gz"; - md5 = "fe7d2d3906ee0e3b484e4a02401576ab"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."five.formlib-1.0.4" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Default product for the Zope Content Management Framework - ''; - homepage = "http://pypi.python.org/pypi/Products.CMFDefault"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; - }; - }; - - "zope.processlifetime-1.0" = self.buildPythonPackage { name = "zope.processlifetime-1.0"; src = fetchurl { @@ -997,22 +971,62 @@ in }; - "zope.component-4.1.0" = self.buildPythonPackage { - name = "zope.component-4.1.0"; + "Products.CMFDefault-2.2.4" = self.buildPythonPackage { + name = "Products.CMFDefault-2.2.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-4.1.0.zip"; - md5 = "8e185893699f9fa577bd9ada0a5302fa"; + url = "https://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.4.tar.gz"; + md5 = "3d4444a8c4b486a2d769060e35a3ee01"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."five.formlib-1.0.4" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Default product for the Zope Content Management Framework + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFDefault"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + }; + }; + + + "plone.app.form-2.2.4" = self.buildPythonPackage { + name = "plone.app.form-2.2.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.4.zip"; + md5 = "1784f608dcb3a1701d91d4985ca31e63"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.14" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Zope Component Architecture + zope.formlib integration for Plone ''; - homepage = "http://pypi.python.org/pypi/zope.component"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.app.form"; + license = "GPL version 2"; + }; + }; + + + "Products.PasswordResetTool-2.0.16" = self.buildPythonPackage { + name = "Products.PasswordResetTool-2.0.16"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.16.zip"; + md5 = "c9069dff718878a32b1ef91875acf240"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Password reset tool for Plone + ''; + homepage = "http://pypi.python.org/pypi/Products.PasswordResetTool"; + license = "GPL"; }; }; @@ -1057,31 +1071,51 @@ in }; - "plone.stringinterp-1.0.10" = self.buildPythonPackage { - name = "plone.stringinterp-1.0.10"; + "lxml-3.3.5" = self.buildPythonPackage { + name = "lxml-3.3.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.10.zip"; - md5 = "595074e94944ad6860e2105a020a3b9a"; + url = "https://pypi.python.org/packages/source/l/lxml/lxml-3.3.5.tar.gz"; + md5 = "88c75f4c73fc8f59c9ebb17495044f2f"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - Adaptable string interpolation + Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API. ''; - homepage = "http://pypi.python.org/pypi/plone.stringinterp"; - license = "GPL version 2"; + homepage = "http://lxml.de/"; + license = "UNKNOWN"; }; }; - "plonetheme.sunburst-1.4.5" = self.buildPythonPackage { - name = "plonetheme.sunburst-1.4.5"; + "PasteDeploy-1.5.2" = self.buildPythonPackage { + name = "PasteDeploy-1.5.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.5.zip"; - md5 = "a8438d6f4a27ad6c10dc3554a9145705"; + url = "https://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-1.5.2.tar.gz"; + md5 = "352b7205c78c8de4987578d19431af3b"; + }; + doCheck = true; + buildInputs = [ self."nose-1.3.3" ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Load, configure, and compose WSGI applications and servers + ''; + homepage = "http://pythonpaste.org/deploy/"; + license = "MIT"; + }; + }; + + + "plonetheme.sunburst-1.4.6" = self.buildPythonPackage { + name = "plonetheme.sunburst-1.4.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.6.zip"; + md5 = "6e236f7d2ab944b708fb26de6f343ceb"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -1097,22 +1131,22 @@ in }; - "PasteDeploy-1.5.0" = self.buildPythonPackage { - name = "PasteDeploy-1.5.0"; + "plone.openid-2.0.2" = self.buildPythonPackage { + name = "plone.openid-2.0.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-1.5.0.tar.gz"; - md5 = "f1a068a0b680493b6eaff3dd7690690f"; + url = "https://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.2.zip"; + md5 = "046133795cf232ab6d19db940f02197a"; }; - doCheck = true; - buildInputs = [ self."nose-1.3.0" ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.PluggableAuthService-1.10.0" self."python-openid-2.2.5" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.22" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Load, configure, and compose WSGI applications and servers + OpenID authentication support for PAS ''; - homepage = "http://pythonpaste.org/deploy/"; - license = "MIT"; + homepage = "http://svn.plone.org/svn/plone/plone.openid"; + license = "BSD"; }; }; @@ -1137,42 +1171,42 @@ in }; - "plone.openid-2.0.1" = self.buildPythonPackage { - name = "plone.openid-2.0.1"; + "Products.PortalTransforms-2.1.3" = self.buildPythonPackage { + name = "Products.PortalTransforms-2.1.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.1.zip"; - md5 = "d4c36926a6dbefed035ed92c29329ce1"; + url = "https://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.3.zip"; + md5 = "a2f1f9e0388ed081028bb4c93fd24317"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.PluggableAuthService-1.10.0" self."python-openid-2.2.5" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Markdown-2.0.3" self."plone.intelligenttext-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.MimetypesRegistry-2.0.5" self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - OpenID authentication support for PAS + MIME based content transformations ''; - homepage = "http://svn.plone.org/svn/plone/plone.openid"; - license = "BSD"; + homepage = "http://pypi.python.org/pypi/Products.PortalTransforms"; + license = "UNKNOWN"; }; }; - "plone.resourceeditor-1.0" = self.buildPythonPackage { - name = "plone.resourceeditor-1.0"; + "zope.interface-4.1.1" = self.buildPythonPackage { + name = "zope.interface-4.1.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip"; - md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4"; + url = "https://pypi.python.org/packages/source/z/zope.interface/zope.interface-4.1.1.tar.gz"; + md5 = "edcd5f719c5eb2e18894c4d06e29b6c6"; }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + doCheck = true; + buildInputs = [ self."zope.event-4.0.3" ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - UNKNOWN + Interfaces for Python ''; - homepage = "https://github.com/plone/plone.resourceeditor"; - license = "GPL"; + homepage = "http://pypi.python.org/pypi/zope.interface"; + license = "ZPL 2.1"; }; }; @@ -1197,35 +1231,35 @@ in }; - "zope.schema-4.2.2" = self.buildPythonPackage { - name = "zope.schema-4.2.2"; + "zope.component-4.2.1" = self.buildPythonPackage { + name = "zope.component-4.2.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz"; - md5 = "e7e581af8193551831560a736a53cf58"; + url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-4.2.1.tar.gz"; + md5 = "cf55d496428d976f9329a4a2330a8b54"; }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" ]; + propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.3" self."zope.interface-4.1.1" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - zope.interface extension for defining data schemas + Zope Component Architecture ''; - homepage = "http://pypi.python.org/pypi/zope.schema"; + homepage = "http://pypi.python.org/pypi/zope.component"; license = "ZPL 2.1"; }; }; - "plone.app.content-2.1.3" = self.buildPythonPackage { - name = "plone.app.content-2.1.3"; + "plone.app.content-2.1.4" = self.buildPythonPackage { + name = "plone.app.content-2.1.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.3.zip"; - md5 = "3463a245414518f058fa6d658a6b9caf"; + url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.4.zip"; + md5 = "6930a2376e2d856e4f24e17f789568e5"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.batching-1.0" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.batching-1.0.1" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1237,6 +1271,46 @@ in }; + "plone.alterego-1.0" = self.buildPythonPackage { + name = "plone.alterego-1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.alterego/plone.alterego-1.0.zip"; + md5 = "b7b6dbcbba00505d98d5aba83e016408"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Low level support for dynamic modules + ''; + homepage = "http://code.google.com/p/dexterity"; + license = "LGPL"; + }; + }; + + + "Products.ExternalEditor-1.1.0" = self.buildPythonPackage { + name = "Products.ExternalEditor-1.1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip"; + md5 = "475fea6e0b958c0c51cfdbfef2f4e623"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Zope External Editor + ''; + homepage = "http://pypi.python.org/pypi/Products.ExternalEditor"; + license = "ZPL 2.1"; + }; + }; + + "Products.CMFDiffTool-2.1" = self.buildPythonPackage { name = "Products.CMFDiffTool-2.1"; src = fetchurl { @@ -1245,7 +1319,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1264,7 +1338,7 @@ in md5 = "2c3b64b17a8e18b405f55d46173e14dd"; }; doCheck = true; - buildInputs = [ self."nose-1.3.0" ]; + buildInputs = [ self."nose-1.3.3" ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { @@ -1297,22 +1371,42 @@ in }; - "plone.dexterity-2.1.3" = self.buildPythonPackage { - name = "plone.dexterity-2.1.3"; + "z3c.formwidget.query-0.10" = self.buildPythonPackage { + name = "z3c.formwidget.query-0.10"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.3.zip"; - md5 = "7f6444a2c26488e4068217266fd243b7"; + url = "https://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.10.zip"; + md5 = "912773ecfa4409bc8911e9e8dd981e58"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.5" self."plone.behavior-1.0.2" self."plone.folder-1.0.4" self."plone.memoize-1.1.1" self."plone.rfc822-1.1" self."plone.supermodel-1.2.3" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self.setuptools self."z3c.form-3.1.1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Flexible CMF content + A source query widget for z3c.form. ''; - homepage = "http://code.google.com/p/dexterity"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/z3c.formwidget.query"; + license = "ZPL 2.1"; + }; + }; + + + "Products.DCWorkflow-2.2.4" = self.buildPythonPackage { + name = "Products.DCWorkflow-2.2.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz"; + md5 = "c90a16c4f3611015592ba8173a5f1863"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + DCWorkflow product for the Zope Content Management Framework + ''; + homepage = "http://pypi.python.org/pypi/Products.DCWorkflow"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; }; }; @@ -1337,11 +1431,11 @@ in }; - "diazo-1.0.4" = self.buildPythonPackage { - name = "diazo-1.0.4"; + "diazo-1.0.5" = self.buildPythonPackage { + name = "diazo-1.0.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/d/diazo/diazo-1.0.4.zip"; - md5 = "b5f07cfd928e06bcb964b3f830767bab"; + url = "https://pypi.python.org/packages/source/d/diazo/diazo-1.0.5.zip"; + md5 = "9b304d079eab7c9dd6d10487f2fc94a4"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -1353,7 +1447,7 @@ in XSLT engine. With Diazo, you "compile" your theme and ruleset in one step, then use a superfast/simple transform on each request thereafter. Alternatively, compile your theme during development, check it into - Subversion, and not touch Diazo during deployment. + version control, and not touch Diazo during deployment. ''; homepage = "http://diazo.org"; license = "New BSD"; @@ -1361,26 +1455,6 @@ in }; - "zc.lockfile-1.0.2" = self.buildPythonPackage { - name = "zc.lockfile-1.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.2.tar.gz"; - md5 = "f099d4cf2583a0c7bea0146a44dc4d59"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Basic inter-process locks - ''; - homepage = "http://www.python.org/pypi/zc.lockfile"; - license = "ZPL 2.1"; - }; - }; - - "zope.tales-3.5.3" = self.buildPythonPackage { name = "zope.tales-3.5.3"; src = fetchurl { @@ -1401,6 +1475,26 @@ in }; + "feedparser-5.0.1" = self.buildPythonPackage { + name = "feedparser-5.0.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.tar.bz2"; + md5 = "702835de74bd4a578524f311e62c2877"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + + ''; + homepage = "https://code.google.com/p/feedparser/"; + license = ""; + }; + }; + + "DateTime-3.0.3" = self.buildPythonPackage { name = "DateTime-3.0.3"; src = fetchurl { @@ -1421,11 +1515,31 @@ in }; - "z3c.autoinclude-0.3.4" = self.buildPythonPackage { - name = "z3c.autoinclude-0.3.4"; + "Missing-2.13.1" = self.buildPythonPackage { + name = "Missing-2.13.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.4.zip"; - md5 = "6a615ae18c12b459bceb3ae28e8e7709"; + url = "https://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip"; + md5 = "9823cff54444cbbcaef8fc45d8e42572"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Special Missing objects used in Zope2. + ''; + homepage = "http://pypi.python.org/pypi/Missing"; + license = "ZPL 2.1"; + }; + }; + + + "z3c.autoinclude-0.3.5" = self.buildPythonPackage { + name = "z3c.autoinclude-0.3.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.5.zip"; + md5 = "44f113a1c280dd238ab9b8490ae88857"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -1435,7 +1549,7 @@ in description = '' Automatically include ZCML ''; - homepage = "UNKNOWN"; + homepage = "http://pypi.python.org/pypi/z3c.autoinclude"; license = "ZPL"; }; }; @@ -1481,15 +1595,15 @@ in }; - "plone.app.iterate-2.1.10" = self.buildPythonPackage { - name = "plone.app.iterate-2.1.10"; + "plone.app.iterate-2.1.12" = self.buildPythonPackage { + name = "plone.app.iterate-2.1.12"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.10.zip"; - md5 = "8bd270d8a3c9509e524a06e092a9b4c4"; + url = "https://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.12.zip"; + md5 = "1d05316d4e9a68ed738e890aafa3c9e2"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.4" self."Products.CMFCore-2.2.7" self."Products.CMFEditions-2.2.8" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.DCWorkflow-2.2.4" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFEditions-2.2.9" self."Products.CMFPlacefulWorkflow-1.5.10" self."Products.DCWorkflow-2.2.4" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1501,6 +1615,26 @@ in }; + "plone.app.theming-1.1.1" = self.buildPythonPackage { + name = "plone.app.theming-1.1.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip"; + md5 = "a694b7a050b6e7c25d720d1e99bb73fa"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."diazo-1.0.5" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.8" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.3" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Integrates the Diazo theming engine with Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.theming"; + license = "GPL"; + }; + }; + + "python-openid-2.2.5" = self.buildPythonPackage { name = "python-openid-2.2.5"; src = fetchurl { @@ -1561,22 +1695,22 @@ in }; - "lxml-3.2.3" = self.buildPythonPackage { - name = "lxml-3.2.3"; + "DocumentTemplate-2.13.2" = self.buildPythonPackage { + name = "DocumentTemplate-2.13.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/l/lxml/lxml-3.2.3.tar.gz"; - md5 = "fef47bb4ac72ac38ce778518dac42236"; + url = "https://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip"; + md5 = "07bb086c77c1dfe94125ad2efbba94b7"; }; doCheck = false; - buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; - propagatedBuildInputs = [ ]; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."RestrictedPython-3.6.0" self."zExceptions-2.13.0" self."zope.sequencesort-3.4.0" self."zope.structuredtext-3.5.1" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API. + Document Templating Markup Language (DTML) ''; - homepage = "http://lxml.de/"; - license = "UNKNOWN"; + homepage = "http://pypi.python.org/pypi/DocumentTemplate"; + license = "ZPL 2.1"; }; }; @@ -1601,26 +1735,6 @@ in }; - "plone.app.controlpanel-2.3.7" = self.buildPythonPackage { - name = "plone.app.controlpanel-2.3.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.7.zip"; - md5 = "537072fe22237a2148310b8714755356"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.form-2.2.3" self."plone.app.vocabularies-2.1.11" self."plone.app.workflow-2.1.6" self."plone.fieldsets-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.PlonePAS-4.1.1" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.cachedescriptors-3.5.1" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.ramcache-1.0" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Formlib-based controlpanels for Plone. - ''; - homepage = "http://pypi.python.org/pypi/plone.app.controlpanel"; - license = "GPL version 2"; - }; - }; - - "zope.ptresource-3.9.0" = self.buildPythonPackage { name = "zope.ptresource-3.9.0"; src = fetchurl { @@ -1641,6 +1755,26 @@ in }; + "plone.namedfile__scales-2.0.5" = self.buildPythonPackage { + name = "plone.namedfile__scales-2.0.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.5.zip"; + md5 = "54f73c5961cbdf5020cf59ae780601ea"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.rfc822-1.1" self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" self."plone.scale__storage-1.3.3" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + File types and fields for images, files and blob files with filenames + ''; + homepage = "http://pypi.python.org/pypi/plone.namedfile"; + license = "BSD"; + }; + }; + + "docutils-0.9.1" = self.buildPythonPackage { name = "docutils-0.9.1"; src = fetchurl { @@ -1661,6 +1795,26 @@ in }; + "plone.app.controlpanel-2.3.8" = self.buildPythonPackage { + name = "plone.app.controlpanel-2.3.8"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.8.zip"; + md5 = "230fa6df467f5bcc0b987d1cd66ccd9f"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.form-2.2.4" self."plone.app.vocabularies-2.1.14" self."plone.app.workflow-2.1.7" self."plone.fieldsets-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.PlonePAS-4.1.3" self."Products.PortalTransforms-2.1.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.cachedescriptors-3.5.1" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.ramcache-1.0" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Formlib-based controlpanels for Plone. + ''; + homepage = "http://pypi.python.org/pypi/plone.app.controlpanel"; + license = "GPL version 2"; + }; + }; + + "beautifulsoup4-4.3.2" = self.buildPythonPackage { name = "beautifulsoup4-4.3.2"; src = fetchurl { @@ -1681,42 +1835,22 @@ in }; - "Products.PloneLanguageTool-3.2.7" = self.buildPythonPackage { - name = "Products.PloneLanguageTool-3.2.7"; + "WebOb-1.4" = self.buildPythonPackage { + name = "WebOb-1.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip"; - md5 = "bd9eb6278bf76e8cbce99437ca362164"; + url = "https://pypi.python.org/packages/source/W/WebOb/WebOb-1.4.tar.gz"; + md5 = "8437607c0cc00c35f658f972516ffb55"; }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; + doCheck = true; + buildInputs = [ self."nose-1.3.3" ]; + propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - PloneLanguageTool allows you to set the available languages in your Plone site, select various fallback mechanisms, and control the use of flags for language selection and translations. + WSGI request and response object ''; - homepage = "http://pypi.python.org/pypi/Products.PloneLanguageTool"; - license = "GPL"; - }; - }; - - - "nose-1.3.0" = self.buildPythonPackage { - name = "nose-1.3.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/n/nose/nose-1.3.0.tar.gz"; - md5 = "95d6d32b9d6b029c3c65674bd9e7eabe"; - }; - doCheck = true; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - nose extends unittest to make testing easier - ''; - homepage = "http://readthedocs.org/docs/nose/"; - license = "GNU LGPL"; + homepage = "http://webob.org/"; + license = "MIT"; }; }; @@ -1749,7 +1883,7 @@ in }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."plone.app.portlets-2.4.5" self."plone.openid-2.0.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."plone.app.portlets-2.4.8" self."plone.openid-2.0.2" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1761,42 +1895,42 @@ in }; - "Products.PortalTransforms-2.1.2" = self.buildPythonPackage { - name = "Products.PortalTransforms-2.1.2"; + "plone.indexer-1.0.2" = self.buildPythonPackage { + name = "plone.indexer-1.0.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.2.zip"; - md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e"; + url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip"; + md5 = "538aeee1f9db78bc8c85ae1bcb0153ed"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Markdown-2.0.3" self."plone.intelligenttext-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.MimetypesRegistry-2.0.5" self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - MIME based content transformations + Hooks to facilitate managing custom index values in Zope 2/CMF applications ''; - homepage = "http://pypi.python.org/pypi/Products.PortalTransforms"; - license = "UNKNOWN"; + homepage = "http://pypi.python.org/pypi/plone.indexer"; + license = "BSD"; }; }; - "zope.schema-4.3.2" = self.buildPythonPackage { - name = "zope.schema-4.3.2"; + "plone.app.portlets-2.4.8" = self.buildPythonPackage { + name = "plone.app.portlets-2.4.8"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.3.2.zip"; - md5 = "b63df4a3035f29113f8130c8ae28bb13"; + url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.8.zip"; + md5 = "7d25027d89d871a50aba91c95b798bb2"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."feedparser-5.0.1" self."five.customerize-1.1" self."five.formlib-1.0.4" self."plone.app.form-2.2.4" self."plone.app.i18n-2.0.2" self."plone.app.vocabularies-2.1.14" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - zope.interface extension for defining data schemas + Plone integration for the basic plone.portlets package ''; - homepage = "http://pypi.python.org/pypi/zope.schema"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.app.portlets"; + license = "GPL version 2"; }; }; @@ -1821,44 +1955,22 @@ in }; - "plone.app.portlets-2.4.5" = self.buildPythonPackage { - name = "plone.app.portlets-2.4.5"; + "plone.formwidget.namedfile-1.0.9" = self.buildPythonPackage { + name = "plone.formwidget.namedfile-1.0.9"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.5.zip"; - md5 = "409aeeed42d87af8338197514363ec76"; + url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.9.zip"; + md5 = "96f2634a8c4c1d98c2f39646a77c87fc"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."feedparser-5.0.1" self."five.customerize-1.1" self."five.formlib-1.0.4" self."plone.app.form-2.2.3" self."plone.app.i18n-2.0.2" self."plone.app.vocabularies-2.1.11" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.5" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Plone integration for the basic plone.portlets package + Image widget for z3c.form and Plone ''; - homepage = "http://pypi.python.org/pypi/plone.app.portlets"; - license = "GPL version 2"; - }; - }; - - - "Plone" = self."Plone-4.3.2"; - - "Plone-4.3.2" = self.buildPythonPackage { - name = "Plone-4.3.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.2.zip"; - md5 = "809f9fe8b8d23b49778e8ce304ea34f6"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.caching-1.1.6" self."plone.app.dexterity-2.0.9" self."plone.app.iterate-2.1.10" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.CMFPlone-4.3.2" self.setuptools self."wicked-1.1.10" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - The Plone Content Management System - ''; - homepage = "http://plone.org/"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/plone.formwidget.namedfile"; + license = "GPL"; }; }; @@ -1883,22 +1995,42 @@ in }; - "feedparser-5.0.1" = self.buildPythonPackage { - name = "feedparser-5.0.1"; + "Products.CMFPlacefulWorkflow-1.5.10" = self.buildPythonPackage { + name = "Products.CMFPlacefulWorkflow-1.5.10"; src = fetchurl { - url = "https://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.tar.bz2"; - md5 = "702835de74bd4a578524f311e62c2877"; + url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.10.zip"; + md5 = "997648c5bed6d5a54ac922c6ba9351a9"; }; doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - + Workflow policies for CMF and Plone ''; - homepage = "https://code.google.com/p/feedparser/"; - license = ""; + homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow"; + license = "GPL"; + }; + }; + + + "plone.dexterity-2.2.1" = self.buildPythonPackage { + name = "plone.dexterity-2.2.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.2.1.zip"; + md5 = "c62d427e3f6c24da1cca58d7cb152e1f"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.6" self."plone.behavior-1.0.2" self."plone.folder-1.0.5" self."plone.memoize-1.1.1" self."plone.rfc822-1.1" self."plone.supermodel-1.2.4" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.22" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Flexible CMF content + ''; + homepage = "http://code.google.com/p/dexterity"; + license = "GPL version 2"; }; }; @@ -1923,6 +2055,26 @@ in }; + "plone.app.dexterity-2.0.11" = self.buildPythonPackage { + name = "plone.app.dexterity-2.0.11"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.11.zip"; + md5 = "649f08fd008908121f5f70dfd33e513a"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.6" self."lxml-2.3.6" self."plone.app.content-2.1.4" self."plone.app.layout-2.3.11" self."plone.app.textfield-1.2.3" self."plone.app.uuid-1.1" self."plone.app.z3cform-0.7.6" self."plone.autoform-1.6" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.4" self."plone.dexterity-2.2.1" self."plone.formwidget.namedfile-1.0.9" self."plone.namedfile__scales-2.0.5" self."plone.portlets-2.2" self."plone.rfc822-1.1" self."plone.schemaeditor-1.3.7" self."plone.supermodel-1.2.4" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self.setuptools self."z3c.form-3.1.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Dexterity is a content type framework for CMF applications, with particular emphasis on Plone. It can be viewed as an alternative to Archetypes that is more light-weight and modular. + ''; + homepage = "http://plone.org/products/dexterity"; + license = "GPL"; + }; + }; + + "mailinglogger-3.7.0" = self.buildPythonPackage { name = "mailinglogger-3.7.0"; src = fetchurl { @@ -1943,26 +2095,6 @@ in }; - "plone.app.jquerytools-1.5.6" = self.buildPythonPackage { - name = "plone.app.jquerytools-1.5.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.6.zip"; - md5 = "4ae9a72baa8e9899c1706b4fedbb516b"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - jQuery Tools integration for Plone plus overlay and AJAX form helpers. - ''; - homepage = "http://pypi.python.org/pypi/plone.app.jquerytools"; - license = "GPL version 2"; - }; - }; - - "Products.BTreeFolder2-2.13.3" = self.buildPythonPackage { name = "Products.BTreeFolder2-2.13.3"; src = fetchurl { @@ -1991,7 +2123,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2003,22 +2135,22 @@ in }; - "plone.formwidget.namedfile-1.0.7" = self.buildPythonPackage { - name = "plone.formwidget.namedfile-1.0.7"; + "plone.app.viewletmanager-2.0.5" = self.buildPythonPackage { + name = "plone.app.viewletmanager-2.0.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.7.zip"; - md5 = "6fa3cd99bf9b30971034b0f6dc31cfb3"; + url = "https://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.5.zip"; + md5 = "e923d0a9a087ef79a6f0303f64a0f853"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0.2" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.14" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Image widget for z3c.form and Plone + configurable viewlet manager ''; - homepage = "http://pypi.python.org/pypi/plone.formwidget.namedfile"; - license = "GPL"; + homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager"; + license = "GPL version 2"; }; }; @@ -2063,35 +2195,35 @@ in }; - "ExtensionClass-2.13.2" = self.buildPythonPackage { - name = "ExtensionClass-2.13.2"; + "plone.app.imaging-1.0.10" = self.buildPythonPackage { + name = "plone.app.imaging-1.0.10"; src = fetchurl { - url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip"; - md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8"; + url = "https://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.10.zip"; + md5 = "511ed465cef112bac3d074f09810ca80"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + propagatedBuildInputs = [ self."plone.scale__storage-1.3.3" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Metaclass for subclassable extension types + User-configurable, blob-aware image scaling for Plone. ''; - homepage = "http://pypi.python.org/pypi/ExtensionClass"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.app.imaging"; + license = "GPL version 2"; }; }; - "plone.app.contentrules-3.0.4" = self.buildPythonPackage { - name = "plone.app.contentrules-3.0.4"; + "plone.app.contentrules-3.0.6" = self.buildPythonPackage { + name = "plone.app.contentrules-3.0.6"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.4.zip"; - md5 = "15e86e2739096bff5bf0745590d5ebb0"; + url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.6.zip"; + md5 = "95eeb55a9489c85c93eb11a87467d867"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.formlib-1.0.4" self."plone.app.form-2.2.3" self."plone.app.vocabularies-2.1.11" self."plone.contentrules-2.0.3" self."plone.memoize-1.1.1" self."plone.stringinterp-1.0.10" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.formlib-1.0.4" self."plone.app.form-2.2.4" self."plone.app.vocabularies-2.1.14" self."plone.contentrules-2.0.4" self."plone.memoize-1.1.1" self."plone.stringinterp-1.0.11" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2110,7 +2242,7 @@ in md5 = "0979b46d8f0f852810c8ec4be5c26cf2"; }; doCheck = true; - buildInputs = [ self."nose-1.3.0" ]; + buildInputs = [ self."nose-1.3.3" ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { @@ -2123,26 +2255,6 @@ in }; - "MarkupSafe-0.18" = self.buildPythonPackage { - name = "MarkupSafe-0.18"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-0.18.tar.gz"; - md5 = "f8d252fd05371e51dec2fe9a36890687"; - }; - doCheck = true; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Implements a XML/HTML/XHTML Markup safe string for Python - ''; - homepage = "http://github.com/mitsuhiko/markupsafe"; - license = "BSD"; - }; - }; - - "zope.pagetemplate-3.6.3" = self.buildPythonPackage { name = "zope.pagetemplate-3.6.3"; src = fetchurl { @@ -2163,22 +2275,22 @@ in }; - "python-gettext-1.2" = self.buildPythonPackage { - name = "python-gettext-1.2"; + "plone.app.users-1.2" = self.buildPythonPackage { + name = "plone.app.users-1.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip"; - md5 = "cd4201d440126d1296d1d2bc2b4795f3"; + url = "https://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.2.zip"; + md5 = "c94682960a960da6d75c8bfba587a836"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."unittest2-0.5.1" ]; + propagatedBuildInputs = [ self."five.formlib-1.0.4" self."plone.app.controlpanel-2.3.8" self."plone.app.layout-2.3.11" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Python Gettext po to mo file compiler. + A package for all things users and groups related (specific to plone) ''; - homepage = "http://pypi.python.org/pypi/python-gettext"; - license = "BSD"; + homepage = "http://pypi.python.org/pypi/plone.app.users"; + license = "GPL version 2"; }; }; @@ -2203,11 +2315,11 @@ in }; - "archetypes.schemaextender-2.1.2" = self.buildPythonPackage { - name = "archetypes.schemaextender-2.1.2"; + "archetypes.schemaextender-2.1.3" = self.buildPythonPackage { + name = "archetypes.schemaextender-2.1.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.2.zip"; - md5 = "865aa5b4b6b26e3bb650d89ddfe77c87"; + url = "https://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.3.zip"; + md5 = "105f2f8e9c18f34bd09d1a90a10c91d2"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -2223,6 +2335,26 @@ in }; + "ZopeUndo-2.12.0" = self.buildPythonPackage { + name = "ZopeUndo-2.12.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip"; + md5 = "2b8da09d1b98d5558f62e12f6e52c401"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + ZODB undo support for Zope2. + ''; + homepage = "http://pypi.python.org/pypi/ZopeUndo"; + license = "ZPL 2.1"; + }; + }; + + "zope.tal-3.5.2" = self.buildPythonPackage { name = "zope.tal-3.5.2"; src = fetchurl { @@ -2263,31 +2395,33 @@ in }; - "cssselect-0.9" = self.buildPythonPackage { - name = "cssselect-0.9"; + "pyramid" = self."pyramid-1.5"; + + "pyramid-1.5" = self.buildPythonPackage { + name = "pyramid-1.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/c/cssselect/cssselect-0.9.tar.gz"; - md5 = "3aba1e431787da957a9cd1e2c2e0bf1c"; + url = "https://pypi.python.org/packages/source/p/pyramid/pyramid-1.5.tar.gz"; + md5 = "8747658dcbab709a9c491e43d3b0d58b"; }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; + doCheck = true; + buildInputs = [ self."nose-1.3.3" self."WebTest-2.0.15" self."zope.component-4.2.1" self."zope.interface-4.1.1" ]; + propagatedBuildInputs = [ self."PasteDeploy-1.5.2" self."repoze.lru-0.6" self.setuptools self."translationstring-1.1" self."venusian-1.0a8" self."WebOb-1.4" self."zope.deprecation-4.1.1" self."zope.interface-4.1.1" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - cssselect parses CSS3 Selectors and translates them to XPath 1.0 + The Pyramid Web Framework, a Pylons project ''; - homepage = "http://packages.python.org/cssselect/"; - license = "BSD"; + homepage = "http://pylonsproject.org"; + license = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; }; }; - "plone.app.search-1.1.5" = self.buildPythonPackage { - name = "plone.app.search-1.1.5"; + "plone.app.search-1.1.7" = self.buildPythonPackage { + name = "plone.app.search-1.1.7"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.5.zip"; - md5 = "eeb42889464d35e9d8169e062bc9c827"; + url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.7.zip"; + md5 = "fc3c8d3f64300f6a02770027d7d14136"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -2323,26 +2457,6 @@ in }; - "Products.PloneTestCase-0.9.17" = self.buildPythonPackage { - name = "Products.PloneTestCase-0.9.17"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.17.zip"; - md5 = "2a5bfb94220a520961d710abc92280f2"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Integration testing framework for Plone. - ''; - homepage = "http://plone.org/products/plonetestcase"; - license = "GPL"; - }; - }; - - "unittest2-0.5.1" = self.buildPythonPackage { name = "unittest2-0.5.1"; src = fetchurl { @@ -2363,6 +2477,46 @@ in }; + "zope.schema-4.2.2" = self.buildPythonPackage { + name = "zope.schema-4.2.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz"; + md5 = "e7e581af8193551831560a736a53cf58"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + zope.interface extension for defining data schemas + ''; + homepage = "http://pypi.python.org/pypi/zope.schema"; + license = "ZPL 2.1"; + }; + }; + + + "zope.schema-4.4.1" = self.buildPythonPackage { + name = "zope.schema-4.4.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.4.1.tar.gz"; + md5 = "afb9281217b79840e1679abeb302467a"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.3" self."zope.interface-4.1.1" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + zope.interface extension for defining data schemas + ''; + homepage = "http://pypi.python.org/pypi/zope.schema"; + license = "ZPL 2.1"; + }; + }; + + "zExceptions-2.13.0" = self.buildPythonPackage { name = "zExceptions-2.13.0"; src = fetchurl { @@ -2391,7 +2545,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2423,21 +2577,21 @@ in }; - "Products.ExternalEditor-1.1.0" = self.buildPythonPackage { - name = "Products.ExternalEditor-1.1.0"; + "zope.browserpage-3.12.2" = self.buildPythonPackage { + name = "zope.browserpage-3.12.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip"; - md5 = "475fea6e0b958c0c51cfdbfef2f4e623"; + url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz"; + md5 = "a543ef3cb1b42f7233b3fca23dc9ea60"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - Zope External Editor + ZCML directives for configuring browser views for Zope. ''; - homepage = "http://pypi.python.org/pypi/Products.ExternalEditor"; + homepage = "http://pypi.python.org/pypi/zope.browserpage/"; license = "ZPL 2.1"; }; }; @@ -2483,15 +2637,15 @@ in }; - "plone.cachepurging-1.0.4" = self.buildPythonPackage { - name = "plone.cachepurging-1.0.4"; + "plone.cachepurging-1.0.5" = self.buildPythonPackage { + name = "plone.cachepurging-1.0.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.4.zip"; - md5 = "886814ac4deef0f1ed99a2eb60864264"; + url = "https://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.5.zip"; + md5 = "ae893d47c424cb8a4cd688f6d9b46dc0"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2503,22 +2657,24 @@ in }; - "roman-1.4.0" = self.buildPythonPackage { - name = "roman-1.4.0"; + "psycopg2" = self."psycopg2-2.5.3"; + + "psycopg2-2.5.3" = self.buildPythonPackage { + name = "psycopg2-2.5.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz"; - md5 = "4f8832ed4108174b159c2afb4bd1d1dd"; + url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.3.tar.gz"; + md5 = "09dcec70f623a9ef774f1aef75690995"; }; doCheck = false; buildInputs = [ ]; propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - Integer to Roman numerals converter + Python-PostgreSQL Database Adapter ''; - homepage = "http://pypi.python.org/pypi/roman"; - license = "Python 2.1.1"; + homepage = "http://initd.org/psycopg/"; + license = "GPL with exceptions or ZPL"; }; }; @@ -2543,24 +2699,42 @@ in }; - "psycopg2" = self."psycopg2-2.5.1"; - - "psycopg2-2.5.1" = self.buildPythonPackage { - name = "psycopg2-2.5.1"; + "Acquisition-2.13.8" = self.buildPythonPackage { + name = "Acquisition-2.13.8"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.1.tar.gz"; - md5 = "1b433f83d50d1bc61e09026e906d84c7"; + url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip"; + md5 = "8c33160c157b50649e2b2b3224622579"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in. + ''; + homepage = "http://pypi.python.org/pypi/Acquisition"; + license = "ZPL 2.1"; + }; + }; + + + "Unidecode-0.04.1" = self.buildPythonPackage { + name = "Unidecode-0.04.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz"; + md5 = "c4c9ed8d40cff25c390ff5d5112b9308"; }; doCheck = false; buildInputs = [ ]; propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Python-PostgreSQL Database Adapter + US-ASCII transliterations of Unicode text ''; - homepage = "http://initd.org/psycopg/"; - license = "GPL with exceptions or ZPL"; + homepage = "http://code.zemanta.com/tsolc/unidecode/"; + license = "UNKNOWN"; }; }; @@ -2605,6 +2779,46 @@ in }; + "Products.ATContentTypes-2.1.14" = self.buildPythonPackage { + name = "Products.ATContentTypes-2.1.14"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.14.zip"; + md5 = "7e777ed4034ffc23688f2a8072a6c109"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.referencebrowserwidget-2.4.20" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.6" self."plone.app.layout-2.3.11" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.7" self."Products.ATReferenceBrowserWidget-3.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.3" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."ZConfig-2.9.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.tal-3.5.2" self."Zope2-2.13.22" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Default Content Types for Plone + ''; + homepage = "http://plone.org/"; + license = "GPL"; + }; + }; + + + "coverage-3.7.1" = self.buildPythonPackage { + name = "coverage-3.7.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/c/coverage/coverage-3.7.1.tar.gz"; + md5 = "c47b36ceb17eaff3ecfab3bcd347d0df"; + }; + doCheck = true; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Code coverage measurement for Python + ''; + homepage = "http://nedbatchelder.com/code/coverage"; + license = "BSD"; + }; + }; + + "zope.i18n__zcml-3.7.4" = self.buildPythonPackage { name = "zope.i18n__zcml-3.7.4"; src = fetchurl { @@ -2625,46 +2839,6 @@ in }; - "Products.ATContentTypes-2.1.13" = self.buildPythonPackage { - name = "Products.ATContentTypes-2.1.13"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.13.zip"; - md5 = "093899fc74f5e2a83db464c96d0f5293"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.referencebrowserwidget-2.4.19" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.app.layout-2.3.7" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.4" self."Products.ATReferenceBrowserWidget-3.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.2" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."ZConfig-2.9.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.tal-3.5.2" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Default Content Types for Plone - ''; - homepage = "http://plone.org/"; - license = "GPL"; - }; - }; - - - "WSGIProxy2-0.3" = self.buildPythonPackage { - name = "WSGIProxy2-0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/W/WSGIProxy2/WSGIProxy2-0.3.zip"; - md5 = "8b2cb207932eb8c341c3fa41f0cbe994"; - }; - doCheck = true; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."six-1.4.1" self."WebOb-1.2.3" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - UNKNOWN - ''; - homepage = "https://github.com/gawel/WSGIProxy2/"; - license = "MIT"; - }; - }; - - "zope.browserresource-3.10.3" = self.buildPythonPackage { name = "zope.browserresource-3.10.3"; src = fetchurl { @@ -2707,26 +2881,6 @@ in }; - "Products.ResourceRegistries-2.2.9" = self.buildPythonPackage { - name = "Products.ResourceRegistries-2.2.9"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.9.zip"; - md5 = "8dd4f36eb894d868366b51941f6f0966"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Registry for managing CSS and JS - ''; - homepage = "http://pypi.python.org/pypi/Products.ResourceRegistries"; - license = "GPL version 2"; - }; - }; - - "five.formlib-1.0.4" = self.buildPythonPackage { name = "five.formlib-1.0.4"; src = fetchurl { @@ -2735,7 +2889,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self.setuptools self."transaction-1.1.1" self."zope.app.form-4.0.2" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self.setuptools self."transaction-1.1.1" self."zope.app.form-4.0.2" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2747,6 +2901,28 @@ in }; + "xlrd" = self."xlrd-0.9.3"; + + "xlrd-0.9.3" = self.buildPythonPackage { + name = "xlrd-0.9.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-0.9.3.tar.gz"; + md5 = "6f3325132f246594988171bc72e1a385"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Library for developers to extract data from Microsoft Excel (tm) spreadsheet files + ''; + homepage = "http://www.python-excel.org/"; + license = "BSD"; + }; + }; + + "Products.statusmessages-4.0" = self.buildPythonPackage { name = "Products.statusmessages-4.0"; src = fetchurl { @@ -2767,48 +2943,6 @@ in }; - "pyramid" = self."pyramid-1.4.5"; - - "pyramid-1.4.5" = self.buildPythonPackage { - name = "pyramid-1.4.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/pyramid/pyramid-1.4.5.tar.gz"; - md5 = "321731aad69e9788b7819e257a50be1a"; - }; - doCheck = true; - buildInputs = [ self."nose-1.3.0" self."WebTest-2.0.9" self."zope.component-4.1.0" self."zope.interface-4.0.5" ]; - propagatedBuildInputs = [ self."Chameleon-2.12" self."Mako-0.9.0" self."PasteDeploy-1.5.0" self."repoze.lru-0.6" self.setuptools self."translationstring-1.1" self."venusian-1.0a8" self."WebOb-1.2.3" self."zope.deprecation-4.0.2" self."zope.interface-4.0.5" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - The Pyramid web application development framework, a Pylons project - ''; - homepage = "http://pylonsproject.org"; - license = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; - }; - }; - - - "Products.contentmigration-2.1.5" = self.buildPythonPackage { - name = "Products.contentmigration-2.1.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.5.zip"; - md5 = "f08e5f2572fc6f4c61b930a17f99418f"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - A generic content migration framework for Plone. - ''; - homepage = "http://pypi.python.org/pypi/Products.contentmigration"; - license = "LGPL"; - }; - }; - - "Products.MimetypesRegistry-2.0.5" = self.buildPythonPackage { name = "Products.MimetypesRegistry-2.0.5"; src = fetchurl { @@ -2817,7 +2951,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2829,35 +2963,15 @@ in }; - "python-dateutil-1.5" = self.buildPythonPackage { - name = "python-dateutil-1.5"; + "plone.app.upgrade-1.3.6" = self.buildPythonPackage { + name = "plone.app.upgrade-1.3.6"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz"; - md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Extensions to the standard python 2.3+ datetime module - ''; - homepage = "http://labix.org/python-dateutil"; - license = "PSF License"; - }; - }; - - - "plone.app.upgrade-1.3.4" = self.buildPythonPackage { - name = "plone.app.upgrade-1.3.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.4.zip"; - md5 = "10c192ee4a2422f901e020fd5b39879a"; + url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.6.zip"; + md5 = "36703e1085f0d5d1d0f6e635e72fd5c1"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.5" self."plone.app.portlets-2.4.5" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.4" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.5" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.23" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.6" self."plone.app.portlets-2.4.8" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.9" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.3" self."Products.ResourceRegistries-2.2.10" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.27" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2869,6 +2983,26 @@ in }; + "Products.PloneLanguageTool-3.2.7" = self.buildPythonPackage { + name = "Products.PloneLanguageTool-3.2.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip"; + md5 = "bd9eb6278bf76e8cbce99437ca362164"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + PloneLanguageTool allows you to set the available languages in your Plone site, select various fallback mechanisms, and control the use of flags for language selection and translations. + ''; + homepage = "http://pypi.python.org/pypi/Products.PloneLanguageTool"; + license = "GPL"; + }; + }; + + "plone.intelligenttext-2.0.2" = self.buildPythonPackage { name = "plone.intelligenttext-2.0.2"; src = fetchurl { @@ -2889,26 +3023,6 @@ in }; - "plone.namedfile__scales-2.0.2" = self.buildPythonPackage { - name = "plone.namedfile__scales-2.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.2.zip"; - md5 = "f6168ab9e38f3a171dc35483527b3e01"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.rfc822-1.1" self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" self."plone.scale__storage-1.3.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - File types and fields for images, files and blob files with filenames - ''; - homepage = "http://pypi.python.org/pypi/plone.namedfile"; - license = "BSD"; - }; - }; - - "zope.contenttype-3.5.5" = self.buildPythonPackage { name = "zope.contenttype-3.5.5"; src = fetchurl { @@ -2929,15 +3043,15 @@ in }; - "zope.proxy-4.1.3" = self.buildPythonPackage { - name = "zope.proxy-4.1.3"; + "zope.proxy-4.1.4" = self.buildPythonPackage { + name = "zope.proxy-4.1.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-4.1.3.zip"; - md5 = "8dbca0d33996511b9a9026da84a47109"; + url = "https://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-4.1.4.tar.gz"; + md5 = "3bcaf8b8512a99649ecf2f158c11d05b"; }; doCheck = true; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" ]; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.interface-4.1.1" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' @@ -2989,26 +3103,6 @@ in }; - "Products.MIMETools-2.13.0" = self.buildPythonPackage { - name = "Products.MIMETools-2.13.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip"; - md5 = "ad5372fc1190599a19493db0864448ec"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - MIMETools provides the <!--#mime--> tag for DocumentTemplate. - ''; - homepage = "http://pypi.python.org/pypi/Products.MIMETools"; - license = "ZPL 2.1"; - }; - }; - - "zope.annotation-3.5.0" = self.buildPythonPackage { name = "zope.annotation-3.5.0"; src = fetchurl { @@ -3037,7 +3131,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.customerize-1.1" self."plone.browserlayer-2.1.2" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.customerize-1.1" self."plone.browserlayer-2.1.3" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3057,7 +3151,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."lxml-2.3.6" self."plone.app.z3cform-0.7.4" self."plone.autoform-1.5" self."plone.registry-1.0.1" self."plone.supermodel-1.2.3" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."lxml-2.3.6" self."plone.app.z3cform-0.7.6" self."plone.autoform-1.6" self."plone.registry-1.0.1" self."plone.supermodel-1.2.4" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3077,7 +3171,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.keyring-2.0.1" self."plone.protect-2.0.2" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."plone.keyring-2.0.1" self."plone.protect-2.0.2" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3109,26 +3203,6 @@ in }; - "Products.ZCTextIndex-2.13.4" = self.buildPythonPackage { - name = "Products.ZCTextIndex-2.13.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.4.zip"; - md5 = "8bbfa5fcd3609246990a9314d6f826b4"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Full text indexing for ZCatalog / Zope 2. - ''; - homepage = "http://pypi.python.org/pypi/Products.ZCTextIndex"; - license = "ZPL 2.1"; - }; - }; - - "zope.filerepresentation-3.6.1" = self.buildPythonPackage { name = "zope.filerepresentation-3.6.1"; src = fetchurl { @@ -3209,26 +3283,6 @@ in }; - "ZODB3-3.10.5" = self.buildPythonPackage { - name = "ZODB3-3.10.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz"; - md5 = "6f180c6897a1820948fee2a6290503cd"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."transaction-1.1.1" self."zc.lockfile-1.0.2" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zope.event-3.5.2" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Zope Object Database: object database and persistence - ''; - homepage = "UNKNOWN"; - license = "ZPL 2.1"; - }; - }; - - "five.customerize-1.1" = self.buildPythonPackage { name = "five.customerize-1.1"; src = fetchurl { @@ -3237,7 +3291,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.portlets-2.2" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.portlets-2.2" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3277,7 +3331,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.caching-1.0" self."python-dateutil-1.5" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."plone.caching-1.0" self."python-dateutil-1.5" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3289,31 +3343,11 @@ in }; - "Products.DCWorkflow-2.2.4" = self.buildPythonPackage { - name = "Products.DCWorkflow-2.2.4"; + "plone.app.locales-4.3.3" = self.buildPythonPackage { + name = "plone.app.locales-4.3.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz"; - md5 = "c90a16c4f3611015592ba8173a5f1863"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - DCWorkflow product for the Zope Content Management Framework - ''; - homepage = "http://pypi.python.org/pypi/Products.DCWorkflow"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; - }; - }; - - - "plone.app.locales-4.3.2" = self.buildPythonPackage { - name = "plone.app.locales-4.3.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.2.zip"; - md5 = "c06d6574c1e1df4e253b80751a468ad5"; + url = "https://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.3.zip"; + md5 = "d774b4de1d16bed639c22c306ad0ada7"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -3329,15 +3363,15 @@ in }; - "collective.z3cform.datetimewidget-1.2.5" = self.buildPythonPackage { - name = "collective.z3cform.datetimewidget-1.2.5"; + "collective.z3cform.datetimewidget-1.2.6" = self.buildPythonPackage { + name = "collective.z3cform.datetimewidget-1.2.6"; src = fetchurl { - url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.5.zip"; - md5 = "38fa463ea9b0b3cf5f61540250968214"; + url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.6.zip"; + md5 = "b8101e810c552a5afb8b57144ab6338a"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0.2" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ]; + propagatedBuildInputs = [ self.setuptools self."z3c.form-3.1.1" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3349,15 +3383,35 @@ in }; - "Zope2-2.13.21" = self.buildPythonPackage { - name = "Zope2-2.13.21"; + "plone.app.contentlisting-1.0.5" = self.buildPythonPackage { + name = "plone.app.contentlisting-1.0.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.21.zip"; - md5 = "7d6e1661e365ee562fea9d3593f03f0e"; + url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.5.zip"; + md5 = "9fc15b8ecad1c918778c3ea9a75bf533"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."docutils-0.9.1" self."ExtensionClass-2.13.2" self."initgroups-2.13.0" self."Missing-2.13.1" self."MultiMapping-2.13.0" self."Persistence-2.13.2" self."Products.BTreeFolder2-2.13.3" self."Products.ExternalMethod-2.13.0" self."Products.MailHost-2.13.1" self."Products.MIMETools-2.13.0" self."Products.OFSP-2.13.2" self."Products.PythonScripts-2.13.2" self."Products.StandardCacheManagers-2.13.0" self."Products.ZCatalog-2.13.23" self."Products.ZCTextIndex-2.13.4" self."pytz-2013b" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."tempstorage-2.12.2" self."transaction-1.1.1" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zExceptions-2.13.0" self."zLOG-2.11.1" self."ZODB3-3.10.5" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.contenttype-3.5.5" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.processlifetime-1.0" self."zope.proxy-3.6.1" self."zope.ptresource-3.9.0" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.sendmail-3.7.5" self."zope.sequencesort-3.4.0" self."zope.site-3.9.2" self."zope.size-3.4.1" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.testbrowser-3.11.1" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."ZopeUndo-2.12.0" ]; + propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Listing of content for the Plone CMS + ''; + homepage = "http://pypi.python.org/pypi/plone.app.contentlisting"; + license = "GPL version 2"; + }; + }; + + + "Zope2-2.13.22" = self.buildPythonPackage { + name = "Zope2-2.13.22"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.22.zip"; + md5 = "4322d37b5ca63b2e4fe43cfc67960819"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."docutils-0.9.1" self."ExtensionClass-2.13.2" self."initgroups-2.13.0" self."Missing-2.13.1" self."MultiMapping-2.13.0" self."Persistence-2.13.2" self."Products.BTreeFolder2-2.13.3" self."Products.ExternalMethod-2.13.0" self."Products.MailHost-2.13.1" self."Products.MIMETools-2.13.0" self."Products.OFSP-2.13.2" self."Products.PythonScripts-2.13.2" self."Products.StandardCacheManagers-2.13.0" self."Products.ZCatalog-2.13.27" self."Products.ZCTextIndex-2.13.5" self."pytz-2013b" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."tempstorage-2.12.2" self."transaction-1.1.1" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zExceptions-2.13.0" self."zLOG-2.11.1" self."ZODB3-3.10.5" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.contenttype-3.5.5" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.processlifetime-1.0" self."zope.proxy-3.6.1" self."zope.ptresource-3.9.0" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.sendmail-3.7.5" self."zope.sequencesort-3.4.0" self."zope.site-3.9.2" self."zope.size-3.4.1" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.testbrowser-3.11.1" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."ZopeUndo-2.12.0" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' @@ -3369,6 +3423,26 @@ in }; + "plone.app.textfield-1.2.3" = self.buildPythonPackage { + name = "plone.app.textfield-1.2.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.3.zip"; + md5 = "1a018fa11ea21de5894f85b67161bcf1"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Text field with MIME type support + ''; + homepage = "http://pypi.python.org/pypi/plone.app.textfield"; + license = "GPL"; + }; + }; + + "Products.ExternalMethod-2.13.0" = self.buildPythonPackage { name = "Products.ExternalMethod-2.13.0"; src = fetchurl { @@ -3389,35 +3463,15 @@ in }; - "plone.app.workflow-2.1.6" = self.buildPythonPackage { - name = "plone.app.workflow-2.1.6"; + "plone.browserlayer-2.1.3" = self.buildPythonPackage { + name = "plone.browserlayer-2.1.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.6.zip"; - md5 = "68a76865382b9db82aaa60c16efb1d14"; + url = "https://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.3.zip"; + md5 = "41df50201e912fa10286c63687aaec3d"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - workflow and security settings for Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.workflow"; - license = "GPL version 2"; - }; - }; - - - "plone.browserlayer-2.1.2" = self.buildPythonPackage { - name = "plone.browserlayer-2.1.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.2.zip"; - md5 = "bce02f4907a4f29314090c525e5fc28e"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3429,15 +3483,35 @@ in }; - "plone.app.folder-1.0.5" = self.buildPythonPackage { - name = "plone.app.folder-1.0.5"; + "plone.app.workflow-2.1.7" = self.buildPythonPackage { + name = "plone.app.workflow-2.1.7"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.5.zip"; - md5 = "8ea860daddb4c93c0b7f2b5f7106fef0"; + url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.7.zip"; + md5 = "269dc3dfdb8dae195ca6e1dff26a51da"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.folder-1.0.4" self.setuptools ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + workflow and security settings for Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.workflow"; + license = "GPL version 2"; + }; + }; + + + "plone.app.folder-1.0.6" = self.buildPythonPackage { + name = "plone.app.folder-1.0.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.6.zip"; + md5 = "78e76f9d20e0c0e6e8edef7cb7e5d8f1"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.folder-1.0.5" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3449,22 +3523,22 @@ in }; - "Chameleon-2.12" = self.buildPythonPackage { - name = "Chameleon-2.12"; + "zc.lockfile-1.0.2" = self.buildPythonPackage { + name = "zc.lockfile-1.0.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/C/Chameleon/Chameleon-2.12.tar.gz"; - md5 = "c2947c7b615bf758fa4a710e759c658b"; + url = "https://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.2.tar.gz"; + md5 = "f099d4cf2583a0c7bea0146a44dc4d59"; }; doCheck = false; - buildInputs = [ self."zope.event-4.0.2" ]; - propagatedBuildInputs = [ ]; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - Fast HTML/XML Template Compiler. + Basic inter-process locks ''; - homepage = "http://www.pagetemplates.org/"; - license = "BSD-like (http://repoze.org/license.html)"; + homepage = "http://www.python.org/pypi/zc.lockfile"; + license = "ZPL 2.1"; }; }; @@ -3509,6 +3583,26 @@ in }; + "plone.stringinterp-1.0.11" = self.buildPythonPackage { + name = "plone.stringinterp-1.0.11"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.11.zip"; + md5 = "e54dfa87b20a72f9b1465fcee1fd7ecd"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Adaptable string interpolation + ''; + homepage = "http://pypi.python.org/pypi/plone.stringinterp"; + license = "GPL version 2"; + }; + }; + + "tempstorage-2.12.2" = self.buildPythonPackage { name = "tempstorage-2.12.2"; src = fetchurl { @@ -3529,11 +3623,11 @@ in }; - "plone.app.uuid-1.0" = self.buildPythonPackage { - name = "plone.app.uuid-1.0"; + "plone.app.uuid-1.1" = self.buildPythonPackage { + name = "plone.app.uuid-1.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.0.zip"; - md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f"; + url = "https://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.1.zip"; + md5 = "12ab2dee1a23d1c731b563686cf7b59f"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -3549,26 +3643,6 @@ in }; - "Acquisition-2.13.8" = self.buildPythonPackage { - name = "Acquisition-2.13.8"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip"; - md5 = "8c33160c157b50649e2b2b3224622579"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in. - ''; - homepage = "http://pypi.python.org/pypi/Acquisition"; - license = "ZPL 2.1"; - }; - }; - - "zope.datetime-3.4.1" = self.buildPythonPackage { name = "zope.datetime-3.4.1"; src = fetchurl { @@ -3609,35 +3683,15 @@ in }; - "plone.app.dexterity-2.0.9" = self.buildPythonPackage { - name = "plone.app.dexterity-2.0.9"; + "zope.location-4.0.3" = self.buildPythonPackage { + name = "zope.location-4.0.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.9.zip"; - md5 = "aa9d6ee719a6918f99f0aa0066ebf024"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.5" self."lxml-2.3.6" self."plone.app.content-2.1.3" self."plone.app.layout-2.3.7" self."plone.app.textfield-1.2.2" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.4" self."plone.autoform-1.5" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.3" self."plone.dexterity-2.1.3" self."plone.formwidget.namedfile-1.0.7" self."plone.namedfile__scales-2.0.2" self."plone.portlets-2.2" self."plone.rfc822-1.1" self."plone.schemaeditor-1.3.3" self."plone.supermodel-1.2.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self.setuptools self."z3c.form-3.0.2" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Dexterity is a content type framework for CMF applications, with particular emphasis on Plone. It can be viewed as an alternative to Archetypes that is more light-weight and modular. - ''; - homepage = "http://plone.org/products/dexterity"; - license = "GPL"; - }; - }; - - - "zope.location-4.0.2" = self.buildPythonPackage { - name = "zope.location-4.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.2.zip"; - md5 = "44d865b2c0b1e1cc93898c7df938d353"; + url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.3.tar.gz"; + md5 = "201416f4eb72a9cf61c7d6d37bb87f24"; }; doCheck = true; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" self."zope.proxy-4.1.3" self."zope.schema-4.3.2" ]; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.interface-4.1.1" self."zope.proxy-4.1.4" self."zope.schema-4.4.1" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' @@ -3649,6 +3703,26 @@ in }; + "WSGIProxy2-0.4.1" = self.buildPythonPackage { + name = "WSGIProxy2-0.4.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/W/WSGIProxy2/WSGIProxy2-0.4.1.zip"; + md5 = "fb8937620dc24270916678f6f07e337b"; + }; + doCheck = true; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."six-1.6.1" self."WebOb-1.4" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + UNKNOWN + ''; + homepage = "https://github.com/gawel/WSGIProxy2/"; + license = "MIT"; + }; + }; + + "zope.app.locales-3.6.2" = self.buildPythonPackage { name = "zope.app.locales-3.6.2"; src = fetchurl { @@ -3677,7 +3751,7 @@ in }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3689,46 +3763,6 @@ in }; - "plone.indexer-1.0.2" = self.buildPythonPackage { - name = "plone.indexer-1.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip"; - md5 = "538aeee1f9db78bc8c85ae1bcb0153ed"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Hooks to facilitate managing custom index values in Zope 2/CMF applications - ''; - homepage = "http://pypi.python.org/pypi/plone.indexer"; - license = "BSD"; - }; - }; - - - "plone.app.layout-2.3.7" = self.buildPythonPackage { - name = "plone.app.layout-2.3.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.7.zip"; - md5 = "c68be1efeef54124211a676d0dbaa655"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.portlets-2.4.5" self."plone.app.viewletmanager-2.0.4" self."plone.i18n-2.0.9" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Layout mechanisms for Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.layout"; - license = "GPL version 2"; - }; - }; - - "zope.app.content-3.5.1" = self.buildPythonPackage { name = "zope.app.content-3.5.1"; src = fetchurl { @@ -3749,55 +3783,55 @@ in }; - "mechanize-0.2.5" = self.buildPythonPackage { - name = "mechanize-0.2.5"; + "plone.app.discussion-2.2.12" = self.buildPythonPackage { + name = "plone.app.discussion-2.2.12"; src = fetchurl { - url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz"; - md5 = "32657f139fc2fb75bcf193b63b8c60b2"; + url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.12.zip"; + md5 = "410d25455ff13100aa7ef2eca9f28ac4"; }; doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."collective.monkeypatcher-1.0.1" self."plone.app.layout-2.3.11" self."plone.app.uuid-1.1" self."plone.app.z3cform-0.7.6" self."plone.indexer-1.0.2" self."plone.registry-1.0.1" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.site-3.9.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Stateful programmatic web browsing. + Enhanced discussion support for Plone ''; - homepage = "http://wwwsearch.sourceforge.net/mechanize/"; - license = "BSD"; + homepage = "http://pypi.python.org/pypi/plone.app.discussion"; + license = "GPL"; }; }; - "z3c.formwidget.query-0.9" = self.buildPythonPackage { - name = "z3c.formwidget.query-0.9"; + "Products.MIMETools-2.13.0" = self.buildPythonPackage { + name = "Products.MIMETools-2.13.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.9.zip"; - md5 = "d9f7960b1a5a81d8ba5241530f496522"; + url = "https://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip"; + md5 = "ad5372fc1190599a19493db0864448ec"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0.2" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - A source query widget for z3c.form. + MIMETools provides the <!--#mime--> tag for DocumentTemplate. ''; - homepage = "http://pypi.python.org/pypi/z3c.formwidget.query"; + homepage = "http://pypi.python.org/pypi/Products.MIMETools"; license = "ZPL 2.1"; }; }; - "plone.app.z3cform-0.7.4" = self.buildPythonPackage { - name = "plone.app.z3cform-0.7.4"; + "plone.app.z3cform-0.7.6" = self.buildPythonPackage { + name = "plone.app.z3cform-0.7.6"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.4.zip"; - md5 = "6350db39b32c3bf6edbb820b91b70b0f"; + url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.6.zip"; + md5 = "292367803fafba716f04fa7a546e7064"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.5" self."plone.protect-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.formwidget.query-0.9" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.6" self."plone.protect-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."z3c.formwidget.query-0.10" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3809,82 +3843,22 @@ in }; - "plone.app.querystring-1.0.8" = self.buildPythonPackage { - name = "plone.app.querystring-1.0.8"; + "python-dateutil-1.5" = self.buildPythonPackage { + name = "python-dateutil-1.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.0.8.zip"; - md5 = "3ad2155da0dd5c6b99643551ad494607"; + url = "https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz"; + md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."DateTime-3.0.3" self."plone.app.contentlisting-1.0.5" self."plone.app.layout-2.3.7" self."plone.app.vocabularies-2.1.11" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.globalrequest-1.0" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" ]; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - UNKNOWN + Extensions to the standard python 2.3+ datetime module ''; - homepage = "http://pypi.python.org/pypi/plone.app.querystring"; - license = "GPL version 2"; - }; - }; - - - "zope.interface-4.0.5" = self.buildPythonPackage { - name = "zope.interface-4.0.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.interface/zope.interface-4.0.5.zip"; - md5 = "caf26025ae1b02da124a58340e423dfe"; - }; - doCheck = true; - buildInputs = [ self."zope.event-4.0.2" pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Interfaces for Python - ''; - homepage = "http://pypi.python.org/pypi/zope.interface"; - license = "ZPL 2.1"; - }; - }; - - - "Products.PasswordResetTool-2.0.15" = self.buildPythonPackage { - name = "Products.PasswordResetTool-2.0.15"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.15.zip"; - md5 = "74b46348d023052285124683bf122272"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Password reset tool for Plone - ''; - homepage = "http://pypi.python.org/pypi/Products.PasswordResetTool"; - license = "GPL"; - }; - }; - - - "plone.portlet.static-2.0.2" = self.buildPythonPackage { - name = "plone.portlet.static-2.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip"; - md5 = "ec0dc691b4191a41ff97779b117f9985"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.portlets-2.4.5" self."plone.i18n-2.0.9" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - A simple static HTML portlet for Plone. - ''; - homepage = "http://pypi.python.org/pypi/plone.portlet.static"; - license = "GPL version 2"; + homepage = "http://labix.org/python-dateutil"; + license = "PSF License"; }; }; @@ -3909,31 +3883,11 @@ in }; - "Missing-2.13.1" = self.buildPythonPackage { - name = "Missing-2.13.1"; + "Products.contentmigration-2.1.7" = self.buildPythonPackage { + name = "Products.contentmigration-2.1.7"; src = fetchurl { - url = "https://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip"; - md5 = "9823cff54444cbbcaef8fc45d8e42572"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Special Missing objects used in Zope2. - ''; - homepage = "http://pypi.python.org/pypi/Missing"; - license = "ZPL 2.1"; - }; - }; - - - "zope.cachedescriptors-3.5.1" = self.buildPythonPackage { - name = "zope.cachedescriptors-3.5.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip"; - md5 = "263459a95238fd61d17e815d97ca49ce"; + url = "https://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.7.zip"; + md5 = "50cefdb73c88e15d331dff50086c109e"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -3941,10 +3895,10 @@ in installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Method and property caching decorators + A generic content migration framework for Plone. ''; - homepage = "http://pypi.python.org/pypi/zope.cachedescriptors"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/Products.contentmigration"; + license = "LGPL"; }; }; @@ -3969,21 +3923,21 @@ in }; - "archetypes.referencebrowserwidget-2.4.19" = self.buildPythonPackage { - name = "archetypes.referencebrowserwidget-2.4.19"; + "ZODB3-3.10.5" = self.buildPythonPackage { + name = "ZODB3-3.10.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.19.zip"; - md5 = "b70af6b2da6d8c57c1138a52e94e588c"; + url = "https://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz"; + md5 = "6f180c6897a1820948fee2a6290503cd"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.jquerytools-1.5.6" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + buildInputs = [ ]; + propagatedBuildInputs = [ self."transaction-1.1.1" self."zc.lockfile-1.0.2" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zope.event-3.5.2" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - A referencebrowser implementation for Archetypes + Zope Object Database: object database and persistence ''; - homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget"; + homepage = "UNKNOWN"; license = "ZPL 2.1"; }; }; @@ -4016,7 +3970,7 @@ in md5 = "a1a72166fd7cccf0f30e3305e09ce5cf"; }; doCheck = false; - buildInputs = [ self."nose-1.3.0" ]; + buildInputs = [ self."nose-1.3.3" ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { @@ -4029,51 +3983,11 @@ in }; - "WebTest-2.0.9" = self.buildPythonPackage { - name = "WebTest-2.0.9"; + "plone.contentrules-2.0.4" = self.buildPythonPackage { + name = "plone.contentrules-2.0.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/W/WebTest/WebTest-2.0.9.zip"; - md5 = "bf0a04fcf8b2cdcaa13b04324cefb53d"; - }; - doCheck = true; - buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.6" self."WSGIProxy2-0.3" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.7" pkgs.unzip ]; - propagatedBuildInputs = [ self."beautifulsoup4-4.3.2" self."six-1.4.1" self."waitress-0.8.7" self."WebOb-1.2.3" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Helper to test WSGI applications - ''; - homepage = "http://webtest.pythonpaste.org/"; - license = "MIT"; - }; - }; - - - "plone.app.contentmenu-2.0.8" = self.buildPythonPackage { - name = "plone.app.contentmenu-2.0.8"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.8.zip"; - md5 = "8ba463f1a164c454c70d26507e5bd22a"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.content-2.1.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Plone's content menu implementation - ''; - homepage = "http://pypi.python.org/pypi/plone.app.contentmenu"; - license = "GPL version 2"; - }; - }; - - - "plone.contentrules-2.0.3" = self.buildPythonPackage { - name = "plone.contentrules-2.0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.3.zip"; - md5 = "e743dca41b07b7ac1c2a65b652679201"; + url = "https://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.4.zip"; + md5 = "21b189c2139ec7baea63a1e7ee187c55"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -4097,7 +4011,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.keyring-2.0.1" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."plone.keyring-2.0.1" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4109,6 +4023,26 @@ in }; + "zope.i18nmessageid-3.5.3" = self.buildPythonPackage { + name = "zope.i18nmessageid-3.5.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz"; + md5 = "cb84bf61c2b7353e3b7578057fbaa264"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Message Identifiers for internationalization + ''; + homepage = "http://pypi.python.org/pypi/zope.i18nmessageid"; + license = "ZPL 2.1"; + }; + }; + + "transaction-1.1.1" = self.buildPythonPackage { name = "transaction-1.1.1"; src = fetchurl { @@ -4129,22 +4063,42 @@ in }; - "plone.app.theming-1.1.1" = self.buildPythonPackage { - name = "plone.app.theming-1.1.1"; + "zope.cachedescriptors-3.5.1" = self.buildPythonPackage { + name = "zope.cachedescriptors-3.5.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip"; - md5 = "a694b7a050b6e7c25d720d1e99bb73fa"; + url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip"; + md5 = "263459a95238fd61d17e815d97ca49ce"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."diazo-1.0.4" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.7" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.2" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ]; + propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Integrates the Diazo theming engine with Plone + Method and property caching decorators ''; - homepage = "http://pypi.python.org/pypi/plone.app.theming"; - license = "GPL"; + homepage = "http://pypi.python.org/pypi/zope.cachedescriptors"; + license = "ZPL 2.1"; + }; + }; + + + "plone.theme-2.1.1" = self.buildPythonPackage { + name = "plone.theme-2.1.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.1.zip"; + md5 = "28f06c6486059221648e38b5da1d304d"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Tools for managing themes in CMF and Plone sites + ''; + homepage = "http://pypi.python.org/pypi/plone.theme"; + license = "GPL version 2"; }; }; @@ -4157,7 +4111,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4169,15 +4123,15 @@ in }; - "Products.ZCatalog-2.13.23" = self.buildPythonPackage { - name = "Products.ZCatalog-2.13.23"; + "Products.ZCatalog-2.13.27" = self.buildPythonPackage { + name = "Products.ZCatalog-2.13.27"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.23.zip"; - md5 = "d425171516dfc70e543a4e2b852301cb"; + url = "https://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.27.zip"; + md5 = "49cad3f1c408973cc9a1430acc9e1432"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Products.ZCTextIndex-2.13.4" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Products.ZCTextIndex-2.13.5" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4189,35 +4143,15 @@ in }; - "plone.app.discussion-2.2.8" = self.buildPythonPackage { - name = "plone.app.discussion-2.2.8"; + "Products.TinyMCE-1.3.6" = self.buildPythonPackage { + name = "Products.TinyMCE-1.3.6"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.8.zip"; - md5 = "97cc5b204076f8803fcdaccbf0565bb6"; + url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.6.zip"; + md5 = "c9e7aa751768f88f3647c5881cc84603"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."collective.monkeypatcher-1.0.1" self."plone.app.layout-2.3.7" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.4" self."plone.indexer-1.0.2" self."plone.registry-1.0.1" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0.2" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.site-3.9.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Enhanced discussion support for Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.discussion"; - license = "GPL"; - }; - }; - - - "Products.TinyMCE-1.3.5" = self.buildPythonPackage { - name = "Products.TinyMCE-1.3.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.5.zip"; - md5 = "b972ff26c90d99c13ded0aeb33af2a2e"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.imaging-1.0.9" self."plone.app.layout-2.3.7" self."plone.caching-1.0" self."plone.namedfile__scales-2.0.2" self."plone.outputfilters-1.11.1" self."Products.ResourceRegistries-2.2.9" self.setuptools self."zope.app.content-3.5.1" self."zope.schema-4.2.2" ]; + propagatedBuildInputs = [ self."plone.app.imaging-1.0.10" self."plone.app.layout-2.3.11" self."plone.caching-1.0" self."plone.namedfile__scales-2.0.5" self."plone.outputfilters-1.12" self."Products.ResourceRegistries-2.2.10" self.setuptools self."zope.app.content-3.5.1" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4229,11 +4163,59 @@ in }; - "plone.supermodel-1.2.3" = self.buildPythonPackage { - name = "plone.supermodel-1.2.3"; + "plone.app.layout-2.3.11" = self.buildPythonPackage { + name = "plone.app.layout-2.3.11"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.3.zip"; - md5 = "34610edccd7f93409b95a6b9ecd3da9e"; + url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.11.zip"; + md5 = "641297ae21cba8fc6cbf03bbbb81c11f"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.content-2.1.4" self."plone.app.portlets-2.4.8" self."plone.app.viewletmanager-2.0.5" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.9" self.setuptools self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Layout mechanisms for Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.layout"; + license = "GPL version 2"; + }; + }; + + + "Pillow-2.3.0" = self.buildPythonPackage { + name = "Pillow-2.3.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Pillow/Pillow-2.3.0.zip"; + md5 = "56b6614499aacb7d6b5983c4914daea7"; + }; + doCheck = false; + buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.unzip ]; + propagatedBuildInputs = [ ]; + configurePhase = '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ; + s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ; + s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;' + ''; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Python Imaging Library (Fork) + ''; + homepage = "http://python-imaging.github.io/"; + license = "Standard PIL License"; + }; + }; + + + "plone.supermodel-1.2.4" = self.buildPythonPackage { + name = "plone.supermodel-1.2.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.4.zip"; + md5 = "f07134bc7ff1ab30735a61bc6f7d4c47"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -4249,6 +4231,26 @@ in }; + "plone.app.caching-1.1.8" = self.buildPythonPackage { + name = "plone.app.caching-1.1.8"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.8.zip"; + md5 = "f74d9f293ba3a89b9dd91589ab6672b5"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.6" self."plone.cachepurging-1.0.5" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.1.1" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Plone UI and default rules for plone.caching/z3c.caching + ''; + homepage = "http://pypi.python.org/pypi/plone.app.caching"; + license = "GPL version 2"; + }; + }; + + "zope.exceptions-3.6.2" = self.buildPythonPackage { name = "zope.exceptions-3.6.2"; src = fetchurl { @@ -4269,42 +4271,22 @@ in }; - "plone.app.users-1.2a2" = self.buildPythonPackage { - name = "plone.app.users-1.2a2"; + "plone.z3cform-0.8.0" = self.buildPythonPackage { + name = "plone.z3cform-0.8.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.2a2.zip"; - md5 = "a96e42e34d97162363cb3bbc8483d2ba"; + url = "https://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip"; + md5 = "bdb23dd162544964d2f8f8f5f002e874"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."five.formlib-1.0.4" self."plone.app.controlpanel-2.3.7" self."plone.app.layout-2.3.7" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."plone.batching-1.0.1" self.setuptools self."z3c.form-3.1.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - A package for all things users and groups related (specific to plone) + plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF. ''; - homepage = "http://pypi.python.org/pypi/plone.app.users"; - license = "GPL version 2"; - }; - }; - - - "plone.app.caching-1.1.6" = self.buildPythonPackage { - name = "plone.app.caching-1.1.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.6.zip"; - md5 = "52f817d67e6da1508bf6f1486e5466d2"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.4" self."plone.cachepurging-1.0.4" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.0.2" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Plone UI and default rules for plone.caching/z3c.caching - ''; - homepage = "http://pypi.python.org/pypi/plone.app.caching"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/plone.z3cform"; + license = "ZPL 2.1"; }; }; @@ -4349,75 +4331,75 @@ in }; - "z3c.form-3.0.2" = self.buildPythonPackage { - name = "z3c.form-3.0.2"; + "python-gettext-1.2" = self.buildPythonPackage { + name = "python-gettext-1.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.2.zip"; - md5 = "8eab166766c6ae2e44e40f54136b3f79"; + url = "https://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip"; + md5 = "cd4201d440126d1296d1d2bc2b4795f3"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."six-1.2.0" self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.site-3.9.2" self."zope.traversing-3.13.2" ]; + propagatedBuildInputs = [ self."unittest2-0.5.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - An advanced form and widget framework for Zope 3 + Python Gettext po to mo file compiler. ''; - homepage = "https://launchpad.net/z3c.form"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/python-gettext"; + license = "BSD"; }; }; - "Products.CMFPlacefulWorkflow-1.5.9" = self.buildPythonPackage { - name = "Products.CMFPlacefulWorkflow-1.5.9"; + "plone.resourceeditor-1.0" = self.buildPythonPackage { + name = "plone.resourceeditor-1.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip"; - md5 = "9041e1f52eab5b348c0dfa85be438722"; + url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip"; + md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self."Products.PloneTestCase-0.9.17" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.testing-3.9.7" ]; + propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Workflow policies for CMF and Plone + UNKNOWN ''; - homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow"; + homepage = "https://github.com/plone/plone.resourceeditor"; license = "GPL"; }; }; - "plone.app.textfield-1.2.2" = self.buildPythonPackage { - name = "plone.app.textfield-1.2.2"; + "Products.ResourceRegistries-2.2.10" = self.buildPythonPackage { + name = "Products.ResourceRegistries-2.2.10"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.2.zip"; - md5 = "f832887a40826d6f68c48b48f071fb9c"; + url = "https://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.10.zip"; + md5 = "207878a7c4b1583fe3cd609116e40bee"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Text field with MIME type support + Registry for managing CSS and JS ''; - homepage = "http://pypi.python.org/pypi/plone.app.textfield"; - license = "GPL"; + homepage = "http://pypi.python.org/pypi/Products.ResourceRegistries"; + license = "GPL version 2"; }; }; - "pyquery-1.2.6" = self.buildPythonPackage { - name = "pyquery-1.2.6"; + "pyquery-1.2.8" = self.buildPythonPackage { + name = "pyquery-1.2.8"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.6.zip"; - md5 = "af51aa835f24eef06175c48dc1218029"; + url = "https://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.8.zip"; + md5 = "a2a9c23a88f7b2615b41722a3ddebeb7"; }; doCheck = true; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."cssselect-0.9" self."lxml-3.2.3" ]; + propagatedBuildInputs = [ self."cssselect-0.9.1" self."lxml-3.3.5" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' @@ -4429,26 +4411,6 @@ in }; - "zope.event-3.5.2" = self.buildPythonPackage { - name = "zope.event-3.5.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz"; - md5 = "6e8af2a16157a74885d4f0d88137cefb"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Very basic event publishing system - ''; - homepage = "http://pypi.python.org/pypi/zope.event"; - license = "ZPL 2.1"; - }; - }; - - "initgroups-2.13.0" = self.buildPythonPackage { name = "initgroups-2.13.0"; src = fetchurl { @@ -4489,22 +4451,22 @@ in }; - "plone.alterego-1.0" = self.buildPythonPackage { - name = "plone.alterego-1.0"; + "plone.app.querystring-1.1.1" = self.buildPythonPackage { + name = "plone.app.querystring-1.1.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.alterego/plone.alterego-1.0.zip"; - md5 = "b7b6dbcbba00505d98d5aba83e016408"; + url = "https://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.1.1.zip"; + md5 = "845c1a4fc37f615022b536667281b80e"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; + propagatedBuildInputs = [ self."DateTime-3.0.3" self."plone.app.contentlisting-1.0.5" self."plone.app.layout-2.3.11" self."plone.app.vocabularies-2.1.14" self."plone.batching-1.0.1" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.globalrequest-1.0" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Low level support for dynamic modules + UNKNOWN ''; - homepage = "http://code.google.com/p/dexterity"; - license = "LGPL"; + homepage = "http://pypi.python.org/pypi/plone.app.querystring"; + license = "GPL version 2"; }; }; @@ -4569,6 +4531,26 @@ in }; + "plone.batching-1.0.1" = self.buildPythonPackage { + name = "plone.batching-1.0.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0.1.zip"; + md5 = "4b57b660082683ad66910b3c6725c141"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Batching facilities used in Plone. + ''; + homepage = "http://pypi.python.org/pypi/plone.batching"; + license = "GPL"; + }; + }; + + "plone.portlet.collection-2.1.5" = self.buildPythonPackage { name = "plone.portlet.collection-2.1.5"; src = fetchurl { @@ -4577,7 +4559,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.portlets-2.4.5" self."plone.app.vocabularies-2.1.11" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self.setuptools ]; + propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.app.vocabularies-2.1.14" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4617,7 +4599,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."archetypes.querywidget-1.0.9" self."plone.app.contentlisting-1.0.5" self."plone.app.form-2.2.3" self."plone.app.portlets-2.4.5" self."plone.app.vocabularies-2.1.11" self."plone.portlet.collection-2.1.5" self."plone.portlets-2.2" self."Products.Archetypes-1.9.4" self."Products.CMFCore-2.2.7" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."archetypes.querywidget-1.0.10" self."plone.app.contentlisting-1.0.5" self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.app.vocabularies-2.1.14" self."plone.portlet.collection-2.1.5" self."plone.portlets-2.2" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4629,15 +4611,15 @@ in }; - "Products.CMFCalendar-2.2.2" = self.buildPythonPackage { - name = "Products.CMFCalendar-2.2.2"; + "Products.CMFCalendar-2.2.3" = self.buildPythonPackage { + name = "Products.CMFCalendar-2.2.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.2.tar.gz"; - md5 = "49458e68dc3b6826ea9a3576ac014419"; + url = "https://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.3.tar.gz"; + md5 = "75659630aa12cfe86cc740db64ef294f"; }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.app.form-4.0.2" self."Zope2-2.13.22" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4649,6 +4631,28 @@ in }; + "Plone" = self."Plone-4.3.3"; + + "Plone-4.3.3" = self.buildPythonPackage { + name = "Plone-4.3.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.3.zip"; + md5 = "ce8ab3b3033e05b9544a8127dc67e09a"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.app.caching-1.1.8" self."plone.app.dexterity-2.0.11" self."plone.app.iterate-2.1.12" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.10" self."Products.CMFPlone-4.3.3" self.setuptools self."wicked-1.1.10" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + The Plone Content Management System + ''; + homepage = "http://plone.org/"; + license = "GPL version 2"; + }; + }; + + "Products.PluggableAuthService-1.10.0" = self.buildPythonPackage { name = "Products.PluggableAuthService-1.10.0"; src = fetchurl { @@ -4657,7 +4661,7 @@ in }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4689,6 +4693,26 @@ in }; + "plone.app.jquerytools-1.5.7" = self.buildPythonPackage { + name = "plone.app.jquerytools-1.5.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.7.zip"; + md5 = "f87fe3088f5258a8dae1490d7d989988"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.22" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + jQuery Tools integration for Plone plus overlay and AJAX form helpers. + ''; + homepage = "http://pypi.python.org/pypi/plone.app.jquerytools"; + license = "GPL version 2"; + }; + }; + + "Products.GenericSetup-1.7.4" = self.buildPythonPackage { name = "Products.GenericSetup-1.7.4"; src = fetchurl { @@ -4697,7 +4721,7 @@ in }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4709,35 +4733,35 @@ in }; - "plone.app.viewletmanager-2.0.4" = self.buildPythonPackage { - name = "plone.app.viewletmanager-2.0.4"; + "ExtensionClass-2.13.2" = self.buildPythonPackage { + name = "ExtensionClass-2.13.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.4.zip"; - md5 = "565a12ac71d20b2823b9e44daebe432f"; + url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip"; + md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.11" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - configurable viewlet manager + Metaclass for subclassable extension types ''; - homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/ExtensionClass"; + license = "ZPL 2.1"; }; }; - "plone.schemaeditor-1.3.3" = self.buildPythonPackage { - name = "plone.schemaeditor-1.3.3"; + "plone.schemaeditor-1.3.7" = self.buildPythonPackage { + name = "plone.schemaeditor-1.3.7"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.3.zip"; - md5 = "25a04a0bf6cd6411669dd3850a1d04b8"; + url = "https://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.7.zip"; + md5 = "94535ff5b8d8d871fbbd9806912c4c00"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.autoform-1.5" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."plone.autoform-1.6" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4789,26 +4813,6 @@ in }; - "ZopeUndo-2.12.0" = self.buildPythonPackage { - name = "ZopeUndo-2.12.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip"; - md5 = "2b8da09d1b98d5558f62e12f6e52c401"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - ZODB undo support for Zope2. - ''; - homepage = "http://pypi.python.org/pypi/ZopeUndo"; - license = "ZPL 2.1"; - }; - }; - - "zope.traversing-3.13.2" = self.buildPythonPackage { name = "zope.traversing-3.13.2"; src = fetchurl { @@ -4849,11 +4853,11 @@ in }; - "plonetheme.classic-1.3.2" = self.buildPythonPackage { - name = "plonetheme.classic-1.3.2"; + "plonetheme.classic-1.3.3" = self.buildPythonPackage { + name = "plonetheme.classic-1.3.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.2.zip"; - md5 = "c77d4c34afaf7c02df44d4df72328155"; + url = "https://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.3.zip"; + md5 = "5bcf588a8998f4a1c5aecb99c3d9ecf4"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -4869,11 +4873,11 @@ in }; - "plone.scale__storage-1.3.2" = self.buildPythonPackage { - name = "plone.scale__storage-1.3.2"; + "plone.scale__storage-1.3.3" = self.buildPythonPackage { + name = "plone.scale__storage-1.3.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.2.zip"; - md5 = "584ccbf515aff9fef363c2cc8abac789"; + url = "https://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.3.zip"; + md5 = "f2d56ec944e5677a4998b3b9e21534e3"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -4889,41 +4893,21 @@ in }; - "zope.browserpage-3.12.2" = self.buildPythonPackage { - name = "zope.browserpage-3.12.2"; + "plone.portlet.static-2.0.2" = self.buildPythonPackage { + name = "plone.portlet.static-2.0.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz"; - md5 = "a543ef3cb1b42f7233b3fca23dc9ea60"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - ZCML directives for configuring browser views for Zope. - ''; - homepage = "http://pypi.python.org/pypi/zope.browserpage/"; - license = "ZPL 2.1"; - }; - }; - - - "plone.app.imaging-1.0.9" = self.buildPythonPackage { - name = "plone.app.imaging-1.0.9"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.9.zip"; - md5 = "e680c5540021a70266343b935ac732a7"; + url = "https://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip"; + md5 = "ec0dc691b4191a41ff97779b117f9985"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.scale__storage-1.3.2" self.setuptools ]; + propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.i18n-2.0.9" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - User-configurable, blob-aware image scaling for Plone. + A simple static HTML portlet for Plone. ''; - homepage = "http://pypi.python.org/pypi/plone.app.imaging"; + homepage = "http://pypi.python.org/pypi/plone.portlet.static"; license = "GPL version 2"; }; }; @@ -4969,26 +4953,6 @@ in }; - "archetypes.querywidget-1.0.9" = self.buildPythonPackage { - name = "archetypes.querywidget-1.0.9"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.9.zip"; - md5 = "67e51c20990bb3eefbc9e8e953d7c9f5"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.6" self."plone.app.querystring-1.0.8" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - UNKNOWN - ''; - homepage = "http://pypi.python.org/pypi/archetypes.querywidget"; - license = "GPL version 2"; - }; - }; - - "Products.PluginRegistry-1.3" = self.buildPythonPackage { name = "Products.PluginRegistry-1.3"; src = fetchurl { @@ -4997,7 +4961,7 @@ in }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -5129,35 +5093,15 @@ in }; - "plone.subrequest-1.6.7" = self.buildPythonPackage { - name = "plone.subrequest-1.6.7"; + "plone.app.vocabularies-2.1.14" = self.buildPythonPackage { + name = "plone.app.vocabularies-2.1.14"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.7.zip"; - md5 = "cc12f68a22565415b10dbeef0020baa4"; + url = "https://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.14.zip"; + md5 = "c3ce7028fd0e3f70588167b8d3c002d5"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."five.globalrequest-1.0" self.setuptools self."zope.globalrequest-1.0" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Subrequests for Zope2 - ''; - homepage = "http://pypi.python.org/pypi/plone.subrequest/"; - license = "GPL version 2"; - }; - }; - - - "plone.app.vocabularies-2.1.11" = self.buildPythonPackage { - name = "plone.app.vocabularies-2.1.11"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.11.tar.gz"; - md5 = "08c773a5093780aaa27709a890f1e21f"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -5169,22 +5113,22 @@ in }; - "DocumentTemplate-2.13.2" = self.buildPythonPackage { - name = "DocumentTemplate-2.13.2"; + "archetypes.querywidget-1.0.10" = self.buildPythonPackage { + name = "archetypes.querywidget-1.0.10"; src = fetchurl { - url = "https://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip"; - md5 = "07bb086c77c1dfe94125ad2efbba94b7"; + url = "https://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.10.zip"; + md5 = "6b65a6ff701ebcb6e9550d27c7e2a855"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."RestrictedPython-3.6.0" self."zExceptions-2.13.0" self."zope.sequencesort-3.4.0" self."zope.structuredtext-3.5.1" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.7" self."plone.app.querystring-1.1.1" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Document Templating Markup Language (DTML) + UNKNOWN ''; - homepage = "http://pypi.python.org/pypi/DocumentTemplate"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/archetypes.querywidget"; + license = "GPL version 2"; }; }; @@ -5217,7 +5161,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.8" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -5229,42 +5173,42 @@ in }; - "zope.i18nmessageid-3.5.3" = self.buildPythonPackage { - name = "zope.i18nmessageid-3.5.3"; + "plone.subrequest-1.6.8" = self.buildPythonPackage { + name = "plone.subrequest-1.6.8"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz"; - md5 = "cb84bf61c2b7353e3b7578057fbaa264"; + url = "https://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.8.zip"; + md5 = "6ea93bc17d56612d41a497cdc5f2960b"; }; doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."five.globalrequest-1.0" self.setuptools self."zope.globalrequest-1.0" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Message Identifiers for internationalization + Subrequests for Zope2 ''; - homepage = "http://pypi.python.org/pypi/zope.i18nmessageid"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.subrequest/"; + license = "GPL version 2"; }; }; - "plone.app.linkintegrity-1.5.3" = self.buildPythonPackage { - name = "plone.app.linkintegrity-1.5.3"; + "z3c.form-3.1.1" = self.buildPythonPackage { + name = "z3c.form-3.1.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.3.zip"; - md5 = "f2eed92f433fe73b4056d3ba48ba8eb0"; + url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.1.1.zip"; + md5 = "0b54d848d6a1be9eab867255e10f5504"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; + propagatedBuildInputs = [ self.setuptools self."six-1.2.0" self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.site-3.9.2" self."zope.traversing-3.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Manage link integrity in Plone. + An advanced form and widget framework for Zope 3 ''; - homepage = "http://pypi.python.org/pypi/plone.app.linkintegrity"; - license = "GPL version 2"; + homepage = "https://launchpad.net/z3c.form"; + license = "ZPL 2.1"; }; }; @@ -5289,6 +5233,46 @@ in }; + "WebTest-2.0.15" = self.buildPythonPackage { + name = "WebTest-2.0.15"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/W/WebTest/WebTest-2.0.15.zip"; + md5 = "49314bdba23f4d0bd807facb2a6d3f90"; + }; + doCheck = true; + buildInputs = [ self."nose-1.3.3" self."unittest2-0.5.1" self."pyquery-1.2.8" self."WSGIProxy2-0.4.1" self."PasteDeploy-1.5.2" self."mock-1.0.1" self."coverage-3.7.1" pkgs.unzip ]; + propagatedBuildInputs = [ self."beautifulsoup4-4.3.2" self."six-1.6.1" self."waitress-0.8.9" self."WebOb-1.4" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Helper to test WSGI applications + ''; + homepage = "http://webtest.pythonpaste.org/"; + license = "MIT"; + }; + }; + + + "plone.app.linkintegrity-1.5.4" = self.buildPythonPackage { + name = "plone.app.linkintegrity-1.5.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.4.zip"; + md5 = "f82e73603ade6f588bc27f01c5aea404"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Manage link integrity in Plone. + ''; + homepage = "http://pypi.python.org/pypi/plone.app.linkintegrity"; + license = "GPL version 2"; + }; + }; + + "zope.app.form-4.0.2" = self.buildPythonPackage { name = "zope.app.form-4.0.2"; src = fetchurl { @@ -5317,7 +5301,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.21" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -5329,68 +5313,5 @@ in }; - "plone.outputfilters-1.11.1" = self.buildPythonPackage { - name = "plone.outputfilters-1.11.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.11.1.zip"; - md5 = "6b7506f09ad98621f8bb388c55183d6d"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.2" self.setuptools ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - meta = { - description = '' - Transformations applied to HTML in Plone text fields as they are rendered - ''; - homepage = "http://github.com/plone/plone.outputfilters"; - license = "GPL"; - }; - }; - - - "xlrd" = self."xlrd-0.9.2"; - - "xlrd-0.9.2" = self.buildPythonPackage { - name = "xlrd-0.9.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-0.9.2.tar.gz"; - md5 = "91a81ee76233e9f3115acaaa1b251b0e"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Library for developers to extract data from Microsoft Excel (tm) spreadsheet files - ''; - homepage = "http://www.python-excel.org/"; - license = "BSD"; - }; - }; - - - "suds" = self."suds-0.4"; - - "suds-0.4" = self.buildPythonPackage { - name = "suds-0.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz"; - md5 = "b7502de662341ed7275b673e6bd73191"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - meta = { - description = '' - Lightweight SOAP client - ''; - homepage = "https://fedorahosted.org/suds"; - license = "UNKNOWN"; - }; - }; - } diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json index b8ddcee3a47f..74e092d309a9 100644 --- a/pkgs/top-level/python-packages.json +++ b/pkgs/top-level/python-packages.json @@ -82,7 +82,7 @@ } }, { "name": "Plone", - "extends": "http://dist.plone.org/release/4.3.2/versions.cfg", + "extends": "http://dist.plone.org/release/4.3.3/versions.cfg", "doCheck": false, "installCommand": "easy_install --always-unzip --no-deps --prefix=\"$out\" .", "override": { @@ -124,11 +124,11 @@ } }, { "name": "plone.recipe.zope2instance", - "extends": "http://dist.plone.org/release/4.3.2/versions.cfg", + "extends": "http://dist.plone.org/release/4.3.3/versions.cfg", "doCheck": false }, { "name": "RelStorage", - "extends": "http://dist.plone.org/release/4.3.2/versions.cfg", + "extends": "http://dist.plone.org/release/4.3.3/versions.cfg", "doCheck": false }, { "name": "psycopg2", From 7b0736b7c01958036c8fc58f72f48a34306f64c6 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 30 May 2014 15:19:12 -0500 Subject: [PATCH 140/254] arcanist: Fix php exec (needed for arc diff) Signed-off-by: Austin Seipp --- pkgs/development/tools/misc/arcanist/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index add2f8621b07..58957a82752a 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, php }: +{ stdenv, fetchgit, php, makeWrapper }: let libphutil = fetchgit { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { version = "20140530"; src = [ arcanist libphutil ]; - buildInputs = [ php ]; + buildInputs = [ php makeWrapper ]; unpackPhase = "true"; buildPhase = "true"; @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { cp -R ${arcanist} $out/libexec/arcanist ln -s $out/libexec/arcanist/bin/arc $out/bin + + wrapProgram $out/bin/arc \ + --prefix PATH : "${php}/bin" ''; meta = { From 61befa04511551e3bdcb8150553e5c87bcd5abe3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 31 May 2014 09:47:10 +0200 Subject: [PATCH 141/254] git: Update to 1.9.4 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 283e9ac18ac5..f95b5a493a65 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "1.9.3"; + version = "1.9.4"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0pyhqwy9g875frf1qyfjj6rz64qhlyvr29n7pljzcy536x9qcczn"; + sha256 = "1shxa49lsxn81qpfi60wh7rn5ci4zjgljvr0qczdmnqzd8w1zyvb"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ]; From 6f8f3d64ff8bdb50f3816a56f01102cbaba0209b Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 31 May 2014 11:04:40 +0000 Subject: [PATCH 142/254] icu: fix configure to use ${stdenv.shell} On darwin, not doing this means the configure script uses a hard-coded /bin/sh for its echo tests, resulting in ECHO_N and ECHO_C settings in icu-config which are incorrect for the stdenv.shell which it is actually uses to run. --- pkgs/development/libraries/icu/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index b2f2f7a083f6..12628e4c53db 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation { echo Source root reset to ''${sourceRoot} ''; + preConfigure = '' + sed -i -e "s|/bin/sh|${stdenv.shell}|" configure + ''; + configureFlags = "--disable-debug"; enableParallelBuilding = true; From 9aac793c49f7001153711de5f2b0536f20890489 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 31 May 2014 11:06:06 +0000 Subject: [PATCH 143/254] harfbuzz: no longer need to guard withGraphite2 on darwin --- pkgs/development/libraries/harfbuzz/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 9cdd2a275bff..2e596b17af3d 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty , icu, graphite2 , withIcu ? false # recommended by upstream as default, but most don't needed and it's big -, withGraphite2 ? !stdenv.isDarwin # it is small and major distros do include it +, withGraphite2 ? true # it is small and major distros do include it }: # TODO: split non-icu and icu lib into different outputs? From 6c8f4fd0ef26f2b999b01feec0cf90e88dc92f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 31 May 2014 13:10:41 +0200 Subject: [PATCH 144/254] libftdi1: new package This is the 1.x version of libftdi, as opposed to our existing libftdi 0.20 package. (AVRDUDE is an (optional) dependee of libftdi1.) --- pkgs/development/libraries/libftdi/1.x.nix | 42 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/libraries/libftdi/1.x.nix diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix new file mode 100644 index 000000000000..273bdb3136e0 --- /dev/null +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, cmake, pkgconfig, libusb1, confuse +, cppSupport ? true, boost ? null +, pythonSupport ? true, python ? null, swig ? null +, docSupport ? true, doxygen ? null +}: + +assert cppSupport -> boost != null; +assert pythonSupport -> python != null && swig != null; +assert docSupport -> doxygen != null; + +stdenv.mkDerivation rec { + name = "libftdi1-1.1"; + + src = fetchurl { + url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2"; + sha256 = "088yh8pxd6q53ssqndydcw1dkq51cjqyahc03lm6iip22cdazcf0"; + }; + + buildInputs = with stdenv.lib; [ cmake pkgconfig confuse ] + ++ optionals cppSupport [ boost ] + ++ optionals pythonSupport [ python swig ] + ++ optionals docSupport [ doxygen ]; + + propagatedBuildInputs = [ libusb1 ]; + + postInstall = '' + mkdir -p "$out/etc/udev/rules.d/" + cp ../packages/99-libftdi.rules "$out/etc/udev/rules.d/" + cp -r doc/man "$out/share/" + '' + stdenv.lib.optionalString docSupport '' + mkdir -p "$out/share/libftdi/doc/" + cp -r doc/html "$out/share/libftdi/doc/" + ''; + + meta = with stdenv.lib; { + description = "A library to talk to FTDI chips using libusb"; + homepage = http://www.intra2net.com/en/developer/libftdi/; + license = with licenses; [ lgpl2 gpl2 ]; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d02161501c34..d3f302f5d22e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5085,6 +5085,8 @@ let libftdi = callPackage ../development/libraries/libftdi { }; + libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { }; + libgcrypt = callPackage ../development/libraries/libgcrypt { }; libgcrypt_1_6 = lowPrio (callPackage ../development/libraries/libgcrypt/1.6.nix { }); From be524e925b73865bc6d2a0c61ae641b6a634e7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 31 May 2014 10:01:01 +0200 Subject: [PATCH 145/254] avrdude: rewrite expression * Use stdenv.mkDerivation instead of composableDerivation. stdenv.mkDerivation is the current coding standard and is easier to read (IMHO). * Remove the 'parportSupport' flag because it doesn't do anything. (Parallel port support is still enabled.) * Remove unneeded --disable-dependency-tracking flag to ./configure; our default builder does that already. * Fix documentation build. But it is still disabled (by default), because texLive is such a big dependency. There is always the man page. * Update 'meta' attributes --- .../tools/misc/avrdude/default.nix | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index 89e848df03bf..18f2f86ea4a8 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -1,8 +1,11 @@ -{ composableDerivation, fetchurl, yacc, flex, texLive, libusb }: +{ stdenv, fetchurl, yacc, flex, libusb +# docSupport is a big dependency, disabled by default +, docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null +}: -let edf = composableDerivation.edf; in +assert docSupport -> texLive != null && texinfo != null && texi2html != null; -composableDerivation.composableDerivation {} rec { +stdenv.mkDerivation rec { name="avrdude-6.0.1"; src = fetchurl { @@ -10,22 +13,21 @@ composableDerivation.composableDerivation {} rec { sha256 = "0hfy1qkc6a5vpqsp9ahi1fpf9x4s10wq4bpyblc26sx9vxl4d066"; }; - configureFlags = [ "--disable-dependency-tracking" ]; + configureFlags = stdenv.lib.optionalString docSupport "--enable-doc"; - buildInputs = [ yacc flex libusb ]; + buildInputs = [ yacc flex libusb ] + ++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ]; - flags = - edf { name = "doc"; enable = { buildInputs = texLive; configureFlags = ["--enable-doc"]; }; } - // edf { name = "parport"; }; - - cfg = { - docSupport = false; # untested - parportSupport = true; - }; - - meta = { - license = "GPL-2"; - description = "AVR Downloader/UploaDEr"; - homepage = http://savannah.nongnu.org/projects/avrdude; + meta = with stdenv.lib; { + description = "Command-line tool for programming Atmel AVR microcontrollers"; + longDescription = '' + AVRDUDE (AVR Downloader/UploaDEr) is an utility to + download/upload/manipulate the ROM and EEPROM contents of AVR + microcontrollers using the in-system programming technique (ISP). + ''; + homepage = http://www.nongnu.org/avrdude/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; }; } From c7c32e1d094db7a65435b7e04794268fdd402074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 31 May 2014 13:19:34 +0200 Subject: [PATCH 146/254] avrdude: add extra dependencies: libelf, libftdi1, readline They are strictly speaking optional, but they provide useful features... --- pkgs/development/tools/misc/avrdude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index 18f2f86ea4a8..03e77dfc3c46 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yacc, flex, libusb +{ stdenv, fetchurl, yacc, flex, libusb, libelf, libftdi1, readline # docSupport is a big dependency, disabled by default , docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionalString docSupport "--enable-doc"; - buildInputs = [ yacc flex libusb ] + buildInputs = [ yacc flex libusb libelf libftdi1 readline ] ++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ]; meta = with stdenv.lib; { From 3b3d1d075c90701a3cc918097d4f69a9012c1a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 31 May 2014 13:28:47 +0200 Subject: [PATCH 147/254] avrdude: update 6.0.1 -> 6.1 --- pkgs/development/tools/misc/avrdude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index 03e77dfc3c46..2026e0ad2c80 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -6,11 +6,11 @@ assert docSupport -> texLive != null && texinfo != null && texi2html != null; stdenv.mkDerivation rec { - name="avrdude-6.0.1"; + name = "avrdude-6.1"; src = fetchurl { url = "mirror://savannah/avrdude/${name}.tar.gz"; - sha256 = "0hfy1qkc6a5vpqsp9ahi1fpf9x4s10wq4bpyblc26sx9vxl4d066"; + sha256 = "0frxg0q09nrm95z7ymzddx7ysl77ilfbdix1m81d9jjpiv5bm64y"; }; configureFlags = stdenv.lib.optionalString docSupport "--enable-doc"; From 39bd9f8b1bbd9dc7fb2ce085a5fcb6bad16c8c45 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 31 May 2014 12:32:29 +0000 Subject: [PATCH 148/254] texLive: handle graphite2 properly on darwin --- pkgs/tools/typesetting/tex/texlive/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index f4ea5b7494f2..df6461cb82c7 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -22,7 +22,7 @@ rec { setupHook = ./setup-hook.sh; doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH="${poppler}/lib" + export DYLD_LIBRARY_PATH="${poppler}/lib:${graphite2}/lib" '' + '' mkdir -p $out mkdir -p $out/nix-support @@ -95,7 +95,7 @@ rec { PATH=$PATH:$out/bin mktexlsr $out/share/texmf* '' + stdenv.lib.optionalString stdenv.isDarwin '' for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib" + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib:${graphite2}/lib" done '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3f302f5d22e..228c673251da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10941,7 +10941,7 @@ let libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = !stdenv.isDarwin; + withIcu = true; withGraphite2 = true; }; }; From 215ce6259681b8696d42d2ff3f6e870d0355d41b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 30 May 2014 19:13:26 -0500 Subject: [PATCH 149/254] btrfsProgs: Update 3.14 -> 3.14.2 (close #2797) --- pkgs/tools/filesystems/btrfsprogs/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index a41b2f28d854..66152f9589b7 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo }: +{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "3.14"; in +let version = "3.14.2"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1qjy4bc96nfzkdjp6hwb85aasqs87nkmgi8pl6qa6cpvml3627cq"; + sha256 = "14vpj6f2v076v9zabgrz8l4dp6n1ar2mvk3lvii51ykvi35d1qbh"; }; - buildInputs = [ attr acl zlib libuuid e2fsprogs lzo ]; + buildInputs = [ + attr acl zlib libuuid e2fsprogs lzo + asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + ]; # for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; From b6910c6bf8bb1b0ac596eb4cc5b8094059091ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 31 May 2014 14:38:56 +0200 Subject: [PATCH 150/254] libserialport: new package libserialport is a cross-platform shared library for serial port access, written in C. It comes from the sigrok project, but has no dependency on sigrok code. Homepage: http://sigrok.org/ --- .../libraries/libserialport/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/libserialport/default.nix diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix new file mode 100644 index 000000000000..c40812beeacc --- /dev/null +++ b/pkgs/development/libraries/libserialport/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, udev }: + +stdenv.mkDerivation rec { + name = "libserialport-0.1.0"; + + src = fetchurl { + url = "http://sigrok.org/download/source/libserialport/${name}.tar.gz"; + sha256 = "1bqrldwrcsv6jbq3pmqczq27gdkrzpaxwplanqs25f6q9gb5p47c"; + }; + + buildInputs = [ pkgconfig udev ]; + + meta = with stdenv.lib; { + description = "Cross-platform shared library for serial port access"; + homepage = http://sigrok.org/; + license = licenses.gpl3Plus; + # Mac OS X, Windows and Android is also supported (according to upstream). + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 228c673251da..d57a28bd37a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5044,6 +5044,8 @@ let libsecret = callPackage ../development/libraries/libsecret { }; + libserialport = callPackage ../development/libraries/libserialport { }; + libgtop = callPackage ../development/libraries/libgtop {}; liblo = callPackage ../development/libraries/liblo { }; From c10628c665154028f4c4f33a0b008c4495b9deea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 18 May 2014 22:55:32 +0200 Subject: [PATCH 151/254] librevisa: new package It's an implementation of the VISA standard (for instrument control). http://www.librevisa.org/ --- .../libraries/librevisa/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/librevisa/default.nix diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix new file mode 100644 index 000000000000..756a53d5ee55 --- /dev/null +++ b/pkgs/development/libraries/librevisa/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, libusb1 }: + +# TODO: add VXI development files, for VXI-11 (TCPIP) support + +stdenv.mkDerivation rec { + name = "librevisa-0.0.20130412"; + + src = fetchurl { + url = "http://www.librevisa.org/download/${name}.tar.gz"; + sha256 = "0bjzq23s3xzw0l9qx4l8achrx5id8xdd6r52lvdl4a28dxzbcfhq"; + }; + + buildInputs = [ pkgconfig libusb1 ]; + + meta = with stdenv.lib; { + description = "Implementation of the VISA standard (for instrument control)"; + longDescription = '' + LibreVISA aims to be a compliant implementation of the VISA standard in a + free software library. + + We currently support targets connected via USB, exposing the USBTMC + interface, and VXI-11 devices. + ''; + homepage = http://www.librevisa.org/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d57a28bd37a3..e1c5feb6c901 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5148,6 +5148,8 @@ let libresample = callPackage ../development/libraries/libresample {}; + librevisa = callPackage ../development/libraries/librevisa { }; + libsamplerate = callPackage ../development/libraries/libsamplerate { stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple From 7329ad6813f1fd35c2e97dbab8b109623f4e5726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 18 May 2014 22:15:37 +0200 Subject: [PATCH 152/254] libsigrok: new package libsigrok is the core library of the sigrok signal analysis software suite, which I'm about to package. http://sigrok.org/ --- pkgs/development/tools/libsigrok/default.nix | 24 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/libsigrok/default.nix diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix new file mode 100644 index 000000000000..c8905dcbafda --- /dev/null +++ b/pkgs/development/tools/libsigrok/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi, check +, libserialport, librevisa +}: + +stdenv.mkDerivation rec { + name = "libsigrok-0.3.0"; + + src = fetchurl { + url = "http://sigrok.org/download/source/libsigrok/${name}.tar.gz"; + sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; + }; + + buildInputs = [ pkgconfig libzip glib libusb1 libftdi check libserialport + librevisa + ]; + + meta = with stdenv.lib; { + description = "Core library of the sigrok signal analysis software suite"; + homepage = http://sigrok.org/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1c5feb6c901..edea20fddfc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3814,6 +3814,8 @@ let libcxx = callPackage ../development/libraries/libc++ { stdenv = pkgs.clangStdenv; }; libcxxabi = callPackage ../development/libraries/libc++abi { stdenv = pkgs.clangStdenv; }; + libsigrok = callPackage ../development/tools/libsigrok { }; + dejagnu = callPackage ../development/tools/misc/dejagnu { }; dfeet = callPackage ../development/tools/misc/d-feet { From 647173db26e78dd4b37c675c1c76eea10a64c874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 18 May 2014 22:28:44 +0200 Subject: [PATCH 153/254] libsigrokdecode: new package libsigrokdecode is a protocol decoding library for the sigrok signal analysis software suite. http://sigrok.org/ --- .../tools/libsigrokdecode/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/tools/libsigrokdecode/default.nix diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix new file mode 100644 index 000000000000..87ecd637b4e2 --- /dev/null +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }: + +stdenv.mkDerivation rec { + name = "libsigrokdecode-0.3.0"; + + src = fetchurl { + url = "http://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz"; + sha256 = "13s7ss52dqj7fccjgrkx10zkj41ygxn8ml1l0bs1vgczz4fvnkpf"; + }; + + buildInputs = [ pkgconfig glib python3 libsigrok check ]; + + meta = with stdenv.lib; { + description = "Protocol decoding library for the sigrok signal analysis software suite"; + homepage = http://sigrok.org/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index edea20fddfc5..64bb7471de9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3816,6 +3816,8 @@ let libsigrok = callPackage ../development/tools/libsigrok { }; + libsigrokdecode = callPackage ../development/tools/libsigrokdecode { }; + dejagnu = callPackage ../development/tools/misc/dejagnu { }; dfeet = callPackage ../development/tools/misc/d-feet { From 8a4dc83793fa7b100176937f6ee820197a9bd41f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 18 May 2014 22:30:34 +0200 Subject: [PATCH 154/254] sigrok-cli: new package This is the command-line frontend for the sigrok signal analysis software suite. http://sigrok.org/ --- pkgs/development/tools/sigrok-cli/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/tools/sigrok-cli/default.nix diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix new file mode 100644 index 000000000000..b2e6dea09e67 --- /dev/null +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }: + +stdenv.mkDerivation rec { + name = "sigrok-cli-0.5.0"; + + src = fetchurl { + url = "http://sigrok.org/download/source/sigrok-cli/${name}.tar.gz"; + sha256 = "0g3jzspq9iwz2szzxil9ilim1and85qd605f4jbc04sva80hb8vk"; + }; + + buildInputs = [ pkgconfig glib libsigrok libsigrokdecode ]; + + meta = with stdenv.lib; { + description = "Command-line frontend for the sigrok signal analysis software suite"; + homepage = http://sigrok.org/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64bb7471de9b..a823ddca2ec8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4041,6 +4041,8 @@ let simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { }; + sigrok-cli = callPackage ../development/tools/sigrok-cli { }; + slimerjs = callPackage ../development/tools/slimerjs {}; sloccount = callPackage ../development/tools/misc/sloccount { }; From 61b79d2eee72ad6113070f0a49f67c22d183a8db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 31 May 2014 15:37:27 +0200 Subject: [PATCH 155/254] pulseview: new package PulseView is a Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite). http://sigrok.org/ --- .../science/electronics/pulseview/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/science/electronics/pulseview/default.nix diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix new file mode 100644 index 000000000000..07724d932541 --- /dev/null +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, cmake, glib, qt4, boost, libsigrok +, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi +}: + +stdenv.mkDerivation rec { + name = "pulseview-0.2.0"; + + src = fetchurl { + url = "http://sigrok.org/download/source/pulseview/${name}.tar.gz"; + sha256 = "1pf1dgwd9j586nqmni6gqf3qxrsmawcmi9wzqfzqkjci18xd7dgy"; + }; + + buildInputs = [ pkgconfig cmake glib qt4 boost libsigrok + libsigrokdecode libserialport libzip udev libusb1 libftdi + ]; + + meta = with stdenv.lib; { + description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)"; + homepage = http://sigrok.org/; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a823ddca2ec8..25437db8584d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9220,6 +9220,8 @@ let pstree = callPackage ../applications/misc/pstree { }; + pulseview = callPackage ../applications/science/electronics/pulseview { }; + puredata = callPackage ../applications/audio/puredata { }; pythonmagick = callPackage ../applications/graphics/PythonMagick { }; From 0717378c46f53dd6dedcf133483bdffd9186cfbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 31 May 2014 18:06:20 +0200 Subject: [PATCH 156/254] avr-gcc: set meta.platforms = linux So that hydra will build it and add it to the binary channel. --- pkgs/development/misc/avr-gcc-with-avr-libc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix index 5218f5b77448..1f54d132dcc7 100644 --- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix +++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix @@ -78,10 +78,11 @@ stdenv.mkDerivation { ''; }; - meta = { + meta = with stdenv.lib; { description = "AVR developement environment including binutils, avr-gcc and avr-libc"; # I've tried compiling the packages separately.. too much hassle. This just works. Fine. license = ["GPL" "LGPL"]; # see single packages .. homepage = []; # dito + platforms = platforms.linux; }; } From 91d40ef2eaf99e51a3d6e01cfa865d87cf57a368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 31 May 2014 16:23:02 +0200 Subject: [PATCH 157/254] avrdudess: new package AVRDUDESS is a GUI for AVRDUDE. In other words, it is a GUI for programming AVR microcontrollers. --- pkgs/applications/misc/avrdudess/default.nix | 42 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/misc/avrdudess/default.nix diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix new file mode 100644 index 000000000000..64bca952ff58 --- /dev/null +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk, xdg_utils }: + +stdenv.mkDerivation rec { + name = "avrdudess-2.2.20140102"; + + src = fetchurl { + url = "http://blog.zakkemble.co.uk/download/avrdudess_20140102.zip"; + sha256 = "18llpvjsfhypzijrvfbzmcg3g141f307mzsrg11wcdxh9syxqak6"; + }; + + buildInputs = [ unzip ]; + + phases = [ "buildPhase" ]; + + buildPhase = '' + mkdir -p "$out/avrdudess" + mkdir -p "$out/bin" + + unzip "$src" -d "$out/avrdudess" + + cat >> "$out/bin/avrdudess" << __EOF__ + #!${stdenv.shell} + export LD_LIBRARY_PATH="${gtk}/lib:${mono}/lib" + # We need PATH from user env for xdg-open to find its tools, which + # typically depend on the currently running desktop environment. + export PATH="${avrgcclibc}/bin:${avrdude}/bin:${xdg_utils}/bin:\$PATH" + + # avrdudess must have its resource files in its current working directory + cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@" + __EOF__ + + chmod a+x "$out/bin/"* + ''; + + meta = with stdenv.lib; { + description = "GUI for AVRDUDE (AVR microcontroller programmer)"; + homepage = https://github.com/zkemble/AVRDUDESS; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25437db8584d..a98045e8f8e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7947,6 +7947,8 @@ let eigen = eigen2; }; + avrdudess = callPackage ../applications/misc/avrdudess { }; + avxsynth = callPackage ../applications/video/avxsynth { }; awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix { From 2f0ecbd220cc724fbd853af39df59b19548bc53a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 31 May 2014 20:24:34 +0200 Subject: [PATCH 158/254] Adding moinmoin --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 672033cfa718..6f60f76553b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4115,6 +4115,23 @@ rec { }; }); + moinmoin = let ver="1.9.7"; in buildPythonPackage (rec { + name = "moinmoin-${ver}"; + + src = fetchurl { + url = "http://static.moinmo.in/files/moin-${ver}.tar.gz"; + sha256 = "f4ba1b5c956bd96d2a61e27e68d297aa63d1afbc80d5740e139dcdf0affb4db5"; + }; + + meta = { + description = "Advanced, easy to use and extensible WikiEngine"; + + homepage = http://moinmo.in/; + + license = "GPLv2+"; + }; + }); + mox = buildPythonPackage rec { name = "mox-0.5.3"; From 0369769bd9843c7ddaab1f9ba77732337abfaee2 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 31 May 2014 19:37:49 +0000 Subject: [PATCH 159/254] gcc-4.8: build Objective-C/C++ support on darwin --- pkgs/development/compilers/gcc/4.8/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 01f7ea6e3e65..902cba392f84 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, noSysDirs , langC ? true, langCC ? true, langFortran ? false +, langObjC ? stdenv.isDarwin +, langObjCpp ? stdenv.isDarwin , langJava ? false , langAda ? false , langVhdl ? false @@ -352,6 +354,8 @@ stdenv.mkDerivation ({ ++ optional langAda "ada" ++ optional langVhdl "vhdl" ++ optional langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" ++ optionals crossDarwin [ "objc" "obj-c++" ] ) ) @@ -490,7 +494,7 @@ stdenv.mkDerivation ({ else null; passthru = - { inherit langC langCC langAda langFortran langVhdl langGo enableMultilib version; }; + { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo enableMultilib version; }; inherit enableParallelBuilding; From 2e2f42f21509b72e337b456c4986b8ea08a11e18 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 31 May 2014 19:38:05 +0000 Subject: [PATCH 160/254] texlive: build bibtex-x and xetex on darwin We also no longer need to specify that harfbuzz and icu not be used, and DYLD_LIBRARY_PATH is properly configured to find graphite2. --- pkgs/tools/typesetting/tex/texlive/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index df6461cb82c7..f91af9fcad4c 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -119,18 +119,11 @@ rec { "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ] ++ stdenv.lib.optionals stdenv.isDarwin [ - # Complains about a missing ICU directory - "--disable-bibtex-x" - # TODO: We should be able to fix these tests "--disable-devnag" "--disable-dvisvgm" "--disable-xdv2pdf" "--disable-xdvipdfmx" - "--disable-xetex" - - "--with-system-harfbuzz=no" - "--with-system-icu=no" ]; phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ]; From 0392293f2e7d1ae14c2c72f4f23fcf0921e62c0a Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 31 May 2014 20:18:46 +0000 Subject: [PATCH 161/254] emacs24: no longer need to use clangStdenv on darwin --- pkgs/top-level/all-packages.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a98045e8f8e2..425e40266833 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8200,12 +8200,6 @@ let librsvg = null; alsaLib = null; imagemagick = null; - - # use clangStdenv on darwin to deal with: unexec: 'my_edata is not in - # section __data' - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; }; emacs24-nox = lowPrio (appendToName "nox" (emacs24.override { From c0e26205f31e384835d0d57cad6dad5da88865c5 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 31 May 2014 20:19:02 +0000 Subject: [PATCH 162/254] vim: no longer need to use clangStdenv on darwin --- pkgs/top-level/all-packages.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 425e40266833..1987d8ff1129 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9570,12 +9570,7 @@ let flup = pythonPackages.flup; }; - vim = callPackage ../applications/editors/vim { - # for Objective-C compilation - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + vim = callPackage ../applications/editors/vim { }; vimWrapper = wrapVim vim; From 643d2af2cdde564dfa2908ecaeb7c66fc402ea5e Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 31 May 2014 20:37:35 +0000 Subject: [PATCH 163/254] emacs24: clangStdenv is in fact needed on darwin --- pkgs/top-level/all-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1987d8ff1129..594b1addbacb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8200,6 +8200,11 @@ let librsvg = null; alsaLib = null; imagemagick = null; + + # resolve unrecognized section __static_data in __DATA segment + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; }; emacs24-nox = lowPrio (appendToName "nox" (emacs24.override { From 32c3bcaa802b10f624891c62b590541e81675c0a Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 31 May 2014 20:38:18 +0000 Subject: [PATCH 164/254] emacs24Macport: new expression This is "Mac port" addition to GNU Emacs 24. This provides a native GUI support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later already contain the official GUI support via the NS (Cocoa) port for Mac OS X 10.4 and later. So if it is good enough for you, then you don't need to try this. --- .../applications/editors/emacs-24/macport.nix | 101 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++ 2 files changed, 108 insertions(+) create mode 100644 pkgs/applications/editors/emacs-24/macport.nix diff --git a/pkgs/applications/editors/emacs-24/macport.nix b/pkgs/applications/editors/emacs-24/macport.nix new file mode 100644 index 000000000000..4c599916d947 --- /dev/null +++ b/pkgs/applications/editors/emacs-24/macport.nix @@ -0,0 +1,101 @@ +{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls +}: + +stdenv.mkDerivation rec { + emacsName = "emacs-24.3"; + name = "${emacsName}-mac-4.8"; + + #builder = ./builder.sh; + + src = fetchurl { + url = "mirror://gnu/emacs/${emacsName}.tar.xz"; + sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh"; + }; + + macportSrc = fetchurl { + url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; + sha256 = "194y341zrpjp75mc3099kjc0inr1d379wwsnav257bwsc967h8yx"; + }; + + buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ]; + + postUnpack = '' + mv $emacsName $name + tar xzf $macportSrc + mv $name $emacsName + ''; + + preConfigure = '' + patch -p0 < patch-mac + + # The search for 'tputs' will fail because it's in ncursesw within the + # ncurses package, yet Emacs' configure script only looks in ncurses. + # Further, we need to make sure that the -L option occurs before mention + # of the library, so that it finds it within the Nix store. + sed -i 's/tinfo ncurses/tinfo ncursesw/' configure + ncurseslib=$(echo ${ncurses}/lib | sed 's#/#\\/#g') + sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure + sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure + + configureFlagsArray=( + LDFLAGS=-L${ncurses}/lib + --with-xml2=yes + --with-gnutls=yes + --with-mac + --enable-mac-app=$out/Applications + ) + makeFlagsArray=( + CFLAGS=-O3 + LDFLAGS="-O3 -L${ncurses}/lib" + ); + ''; + + postInstall = '' + cat >$out/share/emacs/site-lisp/site-start.el < Date: Sat, 31 May 2014 21:59:55 +0000 Subject: [PATCH 165/254] shelly: build version 0.15.4.1 for GHC 7.4.2 --- .../libraries/haskell/shelly/0.15.4.1.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 6 +++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/shelly/0.15.4.1.nix diff --git a/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix b/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix new file mode 100644 index 000000000000..d3ef289042df --- /dev/null +++ b/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix @@ -0,0 +1,21 @@ +{ cabal, hspec, HUnit, mtl, systemFileio, systemFilepath, text +, time, unixCompat +}: + +cabal.mkDerivation (self: { + pname = "shelly"; + version = "0.15.4.1"; + sha256 = "12m11s22izz0ny1syb1ykp2hi9n240myf0nhapvn8jx1fgf5iyck"; + buildDepends = [ + mtl systemFileio systemFilepath text time unixCompat + ]; + testDepends = [ + hspec HUnit mtl systemFileio systemFilepath text time unixCompat + ]; + meta = { + homepage = "https://github.com/yesodweb/Shelly.hs"; + description = "shell-like (systems) programming in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 614a989bb74e..6f8072a382c7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1914,7 +1914,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in setlocale = callPackage ../development/libraries/haskell/setlocale {}; - shelly = callPackage ../development/libraries/haskell/shelly {}; + shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {}; + shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {}; + shelly = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") + then self.shelly_0_15_4_1 + else self.shelly_1_5_3_1; simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {}; From 2481a71c3c745b4070b89dc37832dc45e9be1382 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 1 Jun 2014 05:15:20 +0000 Subject: [PATCH 166/254] Disable use of graphite2 on darwin until #2800 is fixed This applies to harfbuzz, pango and texlive. --- pkgs/development/libraries/harfbuzz/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 2e596b17af3d..9cdd2a275bff 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty , icu, graphite2 , withIcu ? false # recommended by upstream as default, but most don't needed and it's big -, withGraphite2 ? true # it is small and major distros do include it +, withGraphite2 ? !stdenv.isDarwin # it is small and major distros do include it }: # TODO: split non-icu and icu lib into different outputs? diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d25e33bd81fc..8059acd22349 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10956,7 +10956,7 @@ let libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; + withIcu = true; withGraphite2 = !stdenv.isDarwin; }; }; From e719f64a053d03362957c8ef8087f25a58eb17d4 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 1 Jun 2014 05:51:16 +0000 Subject: [PATCH 167/254] graphite2: fix #2800 by setting INSTALL_NAME_DIR --- pkgs/development/libraries/harfbuzz/default.nix | 2 +- .../development/libraries/silgraphite/graphite2.nix | 2 ++ pkgs/development/libraries/silgraphite/macosx.patch | 13 +++++++++++++ pkgs/tools/typesetting/tex/texlive/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/silgraphite/macosx.patch diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 9cdd2a275bff..2e596b17af3d 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty , icu, graphite2 , withIcu ? false # recommended by upstream as default, but most don't needed and it's big -, withGraphite2 ? !stdenv.isDarwin # it is small and major distros do include it +, withGraphite2 ? true # it is small and major distros do include it }: # TODO: split non-icu and icu lib into different outputs? diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index f874804c0010..83f64d1eb009 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig freetype cmake ]; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ]; + meta = { description = "An advanced font engine"; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/libraries/silgraphite/macosx.patch b/pkgs/development/libraries/silgraphite/macosx.patch new file mode 100644 index 000000000000..7929c1967c82 --- /dev/null +++ b/pkgs/development/libraries/silgraphite/macosx.patch @@ -0,0 +1,13 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -102,7 +102,8 @@ set_target_properties(graphite2 PROPERTIES PUBLIC_HEADER "${GRAPHITE_HEADERS}" + VERSION ${GRAPHITE_VERSION} + LT_VERSION_CURRENT ${GRAPHITE_API_CURRENT} + LT_VERSION_REVISION ${GRAPHITE_API_REVISION} +- LT_VERSION_AGE ${GRAPHITE_API_AGE}) ++ LT_VERSION_AGE ${GRAPHITE_API_AGE} ++ INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) + + if (${CMAKE_BUILD_TYPE} STREQUAL "ClangASN") + set(GRAPHITE_LINK_FLAGS "-fsanitize=address") + diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index f91af9fcad4c..bd3a4362be9b 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -22,7 +22,7 @@ rec { setupHook = ./setup-hook.sh; doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH="${poppler}/lib:${graphite2}/lib" + export DYLD_LIBRARY_PATH="${poppler}/lib" '' + '' mkdir -p $out mkdir -p $out/nix-support @@ -95,7 +95,7 @@ rec { PATH=$PATH:$out/bin mktexlsr $out/share/texmf* '' + stdenv.lib.optionalString stdenv.isDarwin '' for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib:${graphite2}/lib" + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib" done '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8059acd22349..d25e33bd81fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10956,7 +10956,7 @@ let libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = !stdenv.isDarwin; + withIcu = true; withGraphite2 = true; }; }; From 8e72c1ef71aa0e91e7cc4271cd61103aaea67c82 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 1 Jun 2014 14:36:45 +0100 Subject: [PATCH 168/254] vifm: update to 0.7.7 --- pkgs/applications/misc/vifm/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 4af565d717aa..5abf57ae1fc4 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -2,17 +2,16 @@ let name = "vifm-${version}"; - version = "0.7.6"; + version = "0.7.7"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url="mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2"; - sha256 ="03v50hmgfvrci5fz31zmklmp6ix7qpqnhvm6639wbk3g5mcrh5w6"; + url = "mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2"; + sha256 = "1lflmkd5q7qqi9d44py0y41pcx5bsadkihn3gc0x5cka04f2gh0d"; }; - #phaseNames = ["doConfigure" "doMakeInstall"]; buildInputs = [ utillinux ncurses file libX11 ]; meta = { From 693219f1b771b6b470b1a4a0ce367c562688af6c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 1 Jun 2014 14:37:08 +0100 Subject: [PATCH 169/254] weechatDevel: update to latest (few nice bugfixes) --- pkgs/applications/networking/irc/weechat/devel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix index f8558ef052e0..0ad05089c62b 100644 --- a/pkgs/applications/networking/irc/weechat/devel.nix +++ b/pkgs/applications/networking/irc/weechat/devel.nix @@ -3,14 +3,14 @@ , pythonPackages, cacert, cmake, makeWrapper }: stdenv.mkDerivation rec { - rev = "02eed97d977567b0fb16cfeeaeebb863eab1e509"; + rev = "70d2b0ad8eb7854932d24c007a05b8627f751205"; version = "1.0-rev${rev}"; name = "weechat-${version}"; src = fetchgit { inherit rev; url = "git://github.com/weechat/weechat.git"; - sha256 = "0nk0p9chvn0h2pzq9793k2dz8h5iplz0zwqzyds55fbmsgzz51g2"; + sha256 = "1k7kcrq46anq87r14sq3vrhij8acn6id7zxyhn0qnjj2wqgrjp5i"; }; buildInputs = From 9c3d455c0b0b299c3cd3bd2c5c9ce55c3f7646db Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 1 Jun 2014 14:37:48 +0100 Subject: [PATCH 170/254] jsmeter: update to 2.11 --- pkgs/applications/networking/jmeter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index ddb7b63fc6f9..2d5e6b66bf05 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, ant }: stdenv.mkDerivation rec { - name = "jmeter-2.10"; + name = "jmeter-2.11"; src = fetchurl { url = "http://ftp.unicamp.br/pub/apache//jmeter/binaries/apache-${name}.tgz"; - sha256 = "1ygm0h02sllh4mfl5imj46v80wnbs1x7n88gfjm523ixmgsa0fvy"; + sha256 = "1fr3sw06qncb6yygcf2lbnkxma4v1dbigpf39ajrm0isxbpyv944"; }; installPhase = '' From db8ba584020998488bf9806a0fa62614b22fbfc0 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 1 Jun 2014 14:39:55 +0100 Subject: [PATCH 171/254] tig: update to 2.0.2 --- .../version-management/git-and-tools/tig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index fd9011130e34..6f2fe890cfa5 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "tig-1.2.1"; + name = "tig-2.0.2"; src = fetchurl { url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; - sha256 = "0i19lc6dd3vdpkdd8q07xii2c4mcpiwmg55av81jyhx0y82x425p"; + sha256 = "0gi7iqiij37b0d3izxymxaw5ns2mv1y7qfic0fhl7xj4s2rz075r"; }; buildInputs = [ ncurses asciidoc xmlto docbook_xsl ]; From df2232ac24fafcba9d343a46da7c98ef1dce832c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 1 Jun 2014 14:40:14 +0100 Subject: [PATCH 172/254] aircrack-ng: update to 1.2-beta3 --- pkgs/tools/networking/aircrack-ng/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 1cc91f256604..475d6775cde2 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools}: +{ stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools, libnl, pkgconfig }: stdenv.mkDerivation rec { - name = "aircrack-ng-1.2-beta1"; + name = "aircrack-ng-1.2-beta3"; src = fetchurl { url = "http://download.aircrack-ng.org/${name}.tar.gz"; - sha256 = "19cfib7sqp2rdm3lc84jrzsa6r8443gkm1ifbmhygsqn6fnkj8zi"; + sha256 = "13g9xz9djjgfc2xi88vnx7zhgy751hqb3739y7znyihd6q9sw8id"; }; - buildInputs = [libpcap openssl zlib]; + buildInputs = [ libpcap openssl zlib libnl pkgconfig ]; patchPhase = '' sed -e 's@^prefix.*@prefix = '$out@ -i common.mak From 33e9c4e35fad536c2ce75ab2e0d991132a9222bc Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 1 Jun 2014 14:40:37 +0100 Subject: [PATCH 173/254] haproxt: update 1.4.25 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 42760da5d4ae..5a634ffec669 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,12 +1,12 @@ { stdenv, pkgs, fetchurl }: stdenv.mkDerivation rec { - version = "1.4.24"; + version = "1.4.25"; name = "haproxy-${version}"; src = fetchurl { url = "http://haproxy.1wt.eu/download/1.4/src/${name}.tar.gz"; - sha256 = "1vy7jz7l8qdd6ah3y65zarz9x9pf3bs02icxnrckpgh1s3s2h2b8"; + sha256 = "0qnvj6kbnrrc69nsp2dn5iv2z79adzkcgqssnk30iwvvwg0qwh44"; }; buildInputs = [ ]; From d3213de455b9794c84adc970e44736af899ec67c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 1 Jun 2014 14:40:57 +0100 Subject: [PATCH 174/254] offlineimap: update to 6.5.6 --- pkgs/tools/networking/offlineimap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 02e1f742201f..2a100fd2873f 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,13 +1,13 @@ { pkgs, fetchurl, buildPythonPackage, sqlite3 }: buildPythonPackage rec { - version = "6.5.5"; + version = "6.5.6"; name = "offlineimap-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz"; - sha256 = "00k84qagph3xnxss6rkxm61x07ngz8fvffx4z9jyw5baf3cdd32p"; + sha256 = "1hr8yxb6r8lmdzzly4hafa1l1z9pfx14rsgc8qiy2zxfpg6ijcn2"; }; doCheck = false; From 8b9a7c36d122666910125c6bb8b0770412733470 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 1 Jun 2014 14:42:07 +0100 Subject: [PATCH 175/254] pythonPackages: updated bunch of packages - afew -> rev9744c18c4d6b0a3e7f57b01e5fe145a60fc82a47 - alot -> revfa4ddf000dc2ac4933852b210901b649634a5f86 - httplib2 -> 0.9 - jedi-0.8.0 -> final0 - pep8 -> 1.5.7 - pyflakes -> 0.8.1 - subprocess32 -> 3.2.6 - turses -> 0.2.22 - tweepy -> 2.3.0 - urwid -> 1.2.1 --- pkgs/top-level/python-packages.nix | 58 ++++++++++++------------------ 1 file changed, 22 insertions(+), 36 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f60f76553b7..b2c3aa320e90 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -205,13 +205,13 @@ rec { afew = buildPythonPackage rec { - rev = "d5d0ddeae0c5758a3f6cf5de77913804d88e906a"; + rev = "9744c18c4d6b0a3e7f57b01e5fe145a60fc82a47"; name = "afew-1.0_${rev}"; src = fetchurl { url = "https://github.com/teythoon/afew/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "0al7hz994sh0yrpixqafr25acglvniq4zsbs9aj89zr7yzq1g1j0"; + sha256 = "1qyban022aji2hl91dh0j3xa6ikkxl5argc6w71yp2x8b02kp3mf"; }; buildInputs = [ pkgs.dbacl ]; @@ -313,13 +313,13 @@ rec { alot = buildPythonPackage rec { - rev = "fa10bfc2de105da819c8e11e913a44c3c1ac60a4"; + rev = "fa4ddf000dc2ac4933852b210901b649634a5f86"; name = "alot-0.3.5_${rev}"; src = fetchurl { url = "https://github.com/pazz/alot/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "0zd4jiwxqb7m672xkr5jcqkfpk9jx1kmkllyvjjvswkgjjqdrhax"; + sha256 = "0h11lqyxg0xbkc9y1xqjvd0kmfm5pdwnmv9chmlsi1614dxn08n0"; }; # error: invalid command 'test' @@ -3497,11 +3497,11 @@ rec { }); httplib2 = buildPythonPackage rec { - name = "httplib2-0.8"; + name = "httplib2-0.9"; src = fetchurl { - url = "http://httplib2.googlecode.com/files/${name}.tar.gz"; - sha256 = "0gww8axb4j1vysbk9kfsk5vrws9a403gh30dxchmga8hrg1rns5g"; + url = "https://pypi.python.org/packages/source/h/httplib2/${name}.tar.gz"; + sha256 = "1asi5wpncnc6ki3bz33mhb9xh2lrkb24y4qng8bmqnczdmm8rsir"; }; meta = { @@ -3603,11 +3603,11 @@ rec { }; jedi = buildPythonPackage (rec { - name = "jedi-0.7.0"; + name = "jedi-0.8.0-final0"; src = fetchurl { url = "http://pypi.python.org/packages/source/j/jedi/${name}.tar.gz"; - sha256 = "1afs06k1j6raasdps1fvdqywyk3if1qchdpl4mivnliqzxqd1w01"; + sha256 = "0jnhwh0b1hy5cssi3n5a4j7z9pgpcckyv5s52ba4jnq5bwgdpbcf"; }; meta = { @@ -4920,27 +4920,13 @@ rec { pep8 = buildPythonPackage rec { name = "pep8-${version}"; - version = "1.4.6"; + version = "1.5.7"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz"; - md5 = "a03bb494859e87b42601b61b1b043a0c"; + md5 = "f6adbdd69365ecca20513c709f9b7c93"; }; - #====================================================================== - #FAIL: test_check_simple (testsuite.test_shell.ShellTestCase) - #---------------------------------------------------------------------- - #Traceback (most recent call last): - # File "/tmp/nix-build-python-pep8-1.4.5.drv-0/pep8-1.4.5/testsuite/test_shell.py", line 84, in test_check_simple - # self.assertTrue(config_filename.endswith('tox.ini')) - #AssertionError: False is not true - # - #---------------------------------------------------------------------- - #Ran 21 tests in 0.711s - # - #FAILED (failures=1) - doCheck = false; - meta = { homepage = "http://pep8.readthedocs.org/"; description = "Python style guide checker"; @@ -5479,11 +5465,11 @@ rec { }; pyflakes = buildPythonPackage rec { - name = "pyflakes-0.7.3"; + name = "pyflakes-0.8.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pyflakes/${name}.tar.gz"; - md5 = "ec94ac11cb110e6e72cca23c104b66b1"; + md5 = "905fe91ad14b912807e8fdc2ac2e2c23"; }; buildInputs = [ unittest2 ]; @@ -7097,11 +7083,11 @@ rec { }; subprocess32 = buildPythonPackage rec { - name = "subprocess32-3.2.5rc1"; + name = "subprocess32-3.2.6"; src = fetchurl { url = "https://pypi.python.org/packages/source/s/subprocess32/${name}.tar.gz"; - md5 = "f5f46106368be6336b54af95d048fea9"; + md5 = "754c5ab9f533e764f931136974b618f1"; }; doCheck = false; @@ -7578,11 +7564,11 @@ rec { turses = buildPythonPackage (rec { - name = "turses-0.2.19"; + name = "turses-0.2.22"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz"; - sha256 = "1g58ahxpaf0wqn6gg5a2n3fkvc3vbx6jpylwqncxnl16qcczmjxn"; + sha256 = "1dqgvdqly4c4d6819mbkqy4g8r7zch4dkmxicfwck7q8h96wmyx3"; }; propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse; @@ -7601,11 +7587,11 @@ rec { }); tweepy = buildPythonPackage (rec { - name = "tweepy-2.1"; + name = "tweepy-2.3.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz"; - sha256 = "1irzwfva7g1k7db708mlxy2qribd6938zwn5xzjzn6i43j5mjysm"; + sha256 = "0wcj5g21brcqr1g7m4by4rs72lfiib4scg19qynn2wz1x77jyrzp"; }; meta = { @@ -7700,14 +7686,14 @@ rec { urwid = buildPythonPackage (rec { - name = "urwid-1.1.1"; + name = "urwid-1.2.1"; # multiple: NameError: name 'evl' is not defined doCheck = false; src = fetchurl { - url = "http://excess.org/urwid/${name}.tar.gz"; - md5 = "eca2e0413cf7216b01c84b99e0f2576d"; + url = "https://pypi.python.org/packages/source/u/urwid/${name}.tar.gz"; + md5 = "6a05ada11b87e7b026b01fc5150855b0"; }; meta = { From eb8a3315109e16e193f7ca07fcd6d05d507a1b06 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 1 Jun 2014 15:01:22 +0100 Subject: [PATCH 176/254] couchdb: update to 1.5.1 --- pkgs/servers/http/couchdb/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 808a86946b04..36d932c1acea 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -3,16 +3,15 @@ stdenv.mkDerivation rec { name = "couchdb-${version}"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "mirror://apache/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"; - sha256 = "1vwgcckp3svgifmagyjmgazm6387i9m6z182p6ja891i8fkb5gdb"; + url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; + sha256 = "0isddp29zh72idgwjaswqy887c1fwx5g1lwlbzscwcv6q70xrmfr"; }; - buildInputs = [ - erlang icu openssl spidermonkey curl help2man sphinx which file pkgconfig - ]; + buildInputs = [ erlang icu openssl spidermonkey curl help2man sphinx which + file pkgconfig ]; postInstall = '' sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb From 87e9b49443c28fbe62e3b273369a330b7aa193e5 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sun, 1 Jun 2014 17:07:46 +0200 Subject: [PATCH 177/254] mpd: Support for PulseAudio --- pkgs/servers/mpd/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 792aa49f447f..9a70a91d73fc 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -18,7 +18,9 @@ , samplerateSupport ? true, libsamplerate , mmsSupport ? true, libmms , mpg123Support ? true, mpg123 -, aacSupport ? true, faad2 }: +, aacSupport ? true, faad2 +, pulseaudioSupport ? true, pulseaudio +}: let @@ -56,7 +58,8 @@ in stdenv.mkDerivation rec { ++ opt mmsSupport libmms ++ opt mpg123Support mpg123 ++ opt aacSupport faad2 - ++ opt zipSupport zziplib; + ++ opt zipSupport zziplib + ++ opt zipSupport pulseaudio; configureFlags = [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") @@ -80,6 +83,7 @@ in stdenv.mkDerivation rec { (mkFlag mmsSupport "mms") (mkFlag mpg123Support "mpg123") (mkFlag aacSupport "aac") + (mkFlag pulseaudioSupport "pulse") (mkFlag stdenv.isDarwin "osx") "--enable-debugging" ] ++ opt stdenv.isLinux From fd81f49655b9aa181a07668add826052e17adfba Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sun, 1 Jun 2014 17:08:43 +0200 Subject: [PATCH 178/254] mpd: update to 0.18.11 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 9a70a91d73fc..36e8f0222061 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -29,10 +29,10 @@ let mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; in stdenv.mkDerivation rec { - name = "mpd-0.18.9"; + name = "mpd-0.18.11"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; - sha256 = "0mgfyrhjlalwngx9j3xxfpfwygh9a31k1ni1isi898bb2x8zsl08"; + sha256 = "1j3jdwmxfnn4z1vjry2g54vcbrdrgi41nv3bf2i26xkgy5708icw"; }; buildInputs = [ pkgconfig glib ] From 05dbaa9a1749083d7e3f9c96a7afb92e9cebad94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 1 Jun 2014 18:29:27 +0200 Subject: [PATCH 179/254] IDEA 13.1.2 -> 13.1.3 --- pkgs/applications/editors/idea/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 6ccd9512978a..9296b294940f 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -64,27 +64,27 @@ let in { - idea_community_1312 = buildIdea rec { + idea_community_1313 = buildIdea rec { name = "idea-community-${version}"; - version = "13.1.2"; - build = "IC-135.690"; + version = "13.1.3"; + build = "IC-135.909"; description = "IntelliJ IDEA 13 Community Edition"; license = stdenv.lib.licenses.asl20.shortName; src = fetchurl { url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "59fde67bf23e4638edd4b5ada133ac1c61c3132dea936eb7de7ee5ea259cc102"; + sha256 = "62ed937ef68df16eef4d32772b6510835527f95020db1c76643f17ed2c067b51"; }; }; - idea_ultimate_1312 = buildIdea rec { + idea_ultimate_1313 = buildIdea rec { name = "idea-ultimate-${version}"; - version = "13.1.2"; - build = "IU-135.690"; + version = "13.1.3"; + build = "IU-135.909"; description = "IntelliJ IDEA 13 Ultimate Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "ccbaed495e2f099c92d1f747a59d7af9f9d41d75cf10e8a299d11825d78685ad"; + sha256 = "6d99e49a63a197e19381a85535ab424a7832653db8cceb3bca7d53615ec7a53d"; }; }; From 6bc20ea278e0739d86903a38838dbdf3ba5d3305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 1 Jun 2014 20:46:33 +0200 Subject: [PATCH 180/254] undo #2522 merge except on darwin It was only meant for darwin originally anyway. See the PR for discussion. --- pkgs/development/libraries/gmp/5.1.x.nix | 10 +++++++--- pkgs/development/libraries/ppl/default.nix | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 53d7f4585659..cba8d394c2ba 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, m4, cxx ? true }: +with { inherit (stdenv.lib) optional; }; + stdenv.mkDerivation rec { name = "gmp-5.1.3"; @@ -14,10 +16,12 @@ stdenv.mkDerivation rec { # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". # See , for instance. - (stdenv.lib.optional (!stdenv.isSunOS) "--enable-fat") - ++ (if cxx then [ "--enable-cxx" "CPPFLAGS=-fexceptions" ] + optional (!stdenv.isSunOS) "--enable-fat" + ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]) - ++ (if stdenv.is64bit then [ "--with-pic" ] else []); + ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" + ++ optional stdenv.is64bit "--with-pic" + ; doCheck = true; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 2c22317a6ca7..e3b1444b8cb3 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl gnum4 ]; propagatedBuildInputs = [ gmpxx ]; - configureFlags = [ "--disable-watchdog" "CPPFLAGS=-fexceptions" ] ++ + configureFlags = [ "--disable-watchdog" ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "CPPFLAGS=-fexceptions" "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips" ]; From d9fff6b563b21ccba0edde1ec94566996d2e6065 Mon Sep 17 00:00:00 2001 From: Malcolm Matalka Date: Sun, 1 Jun 2014 21:39:34 +0200 Subject: [PATCH 181/254] Update to leveldb-1.15.0 --- pkgs/development/libraries/leveldb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 7c990e99c33c..64c03798fea2 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "leveldb-1.9.0"; + name = "leveldb-1.15.0"; src = fetchurl { url = "https://leveldb.googlecode.com/files/${name}.tar.gz"; - sha256 = "b2699b04e5aba8e98382c4955b94725d1f76bd0b5decd60c5628205b717a1d4f"; + sha256 = "10363j8qmlyh971ipb7fmgk9b97bl5267c0xyccrgvpj3rbyri6p"; }; buildPhase = "make all db_bench"; From 2f43cd3793fff581f7931e8b85bf3c92887f3761 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 1 Jun 2014 20:22:47 +0200 Subject: [PATCH 182/254] maude: update full-maude to version 2.6.1e --- pkgs/development/interpreters/maude/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 23e2bc98ba44..877d6b79e53b 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper }: +{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper, unzip }: stdenv.mkDerivation rec { name = "maude-2.6"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { }; fullMaude = fetchurl { - url = "http://maude.cs.uiuc.edu/download/current/FM2.6/full-maude26.maude"; - sha256 = "1382hjwwrsdgd5yjn3ph1b5i1bhrhzvqx0v369bmcjkly9k96v6q"; + url = "http://maude.lcc.uma.es/FullMaude/FM261e/full-maude.maude.zip"; + sha256 = "0g0chfrzc7923sh17zdy731wpsgnwz7rxci0jqqmrphlshwzqm2h"; }; buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done mkdir -p $out/share/maude - cp ${fullMaude} $out/share/maude/full-maude.maude + ${unzip}/bin/unzip ${fullMaude} -d $out/share/maude ''; meta = { From 0ec25c6f941e7665f4c9d8e8ee4f155411a415d3 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sun, 1 Jun 2014 18:33:58 -0400 Subject: [PATCH 183/254] update vim to v7.4.316 --- .../applications/editors/vim/configurable.nix | 21 +++++++---------- pkgs/applications/editors/vim/default.nix | 6 ++--- .../editors/vim/python_framework.patch | 23 +++++++++++++++++++ 3 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 pkgs/applications/editors/vim/python_framework.patch diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index f8e717d60898..9e2abffc451e 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -11,7 +11,7 @@ composableDerivation { else stdenv ).mkDerivation; } (fix: { - name = "vim_configurable-7.4.23"; + name = "vim_configurable-7.4.316"; enableParallelBuilding = true; # test this @@ -21,8 +21,8 @@ composableDerivation { # latest release args.fetchhg { url = "https://vim.googlecode.com/hg/"; - tag = "v7-4-131"; - sha256 = "1akr0i4pykbrkqwrglm0dfn5nwpncb9pgg4h7fl6a8likbr5f3wb"; + tag = "v7-4-316"; + sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx"; }; "vim-nox" = @@ -35,16 +35,13 @@ composableDerivation { }.src; }; + prePatch = "cd src"; + # if darwin support is enabled, we want to make sure we're not building with # OS-installed python framework - preConfigure - = stdenv.lib.optionalString - (stdenv.isDarwin && (config.vim.darwin or true)) '' - # TODO: we should find a better way of doing this as, if the configure - # file changes, we need to change these line numbers - sed -i "5641,5644d" src/auto/configure - sed -i "5648d" src/auto/configure - ''; + patches = stdenv.lib.optionals + (stdenv.isDarwin && (config.vim.darwin or true)) + [ ./python_framework.patch ]; configureFlags = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ]; @@ -53,8 +50,6 @@ composableDerivation { = [ ncurses pkgconfig gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ]; - prePatch = "cd src"; - # most interpreters aren't tested yet.. (see python for example how to do it) flags = { ftNix = { diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 673174904129..357de6249fa4 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "vim-${version}"; - version = "7.4.131"; + version = "7.4.316"; src = fetchhg { url = "https://vim.googlecode.com/hg/"; - tag = "v7-4-131"; - sha256 = "1akr0i4pykbrkqwrglm0dfn5nwpncb9pgg4h7fl6a8likbr5f3wb"; + tag = "v7-4-316"; + sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/python_framework.patch b/pkgs/applications/editors/vim/python_framework.patch new file mode 100644 index 000000000000..b7c7cee6cd93 --- /dev/null +++ b/pkgs/applications/editors/vim/python_framework.patch @@ -0,0 +1,23 @@ +diff --git a/src/auto/configure b/src/auto/configure +index a9755a0..4a0e2a4 100755 +--- a/auto/configure ++++ b/auto/configure +@@ -5638,10 +5638,6 @@ __: + eof + eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" + rm -f -- "${tmp_mkf}" +- if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \ +- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then +- vi_cv_path_python_plibs="-framework Python" +- else + if test "${vi_cv_var_python_version}" = "1.4"; then + vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" + else +@@ -5649,7 +5645,6 @@ eof + fi + vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" + vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` +- fi + + fi + From 088cb87e8c0c6948b16f847d2454e99a335aa895 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 2 Jun 2014 18:15:44 +0200 Subject: [PATCH 184/254] chicken: Bump to 4.9.0. --- .../development/compilers/chicken/default.nix | 21 ++++++------------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 7effd72be4c7..1a4e33775017 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -1,17 +1,7 @@ -{ stdenv, fetchurl, devSnapshot ? false }: +{ stdenv, fetchurl }: let - stableVersion = "4.8.0.6"; - devVersion = "4.9.0rc1"; - version = if devSnapshot then devVersion else stableVersion; - srcRelease = fetchurl { - url = "http://code.call-cc.org/releases/4.8.0/chicken-${stableVersion}.tar.gz"; - sha256 = "0an6l09y9pa6r4crkn33w6l4j6nwhvk6fibx2ajv6h0pfl2jqkd5"; - }; - srcDev = fetchurl { - url = "http://code.call-cc.org/dev-snapshots/2014/04/17/chicken-${devVersion}.tar.gz"; - sha256 = "168f5ib02hh6cnilsrfg103ijhlg4j0z0fgs7i55kzd4aggy1w42"; - }; + version = "4.9.0"; platform = with stdenv; if isDarwin then "macosx" else if isCygwin then "cygwin" @@ -22,9 +12,10 @@ in stdenv.mkDerivation { name = "chicken-${version}"; - src = if devSnapshot - then srcDev - else srcRelease; + src = fetchurl { + url = "http://code.call-cc.org/releases/4.9.0/chicken-${version}.tar.gz"; + sha256 = "08jaavr3lhs0z2q9k7b7w8l3fsxpms58zxg8nyk8674p54cbwaig"; + }; buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; installFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d25e33bd81fc..3ea34f3dec14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2498,10 +2498,6 @@ let chicken = callPackage ../development/compilers/chicken { }; - chicken-dev = chicken.override { - devSnapshot = true; - }; - ccl = builderDefsPackage ../development/compilers/ccl {}; clang = wrapClang llvmPackages.clang; From b899a696590b541aa4b70c4df0809282c6c473be Mon Sep 17 00:00:00 2001 From: letac Date: Mon, 2 Jun 2014 19:42:15 +0200 Subject: [PATCH 185/254] Update racket to 6.0.1 --- pkgs/development/interpreters/racket/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 586c0a0acb9a..8432c848d732 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "racket"; - version = "5.3.6"; + version = "6.0.1"; name = "${pname}-${version}"; src = fetchurl { - url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz"; - sha256 = "12pvgidaym1rwyyi69bd2gfmfwi1y0lf8xgih7a8r20z4g0zzq3z"; + url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; + sha256 = "e2bc0d4d0fcdfc3327a58c931f203c07a06d4724703f9708ba2e4c8ea0f9694d"; }; # Various racket executables do run-time searches for these. From d2f842268387091399daa98f57d6fdf00b1c618c Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 2 Jun 2014 18:01:53 +0000 Subject: [PATCH 186/254] texlive: enable building xdv2pdf and xdvipdfmx on darwin --- pkgs/tools/typesetting/tex/texlive/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index bd3a4362be9b..685d51aab0f2 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -122,8 +122,6 @@ rec { # TODO: We should be able to fix these tests "--disable-devnag" "--disable-dvisvgm" - "--disable-xdv2pdf" - "--disable-xdvipdfmx" ]; phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ]; From af6c8a33d9673aa7f30a0421a169aec87ae74594 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 2 Jun 2014 22:58:16 +0000 Subject: [PATCH 187/254] texlive: add note to clarify why dvisvgm fails to work on darwin --- pkgs/tools/typesetting/tex/texlive/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 685d51aab0f2..22ce7739a747 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -121,6 +121,14 @@ rec { ++ stdenv.lib.optionals stdenv.isDarwin [ # TODO: We should be able to fix these tests "--disable-devnag" + + # jww (2014-06-02): The following fails with: + # FAIL: tests/dvisvgm + # =================== + # + # dyld: Library not loaded: libgs.dylib.9.06 + # Referenced from: .../Work/texk/dvisvgm/.libs/dvisvgm + # Reason: image not found "--disable-dvisvgm" ]; From 9e55902bdf0a9226388cd45f7471da33e9c47d5f Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 3 Jun 2014 02:11:41 +0300 Subject: [PATCH 188/254] pythonPackages.libcloud: update to 0.14.1 --- pkgs/top-level/python-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2c3aa320e90..7eed59664e2d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3709,16 +3709,17 @@ rec { libcloud = buildPythonPackage (rec { - name = "libcloud-0.3.1"; + name = "libcloud-0.14.1"; src = fetchurl { - url = mirror://apache/incubator/libcloud/apache-libcloud-incubating-0.3.1.tar.bz2; - sha256 = "11qilrs4sd4c1mkd64ikrjsc2vwrshhc54n5mh4xrark9c7ayp0y"; + url = https://pypi.python.org/packages/source/a/apache-libcloud/apache-libcloud-0.14.1.tar.bz2; + sha256 = "1l6190pjv54c7y8pzr089ij727qv7bqhhaznr2mkvimgr1wzsql5"; }; - buildInputs = [ zope_interface mock ]; + buildInputs = [ mock ]; - preConfigure = "cp test/secrets.py-dist test/secrets.py"; + propagatedBuildInputs = [ pycrypto ]; + preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; # failing tests for 26 and 27 doCheck = false; From 191dbc234fc3f9bfa7d265f0e9210c311cd7f6d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 3 Jun 2014 10:26:00 +0200 Subject: [PATCH 189/254] gnutls: security + maintenance update for both branches Fixes #2813 CVE-2014-3466. No API/ABI changes in the updates. Tests start to fail for gnutls31, so they get disabled, but the 3.1 branch is already unused on master. --- pkgs/development/libraries/gnutls/3.1.nix | 9 +++++---- pkgs/development/libraries/gnutls/3.2.nix | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gnutls/3.1.nix b/pkgs/development/libraries/gnutls/3.1.nix index 1046310946a4..89306540694b 100644 --- a/pkgs/development/libraries/gnutls/3.1.nix +++ b/pkgs/development/libraries/gnutls/3.1.nix @@ -4,11 +4,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-3.1.22"; + name = "gnutls-3.1.25"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.lz"; - sha256 = "177kmq4jn67s7mmb249722nwxmbjwjpphmib7bhzfk43z02j3pvh"; + sha256 = "1i1v8pbaw72k0ps09i3lvc1zr9gn34jpliiijbs8k7axrv2w9n5g"; }; # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); + doCheck = false;#(!stdenv.isFreeBSD && !stdenv.isDarwin); meta = { description = "The GNU Transport Layer Security Library"; @@ -64,4 +64,5 @@ stdenv.mkDerivation rec { license = "LGPLv2.1+"; maintainers = [ stdenv.lib.maintainers.eelco ]; }; -} \ No newline at end of file +} + diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index 45d0270de5a8..ca9c003dfe74 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -4,11 +4,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-3.2.12.1"; + name = "gnutls-3.2.15"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz"; - sha256 = "1787n4iard3ad0p44xbl4aj3r3f5ir3sz0b2s27qpaaia2w4774g"; + sha256 = "16c5c4k41mxib8i06npks940p9xllgn1wrackfp8712wdvl5zc4q"; }; patches = From 36f5ede37afd7e1a12bf83a22ede9769e8d17963 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 3 Jun 2014 11:45:57 +0200 Subject: [PATCH 190/254] geeqie: Fix incorrect longDescription formatting Note that longDescription should not be formatted as: longDescription = '' Bla bla bla bla ''; because this will cause the second line to have more preceding whitespace. It should be: longDescription = '' Bla bla bla bla ''; --- pkgs/applications/graphics/geeqie/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index ff1e5052054d..44ca66ac5b9d 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -35,13 +35,14 @@ stdenv.mkDerivation rec { description = "Geeqie, a lightweight GTK+ based image viewer"; longDescription = - '' Geeqie is a lightweight GTK+ based image viewer for Unix like - operating systems. It features: EXIF, IPTC and XMP metadata - browsing and editing interoperability; easy integration with other - software; geeqie works on files and directories, there is no need to - import images; fast preview for many raw image formats; tools for - image comparison, sorting and managing photo collection. Geeqie was - initially based on GQview. + '' + Geeqie is a lightweight GTK+ based image viewer for Unix like + operating systems. It features: EXIF, IPTC and XMP metadata + browsing and editing interoperability; easy integration with other + software; geeqie works on files and directories, there is no need to + import images; fast preview for many raw image formats; tools for + image comparison, sorting and managing photo collection. Geeqie was + initially based on GQview. ''; license = "GPLv2+"; From e9ec238377fac0768cc4590b17f889a481413519 Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Tue, 3 Jun 2014 21:14:04 +0800 Subject: [PATCH 191/254] Add haskell-aeson-qq --- .../libraries/haskell/aeson-qq/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/aeson-qq/default.nix diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix new file mode 100644 index 000000000000..fb53dd902579 --- /dev/null +++ b/pkgs/development/libraries/haskell/aeson-qq/default.nix @@ -0,0 +1,15 @@ +{ cabal, aeson, haskellSrcMeta, hspec, parsec, text, vector }: + +cabal.mkDerivation (self: { + pname = "aeson-qq"; + version = "0.6.1"; + sha256 = "164nqk1qfb8a9c95yv5hg0zgcjcg49vrra2wi00h325bgpq6wa5n"; + buildDepends = [ aeson haskellSrcMeta parsec text vector ]; + testDepends = [ aeson hspec ]; + meta = { + homepage = "http://github.com/zalora/aeson-qq"; + description = "Json Quasiquatation for Haskell"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 46e8c6a84e42..62df38eea0ee 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -145,6 +145,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {}; + aesonQq = callPackage ../development/libraries/haskell/aeson-qq {}; + alternativeIo = callPackage ../development/libraries/haskell/alternative-io {}; alsaCore = callPackage ../development/libraries/haskell/alsa-core {}; From 2943fe1e7650136212e90b0c8f8813660c04069a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 3 Jun 2014 13:51:37 -0400 Subject: [PATCH 192/254] go: bump --- pkgs/development/compilers/go/1.2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix index 7b7e16d837db..b519b96415bd 100644 --- a/pkgs/development/compilers/go/1.2.nix +++ b/pkgs/development/compilers/go/1.2.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation { - name = "go-1.2.1"; + name = "go-1.2.2"; src = fetchurl { - url = http://go.googlecode.com/files/go1.2.1.src.tar.gz; - sha1 = "6a4b9991eddd8039438438d6aa25126ab7e07f2f"; + url = https://storage.googleapis.com/golang/go1.2.2.src.tar.gz; + sha1 = "3ce0ac4db434fc1546fec074841ff40dc48c1167"; }; buildInputs = [ bison glibc bash makeWrapper ]; From e87da7761a597d6c2092e5b7331a5389e14ce348 Mon Sep 17 00:00:00 2001 From: Philip Lykke Carlsen Date: Wed, 21 May 2014 20:45:58 +0200 Subject: [PATCH 193/254] subtitleeditor, gstreamermm: new packages --- lib/maintainers.nix | 1 + .../video/subtitleeditor/default.nix | 45 +++++++++++++++++++ .../gstreamer/legacy/gstreamermm/default.nix | 31 +++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 4 files changed, 81 insertions(+) create mode 100644 pkgs/applications/video/subtitleeditor/default.nix create mode 100644 pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0c5022bb22fa..562c88b2d849 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -66,6 +66,7 @@ pierron = "Nicolas B. Pierron "; piotr = "Piotr Pietraszkiewicz "; pkmx = "Chih-Mao Chen "; + plcplc = "Philip Lykke Carlsen "; pSub = "Pascal Wittmann "; qknight = "Joachim Schiele "; raskin = "Michael Raskin <7c6f434c@mail.ru>"; diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix new file mode 100644 index 000000000000..c1c11357ca03 --- /dev/null +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, desktop_file_utils, enchant, gnome, gstreamer, gstreamermm, + gst_plugins_base, gst_plugins_good, intltool, hicolor_icon_theme, + libsigcxx, libxmlxx, makeWrapper, xdg_utils, pkgconfig } : + +let + ver_maj = "0.41"; + ver_min = "0"; +in + +stdenv.mkDerivation rec { + name = "subtitle-editor-${ver_maj}.${ver_min}"; + + buildInputs = [ + desktop_file_utils enchant gnome.gtk gnome.gtkmm gstreamer gstreamermm + gst_plugins_base gst_plugins_good intltool hicolor_icon_theme libsigcxx libxmlxx + makeWrapper xdg_utils pkgconfig + ]; + + src = fetchurl { + url = "http://download.gna.org/subtitleeditor/${ver_maj}/subtitleeditor-${ver_maj}.${ver_min}.tar.gz"; + md5 = "3c21ccd8296001dcb1a02c62396db1b6"; + }; + + doCheck = true; + + postInstall = '' + wrapProgram "$out/bin/subtitleeditor" --prefix \ + GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH" \ + ''; + + + meta = { + description = "GTK+2 application to edit video subtitles"; + longDescription = '' + Subtitle Editor is a GTK+2 tool to edit subtitles for GNU/Linux/*BSD. It can be + used for new subtitles or as a tool to transform, edit, correct and refine + existing subtitle. This program also shows sound waves, which makes it easier + to synchronise subtitles to voices. + ''; + homepage = http://home.gna.org/subtitleeditor; + license = stdenv.lib.licenses.gpl3; + maintainers = stdenv.lib.maintainers.plcplc; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix new file mode 100644 index 000000000000..1427ec866a9c --- /dev/null +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, glibmm, gstreamer, gst_plugins_base, libsigcxx, libxmlxx, pkgconfig }: + +let + ver_maj = "0.10"; + ver_min = "11"; +in +stdenv.mkDerivation rec { + name = "gstreamermm-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "mirror://gnome/sources/gstreamermm/${ver_maj}/gstreamermm-${ver_maj}.${ver_min}.tar.xz"; + sha256 = "12b5f377363594a69cb79f2f5cd0a8b1813ca6553680c3216e6354cfd682ebc6"; + }; + + doCheck = false; # Tests require pulseaudio in /homeless-shelter + + propagatedBuildInputs = [ + glibmm gstreamer gst_plugins_base libsigcxx libxmlxx + ]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = { + description = "C++ bindings for the GStreamer streaming multimedia library"; + homepage = http://www.gtkmm.org/; + license = "LGPLv2+"; + maintainers = "Philip Lykke Carlsen "; + platforms = stdenv.lib.platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ea34f3dec14..54016f654bdd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4660,6 +4660,8 @@ let gst_python = callPackage ../development/libraries/gstreamer/legacy/gst-python {}; + gstreamermm = callPackage ../development/libraries/gstreamer/legacy/gstreamermm { }; + gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {}; gusb = callPackage ../development/libraries/gusb { @@ -6060,6 +6062,8 @@ let strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; + subtitleeditor = callPackage ../applications/video/subtitleeditor { }; + suil = callPackage ../development/libraries/audio/suil { }; suitesparse = callPackage ../development/libraries/suitesparse { }; From 26c50cd60f0d744535510e49865f8b3612796397 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Wed, 4 Jun 2014 00:06:14 +0400 Subject: [PATCH 194/254] dwb: update --- pkgs/applications/networking/browsers/dwb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index b426019efca3..40b875c8c577 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -2,12 +2,12 @@ m4, glib_networking, gsettings_desktop_schemas }: stdenv.mkDerivation { - name = "dwb-2014-05-23"; + name = "dwb-2014-06-03"; src = fetchgit { url = "https://bitbucket.org/portix/dwb.git"; - rev = "813457c0cb6603d3b7a548fc97a8298a7fac34fa"; - sha256 = "1fywnf3yp6p84hap40nb9vrz1gswgnhppygmi1gzjzz3bphwf5pr"; + rev = "d00af56c1e60978060f1b2077f3d49995b98c54f"; + sha256 = "02bs9nbgk8ghaxywhqd8mii4lik748dssn551m00i1305p6q1cjj"; }; buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ]; From fc235a48a0820edf05d1c7f47eac8af451c0ecfb Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Wed, 4 Jun 2014 16:01:26 +0800 Subject: [PATCH 195/254] Update haskell-aeson-qq to version 0.7.0 --- pkgs/development/libraries/haskell/aeson-qq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix index fb53dd902579..1da43428f127 100644 --- a/pkgs/development/libraries/haskell/aeson-qq/default.nix +++ b/pkgs/development/libraries/haskell/aeson-qq/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "aeson-qq"; - version = "0.6.1"; - sha256 = "164nqk1qfb8a9c95yv5hg0zgcjcg49vrra2wi00h325bgpq6wa5n"; + version = "0.7.0"; + sha256 = "1sq34pnwiyf5lngqph4m463ijr185akzbrdi3i40zmqlrymssv3c"; buildDepends = [ aeson haskellSrcMeta parsec text vector ]; testDepends = [ aeson hspec ]; meta = { homepage = "http://github.com/zalora/aeson-qq"; - description = "Json Quasiquatation for Haskell"; + description = "JSON quasiquoter for Haskell"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; From 12f06b3cc3f57a18cb285fd2274292faa6eb038d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 10 May 2014 18:37:58 +0200 Subject: [PATCH 196/254] fcgiwrap: new package Simple server for running CGI applications over FastCGI https://nginx.localdomain.pl/wiki/FcgiWrap --- nixos/modules/module-list.nix | 1 + .../modules/services/web-servers/fcgiwrap.nix | 49 +++++++++++++++++++ pkgs/servers/fcgiwrap/default.nix | 21 ++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 73 insertions(+) create mode 100644 nixos/modules/services/web-servers/fcgiwrap.nix create mode 100644 pkgs/servers/fcgiwrap/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c1b55cb5550e..7fa705a5ae37 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -255,6 +255,7 @@ ./services/ttys/agetty.nix ./services/ttys/kmscon.nix ./services/web-servers/apache-httpd/default.nix + ./services/web-servers/fcgiwrap.nix ./services/web-servers/jboss/default.nix ./services/web-servers/lighttpd/default.nix ./services/web-servers/lighttpd/cgit.nix diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix new file mode 100644 index 000000000000..7e91e7b60eef --- /dev/null +++ b/nixos/modules/services/web-servers/fcgiwrap.nix @@ -0,0 +1,49 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.fcgiwrap; + +in { + + options = { + services.fcgiwrap = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable fcgiwrap, a server for running CGI applications over FastCGI."; + }; + + preforkProcesses = mkOption { + type = types.int; + default = 1; + description = "Number of processes to prefork."; + }; + + bindSocket = mkOption { + type = types.string; + default = "unix:/run/fcgiwrap.sock"; + description = '' + Socket to bind to. Valid socket URLs are: + unix:/path/to/socket for Unix sockets + tcp:dot.ted.qu.ad:port for IPv4 sockets + tcp6:[ipv6_addr]:port for IPv6 sockets + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + systemd.services.fcgiwrap = { + after = [ "nss-user-lookup.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.fcgiwrap}/sbin/fcgiwrap -c ${builtins.toString cfg.preforkProcesses} -s ${cfg.bindSocket}"; + }; + }; + + }; +} diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix new file mode 100644 index 000000000000..84deebcb8f5b --- /dev/null +++ b/pkgs/servers/fcgiwrap/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkgconfig }: + +stdenv.mkDerivation rec { + name = "fcgiwrap-${version}"; + version = "1.1.0"; + + src = fetchurl { + url = "http://github.com/gnosek/fcgiwrap/archive/${version}.tar.gz"; + sha256 = "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac"; + }; + + configureFlags = [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + + buildInputs = [ autoreconfHook systemd fcgi pkgconfig ]; + + meta = with stdenv.lib; { + homepage = https://nginx.localdomain.pl/wiki/FcgiWrap; + description = "Simple server for running CGI applications over FastCGI"; + maintainers = with maintainers; [ lethalman ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ede5259f1ba4..5080ca81db26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6602,6 +6602,8 @@ let elasticmq = callPackage ../servers/elasticmq { }; + fcgiwrap = callPackage ../servers/fcgiwrap { }; + felix = callPackage ../servers/felix { }; felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { }; From 77abe5e4641701f1b7213575ba93cca1ac60d309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 3 Jun 2014 14:25:21 +0200 Subject: [PATCH 197/254] libav: update 0.8.11 -> .12, 9.12 -> .13, introduce 10.1 --- pkgs/development/libraries/libav/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index a6b552613ccf..b21f530478a3 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,8 +26,9 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_9 = libavFun "9.12" "1wm0nf12c1p138y54jh71mvbpikrpk43zc9m2qhpjm9pgnagizk0"; - libav_0_8 = libavFun "0.8.11" "0nhm0mzz2aj78sgmw9xf20a1mlgig78cv1nyhx4zrq7nvgqf8d2r"; + libav_0_8 = libavFun "0.8.12" "0069zv9s0f4silzdyjac87g7a89jhh27sadd1zcr9xngxbvd93fr"; + libav_9 = libavFun "9.13" "1jp6vlza5srks1scgl000x9y1y0l88inrcby4yxv6n92rpv5vw1g"; + libav_10 = libavFun "10.1" "05cy1yq9rxarajs9gfdhkji8gmcpar125xi8lrx4cfplmp4lvq6m"; }; libavFun = version : sha256 : stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5080ca81db26..27dc28348f51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4928,9 +4928,9 @@ let libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { }; - libav = libav_9; + libav = libav_10; libav_all = callPackage ../development/libraries/libav { }; - inherit (libav_all) libav_9 libav_0_8; + inherit (libav_all) libav_0_8 libav_9 libav_10; libavc1394 = callPackage ../development/libraries/libavc1394 { }; From bc53b9ec4c331d11229007054e39abb9e8160c2e Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 4 Jun 2014 14:28:08 +0200 Subject: [PATCH 198/254] opengrok: new package Source code search and cross reference engine http://opengrok.github.io/OpenGrok/ --- .../tools/misc/opengrok/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/misc/opengrok/default.nix diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix new file mode 100644 index 000000000000..8f77b3d7283a --- /dev/null +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -0,0 +1,29 @@ +{ fetchurl, stdenv, jre, ctags, makeWrapper, coreutils, git }: + +stdenv.mkDerivation rec { + name = "opengrok-0.12.1"; + + src = fetchurl { + url = "http://java.net/projects/opengrok/downloads/download/${name}.tar.gz"; + sha256 = "0ihaqgf1z2gsjmy2q96m0s07dpnh92j3ss3myiqjdsh9957fwg79"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + ensureDir $out + cp -a * $out/ + substituteInPlace $out/bin/OpenGrok --replace /bin/uname ${coreutils}/bin/uname + wrapProgram $out/bin/OpenGrok \ + --prefix PATH : "${ctags}/bin:${git}/bin" \ + --set JAVA_HOME "${jre}" \ + --set OPENGROK_TOMCAT_BASE "/var/tomcat" + ''; + + meta = with stdenv.lib; { + description = "Source code search and cross reference engine"; + homepage = http://opengrok.github.io/OpenGrok/; + license = licenses.cddl; + maintainers = [ maintainers.lethalman ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27dc28348f51..54ee84c65f84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3978,6 +3978,8 @@ let omake = callPackage ../development/tools/ocaml/omake { }; omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; + opengrok = callPackage ../development/tools/misc/opengrok { }; + openocd = callPackage ../development/tools/misc/openocd { }; oprofile = callPackage ../development/tools/profiling/oprofile { }; From 6306d81e8a9524930ce7e8f28021150c8fb97c03 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 4 Jun 2014 09:47:00 -0400 Subject: [PATCH 199/254] ncdc: update to 1.19.1 for security fixes --- pkgs/applications/networking/p2p/ncdc/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 794f6fe43087..5f7ad92f7cc6 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -1,18 +1,20 @@ { stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }: -stdenv.mkDerivation rec { +let + version = "1.19.1"; +in +stdenv.mkDerivation { name = "ncdc-${version}"; - version = "1.19"; src = fetchurl { - url = "http://dev.yorhel.nl/download/ncdc-1.19.tar.gz"; - sha256 = "1wgvqwfxq9kc729h2r528n55821w87sfbm4h21mr6pvkpfw30hf2"; + url = "http://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; + sha256 = "0iwx4b3x207sw11qqjfynpwnhryhixjzbgcy9l9zfisa8f0k7cm6"; }; buildInputs = [ ncurses zlib bzip2 sqlite pkgconfig glib gnutls ]; meta = { - description = "modern and lightweight direct connect client with a friendly ncurses interface"; + description = "Modern and lightweight direct connect client with a friendly ncurses interface"; homepage = http://dev.yorhel.nl/ncdc; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; # arbitrary From 638132b64cc6de3bfde9dccc79c4f64292a378dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Jun 2014 16:18:04 +0200 Subject: [PATCH 200/254] mailutils: disable tests --- pkgs/tools/networking/mailutils/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 3ac82e51bf8b..0453567c449b 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { gnutls mysql guile texinfo gnum4 ] ++ stdenv.lib.optional doCheck dejagnu; - doCheck = true; + # Tests fail since gcc 4.8 + doCheck = false; meta = { description = "GNU Mailutils is a rich and powerful protocol-independent mail framework"; @@ -51,8 +52,5 @@ stdenv.mkDerivation rec { # Some of the dependencies fail to build on {cyg,dar}win. platforms = stdenv.lib.platforms.gnu; - - # Tests fail since gcc 4.8 - broken = true; }; } From 73169b3a37e1875a3124f578591ddb33f7413f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Jun 2014 14:11:21 +0200 Subject: [PATCH 201/254] python: 2.7.6 -> 2.7.7 --- .../python/2.7/CVE-2014-1912.patch | 57 ------------------- .../interpreters/python/2.7/default.nix | 8 +-- 2 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch diff --git a/pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch b/pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch deleted file mode 100644 index 95399bf76073..000000000000 --- a/pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch +++ /dev/null @@ -1,57 +0,0 @@ -# Edited from Mercurial patch: deleted the NEWS hunk, since it didn't apply cleanly. -# It added the following line to NEWS: -# - Issue #20246: Fix buffer overflow in socket.recvfrom_into. - -# HG changeset patch -# User Benjamin Peterson -# Date 1389671978 18000 -# Node ID 87673659d8f7ba1623cd4914f09ad3d2ade034e9 -# Parent 2631d33ee7fbd5f0288931ef37872218d511d2e8 -complain when nbytes > buflen to fix possible buffer overflow (closes #20246) - -diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py ---- a/Lib/test/test_socket.py -+++ b/Lib/test/test_socket.py -@@ -1620,6 +1620,16 @@ class BufferIOTest(SocketConnectedTest): - - _testRecvFromIntoMemoryview = _testRecvFromIntoArray - -+ def testRecvFromIntoSmallBuffer(self): -+ # See issue #20246. -+ buf = bytearray(8) -+ self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024) -+ -+ def _testRecvFromIntoSmallBuffer(self): -+ with test_support.check_py3k_warnings(): -+ buf = buffer(MSG*2048) -+ self.serv_conn.send(buf) -+ - - TIPC_STYPE = 2000 - TIPC_LOWER = 200 -diff --git a/Misc/ACKS b/Misc/ACKS ---- a/Misc/ACKS -+++ b/Misc/ACKS -@@ -979,6 +979,7 @@ Eric V. Smith - Christopher Smith - Gregory P. Smith - Roy Smith -+Ryan Smith-Roberts - Rafal Smotrzyk - Dirk Soede - Paul Sokolovsky -diff --git a/Misc/NEWS b/Misc/NEWS ---- a/Modules/socketmodule.c -+++ b/Modules/socketmodule.c -@@ -2742,6 +2742,10 @@ sock_recvfrom_into(PySocketSockObject *s - if (recvlen == 0) { - /* If nbytes was not specified, use the buffer's length */ - recvlen = buflen; -+ } else if (recvlen > buflen) { -+ PyErr_SetString(PyExc_ValueError, -+ "nbytes is greater than the length of the buffer"); -+ goto error; - } - - readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr); - diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index eeadc3c8cc7f..fc91e5a44937 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.6"; + version = "${majorVersion}.7"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "18gnpyh071dxa0rv3silrz92jw9qpblswzwv4gzqcwxzz20qxmhz"; + sha256 = "0y6s12rdi89k24p8zarhy9fqmyy459yg0d125c7cac4v136y70r9"; }; patches = @@ -28,10 +28,6 @@ let # patch python to put zero timestamp into pyc # if DETERMINISTIC_BUILD env var is set ./deterministic-build.patch - - # See http://bugs.python.org/issue20246 - # This will be fixed in 2.7.7. - ./CVE-2014-1912.patch ]; postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) '' From f0fc148e5ac62026aa330ac3fe865ad494f1b66b Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 4 Jun 2014 16:48:40 +0200 Subject: [PATCH 202/254] openttd: Bump to 1.4.1. --- pkgs/games/openttd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 7e2b4221d523..09a7761326a6 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "0m89pr7m7xg71q1j3869dfrbhv88g90cw9zn0jlpg8crsj4wnnyq"; + sha256 = "0gkmf2jj1rab81y10dp8cirr90kv9dpr3ww4wb06j8cvgapy7b0z"; }; buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ]; From 3ee3a5d387123d8ed39a04571d593986b0c9cb42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Jun 2014 16:55:35 +0200 Subject: [PATCH 203/254] maude: update full-maude to version 2.6.1h --- pkgs/development/interpreters/maude/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 877d6b79e53b..65badeae1dde 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper, unzip }: +{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper }: stdenv.mkDerivation rec { name = "maude-2.6"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { }; fullMaude = fetchurl { - url = "http://maude.lcc.uma.es/FullMaude/FM261e/full-maude.maude.zip"; - sha256 = "0g0chfrzc7923sh17zdy731wpsgnwz7rxci0jqqmrphlshwzqm2h"; + url = "https://full-maude.googlecode.com/git/full-maude261h.maude"; + sha256 = "0xx8bfn6arsa75m5vhp5lmpazgfw230ssq33h9vifswlvzzc81ha"; }; buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done mkdir -p $out/share/maude - ${unzip}/bin/unzip ${fullMaude} -d $out/share/maude + cp ${fullMaude} -d $out/share/maude/full-maude.maude ''; meta = { From 853f2ca9d589f5bec52df1adb70b642ff45f9a45 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 4 Jun 2014 19:52:34 +0000 Subject: [PATCH 204/254] Update shake to 0.13.1 --- pkgs/development/libraries/haskell/shake/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index 58325a1afe0f..a2b8cc24e65d 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.12"; - sha256 = "060bvbhk84zagghalg5nh5g17vj8z2kv0qb8vibcq58ahfayj655"; + version = "0.13.1"; + sha256 = "00dvf1ydfgpnkv09fywsvyn0sphjwdrqhvkc21axj580ykbqxrn7"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { binary deepseq filepath hashable QuickCheck random time transformers unorderedContainers utf8String ]; + doCheck = !self.stdenv.isDarwin; meta = { homepage = "https://github.com/ndmitchell/shake"; description = "Build system library, like Make, but more accurate dependencies"; From 86b7cf8bb4105da6660fedac8833cf71b6405a13 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 26 May 2014 20:31:53 +0200 Subject: [PATCH 205/254] Added llpp, a mupdf based pdf pager written in ocaml. Updated lablgl to 1.05 and mupdf to 1.4. Added myself as maintainer for lablgl. --- pkgs/applications/misc/llpp/default.nix | 75 +++++++++++++++++++ pkgs/applications/misc/mupdf/default.nix | 11 +-- .../lablgl/Makefile.config.patch | 52 +------------ .../ocaml-modules/lablgl/default.nix | 9 +-- pkgs/top-level/all-packages.nix | 2 + 5 files changed, 84 insertions(+), 65 deletions(-) create mode 100644 pkgs/applications/misc/llpp/default.nix diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix new file mode 100644 index 000000000000..81ca87af7076 --- /dev/null +++ b/pkgs/applications/misc/llpp/default.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchgit, ocaml, mupdf, lablgl, mesa +, libX11, libXext, gtk3, freetype, zlib, openjpeg +, jbig2dec, libjpeg, ncurses }: + +stdenv.mkDerivation { + name = "llpp-2014-05-26"; + + src = fetchgit { + url = "git://repo.or.cz/llpp.git"; + rev = "902143de64d86b5714b3a59d2cc7085083b87249"; + sha256 = "038xl4gbvm57na2lz1fw36sf43zaxq407zi2d53985vc33677j9s"; + }; + + buildInputs = [ ocaml mupdf lablgl mesa libX11 libXext gtk3 + freetype jbig2dec libjpeg openjpeg zlib ncurses ]; + + # The build phase was extracted from buildall.sh, because that script + # fetched the dependencies on its own. + buildPhase = '' + ccopt="-O" + ccopt="$ccopt -I ${jbig2dec}/include" + ccopt="$ccopt -I ${libjpeg}/include" + ccopt="$ccopt -I ${freetype}/include" + ccopt="$ccopt -I ${openjpeg}/include" + ccopt="$ccopt -I ${zlib}/include" + ccopt="$ccopt -I ${mupdf}/include" + ccopt="$ccopt -include ${freetype}/include/ft2build.h" + ccopt="$ccopt -D_GNU_SOURCE" + + cclib="$cclib -lmupdf" + cclib="$cclib -lz -ljpeg -lopenjp2 -ljbig2dec -lfreetype -lpthread" + cclib="$cclib -lX11" + cclib="$cclib -lfreetype" + + comp=ocamlc.opt + cmsuf=cmo + + sh mkhelp.sh keystoml.ml KEYS > help.ml + + $comp -c -o link.o -ccopt "$ccopt" link.c + $comp -c -o help.$cmsuf help.ml + $comp -c -o utils.$cmsuf utils.ml + $comp -c -o wsi.cmi wsi.mli + $comp -c -o wsi.$cmsuf wsi.ml + $comp -c -o parser.$cmsuf parser.ml + $comp -c -o main.$cmsuf -I ${lablgl}/lib/ocaml/4.01.0/site-lib/lablgl main.ml + + $comp -custom -o llpp \ + -I ${lablgl}/lib/ocaml/4.01.0/site-lib/lablgl \ + str.cma unix.cma lablgl.cma \ + link.o \ + -cclib "$cclib" \ + help.cmo \ + utils.cmo \ + parser.cmo \ + wsi.cmo \ + main.cmo + ''; + + # Binary fails with 'No bytecode file specified.' if stripped. + dontStrip = true; + + installPhase = '' + install -d $out/bin + install llpp llppac $out/bin + ''; + + meta = { + homepage = http://repo.or.cz/w/llpp.git; + description = "A MuPDF based PDF pager written in OCaml"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.pSub ]; + license = "GPL"; + }; +} diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 81bd9e1e97e9..ec19944b972b 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,20 +1,13 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg , libX11, libXext }: stdenv.mkDerivation rec { - name = "mupdf-1.3"; + name = "mupdf-1.4"; src = fetchurl { url = "http://mupdf.com/download/archive/${name}-source.tar.gz"; - sha256 = "0y247nka5gkr1ajn47jrlp5rcnf6h4ff7dfsprma3h4wxqdv7a5b"; + sha256 = "08pc6fv42sb9k9dzjs8ph32nixzrzmr08yxh7arkpsdm42asp2q1"; }; - patches = [(fetchpatch { - name = "CVE-2014-2013.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;" - + "h=60dabde18d7fe12b19da8b509bdfee9cc886aafc"; - sha256 = "0p721f3g2djz9fy6rcgj83c20f5k257wg2d0yvvmp02m7sp06l0g"; - })]; - buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; enableParallelBuilding = true; diff --git a/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch b/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch index c896978f57ea..3d880c00947e 100644 --- a/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch +++ b/pkgs/development/ocaml-modules/lablgl/Makefile.config.patch @@ -41,7 +41,7 @@ diff -Naur lablGL.ori/Makefile.config lablGL/Makefile.config + +##### Uncomment these for windows +#TKLIBS = tk83.lib tcl83.lib gdi32.lib user32.lib -+#GLLIBS = opengl32.lib glu32.lib ++#GLLIBS = opengl32.lib glu32.lib +#TOOLCHAIN = msvc +#XA = .lib +#XB = .bat @@ -65,53 +65,3 @@ diff -Naur lablGL.ori/Makefile.config lablGL/Makefile.config + +# C Compiler options +#COPTS = -c -O -diff -Naur lablGL.ori/META lablGL/META ---- lablGL.ori/META 1970-01-01 01:00:00.000000000 +0100 -+++ lablGL/META 2013-06-02 22:00:59.000000000 +0200 -@@ -0,0 +1,21 @@ -+description = "Bindings for OpenGL graphics engines" -+version = "1.04-1" -+archive(byte) = "lablgl.cma" -+archive(native) = "lablgl.cmxa" -+ -+#package "togl" ( -+# description = "OpenGL widget for labltk" -+# version = "1.01" -+# requires = "lablgl, labltk" -+# archive(byte) = "togl.cma" -+# archive(native) = "togl.cmxa" -+#) -+ -+package "glut" ( -+ description = "Platform-independent OpenGL window" -+ version = "1.01" -+ requires = "lablgl" -+ archive(byte) = "lablglut.cma" -+ archive(native) = "lablglut.cmxa" -+) -+ -diff -Naur lablGL.ori/META~ lablGL/META~ ---- lablGL.ori/META~ 1970-01-01 01:00:00.000000000 +0100 -+++ lablGL/META~ 2013-06-02 21:59:17.000000000 +0200 -@@ -0,0 +1,21 @@ -+description = "Bindings for OpenGL graphics engines" -+version = "1.04-1" -+archive(byte) = "lablgl.cma" -+archive(native) = "lablgl.cmxa" -+ -+#package "togl" ( -+# description = "OpenGL widget for labltk" -+# version = "1.01" -+# requires = "lablGL, labltk" -+# archive(byte) = "togl.cma" -+# archive(native) = "togl.cmxa" -+#) -+ -+package "glut" ( -+ description = "Platform-independent OpenGL window" -+ version = "1.01" -+ requires = "lablGL" -+ archive(byte) = "lablglut.cma" -+ archive(native) = "lablglut.cmxa" -+) -+ diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index a739e4a7146b..8fd07ee06912 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -3,15 +3,15 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgl"; - version = "1.04-1"; + version = "1.05"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-20120306.tar.gz"; - sha256 = "1w5di2n38h7fkrf668zphnramygwl7ybjhrmww3pi9jcf9apa09r"; + url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-${version}.tar.gz"; + sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; }; buildInputs = [ocaml findlib lablgtk mesa freeglut ]; @@ -29,7 +29,6 @@ stdenv.mkDerivation { createFindlibDestdir = true; - #makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib"; buildFlags = "lib libopt glut glutopt"; postInstall = '' @@ -40,6 +39,6 @@ stdenv.mkDerivation { homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; description = "OpenGL bindings for ocaml"; license = "GnuGPLV2"; -# maintainers = [ stdenv.lib.maintainers.roconnor ]; + maintainers = [ stdenv.lib.maintainers.psub ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0b35e55d47f..99355334b012 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8830,6 +8830,8 @@ let bison = bison2; }; + llpp = callPackage ../applications/misc/llpp { inherit (ocamlPackages) lablgl; }; + lmms = callPackage ../applications/audio/lmms { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; From 4eeb0f10fb57203f020502835130fb982bc7af48 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 5 Jun 2014 01:16:50 +0100 Subject: [PATCH 206/254] erlangR16: updated to R16B03-1 - couchdb: using erlangR16 (fails to build with R17) - rename erlang attr names to use only major version in attr name --- .../interpreters/erlang/{R14B04.nix => R14.nix} | 0 .../interpreters/erlang/{R15B03.nix => R15.nix} | 0 .../interpreters/erlang/{R16B02.nix => R16.nix} | 4 ++-- pkgs/servers/nosql/riak/1.3.1.nix | 4 ++-- pkgs/top-level/all-packages.nix | 13 +++++++------ 5 files changed, 11 insertions(+), 10 deletions(-) rename pkgs/development/interpreters/erlang/{R14B04.nix => R14.nix} (100%) rename pkgs/development/interpreters/erlang/{R15B03.nix => R15.nix} (100%) rename pkgs/development/interpreters/erlang/{R16B02.nix => R16.nix} (95%) diff --git a/pkgs/development/interpreters/erlang/R14B04.nix b/pkgs/development/interpreters/erlang/R14.nix similarity index 100% rename from pkgs/development/interpreters/erlang/R14B04.nix rename to pkgs/development/interpreters/erlang/R14.nix diff --git a/pkgs/development/interpreters/erlang/R15B03.nix b/pkgs/development/interpreters/erlang/R15.nix similarity index 100% rename from pkgs/development/interpreters/erlang/R15B03.nix rename to pkgs/development/interpreters/erlang/R15.nix diff --git a/pkgs/development/interpreters/erlang/R16B02.nix b/pkgs/development/interpreters/erlang/R16.nix similarity index 95% rename from pkgs/development/interpreters/erlang/R16B02.nix rename to pkgs/development/interpreters/erlang/R16.nix index 7dc71ed65461..eaf991ff5637 100644 --- a/pkgs/development/interpreters/erlang/R16B02.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version; - version = "R16B02"; + version = "R16B03-1"; src = fetchurl { url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; - sha256 = "119gnf3jfd98hpxxqs8vnzrc81myv07y302b99alalqqz0fsvf3a"; + sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp"; }; buildInputs = diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix index ccac6e331fdc..96315c52f6bf 100644 --- a/pkgs/servers/nosql/riak/1.3.1.nix +++ b/pkgs/servers/nosql/riak/1.3.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, erlangR15B03 }: +{ stdenv, fetchurl, unzip, erlangR15}: let srcs = { @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { name = "riak-1.3.1"; - buildInputs = [unzip erlangR15B03]; + buildInputs = [unzip erlangR15]; src = srcs.riak; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54ee84c65f84..24d977d51489 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3381,9 +3381,9 @@ let clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; - erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; - erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { }; - erlangR16B02 = callPackage ../development/interpreters/erlang/R16B02.nix { }; + erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { }; + erlangR15 = callPackage ../development/interpreters/erlang/R15.nix { }; + erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { }; erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { }; erlang = erlangR17; @@ -6568,6 +6568,7 @@ let spidermonkey = spidermonkey_185; python = python27; sphinx = python27Packages.sphinx; + erlang = erlangR16; }; dico = callPackage ../servers/dico { }; @@ -6599,7 +6600,7 @@ let dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { }; ejabberd = callPackage ../servers/xmpp/ejabberd { - erlang = erlangR16B02; + erlang = erlangR16; }; elasticmq = callPackage ../servers/elasticmq { }; @@ -9684,8 +9685,8 @@ let winswitch = callPackage ../tools/X11/winswitch { }; wings = callPackage ../applications/graphics/wings { - erlang = erlangR14B04; - esdl = esdl.override { erlang = erlangR14B04; }; + erlang = erlangR14; + esdl = esdl.override { erlang = erlangR14; }; }; wmname = callPackage ../applications/misc/wmname { }; From 3a0b265af9195b01629a6962820f335d2a6fd629 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 4 Jun 2014 22:23:39 -0500 Subject: [PATCH 207/254] kernel: 3.14.4 -> 3.14.5 (close #2831) --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index e513fa2e3cd6..465a04837ecc 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.4"; + version = "3.14.5"; extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "05yp192pbjng92rpvq3fd4mhjc96iylwf6xb7as5lscwg660m1b5"; + sha256 = "0x38fyj86hrw7ns14m4kdpscqlj7ig889mxzvwsbhrsk0khllvyn"; }; features.iwlwifi = true; From 7553a476f598e0bbf175453cef722b71a57672b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 12:36:39 +0200 Subject: [PATCH 208/254] simple-build-tool: update to version 0.13.5 --- .../tools/build-managers/simple-build-tool/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/simple-build-tool/default.nix index 8f01486cfe72..b54f894d8eb4 100644 --- a/pkgs/development/tools/build-managers/simple-build-tool/default.nix +++ b/pkgs/development/tools/build-managers/simple-build-tool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "0.13.0"; + version = "0.13.5"; src = fetchurl { url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar"; - sha256 = "04s49v5mw4kwz1rmvbf07kq51i2m0lcv60c9i5y524gjj518pk1w"; + sha256 = "05zvb3j7xxswpz7fz2nwbl4dwfdf0cyx5xzjis5fyi2dbzmfdrmp"; }; phases = [ "installPhase" ]; @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { chmod +x $out/bin/sbt ''; - meta = { + meta = { homepage = http://www.scala-sbt.org/; license = stdenv.lib.licenses.bsd3; description = "A build tool for Scala, Java and more"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; - }; + maintainers = [ stdenv.lib.maintainers.rickynils ]; + }; } From 246edc3df2ade0701aabc53e41d6c8c85f51ac24 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Jun 2014 12:54:37 +0200 Subject: [PATCH 209/254] linux: Update to 3.12.21 --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 6e94f2432c0f..82f31bf4f984 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.20"; + version = "3.12.21"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "15pjvlqbbyif8s8mcpb7wf20fvbczhfp65mn6fd609j1p79nvqb9"; + sha256 = "1pr4gr48bgxz28h790b2w41b1fc41xffz3drflsnz5736pisrhg7"; }; features.iwlwifi = true; From 1da6a7d4a915e48934fbaa27fe01db1211d00df7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Jun 2014 13:04:18 +0200 Subject: [PATCH 210/254] Remove illegal meta.src attributes --- .../audio/ladspa-plugins/ladspah.nix | 33 +++++++------------ .../networking/p2p/ldcpp/default.nix | 1 - pkgs/development/compilers/qi/default.nix | 1 - pkgs/games/construo/default.nix | 1 - pkgs/games/orbit/default.nix | 1 - pkgs/servers/dict/dictd-db.nix | 1 - pkgs/servers/xmpp/openfire/default.nix | 1 - pkgs/tools/filesystems/relfs/default.nix | 1 - 8 files changed, 11 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix index 30ba34af16c5..8c4d8a8c1ed5 100644 --- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix +++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix @@ -1,28 +1,17 @@ -{ stdenv, fetchurl, builderDefs }: +{ runCommand, fetchurl }: + +let -let src = fetchurl { url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt; sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67"; }; + in - let localDefs = builderDefs.passthru.function { - buildInputs = []; - inherit src; - }; - in with localDefs; -let - copyFile = fullDepEntry (" - mkdir -p \$out/include - cp ${src} \$out/include/ladspa.h - ") [minInit defEnsureDir]; -in -stdenv.mkDerivation { - name = "ladspa.h"; - builder = writeScript "ladspa.h-builder" - (textClosure localDefs [copyFile]); - meta = { - description = "LADSPA format audio plugins"; - inherit src; - }; -} + +runCommand "ladspa.h" + { meta.description = "LADSPA format audio plugins"; } + '' + mkdir -p $out/include + cp ${src} $out/include/ladspa.h + '' diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix index 1b601992aa6f..6f282b30fa14 100644 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ b/pkgs/applications/networking/p2p/ldcpp/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { [doScons doForceShare doPropagate]); meta = { description = "Linux DC++ - Direct Connect client"; - inherit src; }; } diff --git a/pkgs/development/compilers/qi/default.nix b/pkgs/development/compilers/qi/default.nix index ae0172558549..ecb022d942a9 100644 --- a/pkgs/development/compilers/qi/default.nix +++ b/pkgs/development/compilers/qi/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { (textClosure localDefs [allBuild doForceShare doPropagate]); meta = { description = "Qi - next generation on top of Common Lisp"; - inherit src; }; } diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 4de74bde5a11..57d055ed3d3d 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { (textClosure localDefs ["preConfigure" "doConfigure" "doMakeInstall" "doForceShare" "doPropagate"]); meta = { description = "Construo masses and springs simulation"; - inherit src; }; } diff --git a/pkgs/games/orbit/default.nix b/pkgs/games/orbit/default.nix index 9769e6f5d670..de4c84f010cd 100644 --- a/pkgs/games/orbit/default.nix +++ b/pkgs/games/orbit/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { [ customBuild doForceShare doPropagate]); meta = { description = "Orbit space flight simulator"; - inherit src; }; } diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index c6c0bc73a08a..5f109c58e6e4 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { [doInstall doForceShare doPropagate]); meta = { description = "${name} dictionary for dictd"; - inherit src; }; }; # Probably a bug in some FreeDict release files, but easier to trivially diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix index e5e5273783f8..736517b53f19 100644 --- a/pkgs/servers/xmpp/openfire/default.nix +++ b/pkgs/servers/xmpp/openfire/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { [ installPhase doForceShare doPropagate]); meta = { description = "XMPP server in Java"; - inherit src; }; } diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix index 56dad0c1e3dd..6d803f725318 100644 --- a/pkgs/tools/filesystems/relfs/default.nix +++ b/pkgs/tools/filesystems/relfs/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { (textClosure localDefs ["build" "doMakeInstall" "doForceShare" "doPropagate"]); meta = { description = "A relational filesystem on top of FUSE"; - inherit src; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; }; From 463ed1bb640efcd3b3714a67e94800a6003eb320 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 5 Jun 2014 02:20:36 -0500 Subject: [PATCH 211/254] mariadb: 10.0.10 -> 10.0.11 Also, enable the TokuDB plugin, as it now builds (there were some bugs in the non-GA release that prevented that). Signed-off-by: Austin Seipp --- pkgs/servers/sql/mariadb/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index a6105c128906..d0f7f5ef3e52 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff }: stdenv.mkDerivation rec { - name = "mariadb-10.0.10"; + name = "mariadb-${version}"; + version = "10.0.11"; src = fetchurl { - url = "https://fossies.org/linux/misc/${name}.tar.gz"; - md5 = "14ce22b8197d4eae88d237776d47220f"; + url = "https://fossies.org/linux/misc/${name}.tar.gz"; + sha256 = "1p8h06kns30rlbnzw9ddmihs7r3jhp8xlrl4r6h5d107wkcw86v3"; }; buildInputs = [ cmake ncurses openssl bison boost libxml2 libaio judy libevent groff ]; - cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DWITHOUT_TOKUDB=1" "-DINSTALL_SCRIPTDIR=bin" ]; + cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ]; enableParallelBuilding = true; @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { description = "An enhanced, drop-in replacement for MySQL"; homepage = https://mariadb.org/; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + maintainers = with stdenv.lib.maintainers; [ shlevy thoughtpolice ]; platforms = stdenv.lib.platforms.all; }; } From b43421221ff3ea7069de175845be80075f31d2a8 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 5 Jun 2014 06:06:19 -0500 Subject: [PATCH 212/254] kernel/grsec: updates; add mainline package for brave souls Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- .../os-specific/linux/kernel/linux-testing.nix | 17 +++++++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 10 ++++++++++ 6 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-testing.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index de8fa4f5413e..ac2ba6113868 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.40"; + version = "3.10.41"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0a56hh47a9x8mg1rxlckfnrjcphwz9hraxj2fgran95vb33hsq5a"; + sha256 = "0rpz2nxay0a4573dnnb8szq3ly3bhjd6wrz5z6iw3kpj19crs0r1"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 1ff3b48676fc..d5fd820cac0b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.58"; + version = "3.2.59"; extraMeta.branch = "3.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1mszzixiv4k61m241dl2n5s8rca26l6hc40v23lha814nrahjkn1"; + sha256 = "0a62nmn90k3g48m8g3y27q6a0qwa3k2s6synss7378kdi4f938i4"; }; # We don't provide these patches if grsecurity is enabled, because diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 63d0d4904024..165baf0a17f4 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.90"; + version = "3.4.91"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0kh4y1sbsjm3awplfsd0i59rz7wc1dj23mcs5rwwhc0p7i8w4r75"; + sha256 = "003l9i14m5ci2232wl68nxbgi0ipkzq00yfgxfp9cmh2sipxy1dk"; }; kernelPatches = args.kernelPatches ++ diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix new file mode 100644 index 000000000000..d58610a38cda --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.15-rc8"; + extraMeta.branch = "3.15"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; + sha256 = ""; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a4ebc689b2fc..c0cca64967c4 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,24 +60,24 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.2.58"; - revision = "201405112002"; + { kversion = "3.2.59"; + revision = "201406042136"; branch = "stable"; - sha256 = "107jbgl1lz6blrk5rxm10jjhbywav9s56bs7zfs3m1618bff7p7v"; + sha256 = "01frz80n7zl3yyl11d1i517n0rw8ivb46cl0swp3zgjx29adwc8s"; }; grsecurity_vserver = grsecPatch - { kversion = "3.2.58"; - revision = "vs2.3.2.16-201405112004"; + { kversion = "3.2.59"; + revision = "vs2.3.2.16-201406042138"; branch = "vserver"; - sha256 = "0xi7c1q0qsvdvs9vw3iclfz8ykjf56cc9wds6419z1lcgcaykb9w"; + sha256 = "1vlmcf2fshxvhsparmvwlbn3gpccc8zjc341sjwsmyc3i8csmysr"; }; grsecurity_unstable = grsecPatch - { kversion = "3.14.4"; - revision = "201405141623"; + { kversion = "3.14.5"; + revision = "201406021708"; branch = "test"; - sha256 = "0k9f3n1hxxqa2l10mjk7hy7w9p0mmiqv6s6cbiji2hyvakm5s7p4"; + sha256 = "002sbbcmvg6wa41a1q8vgf3zcjakns72dc885b6jml0v396hb5c6"; }; grsec_fix_path = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24d977d51489..dc21997dbf1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7196,6 +7196,15 @@ let ]; }; + linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + /* grsec configuration We build several flavors of 'default' grsec kernels. These are @@ -7339,6 +7348,7 @@ let linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); + linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); # grsecurity flavors # Stable kernels From 906aa9ccb1cf34cde003634b6eca1ded5bc703d1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Jun 2014 13:10:35 +0200 Subject: [PATCH 213/254] Make pseudo-filesystems show up as "tmpfs" etc. rather than "none" in df --- nixos/modules/system/boot/stage-1-init.sh | 8 ++++---- nixos/modules/system/boot/stage-2-init.sh | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 15586e68e7e5..7adb932aba7f 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -60,12 +60,12 @@ touch /etc/fstab # to shut up mount touch /etc/mtab # to shut up mke2fs touch /etc/initrd-release mkdir -p /proc -mount -t proc none /proc +mount -t proc proc /proc mkdir -p /sys -mount -t sysfs none /sys -mount -t devtmpfs -o "size=@devSize@" none /dev +mount -t sysfs sysfs /sys +mount -t devtmpfs -o "size=@devSize@" devtmpfs /dev mkdir -p /run -mount -t tmpfs -o "mode=0755,size=@runSize@" none /run +mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run # Process the kernel command line. diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index ab414e29eb2f..eff2fb583bab 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -36,9 +36,9 @@ mount -n -o remount,rw / # stage 1, we need to do that here. if [ ! -e /proc/1 ]; then mkdir -m 0755 -p /proc - mount -n -t proc none /proc + mount -n -t proc proc /proc mkdir -m 0755 -p /dev - mount -t devtmpfs none /dev + mount -t devtmpfs devtmpfs /dev fi @@ -82,9 +82,9 @@ done # More special file systems, initialise required directories. mkdir -m 0755 /dev/shm -mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" none /dev/shm +mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm mkdir -m 0755 -p /dev/pts -[ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # UML doesn't have USB by default +[ -e /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb # UML doesn't have USB by default mkdir -m 01777 -p /tmp mkdir -m 0755 -p /var /var/log /var/lib /var/db mkdir -m 0755 -p /nix/var @@ -114,7 +114,7 @@ rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots if ! mountpoint -q /run; then rm -rf /run mkdir -m 0755 -p /run - mount -t tmpfs -o "mode=0755,size=@runSize@" none /run + mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run fi # Create a ramfs on /run/keys to hold secrets that shouldn't be @@ -122,7 +122,7 @@ fi if ! mountpoint -q /run/keys; then rm -rf /run/keys mkdir /run/keys - mount -t ramfs none /run/keys + mount -t ramfs ramfs /run/keys chown 0:96 /run/keys chmod 0750 /run/keys fi @@ -153,7 +153,7 @@ fi # Create /var/setuid-wrappers as a tmpfs. rm -rf /var/setuid-wrappers mkdir -m 0755 -p /var/setuid-wrappers -mount -t tmpfs -o "mode=0755" none /var/setuid-wrappers +mount -t tmpfs -o "mode=0755" tmpfs /var/setuid-wrappers # Run the script that performs all configuration activation that does From 15f092d7a7088ef1fadb059f305685da045fd979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 5 Jun 2014 14:32:11 +0200 Subject: [PATCH 214/254] openssl: 1.0.1g -> 1.0.1h CVE-2014-0224 CVE-2014-0221 CVE-2014-0195 CVE-2014-0198 CVE-2010-5298 CVE-2014-3470 --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 7217c876bfd9..93f7cbe1a1f4 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -2,7 +2,7 @@ , withCryptodev ? false, cryptodevHeaders }: let - name = "openssl-1.0.1g"; + name = "openssl-1.0.1h"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -43,7 +43,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha256 = "0a70qdqccg16nw4bbawa6pjvzn05vfp5wkwg6jl0grch7f683jsk"; + sha256 = "14yhsgag5as7nhxnw7f0vklwjwa3pmn1i15nmp3f4qxa6sc8l74x"; }; patches = patchesCross false; From 1fc21bd6a99197007804f3981a85201149280b3b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 12:58:57 +0200 Subject: [PATCH 215/254] emacs-scala-mode: package version 2 --- .../scala-mode/{default.nix => v1.nix} | 0 .../editors/emacs-modes/scala-mode/v2.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 26 insertions(+), 1 deletion(-) rename pkgs/applications/editors/emacs-modes/scala-mode/{default.nix => v1.nix} (100%) create mode 100644 pkgs/applications/editors/emacs-modes/scala-mode/v2.nix diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/default.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/scala-mode/default.nix rename to pkgs/applications/editors/emacs-modes/scala-mode/v1.nix diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix new file mode 100644 index 000000000000..13d3f4b00d1f --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, emacs, unzip }: + +stdenv.mkDerivation { + + name = "scala-mode2-2014-06-05"; + + src = fetchurl { + url = "https://github.com/hvesalai/scala-mode2/archive/af2dc30226c890ff7d49d727450f8006b90781df.zip"; + sha256 = "1jj08li9lfg5291jzj170wa3cmyf3g2a0j80cy5307l0mdawp9vx"; + }; + + buildInputs = [ unzip emacs ]; + + installPhase = '' + mkdir -p "$out/share/emacs/site-lisp" + cp -v *.el *.elc "$out/share/emacs/site-lisp/" + ''; + + meta = { + homepage = "https://github.com/hvesalai/scala-mode2"; + description = "An Emacs mode for editing Scala code"; + license = "permissive"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc21997dbf1b..c8f713b31854 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8343,7 +8343,8 @@ let rudel = callPackage ../applications/editors/emacs-modes/rudel { }; - scalaMode = callPackage ../applications/editors/emacs-modes/scala-mode { }; + scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { }; + scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { }; sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { }; From 80a60810ca7e59360e8babf47c4d967f108c1e46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 13:01:33 +0200 Subject: [PATCH 216/254] emacs-sbt-mode: add initial version --- .../editors/emacs-modes/sbt-mode/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/sbt-mode/default.nix diff --git a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix b/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix new file mode 100644 index 000000000000..092026aca88a --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, emacs, unzip }: + +stdenv.mkDerivation { + + name = "sbt-mode-2014-06-05"; + + src = fetchurl { + url = "https://github.com/hvesalai/sbt-mode/archive/676f22d9658989de401d299ed0250db9b911574d.zip"; + sha256 = "0b8qrr3yp48ggl757d3a6bz633mbf4zxqpcwsh47b1ckiwa3nb2h"; + }; + + buildInputs = [ unzip emacs ]; + + installPhase = '' + mkdir -p "$out/share/emacs/site-lisp" + cp -v *.el *.elc "$out/share/emacs/site-lisp/" + ''; + + meta = { + homepage = "https://github.com/hvesalai/scala-mode2"; + description = "An Emacs mode for editing Scala code"; + license = "permissive"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8f713b31854..ce0f7593f2cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8343,6 +8343,8 @@ let rudel = callPackage ../applications/editors/emacs-modes/rudel { }; + sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { }; + scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { }; scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { }; From b8af23e4b756f50612695bd5db35eb5e54743ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 5 Jun 2014 17:47:39 +0200 Subject: [PATCH 217/254] python-pygments: update 1.5 -> 1.6 Bug fixes, some new features and lots of new lexers. Full changelog: http://pygments.org/docs/changelog/#version-1-6 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf0eea9c2fb9..f3f75ea0f90b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5507,11 +5507,11 @@ rec { }; pygments = buildPythonPackage rec { - name = "Pygments-1.5"; + name = "Pygments-1.6"; src = fetchurl { url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz"; - md5 = "ef997066cc9ee7a47d01fb4f3da0b5ff"; + md5 = "a18feedf6ffd0b0cc8c8b0fbdb2027b1"; }; meta = { From 10b9ce53a3839990eb2ca3a2feb646ed8d4f1a2d Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 6 Jun 2014 03:44:28 +0200 Subject: [PATCH 218/254] livestreamer: 1.8.0 -> 1.8.2; fix up dependencies --- pkgs/top-level/python-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3f75ea0f90b..fd63228ca5d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4637,17 +4637,17 @@ rec { }; }; - livestreamer = if isPy34 then null else (buildPythonPackage { - #version = "1.8.0"; - name = "livestreamer-1.8.0"; + livestreamer = if isPy34 then null else (buildPythonPackage rec { + version = "1.8.2"; + name = "livestreamer-${version}"; src = fetchurl { - url = "https://github.com/chrippa/livestreamer/archive/v1.8.0.tar.gz"; - sha256 = "0fzpznbnhzrqawxdljvyml5251wbr3nifdrvnmh2b8vz356js4l8"; + url = "https://github.com/chrippa/livestreamer/archive/v${version}.tar.gz"; + sha256 = "130h97qdb7qx8xg0gz54p5a6cb2zbffi5hsi305xf0ah9nf4rbrc"; }; buildInputs = [ pkgs.makeWrapper ]; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests pkgs.rtmpdump pycrypto ]; postInstall = '' wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin ''; From 1dae8bd2bfb870e662335f9d992bbbd4e7d18007 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Fri, 6 Jun 2014 02:50:54 -0400 Subject: [PATCH 219/254] Add holy-project to nixpkgs. Patch is required until the next version is pushed to hackage. --- .../haskell/holy-project/default.nix | 30 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/haskell/holy-project/default.nix diff --git a/pkgs/development/libraries/haskell/holy-project/default.nix b/pkgs/development/libraries/haskell/holy-project/default.nix new file mode 100644 index 000000000000..4e751d9c003f --- /dev/null +++ b/pkgs/development/libraries/haskell/holy-project/default.nix @@ -0,0 +1,30 @@ +{ cabal, aeson, ansiTerminal, Cabal, filepath, hastache +, httpConduit, HUnit, lens, QuickCheck, random, smallcheck, split +, syb, tasty, tastyHunit, tastyQuickcheck, tastySmallcheck, text +, time +, fetchpatch}: + +cabal.mkDerivation (self: { + pname = "holy-project"; + version = "0.1.1.0"; + sha256 = "1dsyhgjcp54199zfazzzwsggxpj2dsbzfb64v6l3jz7qaapxnj9i"; + isLibrary = true; + isExecutable = true; + patches = [ (fetchpatch { url = "https://github.com/yogsototh/holy-project/pull/3.patch"; sha256 = "1ndyhfrsvn94zxzyq1w4504gz91yfv33375933qmz3wdfkc3rqf0"; }) ]; + buildDepends = [ + aeson ansiTerminal Cabal filepath hastache httpConduit HUnit lens + QuickCheck random smallcheck split syb tasty tastyHunit + tastyQuickcheck tastySmallcheck text time + ]; + testDepends = [ + Cabal HUnit QuickCheck smallcheck tasty tastyHunit tastyQuickcheck + tastySmallcheck + ]; + meta = { + homepage = "http://github.com/yogsototh/holy-project"; + description = "Start your Haskell project with cabal, git and tests"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index be1571bc9023..46e7f279e055 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1174,6 +1174,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in httpTypes = callPackage ../development/libraries/haskell/http-types {}; + holyProject = callPackage ../development/libraries/haskell/holy-project {}; + HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {}; HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {}; HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {}; From f6d03359b3810dca112e1190eeec7f18a3bab247 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 5 Jun 2014 18:38:38 +0200 Subject: [PATCH 220/254] Only overwrite container-configuration when --config is specified. Fixes #2834. --- nixos/modules/virtualisation/nixos-container.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl index 718630fe8b9b..5083abd84489 100644 --- a/nixos/modules/virtualisation/nixos-container.pl +++ b/nixos/modules/virtualisation/nixos-container.pl @@ -31,7 +31,7 @@ EOF } my $ensureUniqueName = 0; -my $extraConfig = ""; +my $extraConfig; GetOptions( "help" => sub { showHelp() }, @@ -190,7 +190,7 @@ elsif ($action eq "update") { # FIXME: may want to be more careful about clobbering the existing # configuration.nix. - writeNixOSConfig $nixosConfigFile if defined $extraConfig; + writeNixOSConfig $nixosConfigFile if (defined $extraConfig && $extraConfig ne ""); system("nix-env", "-p", "$profileDir/system", "-I", "nixos-config=$nixosConfigFile", "-f", "", From 77a937beec87c704014e54b0f0164c2593236f7c Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 6 Jun 2014 11:57:54 +0200 Subject: [PATCH 221/254] elixir: Bump to 1.13.3. --- pkgs/development/interpreters/elixir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index c558063be3a2..00fe490d494a 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }: let - version = "0.13.2"; + version = "0.13.3"; in stdenv.mkDerivation { name = "elixir-${version}"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "13mflf35lj2vbv32s5n982x7k5k55dsn9mx9rf3vkqgfsy7zx4ds"; + sha256 = "17nb8qfyjc67g62x10l2gq0z1501xa4wry906br0w2rm8bf4j8rf"; }; buildInputs = [ erlang rebar makeWrapper ]; From 94c2661503ca65d149570900e326079c97153808 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 6 Jun 2014 14:03:10 +0200 Subject: [PATCH 222/254] tomcat: fix service to be a daemon, and run tomcat in script rather than preStart --- nixos/modules/services/web-servers/tomcat.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index b5eee8f8be8f..1de3d40165e9 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -119,6 +119,8 @@ in startOn = "started network-interfaces"; stopOn = "stopping network-interfaces"; + daemonType = "daemon"; + preStart = '' # Create the base directory @@ -327,10 +329,12 @@ in done '' else ""} - - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh' ''; + script = '' + ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh' + ''; + postStop = '' echo "Stopping tomcat..." From 57eaced234574a70eefb7b802305c9c7c4da094b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Jun 2014 14:08:23 +0200 Subject: [PATCH 223/254] spamassassin: download from any Apache mirror --- pkgs/servers/mail/spamassassin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 03e579bda209..ea69d036f958 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -16,7 +16,7 @@ buildPerlPackage rec { name = "SpamAssassin-3.4.0"; src = fetchurl { - url = "http://apache.imsam.info/spamassassin/source/Mail-${name}.tar.bz2"; + url = "mirror://apache/spamassassin/source/Mail-${name}.tar.bz2"; sha256 = "0527rv6m5qd41l756fqh9q7sm9m2xfhhy2jchlhbmd39x6x3jfsm"; }; From 82d4f431edf59bd337cbfc8a2e0d7f697f24991f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Fri, 6 Jun 2014 15:11:16 +0200 Subject: [PATCH 224/254] haskell-th-lift-instances: update 0.1.2 -> 0.1.3 --- .../libraries/haskell/th-lift-instances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/th-lift-instances/default.nix b/pkgs/development/libraries/haskell/th-lift-instances/default.nix index 27eb090443b6..32354eabd4a6 100644 --- a/pkgs/development/libraries/haskell/th-lift-instances/default.nix +++ b/pkgs/development/libraries/haskell/th-lift-instances/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "th-lift-instances"; - version = "0.1.2"; - sha256 = "0xfz7jnhqxqxd6ijn6vpd0nay38kj862ylsb71xqi35137g5zl9w"; + version = "0.1.3"; + sha256 = "0snqgcdkskwvrsw239j3xq84mwnf5x79kfsn495kprdc6yh3qdkx"; buildDepends = [ text thLift vector ]; testDepends = [ doctest filepath QuickCheck text vector ]; meta = { From 98dfd124561f66029982d3426538cc6d2000a2e4 Mon Sep 17 00:00:00 2001 From: Vladimir Kirillov Date: Fri, 6 Jun 2014 16:06:53 +0300 Subject: [PATCH 225/254] php: import apc 3.1.13 --- pkgs/top-level/php-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7ee050314049..8a01151bd77f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -40,4 +40,12 @@ let self = with self; { sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd"; }; }; + + apc = buildPecl rec { + name = "apc-3.1.13"; + src = pkgs.fetchurl { + url = "http://pecl.php.net/get/${name}.tgz"; + sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y"; + }; + }; }; in self From 1859dbc4a2a7c927375fef34d0176f66ee51e556 Mon Sep 17 00:00:00 2001 From: Vladimir Kirillov Date: Fri, 6 Jun 2014 16:40:02 +0300 Subject: [PATCH 226/254] sysdig: update to 0.1.83 --- pkgs/os-specific/linux/sysdig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 1f9abe97f75f..10a1d88f2347 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,10 +3,10 @@ let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version="0.1.82"; + version="0.1.83"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256="0yjxsdjbkp5dihg5xhkyl3lg64dl40a0b5cvcai8gz74w2955mnk"; + sha256="0d4fw6vba78hqy8plhcq8lkdcxy1fizrr5aiszdsap7cvd0gls6r"; }; buildInputs = [ cmake zlib luajit From cc160a196a5d870e3301d0ed3d6187c048fe82c9 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 5 Jun 2014 15:12:30 +0100 Subject: [PATCH 227/254] couchdb service: adding customizable config file which is writable by couchdb --- nixos/modules/services/databases/couchdb.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 5088c7416810..e1fe6be6f6a3 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -126,6 +126,16 @@ in { Extra configuration. Overrides any other cofiguration. ''; }; + + configFile = mkOption { + type = types.string; + default = "/var/lib/couchdb/couchdb.ini"; + description = '' + Custom configuration file. File needs to be readable and writable + from couchdb user/group. + ''; + }; + }; }; @@ -146,11 +156,13 @@ in { mkdir -p `dirname ${cfg.logFile}`; mkdir -p ${cfg.databaseDir}; mkdir -p ${cfg.viewIndexDir}; + touch ${cfg.configFile} if [ "$(id -u)" = 0 ]; then - chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}` + chown ${cfg.user}:${cfg.group} ${cfg.uriFile} chown ${cfg.user}:${cfg.group} ${cfg.databaseDir} chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir} + chown ${cfg.user}:${cfg.group} ${cfg.configFile} fi ''; @@ -158,7 +170,7 @@ in { PermissionsStartOnly = true; User = cfg.user; Group = cfg.group; - ExecStart = "${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig}"; + ExecStart = "${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}"; }; }; From 17368bdf8ed8eaa84941e4c79721f3d0e862f118 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 6 Jun 2014 23:01:04 -0500 Subject: [PATCH 228/254] arcanist: update Signed-off-by: Austin Seipp --- pkgs/development/tools/misc/arcanist/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 58957a82752a..9cc8e7c7f6bd 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -3,8 +3,8 @@ let libphutil = fetchgit { url = "git://github.com/facebook/libphutil.git"; - rev = "c4cb6d99c4a5903079350f85fcc71895c0a0ea14"; - sha256 = "a7293aac4fdcfbaead09ee3e6ffb54c5d100b07905b4006194067411061ff994"; + rev = "7e75bf271c669b61eb6e6e2ea312a36e64b80a4a"; + sha256 = "ffb7ee8141b925889e9bbc945d2f38f12d1489148b9c9b7eaeadd7524d254a78"; }; arcanist = fetchgit { url = "git://github.com/facebook/arcanist.git"; @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { name = "arcanist-${version}"; - version = "20140530"; + version = "20140606"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper ]; From 8c0b63162b203c7903b5e8d7a428d62dc09fa80a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 6 Jun 2014 23:09:47 -0500 Subject: [PATCH 229/254] compcert: 2.2 -> 2.3pl2 Signed-off-by: Austin Seipp --- pkgs/development/compilers/compcert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index c4af878ba760..f5e66b8ac10b 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "compcert-${version}"; - version = "2.2"; + version = "2.3pl2"; src = fetchurl { url = "http://compcert.inria.fr/release/${name}.tgz"; - sha256 = "0zhqx9mixlsycckl6wq6yrd795byj1jz7m4njcgfv29cx33j1nrk"; + sha256 = "1cq4my646ll1mszs5mbzwk4vp8l8qnsc96fpcv2pl35aw5i6jqm8"; }; buildInputs = [ coq ocaml ]; From 80f3e943b1a94461e1abbcf9bad4766aedbb95a5 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 6 Jun 2014 23:14:54 -0500 Subject: [PATCH 230/254] dd-agent: 4.2.1 -> 4.3.1 Signed-off-by: Austin Seipp --- pkgs/tools/networking/dd-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 1674d01af8fc..8ff45e733fb9 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -2,14 +2,14 @@ , makeWrapper }: stdenv.mkDerivation rec { - version = "4.2.1"; + version = "4.3.1"; name = "dd-agent-${version}"; src = fetchFromGitHub { owner = "DataDog"; repo = "dd-agent"; rev = version; - sha256 = "06f9nkvnpfzs2nw75cac2y9wnp2bay4sg94zz0wjm8886rigjjjm"; + sha256 = "0z6b1s30fyd9ldahizrjwcxx7c7dd74xsqy19j3qykrb25j9cvmn"; }; buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 ]; From 36e6eda5fc21e655b172a3c8a445930bafb64e73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jun 2014 12:28:54 +0200 Subject: [PATCH 231/254] r-modules: set meta.hydraPlatforms for all R packages --- pkgs/development/r-modules/cran-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 52bde8019922..2c48adc558b7 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -49,6 +49,7 @@ let }; propagatedBuildInputs = depends; meta.homepage = "http://cran.r-project.org/web/packages/${name}/"; + meta.hydraPlatforms = R.meta.hydraPlatforms; }; in From 4dd5496bd427f29cffc295ad00ba47476cba303c Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 7 Jun 2014 07:11:50 -0500 Subject: [PATCH 232/254] arcanist: build xhpast for 'arc liberate' Signed-off-by: Austin Seipp --- pkgs/development/tools/misc/arcanist/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 9cc8e7c7f6bd..02fe572edabd 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, php, makeWrapper }: +{ stdenv, fetchgit, php, flex, makeWrapper }: let libphutil = fetchgit { @@ -17,17 +17,23 @@ stdenv.mkDerivation rec { version = "20140606"; src = [ arcanist libphutil ]; - buildInputs = [ php makeWrapper ]; + buildInputs = [ php makeWrapper flex ]; unpackPhase = "true"; - buildPhase = "true"; + buildPhase = '' + ORIG=`pwd` + chmod +w -R ${libphutil} + cd ${libphutil}/support/xhpast + ls + make clean all install + cd $ORIG + ''; installPhase = '' mkdir -p $out/bin $out/libexec cp -R ${libphutil} $out/libexec/libphutil cp -R ${arcanist} $out/libexec/arcanist ln -s $out/libexec/arcanist/bin/arc $out/bin - wrapProgram $out/bin/arc \ --prefix PATH : "${php}/bin" ''; From 91b2021782a0b956163db9b051758a12d1d632ae Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 7 Jun 2014 14:51:50 +0200 Subject: [PATCH 233/254] feh: Set the default theme explicitly to 'feh' feh uses argv[0] to set the default theme, because feh is wrapped this will be .feh-wrapper. This makes it hard to use the configuration on multiple systems and can be confusion. Therefore the theme is explicity set to 'feh'. --- pkgs/applications/graphics/feh/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 47a528175490..b05946b4f824 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg}/bin" + wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg}/bin" \ + --add-flags '--theme=feh' ''; meta = { From b40ce8a1f1a2170a53772a26e77044f377fdc06a Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 7 Jun 2014 14:45:45 +0200 Subject: [PATCH 234/254] Update feh from 2.11 to 2.12. The relevant source code of giblib was imported into feh, therefore giblib is no longer a dependency. --- pkgs/applications/graphics/feh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index b05946b4f824..d23f42fdbf99 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,15 +1,15 @@ -{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng, giblib +{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng , libXinerama, curl }: stdenv.mkDerivation rec { - name = "feh-2.11"; + name = "feh-2.12"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1y41ixsp5nhvb29hhiyh8g1g28lc0kki619skgxcv5iisc93dk4x"; + sha256 = "0ckhidmsms2l5jycp0qf71jzmb3bpbhjq3bcgfpvfvszah7pmq30"; }; - buildInputs = [makeWrapper x11 imlib2 giblib libjpeg libpng libXinerama curl ]; + buildInputs = [makeWrapper x11 imlib2 libjpeg libpng libXinerama curl]; preBuild = '' makeFlags="PREFIX=$out" From 393923a8697e7ce7da0cd434a1025102fb9aa47c Mon Sep 17 00:00:00 2001 From: Jussi Maki Date: Fri, 30 May 2014 14:29:31 +0200 Subject: [PATCH 235/254] graphite-web: Fix webapp content path --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd63228ca5d0..bb8e426fc454 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8919,7 +8919,7 @@ rec { preConfigure = '' substituteInPlace webapp/graphite/thirdparty/pytz/__init__.py --replace '/usr/share/zoneinfo' '/etc/zoneinfo' - substituteInPlace webapp/graphite/settings.py --replace "join(WEBAPP_DIR, 'content')" "join(WEBAPP_DIR, 'webapp', 'content')" + substituteInPlace webapp/graphite/settings.py --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" cp webapp/graphite/manage.py bin/manage-graphite.py substituteInPlace bin/manage-graphite.py --replace 'settings' 'graphite.settings' ''; From 72cd8ce56c49086d350b2059de5392b4c8a7186e Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Fri, 6 Jun 2014 17:45:22 -0400 Subject: [PATCH 236/254] add MacVim --- pkgs/applications/editors/vim/macvim.nix | 92 ++++++++++++ pkgs/applications/editors/vim/macvim.patch | 159 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 253 insertions(+) create mode 100644 pkgs/applications/editors/vim/macvim.nix create mode 100644 pkgs/applications/editors/vim/macvim.patch diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix new file mode 100644 index 000000000000..25a8e5fe9fab --- /dev/null +++ b/pkgs/applications/editors/vim/macvim.nix @@ -0,0 +1,92 @@ +{ stdenv, stdenvAdapters, gccApple, fetchFromGitHub, ncurses, gettext, + pkgconfig, cscope, python, ruby, tcl, perl, luajit +}: + +let inherit (stdenvAdapters.overrideGCC stdenv gccApple) mkDerivation; +in mkDerivation rec { + name = "macvim-${version}"; + + version = "7.4-73"; + + src = fetchFromGitHub { + owner = "b4winckler"; + repo = "macvim"; + rev = "snapshot-73"; + sha256 = "0zv82y2wz8b482khkgbl08cnxq3pv5bm37c71wgfa0fzy3h12gcj"; + }; + + enableParallelBuilding = true; + + buildInputs = [ + gettext ncurses pkgconfig luajit ruby tcl perl python + ]; + + patches = [ ./macvim.patch ]; + + postPatch = '' + substituteInPlace src/MacVim/mvim --replace "# VIM_APP_DIR=/Applications" "VIM_APP_DIR=$out" + + # Don't create custom icons. + substituteInPlace src/MacVim/icons/Makefile --replace '$(MAKE) -C makeicns' "" + substituteInPlace src/MacVim/icons/make_icons.py --replace "dont_create = False" "dont_create = True" + + # Full path to xcodebuild + substituteInPlace src/Makefile --replace "xcodebuild" "/usr/bin/xcodebuild" + ''; + + configureFlags = [ + #"--enable-cscope" # TODO: cscope doesn't build on Darwin yet + "--enable-fail-if-missing" + "--with-features=huge" + "--enable-gui=macvim" + "--enable-multibyte" + "--enable-nls" + "--enable-luainterp=dynamic" + "--enable-pythoninterp=dynamic" + "--enable-perlinterp=dynamic" + "--enable-rubyinterp=dynamic" + "--enable-tclinterp=yes" + "--with-luajit" + "--with-lua-prefix=${luajit}" + "--with-ruby-command=${ruby}/bin/ruby" + "--with-tclsh=${tcl}/bin/tclsh" + "--with-tlib=ncurses" + "--with-compiledby=Nix" + ]; + + preConfigure = '' + DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer + configureFlagsArray+=( + "--with-developer-dir=$DEV_DIR" + ) + ''; + + postInstall = '' + cp -r src/MacVim/build/Release/MacVim.app $out + + rm $out/bin/{Vimdiff,Vimtutor,Vim,ex,rVim,rview,view} + + cp src/MacVim/mvim $out/bin + cp src/vimtutor $out/bin + + for prog in "vimdiff" "vi" "vim" "ex" "rvim" "rview" "view"; do + ln -s $out/bin/mvim $out/bin/$prog + done + + # Fix rpaths + exe="$out/MacVim.app/Contents/MacOS/Vim" + libperl=$(dirname $(find ${perl} -name "libperl.dylib")) + install_name_tool -add_rpath ${luajit}/lib $exe + install_name_tool -add_rpath ${tcl}/lib $exe + install_name_tool -add_rpath ${python}/lib $exe + install_name_tool -add_rpath $libperl $exe + install_name_tool -add_rpath ${ruby}/lib $exe + ''; + + meta = with stdenv.lib; { + description = "Vim - the text editor - for Mac OS X"; + homepage = https://github.com/b4winckler/macvim; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch new file mode 100644 index 000000000000..c721bbe149a3 --- /dev/null +++ b/pkgs/applications/editors/vim/macvim.patch @@ -0,0 +1,159 @@ +diff --git a/src/vimtutor b/src/vimtutor +index 70d9ec7..b565a1a 100755 +--- a/src/vimtutor ++++ b/src/vimtutor +@@ -16,7 +16,7 @@ seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" + if test "$1" = "-g"; then + # Try to use the GUI version of Vim if possible, it will fall back + # on Vim if Gvim is not installed. +- seq="gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" ++ seq="mvim gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" + shift + fi + + +diff --git a/src/auto/configure b/src/auto/configure +index bc9f074..9b9125e 100755 +--- a/src/auto/configure ++++ b/src/auto/configure +@@ -2252,7 +2252,7 @@ rm -f conftest.val + as_fn_set_status $ac_retval + + } # ac_fn_c_compute_int +-cat >auto/config.log <<_ACEOF ++cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +@@ -2262,7 +2262,7 @@ generated by GNU Autoconf 2.69. Invocation command line was + $ $0 $@ + + _ACEOF +-exec 5>>auto/config.log ++exec 5>>config.log + { + cat <<_ASUNAME + ## --------- ## +@@ -5377,10 +5377,7 @@ $as_echo "no" >&6; } + fi + + if test "X$vi_cv_path_mzscheme_pfx" != "X"; then +- if test "x$MACOSX" = "xyes"; then +- MZSCHEME_LIBS="-framework Racket" +- MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" +- elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then ++ if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then + MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a" + MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" + elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"; then +@@ -5716,23 +5713,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } + fi + + if test "x$MACOSX" = "xyes"; then +- dir=/System/Library/Perl +- darwindir=$dir/darwin +- if test -d $darwindir; then +- PERL=/usr/bin/perl +- else +- dir=/System/Library/Perl/5.8.1 +- darwindir=$dir/darwin-thread-multi-2level +- if test -d $darwindir; then +- PERL=/usr/bin/perl +- fi +- fi +- if test -n "$PERL"; then +- PERL_DIR="$dir" +- PERL_CFLAGS="-DFEAT_PERL -I$darwindir/CORE" +- PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a" +- PERL_LIBS="-L$darwindir/CORE -lperl" +- fi + PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` + PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` + fi +@@ -5926,10 +5906,6 @@ __: + eof + eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" + rm -f -- "${tmp_mkf}" +- if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \ +- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then +- vi_cv_path_python_plibs="-framework Python" +- else + if test "${vi_cv_var_python_version}" = "1.4"; then + vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" + else +@@ -5937,7 +5913,6 @@ eof + fi + vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" + vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` +- fi + + fi + +@@ -6004,13 +5979,6 @@ rm -f core conftest.err conftest.$ac_objext \ + $as_echo "no" >&6; } + fi + +- if test -n "$MACSDK"; then +- PYTHON_CFLAGS= +- PYTHON_LIBS=-framework Python +- PYTHON_CONFDIR= +- PYTHON_GETPATH_CFLAGS= +- fi +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 + $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } + cflags_save=$CFLAGS +@@ -6853,11 +6821,7 @@ $as_echo "$tclver - OK" >&6; }; + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 + $as_echo_n "checking for location of Tcl include... " >&6; } +- if test "x$MACOSX" != "xyes"; then + tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" +- else +- tclinc="/System/Library/Frameworks/Tcl.framework/Headers" +- fi + TCL_INC= + for try in $tclinc; do + if test -f "$try/tcl.h"; then +@@ -6875,12 +6839,8 @@ $as_echo "" >&6; } + if test -z "$SKIP_TCL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 + $as_echo_n "checking for location of tclConfig.sh script... " >&6; } +- if test "x$MACOSX" != "xyes"; then + tclcnf=`echo $tclinc | sed s/include/lib/g` + tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" +- else +- tclcnf="/System/Library/Frameworks/Tcl.framework" +- fi + for try in $tclcnf; do + if test -f $try/tclConfig.sh; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 +@@ -7050,10 +7010,6 @@ $as_echo "$rubyhdrdir" >&6; } + if test -f "$rubylibdir/$librubya"; then + librubyarg="$librubyarg" + RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" +- elif test -d "/System/Library/Frameworks/Ruby.framework"; then +- RUBY_LIBS="-framework Ruby" +- RUBY_CFLAGS="-DRUBY_VERSION=$rubyversion" +- librubyarg= + fi + + if test "X$librubyarg" != "X"; then +@@ -14061,7 +14017,7 @@ fi + + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-exec 5>>auto/config.log ++exec 5>>config.log + { + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +@@ -14653,7 +14609,7 @@ if test "$no_create" != yes; then + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false +- exec 5>>auto/config.log ++ exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ede5259f1ba4..ad3eefec8593 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9586,6 +9586,8 @@ let vim = callPackage ../applications/editors/vim { }; + macvim = callPackage ../applications/editors/vim/macvim.nix { }; + vimWrapper = wrapVim vim; vimHugeX = vim_configurable; From 0fcd4f98ffe100bd604cb3a2feba3b484c7b6352 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 12:15:54 +0000 Subject: [PATCH 237/254] haskell-fuzzcheck: new expression --- .../libraries/haskell/fuzzcheck/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/fuzzcheck/default.nix diff --git a/pkgs/development/libraries/haskell/fuzzcheck/default.nix b/pkgs/development/libraries/haskell/fuzzcheck/default.nix new file mode 100644 index 000000000000..a1da7f8ebbf0 --- /dev/null +++ b/pkgs/development/libraries/haskell/fuzzcheck/default.nix @@ -0,0 +1,19 @@ +{ cabal, hspec, hspecExpectations, HUnit, liftedBase, monadControl +, QuickCheck, random, transformers +}: + +cabal.mkDerivation (self: { + pname = "fuzzcheck"; + version = "0.1.1"; + sha256 = "0qfr4f0b50l368b45yzwhqd4g2y1kvfrfj4hr84cdxcwdrwn9mpc"; + buildDepends = [ + liftedBase monadControl QuickCheck random transformers + ]; + testDepends = [ hspec hspecExpectations HUnit QuickCheck ]; + meta = { + homepage = "https://github.com/fpco/fuzzcheck"; + description = "A simple checker for stress testing monadic code"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b10da90afcef..a6688f3ee919 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -800,6 +800,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in freetype2 = callPackage ../development/libraries/haskell/freetype2 {}; + fuzzcheck = callPackage ../development/libraries/haskell/fuzzcheck {}; + gamma = callPackage ../development/libraries/haskell/gamma {}; geniplate = callPackage ../development/libraries/haskell/geniplate {}; From 10d1fd04576b212814eb66fb94689aaad0bc9dd4 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 12:16:20 +0000 Subject: [PATCH 238/254] crafty: simplify expression --- pkgs/games/crafty/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index 65cdd14539bd..e0eb49b53cb8 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, unzip, fullVariant }: +{ stdenv, fetchurl, unzip, fullVariant ? false }: stdenv.mkDerivation rec { - name = "crafty-23.4"; + name = "crafty-${version}"; + version = "23.4"; src = fetchurl { - url = http://www.craftychess.com/crafty-23.4.zip; + url = "http://www.craftychess.com/crafty-${version}.zip"; sha256 = "0rhf4pfxcwj8hqd7bqj98fpdd80v6ss1jnc9kgwx2fw4ksdi37pl"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5285ccf73e5..e785945815dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9952,7 +9952,7 @@ let crack_attack = callPackage ../games/crack-attack { }; - crafty = callPackage ../games/crafty { fullVariant = false; }; + crafty = callPackage ../games/crafty { }; craftyFull = appendToName "full" (crafty.override { fullVariant = true; }); crrcsim = callPackage ../games/crrcsim {}; From b896b498272694bef766ce6d4ec30295f680cb81 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 12:16:31 +0000 Subject: [PATCH 239/254] libdrm: allow to build on any unix --- pkgs/development/libraries/libdrm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index c895f141850f..69d09fe9fae4 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Library for accessing the kernel's Direct Rendering Manager"; license = "bsd"; maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From e5e9171578e15d76bff4c1fb29d931633b79e85a Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 12:16:41 +0000 Subject: [PATCH 240/254] hoogle-local: minor changes for consistency --- pkgs/development/libraries/haskell/hoogle/local.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix index 337cd4c8154a..9f56d028c590 100644 --- a/pkgs/development/libraries/haskell/hoogle/local.nix +++ b/pkgs/development/libraries/haskell/hoogle/local.nix @@ -38,13 +38,13 @@ cabal.mkDerivation (self: rec { sha256 = "1rhr7xh4x9fgflcszbsl176r8jq6rm81bwzmbz73f3pa1zf1v0zc"; isLibrary = true; isExecutable = true; - buildInputs = [ self.ghc Cabal parallel perl wget rehoo ] - ++ self.extraBuildInputs ++ packages; + buildInputs = [self.ghc Cabal] ++ self.extraBuildInputs + ++ [ parallel perl wget rehoo ] ++ packages; buildDepends = [ aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random resourcet safe shake tagsoup text time transformers uniplate vector - vectorAlgorithms wai warp parallel perl wget rehoo + vectorAlgorithms wai warp ]; testDepends = [ filepath ]; testTarget = "--test-option=--no-net"; @@ -112,6 +112,6 @@ cabal.mkDerivation (self: rec { description = "Haskell API Search"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = [ self.stdenv.lib.maintainers.jwiegley ]; }; }) From c06613a3af177777b68dfebe74cd019b48e4dcb8 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 20:18:27 +0000 Subject: [PATCH 241/254] macvim: move the .app bundle to $out/Applications --- pkgs/applications/editors/vim/macvim.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 25a8e5fe9fab..52567d5d31b7 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -24,7 +24,7 @@ in mkDerivation rec { patches = [ ./macvim.patch ]; postPatch = '' - substituteInPlace src/MacVim/mvim --replace "# VIM_APP_DIR=/Applications" "VIM_APP_DIR=$out" + substituteInPlace src/MacVim/mvim --replace "# VIM_APP_DIR=/Applications" "VIM_APP_DIR=$out/Applications" # Don't create custom icons. substituteInPlace src/MacVim/icons/Makefile --replace '$(MAKE) -C makeicns' "" @@ -62,7 +62,7 @@ in mkDerivation rec { ''; postInstall = '' - cp -r src/MacVim/build/Release/MacVim.app $out + cp -r src/MacVim/build/Release/MacVim.app $out/Applications rm $out/bin/{Vimdiff,Vimtutor,Vim,ex,rVim,rview,view} @@ -74,7 +74,7 @@ in mkDerivation rec { done # Fix rpaths - exe="$out/MacVim.app/Contents/MacOS/Vim" + exe="$out/Applications/MacVim.app/Contents/MacOS/Vim" libperl=$(dirname $(find ${perl} -name "libperl.dylib")) install_name_tool -add_rpath ${luajit}/lib $exe install_name_tool -add_rpath ${tcl}/lib $exe From 6a3a9589e2fa15a4a3064a7cd923f6c1cb5e7cd3 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 20:22:58 +0000 Subject: [PATCH 242/254] macvim: add missing call to ensureDir --- pkgs/applications/editors/vim/macvim.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 52567d5d31b7..e48cb2590f9c 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -62,6 +62,7 @@ in mkDerivation rec { ''; postInstall = '' + ensureDir $out/Applications cp -r src/MacVim/build/Release/MacVim.app $out/Applications rm $out/bin/{Vimdiff,Vimtutor,Vim,ex,rVim,rview,view} From 6c3cc8bb9553f92697957da644908bd73fe556c8 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 7 Jun 2014 22:28:56 +0200 Subject: [PATCH 243/254] PPSSPP: add platforms --- pkgs/misc/emulators/ppsspp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index db5e42e37eac..975de0f52701 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -29,5 +29,6 @@ in stdenv.mkDerivation { description = "A PSP emulator, the Qt4 version."; license = licenses.gpl2Plus; maintainers = [ maintainers.fuuzetsu ]; + platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin; }; } \ No newline at end of file From 34495b67ce252fd4b6d0a2584cba832242c2c0e9 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 7 Jun 2014 16:38:41 -0500 Subject: [PATCH 244/254] haskell-data-checked: new expression --- .../libraries/haskell/data-checked/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/data-checked/default.nix diff --git a/pkgs/development/libraries/haskell/data-checked/default.nix b/pkgs/development/libraries/haskell/data-checked/default.nix new file mode 100644 index 000000000000..429f9da92bf3 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-checked/default.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "data-checked"; + version = "0.3"; + sha256 = "0xjn7iqlsgi51h8gz4x40kc2qb5lwf6nw5kjwgkck1w5gjfd11yw"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://github.com/mvv/data-checked"; + description = "Type-indexed runtime-checked properties"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a6688f3ee919..fd35dfb215f6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -564,6 +564,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in dateCache = callPackage ../development/libraries/haskell/date-cache {}; + dataChecked = callPackage ../development/libraries/haskell/data-checked {}; + datetime = callPackage ../development/libraries/haskell/datetime {}; DAV = callPackage ../development/libraries/haskell/DAV {}; From 476a3d818fba2d50c169af5ab4775be2b7e64c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 7 Jun 2014 23:40:58 +0200 Subject: [PATCH 245/254] nixos/graphite-service: fix filename typo It's "aggregation" with two 'g's. Fixes this: carbon-cache[9363]: [console] /nix/store/drxq4jj92sjk3cjik2l4hnsndbray3i4-graphite-config/storage-aggregation.conf not found, ignoring. --- nixos/modules/services/monitoring/graphite.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index d543d15b34e1..3a5b13d6d40b 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -12,7 +12,7 @@ let name = "graphite-config"; paths = lists.filter (el: el != null) [ (writeTextOrNull "carbon.conf" cfg.carbon.config) - (writeTextOrNull "storage-agregation.conf" cfg.carbon.storageAggregation) + (writeTextOrNull "storage-aggregation.conf" cfg.carbon.storageAggregation) (writeTextOrNull "storage-schemas.conf" cfg.carbon.storageSchemas) (writeTextOrNull "blacklist.conf" cfg.carbon.blacklist) (writeTextOrNull "whitelist.conf" cfg.carbon.whitelist) From c6261157f812eff0cdecc7cba3ee29be9224c4eb Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 8 Jun 2014 05:35:26 +0000 Subject: [PATCH 246/254] prooftree: new expression 0.12 --- .../science/logic/prooftree/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/science/logic/prooftree/default.nix diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix new file mode 100644 index 000000000000..caaf4a94a1ed --- /dev/null +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: + +stdenv.mkDerivation (rec { + name = "prooftree-${version}"; + version = "0.12"; + + src = fetchurl { + url = "http://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz"; + sha256 = "08yp66j05pdkdpv9xkfqymqy82mir5xbwfh9mkzhh219xkps4b4m"; + }; + + buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; + + dontAddPrefix = true; + configureFlags = [ "--prefix" "$(out)" ]; + + meta = { + description = "Prooftree is a program for proof-tree visualization"; + longDescription = '' + Prooftree is a program for proof-tree visualization during interactive + proof development in a theorem prover. It is currently being developed + for Coq and Proof General. Prooftree helps against getting lost between + different subgoals in interactive proof development. It clearly shows + where the current subgoal comes from and thus helps in developing the + right plan for solving it. + + Prooftree uses different colors for the already proven subgoals, the + current branch in the proof and the still open subgoals. Sequent texts + are not displayed in the proof tree itself, but they are shown as a + tool-tip when the mouse rests over a sequent symbol. Long proof commands + are abbreviated in the tree display, but show up in full length as + tool-tip. Both, sequents and proof commands, can be shown in the display + below the tree (on single click) or in a separate window (on double or + shift-click). + ''; + homepage = http://askra.de/software/prooftree; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.jwiegley ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e785945815dc..311ee6ec5fa7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10617,6 +10617,11 @@ let picosat = callPackage ../applications/science/logic/picosat {}; + prooftree = callPackage ../applications/science/logic/prooftree { + inherit (ocamlPackages) findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; + }; + prover9 = callPackage ../applications/science/logic/prover9 { }; satallax = callPackage ../applications/science/logic/satallax {}; From d91eacd7200214de1349a1738fabe18bd0289c8d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 7 Jun 2014 19:10:31 -0500 Subject: [PATCH 247/254] kernel: 3.14.5 -> 3.14.6 (close #2868) --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 465a04837ecc..8675c529bde7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.5"; + version = "3.14.6"; extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0x38fyj86hrw7ns14m4kdpscqlj7ig889mxzvwsbhrsk0khllvyn"; + sha256 = "1wk3zdka9n49ixl2s7djavbk0b2nd0772gbmiaxi9mljah9inlhw"; }; features.iwlwifi = true; From 25351ddf709ff7f7be73d8cf4aa32d2ba9ff8d9c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 8 Jun 2014 12:20:47 +0400 Subject: [PATCH 248/254] Use the libav version compatible with our gstreamer version --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 311ee6ec5fa7..3e9a517d89b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4635,7 +4635,9 @@ let gperftools = callPackage ../development/libraries/gperftools { }; - gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { }); + gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { + callPackage = pkgs.newScope (pkgs // { libav = pkgs.libav_9; }); + }); gst_all = { inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer; From e18b59540cd68d03f9e4d2d976f4ccb7e76778fd Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 8 Jun 2014 04:18:25 -0500 Subject: [PATCH 249/254] haskell-bytes: new expression --- .../libraries/haskell/bytes/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/bytes/default.nix diff --git a/pkgs/development/libraries/haskell/bytes/default.nix b/pkgs/development/libraries/haskell/bytes/default.nix new file mode 100644 index 000000000000..cb647f2cb162 --- /dev/null +++ b/pkgs/development/libraries/haskell/bytes/default.nix @@ -0,0 +1,19 @@ +{ cabal, binary, cereal, doctest, filepath, mtl, text, time +, transformers, transformersCompat, void +}: + +cabal.mkDerivation (self: { + pname = "bytes"; + version = "0.14.0.2"; + sha256 = "1bdradf5lq1kgiri64zd8cvcw2fxwbwv0apznl8vxyqlx406v3rn"; + buildDepends = [ + binary cereal mtl text time transformers transformersCompat void + ]; + testDepends = [ doctest filepath ]; + meta = { + homepage = "http://github.com/analytics/bytes"; + description = "Sharing code for serialization between binary and cereal"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fd35dfb215f6..db364b9a58d8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -301,6 +301,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in byteorder = callPackage ../development/libraries/haskell/byteorder {}; + bytes = callPackage ../development/libraries/haskell/bytes {}; + bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {}; bytestringLexing = callPackage ../development/libraries/haskell/bytestring-lexing {}; From edd472983853eecda67e0b59cddd0b5a8737feb9 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 8 Jun 2014 04:28:11 -0500 Subject: [PATCH 250/254] crafty: specify the support platforms --- pkgs/games/crafty/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index e0eb49b53cb8..54deae2ecfe1 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -661,6 +661,7 @@ stdenv.mkDerivation rec { homepage = http://www.craftychess.com/; description = "Crafty is a free, open-source computer chess program developed by Dr. Robert M. Hyatt"; license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.jwiegley ]; }; } From 0195628118064039030b38c948b51b3a59e5ac3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 8 Jun 2014 15:59:35 +0200 Subject: [PATCH 251/254] nixos/statsd-service: fix 'graphitePort' default value graphitePort must point to the port that carbon-cache listens on, not the graphite webUI port. With this change I finally got data from statsd to graphite. --- nixos/modules/services/monitoring/statsd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index 05950639c1e0..74f3deb4c290 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -69,8 +69,8 @@ in }; graphitePort = mkOption { - description = "Port of Graphite server"; - default = config.services.graphite.web.port; + description = "Port of Graphite server (i.e. carbon-cache)."; + default = 2003; type = types.uniq types.int; }; From 7a88839b90463f30f5f9dbf0c32067cd04a9992b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 8 Jun 2014 19:39:34 +0200 Subject: [PATCH 252/254] spring: fix runtime dependency on udev --- pkgs/games/spring/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index f9d380d9cd52..539be06bf7fa 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip , openal, libvorbis, glew, freetype, xlibs, SDL, mesa, binutils , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper -, jdk ? null, python ? null +, jdk ? null, python ? null, systemd , withAI ? true # support for AI Interfaces and Skirmish AIs }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper - docbook_xsl_ns ] + docbook_xsl_ns systemd ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/spring" \ - --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib" + --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib::${systemd}/lib" ''; meta = with stdenv.lib; { From e26b5600e2dae3a8a3197d4e45339b2e619f677c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 8 Jun 2014 19:39:46 +0200 Subject: [PATCH 253/254] springlobby: 0.186 -> 0.195 --- pkgs/games/spring/springlobby.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index b5c8ef0154c2..35fdbc0a19e2 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "springlobby-${version}"; - version = "0.186"; + version = "0.195"; src = fetchurl { url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2"; - sha256 = "0pj7v85gl76hxvfhcypxsayk8lnnhgjn2irawgx49p80wsivl64k"; + sha256 = "0hxxm97c74rvm78vlfn2byn0zjlrhankxdrs2hz73rdq6451h10b"; }; buildInputs = [ From e1a0d45d0046cc01388b98ab88cfe39b2f38fb88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 8 Jun 2014 19:55:38 +0200 Subject: [PATCH 254/254] openra: runtime dependency on systemd --- pkgs/games/openra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index ec9d4ad39802..638d494131f2 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, mono, makeWrapper -, SDL2, freetype, openal +, SDL2, freetype, openal, systemd }: let @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { ''; postInstall = with stdenv.lib; let - runtime = makeLibraryPath [ SDL2 freetype openal ]; + runtime = makeLibraryPath [ SDL2 freetype openal systemd ]; in '' wrapProgram $out/bin/openra \ --prefix PATH : "${mono}/bin" \