diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 37a9f4d0d31..17aa2942595 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -12,8 +12,7 @@ with lib; default = false; type = types.bool; description = '' - Turn on this option if you want to enable all the firmware shipped with Debian/Ubuntu - and iwlwifi. + Turn on this option if you want to enable all the firmware shipped in linux-firmware. ''; }; @@ -26,7 +25,6 @@ with lib; hardware.firmware = [ "${pkgs.firmwareLinuxNonfree}/lib/firmware" "${pkgs.iwlegacy}/lib/firmware" - "${pkgs.iwlwifi}/lib/firmware" ]; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 292feb94882..0fad59d5571 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -55,6 +55,7 @@ ./programs/atop.nix ./programs/bash/bash.nix ./programs/blcr.nix + ./programs/cdemu.nix ./programs/command-not-found/command-not-found.nix ./programs/dconf.nix ./programs/environment.nix @@ -173,6 +174,7 @@ ./services/mail/spamassassin.nix ./services/misc/apache-kafka.nix #./services/misc/autofs.nix + ./services/misc/canto-daemon.nix ./services/misc/cpuminer-cryptonight.nix ./services/misc/cgminer.nix ./services/misc/dictd.nix @@ -287,6 +289,7 @@ ./services/networking/searx.nix ./services/networking/seeks.nix ./services/networking/spiped.nix + ./services/networking/sslh.nix ./services/networking/ssh/lshd.nix ./services/networking/ssh/sshd.nix ./services/networking/strongswan.nix diff --git a/nixos/modules/programs/cdemu.nix b/nixos/modules/programs/cdemu.nix new file mode 100644 index 00000000000..d1b1915eea9 --- /dev/null +++ b/nixos/modules/programs/cdemu.nix @@ -0,0 +1,49 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.programs.cdemu; +in { + + options = { + programs.cdemu = { + enable = mkOption { + default = false; + description = "Whether to enable cdemu for users of appropriate group (default cdrom)"; + }; + group = mkOption { + default = "cdrom"; + description = "Required group for users of cdemu"; + }; + gui = mkOption { + default = true; + description = "Whether to install cdemu GUI (gCDEmu)"; + }; + image-analyzer = mkOption { + default = true; + description = "Whether to install image analyzer"; + }; + }; + }; + + config = mkIf cfg.enable { + + boot = { + extraModulePackages = [ pkgs.linuxPackages.vhba ]; + kernelModules = [ "vhba" ]; + }; + + services = { + udev.extraRules = '' + KERNEL=="vhba_ctl", MODE="0660", OWNER="root", GROUP="${cfg.group}" + ''; + dbus.packages = [ pkgs.cdemu-daemon ]; + }; + + environment.systemPackages = + [ pkgs.cdemu-daemon pkgs.cdemu-client ] + ++ optional cfg.gui pkgs.gcdemu + ++ optional cfg.image-analyzer pkgs.image-analyzer; + }; + +} diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index eab7993387d..b7905233759 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -100,6 +100,7 @@ in { script = "exec mpd --no-daemon ${mpdConf}"; serviceConfig = { User = "mpd"; + PermissionsStartOnly = true; }; }; diff --git a/nixos/modules/services/misc/canto-daemon.nix b/nixos/modules/services/misc/canto-daemon.nix new file mode 100644 index 00000000000..db51a263aab --- /dev/null +++ b/nixos/modules/services/misc/canto-daemon.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + +cfg = config.services.canto-daemon; + +in { + +##### interface + + options = { + + services.canto-daemon = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the canto RSS daemon."; + }; + }; + + }; + +##### implementation + + config = mkIf cfg.enable { + + systemd.user.services.canto-daemon = { + description = "Canto RSS Daemon"; + after = [ "network.target" ]; + wantedBy = [ "default.target" ]; + serviceConfig.ExecStart = "${pkgs.canto-daemon}/bin/canto-daemon"; + }; + }; + +} diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index b2d5854fbc0..3ae010e8107 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -122,6 +122,34 @@ in ''; }; + alerts = { + enable = mkEnableOption "Whether to enable consul-alerts"; + + listenAddr = mkOption { + description = "Api listening address."; + default = "localhost:9000"; + type = types.str; + }; + + consulAddr = mkOption { + description = "Consul api listening adddress"; + default = "localhost:8500"; + type = types.str; + }; + + watchChecks = mkOption { + description = "Whether to enable check watcher."; + default = true; + type = types.bool; + }; + + watchEvents = mkOption { + description = "Whether to enable event watcher."; + default = true; + type = types.bool; + }; + }; + }; }; @@ -204,5 +232,23 @@ in ''; }; + systemd.services.consul-alerts = mkIf (cfg.alerts.enable) { + wantedBy = [ "multi-user.target" ]; + after = [ "consul.service" ]; + + path = [ pkgs.consul ]; + + serviceConfig = { + ExecStart = '' + ${pkgs.consul-alerts}/bin/consul-alerts start \ + --alert-addr=${cfg.alerts.listenAddr} \ + --consul-addr=${cfg.alerts.consulAddr} \ + ${optionalString cfg.alerts.watchChecks "--watch-checks"} \ + ${optionalString cfg.alerts.watchEvents "--watch-events"} + ''; + User = if cfg.dropPrivileges then "consul" else null; + }; + }; + }; } diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix new file mode 100644 index 00000000000..e251571dca3 --- /dev/null +++ b/nixos/modules/services/networking/sslh.nix @@ -0,0 +1,89 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.sslh; + configFile = pkgs.writeText "sslh.conf" '' + verbose: ${if cfg.verbose then "true" else "false"}; + foreground: true; + inetd: false; + numeric: false; + transparent: false; + timeout: "${toString cfg.timeout}"; + user: "nobody"; + pidfile: "${cfg.pidfile}"; + + listen: + ( + { host: "${cfg.host}"; port: "${toString cfg.port}"; } + ); + + ${cfg.appendConfig} + ''; + defaultAppendConfig = '' + protocols: + ( + { name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; probe: "builtin"; }, + { name: "openvpn"; host: "localhost"; port: "1194"; probe: "builtin"; }, + { name: "xmpp"; host: "localhost"; port: "5222"; probe: "builtin"; }, + { name: "http"; host: "localhost"; port: "80"; probe: "builtin"; }, + { name: "ssl"; host: "localhost"; port: "443"; probe: "builtin"; }, + { name: "anyprot"; host: "localhost"; port: "443"; probe: "builtin"; } + ); + ''; +in +{ + options = { + services.sslh = { + enable = mkEnableOption "sslh"; + + verbose = mkOption { + type = types.bool; + default = false; + description = "Verbose logs."; + }; + + timeout = mkOption { + type = types.int; + default = 2; + description = "Timeout in seconds."; + }; + + pidfile = mkOption { + type = types.path; + default = "/run/sslh.pid"; + description = "PID file path for sslh daemon."; + }; + + host = mkOption { + type = types.str; + default = config.networking.hostName; + description = "Listening hostname."; + }; + + port = mkOption { + type = types.int; + default = 443; + description = "Listening port."; + }; + + appendConfig = mkOption { + type = types.str; + default = defaultAppendConfig; + description = "Verbatim configuration file."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.sslh = { + description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${pkgs.sslh}/bin/sslh -F ${configFile}"; + serviceConfig.KillMode = "process"; + serviceConfig.PIDFile = "${cfg.pidfile}"; + }; + }; +} diff --git a/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix new file mode 100644 index 00000000000..6f1f67970f6 --- /dev/null +++ b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix @@ -0,0 +1,196 @@ +{ config, lib, pkgs, serverInfo, php, ... }: + +with lib; + +let + + httpd = serverInfo.serverConfig.package; + + version24 = !versionOlder httpd.version "2.4"; + + allGranted = if version24 then '' + Require all granted + '' else '' + Order allow,deny + Allow from all + ''; + + limesurveyConfig = pkgs.writeText "config.php" '' + + ''; + + limesurveyRoot = "${pkgs.limesurvey}/share/limesurvey/"; + +in rec { + + extraConfig = '' + Alias ${config.urlPrefix}/tmp ${config.dataDir}/tmp + + + ${allGranted} + Options -Indexes +FollowSymlinks + + + Alias ${config.urlPrefix}/upload ${config.dataDir}/upload + + + ${allGranted} + Options -Indexes + + + ${if config.urlPrefix != "" then '' + Alias ${config.urlPrefix} ${limesurveyRoot} + '' else '' + RewriteEngine On + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d + ''} + + + DirectoryIndex index.php + + ''; + + globalEnvVars = [ + { name = "LIMESURVEY_CONFIG"; value = limesurveyConfig; } + ]; + + documentRoot = if config.urlPrefix == "" then limesurveyRoot else null; + + enablePHP = true; + + options = { + + id = mkOption { + default = "main"; + description = '' + A unique identifier necessary to keep multiple owncloud server + instances on the same machine apart. This is used to + disambiguate the administrative scripts, which get names like + mediawiki-$id-change-password. + ''; + }; + + urlPrefix = mkOption { + default = ""; + description = "Url prefix for site."; + type = types.str; + }; + + dbType = mkOption { + default = "pgsql"; + description = "Type of database for limesurvey, for now, only pgsql."; + type = types.enum ["pgsql"]; + }; + + dbName = mkOption { + default = "limesurvey"; + description = "Name of the database that holds the limesurvey data."; + type = types.str; + }; + + dbHost = mkOption { + default = "localhost"; + description = "Limesurvey database host."; + type = types.str; + }; + + dbPort = mkOption { + default = 5432; + description = "Limesurvey database port."; + type = types.int; + }; + + dbUser = mkOption { + default = "limesurvey"; + description = "Limesurvey database user."; + type = types.str; + }; + + dbPassword = mkOption { + example = "foobar"; + description = "Limesurvey database password."; + type = types.str; + }; + + adminUser = mkOption { + description = "Limesurvey admin username."; + default = "admin"; + type = types.str; + }; + + adminPassword = mkOption { + description = "Default limesurvey admin password."; + default = "admin"; + type = types.str; + }; + + adminEmail = mkOption { + description = "Limesurvey admin email."; + default = "admin@admin.com"; + type = types.str; + }; + + forceSSL = mkOption { + default = false; + description = "Force use of HTTPS connection."; + type = types.bool; + }; + + siteName = mkOption { + default = "LimeSurvey"; + description = "LimeSurvey name of the site."; + type = types.str; + }; + + defaultLang = mkOption { + default = "en"; + description = "LimeSurvey default language."; + type = types.str; + }; + + dataDir = mkOption { + default = "/var/lib/limesurvey"; + description = "LimeSurvey data directory."; + type = types.path; + }; + }; + + startupScript = pkgs.writeScript "limesurvey_startup.sh" '' + if [ ! -f ${config.dataDir}/.created ]; then + mkdir -p ${config.dataDir}/{tmp/runtime,tmp/assets,tmp/upload,upload} + chmod -R ug+rw ${config.dataDir} + chmod -R o-rwx ${config.dataDir} + chown -R wwwrun:wwwrun ${config.dataDir} + + ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true + ${pkgs.postgresql}/bin/createdb "${config.dbName}" -O "${config.dbUser}" || true + ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -U postgres -d postgres -c "alter user ${config.dbUser} with password '${config.dbPassword}';" || true + + ${pkgs.limesurvey}/bin/limesurvey-console install '${config.adminUser}' '${config.adminPassword}' '${config.adminUser}' '${config.adminEmail}' + + touch ${config.dataDir}/.created + fi + ''; +} diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index c4329cd7755..6398a15bfcc 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -114,6 +114,9 @@ in { # Let nautilus find extensions export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/ + # Find the mouse + export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons + # 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/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 080588df247..b3da0cda04a 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -55,6 +55,8 @@ in GDM_X_SERVER = "${cfg.xserverBin} ${cfg.xserverArgs}"; GDM_SESSIONS_DIR = "${cfg.session.desktops}"; XDG_CONFIG_DIRS = "${gnome3.gnome_settings_daemon}/etc/xdg"; + # Find the mouse + XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons"; }; execCmd = "exec ${gdm}/sbin/gdm"; }; diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 4f2a2309b60..7ec32fe83b5 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -7,19 +7,19 @@ let in { - imports = - [ ./compiz.nix - ./openbox.nix - ./metacity.nix - ./none.nix - ./twm.nix - ./wmii.nix - ./xmonad.nix - ./i3.nix - ./herbstluftwm.nix - ./bspwm.nix - ./stumpwm.nix - ]; + imports = [ + ./bspwm.nix + ./compiz.nix + ./herbstluftwm.nix + ./i3.nix + ./metacity.nix + ./openbox.nix + ./stumpwm.nix + ./twm.nix + ./windowmaker.nix + ./wmii.nix + ./xmonad.nix + ./none.nix ]; options = { @@ -61,4 +61,4 @@ in config = { services.xserver.displayManager.session = cfg.session; }; -} \ No newline at end of file +} diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 79b173a6ead..0cae9cb844c 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -193,8 +193,9 @@ in "ohci_hcd" "ohci_pci" "xhci_hcd" + "xhci_pci" "usbhid" - "hid_generic" + "hid_generic" "hid_lenovo" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat" # Unix domain sockets (needed by udev). diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 0b7d4de6d20..1e173f5ac7a 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -7,6 +7,8 @@ export LD_LIBRARY_PATH=@extraUtils@/lib export PATH=@extraUtils@/bin ln -s @extraUtils@/bin /bin +# Stop LVM complaining about fd3 +export LVM_SUPPRESS_FD_WARNINGS=true fail() { if [ -n "$panicOnFail" ]; then exit 1; fi @@ -34,7 +36,7 @@ EOF read reply if [ -n "$allowShell" -a "$reply" = f ]; then - exec setsid @shell@ -c "@shell@ < /dev/$console >/dev/$console 2>/dev/$console" + exec setsid @shell@ -c "exec @shell@ < /dev/$console >/dev/$console 2>/dev/$console" elif [ -n "$allowShell" -a "$reply" = i ]; then echo "Starting interactive shell..." setsid @shell@ -c "@shell@ < /dev/$console >/dev/$console 2>/dev/$console" || fail @@ -347,7 +349,8 @@ while read -u 3 mountPoint; do # that we don't properly recognise. if test -z "$pseudoDevice" -a ! -e $device; then echo -n "waiting for device $device to appear..." - for try in $(seq 1 20); do + try=20 + while [ $try -gt 0 ]; do sleep 1 # also re-try lvm activation now that new block devices might have appeared lvm vgchange -ay @@ -355,8 +358,12 @@ while read -u 3 mountPoint; do udevadm trigger --action=add if test -e $device; then break; fi echo -n "." + try=$((try - 1)) done echo + if [ $try -eq 0 ]; then + echo "Timed out waiting for device $device, trying to mount anyway." + fi fi # Wait once more for the udev queue to empty, just in case it's diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 1ac89c4c255..93782ffa4d5 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -55,7 +55,8 @@ in boot.zfs = { useGit = mkOption { type = types.bool; - default = false; + # TODO(wkennington): Revert when 0.6.4 is out + default = versionAtLeast config.boot.kernelPackages.kernel.version "3.19"; example = true; description = '' Use the git version of the SPL and ZFS packages. diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index f2f68a11a28..2381132bb45 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -52,7 +52,6 @@ in rec { (all nixos.tests.firefox) (all nixos.tests.firewall) (all nixos.tests.gnome3) - (all nixos.tests.installer.grub1) (all nixos.tests.installer.lvm) (all nixos.tests.installer.separateBoot) (all nixos.tests.installer.simple) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index af9e6365a9f..03841e51e14 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -26,6 +26,7 @@ let pkgs.docbook5_xsl pkgs.grub pkgs.perlPackages.XMLLibXML + pkgs.perlPackages.ListCompare pkgs.unionfs-fuse pkgs.gummiboot ]; diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index 3f4a197ebcc..d737038380d 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -17,7 +17,7 @@ import ./make-test.nix { users.extraUsers.jenkins.extraGroups = [ "users" ]; - systemd.services.jenkins.serviceConfig.TimeoutStartSec = "3min"; + systemd.services.jenkins.serviceConfig.TimeoutStartSec = "6min"; }; slave = diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 210b2e0813b..3d0114352a1 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -3,14 +3,14 @@ , pyqt4, mutagen, python-libdiscid }: -let version = "1.3"; in +let version = "1.3.2"; in buildPythonPackage { name = "picard-${version}"; namePrefix = ""; src = fetchurl { - url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz"; - sha256 = "06s90w1j29qhd931dgj752k5v4pjbvxiz6g0613xzj3ms8zsrlys"; + url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz"; + sha256 = "0821xb7gyg0rhch8s3qkzmak90wjpcxkv9a364yv6bmqc12j6a77"; }; buildInputs = [ diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 71b2ccb6fb8..25538df0384 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,17 +1,17 @@ -{stdenv, fetchurl, intltool, pkgconfig , gtk, libxml2 +{ stdenv, fetchurl, intltool, pkgconfig , gtk, libxml2 , enchant, gucharmap, python }: stdenv.mkDerivation rec { - name = "bluefish-2.2.6"; + name = "bluefish-2.2.7"; src = fetchurl { url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; - sha256 = "05j2mv6s2llf2pxknddhk8fzbghr7yff58xhkxy2icky64n8khjl"; + sha256 = "1psqx3ljz13ylqs4zkaxv9lv1hgzld6904kdp0alwx99p5rlnlr3"; }; - buildInputs = [intltool pkgconfig gtk libxml2 - enchant gucharmap python]; + buildInputs = [ intltool pkgconfig gtk libxml2 + enchant gucharmap python ]; meta = with stdenv.lib; { description = "A powerful editor targeted towards programmers and webdevelopers"; diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 59dfd2d891e..3a5cf4edc6f 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libjpeg, libtiff, librsvg, libintlOrEmpty }: stdenv.mkDerivation rec { - name = "djvulibre-3.5.25.3"; + name = "djvulibre-3.5.27"; src = fetchurl { url = "mirror://sourceforge/djvu/${name}.tar.gz"; - sha256 = "1q5i5ha4zmj2ahjfhi8cv1rah80vm43m9ads46ji38rgvpb7x3c9"; + sha256 = "0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6"; }; buildInputs = [ libjpeg libtiff librsvg ] ++ libintlOrEmpty; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index b3cca2c7cb5..27830b9baee 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.1.2"; + version = "2.1.3"; name = "lyx-${version}"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${name}.tar.xz"; - sha256 = "19dvn681fz5i6zr7b1vx05sxhbsl73lb18axdcmcr58y6hi3hy68"; + sha256 = "10jnqz7ilxppv60h0hpkq7wgc3fbcm3z19xhnqz9hwp3brz2xm9g"; }; configureFlags = [ diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index 151b8a077d5..3febcfb17fb 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -1,15 +1,24 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtk, vte, pixman, gettext, perl }: +{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte }: + stdenv.mkDerivation rec { name = "sakura-${version}"; - version = "2.4.2"; + version = "3.2.0"; + src = fetchurl { url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "1mpsjsk7dgz56h7yagd9aq0d92vj59yrz4ri6za3mfmglhn29rn5"; + sha256 = "1pfvc35kckrzik5wx8ywhkhclr52rfp2syg46ix2nsdm72q6dl90"; }; - buildInputs = [ cmake pkgconfig gtk vte pixman gettext perl ]; - meta = { - homepage = "http://www.pleyades.net/david/sakura.php"; + + nativeBuildInputs = [ cmake perl pkgconfig ]; + + buildInputs = [ gtk3 vte ]; + + meta = with stdenv.lib; { description = "A terminal emulator based on GTK and VTE"; + homepage = http://www.pleyades.net/david/projects/sakura; + license = licenses.gpl2; + maintainers = with maintainers; [ astsmtl codyopel ]; + platforms = platforms.linux; longDescription = '' sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator with few dependencies, so you don't need a full GNOME desktop @@ -20,8 +29,5 @@ stdenv.mkDerivation rec { terminals in one window and adds a contextual menu with some basic options. No more no less. ''; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 35bba7ee28c..fa8b11adbf8 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "taskwarrior-${version}"; - version = "2.3.0"; + version = "2.4.0"; enableParallelBuilding = true; src = fetchurl { url = "http://www.taskwarrior.org/download/task-${version}.tar.gz"; - sha256 = "0wxcfq0n96vmcbwrlk2x377k8cc5k4i64ca6p02y74g6168ji6ib"; + sha256 = "17hiv7zld06zb5xmyp96bw9xl6vp178fhffs660fxxpxn3srb9bg"; }; nativeBuildInputs = [ cmake libuuid gnutls ]; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 1f83f427156..b30b2e260e3 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { name = "vimb-${version}"; - version = "2.8"; + version = "2.9"; src = fetchurl { url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz"; - sha256 = "04ify6gqpkislsppaplvdfgs3fja9gl37j3dywg7bhz1fbkv166k"; + sha256 = "0h9m5qfs09lb0dz8a79yccmm3a5rv6z8gi5pkyfh8fqkgkh2940p"; }; # Nixos default ca bundle patchPhase = '' - sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/setting.c + sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/config.def.h ''; buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ]; diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix new file mode 100644 index 00000000000..ae4746a3f1e --- /dev/null +++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }: + +python34Packages.buildPythonPackage rec { + version = "0.9.1"; + name = "canto-curses-${version}"; + + src = fetchFromGitHub { + owner = "themoken"; + repo = "canto-curses"; + rev = "v${version}"; + sha256 = "1vb5g0vdkp233r09qv0g4rgz7nprr2a625lf6nf6a51wpimdwgdy"; + }; + + buildInputs = [ readline ncurses canto-daemon ]; + propagatedBuildInputs = [ canto-daemon ]; + + meta = { + description = "An ncurses-based console Atom/RSS feed reader"; + longDescription = '' + Canto is an Atom/RSS feed reader for the console that is meant to be + quick, concise, and colorful. It's meant to allow you to crank through + feeds like you've never cranked before by providing a minimal, yet + information packed interface. No navigating menus. No dense blocks of + unreadable white text. An interface with almost infinite customization + and extensibility using the excellent Python programming language. + ''; + homepage = http://codezen.org/canto-ng/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix new file mode 100644 index 00000000000..bf564dd4327 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, python34Packages, }: + +python34Packages.buildPythonPackage rec { + version = "0.9.1"; + name = "canto-daemon-${version}"; + namePrefix = ""; + + src = fetchFromGitHub { + owner = "themoken"; + repo = "canto-next"; + rev = "v${version}"; + sha256 = "14lh6x0yz2asspwdi1ims01589r79q0dv77vq61gfjk5wiwfbdwa"; + }; + + propagatedBuildInputs = with python34Packages; [ feedparser ]; + + meta = { + description = "Daemon for the canto Atom/RSS feed reader"; + longDescription = '' + Canto is an Atom/RSS feed reader for the console that is meant to be + quick, concise, and colorful. It's meant to allow you to crank through + feeds like you've never cranked before by providing a minimal, yet + information packed interface. No navigating menus. No dense blocks of + unreadable white text. An interface with almost infinite customization + and extensibility using the excellent Python programming language. + ''; + homepage = http://codezen.org/canto-ng/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 1fb7ad8b955..4635814e11c 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchgit, libtoxcore +{ stdenv, fetchurl, libtoxcore , conf ? null }: with stdenv.lib; stdenv.mkDerivation rec { - name = "ratox-dev-20150107"; + name = "ratox-0.2.1"; - src = fetchgit { - url = "git://git.2f30.org/ratox"; - rev = "8be76e4cc829d86b8e1cae43a0d932600d6ff9fb"; - sha256 = "7fe492de3e69a08f9c1bb59a319d0e410905f06514abe99b4d4fe5c899650448"; + src = fetchurl { + url = "nix-prefetch-url http://git.2f30.org/ratox/snapshot/${name}.tar.gz"; + sha256 = "1fm9b3clvnc2nf0pd1z8g08kfszwhk1ij1lyx57wl8vd51z4xsi5"; }; buildInputs = [ libtoxcore ]; diff --git a/pkgs/applications/networking/notbit/default.nix b/pkgs/applications/networking/notbit/default.nix index 8a7d7d3aedc..aa5d47730a4 100644 --- a/pkgs/applications/networking/notbit/default.nix +++ b/pkgs/applications/networking/notbit/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, autoconf, automake, pkgconfig, openssl }: stdenv.mkDerivation rec { - name = "notbit-git-faf0930"; + name = "notbit-git-6f1ca59"; src = fetchgit { url = "git://github.com/bpeel/notbit"; - rev = "faf09304bf723e75f3d98cca93cf45236ee9d6b6"; - sha256 = "b229f87c4c5e901bfd8b13dffe31157126d98ed02118fff6553e8b58eb9ed030"; + rev = "6f1ca5987c7f217c9c3dd27adf6ac995004c29a1"; + sha256 = "0h9nzm248pw9wrdsfkr580ghiqvh6mk6vx7r2r752awrc13wvgis"; }; buildInputs = [ autoconf automake pkgconfig openssl ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index ef4c1a58230..b31a6528c24 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.10.21"; + version = "0.10.22"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "60cd8607cf7d2837252680f6c2879aba1f35a2c74a47c2f2ea874d6eed2adaa5"; + sha256 = "d96eff0dac5d542388d643f4b9e29ade6f7c52a570a00a48e7b5f81882d719dc"; }; subPackages = [ "cmd/syncthing" ]; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 06cc268c159..e82ce2d7b9e 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser -, goffice, makeWrapper, gtk3, gnome_icon_theme +, goffice, makeWrapper, gtk3, gnome_icon_theme, gnome3 }: stdenv.mkDerivation rec { @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { preFixup = '' for f in "$out"/bin/gnumeric-*; do wrapProgram $f \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" done rm $out/share/icons/hicolor/icon-theme.cache ''; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 24b144413df..8cc7e9b3253 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -2,7 +2,7 @@ , xpdf, pil, pyopengl, pygame , setuptools, mesa, freeglut }: -let version = "0.10.3"; +let version = "0.10.5"; in stdenv.mkDerivation { # This project was formerly known as KeyJNote. @@ -12,7 +12,7 @@ in src = fetchurl { url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; - sha256 = "0ppr9bckswpi3gav56dhrk91ibxvqbfhpxmm0zikzpxhdlvnaj5v"; + sha256 = "0fz1zahxlfjang53wn06svy4s4aw28c79v24gwadvjvv3h1g5wam"; }; # Note: We need to have `setuptools' in the path to be able to use diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 66609fa5834..3d59898098c 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, unzip }: stdenv.mkDerivation { - name = "weka-3.6.9"; + name = "weka-3.6.12"; src = fetchurl { - url = "mirror://sourceforge/weka/weka-3-6-9.zip"; - sha256 = "0rnis4vvihhdcdvpp79hkmklcnn897paa0qrs95cbjnpgvxzbczs"; + url = "mirror://sourceforge/weka/weka-3-6-12.zip"; + sha256 = "0sdhiv1nr5rxgjry05srsnynsydkyny79zvaxdj6dk8m1768qksh"; }; buildInputs = [ unzip ]; diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 53104f2f1f2..df6a464fa48 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -195,7 +195,7 @@ rec { # Fedora (please only add full mirrors that carry old Fedora distributions as well). # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content). fedora = [ - http://archives.fedoraproject.org/pub/archive/fedora/ + http://archives.fedoraproject.org/pub/fedora/ http://fedora.osuosl.org/ http://ftp.nluug.nl/pub/os/Linux/distr/fedora/ http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/ @@ -204,6 +204,7 @@ rec { http://ftp.linux.cz/pub/linux/fedora/ http://ftp.heanet.ie/pub/fedora/ http://mirror.1000mbps.com/fedora/ + http://archives.fedoraproject.org/pub/archive/fedora/ ]; # Old SUSE distributions. Unfortunately there is no master site, diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index ba916c12cfc..a0dca0d59fc 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -420,9 +420,10 @@ rec { ''} echo "unpacking RPMs..." + set +o pipefail for i in $rpms; do echo "$i..." - ${rpm}/bin/rpm2cpio "$i" | (chroot /mnt ${cpio}/bin/cpio -i --make-directories) + ${rpm}/bin/rpm2cpio "$i" | chroot /mnt ${cpio}/bin/cpio -i --make-directories --unconditional done eval "$preInstall" @@ -437,7 +438,7 @@ rec { echo "installing RPMs..." PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \ - rpm -iv ${if runScripts then "" else "--noscripts"} $rpms + rpm -iv --nosignature ${if runScripts then "" else "--noscripts"} $rpms echo "running post-install script..." eval "$postInstall" @@ -1033,6 +1034,32 @@ rec { unifiedSystemDir = true; }; + fedora21i386 = { + name = "fedora-21-i386"; + fullName = "Fedora 21 (i386)"; + packagesList = fetchurl rec { + url = "mirror://fedora/linux/releases/21/Everything/i386/os/repodata/${sha256}-primary.xml.gz"; + sha256 = "a6ad1140adeef65bbc1fdcc7f8f2b356f0d20c71bbe3f1625038e7f43fc44780"; + }; + urlPrefix = mirror://fedora/linux/releases/21/Everything/i386/os; + archs = ["noarch" "i386" "i586" "i686"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + + fedora21x86_64 = { + name = "fedora-21-x86_64"; + fullName = "Fedora 21 (x86_64)"; + packagesList = fetchurl rec { + url = "mirror://fedora/linux/releases/21/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz"; + sha256 = "e2a28baab2ea4632fad93f9f28144cda3458190888fdf7f2acc9bc289f397e96"; + }; + urlPrefix = mirror://fedora/linux/releases/21/Everything/x86_64/os; + archs = ["noarch" "x86_64"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + unifiedSystemDir = true; + }; + opensuse103i386 = { name = "opensuse-10.3-i586"; fullName = "openSUSE 10.3 (i586)"; @@ -1776,37 +1803,7 @@ rec { /* Default disk images generated from the `rpmDistros' and - `debDistros' sets (along with Red Hat 9 and SuSE 9.0 images). */ + `debDistros' sets. */ + diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns; - diskImages = - lib.mapAttrs (name: f: f {}) diskImageFuns // - - { redhat9i386 = fillDiskWithRPMs { - name = "redhat-9-i386"; - fullName = "Red Hat Linux 9 (i386)"; - size = 1024; - rpms = import ./rpm/redhat-9-i386.nix { inherit fetchurl; }; - }; - - suse90i386 = fillDiskWithRPMs { - name = "suse-9.0-i386"; - fullName = "SUSE Linux 9.0 (i386)"; - size = 1024; - rpms = import ./rpm/suse-9-i386.nix { inherit fetchurl; }; - # Urgh. The /etc/group entries are installed by aaa_base (or - # something) but due to dependency ordering, that package isn't - # installed yet by the time some other packages refer to these - # entries. - preInstall = '' - echo 'bin:x:1:daemon' >> /mnt/etc/group - echo 'tty:x:5:' >> /mnt/etc/group - echo 'disk:x:6:' >> /mnt/etc/group - echo 'lp:x:7:' >> /mnt/etc/group - echo 'uucp:x:14:' >> /mnt/etc/group - echo 'audio:x:17:' >> /mnt/etc/group - echo 'video:x:33:' >> /mnt/etc/group - ''; - }; - - }; } // import ./windows pkgs diff --git a/pkgs/build-support/vm/rpm/redhat-9-i386.list b/pkgs/build-support/vm/rpm/redhat-9-i386.list deleted file mode 100644 index 4f46f66cfac..00000000000 --- a/pkgs/build-support/vm/rpm/redhat-9-i386.list +++ /dev/null @@ -1,92 +0,0 @@ -baseURL ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS -autoconf-2.57-3.noarch.rpm cea6ded7bd395468a41e9b6380cf5c46 -automake-1.6.3-5.noarch.rpm 9a518459499504faa786b63bd88374d1 -basesystem-8.0-2.noarch.rpm 64bc91a544ed3b175e617df2b6683eec -bash-2.05b-20.i386.rpm db4db03fc2d33e3519d72b8f54d483ef -binutils-2.13.90.0.18-9.i386.rpm cd09dfb42d1f9cbd70eba37430762bb6 -bzip2-1.0.2-8.i386.rpm ca663b78121235bdaafeced854e8e966 -bzip2-devel-1.0.2-8.i386.rpm 1e69cd15c6288d41bf989afa579b2585 -bzip2-libs-1.0.2-8.i386.rpm 996ac1deed904c7d75960b31dfe61b01 -chkconfig-1.3.8-1.i386.rpm 8ab54c42c15b3f649174e6bfa764adde -coreutils-4.5.3-19.i386.rpm 972cd0ff8f3e784c2bc5666e80cf354a -cpp-3.2.2-5.i386.rpm 49d8c65dfa401b96b8018b5f6946c985 -cracklib-2.7-21.i386.rpm 31326ff8fb099f10b5d857dc10a33fa3 -cracklib-dicts-2.7-21.i386.rpm d39c8baf399b348db40f3137e93dae03 -curl-7.9.8-5.i386.rpm 4899792440ce948316546a6a85e1a2ef -db4-4.0.14-20.i386.rpm 5fec52fddea8e7cd88cfaa34839cc4b3 -dev-3.3.2-5.i386.rpm a8a45208c6e18cac1bf897d5eb0ac07e -diffutils-2.8.1-6.i386.rpm 772331d623e47069d464760fa68fd0d9 -e2fsprogs-1.32-6.i386.rpm 0b728dbe2d88c87951a921158a80184a -elfutils-libelf-0.76-3.i386.rpm 1f4a143c12634884ce2a36eef141e6b3 -expat-1.95.5-2.i386.rpm 76aa046090620b8c51107a94a3e80d7c -file-3.39-9.i386.rpm b0560e1725f28fe375f9885a7a6be684 -filesystem-2.2.1-3.i386.rpm 897e20be2729051cae7a5bc32efb6b3f -findutils-4.1.7-9.i386.rpm be0e80cec36c3eabf172d5003dd79466 -fontconfig-2.1-9.i386.rpm 86e827ffaa502266116047e840f8eb8f -freetype-2.1.3-6.i386.rpm 64597ef3568d30982be5c0779f062ff2 -gawk-3.1.1-9.i386.rpm 72da64dc330d5945ae80c1779390ac2e -gcc-3.2.2-5.i386.rpm aa544de315b6ba5478d3f6e0c15d0208 -gcc-c++-3.2.2-5.i386.rpm a287f9ac6f8e2efc4965186366989684 -gdbm-1.8.0-20.i386.rpm 819986ab928712c2c3c9324d74b360b8 -glib-1.2.10-10.i386.rpm 24d900aaab3ca9561f7ff2d7e3a206bb -glibc-2.3.2-11.9.i386.rpm d923d7a9a5ac6c25cb51517b23843f78 -glibc-common-2.3.2-11.9.i386.rpm f63000e72fc1adc2c23d4de3ba9ca2a0 -glibc-debug-2.3.2-11.9.i386.rpm ae4aa98a669c3edc7b3c97b1ef409c43 -glibc-devel-2.3.2-11.9.i386.rpm 569afc17dd5f1208407b3742a3849b1c -glibc-kernheaders-2.4-8.10.i386.rpm 17f4befda9601ac4e3d312245affee2b -grep-2.5.1-7.i386.rpm 0606cd6f5516817fe56d6bcc8afe179a -gzip-1.3.3-9.i386.rpm b47a6dfbf36d55a93e3d3920e936a2a7 -info-4.3-5.i386.rpm 8ce01d5cf0287d8cb012bce443679658 -initscripts-7.14-1.i386.rpm 12258ed059d3de4d7a6abef4d4d14222 -iproute-2.4.7-7.i386.rpm b363643aa70272a146ca92c4577ebced -iputils-20020927-2.i386.rpm 83da3128b0da1fdcfd59786451c9d5eb -krb5-libs-1.2.7-10.i386.rpm 9865f9f50631007ecdd409a53626502c -less-378-7.i386.rpm 608656bbe868016ea464d965e07a026c -libgcc-3.2.2-5.i386.rpm 91cae96d5ac2f19b20cb0c07906aed06 -libjpeg-6b-26.i386.rpm 3c350fc137a973249a85671083ed508b -libpng-1.2.2-16.i386.rpm b7d5a39ec3d2c73e0f944d0f525ce79c -libstdc++-3.2.2-5.i386.rpm 09ffb26f39e27232d3c385f5fbc1ef1d -libstdc++-devel-3.2.2-5.i386.rpm 31768c560244755d32185db6022a4b75 -libtermcap-2.0.8-35.i386.rpm 26883bbee99b436059bd8db85426f3d4 -libtiff-3.5.7-11.i386.rpm e29006e58367d587c0632fb77113841f -libtool-libs-1.4.3-5.i386.rpm 5fbbdfb5e1cf43ee03fc4f8a2bc4eaba -m4-1.4.1-13.i386.rpm 38c55c667d34492f24c5946a3374650d -make-3.79.1-17.i386.rpm 5144104c693ee61250e8fd7d75bab866 -mingetty-1.01-1.i386.rpm d3e42b0faebc682fb3c31216786e0702 -mktemp-1.5-18.i386.rpm 28f1bf48c65ce9a5fd18a53fc71675b0 -modutils-2.4.22-8.i386.rpm db39bb8d565162e3f8608190eb7a19fa -mount-2.11y-9.i386.rpm 280a81dfd645785fd2af9fe312788256 -ncurses-5.3-4.i386.rpm e941b37d22dc9ac4a8c37960c5fa337f -ncurses-devel-5.3-4.i386.rpm 5b3d837bba70045ccb6fccb63ec35dc1 -net-tools-1.60-12.i386.rpm 20c2bca22ba3f63c43190b63ebd78be5 -openssl-0.9.7a-2.i386.rpm 39105ce3607fac29a5e0d227e69fea38 -pam-0.75-48.i386.rpm fe77ccc841c5fbb830c81867e8e0f164 -patch-2.5.4-16.i386.rpm 351d225da983e5684fa4c5c8d5ead90f -pcre-3.9-10.i386.rpm b545fff04823c776e37142764e31613c -perl-5.8.0-88.i386.rpm c00258c140d4ac1650dcaab4abbda253 -perl-Filter-1.29-3.i386.rpm 27a82686fe46c220683a447d73c42375 -pkgconfig-0.14.0-3.i386.rpm 1502d26e4fdec84cce1eee6fb329f4e7 -popt-1.8-0.69.i386.rpm 8d827ac879feb6bd5a4055a9338d86a1 -procps-2.0.11-6.i386.rpm 1068278922d4cf486d1f5d9b8109fb81 -psmisc-21.2-4.i386.rpm 457a78fac813a2779f43ee3f5f02aaec -readline-4.3-5.i386.rpm c7b7159668d3272083585737a93628eb -readline-devel-4.3-5.i386.rpm 79b237ff8225dd73646c347e00ca7732 -redhat-release-9-3.i386.rpm 4002643ba2e2077ccc22ef616d69c9fe -rpm-4.2-0.69.i386.rpm 521141f6fe9a3443d7f89627a6f8c71e -rpm-build-4.2-0.69.i386.rpm 6c8b7c4acf2562f2d12378966223856b -sed-4.0.5-1.i386.rpm 34711aa4e9dc199ba1f617a75b68fd1f -setup-2.5.25-1.noarch.rpm 0adc91fc02ea439db469bd27ee6609de -shadow-utils-4.0.3-6.i386.rpm 45fd133d921a37cd36150fab9350baec -sysklogd-1.4.1-12.i386.rpm caeb14d785b721d045e846effe7f3928 -SysVinit-2.84-13.i386.rpm 4e4a1b1fd557aa8daa4a560b4f59fe0f -tar-1.13.25-11.i386.rpm abea2f1a14cbd9fecddf55b3f57da4c6 -termcap-11.0.1-16.noarch.rpm 2392055e8d44522ac95a050b6c30079b -unzip-5.50-7.i386.rpm e0bba7266dba6aafd03bb362ac6424fe -util-linux-2.11y-9.i386.rpm 4a0bc1bb3aa8eedd8ef6f4cd753dab3c -which-2.14-5.i386.rpm cb0f37e1c1b59f6e9503844c0839314a -words-2-21.noarch.rpm 901c74e5f71314c81d326991298f860f -XFree86-libs-4.3.0-2.i386.rpm c1f7264692685aacba2bc05226c0eb1a -XFree86-libs-data-4.3.0-2.i386.rpm 33030ba631e865db552d795c3490df8e -XFree86-Mesa-libGL-4.3.0-2.i386.rpm e9f579759648cdb0492982f4ccaedc4b -zlib-1.1.4-8.i386.rpm c8e2f95e60e75fcfe51dba704c5a6f11 -zlib-devel-1.1.4-8.i386.rpm 6e891309a0dd19b00cc8dfb9018692fd diff --git a/pkgs/build-support/vm/rpm/redhat-9-i386.nix b/pkgs/build-support/vm/rpm/redhat-9-i386.nix deleted file mode 100644 index 1d9a3142bf8..00000000000 --- a/pkgs/build-support/vm/rpm/redhat-9-i386.nix +++ /dev/null @@ -1,93 +0,0 @@ -{fetchurl}: [ - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm; md5="cea6ded7bd395468a41e9b6380cf5c46";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/automake-1.6.3-5.noarch.rpm; md5="9a518459499504faa786b63bd88374d1";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/basesystem-8.0-2.noarch.rpm; md5="64bc91a544ed3b175e617df2b6683eec";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/bash-2.05b-20.i386.rpm; md5="db4db03fc2d33e3519d72b8f54d483ef";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/binutils-2.13.90.0.18-9.i386.rpm; md5="cd09dfb42d1f9cbd70eba37430762bb6";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/bzip2-1.0.2-8.i386.rpm; md5="ca663b78121235bdaafeced854e8e966";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/bzip2-devel-1.0.2-8.i386.rpm; md5="1e69cd15c6288d41bf989afa579b2585";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/bzip2-libs-1.0.2-8.i386.rpm; md5="996ac1deed904c7d75960b31dfe61b01";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/chkconfig-1.3.8-1.i386.rpm; md5="8ab54c42c15b3f649174e6bfa764adde";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/coreutils-4.5.3-19.i386.rpm; md5="972cd0ff8f3e784c2bc5666e80cf354a";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/cpp-3.2.2-5.i386.rpm; md5="49d8c65dfa401b96b8018b5f6946c985";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/cracklib-2.7-21.i386.rpm; md5="31326ff8fb099f10b5d857dc10a33fa3";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/cracklib-dicts-2.7-21.i386.rpm; md5="d39c8baf399b348db40f3137e93dae03";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/curl-7.9.8-5.i386.rpm; md5="4899792440ce948316546a6a85e1a2ef";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/db4-4.0.14-20.i386.rpm; md5="5fec52fddea8e7cd88cfaa34839cc4b3";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/dev-3.3.2-5.i386.rpm; md5="a8a45208c6e18cac1bf897d5eb0ac07e";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/diffutils-2.8.1-6.i386.rpm; md5="772331d623e47069d464760fa68fd0d9";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/e2fsprogs-1.32-6.i386.rpm; md5="0b728dbe2d88c87951a921158a80184a";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/elfutils-libelf-0.76-3.i386.rpm; md5="1f4a143c12634884ce2a36eef141e6b3";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/expat-1.95.5-2.i386.rpm; md5="76aa046090620b8c51107a94a3e80d7c";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/file-3.39-9.i386.rpm; md5="b0560e1725f28fe375f9885a7a6be684";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/filesystem-2.2.1-3.i386.rpm; md5="897e20be2729051cae7a5bc32efb6b3f";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/findutils-4.1.7-9.i386.rpm; md5="be0e80cec36c3eabf172d5003dd79466";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/fontconfig-2.1-9.i386.rpm; md5="86e827ffaa502266116047e840f8eb8f";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/freetype-2.1.3-6.i386.rpm; md5="64597ef3568d30982be5c0779f062ff2";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/gawk-3.1.1-9.i386.rpm; md5="72da64dc330d5945ae80c1779390ac2e";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/gcc-3.2.2-5.i386.rpm; md5="aa544de315b6ba5478d3f6e0c15d0208";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/gcc-c++-3.2.2-5.i386.rpm; md5="a287f9ac6f8e2efc4965186366989684";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/gdbm-1.8.0-20.i386.rpm; md5="819986ab928712c2c3c9324d74b360b8";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/glib-1.2.10-10.i386.rpm; md5="24d900aaab3ca9561f7ff2d7e3a206bb";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/glibc-2.3.2-11.9.i386.rpm; md5="d923d7a9a5ac6c25cb51517b23843f78";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/glibc-common-2.3.2-11.9.i386.rpm; md5="f63000e72fc1adc2c23d4de3ba9ca2a0";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/glibc-debug-2.3.2-11.9.i386.rpm; md5="ae4aa98a669c3edc7b3c97b1ef409c43";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/glibc-devel-2.3.2-11.9.i386.rpm; md5="569afc17dd5f1208407b3742a3849b1c";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/glibc-kernheaders-2.4-8.10.i386.rpm; md5="17f4befda9601ac4e3d312245affee2b";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/grep-2.5.1-7.i386.rpm; md5="0606cd6f5516817fe56d6bcc8afe179a";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/gzip-1.3.3-9.i386.rpm; md5="b47a6dfbf36d55a93e3d3920e936a2a7";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/info-4.3-5.i386.rpm; md5="8ce01d5cf0287d8cb012bce443679658";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/initscripts-7.14-1.i386.rpm; md5="12258ed059d3de4d7a6abef4d4d14222";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/iproute-2.4.7-7.i386.rpm; md5="b363643aa70272a146ca92c4577ebced";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/iputils-20020927-2.i386.rpm; md5="83da3128b0da1fdcfd59786451c9d5eb";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/krb5-libs-1.2.7-10.i386.rpm; md5="9865f9f50631007ecdd409a53626502c";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/less-378-7.i386.rpm; md5="608656bbe868016ea464d965e07a026c";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libgcc-3.2.2-5.i386.rpm; md5="91cae96d5ac2f19b20cb0c07906aed06";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libjpeg-6b-26.i386.rpm; md5="3c350fc137a973249a85671083ed508b";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libpng-1.2.2-16.i386.rpm; md5="b7d5a39ec3d2c73e0f944d0f525ce79c";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libstdc++-3.2.2-5.i386.rpm; md5="09ffb26f39e27232d3c385f5fbc1ef1d";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libstdc++-devel-3.2.2-5.i386.rpm; md5="31768c560244755d32185db6022a4b75";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libtermcap-2.0.8-35.i386.rpm; md5="26883bbee99b436059bd8db85426f3d4";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libtiff-3.5.7-11.i386.rpm; md5="e29006e58367d587c0632fb77113841f";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/libtool-libs-1.4.3-5.i386.rpm; md5="5fbbdfb5e1cf43ee03fc4f8a2bc4eaba";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/m4-1.4.1-13.i386.rpm; md5="38c55c667d34492f24c5946a3374650d";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/make-3.79.1-17.i386.rpm; md5="5144104c693ee61250e8fd7d75bab866";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/mingetty-1.01-1.i386.rpm; md5="d3e42b0faebc682fb3c31216786e0702";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/mktemp-1.5-18.i386.rpm; md5="28f1bf48c65ce9a5fd18a53fc71675b0";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/modutils-2.4.22-8.i386.rpm; md5="db39bb8d565162e3f8608190eb7a19fa";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/mount-2.11y-9.i386.rpm; md5="280a81dfd645785fd2af9fe312788256";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/ncurses-5.3-4.i386.rpm; md5="e941b37d22dc9ac4a8c37960c5fa337f";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/ncurses-devel-5.3-4.i386.rpm; md5="5b3d837bba70045ccb6fccb63ec35dc1";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/net-tools-1.60-12.i386.rpm; md5="20c2bca22ba3f63c43190b63ebd78be5";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/openssl-0.9.7a-2.i386.rpm; md5="39105ce3607fac29a5e0d227e69fea38";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/pam-0.75-48.i386.rpm; md5="fe77ccc841c5fbb830c81867e8e0f164";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/patch-2.5.4-16.i386.rpm; md5="351d225da983e5684fa4c5c8d5ead90f";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/pcre-3.9-10.i386.rpm; md5="b545fff04823c776e37142764e31613c";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/perl-5.8.0-88.i386.rpm; md5="c00258c140d4ac1650dcaab4abbda253";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/perl-Filter-1.29-3.i386.rpm; md5="27a82686fe46c220683a447d73c42375";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/pkgconfig-0.14.0-3.i386.rpm; md5="1502d26e4fdec84cce1eee6fb329f4e7";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/popt-1.8-0.69.i386.rpm; md5="8d827ac879feb6bd5a4055a9338d86a1";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/procps-2.0.11-6.i386.rpm; md5="1068278922d4cf486d1f5d9b8109fb81";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/psmisc-21.2-4.i386.rpm; md5="457a78fac813a2779f43ee3f5f02aaec";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/readline-4.3-5.i386.rpm; md5="c7b7159668d3272083585737a93628eb";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/readline-devel-4.3-5.i386.rpm; md5="79b237ff8225dd73646c347e00ca7732";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/redhat-release-9-3.i386.rpm; md5="4002643ba2e2077ccc22ef616d69c9fe";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/rpm-4.2-0.69.i386.rpm; md5="521141f6fe9a3443d7f89627a6f8c71e";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/rpm-build-4.2-0.69.i386.rpm; md5="6c8b7c4acf2562f2d12378966223856b";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/sed-4.0.5-1.i386.rpm; md5="34711aa4e9dc199ba1f617a75b68fd1f";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/setup-2.5.25-1.noarch.rpm; md5="0adc91fc02ea439db469bd27ee6609de";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/shadow-utils-4.0.3-6.i386.rpm; md5="45fd133d921a37cd36150fab9350baec";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/sysklogd-1.4.1-12.i386.rpm; md5="caeb14d785b721d045e846effe7f3928";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/SysVinit-2.84-13.i386.rpm; md5="4e4a1b1fd557aa8daa4a560b4f59fe0f";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/tar-1.13.25-11.i386.rpm; md5="abea2f1a14cbd9fecddf55b3f57da4c6";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/termcap-11.0.1-16.noarch.rpm; md5="2392055e8d44522ac95a050b6c30079b";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/unzip-5.50-7.i386.rpm; md5="e0bba7266dba6aafd03bb362ac6424fe";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/util-linux-2.11y-9.i386.rpm; md5="4a0bc1bb3aa8eedd8ef6f4cd753dab3c";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/which-2.14-5.i386.rpm; md5="cb0f37e1c1b59f6e9503844c0839314a";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/words-2-21.noarch.rpm; md5="901c74e5f71314c81d326991298f860f";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/XFree86-libs-4.3.0-2.i386.rpm; md5="c1f7264692685aacba2bc05226c0eb1a";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/XFree86-libs-data-4.3.0-2.i386.rpm; md5="33030ba631e865db552d795c3490df8e";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/XFree86-Mesa-libGL-4.3.0-2.i386.rpm; md5="e9f579759648cdb0492982f4ccaedc4b";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/zlib-1.1.4-8.i386.rpm; md5="c8e2f95e60e75fcfe51dba704c5a6f11";}) - (fetchurl {url=ftp://fr.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/zlib-devel-1.1.4-8.i386.rpm; md5="6e891309a0dd19b00cc8dfb9018692fd";}) -] diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl index 411c351f1e4..8f7669d6fef 100644 --- a/pkgs/build-support/vm/rpm/rpm-closure.pl +++ b/pkgs/build-support/vm/rpm/rpm-closure.pl @@ -28,20 +28,20 @@ sub rpmvercmp { my $v2 = $vercmps2[$i]; if($v1 =~ /^[0-9]*$/ && $v2 =~ /^[0-9]*$/) { - if ( int($v1) > int($v2) ) { - return 1; - } - elsif ( int($v1) < int($v2) ) { - return -1; - } - } else { - if ( $v1 gt $v2 ) { - return 1; - } - elsif ( $v1 lt $v2 ) { - return -1; - } - } + if ( int($v1) > int($v2) ) { + return 1; + } + elsif ( int($v1) < int($v2) ) { + return -1; + } + } else { + if ( $v1 gt $v2 ) { + return 1; + } + elsif ( $v1 lt $v2 ) { + return -1; + } + } } if($l1 == $l2) { return 0; @@ -90,19 +90,25 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) { } my %provides; -foreach my $pkgName (keys %pkgs) { +PKG: foreach my $pkgName (keys %pkgs) { #print STDERR "looking at $pkgName\n"; my $pkg = $pkgs{$pkgName}; - - #print STDERR keys %{$pkg->{format}}, "\n"; - #print STDERR $pkg->{format}->{'rpm:provides'}, "\n"; - + # Skip packages that conflict with a required package. + my $conflicts = $pkg->{format}->{'rpm:conflicts'}->{'rpm:entry'} // []; + foreach my $conflict (@{$conflicts}) { + next if $conflict->{flags} // "" eq "LT" || $conflict->{flags} // "" eq "LE"; + #print STDERR " $pkgName conflicts with $conflict->{name}\n"; + if (grep { $_ eq $conflict->{name} } @toplevelPkgs) { + print STDERR "skipping package $pkgName because it conflicts with a required package\n"; + next PKG; + } + } + my $provides = $pkg->{format}->{'rpm:provides'}->{'rpm:entry'} or die; foreach my $req (@{$provides}) { - #print "$req->{name}\n"; - #print STDERR " provides $req\n"; - #die "multiple provides for $req" if defined $provides{$req}; + #print STDERR " $pkgName provides $req->{name}\n"; + #die "multiple provides for $req->{name}" if defined $provides{$req->{name}}; $provides{$req->{name}} = $pkgName; } @@ -123,9 +129,9 @@ sub closePackage { return if defined $donePkgs{$pkgName}; $donePkgs{$pkgName} = 1; - + print STDERR ">>> $pkgName\n"; - + my $pkg = $pkgs{$pkgName} or die "package $pkgName doesn't exist"; my $requires = $pkg->{format}->{'rpm:requires'}->{'rpm:entry'} || []; @@ -133,14 +139,14 @@ sub closePackage { my @deps = (); foreach my $req (@{$requires}) { next if $req->{name} =~ /^rpmlib\(/; - print STDERR " needs $req->{name}\n"; + #print STDERR " needs $req->{name}\n"; my $provider = $provides{$req->{name}}; if (!defined $provider) { print STDERR " WARNING: no provider for $req->{name}\n"; next; } - print STDERR " satisfied by $provider\n"; - push @deps, $provider; + #print STDERR " satisfied by $provider\n"; + push @deps, $provider; } closePackage($_) foreach @deps; diff --git a/pkgs/build-support/vm/rpm/rpm-list-to-nix.pl b/pkgs/build-support/vm/rpm/rpm-list-to-nix.pl deleted file mode 100755 index bd0e32ac97e..00000000000 --- a/pkgs/build-support/vm/rpm/rpm-list-to-nix.pl +++ /dev/null @@ -1,51 +0,0 @@ -#! /usr/bin/perl -w - -use strict; - -my $list = shift; -my $expr = shift; - -open LIST, "<$list"; -open NEW, ">$list.tmp"; -open EXPR, ">$expr"; - -print EXPR "{fetchurl}: [\n"; - -my $baseURL; - -while () { - - if (/^\s*baseURL\s+(\S+)\s*$/) { - $baseURL = $1; - print NEW "baseURL $baseURL\n"; - } - - elsif (/^\s*(\S+)(\s+([a-z0-9]+))?\s*$/) { - my $pkgName = $1; - my $url = "$baseURL/$pkgName"; - my $hash = $3; - if (!defined $hash) { - $hash = `nix-prefetch-url '$url'`; - die "fetch of `$url' failed" if ($? != 0); - chomp $hash; - } - print NEW "$pkgName $hash\n"; - if (length $hash == 32) { - print EXPR " (fetchurl {url=$url; md5=\"$hash\";})\n"; - } else { - print EXPR " (fetchurl {url=$url; sha256=\"$hash\";})\n"; - } - } - - else { - die "invalid line" - } -} - -print EXPR "]\n"; - -close LIST; -close NEW; -close EXPR; - -rename "$list\.tmp", "$list" or die "cannot rename"; diff --git a/pkgs/build-support/vm/rpm/suse-9-i386.list b/pkgs/build-support/vm/rpm/suse-9-i386.list deleted file mode 100644 index e3ea8e92bd6..00000000000 --- a/pkgs/build-support/vm/rpm/suse-9-i386.list +++ /dev/null @@ -1,90 +0,0 @@ -baseURL mirror://oldsuse/9.0/suse/i586 -glibc-2.3.2-92.i586.rpm d5396400c92d4085e536b708ddce265c -zlib-1.1.4-232.i586.rpm ba1a8342757071dfd7e52a2c69c86584 -readline-4.3-212.i586.rpm c18b059909f3debca772a8f5b7d3aee7 -ncurses-5.3-115.i586.rpm 48c4f77acdbf2ef9aee807466d0fec88 -aaa_base-9.0-7.i586.rpm 1xj9k6b3s0zrdac52q1mw6l7ms55nzmdkfda1s1jbz9laijijppn -aaa_skel-2003.9.18-8.i586.rpm 1cp9kyg8ksqk0hixdkzd454jhymqdpln9x2y2izdifzsc9wzbsz3 -sysconfig-0.23.30-39.i586.rpm 1dmn95b9yb7rcbgxscw7nspjrdw67v4gdn7kmy5pqq3jxnpmhzi8 -permissions-2003.9.18-8.i586.rpm 0z0n89jh63lqsa0sg6z7f7mn1n6bh1qnxd1h9s5ypmpkazfdhhib -ash-0.2-804.i586.rpm 01m2nl5jmy206va26fx7w3p9zvmmvd5jkng19vjdw556a74h9saz -autoconf-2.57-142.i586.rpm 1e360a37d4db4c87e07d15c88f0c12e2 -automake-1.7.6-44.i586.rpm 2c7f1335e73751008f594a68eb515290 -bash-2.05b-212.i586.rpm 1a0fd51a36144dbe89c16553a71899e0 -binutils-2.14.90.0.5-47.i586.rpm 63d69aeb190304f3ddba2d34fcbb5087 -bzip2-1.0.2-232.i586.rpm d667ffc252d983f27eeb041775503438 -coreutils-5.0-90.i586.rpm 121abfc07a9035329b781fdd46e8b600 -compat-2003.5.12-60.i586.rpm e78e5e2e78a2e29c90c3edbf51c8789e -cpp-3.3.1-29.i586.rpm 2df0da5848fbc59e322167cf7bf1b2bd -cracklib-2.7-903.i586.rpm 0c5d1c68796906c035a58cf9e4ce1e64 -curl-7.10.5-42.i586.rpm 17ca3725c110e267127b08bd0a1d59a7 -db-4.1.25-76.i586.rpm 9656c5d737d5d6db5a4a320a98590479 -devs-9.0-5.i586.rpm 81e0daafae9d5c75cf6826518dcb9c0f -diffutils-2.8.1-207.i586.rpm 7d2aed3fe2d8a3e94076695d32c745fb -e2fsprogs-1.34-34.i586.rpm 5acb02c211196891382927dd8a197899 -expat-1.95.6-84.i586.rpm 357ceb9a50240da9143ccc8d616f8a34 -file-4.03-45.i586.rpm 7c239f1f0695363c6a0dc2dc5d6e82cf -filesystem-9.0-7.i586.rpm e4d1ed219ea5c8f39dafa30f3749f900 -fillup-1.42-13.i586.rpm 9d9a32946df392999a0bfd42f7faa7a1 -findutils-4.1.7-748.i586.rpm 10318b40691717786e7092395d63533a -fontconfig-2.2.1-29.i586.rpm 0113c057d8d658b5301e4ce526820f8b -freetype2-2.1.4-68.i586.rpm c101e3205fdfa22e912f9dc21cd24d12 -gawk-3.1.3-82.i586.rpm 9181c9078ad77b582b9e77f0323417df -gcc-3.3.1-29.i586.rpm e32b4b631483ab5d22a12900e070890b -gcc-c++-3.3.1-29.i586.rpm 7e6ee0a475b23bbf1c0e57087f682e43 -gdbm-1.8.3-124.i586.rpm 414fc63a785ee589e40908763b7fb18d -glib-1.2.10-488.i586.rpm 018f711f294f1a54f9a5b625748f7b22 -glibc-devel-2.3.2-92.i586.rpm 705d90c6a8a7b7eaab8632c343d4e173 -glibc-i18ndata-2.3.2-92.i586.rpm fc719866325ef22c27ac07e366f8b854 -glibc-locale-2.3.2-92.i586.rpm 657164f38227450e5b0bde2892804f21 -gnome-filesystem-0.1-80.i586.rpm f42a958db0291f04af16a7ab50efedca -gpm-1.20.1-204.i586.rpm 1mmrydfwl8ivlqhxx9l99w9f6vs0f7gnpc3r7j6qfcszm8ql77w6 -gpg-1.2.2-88.i586.rpm 5734134e5b699eacc227672bcb7fdb62 -grep-2.5.1-302.i586.rpm 553eea58a317a068b2bdbd279066f023 -gzip-1.3.5-51.i586.rpm 011ad84c3d935647e639bba34f9c9726 -info-4.5-92.i586.rpm 0da6ec81011700f2dc0db7f8c62d5436 -insserv-1.00.1-18.i586.rpm 708cee980fe3748f161b64aec372adfb -iproute2-2.4.7-697.i586.rpm 5b8265f3f5f6a23a212b12700664cc91 -iputils-ss021109-60.i586.rpm b7744924b0d4ee20880cee83965d2c9d -less-381-32.i586.rpm 2092ca409eeb6c479d345a5a6d19ca3e -libacl-2.2.15-27.i586.rpm e4e246b6e57e39f68d7eea111daa86c9 -libattr-2.4.8-27.i586.rpm f49e5423a1cd8425f78fe8e2c0846404 -liblcms-1.10-37.i586.rpm 79c8494af052c5032c70ea2a394c7a0e -libgcc-3.3.1-29.i586.rpm 7ba930b645729570c8b8f768490c7e90 -libjpeg-6.2.0-634.i586.rpm 0a8b28e57514c439a0314c89327b0783 -libpng-1.2.5-97.i586.rpm 09f7bfb235dc205074b2c81a60aaa2bf -libstdc++-3.3.1-29.i586.rpm fe9e66884f3c6ec73a57c44868c749dd -libstdc++-devel-3.3.1-29.i586.rpm bb69c86478476fee2fd327a54b5790c9 -libtiff-3.5.7-307.i586.rpm 53152a337d2f540f1b7a61e6b11ae41f -libtool-1.5-85.i586.rpm dfc1992dc92bef0bcdef7273d2cd70fb -libxcrypt-2.0-36.i586.rpm 022c44bdfb02c926ad6499506f9e8525 -logrotate-3.6.6-95.i586.rpm 0i8pj3rdnxf4ig1zghsbi63s3ss0mvnv4mvyjjxcnilnmg6qjnqj -m4-1.4o-512.i586.rpm 141d24f90c907841a8a24ceb8e6cb94d -make-3.80-101.i586.rpm 4f358bda24d2cefc78c3c744d2bd01da -mktemp-1.5-637.i586.rpm 3f444e864a5b167472192de89957f47a -modutils-2.4.25-56.i586.rpm 2d64e9b80a10f945e58a5a70e8859fc9 -ncurses-devel-5.3-115.i586.rpm 747d41d77cfacc3ea3874a6ddebc1862 -net-tools-1.60-448.i586.rpm e92f3a22f4595e97e72d8a6ac2e19959 -openssl-0.9.7b-74.i586.rpm 18e0fa1e8168217f6dea90c1954b5a50 -pam-0.77-129.i586.rpm 7b4e04a641d74fb7f3650100c03b258f -pam-modules-9.0-6.i586.rpm b93f72a778d19ad9bc42d4c3c1ab5bcb -patch-2.5.9-56.i586.rpm f9b39a18023a4661dd715e28022ac9d2 -pcre-4.4-24.i586.rpm 9cd20ad696e815b9a93be0015d6373d1 -perl-5.8.1-51.i586.rpm 24c046fc2d03464f61c26c014b715bf2 -perl-Filter-1.29-100.i586.rpm 7674bae9c1a7890a8553854b4933bc50 -pkgconfig-0.15.0-108.i586.rpm 31db551f2fcc901a25da746110584e2d -popt-1.7-76.i586.rpm 66f310eee498958f83e223845b776746 -readline-devel-4.3-212.i586.rpm c9d0c8cd5ea825beb997c70b6ea95101 -rpm-4.1.1-77.i586.rpm 341f5dfdc85070d91da5fb2774d8c886 -sed-4.0.6-73.i586.rpm c95e7a25899d4d927785cb9cb165fca1 -suse-release-9.0-7.i586.rpm f9965de2e346d02acd56ca963c2ec7ae -syslogd-1.4.1-424.i586.rpm 3713eb72cc56eef8aed49337efeb3611 -sysvinit-2.82-367.i586.rpm 6dfff9b498c7cb98cff660d0d71f24ec -tar-1.13.25-204.i586.rpm 4e7808b8b691eb639115db0f88527571 -termcap-2.0.8-781.i586.rpm 755c8d17157be28822a940689ab3c1c7 -unzip-5.50-250.i586.rpm 423d68022a4e5e78aa2a88c1642471a7 -util-linux-2.11z-95.i586.rpm 2174767b2e2e6e4e3cdd8fc569dc3c6e -XFree86-libs-4.3.0.1-29.i586.rpm 77b0e1d5974703b3fc6621d862b4b038 -zlib-devel-1.1.4-232.i586.rpm 7c60d8432793517236f64b0f79d7f20f -baseURL mirror://oldsuse/9.0/suse/noarch -suse-build-key-1.0-472.noarch.rpm 8e34a1af09d66b66ea353685f4a84dfc diff --git a/pkgs/build-support/vm/rpm/suse-9-i386.nix b/pkgs/build-support/vm/rpm/suse-9-i386.nix deleted file mode 100644 index 783fc87e258..00000000000 --- a/pkgs/build-support/vm/rpm/suse-9-i386.nix +++ /dev/null @@ -1,90 +0,0 @@ -{fetchurl}: [ - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/glibc-2.3.2-92.i586.rpm; md5="d5396400c92d4085e536b708ddce265c";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/zlib-1.1.4-232.i586.rpm; md5="ba1a8342757071dfd7e52a2c69c86584";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/readline-4.3-212.i586.rpm; md5="c18b059909f3debca772a8f5b7d3aee7";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/ncurses-5.3-115.i586.rpm; md5="48c4f77acdbf2ef9aee807466d0fec88";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/aaa_base-9.0-7.i586.rpm; sha256="1xj9k6b3s0zrdac52q1mw6l7ms55nzmdkfda1s1jbz9laijijppn";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/aaa_skel-2003.9.18-8.i586.rpm; sha256="1cp9kyg8ksqk0hixdkzd454jhymqdpln9x2y2izdifzsc9wzbsz3";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/sysconfig-0.23.30-39.i586.rpm; sha256="1dmn95b9yb7rcbgxscw7nspjrdw67v4gdn7kmy5pqq3jxnpmhzi8";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/permissions-2003.9.18-8.i586.rpm; sha256="0z0n89jh63lqsa0sg6z7f7mn1n6bh1qnxd1h9s5ypmpkazfdhhib";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/ash-0.2-804.i586.rpm; sha256="01m2nl5jmy206va26fx7w3p9zvmmvd5jkng19vjdw556a74h9saz";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/autoconf-2.57-142.i586.rpm; md5="1e360a37d4db4c87e07d15c88f0c12e2";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/automake-1.7.6-44.i586.rpm; md5="2c7f1335e73751008f594a68eb515290";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/bash-2.05b-212.i586.rpm; md5="1a0fd51a36144dbe89c16553a71899e0";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/binutils-2.14.90.0.5-47.i586.rpm; md5="63d69aeb190304f3ddba2d34fcbb5087";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/bzip2-1.0.2-232.i586.rpm; md5="d667ffc252d983f27eeb041775503438";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/coreutils-5.0-90.i586.rpm; md5="121abfc07a9035329b781fdd46e8b600";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/compat-2003.5.12-60.i586.rpm; md5="e78e5e2e78a2e29c90c3edbf51c8789e";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/cpp-3.3.1-29.i586.rpm; md5="2df0da5848fbc59e322167cf7bf1b2bd";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/cracklib-2.7-903.i586.rpm; md5="0c5d1c68796906c035a58cf9e4ce1e64";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/curl-7.10.5-42.i586.rpm; md5="17ca3725c110e267127b08bd0a1d59a7";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/db-4.1.25-76.i586.rpm; md5="9656c5d737d5d6db5a4a320a98590479";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/devs-9.0-5.i586.rpm; md5="81e0daafae9d5c75cf6826518dcb9c0f";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/diffutils-2.8.1-207.i586.rpm; md5="7d2aed3fe2d8a3e94076695d32c745fb";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/e2fsprogs-1.34-34.i586.rpm; md5="5acb02c211196891382927dd8a197899";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/expat-1.95.6-84.i586.rpm; md5="357ceb9a50240da9143ccc8d616f8a34";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/file-4.03-45.i586.rpm; md5="7c239f1f0695363c6a0dc2dc5d6e82cf";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/filesystem-9.0-7.i586.rpm; md5="e4d1ed219ea5c8f39dafa30f3749f900";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/fillup-1.42-13.i586.rpm; md5="9d9a32946df392999a0bfd42f7faa7a1";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/findutils-4.1.7-748.i586.rpm; md5="10318b40691717786e7092395d63533a";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/fontconfig-2.2.1-29.i586.rpm; md5="0113c057d8d658b5301e4ce526820f8b";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/freetype2-2.1.4-68.i586.rpm; md5="c101e3205fdfa22e912f9dc21cd24d12";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gawk-3.1.3-82.i586.rpm; md5="9181c9078ad77b582b9e77f0323417df";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gcc-3.3.1-29.i586.rpm; md5="e32b4b631483ab5d22a12900e070890b";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gcc-c++-3.3.1-29.i586.rpm; md5="7e6ee0a475b23bbf1c0e57087f682e43";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gdbm-1.8.3-124.i586.rpm; md5="414fc63a785ee589e40908763b7fb18d";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/glib-1.2.10-488.i586.rpm; md5="018f711f294f1a54f9a5b625748f7b22";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/glibc-devel-2.3.2-92.i586.rpm; md5="705d90c6a8a7b7eaab8632c343d4e173";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/glibc-i18ndata-2.3.2-92.i586.rpm; md5="fc719866325ef22c27ac07e366f8b854";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/glibc-locale-2.3.2-92.i586.rpm; md5="657164f38227450e5b0bde2892804f21";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gnome-filesystem-0.1-80.i586.rpm; md5="f42a958db0291f04af16a7ab50efedca";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gpm-1.20.1-204.i586.rpm; sha256="1mmrydfwl8ivlqhxx9l99w9f6vs0f7gnpc3r7j6qfcszm8ql77w6";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gpg-1.2.2-88.i586.rpm; md5="5734134e5b699eacc227672bcb7fdb62";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/grep-2.5.1-302.i586.rpm; md5="553eea58a317a068b2bdbd279066f023";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/gzip-1.3.5-51.i586.rpm; md5="011ad84c3d935647e639bba34f9c9726";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/info-4.5-92.i586.rpm; md5="0da6ec81011700f2dc0db7f8c62d5436";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/insserv-1.00.1-18.i586.rpm; md5="708cee980fe3748f161b64aec372adfb";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/iproute2-2.4.7-697.i586.rpm; md5="5b8265f3f5f6a23a212b12700664cc91";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/iputils-ss021109-60.i586.rpm; md5="b7744924b0d4ee20880cee83965d2c9d";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/less-381-32.i586.rpm; md5="2092ca409eeb6c479d345a5a6d19ca3e";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libacl-2.2.15-27.i586.rpm; md5="e4e246b6e57e39f68d7eea111daa86c9";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libattr-2.4.8-27.i586.rpm; md5="f49e5423a1cd8425f78fe8e2c0846404";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/liblcms-1.10-37.i586.rpm; md5="79c8494af052c5032c70ea2a394c7a0e";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libgcc-3.3.1-29.i586.rpm; md5="7ba930b645729570c8b8f768490c7e90";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libjpeg-6.2.0-634.i586.rpm; md5="0a8b28e57514c439a0314c89327b0783";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libpng-1.2.5-97.i586.rpm; md5="09f7bfb235dc205074b2c81a60aaa2bf";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libstdc++-3.3.1-29.i586.rpm; md5="fe9e66884f3c6ec73a57c44868c749dd";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libstdc++-devel-3.3.1-29.i586.rpm; md5="bb69c86478476fee2fd327a54b5790c9";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libtiff-3.5.7-307.i586.rpm; md5="53152a337d2f540f1b7a61e6b11ae41f";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libtool-1.5-85.i586.rpm; md5="dfc1992dc92bef0bcdef7273d2cd70fb";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/libxcrypt-2.0-36.i586.rpm; md5="022c44bdfb02c926ad6499506f9e8525";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/logrotate-3.6.6-95.i586.rpm; sha256="0i8pj3rdnxf4ig1zghsbi63s3ss0mvnv4mvyjjxcnilnmg6qjnqj";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/m4-1.4o-512.i586.rpm; md5="141d24f90c907841a8a24ceb8e6cb94d";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/make-3.80-101.i586.rpm; md5="4f358bda24d2cefc78c3c744d2bd01da";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/mktemp-1.5-637.i586.rpm; md5="3f444e864a5b167472192de89957f47a";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/modutils-2.4.25-56.i586.rpm; md5="2d64e9b80a10f945e58a5a70e8859fc9";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/ncurses-devel-5.3-115.i586.rpm; md5="747d41d77cfacc3ea3874a6ddebc1862";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/net-tools-1.60-448.i586.rpm; md5="e92f3a22f4595e97e72d8a6ac2e19959";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/openssl-0.9.7b-74.i586.rpm; md5="18e0fa1e8168217f6dea90c1954b5a50";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/pam-0.77-129.i586.rpm; md5="7b4e04a641d74fb7f3650100c03b258f";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/pam-modules-9.0-6.i586.rpm; md5="b93f72a778d19ad9bc42d4c3c1ab5bcb";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/patch-2.5.9-56.i586.rpm; md5="f9b39a18023a4661dd715e28022ac9d2";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/pcre-4.4-24.i586.rpm; md5="9cd20ad696e815b9a93be0015d6373d1";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/perl-5.8.1-51.i586.rpm; md5="24c046fc2d03464f61c26c014b715bf2";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/perl-Filter-1.29-100.i586.rpm; md5="7674bae9c1a7890a8553854b4933bc50";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/pkgconfig-0.15.0-108.i586.rpm; md5="31db551f2fcc901a25da746110584e2d";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/popt-1.7-76.i586.rpm; md5="66f310eee498958f83e223845b776746";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/readline-devel-4.3-212.i586.rpm; md5="c9d0c8cd5ea825beb997c70b6ea95101";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/rpm-4.1.1-77.i586.rpm; md5="341f5dfdc85070d91da5fb2774d8c886";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/sed-4.0.6-73.i586.rpm; md5="c95e7a25899d4d927785cb9cb165fca1";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/suse-release-9.0-7.i586.rpm; md5="f9965de2e346d02acd56ca963c2ec7ae";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/syslogd-1.4.1-424.i586.rpm; md5="3713eb72cc56eef8aed49337efeb3611";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/sysvinit-2.82-367.i586.rpm; md5="6dfff9b498c7cb98cff660d0d71f24ec";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/tar-1.13.25-204.i586.rpm; md5="4e7808b8b691eb639115db0f88527571";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/termcap-2.0.8-781.i586.rpm; md5="755c8d17157be28822a940689ab3c1c7";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/unzip-5.50-250.i586.rpm; md5="423d68022a4e5e78aa2a88c1642471a7";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/util-linux-2.11z-95.i586.rpm; md5="2174767b2e2e6e4e3cdd8fc569dc3c6e";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/XFree86-libs-4.3.0.1-29.i586.rpm; md5="77b0e1d5974703b3fc6621d862b4b038";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/i586/zlib-devel-1.1.4-232.i586.rpm; md5="7c60d8432793517236f64b0f79d7f20f";}) - (fetchurl {url=mirror://oldsuse/9.0/suse/noarch/suse-build-key-1.0-472.noarch.rpm; md5="8e34a1af09d66b66ea353685f4a84dfc";}) -] diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix index 965a8a05f16..46e30038364 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; # Disable Access Control because our X does not support FamilyServerInterpreted yet - patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./propagate_xdgconfigdirs.patch ]; + patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./propagate_env.patch ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GDM; diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch new file mode 100644 index 00000000000..b3e356a65c3 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch @@ -0,0 +1,13 @@ +--- a/daemon/gdm-launch-environment.c 2014-11-24 15:43:55.532879804 +0100 ++++ a/daemon/gdm-launch-environment.c 2014-11-28 18:22:42.636313967 +0100 +@@ -220,8 +220,8 @@ + "LANG", "LANGUAGE", "LC_CTYPE", "LC_NUMERIC", "LC_TIME", + "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER", + "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT", +- "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", +- NULL ++ "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", "XCURSOR_PATH", ++ "XDG_CONFIG_DIRS", NULL + }; + char *system_data_dirs; + int i; diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_xdgconfigdirs.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_xdgconfigdirs.patch deleted file mode 100644 index 20d7659c1e5..00000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_xdgconfigdirs.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/daemon/gdm-launch-environment.c 2014-08-03 12:05:39.380178964 +0200 -+++ b/daemon/gdm-launch-environment.c 2014-08-03 12:08:26.570182517 +0200 -@@ -224,6 +224,7 @@ - NULL - }; - char *system_data_dirs; -+ char *system_config_dirs; - int i; - - load_lang_config_file (LANG_CONFIG_FILE, -@@ -251,6 +252,15 @@ - system_data_dirs)); - g_free (system_data_dirs); - -+ system_config_dirs = g_strjoinv (":", (char **) g_get_system_config_dirs ()); -+ -+ g_hash_table_insert (hash, -+ g_strdup ("XDG_CONFIG_DIRS"), -+ g_strdup_printf ("%s", -+ system_config_dirs)); -+ g_free (system_config_dirs); -+ -+ - g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (launch_environment->priv->x11_authority_file)); - - g_hash_table_insert (hash, g_strdup ("LOGNAME"), g_strdup (launch_environment->priv->user_name)); diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8ebb3ac85bb..0363855977f 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: +{ stdenv, fetchgit, ghc, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }: let @@ -18,18 +18,22 @@ in stdenv.mkDerivation rec { version = "7.11.20150118"; name = "ghc-${version}"; + rev = "6ff3db92140e3ac8cbda50d1a4aab976350ac8c4"; - src = fetchurl { - url = "http://deb.haskell.org/dailies/2015-01-18/ghc_${version}.orig.tar.bz2"; - sha256 = "1zy960q2faq03camq2n4834bd748vkc15h83bapswc68dqncqj20"; + src = fetchgit { + url = "git://git.haskell.org/ghc.git"; + inherit rev; + sha256 = "1a1r3nw7x5rd8563770zcg1phm55vi3sxs2zwr91ik026n8jjba6"; }; postUnpack = '' - # tarball includes many already-compiled files - find . \( -name '*.dyn_o' -o -name '*.dyn_hi' -o -name haddock \) -type f -exec rm {} \; + pushd ghc-${builtins.substring 0 7 rev} + patchShebangs . + ./boot + popd ''; - buildInputs = [ ghc perl ]; + buildInputs = [ ghc perl autoconf automake happy alex ]; preConfigure = '' echo >mk/build.mk "${buildMK}" diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix new file mode 100644 index 00000000000..3b8f46eb688 --- /dev/null +++ b/pkgs/development/compilers/nim/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "nim-0.10.2"; + + buildInputs = [ unzip ]; + + src = fetchurl { + url = "http://nim-lang.org/download/${name}.zip"; + sha256 = "1jkrf8wgva7kfl0vqs1f3scidi6a85r6bkz2zf90k8gdpin9idrg"; + }; + + buildPhase = "sh build.sh"; + installPhase = + '' + substituteInPlace install.sh --replace '$1/nim' "$out" + sh install.sh $out + ''; + + meta = with stdenv.lib; + { description = "Statically typed, imperative programming language"; + homepage = http://nim-lang.org/; + license = licenses.mit; + maintainers = with maintainers; [ emery ]; + platforms = platforms.linux; # arbitrary + }; +} diff --git a/pkgs/development/compilers/sbcl/1.2.0.nix b/pkgs/development/compilers/sbcl/1.2.0.nix index a12e8c5ae9d..d19edce2c10 100644 --- a/pkgs/development/compilers/sbcl/1.2.0.nix +++ b/pkgs/development/compilers/sbcl/1.2.0.nix @@ -50,6 +50,9 @@ stdenv.mkDerivation rec { # Use whatever `cc` the stdenv provides substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc + + substituteInPlace src/runtime/Config.x86-64-darwin \ + --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 ''; preBuild = '' diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index ea61940e8d4..94a17c483ab 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -53,6 +53,9 @@ stdenv.mkDerivation rec { # Use whatever `cc` the stdenv provides substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc + + substituteInPlace src/runtime/Config.x86-64-darwin \ + --replace mmacosx-version-min=10.4 mmacosx-version-min=10.5 ''; preBuild = '' diff --git a/pkgs/development/compilers/vala/0.26.nix b/pkgs/development/compilers/vala/0.26.nix index 48b5476fe1d..0cf54ea347c 100644 --- a/pkgs/development/compilers/vala/0.26.nix +++ b/pkgs/development/compilers/vala/0.26.nix @@ -4,8 +4,8 @@ let major = "0.26"; - minor = "1"; - sha256 = "8407abb19ab3a58bbfc0d288abb47666ef81f76d0540258c03965e7545f59e6b"; + minor = "2"; + sha256 = "37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4"; in stdenv.mkDerivation rec { name = "vala-${major}.${minor}"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d30e3061d8d..ae736e0125e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -449,9 +449,6 @@ self: super: { rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5 rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6 - # https://github.com/Twinside/Rasterific/issues/20 - Rasterific = dontCheck super.Rasterific; - # Upstream notified by e-mail. MonadCompose = markBrokenVersion "0.2.0.0" super.MonadCompose; @@ -462,6 +459,12 @@ self: super: { doHaddock = false; }); + # This packages compiles 4+ hours on a fast machine. That's just unreasonable. + CHXHtml = dontDistribute super.CHXHtml; + + # https://github.com/bos/bloomfilter/issues/7 + bloomfilter = overrideCabal super.bloomfilter (drv: { broken = !pkgs.stdenv.is64bit; }); + } // { # Not on Hackage. diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 67ac5f5a328..88e14b5a9e2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -40,7 +40,7 @@ self: super: { transformers-compat = disableCabalFlag super.transformers-compat "three"; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; process = self.process_1_2_1_0; }; + Cabal_1_22_0_0 = super.Cabal_1_22_0_0.override { binary = self.binary_0_7_3_0; process = self.process_1_2_2_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 9dd694387fb..ebb12ed20a8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -75,6 +75,9 @@ self: super: { hosc = dontDistribute super.hosc; tidal-midi = dontDistribute super.tidal-midi; + # Needs mtl 2.2.x due to "plailude". + clac = dontDistribute super.clac; + } // # packages relating to amazonka @@ -103,7 +106,7 @@ self: super: { time = self.time_1_5_0_1; unix = self.unix_2_7_1_0; directory = self.directory_1_2_1_0; - process = overrideCabal self.process_1_2_1_0 (drv: { coreSetup = true; }); + process = overrideCabal self.process_1_2_2_0 (drv: { coreSetup = true; }); inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch; }; amazonka = super.amazonka.overrideScope amazonkaEnv; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6ac89102e5c..75365f7addb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5013,12 +5013,11 @@ self: { ({ mkDerivation, array, base, directory, random, wx, wxcore }: mkDerivation { pname = "GeBoP"; - version = "1.7.4"; - sha256 = "1nz0829jx2yf673r6haahzva3m5y80d9whxh79abxx9716874rw9"; + version = "1.7.4.1"; + sha256 = "0cldjrk26p2llyhsp1rcvzbgz5qg8k898fvmdxkfc9ihc5lsxxf5"; isLibrary = false; isExecutable = true; buildDepends = [ array base directory random wx wxcore ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/GeBoP"; description = "Several games"; license = stdenv.lib.licenses.bsd3; @@ -7763,16 +7762,22 @@ self: { }) {}; "Hoed" = callPackage - ({ mkDerivation, array, base, template-haskell }: + ({ mkDerivation, array, base, containers, directory, filepath + , libgraph, mtl, process, RBTree, regex-posix, template-haskell + , threepenny-gui + }: mkDerivation { pname = "Hoed"; - version = "0.1.0.1"; - sha256 = "1121m0ksh9ydn9vvvlz6jh0i9yx8jyxv4qwsnkmcnzajhh3b9w81"; + version = "0.2.0"; + sha256 = "0hjjsrk3rbj2q2n6pylg7xg583ns34iz7mg4mhsfgiadz593b7ph"; isLibrary = true; isExecutable = true; - buildDepends = [ array base template-haskell ]; - homepage = "http://maartenfaddegon.nl/pub"; - description = "Debug anything without recompiling everything!"; + buildDepends = [ + array base containers directory filepath libgraph mtl process + RBTree regex-posix template-haskell threepenny-gui + ]; + homepage = "http://maartenfaddegon.nl"; + description = "Lighweight algorithmic debugging based on observing intermediate values and the cost centre stack"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -12150,22 +12155,17 @@ self: { }) {}; "Rasterific" = callPackage - ({ mkDerivation, base, binary, criterion, deepseq, directory, dlist - , filepath, FontyFruity, free, JuicyPixels, mtl, primitive - , QuickCheck, statistics, vector, vector-algorithms + ({ mkDerivation, base, dlist, FontyFruity, free, JuicyPixels, mtl + , primitive, vector, vector-algorithms }: mkDerivation { pname = "Rasterific"; - version = "0.5.0.1"; - sha256 = "1q1102503ga2nncanww3pgvpgryj9c2q8gy3bmrd1f0lpv31fhn8"; + version = "0.5.0.2"; + sha256 = "0w4p1na6ksvsy9dc8lcpnkvj7x2d6n6w79ndzy257iqfcf03n1kc"; buildDepends = [ base dlist FontyFruity free JuicyPixels mtl primitive vector vector-algorithms ]; - testDepends = [ - base binary criterion deepseq directory filepath FontyFruity - JuicyPixels QuickCheck statistics vector - ]; description = "A pure haskell drawing engine"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -14716,8 +14716,8 @@ self: { ({ mkDerivation, base, containers, directory, Win32 }: mkDerivation { pname = "Win32-notify"; - version = "0.3"; - sha256 = "0mykxfasrl44fg7d7dzi0kabcsxhq3pa86pcy53ppgskn42g8x80"; + version = "0.3.0.1"; + sha256 = "0zzbb00rykl8y1prkcm3paaamhmdrqji34070b9zg7sg2pc5k4f4"; isLibrary = true; isExecutable = true; buildDepends = [ base containers directory Win32 ]; @@ -16588,27 +16588,27 @@ self: { "aeson-schema" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers - , directory, filepath, hashable, hint, HUnit, mtl, QuickCheck - , regex-pcre, syb, template-haskell, temporary, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, th-lift - , transformers, unordered-containers, vector + , directory, filepath, ghc-prim, hashable, hint, HUnit, mtl + , QuickCheck, regex-base, regex-compat, regex-pcre, scientific, syb + , template-haskell, temporary, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, th-lift, transformers + , unordered-containers, vector }: mkDerivation { pname = "aeson-schema"; - version = "0.2.0.1"; - sha256 = "12xlrkb06as9s8ns64fqkh8b24r13fywzk0nxm3128ak0b4db4z0"; + version = "0.3.0.0"; + sha256 = "0glnx168klmfhq2rsp3h149hyafym2rlw9n00vja13kxs557k8s6"; buildDepends = [ - aeson attoparsec base bytestring containers mtl QuickCheck - regex-pcre syb template-haskell text th-lift transformers - unordered-containers vector + aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck + regex-base regex-compat regex-pcre scientific syb template-haskell + text th-lift transformers unordered-containers vector ]; testDepends = [ aeson attoparsec base bytestring containers directory filepath - hashable hint HUnit mtl QuickCheck template-haskell temporary - test-framework test-framework-hunit test-framework-quickcheck2 text - unordered-containers vector + hashable hint HUnit mtl QuickCheck regex-compat scientific + template-haskell temporary test-framework test-framework-hunit + test-framework-quickcheck2 text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/timjb/aeson-schema"; description = "Haskell JSON schema validator and parser generator"; license = stdenv.lib.licenses.mit; @@ -17574,16 +17574,18 @@ self: { "amazonka" = callPackage ({ mkDerivation, amazonka-core, base, bytestring, conduit - , exceptions, http-conduit, lens, mmorph, monad-control, mtl - , resourcet, retry, text, time, transformers, transformers-base + , conduit-extra, cryptohash, cryptohash-conduit, exceptions + , http-conduit, lens, mmorph, monad-control, mtl, resourcet, retry + , text, time, transformers, transformers-base }: mkDerivation { pname = "amazonka"; - version = "0.2.3"; - sha256 = "0zdkpk08m6d4cg0x7z8wkf27x01d3qrpsp31p0mhzsgmdrvr998m"; + version = "0.3.0"; + sha256 = "0zjdd50rhkhb31y1c65wqggc1dgvl9ycxkr8hnqgsvq4q1nz0hn1"; buildDepends = [ - amazonka-core base bytestring conduit exceptions http-conduit lens - mmorph monad-control mtl resourcet retry text time transformers + amazonka-core base bytestring conduit conduit-extra cryptohash + cryptohash-conduit exceptions http-conduit lens mmorph + monad-control mtl resourcet retry text time transformers transformers-base ]; jailbreak = true; @@ -17596,8 +17598,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-autoscaling"; - version = "0.2.3"; - sha256 = "13kpibj6c23lwj4gj401jdhq480hy8qhcphvasqmkh7xs7vabn81"; + version = "0.3.0"; + sha256 = "1kp82bkcmpigidppb2a7isxjl9kls76csd85q4aym50apzhfvmqr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; @@ -17609,8 +17611,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudformation"; - version = "0.2.3"; - sha256 = "1i2b07swgq6i4szwl3y2jl8p7bc68hfcfpp338ghg970rvjps6ja"; + version = "0.3.0"; + sha256 = "1rxdlygbr423f4g6y5aizv3anpcyq56nx3yp5363v3k9xi96dnzq"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; @@ -17622,8 +17624,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudfront"; - version = "0.2.3"; - sha256 = "1r6vs3xfph1i9b36s7kn5d70bls7fwwhrd94drv5f0rcm372ck9b"; + version = "0.3.0"; + sha256 = "02b09208amcv91jcc8lmznbjvvf1bgz9cp3vc9f1s69mb4b09azr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; @@ -17635,8 +17637,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "0.2.3"; - sha256 = "0rak82ahr6qvi4ahkrmxrbivnda06bw91z3zg1lgl6qxyas0601m"; + version = "0.3.0"; + sha256 = "0hjx5cxpf7wmz7pyc4ry7g8khp40f1i4fx366c7va48cmw42zkjl"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; @@ -17648,8 +17650,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "0.2.3"; - sha256 = "18zrmr43045ql886fjz0911j80sdhj34xvxqbpx47xmwmwinqa58"; + version = "0.3.0"; + sha256 = "0kgrgc6l901y5vf6z8has0610cd29k6x3iicb3pwpq00vamiq1b4"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; @@ -17661,8 +17663,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "0.2.3"; - sha256 = "0xchvnqvjbl808yy08kh7zqkpl2wjn7yyqy0wjisw0az106smp1g"; + version = "0.3.0"; + sha256 = "09xalcrw56wbba86ibhjkxpcmj4sdxkfzxy2s2n0i9zb0nk4asfw"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; @@ -17674,8 +17676,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "0.2.3"; - sha256 = "0i5z4p1qrn15g0khi66bcdp6m8nlac0r7lafgfqj5mndj3ml08bp"; + version = "0.3.0"; + sha256 = "1pzaqavz86h9a44gyby5qxjh5sikc105kh2kkpa6h3lhvpp4ka59"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; @@ -17687,8 +17689,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "0.2.3"; - sha256 = "0szdk7z4z2dzflzff46mjn627i9dlpqzvzwrv0rnhm2wcdz5i2i5"; + version = "0.3.0"; + sha256 = "1xbqcid23k6y6b48fv4p3clbzd1inbm47lwyqyakxgk1ch6bgpzp"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; @@ -17699,8 +17701,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "0.2.3"; - sha256 = "16kjzpr70m0ag7ss7ijswhw6h25xikp280hd6ng4dwdplgzci1zl"; + version = "0.3.0"; + sha256 = "00qlqrdzlljqy8cdi52qwxq3jxqh9rzif8pbz5r9ps3zw1ris1q7"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; @@ -17712,8 +17714,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-codedeploy"; - version = "0.2.3"; - sha256 = "0dp1nhsand12fcv1z0p238i04ajylkqjb0wf8a0ksv0997zgzaw5"; + version = "0.3.0"; + sha256 = "12bqpl3xvf9sk2aldxpjr98131j56yyjzwy01pynr9pid132c3a1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; @@ -17725,8 +17727,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "0.2.3"; - sha256 = "0awhxx148rkla192pvk8qwiw87z7hy8z2nsa33aysbs47aasnsdj"; + version = "0.3.0"; + sha256 = "1v07fb55rc80w0pddryvn2qnxsd7g2j6rjpmydrflg3090jq8zbf"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; @@ -17738,8 +17740,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "0.2.3"; - sha256 = "09wvx1mp8vxx8hkwdgkrdhkfclb7v0g5q9lk4a42r70yf2qfq2fw"; + version = "0.3.0"; + sha256 = "16cv000pmp9n0312sp9wnsj7h2z23w6657r0gi1q4z9xqwj4nkkz"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; @@ -17751,8 +17753,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-config"; - version = "0.2.3"; - sha256 = "0acs6gh9qkwdv9kcp9giyz021w0jzq47340shc44zwx5l0s0a1af"; + version = "0.3.0"; + sha256 = "1znrz1gp52fv8qjyzlbygxcn10w687bakrczixcvwqnrw3krsi25"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; @@ -17763,23 +17765,22 @@ self: { "amazonka-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, bifunctors, bytestring, case-insensitive - , conduit, conduit-extra, cryptohash, cryptohash-conduit - , data-default-class, hashable, http-client, http-types, lens - , mmorph, mtl, nats, resourcet, scientific, semigroups, tagged - , tasty, tasty-hunit, template-haskell, text, time, transformers - , unordered-containers, vector, xml-conduit + , conduit, conduit-extra, cryptohash, data-default-class, hashable + , http-client, http-types, lens, mmorph, mtl, nats, resourcet + , scientific, semigroups, tagged, tasty, tasty-hunit + , template-haskell, text, time, transformers, unordered-containers + , vector, xml-conduit }: mkDerivation { pname = "amazonka-core"; - version = "0.2.3"; - sha256 = "1s9mlkrql7vmm14nppx9ixlk3364rc50m4k1lgxiddmz2hhc74v0"; + version = "0.3.0"; + sha256 = "1pgxap976rc5sfqd1cy3092r6ckfnjswk44gccfy2rcxn0cxvmsj"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bifunctors bytestring case-insensitive conduit conduit-extra - cryptohash cryptohash-conduit data-default-class hashable - http-client http-types lens mmorph mtl nats resourcet scientific - semigroups tagged text time transformers unordered-containers - vector xml-conduit + cryptohash data-default-class hashable http-client http-types lens + mmorph mtl nats resourcet scientific semigroups tagged text time + transformers unordered-containers vector xml-conduit ]; testDepends = [ aeson base tasty tasty-hunit template-haskell text time @@ -17794,8 +17795,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-datapipeline"; - version = "0.2.3"; - sha256 = "1b4pz5shyms8zb5d46z51rawj7pvajsbbgprkzw2jm522d0cmzvq"; + version = "0.3.0"; + sha256 = "1q69c2chhnkz9sajcy6cpbzc3dlnq5fi7qppf63lfa3291a7pkpl"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; @@ -17807,8 +17808,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-directconnect"; - version = "0.2.3"; - sha256 = "0cn2rf2lddjvfcsznhpfirl8nj47pmrfdqxx4jp2kly5yxcwrivv"; + version = "0.3.0"; + sha256 = "0cvainbvqb2b9kn8l1jm6rvc16hwd8nd91bz46sm6r4i30yv0848"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; @@ -17820,8 +17821,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-dynamodb"; - version = "0.2.3"; - sha256 = "02402hrqp8iwjq7mww8s3z5vx37fh2n3slv4fvz0bz38dgbgfpz2"; + version = "0.3.0"; + sha256 = "1wyslkbj7jkz8y72djfwa9gknjxwckpm8k369slhqsrj3z0yhi3k"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; @@ -17833,8 +17834,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ec2"; - version = "0.2.3"; - sha256 = "0hcq8l4bilb8fd91k8nsv96xkrc2gqvy1ms95iycwhc8lm1g0wa0"; + version = "0.3.0"; + sha256 = "1ip5x1g6khnywmr0l0naswl02j1s35hxmklra07hz86v6zrlnxhh"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; @@ -17842,12 +17843,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-ecs" = callPackage + ({ mkDerivation, amazonka-core, base }: + mkDerivation { + pname = "amazonka-ecs"; + version = "0.3.0"; + sha256 = "0wm7si0yvn3xh5ad6ycz181yjqlil1l056asw73c8yxfy3g3n0q6"; + buildDepends = [ amazonka-core base ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon EC2 Container Service SDK"; + license = "unknown"; + }) {}; + "amazonka-elasticache" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticache"; - version = "0.2.3"; - sha256 = "1vj3dmcfrql8r3m50ck7afilbv8knp9cd5g0x7l6c1qp3klnz9b9"; + version = "0.3.0"; + sha256 = "0s97ssb4bgkc5ahrjm5dbydnjp7k3sqms1885d978bfnsmrrc91l"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; @@ -17859,8 +17872,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "0.2.3"; - sha256 = "0lrv91mx3bml3gc8cw9pjlb2klag9bnxajgjl44vxacnbs2qb4xz"; + version = "0.3.0"; + sha256 = "02mznpghvzz6inf918dzv3cdid3yamnxfbq136aah97j8vzcj0g1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; @@ -17872,8 +17885,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "0.2.3"; - sha256 = "1fm3hyg798zajrflp09wvmzs5ih2614xkbr8ylnwkzjfpspqi9s9"; + version = "0.3.0"; + sha256 = "0kbh30rz2zx7zw5sh32806g3kr19ijhp71c5wi07i1j949r2ixss"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; @@ -17885,8 +17898,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elb"; - version = "0.2.3"; - sha256 = "1m59zb62d80h6pbhc4azqnmalgn0hs60ij0q9dgr4igxlbwag5d8"; + version = "0.3.0"; + sha256 = "14wvh8r63q5kyyfhh0nh5sq29wn19dy6kjj62k8ysph54bm7d7i2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; @@ -17898,8 +17911,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-emr"; - version = "0.2.3"; - sha256 = "0khmhhhlwwfbb8h2f5djqvpy3c8lh18hy6wvwwxznc2raqlrpvgq"; + version = "0.3.0"; + sha256 = "09f3yclyg0hjqybkpfi61wrsfvxa7mlcai8il3maya78sbrz8bj9"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; @@ -17907,12 +17920,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "amazonka-glacier" = callPackage + ({ mkDerivation, amazonka-core, base }: + mkDerivation { + pname = "amazonka-glacier"; + version = "0.3.0"; + sha256 = "1gj17z7k63a0cdqhjn6f4ylawa8hv5b45hrdqw103fn13qn860hr"; + buildDepends = [ amazonka-core base ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Amazon Glacier SDK"; + license = "unknown"; + }) {}; + "amazonka-iam" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-iam"; - version = "0.2.3"; - sha256 = "1yayzjr8zjrcw8ynprw4737qg0zi580mcxc0r51g8dik19fg6rly"; + version = "0.3.0"; + sha256 = "0lch80bl2p5c78qqam1hwffslzdnqwc5paiyja70z41n4cf9zw9d"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; @@ -17924,8 +17949,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-importexport"; - version = "0.2.3"; - sha256 = "0874iyrq3lsk4b3hpxh491c5jic9y8ififqsxgxv70ywipvfr7d0"; + version = "0.3.0"; + sha256 = "0kbsnbwnlxxnn58mwr7pkqc6jzkwlryq3h7vmzgvnm2xa0gv9vrp"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; @@ -17937,8 +17962,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kinesis"; - version = "0.2.3"; - sha256 = "0i2bv484hhh0rg47669i51qizcm904cq74amf93a5c8pbla1b2fb"; + version = "0.3.0"; + sha256 = "157ayynhc847hc2mk14hkcxbx0z15r5ymfykhf909qwv6js70xs4"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; @@ -17950,8 +17975,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kms"; - version = "0.2.3"; - sha256 = "1xd27qfm08ygi3vlk35qma381p4dq6q357qm5jasfpcm9jj33rss"; + version = "0.3.0"; + sha256 = "00psl8hffvgbl2zl24pfp7lrhis5j971cvyrazr4vgr43iss3ww4"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; @@ -17962,8 +17987,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-lambda"; - version = "0.2.3"; - sha256 = "09hjb5qyvd4yairwxrpajksdrzqva350qnqh9azb9xzlsl6wfxry"; + version = "0.3.0"; + sha256 = "0il89vnwywqisfl4lyibjfi1ihpxba58drbvag4x5rf19nw1glc1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; @@ -17975,8 +18000,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-opsworks"; - version = "0.2.3"; - sha256 = "09scxvk2jp8k4a7ggaphq0ywp3f4d5xy422sds55kfd0m32cqcpg"; + version = "0.3.0"; + sha256 = "07gz564x624jzh7yca4vkla770ly1781kyj5qg70qs3k4kf2b7gm"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; @@ -17988,8 +18013,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-rds"; - version = "0.2.3"; - sha256 = "13hgkww38p1q79xzpd4gj9dv2rzhsba9z8lh5gb4iqyb34831c0i"; + version = "0.3.0"; + sha256 = "1bzxim2mafgb3gaxzj7vx04w4b1cljywwf3vyq9gn3p9i3dc2qh2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; @@ -18001,8 +18026,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-redshift"; - version = "0.2.3"; - sha256 = "05pm2v1hqb5aha979mrx59d9qxqr3kn8f402m30lp0v0gfqlvxj0"; + version = "0.3.0"; + sha256 = "1x5dbzdqrkdf47fixqajb13lqh9j5zpb1src45pszjgy1pnf9zkc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; @@ -18014,8 +18039,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53"; - version = "0.2.3"; - sha256 = "1qklx8iv7isasys02n5ga6ml83j86lmgi92dlwa5spqbvrq8cqbs"; + version = "0.3.0"; + sha256 = "1pb5f2yl640kikqz83arwcnjxz5abwpx04klnp6ypay7sxnpl0sq"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; @@ -18027,8 +18052,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53-domains"; - version = "0.2.3"; - sha256 = "0gxjfjw82nhiza7gxpj2qbyli8jd45rbhgmx17vqj5f741b186d8"; + version = "0.3.0"; + sha256 = "15sk43545qbnh4r3chm44fxsjr1rjjafhqc8pmy0p08r45v82bf2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; @@ -18040,8 +18065,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-s3"; - version = "0.2.3"; - sha256 = "1mv8qz5i4bbiarfai4ryvwwbx52dc8hd4kfi75avglmji8cda315"; + version = "0.3.0"; + sha256 = "0akkfj6yzjpfgrpzi2mscv03hdhv3ym8vslms17xdp5f9ydba0wv"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; @@ -18053,8 +18078,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sdb"; - version = "0.2.3"; - sha256 = "0bd3xr85vp8i6qkd3nqhcppc5vvzgqc1f1xjcbk3mp03vdxbpaal"; + version = "0.3.0"; + sha256 = "10vm8jr7ljkmpa8xwn96262jf2i8cb3c1cxw0dagry101im7wxdg"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; @@ -18066,8 +18091,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ses"; - version = "0.2.3"; - sha256 = "0657j13v78laz8bv2lpmzr44bijifbx59g0fsv76m3jfirkgv1lj"; + version = "0.3.0"; + sha256 = "1vmwkjb37w2jgrvfhj3mx3z6h3q52jkqh3c2fkc27a9q5jyi43p5"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; @@ -18079,8 +18104,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sns"; - version = "0.2.3"; - sha256 = "11xkzgcflz5smp0mpbbsl2l61g5qwzmrzfxvkq0rzavfaqpr6jzc"; + version = "0.3.0"; + sha256 = "1njvanj7bw0r4l1fhg7nq89sz8sx9cahxjwczr7ab3cf7a03ndra"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; @@ -18092,8 +18117,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sqs"; - version = "0.2.3"; - sha256 = "1gziq56fs5iggasggn4d2k7q6dvrg2shabnfgmk7c9pxsqbaj2c6"; + version = "0.3.0"; + sha256 = "06786g4mdy58ca1hdwi6dfa3xlkzf2la8x7c8zqyf6848a573yb1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; @@ -18105,8 +18130,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-storagegateway"; - version = "0.2.3"; - sha256 = "1pj0cnixbqwwxpwh46bcm96j0b686vwd6cdglb3rhg2nq76whjs1"; + version = "0.3.0"; + sha256 = "1d75q42z3yvwdav95na5xdxssk4zjgbr77fs1j63x1991p0ar06c"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; @@ -18118,8 +18143,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sts"; - version = "0.2.3"; - sha256 = "13wisry1c0fig9vw6nr9pw7jwyq4p2gylb568al5s812hw2nisxg"; + version = "0.3.0"; + sha256 = "1xxkch0n5f89s7qqv14vfichv5ldlx6qk8gwzccqvf1wxwcgpbhc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; @@ -18131,8 +18156,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-support"; - version = "0.2.3"; - sha256 = "0sqsx03iw0cf9is491y0gwpaw1xv39nplmja1a2as3iw46vf3382"; + version = "0.3.0"; + sha256 = "0c5fh50qyr8wfl7031x4gksablp3g9kyj6phjpxndzy6hh4cfim2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; @@ -18144,8 +18169,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-swf"; - version = "0.2.3"; - sha256 = "06a7mx44crgh3dwx8amvrqwprdrlhdhvmyw3jybzidm5c2lfjyay"; + version = "0.3.0"; + sha256 = "0s60jgyps1mgaa0kqpi7acqss8j1wn2mjrp8rl69ivarhsyh0ijh"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; @@ -18741,6 +18766,7 @@ self: { base bytestring http-types HUnit mtl test-framework test-framework-hunit wai wai-extra ]; + jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Simple and type safe web framework that generate web API documentation"; license = stdenv.lib.licenses.mit; @@ -20090,8 +20116,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-core"; - version = "0.4.0.0"; - sha256 = "1g802w7b31isjix2xypia26vqhy73cxrjk8izhxcnqyl4f6g5ym2"; + version = "0.5.0.0"; + sha256 = "09v6q0pnl68jv9mq4hlzzz2lqih172zymv9j2f0fpidmq67ayz9b"; buildDepends = [ aeson atlassian-connect-descriptor base base64-bytestring bytestring case-insensitive cipher-aes configurator containers @@ -20973,8 +20999,8 @@ self: { }: mkDerivation { pname = "aws-kinesis-client"; - version = "0.2.0.2"; - sha256 = "1zz9wxgcsnx28i9rg0sykjdmg0fhnv1ycgvzrxnpkph0j8zllsis"; + version = "0.2.0.3"; + sha256 = "16djyvzdmqssfsn97sjzmnq592bzxva4jsjdmxlp6yryqr8ciji3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21692,10 +21718,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-io-access"; - version = "0.3.0.1"; - sha256 = "0hgrxr5331lqk7n6vqpi8a05xwwdm3mbd0p52js0rjg9lqcy0akr"; + version = "0.4.0.0"; + sha256 = "0d0i8ndh2j42qf8ns9wprkjiffy3hyybgvs9nbf67yd50di6p263"; buildDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/bheklilr/base-io-access"; description = "The IO functions included in base delimited into small, composable classes"; license = stdenv.lib.licenses.gpl2; @@ -24360,6 +24385,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-builder_0_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, HUnit, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, utf8-string + }: + mkDerivation { + pname = "blaze-builder"; + version = "0.4.0.0"; + sha256 = "0xhxz2g7hgp892n8qcq7iw136fv2csw9aaq8123srs05z9j1lcfk"; + buildDepends = [ base bytestring deepseq text ]; + testDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text utf8-string + ]; + homepage = "http://github.com/lpsmith/blaze-builder"; + description = "Efficient buffered output"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blaze-builder-conduit" = callPackage ({ mkDerivation, base, conduit }: mkDerivation { @@ -27042,8 +27086,8 @@ self: { }: mkDerivation { pname = "calculator"; - version = "0.2.0.1"; - sha256 = "1ankmv93lpan83g37vzp9nhcxcx3n214p30sbjcryi6ign87cv8q"; + version = "0.2.0.2"; + sha256 = "0xamlq32mg60444sm0wl9vh89v1xgjf2b2vk2ks83f9vfzbfy989"; isLibrary = false; isExecutable = true; buildDepends = [ base containers haskeline mtl parsec QuickCheck ]; @@ -27096,23 +27140,25 @@ self: { "call" = callPackage ({ mkDerivation, base, bindings-portaudio, boundingboxes , clean-unions, colors, containers, control-bool, deepseq - , directory, distributive, elevator, filepath, freetype2, GLFW-b - , hashable, JuicyPixels, JuicyPixels-util, lens, linear - , minioperational, mtl, objective, OpenGL, OpenGLRaw, random - , reflection, template-haskell, text, transformers, vector, WAVE + , directory, distributive, elevator, extensible, filepath + , freetype2, GLFW-b, hashable, JuicyPixels, JuicyPixels-util, lens + , linear, minioperational, mtl, objective, OpenGL, OpenGLRaw + , random, reflection, template-haskell, text, transformers, vector + , WAVE }: mkDerivation { pname = "call"; - version = "0.1.2"; - sha256 = "11nm2h9z758c6j77a60aaln53p2izrcnaygklapv5l46dmgjiy8b"; + version = "0.1.3"; + sha256 = "11gk7wgkrid6k546ilcz3ik8cwclfss6hby1rgla9znyd5lqk7l9"; isLibrary = true; isExecutable = true; buildDepends = [ base bindings-portaudio boundingboxes clean-unions colors containers control-bool deepseq directory distributive elevator - filepath freetype2 GLFW-b hashable JuicyPixels JuicyPixels-util - lens linear minioperational mtl objective OpenGL OpenGLRaw random - reflection template-haskell text transformers vector WAVE + extensible filepath freetype2 GLFW-b hashable JuicyPixels + JuicyPixels-util lens linear minioperational mtl objective OpenGL + OpenGLRaw random reflection template-haskell text transformers + vector WAVE ]; jailbreak = true; homepage = "https://github.com/fumieval/call"; @@ -27356,8 +27402,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "2.2.0.3"; - sha256 = "1f2xwwrn63wnffhblxwzpvbr7vqi2sz2v2bb3bbs9bf03mb78pja"; + version = "2.2.0.4"; + sha256 = "1qn3ghsp340mmq9a49icsr33pyibdqlnw1mg1i1gqglvwlanqysw"; buildDepends = [ base casadi-bindings-core casadi-bindings-internal containers linear vector @@ -27796,6 +27842,7 @@ self: { http-conduit lens lens-aeson mtl text transformers unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/MichelBoucey/cayley-client"; description = "An Haskell client for Cayley graph database"; license = stdenv.lib.licenses.bsd3; @@ -29046,6 +29093,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "clac" = callPackage + ({ mkDerivation, base, containers, optparse-applicative, plailude + , pretty-tree, safe, split + }: + mkDerivation { + pname = "clac"; + version = "0.3.0"; + sha256 = "0vqsp0wp5kf40wxclwpqvkn057ndajxn2nx16ndb60r7xmh59inp"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers optparse-applicative plailude pretty-tree safe + split + ]; + description = "Simple CLI RPN calculator"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "clafer" = callPackage ({ mkDerivation, aeson, array, base, bytestring, cmdargs , containers, data-stringmap, directory, executable-path, filepath @@ -34451,8 +34516,8 @@ self: { }: mkDerivation { pname = "curve25519"; - version = "0.2"; - sha256 = "05dmc66wxli6dy25gyhxnyb5z3dj27jpygf9msspzbghi94hvr4m"; + version = "0.2.1"; + sha256 = "1kfs7cjxig0rk17nb7dzi189msww90yw0066rlalw01kff5w2hdy"; buildDepends = [ base bytestring crypto-api ]; testDepends = [ base bytestring crypto-api DRBG HUnit QuickCheck tagged @@ -34963,6 +35028,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "darkplaces-demo" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , darkplaces-text, data-binary-ieee754, directory, mtl + , optparse-applicative, regex-tdfa, transformers + }: + mkDerivation { + pname = "darkplaces-demo"; + version = "0.1"; + sha256 = "0map78fnnqm2nlh92xrxmg3fs9q2hb4pl87hyara41v2dvwlsj3f"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base binary bytestring containers darkplaces-text + data-binary-ieee754 directory mtl optparse-applicative regex-tdfa + transformers + ]; + homepage = "https://github.com/bacher09/darkplaces-demo"; + description = "Utility and parser for DarkPlaces demo files"; + license = stdenv.lib.licenses.gpl2; + }) {}; + + "darkplaces-text" = callPackage + ({ mkDerivation, alex, ansi-terminal, array, base, bytestring, text + , vector + }: + mkDerivation { + pname = "darkplaces-text"; + version = "0.1"; + sha256 = "08zqrivqz57r0ifjpgksm5l8h19zmsxcicwf97h3andds62v05lf"; + buildDepends = [ ansi-terminal array base bytestring text vector ]; + buildTools = [ alex ]; + homepage = "https://github.com/bacher09/darkplaces-text"; + description = "Parser for darkplaces colorful text"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "dash-haskell" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, direct-sqlite , directory, either, ghc, haddock-api, mtl, optparse-applicative @@ -35358,14 +35459,16 @@ self: { }) {}; "data-filepath" = callPackage - ({ mkDerivation, base, ghc-prim, semigroups, split + ({ mkDerivation, base, bifunctors, ghc-prim, semigroups, split , template-haskell }: mkDerivation { pname = "data-filepath"; - version = "2.1.1.0"; - sha256 = "00x8z4pyqbwpdbsvkzdrdvbgqm01rjqklp7j7hig0s9dv6dfr9fr"; - buildDepends = [ base ghc-prim semigroups split template-haskell ]; + version = "2.2.0.0"; + sha256 = "1l71sg02rqgk7i6w401il7crx3ikdbxi5wbb6ida677pfdrpm7f7"; + buildDepends = [ + base bifunctors ghc-prim semigroups split template-haskell + ]; homepage = "https://github.com/maxpow4h/data-filepath"; description = "A type safe file path data structure"; license = stdenv.lib.licenses.bsd3; @@ -36080,6 +36183,7 @@ self: { base containers hashable HUnit test-framework test-framework-hunit text ]; + jailbreak = true; description = "An implementation of datalog in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -36288,10 +36392,9 @@ self: { }: mkDerivation { pname = "dbus-th"; - version = "0.1.1.0"; - sha256 = "1rwxbv92x7c0psp2s88cn168zkxdghviym9zpaz13av7ix06zx7a"; + version = "0.1.1.1"; + sha256 = "0sxk7m8fdd7cx0n0lbcfz2bv28d0i8v0im50y1sciac7pi13q4bc"; buildDepends = [ base containers dbus syb template-haskell text ]; - jailbreak = true; description = "TemplateHaskell generator of DBus bindings"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -37812,15 +37915,14 @@ self: { }: mkDerivation { pname = "diagrams-rasterific"; - version = "0.1.0.6"; - sha256 = "0hj42ln9gynjcnz7r2r71l73c262jkrdkdl7sy1a99qb4dbr15c6"; + version = "0.1.0.7"; + sha256 = "180ip125phg6q7wvmsq57pdwfc8fq8a5vfadizcqfmc6ng6xzd88"; buildDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib directory filepath FontyFruity JuicyPixels lens mtl old-time optparse-applicative process Rasterific split statestack time unix ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; @@ -41153,6 +41255,7 @@ self: { base bifunctors exceptions free monad-control MonadRandom mtl profunctors semigroupoids semigroups transformers transformers-base ]; + jailbreak = true; homepage = "http://github.com/ekmett/either/"; description = "An either monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -41240,8 +41343,8 @@ self: { }: mkDerivation { pname = "ekg-core"; - version = "0.1.0.2"; - sha256 = "0iipj2q4msawxlvzzikiy7jls22ncbx7v3ldi7y75d52cyl2lmpg"; + version = "0.1.0.3"; + sha256 = "0d2hvj9g62xkaah8iizgr668ij53164nnrdjkikhc2igi6wk31k4"; buildDepends = [ base containers ghc-prim text unordered-containers ]; @@ -42145,6 +42248,7 @@ self: { version = "1.7.0"; sha256 = "1h4ajq1rraiz7qw7350128n26jnqhzk9iyjzqc3lnbyx87q8j73v"; buildDepends = [ base exceptions mtl ]; + jailbreak = true; description = "*Very* basic Erlang-like process support for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -42902,6 +43006,7 @@ self: { buildDepends = [ base exceptions hashable stm time transformers vector ]; + jailbreak = true; homepage = "https://github.com/kim/ex-pool"; description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint"; license = stdenv.lib.licenses.bsd3; @@ -42995,17 +43100,16 @@ self: { }) {}; "exceptions" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, test-framework + ({ mkDerivation, base, mtl, QuickCheck, stm, test-framework , test-framework-quickcheck2, transformers }: mkDerivation { pname = "exceptions"; - version = "0.6.1"; - sha256 = "09jv5jskv48fd5la1pdvafwc9j2jxj1ncf6yxzkwcjddynbkyszm"; - editedCabalFile = "e86a40308d3a603a445e0fc2989d83fbf4216e96e7d241e7703e4394442ac9d6"; - buildDepends = [ base mtl transformers ]; + version = "0.7"; + sha256 = "0y69xxwxvhyshbd687h30nk5sfly9khbbimclz5gfaf2k9sl6k9p"; + buildDepends = [ base mtl stm transformers ]; testDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 + base mtl QuickCheck stm test-framework test-framework-quickcheck2 transformers ]; homepage = "http://github.com/ekmett/exceptions/"; @@ -43353,12 +43457,12 @@ self: { }) {}; "extensible" = callPackage - ({ mkDerivation, base, deepseq, template-haskell }: + ({ mkDerivation, base, binary, deepseq, template-haskell }: mkDerivation { pname = "extensible"; - version = "0.2.8"; - sha256 = "11akhq1p88n0s5z06w0d0zdyyy4qa7jdlgkk2n4h2x74r3dc9g1g"; - buildDepends = [ base deepseq template-haskell ]; + version = "0.2.9"; + sha256 = "1qr4b2nm3nixfv0s9h7mbg6n9lry521bag1r8320vi1rszlrvj0g"; + buildDepends = [ base binary deepseq template-haskell ]; homepage = "https://github.com/fumieval/extensible"; description = "Extensible, efficient, lens-friendly data types"; license = stdenv.lib.licenses.bsd3; @@ -43788,22 +43892,24 @@ self: { "fay" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , directory, filepath, ghc-paths, haskell-names, haskell-packages - , haskell-src-exts, language-ecmascript, mtl, optparse-applicative - , process, safe, sourcemap, split, spoon, syb, text, time - , transformers, uniplate, unordered-containers, utf8-string, vector + , haskell-src-exts, language-ecmascript, mtl, mtl-compat + , optparse-applicative, process, safe, sourcemap, split, spoon, syb + , text, time, transformers, transformers-compat, uniplate + , unordered-containers, utf8-string, vector }: mkDerivation { pname = "fay"; - version = "0.22.0.0"; - sha256 = "1001zwg0gsdvy7kvlkyc10ky04ci297vb3chvwlv13yby36mrmn8"; + version = "0.23.0.0"; + sha256 = "112pdpp4pvgs6y7351a218l00lrg9fhgpzykra4c9yaayclkbcd5"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring containers data-default directory filepath ghc-paths haskell-names haskell-packages haskell-src-exts - language-ecmascript mtl optparse-applicative process safe sourcemap - split spoon syb text time transformers uniplate - unordered-containers utf8-string vector + language-ecmascript mtl mtl-compat optparse-applicative process + safe sourcemap split spoon syb text time transformers + transformers-compat uniplate unordered-containers utf8-string + vector ]; jailbreak = true; homepage = "https://github.com/faylang/fay/wiki"; @@ -43816,8 +43922,8 @@ self: { ({ mkDerivation, base, fay }: mkDerivation { pname = "fay-base"; - version = "0.19.4.2"; - sha256 = "1rch4mwkvxccw8jcndhwvf5n0f9bnwpfg6qnbhbwls4y1cvlcihr"; + version = "0.20.0.0"; + sha256 = "07hizichy7jnlirxq3sh2gjw4k21cfnqpswihbzkcvz0fnmd9sw3"; buildDepends = [ base fay ]; homepage = "https://github.com/faylang/fay/"; description = "The base package for Fay"; @@ -43831,8 +43937,8 @@ self: { }: mkDerivation { pname = "fay-builder"; - version = "0.2.0.2"; - sha256 = "0sbizici0465ih1jpgn768p8hf3s42qva72wldf9bbaps80dc8ya"; + version = "0.2.0.3"; + sha256 = "1kkx6abrvbd2cdwpgdx7cpwyfqpk31zwrxfw9kr1ngayf7sgzc9s"; buildDepends = [ base Cabal data-default directory fay filepath safe split text ]; @@ -43845,8 +43951,8 @@ self: { ({ mkDerivation, fay-base }: mkDerivation { pname = "fay-dom"; - version = "0.5"; - sha256 = "1r8kl6wbrl516qc29zs93png922p7zzg2lagvkcf2cb506qg1mr1"; + version = "0.5.0.1"; + sha256 = "1zm6w6nccswaksr283alhnsss6xw4k7s61yp8ff4lg5127ff9wp0"; buildDepends = [ fay-base ]; homepage = "https://github.com/faylang/fay-dom"; description = "DOM FFI wrapper library for Fay"; @@ -43898,8 +44004,8 @@ self: { ({ mkDerivation, fay, fay-base, text }: mkDerivation { pname = "fay-text"; - version = "0.3.2.1"; - sha256 = "1qng6zlzd96m4zcanvz58qhz9pqj71ya59y6a12gp46mdn2hcqv1"; + version = "0.3.2.2"; + sha256 = "1q1v8jzkccy9arq6jkz4ynpzm1691d1dv9wzyi4i5m6n0gl7aans"; buildDepends = [ fay fay-base text ]; homepage = "https://github.com/faylang/fay-text"; description = "Fay Text type represented as JavaScript strings"; @@ -44547,18 +44653,17 @@ self: { "file-location" = callPackage ({ mkDerivation, base, containers, lifted-base, process - , template-haskell, transformers + , template-haskell, th-orphans, transformers }: mkDerivation { pname = "file-location"; - version = "0.4.5.3"; - sha256 = "0d1iqhdac1gcag1d7ch9ia4fm97jpp31m46b794z90bmm6nr29h9"; + version = "0.4.7.1"; + sha256 = "0p4fj7jjsssn3bdn2z984q2wyngc6cfygbgprzndcw0bxqi78jl4"; buildDepends = [ - base containers lifted-base template-haskell transformers - ]; - testDepends = [ - base containers lifted-base process template-haskell transformers + base containers lifted-base template-haskell th-orphans + transformers ]; + testDepends = [ base lifted-base process ]; homepage = "https://github.com/gregwebs/FileLocation.hs"; description = "common functions that show file location information"; license = stdenv.lib.licenses.bsd3; @@ -48340,8 +48445,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.1.3.0"; - sha256 = "13p09mj92jh4y0v2r672d49fmlz3l5r2r1lqg0jjy6kj045wcfdn"; + version = "0.1.4.0"; + sha256 = "0d29bl64gsij7169wvqgdkr8vcn35jdbqyq2aky53wcbhw4kq7k7"; buildDepends = [ base ghc ]; buildTools = [ cpphs happy ]; patchPhase = '' @@ -49415,8 +49520,8 @@ self: { }: mkDerivation { pname = "gl"; - version = "0.7.2"; - sha256 = "1rarbvxffh2gvn8hz363z59lsjdjqmxc5m995z7lpibc6m4rh054"; + version = "0.7.2.3"; + sha256 = "0kc701k81al4zyarp6zn65is039hpa2ahvr3m5as86qw8kah8h8b"; buildDepends = [ base containers directory filepath fixed half hxt split transformers @@ -50942,17 +51047,18 @@ self: { }) {}; "groundhog" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers - , monad-control, monad-logger, mtl, text, time, transformers - , transformers-base + ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder + , bytestring, containers, monad-control, monad-logger, mtl + , scientific, text, time, transformers, transformers-base }: mkDerivation { pname = "groundhog"; - version = "0.7.0.1"; - sha256 = "1g50qwwxp999g1r8486vqr12facmlxy6nz9vz412v6y469ww5b1x"; + version = "0.7.0.2"; + sha256 = "09wyhqpwmdmw13nbxrrdkc4jsl46pwnq0yhcjzdn9g3s5049s0by"; buildDepends = [ - base blaze-builder bytestring containers monad-control monad-logger - mtl text time transformers transformers-base + aeson base base64-bytestring blaze-builder bytestring containers + monad-control monad-logger mtl scientific text time transformers + transformers-base ]; homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; @@ -51005,8 +51111,8 @@ self: { }: mkDerivation { pname = "groundhog-postgresql"; - version = "0.7.0.1"; - sha256 = "0xsiq7ma5bp6fhy4bigdxly1wi9h2kq8sbk5gxr43fvvm402h9k1"; + version = "0.7.0.2"; + sha256 = "18wdj51v6qqyqx10lvknr3irhs5qddvh301bx7l9cdcpkk1la81i"; buildDepends = [ attoparsec base blaze-builder bytestring containers groundhog monad-control monad-logger postgresql-libpq postgresql-simple @@ -51239,9 +51345,7 @@ self: { "gstreamer" = callPackage ({ mkDerivation, array, base, bytestring, directory, glib - , gstreamer, gstreamer-audio, gstreamer-base, gstreamer-controller - , gstreamer-dataprotocol, gstreamer-net, gstreamer-plugins-base - , gtk2hs-buildtools, mtl + , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl }: mkDerivation { pname = "gstreamer"; @@ -51249,19 +51353,12 @@ self: { sha256 = "0grg20wsvdyfpm2y3ykw7d3j7s2hlbs8psjwfy0yfz3839yvccy6"; buildDepends = [ array base bytestring directory glib mtl ]; buildTools = [ gtk2hs-buildtools ]; - pkgconfigDepends = [ - gstreamer gstreamer-audio gstreamer-base gstreamer-controller - gstreamer-dataprotocol gstreamer-net gstreamer-plugins-base - ]; + pkgconfigDepends = [ gst_plugins_base gstreamer ]; jailbreak = true; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) gstreamer; gstreamer-audio = null; - gstreamer-base = null; gstreamer-controller = null; - gstreamer-dataprotocol = null; gstreamer-net = null; - gstreamer-plugins-base = null;}; + }) { inherit (pkgs) gst_plugins_base; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, haskeline @@ -52940,6 +53037,7 @@ self: { optparse-applicative process resourcet sqlite-simple system-fileio system-filepath tagsoup text transformers ]; + jailbreak = true; homepage = "https://github.com/philopon/haddocset"; description = "Generate docset of Dash by Haddock haskell documentation tool"; license = stdenv.lib.licenses.bsd3; @@ -55400,8 +55498,8 @@ self: { }: mkDerivation { pname = "haskell-names"; - version = "0.5.1"; - sha256 = "1dlivxigd1brcz1il0kz7qm40v8sgn4vqk8w5xxllniqrmiycjma"; + version = "0.5.2"; + sha256 = "0dxv33facklxyy6x9a3xxwv5avfzn6jbigl7zdd2zkvrr6rnz9zf"; buildDepends = [ aeson base bytestring Cabal containers data-lens-light filepath haskell-packages haskell-src-exts hse-cpp mtl tagged transformers @@ -55691,6 +55789,7 @@ self: { base haskell-src-exts pretty syb template-haskell th-orphans uniplate ]; + jailbreak = true; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -58553,6 +58652,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "heroku-persistent" = callPackage + ({ mkDerivation, base, bytestring, heroku, hspec + , persistent-postgresql, text + }: + mkDerivation { + pname = "heroku-persistent"; + version = "0.1.0"; + sha256 = "1ws4076dk4a8l2yz9mwfwqk57sm7y2ch2c5318agsm7hnwil7wbf"; + buildDepends = [ + base bytestring heroku persistent-postgresql text + ]; + testDepends = [ base hspec persistent-postgresql ]; + description = "Parse DATABASE_URL into configuration types for Persistent"; + license = stdenv.lib.licenses.mit; + }) {}; + "herringbone" = callPackage ({ mkDerivation, base, bytestring, containers, directory , http-types, mtl, old-locale, process, process-listlike @@ -59544,8 +59659,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "4.3.8"; - sha256 = "1plnkb3xfkqfaqvmzv3yi8c7iy8sbqjj3618pi3j9xa9rdi8yc0p"; + version = "4.3.9"; + sha256 = "0dasmssr19kbwxwi9hyx52k70j87b3vfxla6gpzf9k3aaqghcnvf"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -60392,8 +60507,8 @@ self: { ({ mkDerivation, base, bindings-DSL, git, openssl, process, zlib }: mkDerivation { pname = "hlibgit2"; - version = "0.18.0.13"; - sha256 = "1bslg51kkhnwm48kxaad4izq3xmzv6dpqy10a5kh16vr5zy3w5hz"; + version = "0.18.0.14"; + sha256 = "0fxglcgi0iwj9xqgx1f3dixia9pqfzz0yq9iq7flaggpr9pvn3n0"; buildDepends = [ base bindings-DSL zlib ]; testDepends = [ base process ]; buildTools = [ git ]; @@ -63702,13 +63817,13 @@ self: { }) {}; "hscurses" = callPackage - ({ mkDerivation, base, mtl, old-locale, old-time, unix }: + ({ mkDerivation, base, exceptions, mtl, old-locale, old-time, unix + }: mkDerivation { pname = "hscurses"; - version = "1.4.1.2"; - sha256 = "1r3njcwad8d4vn17s5g69iw3rhjz9hbhv49wkqqpndck5080fh7l"; - buildDepends = [ base mtl old-locale old-time unix ]; - jailbreak = true; + version = "1.4.2.0"; + sha256 = "0msf80475l3ncpnb1lcpnyscl1svmqg074ylb942rx7dbvck71bj"; + buildDepends = [ base exceptions mtl old-locale old-time unix ]; homepage = "https://github.com/skogsbaer/hscurses"; description = "NCurses bindings for Haskell"; license = "LGPL"; @@ -64155,8 +64270,8 @@ self: { }: mkDerivation { pname = "hslogger"; - version = "1.2.6"; - sha256 = "0yqw7824bn8vb9iynx8lkgswxd0nz484k4bvcwd02wvakbbfawkk"; + version = "1.2.7"; + sha256 = "0s99w1bzzq75mckb8pk0h545w6y8n8n3nq36mp09vn4kwf503mc9"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -67992,32 +68107,35 @@ self: { ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal , classy-prelude, cmdargs, containers, directory, filepath, ghc , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint - , hspec, HTTP, HUnit, MissingH, mono-traversable, mtl, parsec - , process, random, setenv, shelly, split, stm, strict, system-argv0 - , system-filepath, tar, text, transformers, unix - , unordered-containers, utf8-string, uuid, vector, zeromq4-haskell + , hspec, http-client, http-client-tls, HUnit, ipython-kernel + , MissingH, mono-traversable, mtl, parsec, process, random, setenv + , shelly, split, stm, strict, system-argv0, system-filepath, tar + , template-haskell, text, transformers, unix, unordered-containers + , utf8-string, uuid, vector }: mkDerivation { pname = "ihaskell"; - version = "0.4.3.0"; - sha256 = "1k6i56cdzv5ikci20brq7qj07nqdpzkfj7xr69lh1gvx7xb24ida"; + version = "0.5.0.0"; + sha256 = "1vp31ihl2hbpw3fadwmdm6hg1692khmb1v7gzcqik162i65dyzrj"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base base64-bytestring bytestring cereal classy-prelude cmdargs containers directory filepath ghc ghc-parser ghc-paths - haskeline haskell-src-exts here hlint hspec HTTP HUnit MissingH - mono-traversable mtl parsec process random shelly split stm strict - system-argv0 system-filepath tar text transformers unix - unordered-containers utf8-string uuid vector zeromq4-haskell + haskeline haskell-src-exts here hlint hspec http-client + http-client-tls HUnit ipython-kernel MissingH mono-traversable mtl + parsec process random shelly split stm strict system-argv0 + system-filepath tar template-haskell text transformers unix + unordered-containers utf8-string uuid vector ]; testDepends = [ aeson base base64-bytestring bytestring cereal classy-prelude cmdargs containers directory filepath ghc ghc-parser ghc-paths - haskeline haskell-src-exts here hlint hspec HTTP HUnit MissingH - mono-traversable mtl parsec process random setenv shelly split stm - strict system-argv0 system-filepath tar text transformers unix - unordered-containers utf8-string uuid vector zeromq4-haskell + haskeline haskell-src-exts here hlint hspec http-client + http-client-tls HUnit ipython-kernel MissingH mono-traversable mtl + parsec process random setenv shelly split stm strict system-argv0 + system-filepath tar text transformers unix unordered-containers + utf8-string uuid vector ]; jailbreak = true; homepage = "http://gibiansky.github.io/IHaskell/"; @@ -68026,35 +68144,45 @@ self: { }) {}; "ihaskell-aeson" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, classy-prelude, here - , ihaskell + ({ mkDerivation, aeson, aeson-pretty, base, chunked-data + , classy-prelude, here, ihaskell }: mkDerivation { pname = "ihaskell-aeson"; - version = "0.1.0.0"; - sha256 = "0pficg9df5396caic44hc7kxlj0qrd7lq6knkck8sn9xhakpr1m1"; + version = "0.2.0.0"; + sha256 = "1ag8xv456r4dgibqsazmw6xhhfvplc8sw128prr26hw2139ci6w9"; buildDepends = [ - aeson aeson-pretty base classy-prelude here ihaskell + aeson aeson-pretty base chunked-data classy-prelude here ihaskell ]; - jailbreak = true; - homepage = "http://www.github.com/gibiansky/IHaskell-Display"; + homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for Aeson"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ihaskell-basic" = callPackage + ({ mkDerivation, base, classy-prelude, ihaskell }: + mkDerivation { + pname = "ihaskell-basic"; + version = "0.2.0.0"; + sha256 = "0xf2z4xr0gkq3zvpiwvl73b6wbql4x8fdbw81kz990ifb0vwq65w"; + buildDepends = [ base classy-prelude ihaskell ]; + homepage = "http://www.github.com/gibiansky/IHaskell"; + description = "IHaskell display instances for basic types"; + license = stdenv.lib.licenses.mit; + }) {}; + "ihaskell-blaze" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, classy-prelude , ihaskell }: mkDerivation { pname = "ihaskell-blaze"; - version = "0.1.0.0"; - sha256 = "0sxh3sg90sjj4fnirki9gym3dznrwk85jdh034qwg9fqyk4sxn82"; + version = "0.2.0.0"; + sha256 = "1z3fcfyvx1is30ami7bfmcq6xxfj0l8bymyc85k8rgzjfirqfcdd"; buildDepends = [ base blaze-html blaze-markup classy-prelude ihaskell ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for blaze-html types"; license = stdenv.lib.licenses.mit; @@ -68066,13 +68194,12 @@ self: { }: mkDerivation { pname = "ihaskell-charts"; - version = "0.1.0.0"; - sha256 = "0qh04p49ckmx7qrb7swa8bqr69sas1i4k1ki8iwmfaggxghp5pnj"; + version = "0.2.0.0"; + sha256 = "0zncvhjr3nkpr80m5lhl52jq1ha8ml14bjkykkg6d2l1pqnrb3mg"; buildDepends = [ base bytestring Chart Chart-cairo classy-prelude data-default-class directory ihaskell ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for charts types"; license = stdenv.lib.licenses.mit; @@ -68085,13 +68212,12 @@ self: { }: mkDerivation { pname = "ihaskell-diagrams"; - version = "0.1.0.0"; - sha256 = "18k6abmq3xfkvc5mmbmam9qccr1kix530zil736xncpbyja2a5a8"; + version = "0.2.0.0"; + sha256 = "1if010ky6raw4g0wl24iww1i8qygy4jwd4f8yi9axhxzqzknmqvi"; buildDepends = [ base bytestring classy-prelude diagrams diagrams-cairo diagrams-lib directory ihaskell ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for diagram types"; license = stdenv.lib.licenses.mit; @@ -68110,25 +68236,87 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ihaskell-hatex" = callPackage + ({ mkDerivation, base, HaTeX, ihaskell, text }: + mkDerivation { + pname = "ihaskell-hatex"; + version = "0.2.0.0"; + sha256 = "02ynqhirz8bblcfaxksgxxqgnkmxqazj8imwxc2gbrw2v3p0i39s"; + buildDepends = [ base HaTeX ihaskell text ]; + homepage = "http://www.github.com/gibiansky/IHaskell"; + description = "IHaskell display instances for hatex"; + license = stdenv.lib.licenses.mit; + }) {}; + + "ihaskell-juicypixels" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, directory + , ihaskell, JuicyPixels + }: + mkDerivation { + pname = "ihaskell-juicypixels"; + version = "0.2.0.0"; + sha256 = "058a7wcksbmxq2nahyvpbckd24ziya5f99vmlb3l9wgy9a3i4v2k"; + buildDepends = [ + base bytestring classy-prelude directory ihaskell JuicyPixels + ]; + homepage = "http://www.github.com/gibiansky/ihaskell"; + description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; + license = stdenv.lib.licenses.mit; + }) {}; + "ihaskell-magic" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring - , classy-prelude, ihaskell, magic, text, utf8-string + , classy-prelude, ihaskell, ipython-kernel, magic, text + , utf8-string }: mkDerivation { pname = "ihaskell-magic"; - version = "0.1.0.0"; - sha256 = "0p4r5vkpvrznwhwwhhmhmgyw8n0qfm4b9pwy0mv3iwa805ffafnd"; + version = "0.2.0.0"; + sha256 = "0kmvhxc9bw7zg16m9pcs5ck3akc0fwnz3w6mmzj7dkc7avafmwcg"; buildDepends = [ - base base64-bytestring bytestring classy-prelude ihaskell magic - text utf8-string + base base64-bytestring bytestring classy-prelude ihaskell + ipython-kernel magic text utf8-string ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for bytestrings"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ihaskell-parsec" = callPackage + ({ mkDerivation, aeson, base, classy-prelude, here, ihaskell + , parsec, random, unordered-containers + }: + mkDerivation { + pname = "ihaskell-parsec"; + version = "0.2.0.0"; + sha256 = "009mk611knz8w197dfbq66dabncky03axrchah707xikzpbaz95f"; + buildDepends = [ + aeson base classy-prelude here ihaskell parsec random + unordered-containers + ]; + homepage = "http://www.github.com/gibiansky/ihaskell"; + description = "IHaskell display instances for Parsec"; + license = stdenv.lib.licenses.mit; + }) {}; + + "ihaskell-rlangqq" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring + , directory, filepath, ihaskell, ihaskell-blaze, Rlang-QQ, split + , stm, template-haskell, xformat + }: + mkDerivation { + pname = "ihaskell-rlangqq"; + version = "0.2.0.0"; + sha256 = "18681acd0wmmbalj87p4psis1qf84rzhvh8c1a96jgh5nv3rk5dn"; + buildDepends = [ + base base64-bytestring blaze-html bytestring directory filepath + ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat + ]; + description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ihttp" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , contstuff, enumerator, netlines, network @@ -68782,6 +68970,7 @@ self: { base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck tasty-th text vector ]; + jailbreak = true; homepage = "https://github.com/maoe/influxdb-haskell"; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; @@ -69623,18 +69812,20 @@ self: { }) {}; "ipython-kernel" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, containers, text - , unix, uuid, zeromq4-haskell + ({ mkDerivation, aeson, base, bytestring, cereal, containers + , directory, filepath, mtl, parsec, tar, text, transformers, unix + , uuid, zeromq4-haskell }: mkDerivation { pname = "ipython-kernel"; - version = "0.1.0.0"; - sha256 = "048zc62rci4784djsp9m607zy2z3ybh0zm7211j8j8j1z96nz2x5"; + version = "0.3.0.0"; + sha256 = "035cfq1dlkjmmfjkmfvkn4i4rx04wzsgz9s4dbdwhkx3x7bcj7sj"; + isLibrary = true; + isExecutable = true; buildDepends = [ - aeson base bytestring cereal containers text unix uuid - zeromq4-haskell + aeson base bytestring cereal containers directory filepath mtl + parsec tar text transformers unix uuid zeromq4-haskell ]; - jailbreak = true; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; @@ -74397,6 +74588,7 @@ self: { tasty tasty-quickcheck temporary transformers ]; extraLibraries = [ leveldb snappy ]; + jailbreak = true; homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; @@ -75181,15 +75373,16 @@ self: { "lifted-base" = callPackage ({ mkDerivation, base, HUnit, monad-control, test-framework , test-framework-hunit, transformers, transformers-base + , transformers-compat }: mkDerivation { pname = "lifted-base"; - version = "0.2.3.3"; - sha256 = "1n015i21pyh1ksrdiy105c9sw3gm3yvmlwv1sajy7nvpxb2xdjc3"; + version = "0.2.3.4"; + sha256 = "0gm68xfwzxdjk2h3mad9l37307kr73rmvazg69kclfsdi908vqsp"; buildDepends = [ base monad-control transformers-base ]; testDepends = [ base HUnit monad-control test-framework test-framework-hunit - transformers transformers-base + transformers transformers-base transformers-compat ]; homepage = "https://github.com/basvandijk/lifted-base"; description = "lifted IO operations from the base library"; @@ -76033,6 +76226,7 @@ self: { version = "0.1.0.0"; sha256 = "0mkyhanay0zr318cc01wgp4qxwpqj1wzydqlq7c12hbfrjb1ah4b"; buildDepends = [ base exceptions ]; + jailbreak = true; homepage = "https://github.com/ombocomp/listsafe"; description = "Safe wrappers for partial list functions, supporting MonadThrow"; license = stdenv.lib.licenses.asl20; @@ -76592,6 +76786,7 @@ self: { tagged-exception-core test-framework test-framework-hunit test-framework-quickcheck2 transformers ]; + jailbreak = true; homepage = "https://github.com/trskop/lock-file"; description = "Provide exclusive access to a resource using lock file"; license = stdenv.lib.licenses.bsd3; @@ -77071,6 +77266,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lowgl" = callPackage + ({ mkDerivation, base, data-default, gl, linear, vector }: + mkDerivation { + pname = "lowgl"; + version = "0.1.0.0"; + sha256 = "0kc7gpg7v064c6055hsp74dilqd059ww5xb42qdnwgw1ccd874x0"; + buildDepends = [ base data-default gl linear vector ]; + jailbreak = true; + description = "Basic gl wrapper and reference"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "lrucache" = callPackage ({ mkDerivation, base, containers, contravariant }: mkDerivation { @@ -77278,10 +77485,9 @@ self: { ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { pname = "lucid-svg"; - version = "0.4.0.1"; - sha256 = "1gg4zmvz80bqw9sv11irfzn0if7z1558d50cnsl0n12fw45vz87n"; + version = "0.4.0.2"; + sha256 = "1zdndb81190xg2zwpw10pg0qpjvyp2jmvwm64s2bid3shlhibmmd"; buildDepends = [ base blaze-builder lucid text transformers ]; - jailbreak = true; homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git"; description = "DSL for SVG using lucid for HTML"; license = stdenv.lib.licenses.bsd3; @@ -80444,6 +80650,7 @@ self: { base exceptions filepath ghc ghc-paths template-haskell temporary transformers ]; + jailbreak = true; homepage = "https://github.com/jfischoff/modulespection"; description = "Template Haskell for introspecting a module's declarations"; license = stdenv.lib.licenses.bsd3; @@ -80573,12 +80780,16 @@ self: { }) {}; "monad-control" = callPackage - ({ mkDerivation, base, stm, transformers, transformers-base }: + ({ mkDerivation, base, stm, transformers, transformers-base + , transformers-compat + }: mkDerivation { pname = "monad-control"; - version = "1.0.0.2"; - sha256 = "13l9gq00pjlp1b2g9xzfavl6zibi2s195f234rmhzbsb14yhzgnr"; - buildDepends = [ base stm transformers transformers-base ]; + version = "1.0.0.3"; + sha256 = "1jal6m6f8kz9lqfza6jm49jr1nyx6hhqyqfnjq226scm292zybsc"; + buildDepends = [ + base stm transformers transformers-base transformers-compat + ]; homepage = "https://github.com/basvandijk/monad-control"; description = "Lift control operations, like exception catching, through monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -80707,15 +80918,17 @@ self: { , conduit-extra, exceptions, fast-logger, lifted-base , monad-control, monad-loops, mtl, resourcet, stm, stm-chans , template-haskell, text, transformers, transformers-base + , transformers-compat }: mkDerivation { pname = "monad-logger"; - version = "0.3.11.1"; - sha256 = "1vh847ivymhb20sly9aplcm35zcmn7xmibv8lkv1ws9y7s1951p7"; + version = "0.3.12"; + sha256 = "0n5y2rc7da4paszcnvi6yrzg8fmi2nzyxd62d554z7fwciv9px71"; buildDepends = [ base blaze-builder bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans template-haskell text transformers transformers-base + transformers-compat ]; homepage = "https://github.com/kazu-yamamoto/logger"; description = "A class of monads which can log messages"; @@ -81439,8 +81652,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "0.7.0"; - sha256 = "0154spqy8k060hqq2qdj5hyj5fyf6r0dcm7nmz3w4wlg2labc0i4"; + version = "0.8.0.1"; + sha256 = "19b4d21cgnp1iq3fcayi0phjp1lk1l09njpp6wpxcj2jcdi2l9sz"; buildDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups text transformers unordered-containers @@ -81748,6 +81961,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mp" = callPackage + ({ mkDerivation, base, binary, bytestring, ConfigFile, daemons + , directory, filepath, glib, gstreamer, hgettext, MissingH, mtl + , network, random, setlocale, text, unix, unordered-containers + , utf8-string, vty, vty-ui + }: + mkDerivation { + pname = "mp"; + version = "0.1.3"; + sha256 = "0gh2xsn9nmb8r8l69xcdd0v9ldk8663676wl5dxh6300h97a0dsj"; + editedCabalFile = "155358da276e8dee3d6e543f005025de03692dc9857d74cd19291a0b98ece325"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base binary bytestring ConfigFile daemons directory filepath glib + gstreamer hgettext MissingH mtl network random setlocale text unix + unordered-containers utf8-string vty vty-ui + ]; + jailbreak = true; + homepage = "http://code.google.com/p/linux-music-player"; + description = "Music player for linux"; + license = "GPL"; + }) {}; + "mp3decoder" = callPackage ({ mkDerivation, base, binary-strict, bytestring, haskell98, mtl }: mkDerivation { @@ -83814,8 +84051,8 @@ self: { ({ mkDerivation, base, netlist, pretty }: mkDerivation { pname = "netlist-to-vhdl"; - version = "0.3.1"; - sha256 = "15daik7l0pjqilya01l5rl84g2fyjwkap1md0nx82gxcp8m1v76k"; + version = "0.3.2"; + sha256 = "107pkkihj62qjkfwrnhwfscpph5r76lx6r3s0m3b0dbsf1jy2a61"; buildDepends = [ base netlist pretty ]; description = "Convert a Netlist AST to VHDL"; license = stdenv.lib.licenses.bsd3; @@ -84053,8 +84290,8 @@ self: { }: mkDerivation { pname = "network-bitcoin"; - version = "1.7.0"; - sha256 = "0hr9kg4hiif918bciz6zg9wf4amjjgkbkz437m8yf3vsmdfwpb66"; + version = "1.7.1"; + sha256 = "0w801fmwfn1q5n65yd2c5n7c6901gxvx640r6mrjxgcj402bwjxk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -84438,8 +84675,8 @@ self: { }: mkDerivation { pname = "network-simple"; - version = "0.4.0.2"; - sha256 = "0k155m1s7k157rpsz8ww9cs7jyw3faybwfmw97agvskhb4axw6hf"; + version = "0.4.0.3"; + sha256 = "0nbs79v07x18y324drngr1zrcgjla2y9qjxkd64qwbldw48s1i85"; buildDepends = [ base bytestring exceptions network transformers ]; homepage = "https://github.com/k0001/network-simple"; description = "Simple network sockets usage patterns"; @@ -85737,6 +85974,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "octohat" = callPackage + ({ mkDerivation, aeson, base, base-compat, base16-bytestring + , base64-bytestring, bytestring, containers, cryptohash, dotenv + , either, errors, hspec, hspec-expectations, http-client + , http-types, lens, mtl, text, time, transformers + , unordered-containers, wreq, xmlhtml + }: + mkDerivation { + pname = "octohat"; + version = "0.1"; + sha256 = "1xiqs5q2cpgr6vgj3wpwildhnd08c2kwk52hzpwnnarwfif29r49"; + editedCabalFile = "8f268dfdda4d4fe6215f17223f11751da0bf15c4989282aae70c82ffe1a6e35c"; + buildDepends = [ + aeson base base-compat base16-bytestring base64-bytestring + bytestring containers cryptohash dotenv either errors http-client + http-types lens mtl text time transformers unordered-containers + wreq xmlhtml + ]; + testDepends = [ + base base-compat dotenv hspec hspec-expectations text transformers + ]; + description = "A tested, minimal wrapper around GitHub's API"; + license = stdenv.lib.licenses.mit; + }) {}; + "octopus" = callPackage ({ mkDerivation, array, base, bytestring, containers, hexpr, mtl , parsec, symbol, text @@ -85996,8 +86258,8 @@ self: { }: mkDerivation { pname = "on-demand-ssh-tunnel"; - version = "0.1.0.4"; - sha256 = "0k1z7a4h3ml043x140vrhfchlha5x4ak5n3nvaqcfk78cjr8krbr"; + version = "0.1.0.5"; + sha256 = "0gsfdsss7yddb90rx0ml6lpcd5q0qvk78m42iz1ikqgy5g9hgv1x"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -86082,19 +86344,18 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, base, contravariant, old-locale, postgresql-simple - , pretty, product-profunctors, profunctors, semigroups, text, time - , transformers, uuid + ({ mkDerivation, attoparsec, base, case-insensitive, contravariant + , old-locale, postgresql-simple, pretty, product-profunctors + , profunctors, semigroups, text, time, transformers, uuid }: mkDerivation { pname = "opaleye"; - version = "0.3"; - sha256 = "1jq2q0dswgj5jksdd5xn2ny66d1nfqmwf7cv835gg59g4rd2yyrx"; - editedCabalFile = "fba09de3e538f5f3271e5b736a08541a8738fc291ab0d1a7dc537fb30dd60a85"; + version = "0.3.1"; + sha256 = "188c5n0ywmvfsh4sbbwi3p82is92x770mlfdkdbfm4bsqnsc8905"; buildDepends = [ - base contravariant old-locale postgresql-simple pretty - product-profunctors profunctors semigroups text time transformers - uuid + attoparsec base case-insensitive contravariant old-locale + postgresql-simple pretty product-profunctors profunctors semigroups + text time transformers uuid ]; testDepends = [ base postgresql-simple product-profunctors profunctors time @@ -87416,10 +87677,10 @@ self: { pname = "parallel-io"; version = "0.3.3"; sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s"; + editedCabalFile = "75eeeb51593fa2771c8dbc965ca09d830d62e08135870188a10446f842178bee"; isLibrary = true; isExecutable = true; buildDepends = [ base containers extensible-exceptions random ]; - jailbreak = true; homepage = "http://batterseapower.github.com/parallel-io"; description = "Combinators for executing IO actions in parallel on a thread pool"; license = stdenv.lib.licenses.bsd3; @@ -88306,6 +88567,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pcre-heavy" = callPackage + ({ mkDerivation, base, bytestring, doctest, Glob, pcre-light + , stringable, template-haskell + }: + mkDerivation { + pname = "pcre-heavy"; + version = "0.2.0"; + sha256 = "103720n3nqmghvqnh2nhyn4q0a85x02ss98ya36r0jyckr0a1fn8"; + buildDepends = [ + base bytestring pcre-light stringable template-haskell + ]; + testDepends = [ base doctest Glob ]; + homepage = "https://github.com/myfreeweb/pcre-heavy"; + description = "A regexp library on top of pcre-light you can actually use"; + license = "unknown"; + }) {}; + "pcre-less" = callPackage ({ mkDerivation, array, base, regex-pcre }: mkDerivation { @@ -89228,20 +89506,18 @@ self: { }) {}; "pgdl" = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, configurator - , directory, filepath, HTTP, http-conduit, process, resourcet - , split, tagsoup, text, transformers, vty, vty-ui + ({ mkDerivation, base, bytestring, Cabal, configurator, directory + , filepath, HTTP, network-uri, process, tagsoup, text, vty, vty-ui }: mkDerivation { pname = "pgdl"; - version = "7.0"; - sha256 = "1vk2y1c94s2n3r3fk7sfc26sp143qq9hxwaqpfw063nda55q7yh0"; + version = "7.4"; + sha256 = "1n9cyj8yki922vm26bgnxpd4j1ps50gqllgncnk2gg5q7g6y3nz1"; isLibrary = false; isExecutable = true; buildDepends = [ - base binary bytestring Cabal configurator directory filepath HTTP - http-conduit process resourcet split tagsoup text transformers vty - vty-ui + base bytestring Cabal configurator directory filepath HTTP + network-uri process tagsoup text vty vty-ui ]; description = "pgdownloader"; license = stdenv.lib.licenses.publicDomain; @@ -89981,6 +90257,7 @@ self: { version = "2.2.0"; sha256 = "1m44a2pbws73jbr2ca48i94mrfwzlsibyc22i2w3fqq159qfg6ca"; buildDepends = [ base containers exceptions pipes transformers ]; + jailbreak = true; description = "Safety for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -90182,16 +90459,12 @@ self: { }) {}; "plailude" = callPackage - ({ mkDerivation, base, bytestring, mtl, stringable, text, time - , utf8-string - }: + ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "plailude"; - version = "0.4.1"; - sha256 = "1a21a3x6c81ajr5rads2gw1kjlyflxpcr8niksb9yv9k3kmzq6xy"; - buildDepends = [ - base bytestring mtl stringable text time utf8-string - ]; + version = "0.4.1.1"; + sha256 = "05br21gsmcqssi6wcp0pyyv1gx9q9imh6079vxigy9iacwq5hi0q"; + buildDepends = [ base bytestring mtl time ]; jailbreak = true; homepage = "https://secure.plaimi.net/works/plailude"; description = "plaimi's prelude"; @@ -91356,8 +91629,8 @@ self: { }: mkDerivation { pname = "postgresql-typed"; - version = "0.3.1"; - sha256 = "0x7c01ai2k75qcr244cr33dylim44dhphvwd1ji9h4hlvmpr9j11"; + version = "0.3.2"; + sha256 = "0q1k5sj6q9c4mssf3z9m69fqyn9z8iz15v2b0rcc7c8x1za1kq2i"; buildDepends = [ array base binary bytestring containers cryptohash haskell-src-meta network old-locale parsec postgresql-binary scientific @@ -92166,12 +92439,12 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "process_1_2_1_0" = callPackage + "process_1_2_2_0" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, unix }: mkDerivation { pname = "process"; - version = "1.2.1.0"; - sha256 = "0r11j0vys8gmzsdkfq491g43l21f9301dzma0s3gwblfsvdv2hwc"; + version = "1.2.2.0"; + sha256 = "0rxxcimwhsgcphy0brq6gxcrm8spgpqha8fhppj956kp401hx3s8"; buildDepends = [ base deepseq directory filepath unix ]; description = "Process libraries"; license = stdenv.lib.licenses.bsd3; @@ -92469,15 +92742,14 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.1.2.1"; - sha256 = "1108hhh2ivhs85jkga4wps2yscgjnp211sw5w45j4wp9dgpz2hak"; + version = "0.1.2.2"; + sha256 = "11h4hgwwh8vq96vkca2w1rc5l0aikfhp6550x5ax04k4p3l9lzhy"; isLibrary = false; isExecutable = true; buildDepends = [ aeson attoparsec base bytestring filepath text unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/profiteur"; description = "Treemap visualiser for GHC prof files"; license = stdenv.lib.licenses.bsd3; @@ -92713,8 +92985,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "1.3.2"; - sha256 = "02cfs90kfpk09njhx45bfms90350my7j4wcf1yyzfszlkpfn3mmc"; + version = "2.1.0"; + sha256 = "1ln0sa6niqjq5fzbm87kncgfyynyv14756gnj23jiwpwwv3v6pd4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -94204,6 +94476,7 @@ self: { snap-core snap-server stm websockets websockets-snap ]; testDepends = [ base HUnit mtl ]; + jailbreak = true; homepage = "https://github.com/talw/quoridor-hs"; description = "A Quoridor implementation in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -94734,8 +95007,8 @@ self: { }: mkDerivation { pname = "rasterific-svg"; - version = "0.1.0.1"; - sha256 = "1v6ky1b43mm99j6z94q6hbvhm39vpkmncihi1y6qcls8pxymgg7s"; + version = "0.1.0.2"; + sha256 = "1jn6cj7baph2jvihr9aqrxcqwbn1vaa125n2d39s8ib6yar5x3sq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -94747,7 +95020,6 @@ self: { attoparsec base binary blaze-html bytestring directory filepath FontyFruity JuicyPixels linear Rasterific svg-tree text ]; - jailbreak = true; description = "SVG renderer based on Rasterific"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -96572,11 +96844,12 @@ self: { ({ mkDerivation, array, base, ghc, ghc-paths, json, network }: mkDerivation { pname = "remote-debugger"; - version = "0.1.1"; - sha256 = "0ffwqd0sh09qayv8c97rk7ihv33rcpw938a6f3hlxlbpfhlhli46"; + version = "0.2.1"; + sha256 = "0mgq2n92d4xk6yqzrbghlp0h18nmkyhxnv5zynrqykfw5h9xl0f8"; isLibrary = false; isExecutable = true; buildDepends = [ array base ghc ghc-paths json network ]; + jailbreak = true; homepage = "https://github.com/octomarat/HaskellDebugger"; description = "Interface to ghci debugger"; license = stdenv.lib.licenses.bsd3; @@ -97897,6 +98170,7 @@ self: { version = "1.3.0.1"; sha256 = "1s6zihvgd0k9fyp15fvyd1fcm7bgsnp5k9w64w6srh5kwdmx8cvp"; buildDepends = [ base containers exceptions transformers xhb ]; + jailbreak = true; homepage = "https://github.com/lfairy/robot"; description = "Simulate keyboard and mouse events"; license = "unknown"; @@ -99244,6 +99518,7 @@ self: { testDepends = [ base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th ]; + jailbreak = true; homepage = "http://hackage.haskell.org/package/sandi"; description = "Data encoding library"; license = stdenv.lib.licenses.bsd3; @@ -101405,6 +101680,7 @@ self: { pname = "setlocale"; version = "1.0.0.1"; sha256 = "15dzf4hgkn5saz6qyn1xqvinvy0y571crfxfwycmcmm4az6rsqk0"; + editedCabalFile = "f95d33f3a43b64f5b4e1e94641f8614e70c778ada7f6fd8cde83577d84b486c6"; buildDepends = [ base ]; description = "Haskell bindings to setlocale"; license = stdenv.lib.licenses.bsd3; @@ -102087,6 +102363,7 @@ self: { system-fileio system-filepath text time transformers transformers-base unix-compat ]; + jailbreak = true; homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -104218,8 +104495,8 @@ self: { }: mkDerivation { pname = "snaplet-fay"; - version = "0.3.3.9"; - sha256 = "019zffk11ix0fhngl41y6h40m0cvakn2bss4xnyqv8q8rgqn3v2g"; + version = "0.3.3.10"; + sha256 = "15gp711b650z66168a9r0zrwqvrp9l66mfqhb8qnzbyin43kc5ll"; buildDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers @@ -104772,6 +105049,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs) snappy;}; + "snappy-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, snappy }: + mkDerivation { + pname = "snappy-conduit"; + version = "0.1.0.0"; + sha256 = "0k93v3dyv7818xy45l7i5wykfmnwyqkykxjh6xr937zh8a4qapfi"; + buildDepends = [ base bytestring conduit snappy ]; + homepage = "http://github.com/tatac1/snappy-conduit/"; + description = "Conduit bindings for Snappy (see snappy package)"; + license = stdenv.lib.licenses.mit; + }) {}; + "snappy-framing" = callPackage ({ mkDerivation, array, base, binary, bytestring, snappy }: mkDerivation { @@ -107060,8 +107349,8 @@ self: { }: mkDerivation { pname = "stm-conduit"; - version = "2.5.3"; - sha256 = "1jsij92i3rw2wz1166i58p0lxrbx0jndf1hi3kj92ccvnc3zg1iw"; + version = "2.5.4"; + sha256 = "1pwsv9724b6g80l53wwziv2sajaxc2mwl3mxldpzd0v48zaajflk"; buildDepends = [ async base cereal cereal-conduit conduit conduit-extra directory lifted-async lifted-base monad-control monad-loops resourcet stm @@ -108423,13 +108712,12 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.1"; - sha256 = "08id1wadmdqh9nig5cjdkg47s9qi6k92dm02s6l9si7bq2mymwvy"; + version = "0.1.0.1"; + sha256 = "1yypbd94436c38qvgq5cfc1f9bpiq26faxb12s0xyl6551gr6rac"; buildDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml ]; - jailbreak = true; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -109643,12 +109931,17 @@ self: { }) {}; "tagged-exception-core" = callPackage - ({ mkDerivation, base, exceptions, mmorph, transformers }: + ({ mkDerivation, base, exceptions, extensible-exceptions, mmorph + , transformers + }: mkDerivation { pname = "tagged-exception-core"; version = "2.0.0.0"; sha256 = "02ny4yz9afaazw2pxpkpalffx8i5nhi3x9561blrd0pdrqq8qnib"; - buildDepends = [ base exceptions mmorph transformers ]; + buildDepends = [ + base exceptions extensible-exceptions mmorph transformers + ]; + jailbreak = true; homepage = "https://github.com/trskop/tagged-exception"; description = "Reflect exceptions using phantom types"; license = stdenv.lib.licenses.bsd3; @@ -109884,6 +110177,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "takahashi" = callPackage + ({ mkDerivation, base, free-operational, mtl, reasonable-lens }: + mkDerivation { + pname = "takahashi"; + version = "0.2.0.0"; + sha256 = "18cj4w4a998r4krari6j77fnv2msizyrv8xdwyq6v7ja33zb954h"; + buildDepends = [ base free-operational mtl reasonable-lens ]; + description = "library for takahashi method"; + license = stdenv.lib.licenses.mit; + }) {}; + "takusen-oracle" = callPackage ({ mkDerivation, base, clntsh, mtl, old-time, QuickCheck, random , sqlplus, time @@ -111136,6 +111440,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "test-sandbox-compose" = callPackage + ({ mkDerivation, aeson, base, bytestring, cabal-test-bin + , containers, directory, hastache, hspec, http-conduit, lifted-base + , network, optparse-applicative, process, shakespeare, shelly + , test-sandbox, text, unix, wai, wai-extra, warp, yaml, yesod + , yesod-core + }: + mkDerivation { + pname = "test-sandbox-compose"; + version = "0.1.1"; + sha256 = "1v2zvds3c8g0svh4jafzpdylnkn02hfrnwgxf7pilpd7x718id17"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring containers directory hastache http-conduit + lifted-base network optparse-applicative process shelly + test-sandbox text unix wai wai-extra warp yaml yesod yesod-core + ]; + testDepends = [ + base bytestring cabal-test-bin hspec process shakespeare text unix + ]; + description = "Lightweight development enviroments using test-sandbox"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "test-sandbox-hunit" = callPackage ({ mkDerivation, base, HUnit, lifted-base, test-sandbox }: mkDerivation { @@ -111801,14 +112130,15 @@ self: { }: mkDerivation { pname = "th-alpha"; - version = "0.2.0.0"; - sha256 = "1v280dhy3yw6aw9vi3rb91vz9brdcg8j6pvqdirra98r0yz321q0"; + version = "0.2.0.1"; + sha256 = "02bym2rk3lm0l09n6fp68v144l3mv67qjlifsja4q9iya530ckls"; buildDepends = [ base containers mmorph mtl template-haskell th-desugar transformers ]; testDepends = [ base derive tasty tasty-hunit tasty-quickcheck template-haskell ]; + jailbreak = true; homepage = "https://github.com/jkarni/th-alpha"; description = "Alpha equivalence for TH Exp"; license = stdenv.lib.licenses.bsd3; @@ -111982,8 +112312,8 @@ self: { ({ mkDerivation, base, template-haskell, th-lift, th-reify-many }: mkDerivation { pname = "th-orphans"; - version = "0.8.3"; - sha256 = "1ia6qg6fh90glg86kc248mch3qim1x09zbccfh1drcqk4c54lhnx"; + version = "0.9.0"; + sha256 = "150859mxwn40xkwbfbwsxi05x8j8dq5qvx53i956fqh1gp4sx4p3"; buildDepends = [ base template-haskell th-lift th-reify-many ]; description = "Orphan instances for TH datatypes"; license = stdenv.lib.licenses.bsd3; @@ -112266,6 +112596,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "threads-supervisor" = callPackage + ({ mkDerivation, base, bytestring, QuickCheck, stm, tasty + , tasty-hunit, tasty-quickcheck, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "threads-supervisor"; + version = "1.0.0.0"; + sha256 = "0wbq92kg41srm0s2n0ckaimkrvba4na3acdg3ky9rpcwh7ir4a7v"; + buildDepends = [ base stm time unordered-containers ]; + testDepends = [ + base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck + time transformers + ]; + description = "Simple, IO-based library for Erlang-style thread supervision"; + license = stdenv.lib.licenses.mit; + }) {}; + "threadscope" = callPackage ({ mkDerivation, array, base, binary, cairo, containers, deepseq , filepath, ghc-events, glib, gtk, mtl, pango, text, time, unix @@ -113777,13 +114125,12 @@ self: { }) {}; "transformers-base" = callPackage - ({ mkDerivation, base, stm, transformers }: + ({ mkDerivation, base, stm, transformers, transformers-compat }: mkDerivation { pname = "transformers-base"; - version = "0.4.3"; - sha256 = "0bklr7piiipnh99jnqx262pdyb9hzk852d6hzk5sqppvz5ndcf4y"; - editedCabalFile = "48e267c7ce3e0cbc1493d5d7dc3fd7301ae42d229857fd21240a3b915665545e"; - buildDepends = [ base stm transformers ]; + version = "0.4.4"; + sha256 = "11r3slgpgpra6zi2kjg3g60gvv17b1fh6qxipcpk8n86qx7lk8va"; + buildDepends = [ base stm transformers transformers-compat ]; homepage = "https://github.com/mvv/transformers-base"; description = "Lift computations from the bottom of a transformer stack"; license = stdenv.lib.licenses.bsd3; @@ -114973,8 +115320,8 @@ self: { ({ mkDerivation, base, cpphs }: mkDerivation { pname = "type-eq"; - version = "0.4.2"; - sha256 = "0nyx3lqgrnlz0l3p615ln2dglqd39jwlk91ybz7blzhq1gpgayar"; + version = "0.5"; + sha256 = "007srln0xxi27wca8dk72xp3cdwnk8iqmlqgbxi17c9l2x7lrkwz"; buildDepends = [ base ]; buildTools = [ cpphs ]; homepage = "http://github.com/glaebhoerl/type-eq"; @@ -115503,8 +115850,8 @@ self: { }: mkDerivation { pname = "tzdata"; - version = "0.1.20141110.0"; - sha256 = "1i9vngkf1yjda7s89q17r1q37bq8f52069xpc2kzpdql4il8pvdd"; + version = "0.1.20150129.0"; + sha256 = "103f37lcz6a72hl4vyd2ynpbd7ldxkn75znss2kbkrqfggb05p9c"; buildDepends = [ base bytestring containers vector ]; testDepends = [ base bytestring directory filemanip filepath HUnit MissingH @@ -115868,12 +116215,15 @@ self: { "unbound-generics" = callPackage ({ mkDerivation, base, containers, contravariant, mtl, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, transformers + , transformers-compat }: mkDerivation { pname = "unbound-generics"; - version = "0.0.2"; - sha256 = "0zgajq411bp16xwv31i2igsz62lad923rylhfprklsism13rk5ai"; - buildDepends = [ base containers contravariant mtl transformers ]; + version = "0.0.2.1"; + sha256 = "0ilfgmipfwha698qccy8jryjl42py4q2ph1lx1l8678fkfwwhi7i"; + buildDepends = [ + base containers contravariant mtl transformers transformers-compat + ]; testDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck ]; @@ -116805,8 +117155,8 @@ self: { ({ mkDerivation, base, ports-tools, process }: mkDerivation { pname = "up-grade"; - version = "0.0.1"; - sha256 = "1apa5ni0i2wqps8xvppnlhybz6s1qllpbgias4d7fbwb5pfznppd"; + version = "0.0.2"; + sha256 = "1njmx622ghpzgnwm4wykzjj1ixpalbj21hs7nkbwpmljniakp2fb"; isLibrary = false; isExecutable = true; buildDepends = [ base ports-tools process ]; @@ -120343,6 +120693,7 @@ self: { transformers-base unordered-containers vector zip-archive ]; testDepends = [ base parallel text ]; + jailbreak = true; homepage = "https://github.com/kallisti-dev/hs-webdriver"; description = "a Haskell client for the Selenium WebDriver protocol"; license = stdenv.lib.licenses.bsd3; @@ -122218,8 +122569,8 @@ self: { }: mkDerivation { pname = "xml-conduit"; - version = "1.2.3.1"; - sha256 = "10cqhqpc85zx87jc0hapzkvwm76drpxqsjliipvlah2a0x8l4ai8"; + version = "1.2.3.2"; + sha256 = "1vk4ldcacpwfmhiqpcs571s5kqsh7v0ch2sfrw2ibkm0cyqs6jk9"; buildDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default deepseq monad-control @@ -123137,6 +123488,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "y0l0bot" = callPackage + ({ mkDerivation, base, bytestring, containers, mtl, network + , old-locale, old-time, safe, split, text, time + }: + mkDerivation { + pname = "y0l0bot"; + version = "0.1.0"; + sha256 = "0mdfhnwz5zh9zr2p6sp3yp3f23rqsj7y2bafk4ylh9dak69v2cwx"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base bytestring containers mtl network old-locale old-time safe + split text time + ]; + jailbreak = true; + description = "#plaimi's all-encompassing bot"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "yabi" = callPackage ({ mkDerivation, base, word8 }: mkDerivation { @@ -124486,22 +124856,19 @@ self: { "yesod-purescript" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, filepath, formatting, fsnotify, parsec, purescript - , regex-tdfa, regex-tdfa-text, shakespeare, system-fileio - , system-filepath, template-haskell, text, time, transformers - , yesod-core + , formatting, fsnotify, purescript, regex-tdfa, regex-tdfa-text + , shakespeare, system-fileio, system-filepath, template-haskell + , text, time, transformers, yesod-core }: mkDerivation { pname = "yesod-purescript"; - version = "0.0.4.4"; - sha256 = "0cnci6i4r9jp1f5ni4jxis28v0ijryyqvskqif3036nxbq4fm099"; + version = "0.0.4.5"; + sha256 = "0fmndjapnlh6qqwxri4d16dbn151wd8ihypkbprd4402cd7i5fb0"; buildDepends = [ - aeson base bytestring containers data-default directory filepath - formatting fsnotify parsec purescript regex-tdfa regex-tdfa-text - shakespeare system-fileio system-filepath template-haskell text - time transformers yesod-core + aeson base bytestring containers data-default formatting fsnotify + purescript regex-tdfa regex-tdfa-text shakespeare system-fileio + system-filepath template-haskell text time transformers yesod-core ]; - jailbreak = true; homepage = "https://github.com/mpietrzak/yesod-purescript"; description = "PureScript integration for Yesod"; license = stdenv.lib.licenses.mit; @@ -124851,6 +125218,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yet-another-logger" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base + , base-unicode-symbols, bytestring, case-insensitive + , configuration-tools, deepseq, either, enclosed-exceptions, lens + , lifted-base, monad-control, mtl, optparse-applicative, stm + , stm-chans, text, trace, transformers, transformers-base + }: + mkDerivation { + pname = "yet-another-logger"; + version = "0.0.1"; + sha256 = "0pf2vwx0448813sx0y1c50rlg2ws1yaiplhwdjpyl7mk7f20b63m"; + buildDepends = [ + aeson ansi-terminal async base base-unicode-symbols bytestring + case-insensitive configuration-tools deepseq either + enclosed-exceptions lens lifted-base monad-control mtl + optparse-applicative stm stm-chans text trace transformers + transformers-base + ]; + jailbreak = true; + homepage = "https://github.com/alephcloud/hs-yet-another-logger"; + description = "Yet Another Logger"; + license = stdenv.lib.licenses.asl20; + }) {}; + "yhccore" = callPackage ({ mkDerivation, base, containers, mtl, pretty, uniplate }: mkDerivation { @@ -125485,6 +125876,7 @@ self: { async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; pkgconfigDepends = [ zeromq ]; + jailbreak = true; homepage = "http://github.com/twittner/zeromq-haskell/"; description = "Bindings to ZeroMQ 4.x"; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 6fe3601aeaa..802aafc444c 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source MPEG-4 and MPEG-2 AAC encoder"; homepage = http://www.audiocoding.com/faac.html; - license = licenses.unfree; + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 0694b7d3018..2b0b027bda5 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, exampleSupport ? true # Example encoding program +, exampleSupport ? false # Example encoding program }: with stdenv.lib; diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 6238f4b53b0..aab08d52ca1 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -11,11 +11,13 @@ stdenv.mkDerivation rec { }; preConfigure = '' - sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/includes,' -i Makefile - mkdir -p "$out/"{bin,lib,man/man1,man/man3,include} + sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile + mkdir -p "$out/"{bin,lib,man/man1,man/man3,include/gsm} makeFlags="$makeFlags INSTALL_ROOT=$out" ''; + NIX_CFLAGS_COMPILE = "-fPIC"; + parallelBuild = false; meta = { diff --git a/pkgs/development/libraries/haskell/servant-server/default.nix b/pkgs/development/libraries/haskell/servant-server/default.nix index 7776af8036d..8c3ce56d412 100644 --- a/pkgs/development/libraries/haskell/servant-server/default.nix +++ b/pkgs/development/libraries/haskell/servant-server/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "servant-server"; - version = "0.2.1"; - sha256 = "1b2aqxnn9nf5qabbl8k9kq9b2mpn591j9jpjy33sis7ni469bayj"; + version = "0.2.3"; + sha256 = "0n4r145jd1g07g0a1mhbc7s61h6cbbvjvhzwngff756iky7fkcb9"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index a6e0cdfa3b0..8a352a27ba3 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.2.3"; - sha256 = "1knwmvs9hczlknyi27hciy1xkn219s6niv3w7q0wkw6rxz2q555v"; + version = "1.2.3.1"; + sha256 = "10cqhqpc85zx87jc0hapzkvwm76drpxqsjliipvlah2a0x8l4ai8"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq monadControl resourcet systemFilepath text @@ -18,7 +18,6 @@ cabal.mkDerivation (self: { blazeMarkup conduit hspec HUnit resourcet text transformers xmlTypes ]; - jailbreak = true; meta = { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 166444d1b3b..b400ff813d2 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "ldb-1.1.19"; + name = "ldb-1.1.20"; src = fetchurl { url = "mirror://samba/ldb/${name}.tar.gz"; - sha256 = "1p2815z9sjack08pcdbv4xzp1fvr4lxcn30rj0wh3py4ly6ji1h0"; + sha256 = "1ckplfvr8rp5y632w5j0abdgkj3irbzjh1wn0yxadnhz4ymknjds"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix new file mode 100644 index 00000000000..b919aef5658 --- /dev/null +++ b/pkgs/development/libraries/libasr/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, libevent, openssl }: + +stdenv.mkDerivation rec { + name = "libasr-${version}"; + version= "1.0.1"; + + src = fetchurl { + url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + sha256 = "10h1c9b58msbggns8k2m0857zmbldb0x8ghk3aay88yn2bip2916"; + }; + + buildInputs = [ libevent openssl ]; + + meta = with stdenv.lib; { + homepage = https://github.com/OpenSMTPD/libasr; + description = "Free, simple and portable asynchronous resolver library"; + license = licenses.isc; + maintainers = [ maintainers.koral ]; + }; +} diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 15b80053218..7dda6912a98 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -1,34 +1,53 @@ { stdenv, fetchurl, pkgconfig, yasm -, freetype, fribidi, fontconfig -, enca ? null -, harfbuzz ? null +, freetype ? null +, fribidi ? null +, encaSupport ? true, enca ? null # enca support +, fontconfigSupport ? true, fontconfig ? null # fontconfig support +, harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support +, rasterizerSupport ? false # Internal rasterizer +, largeTilesSupport ? false # Use larger tiles in the rasterizer }: +assert ((freetype != null) && (fribidi != null)); +assert encaSupport -> (enca != null); +assert fontconfigSupport -> (fontconfig != null); +assert harfbuzzSupport -> (harfbuzz != null); + let - version = "0.11.1"; - sha256 = "1b0ki1zdkhflszzj5qr45j9qsd0rfbb6ws5pqkny8jhih0l3lxwx"; - baseurl = "https://github.com/libass/libass/releases/download"; -in stdenv.mkDerivation rec { + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; +in + +with stdenv.lib; +stdenv.mkDerivation rec { name = "libass-${version}"; + version = "0.12.1"; src = fetchurl { - url = "${baseurl}/${version}/${name}.tar.xz"; - inherit sha256; + url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz"; + sha256 = "1mwj2nk9g6cq6f8m1hf0ijg1299rghhy9naahqq43sc2whblb1l7"; }; + configureFlags = [ + (mkFlag encaSupport "enca") + (mkFlag fontconfigSupport "fontconfig") + (mkFlag harfbuzzSupport "harfbuzz") + (mkFlag rasterizerSupport "rasterizer") + (mkFlag largeTilesSupport "large-tiles") + ]; + nativeBuildInputs = [ pkgconfig yasm ]; - buildInputs = [ - freetype fribidi fontconfig - enca harfbuzz - ]; + buildInputs = [ freetype fribidi ] + ++ optional encaSupport enca + ++ optional fontconfigSupport fontconfig + ++ optional harfbuzzSupport harfbuzz; meta = { description = "Portable ASS/SSA subtitle renderer"; - homepage = http://code.google.com/p/libass/; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.urkud ]; + homepage = https://github.com/libass/libass; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ codyopel urkud ]; repositories.git = git://github.com/libass/libass.git; }; } diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index ae501f90cec..fc554122c08 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "06dabf77cz6qg7aqv5j5r4m32b5zn253pixwb3k5lm3z0h88y7cn"; }; - NIX_LDFLAGS = "-lssp"; + NIX_LDFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lssp"; doCheck = true; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 45fc442a713..a7c80077e79 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,47 +1,184 @@ -{stdenv, fetchurl, bash, yasm, which, perl, binutils}: +{stdenv, fetchurl, bash, perl, yasm +, vp8Support ? true # VP8 +, vp8DecoderSupport ? true # VP8 decoder +, vp8EncoderSupport ? true # VP8 encoder +, vp9Support ? true # VP9 +, vp9DecoderSupport ? true # VP9 decoder +, vp9EncoderSupport ? true # VP9 encoder +, extraWarningsSupport ? false # emit non-fatal warnings +, werrorSupport ? false # treat warnings as errors (not available with all compilers) +, installBinsSupport ? true # install binaries (vpxdec & vpxenc) +, installLibsSupport ? true # install libraries +, installSrcsSupport ? false # install sources +, debugSupport ? false # debug mode +, gprofSupport ? false # gprof profiling instrumentation +, gcovSupport ? false # gcov coverage instrumentation +, optimizationsSupport ? true # compiler optimization flags +, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime +, thumbSupport ? false # build arm assembly in thumb mode +, libsSupport ? true # build librares +, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples) +, fastUnalignedSupport ? true # use unaligned accesses if supported by hardware +, codecSrcsSupport ? false # codec library source code +, debugLibsSupport ? false # include debug version of each library +, md5Support ? true # support for output of checksum data +, postprocSupport ? true # postprocessing +, vp9PostprocSupport ? true # VP9 specific postprocessing +, multithreadSupport ? true # multithreaded decoding & encoding +, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders) +, memTrackerSupport ? false # track memory usage +, realtimeOnlySupport ? false # build for real-time encoding +, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding +, errorConcealmentSupport ? false # decoder conceals losses +, smallSupport ? false # favor smaller binary over speed +, postprocVisualizerSupport ? false # macro block/block level visualizers +, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests +, multiResEncodingSupport ? false # multiple-resolution encoding +, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising +, decryptSupport ? false +, experimentalSupport ? false # experimental features +# Experimental features +, experimentalMultipleArfSupport ? false +, experimentalNon420Support ? false +, experimentalAlphaSupport ? false +}: -let version = "1.3.0"; +assert (vp8Support || vp9Support); +assert (vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport); +assert vp8DecoderSupport -> vp8Support; +assert vp8EncoderSupport -> vp8Support; +assert vp9DecoderSupport -> vp9Support; +assert vp9EncoderSupport -> vp9Support; +assert installLibsSupport -> libsSupport; +# libvpx will not build binaries if examplesSupport is not enabled (ie. vpxdec & vpxenc) +assert installBinsSupport -> examplesSupport; +assert examplesSupport -> md5Support; +assert vp9PostprocSupport -> (vp9Support && postprocSupport); +assert (internalStatsSupport && vp9Support) -> vp9PostprocSupport; +assert postprocVisualizerSupport -> postprocSupport; +assert (postprocVisualizerSupport && vp9Support) -> vp9PostprocSupport; +assert unitTestsSupport -> ((curl != null) && (coreutils != null)); +assert (experimentalMultipleArfSupport || experimentalNon420Support || experimentalAlphaSupport) -> experimentalSupport; +assert stdenv.isCygwin -> unitTestsSupport; + +let + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; in -stdenv.mkDerivation rec { - name = "libvpx-" + version; - src = fetchurl { # sadly, there's no official tarball for this release - url = "http://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2"; +with stdenv.lib; +stdenv.mkDerivation rec { + name = "libvpx-${version}"; + version = "1.3.0"; + + src = fetchurl { + url = "http://webm.googlecode.com/files/libvpx-v${version}.tar.bz2"; sha1 = "191b95817aede8c136cc3f3745fb1b8c50e6d5dc"; }; patchPhase = '' - sed -e 's,/bin/bash,${bash}/bin/bash,' -i configure build/make/version.sh \ - examples/gen_example_code.sh build/make/gen_asm_deps.sh - sed -e '/enable linux/d' -i configure + patchShebangs . ''; - buildInputs = [ yasm which perl ] - ++ stdenv.lib.optional stdenv.isDarwin binutils; # new asm opcode support + nativeBuildInputs = [ bash perl yasm ]; - preConfigure = '' - mkdir -p build - cd build - substituteInPlace make/configure.sh --replace "-arch x86_64" "-march=x86-64" - ''; + buildInputs = [ ] + ++ optional unitTestsSupport coreutils + ++ optional unitTestsSupport curl; - configureScript = "../configure"; - configureFlags = - [ "--disable-install-srcs" "--disable-install-docs" "--disable-examples" - "--enable-vp8" "--enable-runtime-cpu-detect" "--enable-pic" ] - # --enable-shared is only supported on ELF - ++ stdenv.lib.optional (!stdenv.isDarwin) "--disable-static --enable-shared"; + configureFlags = [ + (mkFlag vp8Support "vp8") + (mkFlag vp8EncoderSupport "vp8-encoder") + (mkFlag vp8DecoderSupport "vp8-decoder") + (mkFlag vp9Support "vp9") + (mkFlag vp9EncoderSupport "vp9-encoder") + (mkFlag vp9DecoderSupport "vp9-decoder") + (mkFlag extraWarningsSupport "extra-warnings") + (mkFlag werrorSupport "werror") + "--disable-install-docs" + (mkFlag installBinsSupport "install-bins") + (mkFlag installLibsSupport "install-libs") + (mkFlag installSrcsSupport "install-srcs") + (mkFlag debugSupport "debug") + (mkFlag gprofSupport "gprof") + (mkFlag gcovSupport "gcov") + # Required to build shared libraries + (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "pic") + (mkFlag (stdenv.isx86_64 || !stdenv.isDarwin || stdenv.isCygwin) "use-x86inc") + (mkFlag optimizationsSupport "optimizations") + (mkFlag runtimeCpuDetectSupport "runtime-cpu-detect") + (mkFlag thumbSupport "thumb") + (mkFlag libsSupport "libs") + (mkFlag examplesSupport "examples") + "--disable-docs" + "--as=yasm" + (mkFlag fastUnalignedSupport "fast-unaligned") + (mkFlag codecSrcsSupport "codec-srcs") + (mkFlag debugLibsSupport "debug-libs") + (mkFlag md5Support "md5") + (mkFlag stdenv.isMips "dequant-tokens") + (mkFlag stdenv.isMips "dc-recon") + (mkFlag postprocSupport "postproc") + (mkFlag vp9PostprocSupport "vp9-postproc") + (mkFlag multithreadSupport "multithread") + (mkFlag internalStatsSupport "internal-stats") + (mkFlag memTrackerSupport "mem-tracker") + /* If --enable-spatial-resampling not enabled, build will fail with undeclared variable errors. + Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl, + but is only executed if --enable-spatial-resampling is enabled */ + "--enable-spatial-resampling" + (mkFlag realtimeOnlySupport "realtime-only") + (mkFlag ontheflyBitpackingSupport "onthefly-bitpacking") + (mkFlag errorConcealmentSupport "error-concealment") + # Shared libraries are only supported on ELF platforms + (mkFlag (stdenv.isDarwin || stdenv.isCygwin) "static") + (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "shared") + (mkFlag smallSupport "small") + (mkFlag postprocVisualizerSupport "postproc-visualizer") + (mkFlag unitTestsSupport "unit-tests") + (mkFlag multiResEncodingSupport "multi-res-encoding") + (mkFlag temporalDenoisingSupport "temporal-denoising") + (mkFlag decryptSupport "decrypt") + (mkFlag experimentalSupport "experimental") + # Experimental features + (mkFlag experimentalMultipleArfSupport "multiple-arf") + (mkFlag experimentalNon420Support "non420") + (mkFlag experimentalAlphaSupport "alpha") + ]; - installPhase = '' - make quiet=false DIST_DIR=$out install - ''; + enableParallelBuilding = true; - meta = with stdenv.lib; { - description = "VP8 video encoder"; - homepage = http://code.google.com/p/webm; + crossAttrs = let + isCygwin = stdenv.cross.libc == "msvcrt"; + isDarwin = stdenv.cross.libc == "libSystem"; + in { + dontSetConfigureCross = true; + configureFlags = configureFlags ++ [ + #"--extra-cflags=" + #"--prefix=" + #"--libc=" + #"--libdir=" + "--enable-external-build" + # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) + # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure + # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 + "--force-target=${stdenv.cross.config}${( + if isDarwin then ( + if stdenv.cross.osxMinVersion == "10.9" then "13" + else if stdenv.cross.osxMinVersion == "10.8" then "12" + else if stdenv.cross.osxMinVersion == "10.7" then "11" + else if stdenv.cross.osxMinVersion == "10.6" then "10" + else if stdenv.cross.osxMinVersion == "10.5" then "9" + else "8") + else "")}-gcc" + (if isCygwin then "--enable-static-msvcrt" else "") + ]; + }; + + meta = { + description = "WebM VP8/VP9 codec SDK"; + homepage = http://www.webmproject.org/; license = licenses.bsd3; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + maintainers = with maintainers; [ codyopel lovek323 ]; + platforms = platforms.all; }; } - diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix new file mode 100644 index 00000000000..fd7f9150e1d --- /dev/null +++ b/pkgs/development/libraries/libvpx/git.nix @@ -0,0 +1,203 @@ +{stdenv, fetchgit, perl, yasm +, vp8Support ? true # VP8 +, vp8DecoderSupport ? true # VP8 decoder +, vp8EncoderSupport ? true # VP8 encoder +, vp9Support ? true # VP9 +, vp9DecoderSupport ? true # VP9 decoder +, vp9EncoderSupport ? true # VP9 encoder +, extraWarningsSupport ? false # emit non-fatal warnings +, werrorSupport ? false # treat warnings as errors (not available with all compilers) +, installBinsSupport ? true # install binaries (vpxdec & vpxenc) +, installLibsSupport ? true # install libraries +, installSrcsSupport ? false # install sources +, debugSupport ? false # debug mode +, gprofSupport ? false # gprof profiling instrumentation +, gcovSupport ? false # gcov coverage instrumentation +, sizeLimitSupport ? true # limit max size to allow in the decoder +, optimizationsSupport ? true # compiler optimization flags +, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime +, thumbSupport ? false # build arm assembly in thumb mode +, libsSupport ? true # build librares +, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples) +, fastUnalignedSupport ? true # use unaligned accesses if supported by hardware +, codecSrcsSupport ? false # codec library source code +, debugLibsSupport ? false # include debug version of each library +, postprocSupport ? true # postprocessing +, vp9PostprocSupport ? true # VP9 specific postprocessing +, multithreadSupport ? true # multithreaded decoding & encoding +, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders) +, memTrackerSupport ? false # track memory usage +, spatialResamplingSupport ? true # spatial sampling (scaling) +, realtimeOnlySupport ? false # build for real-time encoding +, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding +, errorConcealmentSupport ? false # decoder conceals losses +, smallSupport ? false # favor smaller binary over speed +, postprocVisualizerSupport ? false # macro block/block level visualizers +, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests +, webmIOSupport ? true # input from and output to webm container +, libyuvSupport ? true # libyuv +, decodePerfTestsSupport ? false # build decoder perf tests with unit tests +, encodePerfTestsSupport ? false # build encoder perf tests with unit tests +, multiResEncodingSupport ? false # multiple-resolution encoding +, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising +, vp9TemporalDenoisingSupport ? true # VP9 specific temporal denoising +, coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range +, vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9 +, experimentalSupport ? false # experimental features +# Experimental features +, experimentalSpatialSvcSupport ? false # Spatial scalable video coding +, experimentalFpMbStatsSupport ? false +, experimentalEmulateHardwareSupport ? false +}: + +assert (vp8Support || vp9Support); +assert (vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport); +assert vp8DecoderSupport -> vp8Support; +assert vp8EncoderSupport -> vp8Support; +assert vp9DecoderSupport -> vp9Support; +assert vp9EncoderSupport -> vp9Support; +assert installLibsSupport -> libsSupport; +# libvpx will not build binaries if examplesSupport is not enabled (ie. vpxdec & vpxenc) +assert installBinsSupport -> examplesSupport; +assert vp9PostprocSupport -> (vp9Support && postprocSupport); +assert (internalStatsSupport && vp9Support) -> vp9PostprocSupport; +/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors. + Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl, + but is only executed if spatialResamplingSupport is enabled */ +assert spatialResamplingSupport; +assert postprocVisualizerSupport -> postprocSupport; +assert (postprocVisualizerSupport && vp9Support) -> vp9PostprocSupport; +assert unitTestsSupport -> ((curl != null) && (coreutils != null)); +assert vp9TemporalDenoisingSupport -> (vp9Support && temporalDenoisingSupport); +assert vp9HighbitdepthSupport -> vp9Support; +assert (experimentalSpatialSvcSupport || experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) -> experimentalSupport; +assert stdenv.isCygwin -> (unitTestsSupport && webmIOSupport && libyuvSupport); + +let + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; +in + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "libvpx-git"; + + src = fetchgit { + url = "https://chromium.googlesource.com/webm/libvpx"; + /* DO NOT under any circumstance ever just bump the git commit without + confirming changes have not been made to the configure system */ + rev = "f4c29ae9ea16c502c980a81ca9683327d5051929"; # 2015-2-12 + sha256 = "1d5m3dryfdrsf3mi6bcbsndyhihzksqalzfvi21fbxxkk1imsb9x"; + }; + + patchPhase = '' + patchShebangs . + ''; + + nativeBuildInputs = [ perl yasm ]; + + buildInputs = [ ] + ++ optional unitTestsSupport coreutils + ++ optional unitTestsSupport curl; + + configureFlags = [ + (mkFlag vp8Support "vp8") + (mkFlag vp8EncoderSupport "vp8-encoder") + (mkFlag vp8DecoderSupport "vp8-decoder") + (mkFlag vp9Support "vp9") + (mkFlag vp9EncoderSupport "vp9-encoder") + (mkFlag vp9DecoderSupport "vp9-decoder") + (mkFlag extraWarningsSupport "extra-warnings") + (mkFlag werrorSupport "werror") + "--disable-install-docs" + (mkFlag installBinsSupport "install-bins") + (mkFlag installLibsSupport "install-libs") + (mkFlag installSrcsSupport "install-srcs") + (mkFlag debugSupport "debug") + (mkFlag gprofSupport "gprof") + (mkFlag gcovSupport "gcov") + # Required to build shared libraries + (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "pic") + (mkFlag (stdenv.isi686 || stdenv.isx86_64) "use-x86inc") + (mkFlag optimizationsSupport "optimizations") + (mkFlag runtimeCpuDetectSupport "runtime-cpu-detect") + (mkFlag thumbSupport "thumb") + (mkFlag libsSupport "libs") + (mkFlag examplesSupport "examples") + "--disable-docs" + "--as=yasm" + # Limit default decoder max to WHXGA + (if sizeLimitSupport then "--size-limit=5120x3200" else "") + (mkFlag fastUnalignedSupport "fast-unaligned") + (mkFlag codecSrcsSupport "codec-srcs") + (mkFlag debugLibsSupport "debug-libs") + (mkFlag stdenv.isMips "dequant-tokens") + (mkFlag stdenv.isMips "dc-recon") + (mkFlag postprocSupport "postproc") + (mkFlag vp9PostprocSupport "vp9-postproc") + (mkFlag multithreadSupport "multithread") + (mkFlag internalStatsSupport "internal-stats") + (mkFlag memTrackerSupport "mem-tracker") + (mkFlag spatialResamplingSupport "spatial-resampling") + (mkFlag realtimeOnlySupport "realtime-only") + (mkFlag ontheflyBitpackingSupport "onthefly-bitpacking") + (mkFlag errorConcealmentSupport "error-concealment") + # Shared libraries are only supported on ELF platforms + (mkFlag (stdenv.isDarwin || stdenv.isCygwin) "static") + (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "shared") + (mkFlag smallSupport "small") + (mkFlag postprocVisualizerSupport "postproc-visualizer") + (mkFlag unitTestsSupport "unit-tests") + (mkFlag webmIOSupport "webm-io") + (mkFlag libyuvSupport "libyuv") + (mkFlag decodePerfTestsSupport "decode-perf-tests") + (mkFlag encodePerfTestsSupport "encode-perf-tests") + (mkFlag multiResEncodingSupport "multi-res-encoding") + (mkFlag temporalDenoisingSupport "temporal-denoising") + (mkFlag vp9TemporalDenoisingSupport "vp9-temporal-denoising") + (mkFlag coefficientRangeCheckingSupport "coefficient-range-checking") + (mkFlag (vp9HighbitdepthSupport && !stdenv.isi686) "vp9-highbitdepth") + (mkFlag experimentalSupport "experimental") + # Experimental features + (mkFlag experimentalSpatialSvcSupport "spatial-svc") + (mkFlag experimentalFpMbStatsSupport "fp-mb-stats") + (mkFlag experimentalEmulateHardwareSupport "emulate-hardware") + ]; + + enableParallelBuilding = true; + + crossAttrs = let + isCygwin = stdenv.cross.libc == "msvcrt"; + isDarwin = stdenv.cross.libc == "libSystem"; + in { + dontSetConfigureCross = true; + configureFlags = configureFlags ++ [ + #"--extra-cflags=" + #"--prefix=" + #"--libc=" + #"--libdir=" + "--enable-external-build" + # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) + # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure + # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 + "--force-target=${stdenv.cross.config}${( + if isDarwin then ( + if stdenv.cross.osxMinVersion == "10.10" then "14" + else if stdenv.cross.osxMinVersion == "10.9" then "13" + else if stdenv.cross.osxMinVersion == "10.8" then "12" + else if stdenv.cross.osxMinVersion == "10.7" then "11" + else if stdenv.cross.osxMinVersion == "10.6" then "10" + else if stdenv.cross.osxMinVersion == "10.5" then "9" + else "8") + else "")}-gcc" + (if isCygwin then "--enable-static-msvcrt" else "") + ]; + }; + + meta = { + description = "WebM VP8/VP9 codec SDK"; + homepage = http://www.webmproject.org/; + license = licenses.bsd3; + maintainers = with maintainers; [ codyopel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/protobuf/2.5.nix b/pkgs/development/libraries/protobuf/2.5.nix index 4cc6a68c9f2..9d7bb38cf3c 100644 --- a/pkgs/development/libraries/protobuf/2.5.nix +++ b/pkgs/development/libraries/protobuf/2.5.nix @@ -2,6 +2,7 @@ callPackage ./generic.nix (args // rec { version = "2.5.0"; + # make sure you test also -A pythonPackages.protobuf src = fetchurl { url = "http://protobuf.googlecode.com/files/${version}.tar.bz2"; sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; diff --git a/pkgs/development/libraries/protobuf/2.6.nix b/pkgs/development/libraries/protobuf/2.6.nix index 72960b0dd6a..49ed9d9ade1 100644 --- a/pkgs/development/libraries/protobuf/2.6.nix +++ b/pkgs/development/libraries/protobuf/2.6.nix @@ -2,6 +2,7 @@ callPackage ./generic.nix (args // rec { version = "2.6.1"; + # make sure you test also -A pythonPackages.protobuf src = fetchFromGitHub { owner = "google"; repo = "protobuf"; diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 003ea703517..929621204a0 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "protobuf-${version}"; + name = "protobuf-v${version}"; inherit src; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index d7e66a4f618..30fbdcd1e8d 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.4"; - rev = "5e604833c5aa605d0b6efbe5234492b5e7d8ac61"; - sha256 = "1aqksqi1qmjpva5cal6j7h0hzk298wk3nhqv73wnyqdchq2sa8v5"; + version = "1.5"; + rev = "9f0324125f53a12f766f6ed6f98f16e2f42337f4"; + sha256 = "1nyim0l975faj7926s4wba8yvjy4rvx005zb7krv0gb5p84nzgi7"; }) \ No newline at end of file diff --git a/pkgs/development/libraries/x265/generic.nix b/pkgs/development/libraries/x265/generic.nix index 58a39dbbe38..2779b581143 100644 --- a/pkgs/development/libraries/x265/generic.nix +++ b/pkgs/development/libraries/x265/generic.nix @@ -1,12 +1,21 @@ -{ stdenv, cmake, fetchhg, mercurial, yasm +{ stdenv, fetchhg, cmake, yasm , rev , sha256, version -, highBitDepth ? false -, debuggingSupport ? false -, enableCli ? true -, testSupport ? false +, debugSupport ? false # Run-time sanity checks (debugging) +, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel +, werrorSupport ? false # Warnings as errors +, ppaSupport ? false # PPA profiling instrumentation +, vtuneSupport ? false # Vtune profiling instrumentation +, custatsSupport ? false # Internal profiling of encoder work +, cliSupport ? true # Build standalone CLI application +, unittestsSupport ? false # Unit tests , ... }: +let + mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; +in + +with stdenv.lib; stdenv.mkDerivation rec { name = "x265-${version}"; @@ -20,39 +29,28 @@ stdenv.mkDerivation rec { sed -i 's/unknown/${version}/g' source/cmake/version.cmake ''; - cmakeFlags = with stdenv.lib; - '' - ${if debuggingSupport - then "-DCHECKED_BUILD=ON" - else "-DCHECKED_BUILD=OFF" - } - -DSTATIC_LINK_CRT=OFF - ${if (stdenv.system == "x86_64-linux" && highBitDepth) - then "-DHIGH_BIT_DEPTH=ON" - else "-DHIGH_BIT_DEPTH=OFF" - } - -DWARNINGS_AS_ERRORS=OFF - -DENABLE_PPA=OFF - -DENABLE_SHARED=ON - ${if enableCli - then "-DENABLE_CLI=ON" - else "-DENABLE_CLI=OFF" - } - ${if testSupport - then "-DENABLE_TESTS=ON" - else "-DENABLE_TESTS=OFF" - } - ''; + cmakeFlags = with stdenv.lib; [ + (mkFlag debugSupport "CHECKED_BUILD") + "-DSTATIC_LINK_CRT=OFF" + (mkFlag (highbitdepthSupport && stdenv.isx86_64) "HIGH_BIT_DEPTH") + (mkFlag werrorSupport "WARNINGS_AS_ERRORS") + (mkFlag ppaSupport "ENABLE_PPA") + "-DENABLE_SHARED=ON" + (mkFlag cliSupport "ENABLE_CLI") + (mkFlag unittestsSupport "ENABLE_TESTS") + ]; - preConfigure = "cd source"; + preConfigure = '' + cd source + ''; - buildInputs = [ cmake yasm ]; + nativeBuildInputs = [ cmake yasm ]; - meta = with stdenv.lib; { - homepage = "http://x265.org"; + meta = { description = "Library for encoding h.265/HEVC video streams"; - license = licenses.gpl2; - platforms = platforms.linux; + homepage = http://x265.org; + license = licenses.gpl2; maintainers = with maintainers; [ codyopel ]; + platforms = platforms.all; }; } \ No newline at end of file diff --git a/pkgs/development/libraries/x265/hg.nix b/pkgs/development/libraries/x265/hg.nix index 5793bd34338..d26df82b3e3 100644 --- a/pkgs/development/libraries/x265/hg.nix +++ b/pkgs/development/libraries/x265/hg.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "hg"; - rev = "5f9f7194267b76f733e9ffb0f9e8b474dfe89a71"; - sha256 = "056ng8nsadmjf6s7igbgbxmiapjcxpfy6pbayl764xbhpkv4md88"; + version = "2015-2-11"; # Date of commit used Y-M-D + rev = "9ab104096834f51bd799ea1cf1160092f8182944"; + sha256 = "1j4k6ylglrzng5rz29qx2z06amdrq8wyzvqhm4ivfzvpndfniim6"; }) \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 546d2aaa522..e90e7c4571c 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -2,7 +2,7 @@ let pname = "cmdliner"; - version = "0.9.6"; + version = "0.9.7"; ocaml_version = (builtins.parseDrvName ocaml.name).version; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "1i08yjkk5wln60bw9rrllh6ajjgq14cvzvcci8y1nk5v6ys7jr8p"; + sha256 = "0ymzy1l6z85b6779lfxk179igfpf7rgfik70kr3c7lxmzwy8j6cw"; }; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index f54d14e4fe9..25a9e4128bf 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib, lwt }: -let version = "0.3.1"; in +let version = "0.4.1"; in stdenv.mkDerivation { name = "ocaml-ezjsonm-${version}"; src = fetchzip { url = "https://github.com/mirage/ezjsonm/archive/${version}.tar.gz"; - sha256 = "0cz1v75j8j5y4vfcgylp5zaxiy7541qg6pm4wrgmvy6fmh82654f"; + sha256 = "0cfjh8awajvw6kkmxr65dvri4k6h29pynxvk76a8c2lkixpsc095"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 1e4599bbf30..6fd7f2f2e5e 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, ocaml, findlib }: stdenv.mkDerivation rec { - name = "ocaml-re-1.2.2"; + name = "ocaml-re-1.3.0"; src = fetchgit { url = https://github.com/ocaml/ocaml-re.git; rev = "refs/tags/${name}"; - sha256 = "1556i1zc6nrg4hxlvidllfhkjwl6n74biyjbvjlby8304n84jrk7"; + sha256 = "1h8hz0dbjp8l39pva2js380c8bsm8rb4v326l62rkrdv8jvyh6bx"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 4111e264658..53549791b25 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,14 +1,15 @@ -{stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig}: +{ stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig }: -stdenv.mkDerivation { - name = "ocaml-sqlite3-2.0.7"; +stdenv.mkDerivation rec { + name = "ocaml-sqlite3-${version}"; + version = "2.0.9"; src = fetchurl { - url = https://github.com/mmottl/sqlite3-ocaml/archive/v2.0.7.tar.gz; - sha256 = "04m7qz251m6l2b7slkgml2j8bnx60lwzbdbsv95vidwzqcwg7bdq"; + url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/v${version}/sqlite3-ocaml-${version}.tar.gz"; + sha256 = "0rwsx1nfa3xqmbygim2qx45jqm1gwf08m70wmcwkx50f1qk3l551"; }; - buildInputs = [ocaml findlib pkgconfig sqlite]; + buildInputs = [ ocaml findlib pkgconfig sqlite ]; createFindlibDestdir = true; diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 928a5d33f8f..2fa5f4d82e3 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bash, pharo-vm, unzip, makeDesktopItem }: stdenv.mkDerivation rec { - version = "0.2.1-2014.09.29"; + version = "0.2.4-2015.02.13"; name = "pharo-launcher-${version}"; src = fetchurl { url = "http://files.pharo.org/platform/launcher/blessed/PharoLauncher-user-${version}.zip"; - md5 = "10945989c2b323c7f09a3b4e42ee7f2d"; + md5 = "064f53cd20c7f189ba2d01f9e4b17d36"; }; executable-name = "pharo-launcher"; @@ -68,4 +68,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.DamienCassou ]; platforms = pharo-vm.meta.platforms; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index f0e057e2dd6..f1bb496ac00 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -51,7 +51,7 @@ # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. -if disabled then throw "${name} not supported for interpreter ${python.executable}" else python.stdenv.mkDerivation (attrs // { +python.stdenv.mkDerivation (attrs // { inherit doCheck; name = namePrefix + name; @@ -118,7 +118,7 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl # work as expected # --old-and-unmanagable: - # instruct setuptools not to use eggs but fallback to plan package install + # instruct setuptools not to use eggs but fallback to plan package install # this also reduces one .pth file in the chain, but the main reason is to # force install process to install only scripts for the package we are # installing (otherwise it will install scripts also for dependencies) @@ -167,6 +167,7 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl meta = with lib.maintainers; { # default to python's platforms platforms = python.meta.platforms; + broken = disabled; } // meta // { # add extra maintainer(s) to every package maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ]; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix new file mode 100644 index 00000000000..f9406279b5d --- /dev/null +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, cmake, llvmPackages }: + +with llvmPackages; + +let version = "3.5"; in +stdenv.mkDerivation rec { + name = "include-what-you-use-${version}"; + + src = fetchurl { + sha256 = "1wfl78wkg8m2ssjnkb2rwcqy35nhc8fa63mk3sa60jrshpy7b15w"; + url = "${meta.homepage}/downloads/${name}.src.tar.gz"; + }; + + meta = with stdenv.lib; { + description = "Analyze #includes in C/C++ source files with clang"; + longDescription = '' + For every symbol (type, function variable, or macro) that you use in + foo.cc, either foo.cc or foo.h should #include a .h file that exports the + declaration of that symbol. The include-what-you-use tool is a program + that can be built with the clang libraries in order to analyze #includes + of source files to find include-what-you-use violations, and suggest + fixes for them. The main goal of include-what-you-use is to remove + superfluous #includes. It does this both by figuring out what #includes + are not actually needed for this file (for both .cc and .h files), and + replacing #includes with forward-declares when possible. + ''; + homepage = http://include-what-you-use.com; + license = with licenses; bsd3; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + + buildInputs = [ clang cmake llvm ]; + + cmakeFlags = [ "-DLLVM_PATH=${llvm}" ]; + enableParallelBuilding = true; +} diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index dc846acb500..fe174febc9e 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { name = "ocp-build-1.99.8-beta"; src = fetchurl { - url = "https://github.com/OCamlPro/ocp-build/archive/ocp-build.1.99.8-beta.tar.gz"; - sha256 = "06qh8v7k5m52xbivas08lblspsnvdl0vd7ghfj6wvpnfl8qvqabn"; + url = http://www.typerex.org/pub/ocp-build/ocp-build.1.99.8-beta.tar.gz; + sha256 = "03zqpl73ah0fji5baxmk8w0h7waamlnhhysi128yap4abzsh5w87"; }; buildInputs = [ ocaml findlib ncurses ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation { TERM = "xterm"; meta = with stdenv.lib; { - homepage = "http://typerex.ocamlpro.com/ocp-build.html"; + homepage = http://www.typerex.org/ocp-build.html; description = "A build tool for OCaml"; longDescription = '' ocp-build is a build system for OCaml application, based on simple diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index e385c0d40c4..1965521ba81 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -64,8 +64,8 @@ let patchShebangs = dir: '' node=`type -p node` coffee=`type -p coffee || true` - find -L ${dir} -type f -print0 | \ - xargs -0 sed --follow-symlinks -i \ + find -L ${dir} -type f -print0 | xargs -0 grep -Il . | \ + xargs sed --follow-symlinks -i \ -e 's@#!/usr/bin/env node@#!'"$node"'@' \ -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ -e 's@#!/.*/node@#!'"$node"'@' \ diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix new file mode 100644 index 00000000000..6126108b642 --- /dev/null +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -0,0 +1,15 @@ +{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg }: +let pkg = import ./base.nix { + version = "3.0.0"; + pkgName = "image-analyzer"; + pkgSha256 = "1rb3f7c08dxc02zrwrkfvq7qlzlmm0kd2ah1fhxj6ajiyshi8q4v"; +}; +in callPackage pkg { + buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme gdk_pixbuf librsvg ]; + drvParams = { + postFixup = '' + wrapProgram $out/bin/image-analyzer \ + --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + }; +} diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix new file mode 100644 index 00000000000..b2b641e3f7a --- /dev/null +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -0,0 +1,37 @@ +{ pkgName, version, pkgSha256 }: +{ stdenv, fetchurl, cmake, pkgconfig, buildInputs, drvParams ? {} }: +let name = "${pkgName}-${version}"; +in stdenv.mkDerivation ({ + inherit name buildInputs; + src = fetchurl { + url = "http://downloads.sourceforge.net/cdemu/${name}.tar.bz2"; + sha256 = pkgSha256; + }; + nativeBuildInputs = [ pkgconfig cmake ]; + setSourceRoot = '' + mkdir build + cd build + sourceRoot="`pwd`" + ''; + configurePhase = '' + cmake ../${name} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON + ''; + meta = { + description = "CDemu is a software suite designed to emulate an optical drive and disc (including CD-ROMs and DVD-ROMs) on the Linux operating system."; + longDescription = '' + CDEmu consists of: + + - a kernel module implementing a virtual drive-controller + - libmirage which is a software library for interpreting optical disc images + - a daemon which emulates the functionality of an optical drive+disc + - textmode and GTK clients for controlling the emulator + - an image analyzer to view the structure of image files + + Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed. + ''; + homepage = "http://cdemu.sourceforge.net/"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = [ "Rok Mandeljc " ]; + }; +} // drvParams) diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix new file mode 100644 index 00000000000..e590cf60ac0 --- /dev/null +++ b/pkgs/misc/emulators/cdemu/client.nix @@ -0,0 +1,15 @@ +{ callPackage, python, dbus_python, intltool, makeWrapper }: +let pkg = import ./base.nix { + version = "3.0.0"; + pkgName = "cdemu-client"; + pkgSha256 = "125f6j7c52a0c7smbx323vdpwhx24yl0vglkiyfcbm92fjji14rm"; +}; +in callPackage pkg { + buildInputs = [ python dbus_python intltool makeWrapper ]; + drvParams = { + postFixup = '' + wrapProgram $out/bin/cdemu \ + --set PYTHONPATH "$PYTHONPATH" + ''; + }; +} diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix new file mode 100644 index 00000000000..cc7a619b14f --- /dev/null +++ b/pkgs/misc/emulators/cdemu/daemon.nix @@ -0,0 +1,9 @@ +{ callPackage, glib, libao }: +let pkg = import ./base.nix { + version = "3.0.2"; + pkgName = "cdemu-daemon"; + pkgSha256 = "01jg9b1nkqrbh6binfcbyraz83s9yjavgwi3y4w1bmqg5qlhv6lc"; +}; +in callPackage pkg { + buildInputs = [ glib libao (callPackage ./libmirage.nix {}) ]; +} diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix new file mode 100644 index 00000000000..b3d7f6d23ec --- /dev/null +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -0,0 +1,18 @@ +{ callPackage, python, pygobject3, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }: +let pkg = import ./base.nix { + version = "3.0.0"; + pkgName = "gcdemu"; + pkgSha256 = "1m5ab325r586v2y2d93a817phn6wck67y5mfkf948mph40ks0mqk"; +}; +in callPackage pkg { + buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme gdk_pixbuf librsvg ]; + drvParams = { + postFixup = '' + wrapProgram $out/bin/gcdemu \ + --set PYTHONPATH "$PYTHONPATH" \ + --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ + --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + # TODO AppIndicator + }; +} diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix new file mode 100644 index 00000000000..f6ae5d132fc --- /dev/null +++ b/pkgs/misc/emulators/cdemu/libmirage.nix @@ -0,0 +1,9 @@ +{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate }: +let pkg = import ./base.nix { + version = "3.0.3"; + pkgName = "libmirage"; + pkgSha256 = "03idg94h5qhmnnc8g9dw8yqf14yv2paph5n77dfmg925f3z70nyn"; +}; +in callPackage pkg { + buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate ]; +} diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix new file mode 100644 index 00000000000..d4596be03a6 --- /dev/null +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, kernel }: +let version = "20140928"; +in stdenv.mkDerivation { + name = "vhba-${version}"; + src = fetchurl { + url = "http://downloads.sourceforge.net/cdemu/vhba-module-${version}.tar.bz2"; + sha256 = "18jmpg2kpx87f32b8aprr1pxla9dlhf901rkj1sp3ammf94nxxa5"; + }; + preBuild = '' + makeFlags="KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build INSTALL_MOD_PATH=$out"; + ''; +} diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index b52957963c6..db1082f7989 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.cc.cc.isGNU or false; let - version = "1.7.35"; + version = "1.7.36"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "1yqwwfapv7vdhmdcnhnl2c4iqaqn1xwib4zfyv9ndhq2ld9gcbpb"; + sha256 = "1gg3xzccbsxfmvp7r09mq7q9904p7h97nr3pdkk5l1f6n8xbzai1"; }; gecko = fetchurl { diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 78c1e857ebe..b8a67b87a80 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,72 +1,29 @@ -# The firmware bundle as packaged by Debian. This should be "all" firmware that is not shipped -# as part of the kernel itself. -# You can either install the complete bundle, or write a separate package for individual -# devices that copies the firmware from this package. - -{ stdenv, fetchurl, dpkg }: +{ stdenv, fetchgit }: let - version = "0.43"; + version = "17657c35869baa999b454e868cd3d5a7e1656425"; + shortVersion = stdenv.lib.substring 0 7 version; +in +stdenv.mkDerivation { + name = "firmware-linux-nonfree-${shortVersion}"; - packages = [ - { name = "adi"; sha256 = "13cwnbispivpd73k928l1i818ylhpahp6xh7d6pw59sswrsx6inw"; } - { name = "atheros"; sha256 = "0sw9d52k3ynx1cxg7cq49pmm8y6vlqyhb9843hbyf6nbmjqj72bx"; } - { name = "bnx2"; sha256 = "1r8scys27qj5shdbgl8ag9vi4hiidx4bp8yw4n4dcp288d9x7bbh"; } - { name = "bnx2x"; sha256 = "03jx4vnn8irlwswydf4h3ya1kf064jkaj67jry2hr6qwpd4l8pgq"; } - { name = "brcm80211"; sha256 = "01mkmjkg16kdd26pwlg4a1s1717fh0j602mwqhwh46k8zakg2lkh"; } - { name = "intelwimax"; sha256 = "1avls6sx0pbsffrcs267r2r2rqlx2xrv8j9znc7ix1bi8g4fx91v"; } - { name = "ipw2x00"; sha256 = "19zqc30hsz7snw020izm81qbap3xsygggnmbspxndw7jihz0amjs"; } - { name = "ivtv"; sha256 = "1f2004lpw5nr9rxj3cl4ba0jdm51wkvsrbiy4drakawpjwh5y4qw"; } - { name = "iwlwifi"; sha256 = "1538r751mx8nhg3xibnnrhnflvf3kl5y9rnm7rpl4wyrfgx61amd"; } - { name = "libertas"; sha256 = "0svkqlsiqgmh970r38nh0c1pjx41zdfql2k2k5djw99fscjklacd"; } - { name = "linux"; sha256 = "0j62v6vbh2287j3x5c9i0xspmhyh5k1z8dyajgix7k37xi4jvpy2"; } - { name = "linux-nonfree"; sha256 = "1f5x72rzicivwm0sn9l6wjkx7z9a0b8n6c9m60xrqg36ly7mizzp"; } - { name = "myricom"; sha256 = "17cdl885jlnja5m60l35xr2f84hv8z4cvg3d25vpp171s1vf1ks1"; } - { name = "netxen"; sha256 = "122nava9ld1v8gcnqbdpx0kffv0rxm9glp4xg09ssvldy4myfgl7"; } - { name = "qlogic"; sha256 = "02pgmprz1qwij7lw1lgmb8clgxj8v3mx0fyy1l4z7bffnpvip863"; } - { name = "ralink"; sha256 = "0yw9gf9gm3jxmsndr8kcsf6829smm88kshfb4c8jn0n6f4yy9l7x"; } - { name = "realtek"; sha256 = "0gay9x47pimdqj665sr1416l3bdyca9grsqpj0s9n6k1lmywrqx1"; } - { name = "ti-connectivity"; sha256 = "1m6yk0827991hs46l8pp8iiwh1ms0rwlmwn64k2wr725k5yzg29b"; } - ]; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; + rev = version; + sha256 = "15lv58wf3vjs4dpxvx3a7wn0pj83952wa2ab6ajfl3pbdhcvkzjb"; + }; - fetchPackage = - { name, sha256 }: fetchurl { - url = "mirror://debian/pool/non-free/f/firmware-nonfree/firmware-${name}_${version}_all.deb"; - inherit sha256; - }; - - srcs = map fetchPackage packages; - -in stdenv.mkDerivation { - name = "firmware-linux-nonfree-${version}"; - inherit srcs; - - unpackPhase = '' - mkdir -p ./firmware + preInstall = '' + mkdir -p $out ''; - buildPhase = '' - for src in $srcs; do - dpkg-deb -W $src - dpkg-deb -x $src . - done - ''; + installFlags = [ "DESTDIR=$(out)" ]; - buildInputs = [ dpkg ]; - - installPhase = '' - mkdir -p $out/share $out/lib/firmware - cp -r lib/firmware/* "$out/lib/firmware/" - # iwlwifi is packaged separately, but we need Bluetooth fw - rm $out/lib/firmware/iwlwifi* - cp -r usr/share/doc $out/share/ - find $out/share -name changelog.gz | xargs rm - ''; - - meta = { - description = "Binary firmware collection packaged by Debian"; + meta = with stdenv.lib; { + description = "Binary firmware collection packaged by kernel.org"; homepage = http://packages.debian.org/sid/firmware-linux-nonfree; - license = stdenv.lib.licenses.unfreeRedistributableFirmware; - platforms = stdenv.lib.platforms.linux; + license = licenses.unfreeRedistributableFirmware; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/os-specific/linux/firmware/iwlwifi/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi/default.nix deleted file mode 100644 index a0236fc3c99..00000000000 --- a/pkgs/os-specific/linux/firmware/iwlwifi/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, fetchurl }: - -let - packages = [ - # Kernel 2.6.29+ - { name = "5150-ucode-8.24.2.2"; sha256 = "1y8cah9xa8a9c7alh220cvmncjmwnacdz0kwsvg9lqr4cvzyclyj"; } - - # Kernel 2.6.30+ - { name = "6000-ucode-9.221.4.1"; sha256 = "0sw3v9807agx4mxdrfgsw7f195gs1f4zscnzcgpc8gb664r6413z"; } - - # Kernel 2.6.37+ - { name = "6050-ucode-41.28.5.1"; sha256 = "1i10rfn3kc07s2iqz79wvsrblhm360yz6v231dcz8sabvcyrlzar"; } - { name = "100-ucode-39.31.5.1"; sha256 = "1jvzdaiklnw613c4drkjkcdlnnk6c9kk7f0jqdxfkgppydwssnc2"; } - - # Kernel 2.6.38+ - { name = "5000-ucode-8.83.5.1-1"; sha256 = "0pkzr4gflp3j0jm4rw66jypk3xn4bvpgdsnxjqwanyd64aj6naxg"; } - - # Kernel 3.2+ - { name = "6000g2b-ucode-18.168.6.1"; sha256 = "1shby6s9h4kfwmvg89505p61yq88ml1qccvw8h2m4l63a9mwg0qn"; } - { name = "6000g2a-ucode-18.168.6.1"; sha256 = "1sdv4lkpfd87c95zbk8wgn0b4l4nbwkb0b4iwvrzpnmdarbn3wm7"; } - { name = "1000-ucode-39.31.5.1"; sha256 = "0w69hfpwx79cph0517a6mkhsk51li2l0yhfr1jddmj3i4ny1y3zd"; } - { name = "135-ucode-18.168.6.1"; sha256 = "1dvyzwkyzsmvlp13z84g2lzkr0w0p8mj7c98fwh3pwv0cmglf04c"; } - { name = "105-ucode-18.168.6.1"; sha256 = "11z67ippn4hlmsnyv1lxknysrl3m5v908i9wf1nkm7kxw76biz04"; } - { name = "2000-ucode-18.168.6.1"; sha256 = "0ax98hlmz11hqi0k81j5cizp2hwaah7j6s3hw7jdfsmwpzy9lwrm"; } - { name = "2030-ucode-18.168.6.1"; sha256 = "0b69jpb46fk63ybyyb8lbh99j1d29ayp8fl98l18iqy3q7mx4ry8"; } - - # Kernel 3.10+ - { name = "7260-ucode-22.1.7.0"; sha256 = "0m31p98zwr70k3b9akha0d8n7x9ym43yg992jk8zd94159g37k0y"; } - { name = "3160-ucode-22.1.7.0"; sha256 = "0qfm854xv6dc6kqj0vym1avrirrshnxp9yqnlx356zvfnqyx4l33"; } - - # Kernel 3.13+ - { name = "7260-ucode-22.24.8.0"; sha256 = "1zvw5dj3kv7rdnypcmp6na8mlfw735nzahy8qz35zrmda8b6gvqi"; } - { name = "3160-ucode-22.24.8.0"; sha256 = "1jv3bhds3a3y2r719fqpc5cwb674hm3lwq9df11i6473f0xjs224"; } - { name = "7265-ucode-22.24.8.0"; sha256 = "1pvmc58gyr62akzdj8gx02y3i3d67zwawm8zdvpg2q615721wjp9"; } - - # Kernel 3.14.9+ - { name = "7260-ucode-25.228.9.0"; sha256 = "0ppx9lpkc2l9aggdadw4y2cpdz5zqyckshzhlb1qj60jbajiny36"; } - { name = "3160-ucode-25.228.9.0"; sha256 = "125kh5p21bx808l2al8v9a1g63396d1a1chf4amqa9zrp2aajmk8"; } - { name = "7265-ucode-25.228.9.0"; sha256 = "1dv9bai1s6vdigsahbrxjwlndnp2dsgkqz8j7021d34s99kbi6z8"; } - - # Kernel 3.17+ - { name = "7260-ucode-23.11.10.0"; sha256 = "1d9w7kd3h3632qmwb44943lxdafjn3ii8ha9wdvqri3b8fjfn7sa"; } - { name = "3160-ucode-23.11.10.0"; sha256 = "0ijpgfzz8735rsbkc6mvk3w7f1v9rr9dgy1l79vzmzc1vh2zpbdm"; } - { name = "7265-ucode-23.11.10.0"; sha256 = "1az8nq6z1ns1220309wp8jq1sc5flz2ac5k41pgj50503h54rlvi"; } - ]; - - fetchPackage = - { name, sha256 }: fetchurl { - name = "iwlwifi-${name}.tgz"; - url = "https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-${name}.tgz"; - inherit sha256; - }; - - srcs = map fetchPackage packages; - -in stdenv.mkDerivation { - name = "iwlwifi"; - inherit srcs; - - unpackPhase = '' - mkdir -p ./firmware - ''; - - buildPhase = '' - for src in $srcs; do - tar zxf $src - done - ''; - - installPhase = '' - mkdir -p $out/lib/firmware - cp -r iwlwifi-*/*.ucode "$out/lib/firmware/" - ''; - - meta = { - description = "Binary firmware collection from intel"; - homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; - license = stdenv.lib.licenses.unfreeRedistributableFirmware; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4f08e5a6fd8..2afbed13cae 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -49,7 +49,6 @@ with stdenv.lib; NUMA? y # Disable some expensive (?) features. - FTRACE n KPROBES n PM_TRACE_RTC n @@ -148,6 +147,7 @@ with stdenv.lib; # Filesystem options - in particular, enable extended attributes and # ACLs for all filesystems that support them. + FANOTIFY y EXT2_FS_XATTR y EXT2_FS_POSIX_ACL y EXT2_FS_SECURITY y diff --git a/pkgs/os-specific/linux/kernel/crc-regression.patch b/pkgs/os-specific/linux/kernel/crc-regression.patch new file mode 100644 index 00000000000..623713d16a6 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/crc-regression.patch @@ -0,0 +1,24 @@ +See https://github.com/NixOS/nixpkgs/issues/6231 + +v3.14.31:crypto/crc32c.c is missing the MODULE_ALIAS_CRYPTO("crc32c"). +That's probably because crypto/crc32c.c was renamed to +crypto/crc32c_generic.c in commit +06e5a1f29819759392239669beb2cad27059c8ec and therefore fell through +the cracks when backporting commit +5d26a105b5a73e5635eae0629b42fa0a90e07b7b. + +So the affected kernels (all that backported the "crypto-" prefix +patches) need this additional patch: + +diff --git a/crypto/crc32c.c b/crypto/crc32c.c +index 06f7018c9d95..aae5829eb681 100644 +--- a/crypto/crc32c.c ++++ b/crypto/crc32c.c +@@ -167,6 +167,7 @@ static void __exit crc32c_mod_fini(void) + module_init(crc32c_mod_init); + module_exit(crc32c_mod_fini); + ++MODULE_ALIAS_CRYPTO("crc32c"); + MODULE_AUTHOR("Clay Haapala "); + MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations wrapper for lib/crc32c"); + MODULE_LICENSE("GPL"); diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix new file mode 100644 index 00000000000..1706a5f05c4 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.19"; + modDirVersion = "3.19.0"; + # Remember to update grsecurity! + extraMeta.branch = "3.19"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "0v40b5l6dcviqgl47bxlcbimz7kawmy1c2909axi441jwlgm2hmy"; + }; + + 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 6c8047ab1d4..14c25374b3f 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -82,4 +82,9 @@ rec { { name = "grsec-fix-path"; patch = ./grsec-path.patch; }; + + crc_regression = + { name = "crc-backport-regression"; + patch = ./crc-regression.patch; + }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 63cb33a52a2..f8b6327a654 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "343.36"; + versionNumber = "346.35"; # Policy: use the highest stable version as the default (on our master). inherit (stdenv.lib) makeLibraryPath; in @@ -26,12 +26,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "17l23dp725883xcyy1n178pcl6lj27psrgbxymc356x2pngwkhcc"; + sha256 = "09fz8nydi8ip3yv7dmbwnpwvjql5wp582z57022ppb9hqwq3r9mv"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0djvh9wmazrfvpgyiqrz81kjk2war20xyjjr2kncxyplzk28mw97"; + sha256 = "1z9a69a9xbcrz925mj02l2qaqcnhxzh2msbq4hf73p7x4h94ibkx"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 1dec2dcb80b..3765469b9ab 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.95"; + version = "0.1.96"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "1h7yjfpgnhmzvc9862k7salc80sw7chmxx5chh4xw1lzsjz1nz5s"; + sha256 = "0fw5km1ms5faa9hlhzb6nba79m59443zblv43gpzsq1pwvpg7r94"; }; buildInputs = [ cmake zlib luajit diff --git a/pkgs/os-specific/linux/zfs/3.19-compat-git.patch b/pkgs/os-specific/linux/zfs/3.19-compat-git.patch deleted file mode 100644 index 07c4eb55acd..00000000000 --- a/pkgs/os-specific/linux/zfs/3.19-compat-git.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 5a562310d706c3c2f2adc067fe73f1061c4fc386 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Sat, 7 Feb 2015 13:41:01 +0100 -Subject: [PATCH] Linux 3.19 compat: file_inode was added - -struct access f->f_dentry->d_inode was replaced by accessor function -file_inode(f) ---- - config/kernel-file-inode.m4 | 20 ++++++++++++++++++++ - config/kernel.m4 | 1 + - include/linux/Makefile.am | 1 + - include/linux/fs_compat.h | 38 ++++++++++++++++++++++++++++++++++++++ - include/sys/zpl.h | 1 + - module/zfs/zpl_file.c | 4 ++-- - 6 files changed, 63 insertions(+), 2 deletions(-) - create mode 100644 config/kernel-file-inode.m4 - create mode 100644 include/linux/fs_compat.h - -diff --git a/config/kernel-file-inode.m4 b/config/kernel-file-inode.m4 -new file mode 100644 -index 0000000..13af4e6 ---- /dev/null -+++ b/config/kernel-file-inode.m4 -@@ -0,0 +1,20 @@ -+dnl # -+dnl # 3.19 API change -+dnl # struct access f->f_dentry->d_inode was replaced by accessor function -+dnl # file_inode(f) -+dnl # -+AC_DEFUN([ZFS_AC_KERNEL_FILE_INODE], [ -+ AC_MSG_CHECKING([whether file_inode() is available]) -+ ZFS_LINUX_TRY_COMPILE([ -+ #include -+ ],[ -+ struct file *f = NULL; -+ file_inode(f); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_FILE_INODE, 1, -+ [file_inode() is available]) -+ ],[ -+ AC_MSG_RESULT(no) -+ ]) -+]) -diff --git a/config/kernel.m4 b/config/kernel.m4 -index bdfb19c..e0b7954 100644 ---- a/config/kernel.m4 -+++ b/config/kernel.m4 -@@ -61,6 +61,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ - ZFS_AC_KERNEL_INODE_OPERATIONS_GET_ACL - ZFS_AC_KERNEL_CURRENT_UMASK - ZFS_AC_KERNEL_SHOW_OPTIONS -+ ZFS_AC_KERNEL_FILE_INODE - ZFS_AC_KERNEL_FSYNC - ZFS_AC_KERNEL_EVICT_INODE - ZFS_AC_KERNEL_DIRTY_INODE_WITH_FLAGS -diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index d00b1c8..480af26 100644 ---- a/include/linux/Makefile.am -+++ b/include/linux/Makefile.am -@@ -4,6 +4,7 @@ KERNEL_H = \ - $(top_srcdir)/include/linux/dcache_compat.h \ - $(top_srcdir)/include/linux/xattr_compat.h \ - $(top_srcdir)/include/linux/vfs_compat.h \ -+ $(top_srcdir)/include/linux/fs_compat.h \ - $(top_srcdir)/include/linux/blkdev_compat.h \ - $(top_srcdir)/include/linux/utsname_compat.h - -diff --git a/include/linux/fs_compat.h b/include/linux/fs_compat.h -new file mode 100644 -index 0000000..7860d75 ---- /dev/null -+++ b/include/linux/fs_compat.h -@@ -0,0 +1,38 @@ -+/* -+ * CDDL HEADER START -+ * -+ * The contents of this file are subject to the terms of the -+ * Common Development and Distribution License (the "License"). -+ * You may not use this file except in compliance with the License. -+ * -+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -+ * or http://www.opensolaris.org/os/licensing. -+ * See the License for the specific language governing permissions -+ * and limitations under the License. -+ * -+ * When distributing Covered Code, include this CDDL HEADER in each -+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE. -+ * If applicable, add the following below this CDDL HEADER, with the -+ * fields enclosed by brackets "[]" replaced with your own identifying -+ * information: Portions Copyright [yyyy] [name of copyright owner] -+ * -+ * CDDL HEADER END -+ */ -+ -+/* -+ * Copyright (C) 2015 Jörg Thalheim. -+ */ -+ -+#ifndef _ZFS_FS_H -+#define _ZFS_FS_H -+ -+#include -+ -+#ifndef HAVE_FILE_INODE -+static inline struct inode *file_inode(const struct file *f) -+{ -+ return f->f_dentry->d_inode; -+} -+#endif /* HAVE_FILE_INODE */ -+ -+#endif /* _ZFS_FS_H */ -diff --git a/include/sys/zpl.h b/include/sys/zpl.h -index 3fc5d97..20eb27b 100644 ---- a/include/sys/zpl.h -+++ b/include/sys/zpl.h -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/module/zfs/zpl_file.c b/module/zfs/zpl_file.c -index 1f4f219..5f5bbba 100644 ---- a/module/zfs/zpl_file.c -+++ b/module/zfs/zpl_file.c -@@ -617,7 +617,7 @@ zpl_fallocate(struct file *filp, int mode, loff_t offset, loff_t len) - static int - zpl_ioctl_getflags(struct file *filp, void __user *arg) - { -- struct inode *ip = filp->f_dentry->d_inode; -+ struct inode *ip = file_inode(filp); - unsigned int ioctl_flags = 0; - uint64_t zfs_flags = ITOZ(ip)->z_pflags; - int error; -@@ -653,7 +653,7 @@ zpl_ioctl_getflags(struct file *filp, void __user *arg) - static int - zpl_ioctl_setflags(struct file *filp, void __user *arg) - { -- struct inode *ip = filp->f_dentry->d_inode; -+ struct inode *ip = file_inode(filp); - uint64_t zfs_flags = ITOZ(ip)->z_pflags; - unsigned int ioctl_flags; - cred_t *cr = CRED(); diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index da48880ae16..61349b2ab20 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -5,13 +5,12 @@ callPackage ./generic.nix (args // rec { src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "33b4de513ee81c2a87e1b954a9544a5eec1f8f94"; - sha256 = "07kdml65l22z1xi8jif5hr7zr7a8mykyms4f5yrf8nyad20kp6il"; + rev = "5f15fa22167ff665d0db0159551eb90759683984"; + sha256 = "14l1s1rfykj5dz1ssh5c8d1k98qn19l48sd31lwshiczx63zjygw"; }; patches = [ ./nix-build-git.patch - ./3.19-compat-git.patch # Remove once PR-3084 is mainlined ]; spl = spl_git; diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix new file mode 100644 index 00000000000..89ce5a644d8 --- /dev/null +++ b/pkgs/servers/limesurvey/default.nix @@ -0,0 +1,41 @@ +{ stdenv, lib, fetchFromGitHub, writeText, makeWrapper, php }: + +stdenv.mkDerivation rec { + name = "limesurvey-${version}"; + version = "2.05_plus_141210"; + + src = fetchFromGitHub { + owner = "LimeSurvey"; + repo = "LimeSurvey"; + rev = version; + sha256 = "1b5yixrlrjm055ag07c7phk84mk1892v20nsss1y0xzvgn6s14gq"; + }; + + buildInputs = [ makeWrapper ]; + + phpConfig = writeText "config.php" '' + + ''; + + patchPhase = '' + substituteInPlace application/core/LSYii_Application.php \ + --replace "'basePath" "//'basePath" + ''; + + installPhase = '' + mkdir -p $out/{bin,share/limesurvey} + cp -R . $out/share/limesurvey + cp ${phpConfig} $out/share/limesurvey/application/config/config.php + makeWrapper ${php}/bin/php $out/bin/limesurvey-console \ + --add-flags "$out/share/limesurvey/application/commands/console.php" + ''; + + meta = with lib; { + description = "Open source survey application"; + license = licenses.gpl2; + homepage = https://www.limesurvey.org; + maintainers = with maintainers; [offline]; + }; +} diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 8cabb8cac94..d2c19a2a00b 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, libevent, zlib, openssl, db, bison, pam }: +{ stdenv, fetchurl, libasr, libevent, zlib, openssl, db, bison, pam }: stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "5.4.2p1"; + version = "5.4.4p1"; - buildInputs = [ libevent zlib openssl db bison pam ]; + buildInputs = [ libasr libevent zlib openssl db bison pam ]; src = fetchurl { url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "18nrzfjhv9znb5dbhc5k3fi31a3vr1r8j36q3fzghkh47n6z9yjg"; - }; + sha256 = "1gcfdmpkk892wnnhwc2nb559bwl3k892w7saj4q8m6jfll53660i"; + }; - configureFlags = [ + configureFlags = [ "--with-mantype=doc" "--with-pam" "--without-bsd-auth" @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--with-privsep-user=smtpd" "--with-queue-user=smtpq" "--with-ca-file=/etc/ssl/certs/ca-bundle.crt" - ]; + ]; meta = { homepage = https://www.opensmtpd.org/; diff --git a/pkgs/servers/nosql/redis/3.0.nix b/pkgs/servers/nosql/redis/3.0.nix new file mode 100644 index 00000000000..049639ad684 --- /dev/null +++ b/pkgs/servers/nosql/redis/3.0.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "3.0.0-rc3"; + name = "redis-${version}"; + + src = fetchurl { + url = "https://github.com/antirez/redis/archive/${version}.tar.gz"; + sha256 = "1695fa532eafc14c95f45add5d8a71d07e0e87b5c8f06c29dfa06313322d27b7"; + }; + + makeFlags = "PREFIX=$(out)"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://redis.io; + description = "An open source, advanced key-value store"; + license = stdenv.lib.licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.berdario ]; + }; +} diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 64fbabb0800..842d38e8dc5 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "5.5.40"; src = fetchurl { - url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; + url = "http://cdn.mysql.com/archives/mysql-5.5/${name}.tar.gz"; sha256 = "0q29nzmmxm78b89qjfzgm93r0glaam3xw3zfx1k8ihii39v22dsd"; }; diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix new file mode 100644 index 00000000000..3f9aa4470f9 --- /dev/null +++ b/pkgs/servers/sslh/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers }: + +stdenv.mkDerivation rec { + name = "sslh-${version}"; + version = "1.16"; + + src = fetchurl { + url = "https://github.com/yrutschle/sslh/archive/v${version}.tar.gz"; + sha256 = "0xwi2bflvq4phrqjic84xch20jkg3wdys219mw2cy23sjkzk63mb"; + }; + + postPatch = "patchShebangs *.sh"; + + buildInputs = [ libcap libconfig perl tcp_wrappers ]; + + makeFlags = "USELIBCAP=1 USELIBWRAP=1"; + + installFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)"; + license = licenses.gpl2Plus; + homepage = http://www.rutschle.net/tech/sslh.shtml; + maintainers = [ maintainers.koral ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 659a582f39c..da537c5c453 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1985,11 +1985,11 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.16.2.901"; + name = "xorg-server-1.16.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.16.2.901.tar.bz2; - sha256 = "19jb8v26wc332ramwjdg5vjh3s36kr7n46s6fdfaxrj1wif5m27g"; + url = mirror://xorg/individual/xserver/xorg-server-1.16.4.tar.bz2; + sha256 = "0wf8xykcjhvpk9ppjcixvf60p6kkyrpmfj0z29d93a8kjb6f3dmb"; }; buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ]; }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 4ac572cb201..bb1c5b9291f 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -171,7 +171,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.16.2.901.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.16.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 diff --git a/pkgs/shells/bash-completion/bash-4.3.patch b/pkgs/shells/bash-completion/bash-4.3.patch new file mode 100644 index 00000000000..e893b501d31 --- /dev/null +++ b/pkgs/shells/bash-completion/bash-4.3.patch @@ -0,0 +1,22 @@ +commit a9c556ccad819869a6a5d932aac0a75a99372f08 +Author: Barry Warsaw +Date: Wed Sep 17 19:32:43 2014 +0300 + + _init_completion: Handle cword < 0 (LP: #1289597) + + Previously only bash 4.3 seemed to provoke this, but now with the + empty command consistency tweak it occurs with earlier as well. + +diff --git a/bash_completion b/bash_completion +index 7e01ae4..3bb4bc2 100644 +--- a/bash_completion ++++ b/bash_completion +@@ -727,7 +727,7 @@ _init_completion() + fi + done + +- [[ $cword -eq 0 ]] && return 1 ++ [[ $cword -le 0 ]] && return 1 + prev=${words[cword-1]} + + [[ ${split-} ]] && _split_longopt && split=true diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index a189ed29d8c..39f7073fcbb 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0kxf8s5bw7y50x0ksb77d3kv0dwadixhybl818w27y6mlw26hq1b"; }; + patches = [ ./bash-4.3.patch ]; + doCheck = true; meta = { diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 0bf1ec736fc..6769540d8df 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl }: +let + version = "9.38"; +in stdenv.mkDerivation rec { - name = "p7zip-9.20.1"; - + name = "p7zip-${version}"; + src = fetchurl { - url = mirror://sourceforge/p7zip/p7zip_9.20.1_src_all.tar.bz2; - sha256 = "10j7rc1nzdp7vvcpc3340yi3qw7abby4szv8zkwh10d0zizpwma9"; + url = "mirror://sourceforge/p7zip/p7zip_${version}_src_all.tar.bz2"; + sha256 = "0mxribb9a3lz3bifz6002hg7vyy8h9piinypian533hw8qvswfx7"; }; preConfigure = '' diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix index 7f7d956afd2..acb992b24ad 100644 --- a/pkgs/tools/filesystems/genext2fs/default.nix +++ b/pkgs/tools/filesystems/genext2fs/default.nix @@ -8,8 +8,11 @@ stdenv.mkDerivation { sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0"; }; - meta = { + meta = with stdenv.lib; { homepage = http://genext2fs.sourceforge.net/; description = "A tool to generate ext2 filesystem images without requiring root privileges"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix new file mode 100644 index 00000000000..4c509444b74 --- /dev/null +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl, autoconf, automake, pkgconfig, curl, openssl, libxml2, fuse}: + +stdenv.mkDerivation { + name = "sshfs-fuse-1.78"; + src = fetchurl { + url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.78.tar.gz; + sha256 = "1xcp0bqa4a2ynjn5phb1pj70wm322czhqp4qcb27d5jd545b1h1n"; + }; + preConfigure = "./autogen.sh"; + buildInputs = [ autoconf automake pkgconfig curl openssl libxml2 fuse ]; + + meta = { + description = "Mount an S3 bucket as filesystem through FUSE"; + license = "GPLv2"; + }; +} diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 0f7b5c4a770..4761980a18d 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "tmsu-${version}"; - version = "0.5.0"; + version = "0.5.1"; go-sqlite3 = fetchgit { url = "git://github.com/mattn/go-sqlite3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "oniony"; repo = "tmsu"; rev = "v${version}"; - sha256 = "1as8whsk3dq9nkn4czc8q73nvlab343mdvm1sjllrnfkmz0s4cab"; + sha256 = "1fr80p5c3hd3956gn7ri5pv3gblaxw95xkpf6wz1llkmrr2i8ncp"; }; buildInputs = [ go fuse ]; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 6cab550d82b..90a7ce9efad 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,12 +1,8 @@ -a @ { - freeglut,ghostscriptX,imagemagick,fftw, - boehmgc,mesa,ncurses,readline,gsl,libsigsegv, - python,zlib, perl, texLive, texinfo, xz, - - noDepEntry, fullDepEntry, fetchUrlFromSrcInfo, - lib, - - ...}: +{stdenv, fetchurl + , freeglut, ghostscriptX, imagemagick, fftw + , boehmgc, mesa, ncurses, readline, gsl, libsigsegv + , python, zlib, perl, texLive, texinfo, xz +}: let s = # Generated upstream information rec { @@ -17,60 +13,37 @@ let url="mirror://sourceforge/project/asymptote/2.32/asymptote-2.32.src.tgz"; sha256="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90"; }; - buildInputs = with a; [ - freeglut ghostscriptX imagemagick fftw boehmgc - mesa ncurses readline gsl libsigsegv python zlib - perl texLive texinfo xz + buildInputs = [ + freeglut ghostscriptX imagemagick fftw + boehmgc mesa ncurses readline gsl libsigsegv + python zlib perl texLive texinfo xz ]; in -rec { - src = a.fetchUrlFromSrcInfo s; - - inherit (s) name; +stdenv.mkDerivation { + inherit (s) name version; inherit buildInputs; - configureFlags = "--enable-gc=${a.boehmgc} --enable-offscreen"; - - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "doUnpack" "fixPaths" "extractTexinfoTex" - "fixEpsWrite" - "doConfigure" "dumpRealVars" "doMakeInstall" "fixPathsResult" - "fixInfoDir"]; - - setVars = a.noDepEntry '' + src = fetchurl { + inherit (s) url sha256; + }; + preConfigure = '' export HOME="$PWD" + patchShebangs . + sed -e 's@epswrite@eps2write@g' -i runlabel.in + xz -d < ${texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex + cp texinfo-*/doc/texinfo.tex doc/ + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${boehmgc}/include/gc" ''; - - dumpRealVars = a.noDepEntry '' - set > ../real-env-vars - ''; - - fixPaths = a.doPatchShebangs ''.''; - fixPathsResult = a.doPatchShebangs ''$out/bin''; - - fixInfoDir = a.noDepEntry '' + postInstall = '' mv -v "$out/share/info/asymptote/"*.info $out/share/info/ sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info rmdir $out/share/info/asymptote rm $out/share/info/dir ''; - - extractTexinfoTex = a.fullDepEntry '' - xz -d < ${a.texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex - cp texinfo-*/doc/texinfo.tex doc/ - '' ["minInit" "addInputs" "doUnpack"]; - - fixEpsWrite = a.fullDepEntry '' - sed -e 's@epswrite@eps2write@g' -i runlabel.in - '' ["minInit" "addInputs" "doUnpack"]; - meta = { inherit (s) version; - description = "A tool for programming graphics intended to replace Metapost"; - maintainers = [ - a.lib.maintainers.raskin - a.lib.maintainers.simons - ]; - platforms = with a.lib.platforms; - linux; + description = "A tool for programming graphics intended to replace Metapost"; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.simons]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/tools/graphics/pngnq/default.nix index d1b1cfad00d..5676b37042d 100644 --- a/pkgs/tools/graphics/pngnq/default.nix +++ b/pkgs/tools/graphics/pngnq/default.nix @@ -1,18 +1,24 @@ -{ stdenv, fetchurl, libpng }: +{ stdenv, fetchurl, pkgconfig, libpng, zlib }: stdenv.mkDerivation rec { - name = "pngnq-1.0"; + name = "pngnq-1.1"; src = fetchurl { url = "mirror://sourceforge/pngnq/${name}.tar.gz"; - sha256 = "19q07hlhr9p5d0wqgzyrcxdnqlczdwpiibcji0k2a6jfmxrcn4rl"; + sha256 = "1qmnnl846agg55i7h4vmrn11lgb8kg6gvs8byqz34bdkjh5gwiy1"; }; - buildInputs = [ libpng ]; + buildInputs = [ pkgconfig libpng zlib ]; - meta = { + patchPhase = '' + sed -i '/png.h/a \#include ' src/rwpng.c + ''; + + meta = with stdenv.lib; { homepage = http://pngnq.sourceforge.net/; description = "A PNG quantizer"; - license = "bsd"; + license = licenses.bsd3; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix new file mode 100644 index 00000000000..2bfe0eb4266 --- /dev/null +++ b/pkgs/tools/misc/contacts/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "1.1a-3"; + name = "contacts-${version}"; + + src = fetchurl { + url = "https://github.com/dhess/contacts/archive/4092a3c6615d7a22852a3bafc44e4aeeb698aa8f.tar.gz"; + sha256 = "0wdqc1ndgrdhqapvvgx5xihc750szv08lp91x4l6n0gh59cpxpg3"; + }; + + preBuild = '' + substituteInPlace Makefile --replace "xcodebuild" "/usr/bin/xcodebuild" + ''; + + installPhase = '' + mkdir -p $out/bin + cp ./build/Deployment/contacts $out/bin + ''; + + meta = with stdenv.lib; { + description = "Access contacts from the Mac address book from command-line"; + homepage = http://www.gnufoo.org/contacts/contacts.html; + license = licenses.gpl2; + maintainers = with maintainers; [ jwiegley ]; + platforms = stdenv.lib.platforms.darwin; + hydraPlatforms = stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 90a2e5f9039..070efe69d4c 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -3,13 +3,13 @@ }: let - wine_patches_version = "1.7.35"; - wine_hash = "1yqwwfapv7vdhmdcnhnl2c4iqaqn1xwib4zfyv9ndhq2ld9gcbpb"; + wine_patches_version = "1.7.36"; + wine_hash = "1gg3xzccbsxfmvp7r09mq7q9904p7h97nr3pdkk5l1f6n8xbzai1"; wine_patches = fetchgit { url = "git://github.com/compholio/wine-compholio.git"; rev = "refs/tags/v${wine_patches_version}"; - sha256 = "0w3a3zh1p9np5hi1pk64pnz7bvgkdlhnl41bbkskh7yfgdbg4wq2"; + sha256 = "1nnwhd7m1wwipg72dzjhzhk9fgcf1ynknncj89ab0pabn4wmib2i"; }; wine_custom = diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix new file mode 100644 index 00000000000..50fde6a7794 --- /dev/null +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, automake, autoconf, openssl, ppp }: + +with stdenv.lib; + +let repo = "openfortivpn"; + version = "1.0.1"; + +in stdenv.mkDerivation { + name = "${repo}-${version}"; + + src = fetchFromGitHub { + owner = "adrienverge"; + inherit repo; + rev = "v${version}"; + sha256 = "0kwl8hv3nydd34xp1489jpjdj4bmknfl9xrgynij0vf5qx29xv7m"; + }; + + buildInputs = [ openssl automake autoconf ppp ]; + + preConfigure = '' + aclocal + autoconf + automake --add-missing + + substituteInPlace src/tunnel.c --replace "/usr/sbin/pppd" "${ppp}/bin/pppd" + ''; + + enableParallelBuilding = true; + + meta = { + description = "Client for PPP+SSL VPN tunnel services"; + homepage = https://github.com/adrienverge/openfortivpn; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.madjar ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix new file mode 100644 index 00000000000..09357e87da0 --- /dev/null +++ b/pkgs/tools/networking/polygraph/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, openssl, zlib, ncurses }: + +stdenv.mkDerivation rec { + name = "polygraph-4.3.2"; + + src = fetchurl { + url = "http://www.web-polygraph.org/downloads/srcs/${name}-src.tgz"; + sha256 = "1fv9jpcicfsgsmghkykqif6l6w7nwvk5xbdmpv72jbrwzx44845h"; + }; + + buildInputs = [ openssl zlib ncurses ]; + + patches = [ ./fix_build.patch ]; + + meta = with stdenv.lib; { + homepage = http://www.web-polygraph.org; + description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries"; + platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; + }; +} \ No newline at end of file diff --git a/pkgs/tools/networking/polygraph/fix_build.patch b/pkgs/tools/networking/polygraph/fix_build.patch new file mode 100644 index 00000000000..96832d72037 --- /dev/null +++ b/pkgs/tools/networking/polygraph/fix_build.patch @@ -0,0 +1,77 @@ +Description: Fix ftbfs with GCC-4.7. +Author: Mònica Ramírez Arceda +Bug-Debian: http://bugs.debian.org/667326 +Last-Update: 2012-05-11 + +--- a/src/xstd/Heap.h ++++ b/src/xstd/Heap.h +@@ -23,7 +23,7 @@ + const Item &top() const { return this->theItems[1]; } + Item &at(int idx) { return this->theItems[idx+1]; } + +- void add(Item v) { append(v); floatUp(++theCnt); } ++ void add(Item v) { this->append(v); floatUp(++theCnt); } + void skip() { this->theItems[1] = this->theItems[theCnt--]; this->theCount--; sinkDown(1); } + Item shift() { const Item v = this->theItems[1]; skip(); return v; } + +--- a/src/xstd/Ring.h ++++ b/src/xstd/Ring.h +@@ -22,11 +22,11 @@ + int size() const { return Array::size(); } + bool empty() const { return this->theInOff <= this->theOutOff; } + bool full() const { return count() >= this->theCapacity; } +- const Item &top(int off = 0) const { return item((this->theOutOff+off) % this->theCapacity); } ++ const Item &top(int off = 0) const { return this->item((this->theOutOff+off) % this->theCapacity); } + +- Item &top(int off = 0) { return item((this->theOutOff+off) % this->theCapacity); } +- void enqueue(Item i) { Assert(!full()); item(this->theInOff++ % this->theCapacity) = i; check(); } +- Item dequeue() { return item(this->theOutOff++ % this->theCapacity); } ++ Item &top(int off = 0) { return this->item((this->theOutOff+off) % this->theCapacity); } ++ void enqueue(Item i) { Assert(!full()); this->item(this->theInOff++ % this->theCapacity) = i; check(); } ++ Item dequeue() { return this->item(this->theOutOff++ % this->theCapacity); } + + void reset() { this->theInOff = this->theOutOff = 0; } + inline void resize(int aCap); +--- a/src/runtime/StatPhase.cc ++++ b/src/runtime/StatPhase.cc +@@ -413,12 +413,12 @@ + break; + } + } else { +- static CompoundXactInfo &compound = *CompoundXactInfo::Create(); +- compound.exchanges = 1; +- compound.reqSize = reqSize; +- compound.repSize = repSize; +- compound.lifeTime = repTime; +- compound.record(rec.theIsolated); ++ static CompoundXactInfo &compound2 = *CompoundXactInfo::Create(); ++ compound2.exchanges = 1; ++ compound2.reqSize = reqSize; ++ compound2.repSize = repSize; ++ compound2.lifeTime = repTime; ++ compound2.record(rec.theIsolated); + } + + if (x->cookiesSent() > 0) +--- a/src/cache/CacheEntryHash.cc ++++ b/src/cache/CacheEntryHash.cc +@@ -14,7 +14,7 @@ + + CacheEntryHash::CacheEntryHash(int aCapacity): theCount(0) { + theCapacity = (aCapacity + aCapacity/3 + 7) | 1; +- theIndex = new (CacheEntry*[theCapacity]); ++ theIndex = new (CacheEntry*[this->theCapacity]); + memset(theIndex, 0, sizeof(CacheEntry*)*theCapacity); + } + +--- a/src/tools/IntIntHash.cc ++++ b/src/tools/IntIntHash.cc +@@ -13,7 +13,7 @@ + + IntIntHash::IntIntHash(int aCapacity): theHashCap(0) { + theHashCap = (aCapacity + aCapacity/3 + 7) | 1; +- theIndex = new (IntIntHashItem*[theHashCap]); ++ theIndex = new (IntIntHashItem*[this->theHashCap]); + memset(theIndex, 0, sizeof(IntIntHashItem*)*theHashCap); + } + \ No newline at end of file diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 38e025feb38..e14cd819177 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { - name = "tinc-1.1preae5b56c"; + name = "tinc-1.1pre4b2ddde"; src = fetchgit { url = "git://tinc-vpn.org/tinc"; - rev = "ae5b56c03d1e1af7561d7f1d1d8a333c3a9691ff"; - sha256 = "052bli42b5mc6w74wr129yj2jagpds03zckxqiqv7wr8d38swmm7"; + rev = "4b2ddded2c8ae1a1a5930637552eeb48f30d6530"; + sha256 = "037yl4qvy053a7jsp9dhj9bak6knnqxx2wsqq282dv032584sh46"; }; buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ]; diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 75510c94606..b9f212de26b 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gnupg-2.1.1"; + name = "gnupg-2.1.2"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0jffj23a02gw7gmrh9j9ynp50bvl2pc2y74i9ii65nvm50fx1v3h"; + sha256 = "14k7c5spai3yppz6izf1ggbnffskl54ln87v1wgy9pwism1mlks0"; }; patches = [ ./socket-activate-2.1.1.patch ]; diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 4513cf35920..ca3cad5129e 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { - version = "2.7"; + version = "2.8"; name = "kpcli-${version}"; src = fetchurl { url = "mirror://sourceforge/kpcli/${name}.pl"; - sha256 = "6bb1f7320b4474d6dbb73915393e5df96862f27c6228aa042a810fef46e2b777"; + sha256 = "1vmj131ii3skm1dx0pmcvq19h6a94a2vjldmqlf1b3dxjvz1ld91"; }; buildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 74889a05bee..bca6fc3d7d1 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -35,13 +35,15 @@ stdenv.mkDerivation rec { ''; }; - installPhase = '' - PREFIX="$out" make install - + preInstall = '' mkdir -p "$out/share/bash-completion/completions" mkdir -p "$out/share/zsh/site-functions" mkdir -p "$out/share/fish/completions" + ''; + installFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' # Install Emacs Mode. NOTE: We can't install the necessary # dependencies (s.el and f.el) here. The user has to do this # himself. diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 7e8236c460f..ba2051dadc4 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: -let version = "0.03.14"; in +let version = "0.03.15"; in stdenv.mkDerivation rec { name = "stress-ng-${version}"; src = fetchurl { + sha256 = "1x1zfws5bndbj1qim0mvnsmjvhf0p4xryrpjdk3qrwc1kigdsimr"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; - sha256 = "049c541p2m6mjgvi8nri6rmc1yjvyg1x0gkgdq9axzvbxh7bcgh1"; }; patchPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab66a919d16..1a0ee6c147f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -374,6 +374,12 @@ let inherit sha256; }; + fetchFromGitorious = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { + inherit name; + url = "https://gitorious.org/${owner}/${repo}/archive/${rev}.tar.gz"; + inherit sha256; + }; + resolveMirrorURLs = {url}: fetchurl { showURLs = true; inherit url; @@ -524,10 +530,7 @@ let ascii = callPackage ../tools/text/ascii { }; - asymptote = builderDefsPackage ../tools/graphics/asymptote { - inherit freeglut ghostscriptX imagemagick fftw boehmgc - mesa ncurses readline gsl libsigsegv python zlib perl - texinfo xz; + asymptote = callPackage ../tools/graphics/asymptote { texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra texLiveCMSuper ]; }; @@ -690,6 +693,14 @@ let catdoc = callPackage ../tools/text/catdoc { }; + cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; + + cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; + + gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; + + image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; + ccnet = callPackage ../tools/networking/ccnet { }; cloud-init = callPackage ../tools/virtualization/cloud-init { }; @@ -720,6 +731,8 @@ let cv = callPackage ../tools/misc/cv { }; + contacts = callPackage ../tools/misc/contacts { }; + datamash = callPackage ../tools/misc/datamash { }; ddate = callPackage ../tools/misc/ddate { }; @@ -1751,6 +1764,8 @@ let librdmacm = callPackage ../development/libraries/librdmacm { }; + limesurvey = callPackage ../servers/limesurvey { }; + logcheck = callPackage ../tools/system/logcheck { inherit (perlPackages) mimeConstruct; }; @@ -2055,6 +2070,8 @@ let obexd = callPackage ../tools/bluetooth/obexd { }; + openfortivpn = callPackage ../tools/networking/openfortivpn { }; + obexfs = callPackage ../tools/bluetooth/obexfs { }; obexftp = callPackage ../tools/bluetooth/obexftp { }; @@ -2315,6 +2332,8 @@ let pastebinit = callPackage ../tools/misc/pastebinit { }; + polygraph = callPackage ../tools/networking/polygraph { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pstoedit = callPackage ../tools/graphics/pstoedit { }; @@ -2460,6 +2479,8 @@ let rzip = callPackage ../tools/compression/rzip { }; s3backer = callPackage ../tools/filesystems/s3backer { }; + + s3fs = callPackage ../tools/filesystems/s3fs { }; s3cmd = callPackage ../tools/networking/s3cmd { }; @@ -3708,6 +3729,8 @@ let mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; mozart = mozart-binary; + nim = callPackage ../development/compilers/nim { }; + neko = callPackage ../development/compilers/neko { }; nasm = callPackage ../development/compilers/nasm { }; @@ -4861,6 +4884,8 @@ let inherit (perlPackages) XMLSimple; }; + include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { }; + indent = callPackage ../development/tools/misc/indent { }; ino = callPackage ../development/arduino/ino { }; @@ -5942,6 +5967,8 @@ let libarchive = callPackage ../development/libraries/libarchive { }; + libasr = callPackage ../development/libraries/libasr { }; + libass = callPackage ../development/libraries/libass { }; libassuan1 = callPackage ../development/libraries/libassuan1 { }; @@ -6559,6 +6586,7 @@ let libviper = callPackage ../development/libraries/libviper { }; libvpx = callPackage ../development/libraries/libvpx { }; + libvpx-git = callPackage ../development/libraries/libvpx/git.nix { }; libvterm = callPackage ../development/libraries/libvterm { }; @@ -8142,6 +8170,7 @@ let radius = callPackage ../servers/radius { }; redis = callPackage ../servers/nosql/redis { }; + redis3 = callPackage ../servers/nosql/redis/3.0.nix { }; redstore = callPackage ../servers/http/redstore { }; @@ -8235,6 +8264,8 @@ let }); squid = squids.squid31; # has ipv6 support + sslh = callPackage ../servers/sslh { }; + thttpd = callPackage ../servers/http/thttpd { }; storm = callPackage ../servers/computing/storm { }; @@ -8552,8 +8583,6 @@ let iw = callPackage ../os-specific/linux/iw { }; - iwlwifi = callPackage ../os-specific/linux/firmware/iwlwifi { }; - iwlegacy = callPackage ../os-specific/linux/firmware/iwlegacy { }; jfbview = callPackage ../os-specific/linux/jfbview { }; @@ -8627,7 +8656,7 @@ let linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = [ kernelPatches.bridge_stp_helper ] + kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.crc_regression ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -8637,7 +8666,7 @@ let linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = [ kernelPatches.bridge_stp_helper ] + kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.crc_regression ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -8647,7 +8676,7 @@ let linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = [ kernelPatches.bridge_stp_helper ] + kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.crc_regression ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -8665,6 +8694,16 @@ let ]; }; + linux_3_19 = makeOverridable (import ../os-specific/linux/kernel/linux-3.19.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.bridge_stp_helper ] @@ -8794,6 +8833,8 @@ let v86d = callPackage ../os-specific/linux/v86d { }; + vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; + virtualbox = callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome) libIDL; @@ -8818,12 +8859,12 @@ let }; # The current default kernel / kernel modules. - linux = linuxPackages.kernel; linuxPackages = linuxPackages_3_14; + linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linux_latest = pkgs.linux_3_18; - linuxPackages_latest = pkgs.linuxPackages_3_18; + linuxPackages_latest = pkgs.linuxPackages_3_19; + linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); @@ -8834,6 +8875,7 @@ let linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); + linuxPackages_3_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_19 linuxPackages_3_19); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); linuxPackages_custom = {version, src, configfile}: let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile; @@ -9635,6 +9677,10 @@ let camlistore = callPackage ../applications/misc/camlistore { }; + canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; + + canto-daemon = callPackage ../applications/networking/feedreaders/canto-daemon { }; + carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell aspell gettext ncurses avahi dbus dbus_glib python @@ -11168,7 +11214,7 @@ let }; sakura = callPackage ../applications/misc/sakura { - inherit (gnome) vte; + inherit (gnome3) vte; }; sbagen = callPackage ../applications/misc/sbagen { }; diff --git a/pkgs/top-level/haskell-ng.nix b/pkgs/top-level/haskell-ng.nix index 113b080ec04..2e0d61f1873 100644 --- a/pkgs/top-level/haskell-ng.nix +++ b/pkgs/top-level/haskell-ng.nix @@ -34,7 +34,7 @@ rec { ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix ({ ghc = compiler.ghc784; gmp = pkgs.gmp.override { withStatic = true; }; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); - ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ ghc = packages.ghc784.ghc; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); ghc = compiler.ghc784; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2793cb517b..466e934cb45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1092,15 +1092,19 @@ let boto = buildPythonPackage rec { name = "boto-${version}"; - version = "2.34.0"; + version = "2.36.0"; src = pkgs.fetchurl { url = "https://github.com/boto/boto/archive/${version}.tar.gz"; - sha256 = "08zavyn02qng9y0251a9mrlkb3aw33m7gx5kc97hwngl3xk3s777"; + sha256 = "1zrlmri89q2090yh9ylx798q4yk54y39v7w7xj101fnwc1r6jlqr"; }; - # The tests seem to require AWS credentials. - doCheck = false; + checkPhase = '' + ${python.interpreter} tests/test.py default + ''; + + buildInputs = [ self.nose self.mock ]; + propagatedBuildInputs = [ self.requests self.httpretty ]; meta = { homepage = https://github.com/boto/boto; @@ -7217,11 +7221,11 @@ let pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "0.14.0"; + version = "0.15.4"; src = pkgs.fetchurl { + sha256 = "1s57krfa5kpn15ma7dcivizgn987j24i6cxrnjf9hnnann0q26cd"; url = "https://pypi.python.org/packages/source/p/pgcli/${name}.tar.gz"; - sha256 = "0x31b3kvybdvd413h6b5iq4b5vv2x30ff1r00gs6ana0xpzzrqxp"; }; propagatedBuildInputs = with self; [ click jedi prompt_toolkit psycopg2 pygments sqlparse ]; @@ -7232,7 +7236,7 @@ let Rich command-line interface for PostgreSQL with auto-completion and syntax highlighting. ''; - homepage = http://pgcli.com/about; + homepage = http://pgcli.com; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ nckx ]; }; @@ -7485,9 +7489,8 @@ let protobuf = buildPythonPackage rec { inherit (pkgs.protobuf) name src; - propagatedBuildInputs = with self; [ pkgs.protobuf google_apputils ]; - sourceRoot = "${name}/python"; - + propagatedBuildInputs = with self; [ pkgs.protobuf google_apputils ]; + sourceRoot = "${name}-src/python"; meta = { description = "Protocol Buffers are Google's data interchange format"; @@ -7659,7 +7662,7 @@ let sha256 = "1xanqn7rn96841s3lim5lnx5743gc4kyfg4ggj1ys5r0gw8i6har"; }; - disabled = isPy3k; + disabled = isPy3k || isPyPy; propagatedBuildInputs = with self; [ dateutil ]; @@ -7680,7 +7683,7 @@ let sha256 = "0avkrcpisfvhz103v7vmq2jd83hvmpqrb4mlbx6ikkk1wcvclsx8"; }; - disabled = isPy3k; + disabled = isPy3k || isPyPy; propagatedBuildInputs = with self; [ sqlite3 vobject lxml requests urwid pyxdg ]; @@ -9803,12 +9806,12 @@ let }; sympy = buildPythonPackage rec { - name = "sympy-0.7.4"; + name = "sympy-0.7.6"; disabled = isPy34; # some tests fail src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sympy/${name}.tar.gz"; - sha256 = "0h1b9mx0snyyybj1x1ga69qssgjzkkgx2rw6nddjhyz1fknf8ywh"; + sha256 = "19yp0gy4i7p4g6l3b8vaqkj9qj7yqb5kqy0qgbdagpzgkdz958yz"; }; buildInputs = [ pkgs.glibcLocales ]; @@ -10243,11 +10246,11 @@ let }; sqlalchemy9 = buildPythonPackage rec { - name = "SQLAlchemy-0.9.4"; + name = "SQLAlchemy-0.9.8"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; - md5 = "c008ea5e2565ec1418ee8461393a99b1"; + md5 = "470ca4da4a0081efc830f0d90dd91682"; }; buildInputs = with self; [ nose mock ]; @@ -10538,13 +10541,12 @@ let }; taskw = buildPythonPackage rec { - version = "0.8.6"; + version = "1.0.2"; name = "taskw-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/taskw/${name}.tar.gz"; - # md5 = "9f3ce2eaff9a3986d04632547168894d"; # provided by pypi website. - sha256 = "341a165a1c2ef94fb1c2a49a785357377f04a0d55cabe9563179849497e47146"; + sha256 = "0wa2hwplss2r56jrwib6j9sxxm02dz78878975jk9fj10p84w5kr"; }; patches = [ ../development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch ]; @@ -10553,7 +10555,7 @@ let --replace '@@taskwarrior@@' '${pkgs.taskwarrior}' ''; - buildInputs = with self; [ nose pkgs.taskwarrior ]; + buildInputs = with self; [ nose pkgs.taskwarrior tox ]; propagatedBuildInputs = with self; [ six dateutil pytz ]; meta = { @@ -10693,14 +10695,8 @@ let }; }; - # TODO - # Installs correctly but fails tests that involve simple things like: - # cmd.run("tox", "-h") - # also, buildPythonPackage needs to supply the tox.ini correctly for projects that use tox for their tests - # - tox = buildPythonPackage rec { - name = "tox-1.7.2"; + name = "tox-1.8.1"; propagatedBuildInputs = with self; [ py virtualenv ]; @@ -10708,7 +10704,7 @@ let src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/tox/${name}.tar.gz"; - md5 = "0d9b3acb1a9252659d753b0ae6b9b264"; + md5 = "c4423cc6512932b37e5b0d1faa87bef2"; }; }; @@ -12273,6 +12269,8 @@ let sha256 = "0nyqb0v8yrkqnrqsh1hlhvzr2pyvkxvkw701p3gpsvk29c0gb5n6"; }; + doCheck = false; # some tests use networking + buildInputs = with self; [ mock unittest2 ]; propagatedBuildInputs = with self; [ requests ];