diff --git a/default.nix b/default.nix index 9d5764a6307..c1b9bfd39f9 100644 --- a/default.nix +++ b/default.nix @@ -1 +1,7 @@ -import ./pkgs/top-level/all-packages.nix +if ! builtins ? nixVersion || builtins.compareVersions "1.6" builtins.nixVersion == 1 then + + abort "This version of Nixpkgs requires Nix >= 1.6, please upgrade!" + +else + + import ./pkgs/top-level/all-packages.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 07414a9ad3a..5061cab826d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -15,6 +15,7 @@ astsmtl = "Alexander Tsamutali "; aszlig = "aszlig "; bbenoist = "Baptist BENOIST "; + bennofs = "Benno Fünfstück "; bjg = "Brian Gough "; bjornfor = "Bjørn Forsman "; bluescreen303 = "Mathijs Kwik "; diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 8bef3d67b8d..99810f87750 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -497,7 +497,7 @@ sub waitForX { retry sub { my ($status, $out) = $self->execute("journalctl -bu systemd-logind | grep Linked"); return 0 if $status != 0; - my ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1"); + ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1"); return 1 if $status == 0; } }); diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 970b9caa2f9..fc05584e256 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -120,6 +120,8 @@ jenkins = 109; systemd-journal-gateway = 110; notbit = 111; + ngircd = 112; + btsync = 113; # When adding a uid, make sure it doesn't match an existing gid. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 326ce8e15b1..e59b0ff5ac2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -61,6 +61,7 @@ ./security/apparmor.nix ./security/apparmor-suid.nix ./security/ca.nix + ./security/duosec.nix ./security/pam.nix ./security/pam_usb.nix ./security/polkit.nix @@ -154,6 +155,7 @@ ./services/networking/avahi-daemon.nix ./services/networking/bind.nix ./services/networking/bitlbee.nix + ./services/networking/btsync.nix ./services/networking/connman.nix ./services/networking/cntlm.nix ./services/networking/chrony.nix @@ -179,6 +181,7 @@ ./services/networking/minidlna.nix ./services/networking/nat.nix ./services/networking/networkmanager.nix + ./services/networking/ngircd.nix ./services/networking/notbit.nix ./services/networking/ntopng.nix ./services/networking/ntpd.nix diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix new file mode 100644 index 00000000000..989bd13d101 --- /dev/null +++ b/nixos/modules/security/duosec.nix @@ -0,0 +1,198 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + cfg = config.security.duosec; + + boolToStr = b: if b then "yes" else "no"; + + configFile = '' + [duo] + ikey=${cfg.ikey} + skey=${cfg.skey} + host=${cfg.host} + ${optionalString (cfg.group != "") ("group="+cfg.group)} + failmode=${cfg.failmode} + pushinfo=${boolToStr cfg.pushinfo} + autopush=${boolToStr cfg.autopush} + motd=${boolToStr cfg.motd} + prompts=${toString cfg.prompts} + accept_env_factor=${boolToStr cfg.acceptEnvFactor} + fallback_local_ip=${boolToStr cfg.fallbackLocalIP} + ''; + + loginCfgFile = optional cfg.ssh.enable + { source = pkgs.writeText "login_duo.conf" configFile; + mode = "0600"; + uid = config.ids.uids.sshd; + target = "duo/login_duo.conf"; + }; + + pamCfgFile = optional cfg.pam.enable + { source = pkgs.writeText "pam_duo.conf" configFile; + mode = "0600"; + uid = config.ids.uids.sshd; + target = "duo/pam_duo.conf"; + }; +in +{ + options = { + security.duosec = { + ssh.enable = mkOption { + type = types.bool; + default = false; + description = "If enabled, protect SSH logins with Duo Security."; + }; + + pam.enable = mkOption { + type = types.bool; + default = false; + description = "If enabled, protect logins with Duo Security using PAM support."; + }; + + ikey = mkOption { + type = types.str; + description = "Integration key."; + }; + + skey = mkOption { + type = types.str; + description = "Secret key."; + }; + + host = mkOption { + type = types.str; + description = "Duo API hostname."; + }; + + group = mkOption { + type = types.str; + default = ""; + description = "Use Duo authentication for users only in this group."; + }; + + failmode = mkOption { + type = types.str; + default = "safe"; + description = '' + On service or configuration errors that prevent Duo + authentication, fail "safe" (allow access) or "secure" (deny + access). The default is "safe". + ''; + }; + + pushinfo = mkOption { + type = types.bool; + default = false; + description = '' + Include information such as the command to be executed in + the Duo Push message. + ''; + }; + + autopush = mkOption { + type = types.bool; + default = false; + description = '' + If true, Duo Unix will automatically send + a push login request to the user’s phone, falling back on a + phone call if push is unavailable. If + false, the user will be prompted to + choose an authentication method. When configured with + autopush = yes, we recommend setting + prompts = 1. + ''; + }; + + motd = mkOption { + type = types.bool; + default = false; + description = '' + Print the contents of /etc/motd to screen + after a succesful login. + ''; + }; + + prompts = mkOption { + type = types.int; + default = 3; + description = '' + If a user fails to authenticate with a second factor, Duo + Unix will prompt the user to authenticate again. This option + sets the maximum number of prompts that Duo Unix will + display before denying access. Must be 1, 2, or 3. Default + is 3. + + For example, when prompts = 1, the user + will have to successfully authenticate on the first prompt, + whereas if prompts = 2, if the user + enters incorrect information at the initial prompt, he/she + will be prompted to authenticate again. + + When configured with autopush = true, we + recommend setting prompts = 1. + ''; + }; + + acceptEnvFactor = mkOption { + type = types.bool; + default = false; + description = '' + Look for factor selection or passcode in the + $DUO_PASSCODE environment variable before + prompting the user for input. + + When $DUO_PASSCODE is non-empty, it will override + autopush. The SSH client will need SendEnv DUO_PASSCODE in + its configuration, and the SSH server will similarily need + AcceptEnv DUO_PASSCODE. + ''; + }; + + fallbackLocalIP = mkOption { + type = types.bool; + default = false; + description = '' + Duo Unix reports the IP address of the authorizing user, for + the purposes of authorization and whitelisting. If Duo Unix + cannot detect the IP address of the client, setting + fallbackLocalIP = yes will cause Duo Unix + to send the IP address of the server it is running on. + + If you are using IP whitelisting, enabling this option could + cause unauthorized logins if the local IP is listed in the + whitelist. + ''; + }; + }; + }; + + config = mkIf (cfg.ssh.enable || cfg.pam.enable) { + assertions = + [ { assertion = cfg.failmode == "safe" || cfg.failmode == "secure"; + message = "Invalid value for failmode (must be safe or secure)."; + } + { assertion = cfg.prompts == 1 || cfg.prompts == 2 || cfg.prompts == 3; + message = "Invalid value for prompts (must be 1, 2, or 3)."; + } + { assertion = !cfg.pam.enable; + message = "PAM support is currently not implemented."; + } + ]; + + environment.systemPackages = [ pkgs.duo-unix ]; + security.setuidPrograms = [ "login_duo" ]; + environment.etc = loginCfgFile ++ pamCfgFile; + + /* If PAM *and* SSH are enabled, then don't do anything special. + If PAM isn't used, set the default SSH-only options. */ + services.openssh.extraConfig = mkIf (cfg.ssh.enable || cfg.pam.enable) ( + if cfg.pam.enable then "UseDNS no" else '' + # Duo Security configuration + ForceCommand ${config.security.wrapperDir}/login_duo + PermitTunnel no + AllowTcpForwarding no + ''); + }; +} diff --git a/nixos/modules/services/backup/almir.nix b/nixos/modules/services/backup/almir.nix index d5bc932c6b9..8fdcdd6c7be 100644 --- a/nixos/modules/services/backup/almir.nix +++ b/nixos/modules/services/backup/almir.nix @@ -154,7 +154,8 @@ in { description = "Almir web app"; wantedBy = [ "multi-user.target" ]; path = [ pkgs.pythonPackages.almir ]; - serviceConfig.ExecStart = "${pkgs.pythonPackages.almir}/bin/pserve ${productionini}"; + environment.PYTHONPATH = "${pkgs.pythonPackages.almir}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages"; + serviceConfig.ExecStart = "${pkgs.pythonPackages.pyramid}/bin/pserve ${productionini}"; }; environment.systemPackages = [ pkgs.pythonPackages.almir ]; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 7e42438fe6d..44fb0062f92 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -250,9 +250,6 @@ in rm /tmp/mysql_init fi ''; # */ - - serviceConfig.ExecStop = - "${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown"; }; }; diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 9a5b170d5e6..1a8b85db329 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -63,7 +63,7 @@ in services.nixosManual.showManual = mkOption { type = types.bool; - default = true; + default = false; description = '' Whether to show the NixOS manual on one of the virtual consoles. diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index be57b8c5c03..3e2e7e9df6e 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -4,17 +4,31 @@ with pkgs.lib; let cfg = config.services.graphite; - writeTextOrNull = f: t: if t == null then null else pkgs.writeText f t; + writeTextOrNull = f: t: if t == null then null else pkgs.writeTextDir f t; + + dataDir = cfg.dataDir; + + configDir = pkgs.buildEnv { + name = "graphite-config"; + paths = lists.filter (el: el != null) [ + (writeTextOrNull "carbon.conf" cfg.carbon.config) + (writeTextOrNull "storage-agregation.conf" cfg.carbon.storageAggregation) + (writeTextOrNull "storage-schemas.conf" cfg.carbon.storageSchemas) + (writeTextOrNull "blacklist.conf" cfg.carbon.blacklist) + (writeTextOrNull "whitelist.conf" cfg.carbon.whitelist) + (writeTextOrNull "rewrite-rules.conf" cfg.carbon.rewriteRules) + (writeTextOrNull "relay-rules.conf" cfg.carbon.relayRules) + (writeTextOrNull "aggregation-rules.conf" cfg.carbon.aggregationRules) + ]; + }; - dataDir = "/var/db/graphite"; carbonOpts = name: with config.ids; '' - --nodaemon --syslog --prefix=${name} --pidfile /var/run/${name}.pid \ - --uid ${toString uids.graphite} --gid ${toString uids.graphite} ${name} + --nodaemon --syslog --prefix=${name} --pidfile ${dataDir}/${name}.pid ${name} ''; carbonEnv = { PYTHONPATH = "${pkgs.python27Packages.carbon}/lib/python2.7/site-packages"; GRAPHITE_ROOT = dataDir; - GRAPHITE_CONF_DIR = "/etc/graphite/"; + GRAPHITE_CONF_DIR = configDir; GRAPHITE_STORAGE_DIR = dataDir; }; @@ -23,6 +37,14 @@ in { ###### interface options.services.graphite = { + dataDir = mkOption { + type = types.path; + default = "/var/db/graphite"; + description = '' + Data directory for graphite. + ''; + }; + web = { enable = mkOption { description = "Whether to enable graphite web frontend"; @@ -38,8 +60,8 @@ in { port = mkOption { description = "Graphite web frontend port"; - default = "8080"; - type = types.str; + default = 8080; + type = types.int; }; }; @@ -152,31 +174,17 @@ in { ###### implementation config = mkIf (cfg.carbon.enableAggregator || cfg.carbon.enableCache || cfg.carbon.enableRelay || cfg.web.enable) { - environment.etc = lists.filter (el: el.source != null) [ - { source = writeTextOrNull "carbon.conf" cfg.carbon.config; - target = "graphite/carbon.conf"; } - { source = writeTextOrNull "storage-agregation.conf" cfg.carbon.storageAggregation; - target = "graphite/storage-agregation.conf"; } - { source = writeTextOrNull "storage-schemas.conf" cfg.carbon.storageSchemas; - target = "graphite/storage-schemas.conf"; } - { source = writeTextOrNull "blacklist.conf" cfg.carbon.blacklist; - target = "graphite/blacklist.conf"; } - { source = writeTextOrNull "whitelist.conf" cfg.carbon.whitelist; - target = "graphite/whitelist.conf"; } - { source = writeTextOrNull "rewrite-rules.conf" cfg.carbon.rewriteRules; - target = "graphite/rewrite-rules.conf"; } - { source = writeTextOrNull "relay-rules.conf" cfg.carbon.relayRules; - target = "graphite/relay-rules.conf"; } - { source = writeTextOrNull "aggregation-rules.conf" cfg.carbon.aggregationRules; - target = "graphite/aggregation-rules.conf"; } - ]; - - systemd.services.carbonCache = mkIf cfg.carbon.enableCache { + systemd.services.carbonCache = { + enable = cfg.carbon.enableCache; description = "Graphite Data Storage Backend"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; environment = carbonEnv; - serviceConfig.ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-cache"}"; + serviceConfig = { + ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-cache"}"; + User = "graphite"; + Group = "graphite"; + }; restartTriggers = [ pkgs.pythonPackages.carbon cfg.carbon.config @@ -185,33 +193,45 @@ in { cfg.carbon.rewriteRules ]; preStart = '' - mkdir -p ${dataDir}/whisper + mkdir -m 0700 -p ${cfg.dataDir}/whisper + if [ "$(id -u)" = 0 ]; then chown -R graphite:graphite ${cfg.dataDir}; fi ''; }; - systemd.services.carbonAggregator = mkIf cfg.carbon.enableAggregator { + systemd.services.carbonAggregator = { + enable = cfg.carbon.enableAggregator; description = "Carbon Data Aggregator"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; environment = carbonEnv; - serviceConfig.ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-aggregator"}"; + serviceConfig = { + ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-aggregator"}"; + User = "graphite"; + Group = "graphite"; + }; restartTriggers = [ pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.aggregationRules ]; }; - systemd.services.carbonRelay = mkIf cfg.carbon.enableRelay { + systemd.services.carbonRelay = { + enable = cfg.carbon.enableRelay; description = "Carbon Data Relay"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; environment = carbonEnv; - serviceConfig.ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-relay"}"; + serviceConfig = { + ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-relay"}"; + User = "graphite"; + Group = "graphite"; + }; restartTriggers = [ pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.relayRules ]; }; - systemd.services.graphiteWeb = mkIf cfg.web.enable { + systemd.services.graphiteWeb = { + enable = cfg.web.enable; description = "Graphite Web Interface"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; @@ -224,14 +244,15 @@ in { serviceConfig = { ExecStart = '' ${pkgs.python27Packages.waitress}/bin/waitress-serve \ - --host=${cfg.web.host} --port=${cfg.web.port} \ + --host=${cfg.web.host} --port=${toString cfg.web.port} \ --call django.core.handlers.wsgi:WSGIHandler''; User = "graphite"; Group = "graphite"; }; preStart = '' if ! test -e ${dataDir}/db-created; then - mkdir -p ${dataDir}/{whisper/,log/webapp/} + mkdir -m 0700 -p ${dataDir}/{whisper/,log/webapp/} + if [ "$(id -u)" = 0 ]; then chown -R graphite:graphite ${cfg.dataDir}; fi # populate database ${pkgs.python27Packages.graphite_web}/bin/manage-graphite.py syncdb --noinput @@ -259,7 +280,6 @@ in { uid = config.ids.uids.graphite; description = "Graphite daemon user"; home = dataDir; - createHome = true; }; users.extraGroups.graphite.gid = config.ids.gids.graphite; }; diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix index 979debefdd9..54b7e79f82e 100644 --- a/nixos/modules/services/monitoring/statsd.nix +++ b/nixos/modules/services/monitoring/statsd.nix @@ -64,13 +64,13 @@ in graphiteHost = mkOption { description = "Hostname or IP of Graphite server"; - default = "127.0.0.1"; + default = config.services.graphite.web.host; type = types.str; }; graphitePort = mkOption { description = "Port of Graphite server"; - default = 2003; + default = config.services.graphite.web.port; type = types.uniq types.int; }; diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix index 4a888b64bd3..b34ebc3663e 100644 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix @@ -46,6 +46,16 @@ in description = "Cache directory."; }; + crypt = mkOption { + default = false; + description = "Whether to enable (weak) protocol encryption."; + }; + + sparse = mkOption { + default = false; + description = "Minimal cell list in /afs."; + }; + }; }; @@ -70,18 +80,23 @@ in startOn = "started network-interfaces"; stopOn = "stopping network-interfaces"; - preStart = '' - mkdir -m 0755 /afs || true - mkdir -m 0755 -p ${cfg.cacheDirectory} || true + preStart = '' + mkdir -p -m 0755 /afs + mkdir -m 0700 -p ${cfg.cacheDirectory} ${pkgs.module_init_tools}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true - ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} -dynroot -fakestat - ''; + ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb + ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"} + ''; - postStop = '' - umount /afs + # Doing this in preStop, because after these commands AFS is basically + # stopped, so systemd has nothing to do, just noticing it. If done in + # postStop, then we get a hang + kernel oops, because AFS can't be + # stopped simply by sending signals to processes. + preStop = '' + ${pkgs.utillinux}/bin/umount /afs ${openafsPkgs}/sbin/afsd -shutdown - rmmod libafs - ''; + ${pkgs.module_init_tools}/sbin/rmmod libafs + ''; }; diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix new file mode 100644 index 00000000000..e7fb471ccf4 --- /dev/null +++ b/nixos/modules/services/networking/btsync.nix @@ -0,0 +1,280 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + cfg = config.services.btsync; + listenAddr = cfg.httpListenAddr + ":" + (toString cfg.httpListenPort); + + boolStr = x: if x then "true" else "false"; + optionalEmptyStr = b: v: optionalString (b != "") v; + + webUIConfig = optionalString cfg.enableWebUI + '' + "webui": + { + ${optionalEmptyStr cfg.httpLogin "\"login\": \"${cfg.httpLogin}\","} + ${optionalEmptyStr cfg.httpPass "\"password\": \"${cfg.httpPass}\","} + ${optionalEmptyStr cfg.apiKey "\"api_key\": \"${cfg.apiKey}\","} + "listen": "${listenAddr}" + } + ''; + + knownHosts = e: + optionalString (e ? "knownHosts") + (concatStringsSep "," (map (v: "\"${v}\"") e."knownHosts")); + + sharedFoldersRecord = with pkgs.lib; + concatStringsSep "," (map (entry: + let helper = attr: v: + if (entry ? attr) then boolStr entry.attr else boolStr v; + in + '' + { + "secret": "${entry.secret}", + "dir": "${entry.directory}", + + "use_relay_server": ${helper "useRelayServer" true}, + "use_tracker": ${helper "useTracker" true}, + "use_dht": ${helper "useDHT" false}, + + "search_lan": ${helper "searchLAN" true}, + "use_sync_trash": ${helper "useSyncTrash" true}, + + "known_hosts": [${knownHosts entry}] + } + '') cfg.sharedFolders); + + sharedFoldersConfig = optionalString (cfg.sharedFolders != []) + '' + "shared_folders": + [ + ${sharedFoldersRecord} + ] + ''; + + configFile = pkgs.writeText "btsync.config" + '' + { + "device_name": "${cfg.deviceName}", + "storage_path": "/var/lib/btsync", + "listening_port": ${toString cfg.listeningPort}, + "use_gui": false, + + "check_for_updates": ${boolStr cfg.checkForUpdates}, + "use_upnp": ${boolStr cfg.useUpnp}, + "download_limit": ${toString cfg.downloadLimit}, + "upload_limit": ${toString cfg.uploadLimit}, + "lan_encrypt_data": ${boolStr cfg.encryptLAN}, + + ${webUIConfig} + ${sharedFoldersConfig} + } + ''; +in +{ + options = { + services.btsync = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, start the Bittorrent Sync daemon. Once enabled, + you can interact with the service through the Web UI, or + configure it in your NixOS configuration. Enabling the + btsync service also installs a + multi-instance systemd unit which can be used to start + user-specific copies of the daemon. Once installed, you can + use systemctl start btsync@user to start + the daemon only for user user, using the + configuration file located at + $HOME/.config/btsync.conf + ''; + }; + + deviceName = mkOption { + type = types.str; + example = "Voltron"; + description = '' + Name of the Bittorrent Sync device. + ''; + }; + + listeningPort = mkOption { + type = types.int; + default = 0; + example = 44444; + description = '' + Listening port. Defaults to 0 which randomizes the port. + ''; + }; + + checkForUpdates = mkOption { + type = types.bool; + default = true; + description = '' + Determines whether to check for updates and alert the user + about them in the UI. + ''; + }; + + useUpnp = mkOption { + type = types.bool; + default = true; + description = '' + Use Universal Plug-n-Play (UPnP) + ''; + }; + + downloadLimit = mkOption { + type = types.int; + default = 0; + example = 1024; + description = '' + Download speed limit. 0 is unlimited (default). + ''; + }; + + uploadLimit = mkOption { + type = types.int; + default = 0; + example = 1024; + description = '' + Upload speed limit. 0 is unlimited (default). + ''; + }; + + httpListenAddr = mkOption { + type = types.str; + default = "0.0.0.0"; + example = "1.2.3.4"; + description = '' + HTTP address to bind to. + ''; + }; + + httpListenPort = mkOption { + type = types.int; + default = 9000; + description = '' + HTTP port to bind on. + ''; + }; + + httpLogin = mkOption { + type = types.str; + example = "allyourbase"; + description = '' + HTTP web login username. + ''; + }; + + httpPass = mkOption { + type = types.str; + example = "arebelongtous"; + description = '' + HTTP web login password. + ''; + }; + + encryptLAN = mkOption { + type = types.bool; + default = true; + description = "Encrypt LAN data."; + }; + + enableWebUI = mkOption { + type = types.bool; + default = false; + description = '' + Enable Web UI for administration. Bound to the specified + httpListenAddress and + httpListenPort. + ''; + }; + + apiKey = mkOption { + type = types.str; + default = ""; + description = "API key, which enables the developer API."; + }; + + sharedFolders = mkOption { + default = []; + example = + [ { secret = "AHMYFPCQAHBM7LQPFXQ7WV6Y42IGUXJ5Y"; + directory = "/home/user/sync_test"; + useRelayServer = true; + useTracker = true; + useDHT = false; + searchLAN = true; + useSyncTrash = true; + knownHosts = + [ "192.168.1.2:4444" + "192.168.1.3:4444" + ]; + } + ]; + description = '' + Shared folder list. If enabled, web UI must be + disabled. Secrets can be generated using btsync + --generate-secret. Note that this secret will be + put inside the Nix store, so it is realistically not very + secret. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = + [ { assertion = cfg.deviceName != ""; + message = "Device name cannot be empty."; + } + { assertion = cfg.enableWebUI -> cfg.sharedFolders == []; + message = "If using shared folders, the web UI cannot be enabled."; + } + { assertion = cfg.apiKey != "" -> cfg.enableWebUI; + message = "If you're using an API key, you must enable the web server."; + } + # TODO FIXME: the README says not specifying the login/pass means it + # should disable authentication, but apparently it doesn't? + { assertion = cfg.enableWebUI -> cfg.httpLogin != "" && cfg.httpPass != ""; + message = "If using the web UI, you must configure a login/password."; + } + # TODO FIXME: assert the existence of sharedFolder directories? + ]; + + users.extraUsers.btsync = { + description = "Bittorrent Sync Service user"; + home = "/var/lib/btsync"; + createHome = true; + uid = config.ids.uids.btsync; + }; + + systemd.services.btsync = with pkgs; { + description = "Bittorrent Sync Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + Restart = "on-abort"; + User = "btsync"; + ExecStart = + "${bittorrentSync}/bin/btsync --nodaemon --config ${configFile}"; + }; + }; + + systemd.services."btsync@" = with pkgs; { + description = "Bittorrent Sync Service for %i"; + after = [ "network.target" ]; + serviceConfig = { + Restart = "on-abort"; + User = "%i"; + ExecStart = + "${bittorrentSync}/bin/btsync --nodaemon --config %h/.config/btsync.conf"; + }; + }; + + environment.systemPackages = [ pkgs.bittorrentSync ]; + }; +} diff --git a/nixos/modules/services/networking/ngircd.nix b/nixos/modules/services/networking/ngircd.nix new file mode 100644 index 00000000000..49e5f355980 --- /dev/null +++ b/nixos/modules/services/networking/ngircd.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.ngircd; + + configFile = pkgs.stdenv.mkDerivation { + name = "ngircd.conf"; + + text = cfg.config; + + preferLocalBuild = true; + + buildCommand = '' + echo -n "$text" > $out + ${cfg.package}/sbin/ngircd --config $out --configtest + ''; + }; +in { + options = { + services.ngircd = { + enable = mkEnableOption "the ngircd IRC server"; + + config = mkOption { + description = "The ngircd configuration (see ngircd.conf(5))."; + + type = types.lines; + }; + + package = mkOption { + description = "The ngircd package."; + + type = types.package; + + default = pkgs.ngircd; + }; + }; + }; + + config = mkIf cfg.enable { + #!!! TODO: Use ExecReload (see https://github.com/NixOS/nixpkgs/issues/1988) + systemd.services.ngircd = { + description = "The ngircd IRC server"; + + wantedBy = [ "multi-user.target" ]; + + serviceConfig.ExecStart = "${cfg.package}/sbin/ngircd --config ${configFile} --nodaemon"; + + serviceConfig.User = "ngircd"; + }; + + users.extraUsers.ngircd = { + uid = config.ids.uids.ngircd; + description = "ngircd user."; + }; + }; +} diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index b3d934862ab..d647301889a 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -5,16 +5,22 @@ with pkgs.lib; let cfg = config.services.elasticsearch; - es_home = "/var/lib/elasticsearch"; - - configFile = pkgs.writeText "elasticsearch.yml" '' + esConfig = '' network.host: ${cfg.host} - network.port: ${cfg.port} - network.tcp.port: ${cfg.tcp_port} + network.port: ${toString cfg.port} + network.tcp.port: ${toString cfg.tcp_port} cluster.name: ${cfg.cluster_name} ${cfg.extraConf} ''; + configDir = pkgs.buildEnv { + name = "elasticsearch-config"; + paths = [ + (pkgs.writeTextDir "elasticsearch.yml" esConfig) + (pkgs.writeTextDir "logging.yml" cfg.logging) + ]; + }; + in { ###### interface @@ -34,14 +40,14 @@ in { port = mkOption { description = "Elasticsearch port to listen for HTTP traffic"; - default = "9200"; - type = types.str; + default = 9200; + type = types.int; }; tcp_port = mkOption { description = "Elasticsearch port for the node to node communication"; - default = "9300"; - type = types.str; + default = 9300; + type = types.int; }; cluster_name = mkOption { @@ -79,27 +85,32 @@ in { ''; type = types.str; }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/elasticsearch"; + description = '' + Data directory for elasticsearch. + ''; + }; }; ###### implementation config = mkIf cfg.enable { - environment.etc = [ - { source = configFile; - target = "elasticsearch/elasticsearch.yml"; } - { source = pkgs.writeText "logging.yml" cfg.logging; - target = "elasticsearch/logging.yml"; } - ]; - systemd.services.elasticsearch = { description = "Elasticsearch daemon"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; - environment = { ES_HOME = es_home; }; + environment = { ES_HOME = cfg.dataDir; }; serviceConfig = { - ExecStart = "${pkgs.elasticsearch}/bin/elasticsearch -f -Des.path.conf=/etc/elasticsearch"; + ExecStart = "${pkgs.elasticsearch}/bin/elasticsearch -f -Des.path.conf=${configDir}"; User = "elasticsearch"; }; + preStart = '' + mkdir -m 0700 -p ${cfg.dataDir} + if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi + ''; }; environment.systemPackages = [ pkgs.elasticsearch ]; @@ -108,8 +119,7 @@ in { name = "elasticsearch"; uid = config.ids.uids.elasticsearch; description = "Elasticsearch daemon user"; - home = es_home; - createHome = true; + home = cfg.dataDir; }; }; } diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix index eab18c4229b..a79b1194c80 100644 --- a/nixos/modules/services/search/solr.nix +++ b/nixos/modules/services/search/solr.nix @@ -6,6 +6,26 @@ let cfg = config.services.solr; + # Assemble all jars needed for solr + solrJars = pkgs.stdenv.mkDerivation { + name = "solr-jars"; + + src = pkgs.fetchurl { + url = http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/bin/apache-tomcat-5.5.36.tar.gz; + sha256 = "01mzvh53wrs1p2ym765jwd00gl6kn8f9k3nhdrnhdqr8dhimfb2p"; + }; + + buildPhases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/lib + cp common/lib/*.jar $out/lib/ + ln -s ${pkgs.ant}/lib/ant/lib/ant.jar $out/lib/ + ln -s ${cfg.solrPackage}/lib/ext/* $out/lib/ + ln -s ${pkgs.openjdk}/lib/openjdk/lib/tools.jar $out/lib/ + ''; + }; + in { options = { @@ -101,7 +121,8 @@ in { inherit (cfg) user group javaPackage; warFile = "${cfg.solrPackage}/lib/solr.war"; extraOptions = [ - "--commonLibFolder=${cfg.solrPackage}/lib/ext" + "--commonLibFolder=${solrJars}/lib" + "--useJasper" ] ++ cfg.extraWinstoneOptions; extraJavaOptions = [ "-Dsolr.solr.home=${cfg.solrHome}" diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 1a39fe43bbe..62153613355 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -9,6 +9,11 @@ let user ${cfg.user} ${cfg.group}; daemon off; ${cfg.config} + ${optionalString (cfg.httpConfig != "") '' + http { + ${cfg.httpConfig} + } + ''} ${cfg.appendConfig} ''; in @@ -51,6 +56,12 @@ in ''; }; + httpConfig = mkOption { + type = types.lines; + default = ""; + description = "Configuration lines to be appended inside of the http {} block."; + }; + stateDir = mkOption { default = "/var/spool/nginx"; description = " diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 456975015a2..85be61bfc1e 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -43,7 +43,7 @@ in { ''; }; - environment.variables.GIO_EXTRA_MODULES = "${gnome3.dconf}/lib/gio/modules"; + environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules" ]; environment.systemPackages = [ gnome3.evince gnome3.eog diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 3c67571ffd5..9ce7744b065 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -81,7 +81,7 @@ in environment.pathsToLink = [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ]; - environment.variables.GIO_EXTRA_MODULES = "${pkgs.xfce.gvfs}/lib/gio/modules"; + environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ]; # Enable helpful DBus services. services.udisks2.enable = true; diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 327f3b7e112..4cfd8a0b618 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -203,6 +203,9 @@ in # To wait for SCSI devices to appear. "scsi_wait_scan" + + # Needed by the stage 2 init script. + "rtc_cmos" ]; boot.initrd.kernelModules = diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index b749172a3ff..ee042992b17 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -131,13 +131,12 @@ if ! mountpoint -q /run; then mount -t tmpfs -o "mode=0755,size=@runSize@" none /run fi -# Create a ramfs on /run/keys to hold secrets that shouldn't -# be written to disk (generally used for nixops, harmless -# elsehwere) +# Create a ramfs on /run/keys to hold secrets that shouldn't be +# written to disk (generally used for NixOps, harmless elsewhere). if ! mountpoint -q /run/keys; then rm -rf /run/keys mkdir -m 0750 /run/keys - chown root:keys /run/keys + chown 0:96 /run/keys mount -t ramfs none /run/keys fi @@ -162,6 +161,12 @@ echo "running activation script..." $systemConfig/activate +# Restore the system time from the hardware clock. We do this after +# running the activation script to be sure that /etc/localtime points +# at the current time zone. +hwclock --hctosys + + # Record the boot configuration. ln -sfn "$systemConfig" /run/booted-system diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index a8f0a59b6fa..e9c03df2ba3 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -19,6 +19,8 @@ let sources = map (x: x.source) etc'; targets = map (x: x.target) etc'; modes = map (x: x.mode) etc'; + uids = map (x: x.uid) etc'; + gids = map (x: x.gid) etc'; }; in @@ -87,6 +89,24 @@ in ''; }; + uid = mkOption { + default = 0; + type = types.int; + description = '' + UID of created file. Only takes affect when the file is + copied (that is, the mode is not 'symlink'). + ''; + }; + + gid = mkOption { + default = 0; + type = types.int; + description = '' + GID of created file. Only takes affect when the file is + copied (that is, the mode is not 'symlink'). + ''; + }; + }; config = { diff --git a/nixos/modules/system/etc/make-etc.sh b/nixos/modules/system/etc/make-etc.sh index 7cf68db9ddc..60d4ba1301a 100644 --- a/nixos/modules/system/etc/make-etc.sh +++ b/nixos/modules/system/etc/make-etc.sh @@ -6,6 +6,8 @@ set -f sources_=($sources) targets_=($targets) modes_=($modes) +uids_=($uids) +gids_=($gids) set +f for ((i = 0; i < ${#targets_[@]}; i++)); do @@ -35,6 +37,8 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do if test "${modes_[$i]}" != symlink; then echo "${modes_[$i]}" > $out/etc/$target.mode + echo "${uids_[$i]}" > $out/etc/$target.uid + echo "${gids_[$i]}" > $out/etc/$target.gid fi fi diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl index 4b79dbaab89..8ba9a370b27 100644 --- a/nixos/modules/system/etc/setup-etc.pl +++ b/nixos/modules/system/etc/setup-etc.pl @@ -60,7 +60,15 @@ sub link { if ($mode eq "direct-symlink") { atomicSymlink readlink("$static/$fn"), $target or warn; } else { + open UID, "<$_.uid"; + my $uid = ; chomp $uid; + close UID; + open GID, "<$_.gid"; + my $gid = ; chomp $gid; + close GID; + copy "$static/$fn", "$target.tmp" or warn; + chown int($uid), int($gid), "$target.tmp" or warn; chmod oct($mode), "$target.tmp" or warn; rename "$target.tmp", $target or warn; } diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 634932ff007..5fca115b819 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -1,7 +1,9 @@ { config, pkgs, ... }: with pkgs.lib; - +let + diskSize = "100G"; +in { imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ]; @@ -12,7 +14,7 @@ with pkgs.lib; '' mkdir $out diskImage=$out/$diskImageBase - truncate $diskImage --size 10G + truncate $diskImage --size ${diskSize} mv closure xchg/ ''; @@ -20,8 +22,9 @@ with pkgs.lib; '' PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin pushd $out - tar -Szcf $diskImageBase.tar.gz $diskImageBase - rm $out/$diskImageBase + mv $diskImageBase disk.raw + tar -Szcf $diskImageBase.tar.gz disk.raw + rm $out/disk.raw popd ''; diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw"; @@ -32,7 +35,7 @@ with pkgs.lib; '' # Create partition table ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos - ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 10G + ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize} ${pkgs.parted}/sbin/parted /dev/vda print . /sys/class/block/vda1/uevent mknod /dev/vda1 b $MAJOR $MINOR diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 9dbdada07d4..c5e35d8867c 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; - + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix deleted file mode 100644 index 4315a5a7547..00000000000 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw -, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio -, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf -, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango -, perl, pkgconfig, python, serd, sord, sratom, suil }: - -let - tag = "3.5.357"; -in - -stdenv.mkDerivation rec { - name = "ardour-${tag}"; - - src = fetchgit { - url = git://git.ardour.org/ardour/ardour.git; - rev = "refs/tags/${tag}"; - sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42"; - }; - - buildInputs = - [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc - glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo - libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 - makeWrapper pango perl pkgconfig python serd sord sratom suil - ]; - - patchPhase = '' - # The funny revision number is from `git describe rev` - printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-gce4d125\"; }\n' > libs/ardour/revision.cc - # Note the different version number - sed -i '33i rev = \"3.5-357-gce4d125\"' wscript - sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript - sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings - sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl - ''; - - configurePhase = "python waf configure --optimize --prefix=$out"; - - buildPhase = "python waf"; - - # For the custom ardour clearlooks gtk-engine to work, it must be - # moved to a directory called "engines" and added to GTK_PATH - installPhase = '' - python waf install - mkdir -pv $out/gtk2/engines - cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/ - wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2 - ''; - - meta = with stdenv.lib; { - description = "Multi-track hard disk recording software"; - longDescription = '' - Also read "The importance of Paying Something" on their homepage, please! - ''; - homepage = http://ardour.org/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 08cecfea064..4315a5a7547 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,51 +1,62 @@ -{ stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor2 -, librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2 -, lilv, lv2, serd, sord, sratom, suil # these are probably optional -, libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango -, gtk, glibmm, gtkmm, libgnomecanvas, libgnomecanvasmm, liblo, aubio -, fftwSinglePrec, libmad, automake, autoconf, libtool, liblrdf, curl }: +{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw +, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio +, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf +, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile +, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango +, perl, pkgconfig, python, serd, sord, sratom, suil }: + +let + tag = "3.5.357"; +in stdenv.mkDerivation rec { - name = "ardour-${version}"; - version = "2.8.16"; + name = "ardour-${tag}"; - src = fetchurl { - url = "mirror://gentoo/distfiles/${name}.tar.bz2"; - sha256 = "0h2y0x4yznalllja53anjil2gmgcb26f39zshc4gl1d1kc8k5vip"; + src = fetchgit { + url = git://git.ardour.org/ardour/ardour.git; + rev = "refs/tags/${tag}"; + sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42"; }; - postPatch = '' - #sed -e "s#/usr/bin/which#type -P#" -i libs/glibmm2/autogen.sh - echo '#include "ardour/svn_revision.h"' > libs/ardour/svn_revision.cc - echo -e 'namespace ARDOUR {\n extern const char* svn_revision = "2.8.12";\n }\n' >> libs/ardour/svn_revision.cc + buildInputs = + [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc + glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo + libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate + libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 + makeWrapper pango perl pkgconfig python serd sord sratom suil + ]; + + patchPhase = '' + # The funny revision number is from `git describe rev` + printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-gce4d125\"; }\n' > libs/ardour/revision.cc + # Note the different version number + sed -i '33i rev = \"3.5-357-gce4d125\"' wscript + sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript + sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings + sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl ''; - buildInputs = [ - scons boost pkgconfig fftw librdf_raptor2 librdf_rasqal jackaudio - flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx - #lilv lv2 serd sord sratom suil - libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas libgnomecanvasmm liblrdf - liblo aubio fftwSinglePrec libmad autoconf automake libtool curl - ]; + configurePhase = "python waf configure --optimize --prefix=$out"; - buildPhase = '' - mkdir -p $out - export CXX=g++ - scons PREFIX=$out SYSLIBS=1 install + buildPhase = "python waf"; + + # For the custom ardour clearlooks gtk-engine to work, it must be + # moved to a directory called "engines" and added to GTK_PATH + installPhase = '' + python waf install + mkdir -pv $out/gtk2/engines + cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/ + wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2 ''; - installPhase = ":"; - - meta = { + meta = with stdenv.lib; { description = "Multi-track hard disk recording software"; longDescription = '' - Broken: use ardour3-svn instead Also read "The importance of Paying Something" on their homepage, please! ''; homepage = http://ardour.org/; - branch = "2"; - license = "GPLv2"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix new file mode 100644 index 00000000000..dd9b830be84 --- /dev/null +++ b/pkgs/applications/audio/ekho/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig +, libsndfile, pulseaudio +}: + +let + version = "5.8.2"; +in stdenv.mkDerivation rec { + name = "ekho-${version}"; + + meta = with stdenv.lib; { + description = "Chinese text-to-speech software"; + homepage = "http://www.eguidedog.net/ekho.php"; + longDescription = '' + Ekho (余音) is a free, open source and multilingual text-to-speech (TTS) + software. It supports Cantonese (Chinese dialect spoken in Hong Kong and + part of Guangdong province), Mandarin (standard Chinese), Zhaoan Hakka + (a dialect in Taiwan), Tibetan, Ngangien (an ancient Chinese before + Yuan Dynasty) and Korean (in trial). + ''; + license = licenses.gpl2Plus; + platforms = platforms.linux; + hydraPlatforms = []; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${name}.tar.xz"; + sha256 = "0ym6lpcpsvwvsiwlzkl1509a2hljwcw7synngrmqjq1n49ww00nj"; + }; + + preConfigure = with stdenv.lib; '' + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${optionalString stdenv.is64bit "-D_x86_64"}" + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DEKHO_DATA_PATH=\"$out/share/ekho-data\"" + ''; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libsndfile pulseaudio ]; +} diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index be6970f01e1..269b48aebb8 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "Gigasampler file access library"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 6b15052769b..2baf69cef4f 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = http://drobilla.net/software/jalv; license = licenses.isc; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index 72087c76b05..ad52e7b2d85 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "LASH Audio Session Handler"; + description = "A Linux Audio Session Handler"; longDescription = '' Session management system for GNU/Linux audio applications. ''; diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix index 1e163391a39..26ea2c7b0b2 100644 --- a/pkgs/applications/audio/mid2key/default.nix +++ b/pkgs/applications/audio/mid2key/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "A simple tool which maps midi notes to simulated keystrokes"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 7cfe73c9c75..b851517b872 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "graphical frontend to LinuxSampler"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix index 14f9c1eb0d4..b815b052347 100644 --- a/pkgs/applications/editors/kdevelop/default.nix +++ b/pkgs/applications/editors/kdevelop/default.nix @@ -1,28 +1,20 @@ { stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info, - kdebase_workspace, gettext, perl, okteta }: + kdebase_workspace, gettext, perl, okteta, qjson }: stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "4.3.1"; + version = "4.6.0"; pname = "kdevelop"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0015hv39rqhyq1w6jw65lx7ls4l5pc3a2asvd5zsd65831vrfxxs"; + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "1ee9e7b8c46f575dd29d920cfd6284130f2e738a2e1f52dfd97b075fab2e4c73"; }; - buildInputs = [ kdevplatform kdebase_workspace okteta ]; + buildInputs = [ kdevplatform kdebase_workspace okteta qjson ]; nativeBuildInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ]; - patches = - [ ( fetchurl { - url = https://git.reviewboard.kde.org/r/105211/diff/raw/; - name = "okteta-0.9.patch"; # fixes build with KDE-4.9.x - sha256 = "1mvqhw7jr1vi66l3jgam3slyfafcvwy4g3iapfi69dpfnzhmcxl0"; - } ) - ]; - NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE"; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/vim/wrapper.nix b/pkgs/applications/editors/vim/wrapper.nix index 709753ff8eb..72e86805053 100644 --- a/pkgs/applications/editors/vim/wrapper.nix +++ b/pkgs/applications/editors/vim/wrapper.nix @@ -2,10 +2,12 @@ let - vimrcfile = writeText "vimrc" (if vimrc == null then "" else vimrc); + vimrcfile = writeText "vimrc" vimrc; + + p = builtins.parseDrvName vim.name; in stdenv.mkDerivation rec { - name = "vimwrapper-${vim.version}"; + name = "${p.name}-with-vimrc-${p.version}"; buildInputs = [ makeWrapper vim vimrcfile ]; diff --git a/pkgs/applications/editors/yi/yi-contrib.nix b/pkgs/applications/editors/yi/yi-contrib.nix index 0ed6e877862..6dd75301187 100644 --- a/pkgs/applications/editors/yi/yi-contrib.nix +++ b/pkgs/applications/editors/yi/yi-contrib.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yi-contrib"; - version = "0.7.1"; - sha256 = "0915ikck01kc5npbvywd9r7azylqrhfymzc72rf4iaghz4w939li"; + version = "0.7.2"; + sha256 = "074cq1y0pp66r2fqqszd8w2pws8jbfwq9g39w3rsgjnw83058fr8"; buildDepends = [ dataAccessor filepath mtl split yi ]; meta = { homepage = "http://haskell.org/haskellwiki/Yi"; diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix index b504af14904..b358f5488dc 100644 --- a/pkgs/applications/editors/yi/yi.nix +++ b/pkgs/applications/editors/yi/yi.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yi"; - version = "0.7.1"; - sha256 = "111xg7qpjhsqf6pfr136wh8km3lrgpzghd9h5rlypafr61w59vly"; + version = "0.7.2"; + sha256 = "0g0hvr4zqcrmdl6mbdmrfxd5m51fhkhslvl9piwq83g2wirxqbvm"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix new file mode 100644 index 00000000000..2a3ed77609f --- /dev/null +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -0,0 +1,56 @@ +{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkit +, pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils +, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils }: + +# for dependencies see http://www.yorba.org/projects/shotwell/install/ + +let + rest = stdenv.mkDerivation rec { + name = "rest-0.7.12"; + + src = fetchurl { + url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz"; + sha256 = "0fmg7fq5fx0jg3ryk71kwdkspsvj42acxy9imk7vznkqj29a9zqn"; + }; + + configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; + + buildInputs = [ pkgconfig glib libsoup ]; + }; +in stdenv.mkDerivation rec { + version = "0.18.0"; + name = "shotwell-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/shotwell/0.18/${name}.tar.xz"; + sha256 = "0cq0zs13f3f4xyz46yvj4qfpm5nh4ypds7r53pkqm4a3n8ybf5v7"; + }; + + NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; + + configureFlags = [ "--disable-gsettings-convert-install" ]; + + preConfigure = '' + patchShebangs . + ''; + + postInstall = '' + wrapProgram "$out/bin/shotwell" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gsettings_desktop_schemas}/share:${gtk3}/share:$out/share" + ''; + + + buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkit pkgconfig + gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2 + libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg + makeWrapper gnome_doc_utils ]; + + meta = with stdenv.lib; { + description = "Popular photo organizer for the GNOME desktop"; + homepage = http://www.yorba.org/projects/shotwell/; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [iElectric]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/ike/default.nix b/pkgs/applications/ike/default.nix index 7bba42152e8..d595cb60da8 100644 --- a/pkgs/applications/ike/default.nix +++ b/pkgs/applications/ike/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { installPhase = '' make install for file in "$out"/bin/* "$out"/sbin/*; do - wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.gcc}/lib:${libedit}/lib:${qt4}/lib" + wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.gcc}/lib:${stdenv.glibc}/lib::${gcc.gcc}/lib64:${stdenv.glibc}/lib64:${libedit}/lib:${qt4}/lib" done ''; diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 49c1a403814..a7aeed339e2 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "xmobar"; - version = "0.20"; - sha256 = "06ra5nx53rlijkb3hhp5p5a0b3bx14921jgkkp1xqciscnspj2nv"; + version = "0.20.1"; + sha256 = "16jfgn6ciqxrwj6qjhbcpms7mzlbxfaxyxfxp64xvnw626xlpjvk"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index a3645b2ac69..782356640c8 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -6,13 +6,13 @@ sha256 = "0qbv6prxl18y5824pfd13ng9798g561gzb6nypwp502hqr45jvb6"; }; beta = { - version = "34.0.1847.45"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.45.tar.xz"; - sha256 = "0ypz6cclddiasmy8z5p97ndpl9xb7p5ncn9dxm6zkffxyagnx531"; + version = "34.0.1847.60"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.60.tar.xz"; + sha256 = "1na5d6z4a0wkabn7cj62vyiv3mmvcb6qdvrkyy6fj79h7gk2hb7k"; }; stable = { - version = "33.0.1750.149"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.149.tar.xz"; - sha256 = "111hml6kjfzps9addvhcjygjb2k65spknx2zc6pnz4ygshynspqn"; + version = "33.0.1750.152"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-33.0.1750.152.tar.xz"; + sha256 = "0byc23vwn9alsva0jqvwvgnbx2bm7x48m3jln02y4fpf1f265m4z"; }; } diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix index 029a6f8e633..e5f18f72ced 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json_c, ncurses +{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses , gettext, libiconvOrEmpty, makeWrapper, perl }: stdenv.mkDerivation rec { - name = "newsbeuter-2.7"; + name = "newsbeuter-2.8"; src = fetchurl { url = "http://www.newsbeuter.org/downloads/${name}.tar.gz"; - sha256 = "0flhzzlbdirjmrq738gmcxqqnifg3kb7plcwqcxshpizmjkhswp6"; + sha256 = "013qi8yghpms2qq1b3xbrlmfgpj0ybgk0qhj245ni4kpxila0wn8"; + }; buildInputs # use gettext instead of libintlOrEmpty so we have access to the msgfmt # command - = [ pkgconfig sqlite curl libxml2 stfl json_c ncurses gettext perl ] + = [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl ] ++ libiconvOrEmpty ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; preBuild = '' - sed -i -e 104,108d config.sh + sed -i -e 110,114d config.sh sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl export LDFLAGS=-lncursesw ''; diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix index 17e97d92b89..4390360ff9e 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix @@ -2,11 +2,12 @@ , gettext, libiconvOrEmpty, makeWrapper, perl }: stdenv.mkDerivation rec { - name = "newsbeuter-dev-20131118"; + name = "newsbeuter-dev-20140309"; src = fetchgit { url = "https://github.com/akrennmair/newsbeuter.git"; - rev = "18b73f7d44a99a698d4878fe7d226f55842132c2"; + rev = "1427bdb0705806368db39576a9b803df82fa0415"; + sha256 = "b29a304a46bf56b439d0d35ea586f7fd0fbf1a5565dca95de76e774885d8b64b"; }; buildInputs @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; preBuild = '' - sed -i -e 104,108d config.sh + sed -i -e 110,114d config.sh sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl export LDFLAGS=-lncursesw ''; diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index d3009115b17..7554ad7d1a8 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Integrated IRC client for KDE"; + repositories.git = git://anongit.kde.org/konversation; license = "GPL"; inherit (kdelibs.meta) maintainers platforms; }; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 89b437acc90..b47018e0d97 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { cacert cmake ]; + # This patch is based on + # weechat/c324610226cef15ecfb1235113c8243b068084c8. It fixes + # freeze/crash on /exit when using nixpkgs' gnutls 3.2. The next + # weechat release (0.4.4) will include this, so it's safe to remove + # then. + patches = [ ./fix-gnutls-32.diff ]; + postInstall = '' wrapProgram "$out/bin/weechat" \ --prefix PYTHONPATH : "$PYTHONPATH" \ diff --git a/pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff b/pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff new file mode 100644 index 00000000000..56e357c8f7d --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff @@ -0,0 +1,16 @@ +diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt +index 325c611..a8927bc 100644 +--- a/src/gui/curses/CMakeLists.txt ++++ b/src/gui/curses/CMakeLists.txt +@@ -53,9 +53,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") + ENDIF(HAVE_BACKTRACE) + ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") + +-IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") +- LIST(APPEND EXTRA_LIBS "pthread") +-ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") ++LIST(APPEND EXTRA_LIBS "pthread") + + IF(ICONV_LIBRARY) + LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY}) + diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index a8fb387e729..70aeb000981 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -3,7 +3,7 @@ , gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which }: stdenv.mkDerivation rec { - version = "20131130"; + version = "20140312"; name = "sup-${version}"; meta = { @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://github.com/sup-heliotrope/sup.git; - rev = "a5a1e39034204ac4b05c9171a71164712690b010"; - sha256 = "0w2w7dcif1ri1qq81csz7gj45rqd9z7hjd6x29awibybyyqyvj5s"; + rev = "0cad7b308237c07b8a46149908b2ad4806ac3d1d"; + sha256 = "83534b6ad9fb6aa883d630c927e3a71bd09a646e3254b4eb0cc7a09f69a525bc"; }; buildInputs = diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 527c860c098..c0892740dbd 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,14 +6,14 @@ }: let pname = "liferea"; - version = "1.10.6"; + version = "1.10.7"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0vp19z4p3cn3zbg1zjpg2iyzwq893dx5c1kh6aac06s3rf1124gm"; + url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; + sha256 = "17kvg44brdz99firr5h5qx8icvadlr7p1cz3xr3437sf5rhj25wh"; }; buildInputs = with gst_all_1; [ diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix new file mode 100644 index 00000000000..c933460af43 --- /dev/null +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, +slang, ncurses +}: + +let version = "1.0.1"; in + +stdenv.mkDerivation { + name = "slrn-${version}"; + + src = fetchurl { + url = "http://www.jedsoft.org/slrn/download/slrn-1.0.1.tar.gz"; + sha256 = "1rmaprfwvshzkv0c5vi43839cz3laqjpl306b9z0ghwyjdha1d06"; + }; + + preConfigure = '' + sed -i -e "s|-ltermcap|-lncurses|" configure + sed -i autoconf/Makefile.in src/Makefile.in \ + -e "s|/bin/cp|cp|" \ + -e "s|/bin/rm|rm|" + ''; + + configureFlags = "--with-slang=${slang}"; + + buildInputs = [ slang ncurses ]; + + meta = { + description = "The slrn (S-Lang read news) newsreader"; + homepage = http://slrn.sourceforge.net/index.html; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index b408f20b711..e53fda08911 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "ktorrent"; - version = "4.2.1"; + version = "4.3.1"; src = fetchurl { url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2"; - sha256 = "1b6w7i1vvq8mlw9yrlxvb51hvaj6rpl8lv9b9zagyl3wcanz73zd"; + sha256 = "66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1"; }; patches = [ ./find-workspace.diff ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "KDE integrated BtTorrent client"; - homepage = http://ktorrent.org; + homepage = http://ktorrent.pwsp.net; maintainers = with stdenv.lib.maintainers; [ sander urkud ]; inherit (libktorrent.meta) platforms; }; diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix new file mode 100644 index 00000000000..a06185ed2ae --- /dev/null +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }: + +stdenv.mkDerivation rec { + name = "ncdc-${version}"; + version = "1.19"; + + src = fetchurl { + url = "http://dev.yorhel.nl/download/ncdc-1.19.tar.gz"; + sha256 = "1wgvqwfxq9kc729h2r528n55821w87sfbm4h21mr6pvkpfw30hf2"; + }; + + buildInputs = [ ncurses zlib bzip2 sqlite pkgconfig glib gnutls ]; + + meta = { + description = "modern and lightweight direct connect client with a friendly ncurses interface"; + homepage = http://dev.yorhel.nl/ncdc; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 49129e6b8ce..d64230aa50d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -1,4 +1,4 @@ -{ cabal, aeson, async, blazeBuilder, bloomfilter, bup +{ cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable , caseInsensitive, clientsession, cryptoApi, cryptohash, curl , dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance , extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet @@ -7,31 +7,31 @@ , MonadCatchIOTransformers, monadControl, mtl, network , networkConduit, networkInfo, networkMulticast , networkProtocolXmpp, openssh, optparseApplicative, perl -, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, SHA, stm -, tasty, tastyHunit, tastyQuickcheck, tastyRerun, text, time -, transformers, unixCompat, utf8String, uuid, wai, waiLogger, warp -, warpTls, which, xmlTypes, yesod, yesodCore, yesodDefault +, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem +, SHA, stm, tasty, tastyHunit, tastyQuickcheck, tastyRerun, text +, time, transformers, unixCompat, utf8String, uuid, wai, waiLogger +, warp, warpTls, which, xmlTypes, yesod, yesodCore, yesodDefault , yesodForm, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140306"; - sha256 = "1kjgqrz0wnccylrbdiwj1yndg7v2k09f5h2vkk06bnx02xmwvjl9"; + version = "5.20140320"; + sha256 = "0jhg5nbvdsiaprpj4h57fpfskhx0nqva4yx6krfd90i9gwgkm8l5"; isLibrary = false; isExecutable = true; buildDepends = [ - aeson async blazeBuilder bloomfilter caseInsensitive clientsession - cryptoApi cryptohash dataDefault dataenc DAV dbus dlist dns - editDistance extensibleExceptions feed filepath gnutls hamlet - hinotify hS3 hslogger HTTP httpClient httpConduit httpTypes IfElse - json liftedBase MissingH MonadCatchIOTransformers monadControl mtl - network networkConduit networkInfo networkMulticast - networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa - SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck tastyRerun - text time transformers unixCompat utf8String uuid wai waiLogger - warp warpTls xmlTypes yesod yesodCore yesodDefault yesodForm - yesodStatic + aeson async blazeBuilder bloomfilter byteable caseInsensitive + clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus + dlist dns editDistance extensibleExceptions feed filepath gnutls + hamlet hinotify hS3 hslogger HTTP httpClient httpConduit httpTypes + IfElse json liftedBase MissingH MonadCatchIOTransformers + monadControl mtl network networkConduit networkInfo + networkMulticast networkProtocolXmpp optparseApplicative QuickCheck + random regexTdfa SafeSemaphore securemem SHA stm tasty tastyHunit + tastyQuickcheck tastyRerun text time transformers unixCompat + utf8String uuid wai waiLogger warp warpTls xmlTypes yesod yesodCore + yesodDefault yesodForm yesodStatic ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; configureFlags = "-fS3 diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index c14eb36acf9..9be32b9accd 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "1.9.0"; + version = "1.9.1"; svn = subversionClient.override { perlBindings = true; }; @@ -20,8 +20,8 @@ stdenv.mkDerivation { name = "git-${version}"; src = fetchurl { - url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "10lq71vrg1zbqm923wb0p36ily6y5x057f2bryk4wqkdqgyrfc6y"; + url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; + sha256 = "0yx7qf9hqgfvrliqvk775pw3zh982nx5r16iw7n997q4ik7gnqpr"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index af3f6f79942..9bbc7c9e739 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -5,7 +5,7 @@ , libass, fftw, ffms , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies , spellChecking ? true, hunspell ? null -, automationSupport ? true, lua ? null +, automationSupport ? true, lua ? null , openalSupport ? false, openal ? null , alsaSupport ? true, alsaLib ? null , pulseaudioSupport ? true, pulseaudio ? null @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { ; NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm"; - - preConfigure = "cd aegisub"; - + + preConfigure = "cd aegisub"; + postInstall = "ln -s $out/bin/aegisub-3.0 $out/bin/aegisub"; - + meta = { description = "An advanced subtitle editor"; longDescription = '' @@ -53,8 +53,8 @@ stdenv.mkDerivation rec { built-in real-time video preview. ''; homepage = http://www.aegisub.org/; - license = stdenv.lib.licenses.bsd3; - # The Aegisub sources are itself BSD/ISC, + license = stdenv.lib.licenses.bsd3; + # The Aegisub sources are itself BSD/ISC, # but they are linked against GPL'd softwares # - so the resulting program will be GPL maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index ed93f81b662..17bf282a459 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -5,6 +5,7 @@ python3Packages.buildPythonPackage rec { name = "kazam-${version}"; version = "1.4.3"; + namePrefix = ""; src = fetchurl { url = "https://launchpad.net/kazam/stable/${version}/+download/kazam-${version}.tar.gz"; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 693f367a169..f059472aa9b 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -46,7 +46,7 @@ assert cacaSupport -> libcaca != null; # but by purity reasons it should be avoided; thanks the-kenny to point it out! # Now, it will just download and package Waf, mimetizing bootstrap.py behaviour -let +let waf = fetchurl { url = https://waf.googlecode.com/files/waf-1.7.13; sha256 = "03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873"; @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { python3 ${waf} install # Maybe not needed, but it doesn't hurt anyway: a standard font mkdir -p $out/share/mpv - ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf + ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf ''; meta = { diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index 1802ed74db9..8e5108b4410 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { version = "1.20"; src = fetchurl { - url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2"; + url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2"; sha256 = "0yapnr8wvlx7h1q1w98yfy2vsbf0rlp4wd99r3xb0b7l70b36mpw"; }; - + buildInputs = with stdenv.lib; - optionals localBios [ nasm ] + optionals localBios [ nasm ] ++ optionals sdlSupport [ SDL ]; builder = ./builder.sh; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "An open-source 8086 emulator"; longDescription = '' 8086tiny is a tiny, open source (MIT), portable (little-endian hosts) Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny emulates a "late 80's era" PC XT-type machine. - + 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) ''; homepage = http://www.megalith.co.uk/8086tiny/index.html; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { }; } -# TODO: add support for a locally made BIOS \ No newline at end of file +# TODO: add support for a locally made BIOS diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index eaa7a4ad054..75afcb41f80 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz"; sha256 = "042blm1xb9ig4fh2bv8nrrfpgkcxy4hq8yrkx7mrdpm5g4mvfwyr"; }; - + buildInputs = with stdenv.lib; [ libX11 mesa ] ++ optionals sdlSupport [ SDL ] @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ++ optionals curlSupport [ curl ]; configureFlags = '' - --with-x11 + --with-x11 --with-term=${if termSupport then "yes" else "no"} --with-sdl=${if sdlSupport then "yes" else "no"} --with-svga=no @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { --enable-plugins=no --enable-disasm --enable-debugger - --enable-ne2000 - --enable-e1000 - --enable-sb16 - --enable-voodoo - --enable-usb + --enable-ne2000 + --enable-e1000 + --enable-sb16 + --enable-voodoo + --enable-usb --enable-pnic ''; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index dcf5b4e5009..7f3bf8fafc8 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman -, attr, libcap, vde2, alsaLib, texinfo, libuuid +, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison , makeWrapper , sdlSupport ? true, SDL , vncSupport ? true, libjpeg, libpng @@ -7,19 +7,19 @@ , x86Only ? false }: -let n = "qemu-1.5.2"; in +let n = "qemu-1.7.0"; in stdenv.mkDerivation rec { name = n + (if x86Only then "-x86-only" else ""); src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn"; + sha256 = "050kq9mz8c2jcshm7nn7dldypsk8jr590ybnlw2wc51dbyl37wri"; }; buildInputs = [ python zlib pkgconfig glib ncurses perl pixman attr libcap - vde2 alsaLib texinfo libuuid makeWrapper + vde2 alsaLib texinfo libuuid flex bison makeWrapper ] ++ stdenv.lib.optionals sdlSupport [ SDL ] ++ stdenv.lib.optionals vncSupport [ libjpeg libpng ] @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { fi ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.qemu.org/; description = "A generic and open source machine emulator and virtualizer"; - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [ viric shlevy eelco ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric shlevy eelco ]; + platforms = platforms.linux; }; } diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 3dcb8aa1705..274cd05024b 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -2,7 +2,7 @@ , kernel ? pkgs.linux_3_10 , img ? "bzImage" , rootModules ? - [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ] + [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" "rtc_cmos" ] }: with pkgs; @@ -57,6 +57,7 @@ rec { mknod ${dev}/random c 1 8 mknod ${dev}/urandom c 1 9 mknod ${dev}/tty c 5 0 + mknod ${dev}/rtc c 254 0 . /sys/class/block/${hd}/uevent mknod ${dev}/${hd} b $MAJOR $MINOR ''; @@ -159,6 +160,10 @@ rec { #! ${bash}/bin/sh source /tmp/xchg/saved-env + # Set the system time from the hardware clock. Works around an + # apparent KVM > 1.5.2 bug. + ${pkgs.utillinux}/sbin/hwclock -s + export NIX_STORE=/nix/store export NIX_BUILD_TOP=/tmp export TMPDIR=/tmp diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/data/documentation/man-pages-posix/default.nix index 8c126db0792..78b3aa1c8b3 100644 --- a/pkgs/data/documentation/man-pages-posix/default.nix +++ b/pkgs/data/documentation/man-pages-posix/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "man-pages-posix-2003a"; + name = "man-pages-posix-2013-a"; src = fetchurl { - url = "mirror://kernel/linux/docs/man-pages/man-pages-posix/man-pages-posix-2003-a.tar.bz2"; - sha256 = "1sj97lbj27w935f9ia91ih1mwlz4j3qcr3d3nkvcxm6cpfvv2mg3"; + url = "mirror://kernel/linux/docs/man-pages/man-pages-posix/${name}.tar.xz"; + sha256 = "0258j05zdrxpgdj8nndbyi7bvrs8fxdksb0xbfrylzgzfmf3lqqr"; }; preBuild = diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 15544eff922..61dfe2b1795 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -128,5 +128,6 @@ rec { gitg = callPackage ./misc/gitg { }; libgit2-glib = callPackage ./misc/libgit2-glib { }; - + + gexiv2 = callPackage ./misc/gexiv2 { }; } diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix new file mode 100644 index 00000000000..86942c13f34 --- /dev/null +++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4 }: + + +stdenv.mkDerivation rec { + name = "gexiv2-${version}"; + version = "0.7.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gexiv2/0.7/${name}.tar.xz"; + sha256 = "12pfc5a57dhlf0c3yg5x3jissxi7jy2b6ir6y99cn510801gwcdn"; + }; + + preConfigure = '' + patchShebangs . + ''; + + buildInputs = [ pkgconfig glib libtool m4 ]; + propagatedBuildInputs = [ exiv2 ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/gexiv2; + description = "GObject wrapper around the Exiv2 photo metadata library"; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/desktops/kde-4.10/kdeutils/kdf.nix b/pkgs/desktops/kde-4.10/kdeutils/kdf.nix index 3f9da58d0a6..4b02c12d88a 100644 --- a/pkgs/desktops/kde-4.10/kdeutils/kdf.nix +++ b/pkgs/desktops/kde-4.10/kdeutils/kdf.nix @@ -3,6 +3,8 @@ kde { buildInputs = [ kdelibs ]; + enableParallelBuilding = false; + meta = { description = "KDE free disk space utility"; }; diff --git a/pkgs/desktops/xfce/applications/gigolo.nix b/pkgs/desktops/xfce/applications/gigolo.nix index b54ea8cc623..9badeb5370e 100644 --- a/pkgs/desktops/xfce/applications/gigolo.nix +++ b/pkgs/desktops/xfce/applications/gigolo.nix @@ -3,20 +3,16 @@ stdenv.mkDerivation rec { p_name = "gigolo"; ver_maj = "0.4"; - ver_min = "1"; + ver_min = "2"; src = fetchurl { url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2"; + sha256 = "0r4ij0mlnp0bqq44pyrdcpz18r1zwsksw6w5yc0jzgg7wj7wfgsm"; }; name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = [ python gettext intltool gtk pkgconfig gvfs]; - preConfigure = '' - sed -i "waf" -e "1 s^.*/env[ ]*python^#!${python}/bin/python^"; - ''; - meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; description = "A frontend to easily manage connections to remote filesystems"; diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix index baef6872848..df743e4cc9c 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { p_name = "xfce4-taskmanager"; ver_maj = "1.0"; - ver_min = "0"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0"; + sha256 = "11pfiglfg3mzsmpiwva6l7dj44zsv76vyf0282pghwcrvnb2gapm"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 06902792624..8988d072e2c 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -4,11 +4,11 @@ libgsf, poppler, bzip2 }: stdenv.mkDerivation rec { p_name = "tumbler"; ver_maj = "0.1"; - ver_min = "29"; + ver_min = "30"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "14zw69x5979d19brjbyq81wvbikb13vgv901gxnbw8lyc3pc9fn3"; + sha256 = "013kacqyy1vya7kp6jgc1almp3cbbvq96a3r7f5myiihr1whvhp7"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index bb9c6d75d44..8cc283bc3f1 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -1,18 +1,30 @@ -{ stdenv, fetchurl, mono, unzip, pkgconfig - } : -stdenv.mkDerivation rec { - pname = "fsharp"; - date = "2011-08-10"; - name = "${pname}-${date}"; +{ stdenv, fetchgit, mono, pkgconfig, autoconf, automake, which }: - src = fetchurl { - url = "http://download.mono-project.com/sources/fsharp/fsharp-cc126f2.zip"; - sha256 = "03j2ypnfddl2zpvg8ivhafjy8dlz49b38rdy89l8c3irxdsb7k6i"; +stdenv.mkDerivation rec { + name = "fsharp-${version}"; + version = "3.1"; + + src = fetchgit { + url = "https://github.com/fsharp/fsharp"; + rev = "refs/heads/fsharp_31"; + sha256 = "0d41ae31c57ec9ac8a4ea149b615ae085f3774b8877d8e53ddbf68856c32eda0"; }; - buildInputs = [mono unzip pkgconfig]; + buildInputs = [ mono pkgconfig autoconf automake which ]; + configurePhase = '' + substituteInPlace ./autogen.sh "/usr/bin/env sh" "/bin/sh" + ./autogen.sh --prefix $out + ''; - sourceRoot = "fsharp"; + # Make sure the executables use the right mono binary, + # and set up some symlinks for backwards compatibility. + postInstall = '' + substituteInPlace $out/bin/fsharpc --replace " mono " " ${mono}/bin/mono " + substituteInPlace $out/bin/fsharpi --replace " mono " " ${mono}/bin/mono " + substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono " + ln -s $out/bin/fsharpc $out/bin/fsc + ln -s $out/bin/fsharpi $out/bin/fsi + ''; # To fix this error when running: # The file "/nix/store/path/whatever.exe" is an not a valid CIL image @@ -20,9 +32,9 @@ stdenv.mkDerivation rec { meta = { description = "A functional CLI language"; - homepage = "http://tryfsharp.org/"; + homepage = "http://fsharp.org/"; license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.raskin ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index d1acb3d09b9..497a59e17fa 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { preConfigure = '' echo "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" ''; diff --git a/pkgs/development/compilers/ghc/7.8.1.nix b/pkgs/development/compilers/ghc/7.8.1.nix index c9ca6fd8719..f58ca9cc1fc 100644 --- a/pkgs/development/compilers/ghc/7.8.1.nix +++ b/pkgs/development/compilers/ghc/7.8.1.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { preConfigure = '' echo "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" ''; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 7f5ec0985b9..cc220eb7b1c 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { preConfigure = '' echo "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" ''; diff --git a/pkgs/development/compilers/mono/build-fix-llvm.patch b/pkgs/development/compilers/mono/build-fix-llvm.patch new file mode 100644 index 00000000000..526986ad12c --- /dev/null +++ b/pkgs/development/compilers/mono/build-fix-llvm.patch @@ -0,0 +1,12 @@ +diff --git a/lib/CodeGen/AsmPrinter/CMakeLists.txt.old b/lib/CodeGen/AsmPrinter/CMakeLists.txt +index be484a6..c92ff46 100644 +--- a/lib/CodeGen/AsmPrinter/CMakeLists.txt.old ++++ b/lib/CodeGen/AsmPrinter/CMakeLists.txt +@@ -10,6 +10,7 @@ add_llvm_library(LLVMAsmPrinter + DwarfCompileUnit.cpp + DwarfDebug.cpp + DwarfException.cpp ++ DwarfMonoException.cpp + ErlangGCPrinter.cpp + OcamlGCPrinter.cpp + Win64Exception.cpp diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 88bef618f74..4ff2dacff18 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -1,13 +1,18 @@ -{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11}: +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? true }: +let + llvm = callPackage ./llvm.nix { }; + llvmOpts = stdenv.lib.optionalString withLLVM "--enable-llvm --enable-llvmloaded --with-llvm=${llvm}"; +in stdenv.mkDerivation rec { - name = "mono-2.11.4"; + name = "mono-${version}"; + version = "3.2.8"; src = fetchurl { url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2"; - sha256 = "0wv8pnj02mq012sihx2scx0avyw51b5wb976wn7x86zda0vfcsnr"; + sha256 = "0h0s42pmgrhwqaym0b1401h70dcpr179ngcsp7f8i4hl4snqrd7x"; }; - buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11]; + buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib]; propagatedBuildInputs = [glib]; NIX_LDFLAGS = "-lgcc_s" ; @@ -17,7 +22,7 @@ stdenv.mkDerivation rec { # In fact I think this line does not help at all to what I # wanted to achieve: have mono to find libgdiplus automatically - configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib --with-libgdiplus=${libgdiplus}/lib/libgdiplus.so"; + configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib --with-libgdiplus=${libgdiplus}/lib/libgdiplus.so ${llvmOpts}"; # Attempt to fix this error when running "mcs --version": # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image @@ -26,10 +31,14 @@ stdenv.mkDerivation rec { # Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601 enableParallelBuilding = false; - preBuild = " + # Patch all the necessary scripts. Also, if we're using LLVM, we fix the default + # LLVM path to point into the Mono LLVM build, since it's private anyway. + preBuild = '' makeFlagsArray=(INSTALL=`type -tp install`) patchShebangs ./ - "; + '' + stdenv.lib.optionalString withLLVM '' + substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")" + ''; #Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps #Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive @@ -46,7 +55,7 @@ stdenv.mkDerivation rec { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice ]; license = "free"; # Combination of LGPL/X11/GPL ? }; } diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix new file mode 100644 index 00000000000..74f85b1519c --- /dev/null +++ b/pkgs/development/compilers/mono/llvm.nix @@ -0,0 +1,59 @@ +{ stdenv +, fetchurl +, perl +, groff +, cmake +, python +, libffi +, binutils +, libxml2 +, valgrind +, ncurses +, zlib +}: + +stdenv.mkDerivation rec { + name = "llvm-${version}"; + version = "3.4svn-mono-f9b1a74368"; + src = fetchurl { + # from the HEAD of the 'mono3' branch + url = "https://github.com/mono/llvm/archive/f9b1a74368ec299fc04c4cfef4b5aa0992b7b806.tar.gz"; + name = "${name}.tar.gz"; + sha256 = "1bbkx4p5zdnk3nbdd5jxvbwqx8cdq8z1n1nhf639i98mggs0zhdg"; + }; + + patches = [ ./build-fix-llvm.patch ]; + unpackPhase = '' + unpackFile ${src} + mv llvm-* llvm + sourceRoot=$PWD/llvm + ''; + + buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind; + + propagatedBuildInputs = [ ncurses zlib ]; + + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + postBuild = "rm -fR $out"; + + cmakeFlags = with stdenv; [ + "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_BINUTILS_INCDIR=${binutils}/include" + "-DCMAKE_CXX_FLAGS=-std=c++11" + ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; + + enableParallelBuilding = true; + + meta = { + description = "Collection of modular and reusable compiler and toolchain technologies - Mono build"; + homepage = http://llvm.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 8d7da9d91e6..3725586f3f4 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -18,7 +18,7 @@ with stdenv.lib; let majorVersion = "3.4"; version = "${majorVersion}.0"; - fullVersion = "${version}rc2"; + fullVersion = "${version}"; buildInputs = filter (p: p != null) [ zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto @@ -30,7 +30,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; - sha256 = "0v37mlkwzbc8m54h3nb04x6xm2yx5fmd7flq2shn37ixf9d0ih6z"; + sha256 = "1gjcn5c3zqg161vwzh43ciha15w0plf5v7cyfm372pnllb08cdpi"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 9150df8da7d..d1510e34238 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "A C library to make the use of LV2 plugins"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; - + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index f5d48df03f8..25d19d089a5 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "A plugin standard for audio systems"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; - + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 5c78296af97..ac0b9d233fa 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "A library for serialising LV2 atoms to/from RDF"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; - + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 8af725b6b80..87e03472659 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; - + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/facile/default.nix b/pkgs/development/libraries/facile/default.nix index edbe99cd8b0..5e3776afbc0 100644 --- a/pkgs/development/libraries/facile/default.nix +++ b/pkgs/development/libraries/facile/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { }; dontAddPrefix = 1; - - patchPhase = "sed -e 's@mkdir@mkdir -p@' -i Makefile"; - + + patches = [ ./ocaml_4.xx.patch ]; + + postPatch = "sed -e 's@mkdir@mkdir -p@' -i Makefile"; + postConfigure = "make -C src .depend"; makeFlags = "FACILEDIR=\${out}/lib/ocaml/facile"; diff --git a/pkgs/development/libraries/facile/ocaml_4.xx.patch b/pkgs/development/libraries/facile/ocaml_4.xx.patch new file mode 100644 index 00000000000..429405fabda --- /dev/null +++ b/pkgs/development/libraries/facile/ocaml_4.xx.patch @@ -0,0 +1,12 @@ +diff -rupN facile-1.1/src/fcl_data.ml facile-1.1-patched//src/fcl_data.ml +--- facile-1.1/src/fcl_data.ml 2004-09-08 11:51:02.000000000 +0200 ++++ facile-1.1-patched//src/fcl_data.ml 2012-12-16 13:49:36.286722670 +0100 +@@ -16,7 +16,7 @@ end + + module Hashtbl = struct + type ('a, 'b) t = ('a, 'b) Hashtbl.t +- let create = Hashtbl.create ++ let create x = Hashtbl.create x + let get h = h + + let add h k d = diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix index f356bceaf40..99c823e7b29 100644 --- a/pkgs/development/libraries/ffmpeg/0.10.nix +++ b/pkgs/development/libraries/ffmpeg/0.10.nix @@ -21,11 +21,11 @@ assert vdpauSupport -> libvdpau != null; assert faacSupport -> faac != null; stdenv.mkDerivation rec { - name = "ffmpeg-0.10.11"; + name = "ffmpeg-0.10.12"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1l1nyvsfafl9w0falv1hcm65r2rlxyb59har0rkrrpi56fj1ma4r"; + sha256 = "00nvm3iysn8zincpvv1abqrxqj1ky0322dh2j9csjw983358538i"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 94c0505bc6f..1abcb7c6943 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,24 +1,19 @@ -a : -let - s = import ./src-for-default.nix; - buildInputs = with a; [ - zlib - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; +{ stdenv, fetchurl }: - inherit (s) name; - inherit buildInputs; - configureFlags = []; +let version = "1.6.0"; in - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; +stdenv.mkDerivation { + name = "geoip-${version}"; + + src = fetchurl { + url = "http://geolite.maxmind.com/download/geoip/api/c/GeoIP-${version}.tar.gz"; + sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7"; + }; meta = { description = "Geolocation API"; - maintainers = [ - a.lib.maintainers.raskin - ]; + maintainers = [ stdenv.lib.maintainers.raskin ]; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/geoip/src-for-default.nix b/pkgs/development/libraries/geoip/src-for-default.nix deleted file mode 100644 index 1fc4b9b8755..00000000000 --- a/pkgs/development/libraries/geoip/src-for-default.nix +++ /dev/null @@ -1,8 +0,0 @@ -rec { - advertisedUrl="http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.4.6.tar.gz"; - version = "1.4.6"; - url="http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.6.0.tar.gz"; - hash = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7"; - name = "geoip-1.6.0"; - -} diff --git a/pkgs/development/libraries/geoip/src-info-for-default.nix b/pkgs/development/libraries/geoip/src-info-for-default.nix deleted file mode 100644 index 99c79227c63..00000000000 --- a/pkgs/development/libraries/geoip/src-info-for-default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - downloadPage = "http://geolite.maxmind.com/download/geoip/api/c/"; - sourceRegexp = "GeoIP-[0-9.]+[.]tar[.]gz"; - choiceCommand = "tail -1"; - baseName = "geoip"; -} diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index fff05ed8727..45d0270de5a 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -4,11 +4,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-3.2.12"; + name = "gnutls-3.2.12.1"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz"; - sha256 = "1zwk9qkxn3190nssyamd7jsb3ag6mnnln3jwbgmjs1w306dzwafi"; + sha256 = "1787n4iard3ad0p44xbl4aj3r3f5ir3sz0b2s27qpaaia2w4774g"; }; patches = diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index a9137ad46a7..7647c0f64db 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -9,11 +9,18 @@ stdenv.mkDerivation rec { name = "gst-plugins-bad-1.2.3"; - meta = { - homepage = "http://gstreamer.freedesktop.org"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + meta = with stdenv.lib; { + description = "Gstreamer Bad Plugins"; + homepage = "http://gstreamer.freedesktop.org"; + longDescription = '' + a set of plug-ins that aren't up to par compared to the + rest. They might be close to being good quality, but they're missing + something - be it a good code review, some documentation, a set of tests, + a real live maintainer, or some actual wide use. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index b68de91c240..4796ce078df 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -14,4 +14,8 @@ rec { gst-libav = callPackage ./libav { inherit gst-plugins-base; }; gst-python = callPackage ./python { inherit gst-plugins-base gstreamer; }; + + gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; }; + + gst-editing-services = callPackage ./ges { inherit gnonlin; }; } diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix new file mode 100644 index 00000000000..94d3688eb1c --- /dev/null +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, python +, gnonlin, libxml2 +}: + +stdenv.mkDerivation rec { + name = "gstreamer-editing-services-1.2.0"; + + meta = with stdenv.lib; { + description = "Library for creation of audio/video non-linear editors"; + homepage = "http://gstreamer.freedesktop.org"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; + sha256 = "1n7nw8rqvwna9af55lggah44gdvfgld1igvgaya8glc37wpq89b0"; + }; + + nativeBuildInputs = [ pkgconfig python ]; + + propagatedBuildInputs = [ gnonlin libxml2 ]; +} diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix new file mode 100644 index 00000000000..c45c1469cb3 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig +, gst-plugins-base +}: + +stdenv.mkDerivation rec { + name = "gnonlin-1.2.0"; + + meta = with stdenv.lib; { + description = "Gstreamer Non-Linear Multimedia Editing Plugins"; + homepage = "http://gstreamer.freedesktop.org"; + longDescription = '' + Gnonlin is a library built on top of GStreamer which provides + support for writing non-linear audio and video editing + applications. It introduces the concept of a timeline. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "${meta.homepage}/src/gnonlin/${name}.tar.xz"; + sha256 = "15hyb0kg8sm92kj37cir4l3sa21b8zy4la1ccfhb358b4mf24vl7"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + propagatedBuildInputs = [ gst-plugins-base ]; +} diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 71151c4e559..090c84600ab 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -9,11 +9,17 @@ stdenv.mkDerivation rec { name = "gst-plugins-good-1.2.3"; - meta = { - homepage = "http://gstreamer.freedesktop.org"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + meta = with stdenv.lib; { + description = "Gstreamer Good Plugins"; + homepage = "http://gstreamer.freedesktop.org"; + longDescription = '' + a set of plug-ins that we consider to have good quality code, + correct functionality, our preferred license (LGPL for the plug-in + code, LGPL or LGPL-compatible for the supporting library). + ''; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix index c3510a69a12..c0cab607062 100644 --- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix @@ -2,12 +2,12 @@ , automoc4, flex, bison, pkgconfig }: stdenv.mkDerivation rec { - name = "${pname}-0.10.2"; + name = "${pname}-0.10.3"; pname = "qt-gstreamer"; src = fetchurl { url = "http://gstreamer.freedesktop.org/src/${pname}/${name}.tar.bz2"; - sha256 = "1laryg5vgc3prdi7dmpfwa71nsrc3ngv27sgax44c4qfrgpsgwbf"; + sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl"; }; buildInputs = [ gstreamer gst_plugins_base glib qt4 ]; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index eaf284e950d..843822b0748 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "gst-python-1.1.90"; + name = "gst-python-1.2.0"; src = fetchurl { urls = [ "${meta.homepage}/src/gst-python/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "1vsykx2l5360y19c0rxspa9nf1ilml2c1ybsv8cw8p696scryb2l"; + sha256 = "09c6yls8ipbmwimdjr7xi3hvf2xa1xn1pv07855r7wfyzas1xbl1"; }; buildInputs = diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 50005004135..4f16fa4259c 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -7,11 +7,18 @@ stdenv.mkDerivation rec { name = "gst-plugins-ugly-1.2.3"; - meta = { - homepage = "http://gstreamer.freedesktop.org"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + meta = with stdenv.lib; { + description = "Gstreamer Ugly Plugins"; + homepage = "http://gstreamer.freedesktop.org"; + longDescription = '' + a set of plug-ins that have good quality and correct functionality, + but distributing them might pose problems. The license on either + the plug-ins or the supporting libraries might not be how we'd + like. The code might be widely known to present patent problems. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/haskell/Glob/default.nix b/pkgs/development/libraries/haskell/Glob/default.nix index 80c0eaa44ab..d6f07e9168d 100644 --- a/pkgs/development/libraries/haskell/Glob/default.nix +++ b/pkgs/development/libraries/haskell/Glob/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Glob"; - version = "0.7.3"; - sha256 = "0yl0wxbd03dv0hfr2aqwm9f3xnhjkdicymqv3nmhjjslqq3a59zd"; + version = "0.7.4"; + sha256 = "00f6xznqh27vbr8rggsrdphqsq1cvv931pa06b1grs7w01dcmw8s"; buildDepends = [ dlist filepath transformers ]; meta = { homepage = "http://iki.fi/matti.niemenmaa/glob/"; diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix index a8275c31b85..08134abf843 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HDBC"; - version = "2.3.1.2"; - sha256 = "1rjamh8xscb9jhxgxcrs2qnvs2ipv9dqgnn0bpv5vwclmzmn5j87"; + version = "2.4.0.0"; + sha256 = "1zwkrr0pbgxi2y75n2sjr3xs8xa3pxbmnqg3phqkjqcz3j4gcq6y"; isLibrary = true; isExecutable = true; buildDepends = [ convertible mtl text time utf8String ]; diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix index b490cf75d96..996437cbeac 100644 --- a/pkgs/development/libraries/haskell/HaXml/default.nix +++ b/pkgs/development/libraries/haskell/HaXml/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HaXml"; - version = "1.24"; - sha256 = "18kvavqa84k2121ppxngn39fjz4w63chngb3255w1fhdz13v3ydn"; + version = "1.24.1"; + sha256 = "1pvqgczksxasayvdb6d4g7ya7g7w1v9hsa35kaxm9bcic9y8q9az"; isLibrary = true; isExecutable = true; buildDepends = [ filepath polyparse random ]; diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix new file mode 100644 index 00000000000..85829093c34 --- /dev/null +++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.1.nix @@ -0,0 +1,19 @@ +{ cabal, random, testFramework, tfRandom }: + +cabal.mkDerivation (self: { + pname = "QuickCheck"; + version = "2.7.1"; + sha256 = "1hk19q7lfvja7g626hbbq0xs30zsgjpqfalgmdr24fy8sgdchm21"; + buildDepends = [ random tfRandom ]; + testDepends = [ testFramework ]; + patchPhase = '' + sed -i -e 's|QuickCheck == .*,|QuickCheck,|' QuickCheck.cabal + ''; + meta = { + homepage = "http://code.haskell.org/QuickCheck"; + description = "Automatic testing of Haskell programs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/alsa-pcm/default.nix b/pkgs/development/libraries/haskell/alsa-pcm/default.nix index 39123a176dc..c4f39cdd7ee 100644 --- a/pkgs/development/libraries/haskell/alsa-pcm/default.nix +++ b/pkgs/development/libraries/haskell/alsa-pcm/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "alsa-pcm"; - version = "0.6"; - sha256 = "10cmlf1s9y65cs81wn7xwgcd4218n3h3p34avibv3fa7n3q9b4x1"; + version = "0.6.0.1"; + sha256 = "0gnq4p172sqmlks6aykzr5l2qx2shrs2fypcvs4g56c9zpk3c3ax"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix index 181937fdd80..082745fadf0 100644 --- a/pkgs/development/libraries/haskell/arithmoi/default.nix +++ b/pkgs/development/libraries/haskell/arithmoi/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "arithmoi"; - version = "0.4.0.3"; - sha256 = "0idn312xzly636h13zmm7cw7ki64bpnniqc97nshqzgp8if5ycrc"; + version = "0.4.0.4"; + sha256 = "1v8qn0gjvlds6ljm9sfzzi5w3gsf7x63z0r7hcs1rvn0n3acwz6y"; buildDepends = [ mtl random ]; meta = { homepage = "https://bitbucket.org/dafis/arithmoi"; diff --git a/pkgs/development/libraries/haskell/base64-conduit/default.nix b/pkgs/development/libraries/haskell/base64-conduit/default.nix index 3a2d044de64..0fa5a02d5a5 100644 --- a/pkgs/development/libraries/haskell/base64-conduit/default.nix +++ b/pkgs/development/libraries/haskell/base64-conduit/default.nix @@ -3,15 +3,15 @@ cabal.mkDerivation (self: { pname = "base64-conduit"; - version = "1.0.0"; - sha256 = "10wjgdixk5da48jpm2i91vy3ckdqpbpgba6hzn7ak6d3qac22m9q"; + version = "1.0.0.1"; + sha256 = "07zhvn3fy60q04a5g5mzhkl17rap9jlh00vb4f6565bjha2k16g9"; buildDepends = [ base64Bytestring conduit ]; testDepends = [ base64Bytestring conduit hspec QuickCheck transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; - description = "Base64-encode and decode streams of bytes"; + description = "Base64-encode and decode streams of bytes. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix new file mode 100644 index 00000000000..835747ee881 --- /dev/null +++ b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix @@ -0,0 +1,14 @@ +{ cabal, chell, QuickCheck, random }: + +cabal.mkDerivation (self: { + pname = "chell-quickcheck"; + version = "0.2.2"; + sha256 = "05qshv9vcl05khxsxyks2z7dqd8dqafjsg3awkkdhviviv5p2fp8"; + buildDepends = [ chell QuickCheck random ]; + meta = { + homepage = "https://john-millikin.com/software/chell/"; + description = "QuickCheck support for the Chell testing library"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/chell/default.nix b/pkgs/development/libraries/haskell/chell/default.nix new file mode 100644 index 00000000000..c69994e6868 --- /dev/null +++ b/pkgs/development/libraries/haskell/chell/default.nix @@ -0,0 +1,18 @@ +{ cabal, ansiTerminal, options, patience, random, text +, transformers +}: + +cabal.mkDerivation (self: { + pname = "chell"; + version = "0.3.3"; + sha256 = "1k5vxipf47753d41dgr1gr4zy7y72gz2x8lcn0fgfmxi2v810nsm"; + buildDepends = [ + ansiTerminal options patience random text transformers + ]; + meta = { + homepage = "https://john-millikin.com/software/chell/"; + description = "A simple and intuitive library for automated testing"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/chunked-data/default.nix b/pkgs/development/libraries/haskell/chunked-data/default.nix index 95b52d50b4d..2705aee7aab 100644 --- a/pkgs/development/libraries/haskell/chunked-data/default.nix +++ b/pkgs/development/libraries/haskell/chunked-data/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "chunked-data"; - version = "0.1.0.0"; - sha256 = "1wdgvhf170rv557dwsiqy6nhys965xhs6w24ays273fv8hn3yk9l"; + version = "0.1.0.1"; + sha256 = "0kdq79mxi9nhy3dqw283f5ffx4rxwfrdq9cfw46ql5wmqrg2qw7r"; buildDepends = [ blazeBuilder monoTraversable semigroups systemFilepath text transformers vector diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix index d68d2389e0e..52ec2fab711 100644 --- a/pkgs/development/libraries/haskell/cipher-aes/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cipher-aes"; - version = "0.2.6"; - sha256 = "0ys5a1w5pwwr74k9wzcsh1flb2jdcvnp1zz7sjs14jpxclpd8x3i"; + version = "0.2.7"; + sha256 = "1a5viy2frkdqhzzlipd2ik89a04gv95v4b98lgpsas2958r9c9yp"; buildDepends = [ byteable cryptoCipherTypes securemem ]; testDepends = [ byteable cryptoCipherTests cryptoCipherTypes QuickCheck diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index abc0841c58e..99fa5a138b8 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.8.0.1"; - sha256 = "0mj6zz53w6irs16w1pk65imhvnhp1rq3vq8s1n1xkf9gr13v3y9r"; + version = "0.8.1.1"; + sha256 = "14iq0zdmw4f2i3c282hs89c4a763wcm7vn5n0f6kcvcpjgjyahgi"; buildDepends = [ basicPrelude chunkedData enclosedExceptions hashable liftedBase monoTraversable semigroups systemFilepath text time transformers diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index 5d1fa791c69..4799a0f63f5 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -1,19 +1,21 @@ -{ cabal, basicPrelude, chunkedData, conduit, hspec, monoTraversable +{ cabal, base16Bytestring, base64Bytestring, basicPrelude +, chunkedData, conduit, hspec, monoTraversable, mwcRandom , primitive, silently, systemFileio, systemFilepath, text -, transformers, transformersBase, vector +, transformers, transformersBase, unixCompat, vector, void }: cabal.mkDerivation (self: { pname = "conduit-combinators"; - version = "0.2.0.1"; - sha256 = "0hmy398kk37n5l4pacb2a0z9h9f1kl6vva9gsph1kiqnnz7sbr4r"; + version = "0.2.3"; + sha256 = "05sb1v6rciaj7cj6lxv6pf9ai0k3q6cvvflcb4a7q6ql9xr3j7pr"; buildDepends = [ - chunkedData conduit monoTraversable primitive systemFileio - systemFilepath text transformers transformersBase vector + base16Bytestring base64Bytestring chunkedData conduit + monoTraversable mwcRandom primitive systemFileio systemFilepath + text transformers transformersBase unixCompat vector void ]; testDepends = [ - basicPrelude chunkedData hspec monoTraversable silently text - transformers vector + base16Bytestring base64Bytestring basicPrelude chunkedData hspec + monoTraversable mwcRandom silently text transformers vector ]; meta = { homepage = "https://github.com/fpco/conduit-combinators"; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index c5fe6d9d379..b2a3ec9804b 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.15.1"; - sha256 = "0pbrsa00x8qr856532iinw9lyliwh7gwzyd1pshdmj3gkbqpf2bv"; + version = "1.0.17"; + sha256 = "0skshic2glx0sfy75skj8b4iip62zha51pgnnx5hsswhx8j2whcw"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text textStreamDecode transformers transformersBase void @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { testDepends = [ hspec mtl QuickCheck resourcet text transformers void ]; + doCheck = false; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix index 1e0dc901aaf..333d8e6601d 100644 --- a/pkgs/development/libraries/haskell/constraints/default.nix +++ b/pkgs/development/libraries/haskell/constraints/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "constraints"; - version = "0.3.4.2"; - sha256 = "14bfar4d44yl9zxgqxj4p67ag2ndprm602l4pinfjk0ywbh63fwq"; + version = "0.3.5"; + sha256 = "01xrk0xqkfwzzr5jwkadkyjgrdcpslwiqfqdb7mci688xp2isi3i"; buildDepends = [ newtype ]; meta = { homepage = "http://github.com/ekmett/constraints/"; diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix index 8a79e50527d..78be057c201 100644 --- a/pkgs/development/libraries/haskell/convertible/default.nix +++ b/pkgs/development/libraries/haskell/convertible/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "convertible"; - version = "1.0.11.1"; - sha256 = "1r50a2rpfsx0s7dv8ww5xck33b1mhy73gfilffrbqd4hxjgnxlj6"; + version = "1.1.0.0"; + sha256 = "0pc3z4jfjna1rz5wlfimw9fyhpasmdnwvava883s401760y99i0k"; isLibrary = true; isExecutable = true; buildDepends = [ mtl text time ]; diff --git a/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix new file mode 100644 index 00000000000..501edf03ae0 --- /dev/null +++ b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix @@ -0,0 +1,14 @@ +{ cabal, conduit, cryptohash, transformers }: + +cabal.mkDerivation (self: { + pname = "cryptohash-conduit"; + version = "0.1.0"; + sha256 = "08x45dy5crxc63gd4psryrzprz7lc5hbzjl23q56c3iqbvrx2r7w"; + buildDepends = [ conduit cryptohash transformers ]; + meta = { + homepage = "http://github.com/vincenthz/hs-cryptohash-conduit"; + description = "cryptohash conduit"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix index 2cb78af7ba9..9ab9b9f5d2d 100644 --- a/pkgs/development/libraries/haskell/css-text/default.nix +++ b/pkgs/development/libraries/haskell/css-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "css-text"; - version = "0.1.2.0.1"; - sha256 = "0j8d9kfs9j01gqlapaahyziphkx0f55g9bbz2wwix1si7954xxhp"; + version = "0.1.2.1"; + sha256 = "1xi1n2f0g8y43p95lynhcg50wxbq7hqfzbfzm7fy8mn7gvd920nw"; buildDepends = [ attoparsec text ]; testDepends = [ attoparsec hspec QuickCheck text ]; meta = { diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix index 41bd2347012..89658ead4d5 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-accessor-template"; - version = "0.2.1.10"; - sha256 = "11a4c0g74ppl7nls0dhx6xs47dfcq1wp7bd8qgdba6hhn645afzy"; + version = "0.2.1.11"; + sha256 = "1n2slv287zp6pabqb7xbfi296dbikw5a4ivqmnas0c4nxikqkayx"; buildDepends = [ dataAccessor utilityHt ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Record_access"; diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix index 7c1de10b20b..8fdde66f5fd 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-accessor"; - version = "0.2.2.3"; - sha256 = "1fa1rbbs3m05y61w42vj4vqlcpqmz60v8mv3r0h6lx669k6ka5gj"; + version = "0.2.2.5"; + sha256 = "0z63fv41cnpk3h404gprk2f5jl7rrpyv97xmsgac9zgdm5zkkhm6"; buildDepends = [ transformers ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Record_access"; diff --git a/pkgs/development/libraries/haskell/dbmigrations/default.nix b/pkgs/development/libraries/haskell/dbmigrations/default.nix index 10b3737d88a..008cb04f2fa 100644 --- a/pkgs/development/libraries/haskell/dbmigrations/default.nix +++ b/pkgs/development/libraries/haskell/dbmigrations/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { configurator fgl filepath HDBC HDBCPostgresql HDBCSqlite3 HUnit mtl random text time yamlLight ]; + jailbreak = true; meta = { description = "An implementation of relational database \"migrations\""; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index 304b9e84942..7f0285dfc7a 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -1,16 +1,22 @@ -{ cabal, cereal, libxmlSax, network, parsec, random, text -, transformers, vector, xmlTypes +{ cabal, cereal, chell, chellQuickcheck, filepath, libxmlSax +, network, parsec, QuickCheck, random, text, transformers, vector +, xmlTypes }: cabal.mkDerivation (self: { pname = "dbus"; - version = "0.10.6"; - sha256 = "0jbysa7czhp7yl3fb6sxiqppg8yb3cdk4v8hcs4y8yzwjj0lm7mf"; + version = "0.10.7"; + sha256 = "0xszynw6p07r7z9nlq8alx5lxfjm57gljya835ccj63hqhkr5yxh"; buildDepends = [ cereal libxmlSax network parsec random text transformers vector xmlTypes ]; + testDepends = [ + cereal chell chellQuickcheck filepath libxmlSax network parsec + QuickCheck random text transformers vector xmlTypes + ]; jailbreak = true; + doCheck = false; meta = { homepage = "https://john-millikin.com/software/haskell-dbus/"; description = "A client library for the D-Bus IPC system"; diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index 0873e65d9da..42ca82f4ac1 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.13"; - sha256 = "0lmwj66s4krh29qqmkyc3cn3j4b4mhyqvlngvmy1xaigmgib5aci"; + version = "2.5.14"; + sha256 = "1fihcd8l4z8d6rad8h39pg5gdb75h895c2xld9574fwp3bm0zl0c"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index c38346d189b..bd09b67196b 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "1.1"; - sha256 = "0x66qdwni3pwc2lrqy5jnyz7nqbfpr1086g1ndy6cxx8hp632zaf"; + version = "1.1.0.2"; + sha256 = "0y36cx89rlbmj470a6g11wlzkwzznjkjmkcpm7dzbxvfxw4pp70z"; buildDepends = [ cairo colour dataDefaultClass diagramsCore diagramsLib filepath hashable JuicyPixels lens mtl optparseApplicative split statestack diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 34dcb3745e3..f2a654302b6 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "1.1.1.1"; - sha256 = "1b91scy96zf2njikfyr2ir2ckiib4dlvjazrlbri6f5ds40gnhna"; + version = "1.1.1.2"; + sha256 = "09dfnvriih4lkici34bj9nvww245hzl95crldblwyjwi2c8qcy69"; buildDepends = [ arithmoi circlePacking colour dataDefault dataDefaultClass diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 3a3f74d4c27..3529faaf6af 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "1.1"; - sha256 = "0prklz6s5zcainpkawibdg3bidmvsd2xsc1xxrmfp7lscmim736v"; + version = "1.1.0.1"; + sha256 = "1jr827cd3qa631glwc9h247w0wnrx84gj2iwxj18b4y78d0ajz69"; buildDepends = [ dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix index cddc5dbadcf..6159270379e 100644 --- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix +++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "diagrams"; - version = "1.1"; - sha256 = "1fdacsa57w64hkcsrriwdgdxddd7gps97fyaz2rl8wfxcl96vclr"; + version = "1.1.0.1"; + sha256 = "0cxmrikcxgnrki9z8i33z7fbjpkx0vw849zj1cbq1zh8ry8xhhvg"; buildDepends = [ diagramsContrib diagramsCore diagramsLib diagramsSvg ]; diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 32385655426..c8c8bf5434d 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.1.0.1"; - sha256 = "0zkxkncz8ayvahr57fgq44vgir3yghxs2y1rrp138951fcy2g3a7"; + version = "1.1.0.3"; + sha256 = "1g4kcmpqsnb25yqvd6yv026znp7s5jhnqg1nvfxcaq0zz84w9ckh"; buildDepends = [ active colour dataDefaultClass diagramsCore filepath fingertree hashable intervals lens MemoTrie monoidExtras optparseApplicative diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index a7f85f98b09..9716177ede5 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "diagrams-postscript"; - version = "1.0.2"; - sha256 = "14y8wivgxs3qvybzqk1bfqsrs5457qd5br7nk1924si5gpsgp1xx"; + version = "1.0.2.2"; + sha256 = "00xzzx6dvraa8gbk3agqvrmxjnpvq4hik7kahidw4k37hxyyvwm3"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib dlist filepath hashable lens monoidExtras mtl semigroups split vectorSpace diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index cc5795c80a1..663a6287c62 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "1.0.2"; - sha256 = "1pbkr5qg3cjk2c23aas5y9f0bk5nsding4r4c4fdkxj49ipi4ys1"; + version = "1.0.2.1"; + sha256 = "1qm4vk67knl4bpp84kwm95blshf7slarpl620m8irslsq3yag507"; buildDepends = [ blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath hashable lens monoidExtras mtl split time vectorSpace diff --git a/pkgs/development/libraries/haskell/dlist-instances/default.nix b/pkgs/development/libraries/haskell/dlist-instances/default.nix new file mode 100644 index 00000000000..d168c4b3583 --- /dev/null +++ b/pkgs/development/libraries/haskell/dlist-instances/default.nix @@ -0,0 +1,14 @@ +{ cabal, dlist, semigroups }: + +cabal.mkDerivation (self: { + pname = "dlist-instances"; + version = "0.1"; + sha256 = "0r1j7djywqd7c224wc9ixkplj3m2mbf9k3ra7n92ja2kfpksm615"; + buildDepends = [ dlist semigroups ]; + meta = { + homepage = "https://github.com/gregwebs/dlist-instances"; + description = "Difference lists instances"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix index 547ea9f8a47..f87e7e2d758 100644 --- a/pkgs/development/libraries/haskell/dlist/default.nix +++ b/pkgs/development/libraries/haskell/dlist/default.nix @@ -1,9 +1,10 @@ -{ cabal, Cabal, QuickCheck }: +{ cabal, Cabal, deepseq, QuickCheck }: cabal.mkDerivation (self: { pname = "dlist"; - version = "0.6.0.1"; - sha256 = "08q8dsczh59a0ii3nqk6yqz70msd0pndjjcg9dzq8iyknbbqbi45"; + version = "0.7"; + sha256 = "1abbym3afm77xkgcrv3d9nl4wn69m7m3gxahdcvkg1ir1sm2pkyi"; + buildDepends = [ deepseq ]; testDepends = [ Cabal QuickCheck ]; meta = { homepage = "https://github.com/spl/dlist"; diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 843fd6239dc..8ed11decf05 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "doctest"; - version = "0.9.10.1"; - sha256 = "1kl6bihhyj08ifij7ddpy6067s1lv2lnnp4an9wany3fzwlifbyi"; + version = "0.9.10.2"; + sha256 = "1vrhfbw59vfypylkr2ica2wx1vm62r40s4165syy76r8cyy0i554"; isLibrary = true; isExecutable = true; buildDepends = [ deepseq filepath ghcPaths syb transformers ]; diff --git a/pkgs/development/libraries/haskell/dsp/default.nix b/pkgs/development/libraries/haskell/dsp/default.nix new file mode 100644 index 00000000000..c16a6888b6b --- /dev/null +++ b/pkgs/development/libraries/haskell/dsp/default.nix @@ -0,0 +1,16 @@ +{ cabal, random }: + +cabal.mkDerivation (self: { + pname = "dsp"; + version = "0.2.3"; + sha256 = "1h7y3b2gwbkq97lv6f9a4zssyqs422g5zj2bi9mq1a5fzy5i4v4v"; + isLibrary = true; + isExecutable = true; + buildDepends = [ random ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/DSP"; + description = "Haskell Digital Signal Processing"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix index 5e55f3a6d59..7207bfbb185 100644 --- a/pkgs/development/libraries/haskell/errors/default.nix +++ b/pkgs/development/libraries/haskell/errors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "errors"; - version = "1.4.5"; - sha256 = "16m4psk1150319bd2hrswpp2h90l1hhh7w13arfhy4ylh8vscm4q"; + version = "1.4.6"; + sha256 = "1h8va76rhvs76ljdccxbmb659qk1slzkal118m85bw6lpy5wv6fi"; buildDepends = [ either safe transformers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix index 0665694212b..a206b7c186e 100644 --- a/pkgs/development/libraries/haskell/exceptions/default.nix +++ b/pkgs/development/libraries/haskell/exceptions/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "exceptions"; - version = "0.3.3"; - sha256 = "1gng8zvsljm6xrb5gy501f1dl47z171wkic8bsivhn4rgp9lby9l"; + version = "0.3.3.1"; + sha256 = "091frx3hmx7lq10z7f8q98pz0sa1lj23i7z4z98gh1980r525fah"; buildDepends = [ mtl transformers ]; testDepends = [ mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://github.com/ekmett/exceptions/"; description = "Extensible optionally-pure exceptions"; - license = "unknown"; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix index 53f6fdce41c..6e9ed486884 100644 --- a/pkgs/development/libraries/haskell/fay-base/default.nix +++ b/pkgs/development/libraries/haskell/fay-base/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fay-base"; - version = "0.19"; - sha256 = "03jf1ig3s2dcdd26j3d3iwm9hbiq5f5q5hyg22jdvl7lmvigw36j"; + version = "0.19.1"; + sha256 = "1b4v8l3adhcpply9yqk1pc1cgsvqlamvk60rvcb89kw5clrbvr4r"; buildDepends = [ fay ]; meta = { homepage = "https://github.com/faylang/fay-base"; diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index fdce9907056..ec5f0a48b87 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "fay"; - version = "0.19.0.2"; - sha256 = "025yhl32xr5fcsxval5rcj8jrgd6qnjq9bqbhbsr5ni8dz3ks5r3"; + version = "0.19.1.1"; + sha256 = "1jjv7l4x1bxr4whhcn4vh4b3ac4wfnb6l322jmdj60nh9sj8dzpf"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix index 0cd65bb1905..7a2b9e75e7f 100644 --- a/pkgs/development/libraries/haskell/filepath/default.nix +++ b/pkgs/development/libraries/haskell/filepath/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, QuickCheck, random }: cabal.mkDerivation (self: { pname = "filepath"; - version = "1.3.0.1"; - sha256 = "1ny8dz8rv883vg6hkzg3zank771cr2z9sfhii7aw4rfb71k29g5p"; + version = "1.3.0.2"; + sha256 = "0wvvz6cs5fh4f04a87b9s7xrnzypmnzzkn149p6xk8xi7gcvcpy2"; + testDepends = [ QuickCheck random ]; meta = { homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/"; description = "Library for manipulating FilePaths in a cross platform way"; diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix index f1a0554e380..3d7a1300b58 100644 --- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix +++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "filesystem-conduit"; - version = "1.0.0.1"; - sha256 = "04l8i97mr0jzkc7vc77j885n45qd2qyn5kmzxyckp3za96sjsqqw"; + version = "1.0.0.2"; + sha256 = "05dsl3bgyjciq6sgmba0hki7imilrjq3ddp9ip5gxl9884j1f4a1"; buildDepends = [ conduit systemFileio systemFilepath text transformers ]; @@ -14,7 +14,7 @@ cabal.mkDerivation (self: { ]; meta = { homepage = "http://github.com/snoyberg/conduit"; - description = "Use system-filepath data types with conduits"; + description = "Use system-filepath data types with conduits. (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix index 3b1c61574f0..926c2a812a0 100644 --- a/pkgs/development/libraries/haskell/foldl/default.nix +++ b/pkgs/development/libraries/haskell/foldl/default.nix @@ -1,10 +1,10 @@ -{ cabal, primitive, text, vector }: +{ cabal, primitive, text, transformers, vector }: cabal.mkDerivation (self: { pname = "foldl"; - version = "1.0.2"; - sha256 = "11cqmw102m2bskaknl8qr7hwyn94hfv2ind5fgvjw4hwgllr8v84"; - buildDepends = [ primitive text vector ]; + version = "1.0.3"; + sha256 = "0jl50bh7k8wp0nz0s0sb2zwh92yrgsm2l6szib41g7zq34mwamn9"; + buildDepends = [ primitive text transformers vector ]; meta = { description = "Composable, streaming, and efficient left folds"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index b57abc40e20..a336c2a7e2b 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "force-layout"; - version = "0.3.0.2"; - sha256 = "0zrvsrqwl0wjv38l6zl1pa09572njdbcfbvimhpp930629zk4yb7"; + version = "0.3.0.3"; + sha256 = "0xix9syfiya5wx0iwzs7sp3ksqyp15vjlpir71x8md8v0hkrnh5a"; buildDepends = [ dataDefaultClass lens vectorSpace vectorSpacePoints ]; diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 02c459c8e5c..260fff8ae82 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "3.1.6"; - sha256 = "1z8fzh08f38cxplf14sflpgrazlwzz6q73lvxm37xyp7gww2prhi"; + version = "3.1.7"; + sha256 = "1mv6m1fcqkm4i27jw1aniwfq2dhpn4m7kicyq4l70zmkfr7y7c5s"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix index 58ad2765f6b..d42c4c84bf1 100644 --- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix +++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix @@ -1,10 +1,10 @@ -{ cabal, glib, gtk3, mtl, transformers, webkitgtk3 }: +{ cabal, ghcjsBase, mtl }: cabal.mkDerivation (self: { pname = "ghcjs-dom"; - version = "0.0.4"; - sha256 = "1a3dv2l3s3aifcpivmnv308k2a1kb7r4x0z9gi83wc4xr9a8f08w"; - buildDepends = [ glib gtk3 mtl transformers webkitgtk3 ]; + version = "0.0.6"; + sha256 = "0c27mf5cjvw5q4lwbmi245q4y09b61y5s6hxsfzgdn4lhfbvdma6"; + buildDepends = [ ghcjsBase mtl ]; meta = { description = "DOM library that supports both GHCJS and WebKitGTK"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/gnuplot/default.nix b/pkgs/development/libraries/haskell/gnuplot/default.nix index 8390ef2520a..f835410dbbd 100644 --- a/pkgs/development/libraries/haskell/gnuplot/default.nix +++ b/pkgs/development/libraries/haskell/gnuplot/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gnuplot"; - version = "0.5.2"; - sha256 = "11gma33bikx97jra04vgnhikylw9wm1l37hdrsknl7mgk2qbrs74"; + version = "0.5.2.2"; + sha256 = "0l5hi346bhs9w11i3z6yy4mcr3k50xcp3j31g6wza9grxlfqc5av"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index 519b24668ae..74cfc453099 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.3.2.8"; - sha256 = "043anrsilhd6mgc7c5qb6b7rkdf60xfgzzjn38zk6v0f41lvff99"; + version = "0.3.3"; + sha256 = "1f40dyrdb9c5iysmclql75l86zg3iisnyyiq5fkgixdafzsq31ir"; buildDepends = [ aeson Cabal dataLens dataLensTemplate filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 718f2088ff2..77ebf3fd9af 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.13.0.6"; - sha256 = "1h34bmcb9bqkagcx3iqnp4l8z8qhngf00mki4hpk905znja6hib9"; + version = "0.13.1"; + sha256 = "0v9c5hhybn617nmjswqkjrf7bjb5073achfi05ivw1gblbvsj0ir"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index b060d3c6efe..563372fa451 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hjsmin"; - version = "0.1.4.5"; - sha256 = "0lzqs20kyngbjc7wqq347b1caj0hbf29dvdpxghfpjbrgyvyqh74"; + version = "0.1.4.6"; + sha256 = "0z0wzgwm66ckq9h756s7srfyiv2jia9779yi86cn1zgzr8dwspvr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { blazeBuilder Cabal HUnit languageJavascript QuickCheck testFramework testFrameworkHunit text ]; + jailbreak = true; meta = { homepage = "http://github.com/alanz/hjsmin"; description = "Haskell implementation of a javascript minifier"; diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index 1b9cbd08978..28edba11cac 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -1,16 +1,17 @@ { cabal, ansiTerminal, deepseq, filepath, hspecExpectations, HUnit -, QuickCheck, quickcheckIo, random, setenv, time, transformers +, QuickCheck, quickcheckIo, random, setenv, tfRandom, time +, transformers }: cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.8.3"; - sha256 = "12d254snnv8i1qqybsp6yzbqdxjf1wx8d29ja3lazb3kx12qwawd"; + version = "1.9.0"; + sha256 = "1jvx748aay8ln23p382y03gk6hc19f3z62za4326i0d3cyapfqdv"; isLibrary = true; isExecutable = true; buildDepends = [ ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck - quickcheckIo random setenv time transformers + quickcheckIo random setenv tfRandom time transformers ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 984a046f501..0c41ab471f8 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -1,22 +1,22 @@ { cabal, ansiTerminal, deepseq, doctest, filepath, ghcPaths , hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo -, random, setenv, silently, time, transformers +, random, setenv, silently, tfRandom, time, transformers }: cabal.mkDerivation (self: { pname = "hspec"; - version = "1.8.3"; - sha256 = "0k5l8r54nc0q5x3czdfxkwa606qnli3a6qm2xd3r5yl5bnz6hzh8"; + version = "1.9.0"; + sha256 = "01nwxx63l9cl1smld7pwm59k6shs865iiy1jqwi97lkhzhy9cvhl"; isLibrary = true; isExecutable = true; buildDepends = [ ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck - quickcheckIo random setenv time transformers + quickcheckIo random setenv tfRandom time transformers ]; testDepends = [ ansiTerminal deepseq doctest filepath ghcPaths hspecExpectations - hspecMeta HUnit QuickCheck quickcheckIo random setenv silently time - transformers + hspecMeta HUnit QuickCheck quickcheckIo random setenv silently + tfRandom time transformers ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index 3f7b2ad507a..bff7c352175 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -1,15 +1,14 @@ -{ cabal, conduit, filesystemConduit, hspec, HUnit, resourcet -, systemFilepath, tagstreamConduit, text, transformers, xmlConduit -, xmlTypes +{ cabal, conduit, hspec, HUnit, resourcet, systemFilepath +, tagstreamConduit, text, transformers, xmlConduit, xmlTypes }: cabal.mkDerivation (self: { pname = "html-conduit"; - version = "1.1.0.1"; - sha256 = "0v3zlassakc34i7kzajx63s1rxn516xv7lrib0a4kn4cdlqn7kxs"; + version = "1.1.0.2"; + sha256 = "12a5hb9sf4sd11sjhwwp84k8whkxs7hqfyni2hi247fii2ldkfax"; buildDepends = [ - conduit filesystemConduit resourcet systemFilepath tagstreamConduit - text transformers xmlConduit xmlTypes + conduit resourcet systemFilepath tagstreamConduit text transformers + xmlConduit xmlTypes ]; testDepends = [ hspec HUnit xmlConduit ]; meta = { diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index ff21e12bb43..87a48bbdd39 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.2.2.2"; - sha256 = "1pn38vqbb8ff3gmwkzb8a2fika2rdymnlglpi3q7yn0jsvxl5xli"; + version = "0.2.2.3"; + sha256 = "0li4mfw5lm0y0m3l3r7cbmhbch7ap9n2067jqw1l0qjm8s74nqkh"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq failure httpTypes network publicsuffixlist diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 3605425436e..1e1b0117a2f 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.3.1"; - sha256 = "1xayhjrs6nm7gm5xc6z6vhzi9iq5czdvpywamkncivjsxjlc50b8"; + version = "0.3.1.1"; + sha256 = "02aksdkwhdxzc4kk7j3npbiqpm9px3yva0375mk1b1f2g552g5jj"; buildDepends = [ async basicPrelude blazeBuilder caseInsensitive conduit dataDefaultClass httpClient httpTypes liftedBase monadControl diff --git a/pkgs/development/libraries/haskell/language-ecmascript/default.nix b/pkgs/development/libraries/haskell/language-ecmascript/default.nix index 77165ef104d..79404ffbcf0 100644 --- a/pkgs/development/libraries/haskell/language-ecmascript/default.nix +++ b/pkgs/development/libraries/haskell/language-ecmascript/default.nix @@ -1,14 +1,15 @@ { cabal, dataDefaultClass, Diff, filepath, HUnit, mtl, parsec , QuickCheck, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, uniplate, wlPprint +, testFrameworkQuickcheck2, testingFeat, uniplate, wlPprint }: cabal.mkDerivation (self: { pname = "language-ecmascript"; - version = "0.15.4"; - sha256 = "1drivy75lvrwjx7irdbnnqp7y6mbzbm2pbxy7zzc1nfln6g3k9x7"; + version = "0.16"; + sha256 = "1gz0089llxfmq9v2j5hp85h7w2vw50sgbl6dcd7i0s8m5zd3dmqg"; buildDepends = [ - dataDefaultClass Diff mtl parsec QuickCheck uniplate wlPprint + dataDefaultClass Diff mtl parsec QuickCheck testingFeat uniplate + wlPprint ]; testDepends = [ dataDefaultClass Diff filepath HUnit mtl parsec QuickCheck diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 7c347f69ce4..427cf681d2e 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,5 +1,5 @@ -{ cabal, aeson, bifunctors, comonad, constraints, contravariant -, deepseq, distributive, doctest, exceptions, filepath +{ cabal, aeson, bifunctors, comonad, contravariant, deepseq +, distributive, doctest, exceptions, filepath, free , genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel , primitive, profunctors, QuickCheck, reflection, scientific , semigroupoids, semigroups, simpleReflect, split, tagged @@ -10,11 +10,11 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "4.0.5"; - sha256 = "1kjmi76zpkhkwn514inhpfhfh3pg5na1f2zw1faqnk3bylpp9h6g"; + version = "4.1"; + sha256 = "0fsl2cydmkj2k49z3cgv6hfgrlkmx7zsy0ikp4k5jn2kp3hs77dw"; buildDepends = [ - aeson bifunctors comonad constraints contravariant distributive - exceptions filepath hashable mtl parallel primitive profunctors + aeson bifunctors comonad contravariant distributive exceptions + filepath free hashable mtl parallel primitive profunctors reflection scientific semigroupoids semigroups split tagged text transformers transformersCompat unorderedContainers utf8String vector void zlib diff --git a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix new file mode 100644 index 00000000000..b30b0714d1f --- /dev/null +++ b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix @@ -0,0 +1,21 @@ +{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd-journal, text +, transformers, uniplate, unixBytestring, unorderedContainers, uuid +, vector +}: + +cabal.mkDerivation (self: { + pname = "libsystemd-journal"; + version = "1.1.0"; + sha256 = "0zdql5y40d0d044mwbsr3xxmfzgnnp02a36wbbslxmrm5c3w1qi2"; + buildDepends = [ + hashable hsyslog pipes pipesSafe text transformers uniplate + unixBytestring unorderedContainers uuid vector + ]; + extraLibraries = [ systemd-journal ]; + meta = { + homepage = "http://github.com/ocharles/libsystemd-journal"; + description = "Haskell bindings to libsystemd-journal"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index b57879085bf..f0dac623a98 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "linear"; - version = "1.9.0.1"; - sha256 = "1ibdv1915rqz6dp8qg1nipnwwk345n4c5n51i8nn1h7p7jp53hhs"; + version = "1.9.1"; + sha256 = "17jvqy2nbcra36fzkwbjkfwg6mjw804zd1i50mhbqwg9j7z4s5sb"; buildDepends = [ adjunctions binary distributive hashable lens reflection semigroupoids semigroups tagged transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/list-tries/default.nix b/pkgs/development/libraries/haskell/list-tries/default.nix index 4eb91c67a47..a7d2a963e0d 100644 --- a/pkgs/development/libraries/haskell/list-tries/default.nix +++ b/pkgs/development/libraries/haskell/list-tries/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "list-tries"; - version = "0.5.1"; - sha256 = "15lbq41rikj5vm9gfgjxz98pamnib4dcs48fr2vm9r3s3fikd2kz"; + version = "0.5.2"; + sha256 = "0lfl35i1k3nnv8q6bhwq4sr197fylin2hmxa4b96kfcc22xfzwy6"; isLibrary = true; isExecutable = true; buildDepends = [ binary dlist ]; diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix similarity index 86% rename from pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix rename to pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix index 200d8d00b44..bfa0ed43d0e 100644 --- a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.1.0.nix +++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "llvm-general-pure"; - version = "3.4.1.0"; - sha256 = "0cjzqw9k6x8akbgx4rdigvhjhfv9zlq40p789invdc514qmxhr6q"; + version = "3.4.2.2"; + sha256 = "0grbw0lamp0w4jzxg97jccl3jqdgqfgldpb4llvhr1l70591b0s8"; buildDepends = [ mtl parsec setenv transformers ]; testDepends = [ HUnit mtl QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix similarity index 88% rename from pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix rename to pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix index b86a65618cd..43a346ebf19 100644 --- a/pkgs/development/libraries/haskell/llvm-general/3.4.1.0.nix +++ b/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "llvm-general"; - version = "3.4.1.0"; - sha256 = "0vh0bqkkahafhiv1sqvrncxswvz4rvb2zfwf33936fnnh5vn8vyp"; + version = "3.4.2.2"; + sha256 = "1dqdvv8pslblavyi14xy0bgrr1ca8d1jqp60x16zgbzkk3f2jx6a"; buildDepends = [ llvmGeneralPure mtl parsec setenv transformers utf8String ]; diff --git a/pkgs/development/libraries/haskell/ltk/default.nix b/pkgs/development/libraries/haskell/ltk/default.nix index 7960395eb09..df1e4be218f 100644 --- a/pkgs/development/libraries/haskell/ltk/default.nix +++ b/pkgs/development/libraries/haskell/ltk/default.nix @@ -1,10 +1,12 @@ -{ cabal, Cabal, filepath, glib, gtk, mtl, parsec, transformers }: +{ cabal, Cabal, filepath, glib, gtk3, mtl, parsec, transformers }: cabal.mkDerivation (self: { pname = "ltk"; - version = "0.12.1.0"; - sha256 = "12x6nba5bll8fgzpxii1cf87j27jk4mn5gf1bx4ahd9v30h1a0h6"; - buildDepends = [ Cabal filepath glib gtk mtl parsec transformers ]; + version = "0.13.1.0"; + sha256 = "09ryyzjd3iazwiw714hsny2b9f4b1cfhyzc11k5xzin5kh5d804a"; + buildDepends = [ + Cabal filepath glib gtk3 mtl parsec transformers + ]; meta = { homepage = "http://www.leksah.org"; description = "Leksah tool kit"; diff --git a/pkgs/development/libraries/haskell/lzma-enumerator/default.nix b/pkgs/development/libraries/haskell/lzma-enumerator/default.nix new file mode 100644 index 00000000000..f931262a91e --- /dev/null +++ b/pkgs/development/libraries/haskell/lzma-enumerator/default.nix @@ -0,0 +1,22 @@ +{ cabal, bindingsDSL, enumerator, HUnit, lzma, mtl, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "lzma-enumerator"; + version = "0.1.3"; + sha256 = "0pzz8bf6310p23pmsa013i8vib0xsfvlkj7zp0w9xs2xsi4j7jk1"; + buildDepends = [ bindingsDSL enumerator mtl ]; + testDepends = [ + enumerator HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + extraLibraries = [ lzma ]; + jailbreak = true; + meta = { + homepage = "http://github.com/alphaHeavy/lzma-enumerator"; + description = "Enumerator interface for lzma/xz compression"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/midi/default.nix b/pkgs/development/libraries/haskell/midi/default.nix index e50843c6ff2..9467b567f82 100644 --- a/pkgs/development/libraries/haskell/midi/default.nix +++ b/pkgs/development/libraries/haskell/midi/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "midi"; - version = "0.2.1"; - sha256 = "0i767y0835979s9i3wm8qwzh2awhhmfvhc5zvq2lkn8xlsp3wa6y"; + version = "0.2.1.1"; + sha256 = "11h4kr9a1jia1ghcyzgavcznw4771l00z736iibjpagw0b8fpip5"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index 5119863500d..a1de3e9ad16 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -1,15 +1,16 @@ -{ cabal, comonad, foldl, hashable, hspec, QuickCheck, semigroupoids -, semigroups, text, transformers, unorderedContainers, vector -, vectorAlgorithms, vectorInstances +{ cabal, comonad, dlist, dlistInstances, foldl, hashable, hspec +, QuickCheck, semigroupoids, semigroups, text, transformers +, unorderedContainers, vector, vectorAlgorithms, vectorInstances }: cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.4.0.1"; - sha256 = "049skbjwz49c9qz2nys2hn6pc4gqn1a91b5kl9z6hjs9fnaic6ng"; + version = "0.4.0.3"; + sha256 = "04g2ihk4n71zrz09si2k8j46y53i5vllps9xizgs0bmikmrgh29f"; buildDepends = [ - comonad hashable semigroupoids semigroups text transformers - unorderedContainers vector vectorAlgorithms vectorInstances + comonad dlist dlistInstances hashable semigroupoids semigroups text + transformers unorderedContainers vector vectorAlgorithms + vectorInstances ]; testDepends = [ foldl hspec QuickCheck semigroups text transformers diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index 9fb5d334a4d..4fac81b01f9 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "numeric-prelude"; - version = "0.4.0.3"; - sha256 = "0lgjnkvbz14cqsm5fjafl8g5mkclcdvpwa3kpz9radmg2x09rsnl"; + version = "0.4.1"; + sha256 = "1y1dg4bk811xmz3p23g8kjl6vxns3gs8qj671971c06nccfl1h5r"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/options/default.nix b/pkgs/development/libraries/haskell/options/default.nix new file mode 100644 index 00000000000..3772a142a58 --- /dev/null +++ b/pkgs/development/libraries/haskell/options/default.nix @@ -0,0 +1,16 @@ +{ cabal, chell, chellQuickcheck, monadsTf, transformers }: + +cabal.mkDerivation (self: { + pname = "options"; + version = "1.0"; + sha256 = "0d40d6k1c8v2b0bgchgl54sk9wx28kysp8bjws8bwjcmmd57775f"; + buildDepends = [ monadsTf transformers ]; + testDepends = [ chell chellQuickcheck monadsTf transformers ]; + doCheck = false; + meta = { + homepage = "https://john-millikin.com/software/haskell-options/"; + description = "A powerful and easy-to-use command-line option parser"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index 6f7ef601d61..da681b324a7 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -1,14 +1,16 @@ -{ cabal, HUnit, testFramework, testFrameworkHunit +{ cabal, ansiWlPprint, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 , testFrameworkThPrime, transformers }: cabal.mkDerivation (self: { pname = "optparse-applicative"; - version = "0.7.0.2"; - sha256 = "1pq620236x8fch9nkq4g4vganbzksnwj8z1bb80c2mwvf6sbg5ci"; - buildDepends = [ transformers ]; + version = "0.8.0.1"; + sha256 = "19k7jw9hrns5i8dr67jxadaqnj0cmn991hl00fwymg4awv34p1w3"; + buildDepends = [ ansiWlPprint transformers ]; testDepends = [ - HUnit testFramework testFrameworkHunit testFrameworkThPrime + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 testFrameworkThPrime ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 1a61e5f76a0..a3faace8d49 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,17 +1,17 @@ { cabal, aeson, attoparsec, base64Bytestring, blazeHtml , blazeMarkup, conduit, hspec, liftedBase, monadControl -, monadLogger, pathPieces, poolConduit, resourcet, scientific +, monadLogger, pathPieces, resourcePool, resourcet, scientific , silently, sqlite, text, time, transformers, transformersBase , unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "persistent"; - version = "1.3.0.3"; - sha256 = "0p9h43wvm1l9va6s6p71y6r5ifgvbqz8ypc86pmzbphq6712jnsl"; + version = "1.3.0.4"; + sha256 = "09p7nf6dnjz83qp7invkmzcr55zglm0y54p8pb1y6acjpnw3glkl"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit - liftedBase monadControl monadLogger pathPieces poolConduit + liftedBase monadControl monadLogger pathPieces resourcePool resourcet scientific silently text time transformers transformersBase unorderedContainers vector ]; diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix index 7204286671e..d886d17478b 100644 --- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-attoparsec"; - version = "0.4.0.1"; - sha256 = "0f536x0l135b5pd14l6lri7kinwh2m4p7qw054lacw362y7004zf"; + version = "0.5.0"; + sha256 = "1xpqna850lxawx0m84lzaxwrwfw4vccr7jjf199ir7bmwwhqlr5h"; buildDepends = [ attoparsec pipes pipesParse text transformers ]; testDepends = [ attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index d1be8d1d896..56c4a5965e1 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -1,15 +1,15 @@ { cabal, aeson, attoparsec, base16Bytestring, blazeBuilder -, blazeTextual, cryptohash, HUnit, postgresqlLibpq, text, time -, transformers, uuid, vector +, blazeTextual, cryptohash, hashable, HUnit, postgresqlLibpq +, scientific, text, time, transformers, uuid, vector }: cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.4.0.2"; - sha256 = "0gx9jmmzv6aaa6z88i3j51f5hp153dbwzw3x7jx329c5pjp536g9"; + version = "0.4.2.0"; + sha256 = "0g31a7s2h9d6f3igvrddbr357sk4vabvg88mmvb194pps66y8zzn"; buildDepends = [ - aeson attoparsec blazeBuilder blazeTextual postgresqlLibpq text - time transformers uuid vector + aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq + scientific text time transformers uuid vector ]; testDepends = [ aeson base16Bytestring cryptohash HUnit text time vector diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix index 37fb26208f4..0d7b9d709c6 100644 --- a/pkgs/development/libraries/haskell/recaptcha/default.nix +++ b/pkgs/development/libraries/haskell/recaptcha/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "recaptcha"; - version = "0.1"; - sha256 = "de00e6e3aadd99a1cd036ce4b413ebe02d59c1b9cfd3032f122735cca1f25144"; + version = "0.1.0.1"; + sha256 = "0mk2vdvm5jz8jh8xc4alsly8c9msfis0drbgg89rck1y387z2njz"; buildDepends = [ HTTP network xhtml ]; meta = { homepage = "http://github.com/jgm/recaptcha/tree/master"; diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 913e77483e4..cb554314752 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.10"; - sha256 = "0mgwcgacf4ilyh54s862p8jqv1f42dkp287sdkpswyai1pxlvipz"; + version = "0.4.10.1"; + sha256 = "05skxqxhbmsyjn72w1c9n924d865wxadfsxlavk0nmbd7ygmnazb"; buildDepends = [ liftedBase mmorph monadControl mtl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/sample-frame/default.nix b/pkgs/development/libraries/haskell/sample-frame/default.nix index f8acbf1fda8..8e9478ed5e2 100644 --- a/pkgs/development/libraries/haskell/sample-frame/default.nix +++ b/pkgs/development/libraries/haskell/sample-frame/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "sample-frame"; - version = "0.0.2"; - sha256 = "1k1fyslgw5vvn9a38mhp7c9j1xxf75ys010rcn2vr3pm6aj868sx"; + version = "0.0.3"; + sha256 = "0ivj0bcnqqc805np62bdpvh8v4ykmw86ph5rp7k54bbv9wd31bsv"; isLibrary = true; isExecutable = true; buildDepends = [ QuickCheck storableRecord ]; diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index e51c2a7a64c..278a26d1536 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "scotty"; - version = "0.6.2"; - sha256 = "0szki6wcmhj20kxhmgidgf930xwhiq03qrk8m0x8aklcjzkhvy69"; + version = "0.7.1"; + sha256 = "07aj74jq0hh86ik4x5p5q65b47q44rrnd6mkp039wj9l6dmyrv3c"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes mtl regexCompat text transformers wai waiExtra warp diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index f7505c62fc1..3e769f5e601 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.11.3"; - sha256 = "0j4b9fd60kvkayf5zgr8d8w0i4k8ly2v0vnfg80k0lkwpka7nwzl"; + version = "0.11.4"; + sha256 = "0gkj7zdy500zf58yscr5fq1ghj0kb3hywcv97r1xmi6ydccgf4ni"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix index 48f12cd8825..e233dc60cc0 100644 --- a/pkgs/development/libraries/haskell/singletons/default.nix +++ b/pkgs/development/libraries/haskell/singletons/default.nix @@ -1,10 +1,13 @@ -{ cabal, mtl, syb, thDesugar }: +{ cabal, Cabal, constraints, filepath, mtl, tasty, tastyGolden +, thDesugar +}: cabal.mkDerivation (self: { pname = "singletons"; - version = "0.9.3"; - sha256 = "0m90k3ygm04c0gjfiaw5rmajyn2yz0ldcqm2xmm39d10270skpb4"; - buildDepends = [ mtl syb thDesugar ]; + version = "0.10.0"; + sha256 = "14vnkw9ihrs3xg3lhb3wkyfz59lsaz4c3iqh3hqy7x9gmifgggwr"; + buildDepends = [ mtl thDesugar ]; + testDepends = [ Cabal constraints filepath tasty tastyGolden ]; noHaddock = true; meta = { homepage = "http://www.cis.upenn.edu/~eir/packages/singletons"; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 7bc8d6e4b57..351e8d94323 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.9.6.0"; - sha256 = "0v5bp8dw867gq92p3qw3h2yv6bhr2b7gy72rs26m9crk2dsfx9pa"; + version = "0.9.6.1"; + sha256 = "1wfjkbck2dc4a1nxz62yprf68g66m9vhvxihn9c5xypxjpgj2r9k"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator bytestringMmap caseInsensitive deepseq enumerator filepath hashable diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 3a656d65b33..3d361a69b87 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.2.2"; - sha256 = "097bv45646g5qanc5ik0lpfm8g7zd1f5ymlxkilgcnvc72wiwkjm"; + version = "0.13.2.4"; + sha256 = "1806nd6gzih66c9gg2iz3dxr4qcd4jkgamz8pv9x3zkk7n5jqga0"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index ee808800c55..d62033e8d16 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagged"; - version = "0.7"; - sha256 = "1g78hl6sib1mhg016gy3fqw78x72jsgqizsgim8a1pysjzq0y6zm"; + version = "0.7.1"; + sha256 = "036k5k44971fq6zdxc36kkic9ma93mcas7zk48i32s60iznnfc6v"; meta = { homepage = "http://github.com/ekmett/tagged"; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; diff --git a/pkgs/development/libraries/haskell/tagshare/default.nix b/pkgs/development/libraries/haskell/tagshare/default.nix new file mode 100644 index 00000000000..be56d518121 --- /dev/null +++ b/pkgs/development/libraries/haskell/tagshare/default.nix @@ -0,0 +1,13 @@ +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "tagshare"; + version = "0.0"; + sha256 = "1q3chp1rmwmxa8rxv7548wsvbqbng6grrnv1587p08385sp4ncfj"; + buildDepends = [ mtl ]; + meta = { + description = "TagShare - explicit sharing with tags"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix index 86ee3437cbb..ee848359509 100644 --- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix @@ -1,10 +1,10 @@ -{ cabal, QuickCheck, random, tagged, tasty }: +{ cabal, QuickCheck, tagged, tasty }: cabal.mkDerivation (self: { pname = "tasty-quickcheck"; - version = "0.8"; - sha256 = "10d7chqrlp1fjphnkiykxd22g4mfp69kmihd705sxb0y0mrdfh8x"; - buildDepends = [ QuickCheck random tagged tasty ]; + version = "0.8.0.3"; + sha256 = "0dng415dsdg86rliwmz5hpn2111cn0x494c0vmdmzv5qgvx5naf6"; + buildDepends = [ QuickCheck tagged tasty ]; meta = { description = "QuickCheck support for the Tasty test framework"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 6fcdf9a4cb3..706053a3e03 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.8"; - sha256 = "12r8ml45r1dq3vmjkibxkla5rmmyrm11js26kmkha110ji8hnflg"; + version = "0.8.0.2"; + sha256 = "0xn0qc1d7bq8s7988x58snq5ipvmi7g87rg89r1l21yxl6a85zw5"; buildDepends = [ ansiTerminal async deepseq mtl optparseApplicative regexTdfa stm tagged unboundedDelays diff --git a/pkgs/development/libraries/haskell/testing-feat/default.nix b/pkgs/development/libraries/haskell/testing-feat/default.nix new file mode 100644 index 00000000000..5e6a8177d1a --- /dev/null +++ b/pkgs/development/libraries/haskell/testing-feat/default.nix @@ -0,0 +1,13 @@ +{ cabal, mtl, QuickCheck, tagshare }: + +cabal.mkDerivation (self: { + pname = "testing-feat"; + version = "0.4.0.1"; + sha256 = "1fqp5k8kwnn7qqggyy5scsxmkvd1pibc5sfs7v1myrp0azkc25cp"; + buildDepends = [ mtl QuickCheck tagshare ]; + meta = { + description = "Functional Enumeration of Algebraic Types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/tf-random/default.nix b/pkgs/development/libraries/haskell/tf-random/default.nix new file mode 100644 index 00000000000..3ff0b2d9b84 --- /dev/null +++ b/pkgs/development/libraries/haskell/tf-random/default.nix @@ -0,0 +1,13 @@ +{ cabal, primitive, random, time }: + +cabal.mkDerivation (self: { + pname = "tf-random"; + version = "0.4"; + sha256 = "0yi7699zswpsn9a39ccqkyd0117sppjnqggclnhs1wm7ql1glc27"; + buildDepends = [ primitive random time ]; + meta = { + description = "High-quality splittable pseudorandom number generator"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/th-desugar/default.nix b/pkgs/development/libraries/haskell/th-desugar/default.nix index f3aa1628aae..42ff1d78198 100644 --- a/pkgs/development/libraries/haskell/th-desugar/default.nix +++ b/pkgs/development/libraries/haskell/th-desugar/default.nix @@ -1,10 +1,11 @@ -{ cabal, mtl, syb }: +{ cabal, hspec, HUnit, mtl, syb }: cabal.mkDerivation (self: { pname = "th-desugar"; - version = "1.2.1"; - sha256 = "12a8m1vzfbn728psaiqxwngmksrbybci3g7a47z04rjbsjf3cy4v"; + version = "1.3.0"; + sha256 = "1wfypk1hcxr2918qp63df5xlx00rqwnaa59mivnlqs558g4kjx6j"; buildDepends = [ mtl syb ]; + testDepends = [ hspec HUnit mtl syb ]; meta = { homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; description = "Functions to desugar Template Haskell"; diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix index 4cce59f6165..6a0e81383f7 100644 --- a/pkgs/development/libraries/haskell/timezone-olson/default.nix +++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "timezone-olson"; - version = "0.1.3"; - sha256 = "02x3wq03h2zjhxrcv6vnq9hrzggdvpnj7zj8rcrq4scf67q6h8gc"; + version = "0.1.4"; + sha256 = "1l5j6gqi9vlx7sifn7vv3by4z9ha3h6klfds4ywqv3dv0gh5725k"; buildDepends = [ binary extensibleExceptions time timezoneSeries ]; meta = { homepage = "http://projects.haskell.org/time-ng/"; diff --git a/pkgs/development/libraries/haskell/tls/1.2.2.nix b/pkgs/development/libraries/haskell/tls/1.2.3.nix similarity index 63% rename from pkgs/development/libraries/haskell/tls/1.2.2.nix rename to pkgs/development/libraries/haskell/tls/1.2.3.nix index 638299d4a42..5906413796d 100644 --- a/pkgs/development/libraries/haskell/tls/1.2.2.nix +++ b/pkgs/development/libraries/haskell/tls/1.2.3.nix @@ -1,5 +1,5 @@ -{ cabal, asn1Encoding, asn1Types, cereal, cipherAes, cipherRc4 -, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey +{ cabal, asn1Encoding, asn1Types, byteable, cereal, cipherAes +, cipherRc4, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey , cryptoPubkeyTypes, cryptoRandom, dataDefaultClass, mtl, network , QuickCheck, testFramework, testFrameworkQuickcheck2, time, x509 , x509Store, x509Validation @@ -7,12 +7,13 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "1.2.2"; - sha256 = "156l859mfpdax5rg1frwa5ms5bzggaja0mi795hh8i5c3ah7hfcp"; + version = "1.2.3"; + sha256 = "0vv81z5m223b90zzfp5dk376fh8yngyd8h9anrxjrqb4f3bycaxg"; buildDepends = [ - asn1Encoding asn1Types cereal cipherAes cipherRc4 cryptohash - cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom - dataDefaultClass mtl network x509 x509Store x509Validation + asn1Encoding asn1Types byteable cereal cipherAes cipherRc4 + cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes + cryptoRandom dataDefaultClass mtl network x509 x509Store + x509Validation ]; testDepends = [ cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass mtl diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix index a52f9fe04fb..73343bf307b 100644 --- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "unix-process-conduit"; - version = "0.2.2.2"; - sha256 = "0an4lwwkzr902r0rxa35i9kdm5cpgdfmg5m06zsxzbck3mry7871"; + version = "0.2.2.3"; + sha256 = "0ldgjwdvshggygxn9fpnxvb01dba0q0bn9f7iiw5xgqhli46nvcy"; buildDepends = [ conduit filepath stm time transformers ]; testDepends = [ conduit hspec transformers ]; meta = { homepage = "https://github.com/snoyberg/conduit"; - description = "Run processes on Unix systems, with a conduit interface"; + description = "Run processes on Unix systems, with a conduit interface (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 0ca4ea5f5c2..e329c1ef406 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.2.2"; sha256 = "0xnl12mscc5nwjl9s2lx4xr8q8agzcpxh3bmxxidfjrg19drfwrm"; testDepends = [ doctest hspec QuickCheck time ]; + configureFlags = self.stdenv.lib.optionalString self.enableSharedLibraries "--ghc-option=-fPIC"; meta = { description = "Unix time parser/formatter and utilities"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 3bcadc78a97..8a8ed40adb4 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.3"; - sha256 = "0x059mzw6v2xf92fdhy0ilyqbics2as6dqrdr6njpp0m6qykkybb"; + version = "4.7.5"; + sha256 = "0ahd5qjszfw1xbl5jxhzfw31mny8hp8clw9qciv15xn442prvvpr"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 412fd3f16e6..fec4d410c22 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,19 +1,22 @@ { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup -, cereal, cryptoApi, cryptoConduit, cryptohashCryptoapi, fileEmbed +, byteable, cmdargs, cryptohash, cryptohashConduit, fileEmbed , filepath, hspec, httpDate, httpTypes, mimeTypes, network , systemFileio, systemFilepath, text, time, transformers -, unixCompat, unorderedContainers, wai, waiTest, zlib +, unixCompat, unorderedContainers, wai, waiExtra, waiTest, warp +, zlib }: cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "2.0.0.3"; - sha256 = "0anbmp6wjk1qba1skr08fkm5y9lm58kfghzcgzgx8hrid7w85fb7"; + version = "2.0.0.5"; + sha256 = "0f18wwk0xrzbn9d6krjdcm71cyxl1pzzi5xqwzzc9xnq595m75wa"; + isLibrary = true; + isExecutable = true; buildDepends = [ - base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal - cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed filepath - httpDate httpTypes mimeTypes systemFileio systemFilepath text time - transformers unixCompat unorderedContainers wai zlib + base64Bytestring blazeBuilder blazeHtml blazeMarkup byteable + cmdargs cryptohash cryptohashConduit fileEmbed filepath httpDate + httpTypes mimeTypes systemFileio systemFilepath text time + transformers unixCompat unorderedContainers wai waiExtra warp zlib ]; testDepends = [ hspec httpDate httpTypes mimeTypes network text time transformers diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 50e4d983d75..df13922601c 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "2.1.0"; - sha256 = "14aj1c6i58jyg79y516sa2l39y4i7az3l5lp6fkxkgqgzl5dxs6c"; + version = "2.1.1"; + sha256 = "1bsc9sjmp9hspdif4f81iqjkcaflv6b7rd42g62qj790a4b70igf"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix index e496d5266db..005305d7709 100644 --- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wai-middleware-static"; - version = "0.4.0.2"; - sha256 = "0nw54h8baphjdwsd118g9j5w4g2mnb2hrny0n4ih4jlqlcqam3lf"; + version = "0.4.0.3"; + sha256 = "0nvzdj04g10bcay6x4y5l7gxx38gs3ns0izair8n1j1awrp8px07"; buildDepends = [ filepath httpTypes mtl text wai ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 1d7b184d6df..5e3a666726a 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -1,15 +1,15 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, cookie, hspec, httpTypes, HUnit, network, text +, conduit, cookie, deepseq, hspec, httpTypes, network, text , transformers, wai }: cabal.mkDerivation (self: { pname = "wai-test"; - version = "2.0.0.2"; - sha256 = "0085whb8jav2zasmgi8z62anm6i509lc2w0988vqlcrds7rrknc8"; + version = "2.0.1"; + sha256 = "0c803l3cz5bjf60l97sy1isxhnmbpzr5x39yhnck28r0vykycnrj"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie - httpTypes HUnit network text transformers wai + deepseq httpTypes network text transformers wai ]; testDepends = [ hspec wai ]; meta = { diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 7ebc7af3627..d08f8d6e545 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "2.1.1"; - sha256 = "1nldm0pq1q5m91mhss4h23dxdqwqmvfdmcpq5grc1rqjb88mgm25"; + version = "2.1.2"; + sha256 = "15630g8qzshn2620qsdki1nwr4bkapqz0k2bls0yxyblvw0fn9cf"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpDate httpTypes liftedBase network networkConduit simpleSendfile diff --git a/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch b/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch deleted file mode 100644 index 38551d24d43..00000000000 --- a/pkgs/development/libraries/haskell/wxHaskell/fix-bogus-pointer-assignment.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ubr wxc-0.90.0.4-orig/src/cpp/eljpen.cpp wxc-0.90.0.4/src/cpp/eljpen.cpp ---- wxc-0.90.0.4-orig/src/cpp/eljpen.cpp 2012-07-03 12:12:17.000000000 +0200 -+++ wxc-0.90.0.4/src/cpp/eljpen.cpp 2013-01-07 12:09:50.296417007 +0100 -@@ -156,7 +156,7 @@ - EWXWEXPORT(void,wxPen_GetStipple)(void* self,wxBitmap* _ref) - { - #if defined(__WXGTK__) -- *_ref = NULL; -+ _ref = NULL; - #else - *_ref = *(((wxPen*)self)->GetStipple()); - #endif -Only in wxc-0.90.0.4/src/cpp: eljpen.cpp.orig diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index dc030f68059..90bfdc5ca0a 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -2,9 +2,10 @@ cabal.mkDerivation (self: { pname = "wx"; - version = "0.90.0.1"; - sha256 = "116vlpssjcyzil99xmz3azc2vl97iban3gdpxd593q5gi24l838m"; + version = "0.90.1.0"; + sha256 = "1669mrd73c3v7c4yc0zgyqsnfgzb7561v1wd168y06d0db1nlkn9"; buildDepends = [ stm wxcore ]; + preConfigure = "find . -type f -exec touch {} +"; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index d95b07121af..7a9f05c6b62 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -2,15 +2,12 @@ cabal.mkDerivation (self: { pname = "wxc"; - version = "0.90.0.4"; - sha256 = "1bh20i1rb8ng0ni1v98nm8qv5wni19dvxwf5i3ijxhrxqdq4i7p6"; + version = "0.90.1.0"; + sha256 = "1j318pxn6wqjwhz5rinb8az1bkhasgm9rhb3l36dlbzwcc4p0a2a"; buildDepends = [ wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; - postInstall = '' - cp -v dist/build/libwxc.so.${self.version} $out/lib/libwxc.so - ''; - patches = [ ./fix-bogus-pointer-assignment.patch ]; noHaddock = true; + preConfigure = "find . -type f -exec touch {} +"; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index 5dde5e8fc3f..3ee5d9e2cdb 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -4,13 +4,11 @@ cabal.mkDerivation (self: { pname = "wxcore"; - version = "0.90.0.3"; - sha256 = "0d79hr6cz9zj3w57h6630nfnsmfq1w73gz04jjmlhwh8ih557imw"; + version = "0.90.1.0"; + sha256 = "0pyh5xc8f3rlyn66dawlijwym8nwac12qwh96hfkna0pbqg0995c"; buildDepends = [ filepath parsec stm time wxc wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; - patchPhase = '' - sed -i -e 's|containers >=.*|containers|' wxcore.cabal - ''; + preConfigure = "find . -type f -exec touch {} +"; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell core"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index 08512c20625..0f379401b35 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -1,15 +1,13 @@ -{ cabal, parsec, strict, time }: +{ cabal, filepath, parsec, strict, time }: cabal.mkDerivation (self: { pname = "wxdirect"; - version = "0.90.0.1"; - sha256 = "04jslgxw601g6wh8f2wrdnipzh6x0487kfxb89fkgfgjhxrkfyr3"; + version = "0.90.1.0"; + sha256 = "06r8z4css7md35rcbi805407dcabcrb1knif9f7445aphwzgadr0"; isLibrary = true; isExecutable = true; - buildDepends = [ parsec strict time ]; - patchPhase = '' - sed -i -e 's|containers >=.*|containers|' wxdirect.cabal - ''; + buildDepends = [ filepath parsec strict time ]; + preConfigure = "find . -type f -exec touch {} +"; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "helper tool for building wxHaskell"; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 35106292f85..e9a9c075c32 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.7.2"; - sha256 = "00dmmws0gmp9fb2ha6z055ix7jlsiry24bwhkl226b680gi9a84d"; + version = "0.8.8"; + sha256 = "0fv56x40ici6hx2dfy85fg7zy213mn82h84czhj4xbvjszg8wycw"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 50071e8cffe..e939b1e4ee7 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -1,26 +1,26 @@ { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit -, dataDefaultClass, fileEmbed, filepath, filesystemConduit -, fsnotify, ghcPaths, httpConduit, httpReverseProxy, httpTypes -, liftedBase, network, networkConduit, optparseApplicative, parsec -, projectTemplate, resourcet, shakespeare, shakespeareCss -, shakespeareJs, shakespeareText, split, systemFileio -, systemFilepath, tar, text, time, transformers, unixCompat -, unorderedContainers, wai, warp, yaml, zlib +, dataDefaultClass, fileEmbed, filepath, fsnotify, ghcPaths +, httpConduit, httpReverseProxy, httpTypes, liftedBase, network +, networkConduit, optparseApplicative, parsec, projectTemplate +, resourcet, shakespeare, shakespeareCss, shakespeareJs +, shakespeareText, split, systemFileio, systemFilepath, tar, text +, time, transformers, unixCompat, unorderedContainers, wai, warp +, yaml, zlib }: cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.7.1"; - sha256 = "1lbnn7lzgpw0xsbnlax41q5hqb1bv9irmncgjvv18y8mpf5zcncs"; + version = "1.2.7.3"; + sha256 = "05kbfnkigk4p1vjw0h1pkp7jfczjq99vgrsaz45faajadnhffnpz"; isLibrary = false; isExecutable = true; buildDepends = [ attoparsec base64Bytestring blazeBuilder Cabal conduit - dataDefaultClass fileEmbed filepath filesystemConduit fsnotify - ghcPaths httpConduit httpReverseProxy httpTypes liftedBase network - networkConduit optparseApplicative parsec projectTemplate resourcet - shakespeare shakespeareCss shakespeareJs shakespeareText split - systemFileio systemFilepath tar text time transformers unixCompat + dataDefaultClass fileEmbed filepath fsnotify ghcPaths httpConduit + httpReverseProxy httpTypes liftedBase network networkConduit + optparseApplicative parsec projectTemplate resourcet shakespeare + shakespeareCss shakespeareJs shakespeareText split systemFileio + systemFilepath tar text time transformers unixCompat unorderedContainers wai warp yaml zlib ]; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index bd1116267fa..2c3d378257f 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.7"; - sha256 = "1gkpx0d7hyvn45254aj40iy4k0bf3kkrvmxnw3q1mvqc3k1kdxqn"; + version = "1.2.9"; + sha256 = "0qd9x2pca2nx7yqz9whlvb0rjgf1zf9vw19j6z0p149yddgrrcyq"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index a42e0a50bc4..2f58cbb6408 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,15 +1,15 @@ { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup -, cryptoApi, dataDefault, emailValidate, hamlet, hspec, network +, byteable, dataDefault, emailValidate, hamlet, hspec, network , persistent, resourcet, shakespeareCss, shakespeareJs, text, time , transformers, wai, xssSanitize, yesodCore, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.7"; - sha256 = "01fv3c5db702nm9dk5ynvn5mf9vc4a1rkjn31zlw260jlgqy4vsn"; + version = "1.3.8"; + sha256 = "0cdpdgclhasdmynp9fhf9yhl33nwh71bmg344x51xkp5347w614b"; buildDepends = [ - aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi + aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate hamlet network persistent resourcet shakespeareCss shakespeareJs text time transformers wai xssSanitize yesodCore yesodPersistent diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index 42b55bcee6a..a96db23f952 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -1,15 +1,15 @@ -{ cabal, blazeBuilder, conduit, hspec, liftedBase, persistent -, persistentSqlite, persistentTemplate, poolConduit, resourcet -, text, transformers, waiTest, yesodCore +{ cabal, blazeBuilder, conduit, hspec, persistent, persistentSqlite +, persistentTemplate, resourcePool, resourcet, text, transformers +, waiTest, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.2.2.1"; - sha256 = "0vihd94yh4xipvz193p2fd1sqlbwdj0619l21gpdy307sng50kjn"; + version = "1.2.2.2"; + sha256 = "112wr85k8a7ah1m5s8b9h1dm3hbglckdhngp12d67rccrr4mmgjq"; buildDepends = [ - blazeBuilder conduit liftedBase persistent persistentTemplate - poolConduit resourcet transformers yesodCore + blazeBuilder conduit persistent persistentTemplate resourcePool + resourcet transformers yesodCore ]; testDepends = [ blazeBuilder conduit hspec persistent persistentSqlite text waiTest diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 757367b7393..7059e178bb6 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,5 +1,5 @@ -{ cabal, base64Bytestring, cereal, conduit, cryptoConduit -, cryptohashCryptoapi, dataDefault, fileEmbed, filepath, hjsmin +{ cabal, base64Bytestring, byteable, conduit, cryptohash +, cryptohashConduit, dataDefault, fileEmbed, filepath, hjsmin , hspec, httpTypes, HUnit, mimeTypes, processConduit, resourcet , shakespeareCss, systemFileio, systemFilepath, text, transformers , unixCompat, unorderedContainers, wai, waiAppStatic, waiTest @@ -8,17 +8,17 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.2.2.1"; - sha256 = "1dsr3gv6hf42islw2018y4yajvkd9j627fkdlz45309cyjns55jg"; + version = "1.2.2.2"; + sha256 = "156qqd2v3z7wv75jsfscs9cvbg1cl1riqcrhycrqcmapjprr2r12"; buildDepends = [ - base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi + base64Bytestring byteable conduit cryptohash cryptohashConduit dataDefault fileEmbed filepath hjsmin httpTypes mimeTypes processConduit resourcet shakespeareCss systemFileio systemFilepath text transformers unixCompat unorderedContainers wai waiAppStatic yesodCore ]; testDepends = [ - base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi + base64Bytestring byteable conduit cryptohash cryptohashConduit dataDefault fileEmbed filepath hjsmin hspec httpTypes HUnit mimeTypes processConduit resourcet shakespeareCss systemFileio systemFilepath text transformers unixCompat unorderedContainers wai diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index c4ad5b29acd..38a319a8745 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -1,19 +1,18 @@ { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup , caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit -, monadControl, network, persistent, poolConduit, text, time -, transformers, wai, waiTest, xmlConduit, xmlTypes, yesodCore -, yesodForm +, monadControl, network, persistent, text, time, transformers, wai +, waiTest, xmlConduit, xmlTypes, yesodCore, yesodForm }: cabal.mkDerivation (self: { pname = "yesod-test"; - version = "1.2.1"; - sha256 = "1f92q9wjj6npxfsjibw0qlg6pai721mwkjcadh121bwgrancflyr"; + version = "1.2.1.1"; + sha256 = "0rbavw67cfqyav6xakacag0sd0gixbz3sls06px6q6pnpzk9q9d4"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network - persistent poolConduit text time transformers wai waiTest - xmlConduit xmlTypes yesodCore + persistent text time transformers wai waiTest xmlConduit xmlTypes + yesodCore ]; testDepends = [ hspec htmlConduit HUnit text xmlConduit yesodCore yesodForm diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index 2ff2fac296d..6f874450fc5 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, perl, phonon, - gettext, pkgconfig, apr, aprutil, boost, qjson }: + gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }: stdenv.mkDerivation rec { - name = "kdevplatform-1.3.1"; + name = "kdevplatform-1.6.0"; src = fetchurl { - url = "mirror://kde/stable/kdevelop/4.3.1/src/${name}.tar.bz2"; - sha256 = "1fiqwabw5ilhw1jwvvr743dym12y3kxrs3zlqahz57yncdsglcl6"; + url = "mirror://kde/stable/kdevelop/4.6.0/src/${name}.tar.xz"; + sha256 = "cdf7c88ca8860258f46e41d2107c826a307212fd041345bee54fbd70c9794f80"; }; propagatedBuildInputs = [ kdelibs qt4 phonon ]; - buildInputs = [ apr aprutil subversion boost qjson ]; + buildInputs = [ apr aprutil subversion boost qjson grantlee ]; nativeBuildInputs = [ cmake automoc4 gettext pkgconfig ]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index c99059bf034..04d51edf531 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,8 +26,8 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_9 = libavFun "9.11" "1ad7vyxp0w8dw6ngc16fz0ngsjlgk6h8bpphghqia5sqkbl10ca3"; - libav_0_8 = libavFun "0.8.10" "0sxmj4qsd3ljygvdjz7ly46nf7sqmaqka4hx65b1jdji12al1djc"; + libav_9 = libavFun "9.12" "1wm0nf12c1p138y54jh71mvbpikrpk43zc9m2qhpjm9pgnagizk0"; + libav_0_8 = libavFun "0.8.11" "0nhm0mzz2aj78sgmw9xf20a1mlgig78cv1nyhx4zrq7nvgqf8d2r"; }; libavFun = version : sha256 : stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 70a882ff15c..d6c238ff179 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { description = "a simple library for processing structured configuration files"; license = licenses.lgpl3; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 6129ef42f3d..8975c4fa074 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Gigasampler file access library"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index a452cb7609e..db07775d45e 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -2,8 +2,8 @@ , phonon, libgcrypt }: let - mp_ = "2.1"; - version = "1.${mp_}-2"; + mp_ = "3.1"; + version = "1.${mp_}"; version4 = "4.${mp_}"; in stdenv.mkDerivation rec { @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { pname = "libktorrent"; src = fetchurl { - url = "http://ktorrent.org/downloads/${version4}/${name}.tar.bz2"; - sha256 = "1b4ibkba27ivvjsh5s93xwlcgzvvwsgl6mcd8g96d1al05n2ccw9"; + url = "${meta.homepage}/downloads/${version4}/${name}.tar.bz2"; + sha256 = "2fe11ccb4bf2028c3da11e52cde890f1b3a90560e548eac89a4f8e1558b09725"; }; nativeBuildInputs = [ cmake automoc4 gettext ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A BiTtorrent library used by KTorrent"; - homepage = http://ktorrent.org; + homepage = http://ktorrent.pwsp.net; inherit (kdelibs.meta) platforms; }; } diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index 33731e5d755..a1cbf9250c4 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "LinuxSampler Control Protocol (LSCP) wrapper library"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/readline/readline6.3.nix b/pkgs/development/libraries/readline/readline6.3.nix new file mode 100644 index 00000000000..2f99b9d7218 --- /dev/null +++ b/pkgs/development/libraries/readline/readline6.3.nix @@ -0,0 +1,49 @@ +{ fetchurl, stdenv, ncurses }: + +stdenv.mkDerivation (rec { + name = "readline-6.3"; + + src = fetchurl { + url = "mirror://gnu/readline/${name}.tar.gz"; + sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn"; + }; + + propagatedBuildInputs = [ncurses]; + + patchFlags = "-p0"; + + patches = + [ ./link-against-ncurses.patch ]; + + meta = { + description = "GNU Readline, a library for interactive line editing"; + + longDescription = '' + The GNU Readline library provides a set of functions for use by + applications that allow users to edit command lines as they are + typed in. Both Emacs and vi editing modes are available. The + Readline library includes additional functions to maintain a + list of previously-entered command lines, to recall and perhaps + reedit those lines, and perform csh-like history expansion on + previous commands. + + The history facilites are also placed into a separate library, + the History library, as part of the build process. The History + library may be used without Readline in applications which + desire its capabilities. + ''; + + homepage = http://savannah.gnu.org/projects/readline/; + + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} + +// + +# Don't run the native `strip' when cross-compiling. +(if (stdenv ? cross) + then { dontStrip = true; } + else { })) diff --git a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix b/pkgs/development/libraries/ruby_ncursesw_sup/default.nix index 67041ad0607..8d55bafeb20 100644 --- a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix +++ b/pkgs/development/libraries/ruby_ncursesw_sup/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, ncurses, ruby, rubygems }: stdenv.mkDerivation rec { - name = ''ncursesw-sup-afd962b9c06108ff0643e98593c5605314d76917''; + name = "ncursesw-sup-${version}"; + version = "1.4.6"; src = fetchurl { - url = "https://github.com/sup-heliotrope/ncursesw-ruby/archive/afd962b9c06108ff0643e98593c5605314d76917.tar.gz"; - sha256 = "13i286p4bm8zqg9xh96a1dg7wkywj9m6975gbh3w43d3rmfc1h6a"; + url = "https://github.com/sup-heliotrope/ncursesw-ruby/archive/v${version}.tar.gz"; + sha256 = "1fzmj5kqh2aql7r7jys8cyf7mb78kz71yc4a6gh74h9s8pybyhh7"; }; meta = { @@ -32,12 +33,12 @@ stdenv.mkDerivation rec { # For some reason, the installation phase doesn't work with the default # make install command run by gem (we'll fix it and do it ourselves later) gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \ - --bindir "$out/bin" --no-rdoc --no-ri ncursesw-sup-1.3.1.2.gem || true + --bindir "$out/bin" --no-rdoc --no-ri ncursesw-${version}.gem || true # Needed for ruby to recognise the gem cp ncursesw.gemspec "$out/${ruby.gemPath}/specifications" - cd "$out/${ruby.gemPath}/gems/ncursesw-sup-1.3.1.2" + cd "$out/${ruby.gemPath}/gems/ncursesw-${version}" mkdir src mv lib src sed -i "s/srcdir = ./srcdir = src/" Makefile diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 63733a35b20..2fd5c9ad493 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; - + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 0f2326420cb..8f122cb699a 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "A lightweight C library for storing RDF data in memory"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; - + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 0153cfa62ac..e1129d25ef4 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; + # Workaround to make the python wrapper not drop this package: + # pythonFull.override { extraLibs = [ thrift ]; } + pythonPath = []; + buildInputs = [ boost zlib libevent openssl python automake autoconf libtool pkgconfig bison flex diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index c1960d4706e..f1bf39a283d 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,20 +1,20 @@ -{stdenv, fetchurl, ncurses, ocaml, findlib, ocaml_pcre, camlzip, openssl, ocaml_ssl, lablgtk, cryptokit }: +{stdenv, fetchurl, ncurses, ocaml, findlib, ocaml_pcre, camlzip, openssl, ocaml_ssl, cryptokit }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; in stdenv.mkDerivation { - name = "ocamlnet-3.6.3"; + name = "ocamlnet-3.7.3"; src = fetchurl { - url = http://download.camlcity.org/download/ocamlnet-3.6.3.tar.gz; - sha256 = "c62fe0a4db6c63c04e24c8d76bcb504054f0b59a7a41c1abcbb8dd504afc9f29"; + url = http://download.camlcity.org/download/ocamlnet-3.7.3.tar.gz; + sha256 = "0s24icyrxkqqai91rgxpf52s1fx70j7p12c8vq9vcmvdhll6kp2d"; }; - buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl lablgtk cryptokit]; + buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl cryptokit]; - propagatedbuildInputs = [ncurses ocaml_pcre camlzip openssl ocaml_ssl lablgtk cryptokit]; + propagatedbuildInputs = [ncurses ocaml_pcre camlzip openssl ocaml_ssl cryptokit]; patches = [ ./configure.patch ]; diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index 6c128c25073..883be6a8d41 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.7.1.4"; - sha256 = "000vdvm38a3d3jpjg3cgsfl11w8jzvl0haqz78fy3zblqlndxy1m"; + version = "0.7.1.6"; + sha256 = "1nj70f7ki6wxvjm5ra83xr2yymfsakb5kg2q1dl54hvxsd0wqcw7"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 860148cf244..72ba1ba6b87 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -1,15 +1,16 @@ -{ cabal, cpphs, filepath, haskellSrcExts, hscolour, transformers -, uniplate +{ cabal, cmdargs, cpphs, filepath, haskellSrcExts, hscolour +, transformers, uniplate }: cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.57"; - sha256 = "062fpyjd3mha9faxdpg763sigafl4mvl8qqw3z31zkafz361qzm4"; + version = "1.8.59"; + sha256 = "14yn63zbbqwvxlis0kwga4mrz6qjr8kq1cq7f0rcilgqgh1dkwh8"; isLibrary = true; isExecutable = true; buildDepends = [ - cpphs filepath haskellSrcExts hscolour transformers uniplate + cmdargs cpphs filepath haskellSrcExts hscolour transformers + uniplate ]; jailbreak = true; meta = { diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 0d3eb5c824f..b3a86a03d97 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -8,7 +8,7 @@ let - basename = "gdb-7.6.2"; + basename = "gdb-7.7"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -27,9 +27,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.bz2"; - sha256 = "1s6hjqmq7xz10hqx45dgrpfh5mla578shn3zxgnrsv66w4n0wsig"; + sha256 = "08vcb97j1b7vxwq6088wb6s3g3bm8iwikd922y0xsgbbxv3d2104"; }; + patches = [ ./edit-signals.patch ]; + # I think python is not a native input, but I leave it # here while I will not need it cross building nativeBuildInputs = [ texinfo python ] diff --git a/pkgs/development/tools/misc/gdb/edit-signals.patch b/pkgs/development/tools/misc/gdb/edit-signals.patch new file mode 100644 index 00000000000..e9da8035ef5 --- /dev/null +++ b/pkgs/development/tools/misc/gdb/edit-signals.patch @@ -0,0 +1,25 @@ +Patch adapted from +https://www.sourceware.org/ml/gdb-patches/2012-08/msg00439.html + +Without it, spawning a terminal 'vim' from gdb 'edit' cmd, makes +all gdb grazy. + +diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c +index 7ea0fec..be5455c 100644 +--- a/gdb/tui/tui-win.c ++++ b/gdb/tui/tui-win.c +@@ -831,11 +831,12 @@ void + tui_initialize_win (void) + { + #ifdef SIGWINCH +-#ifdef HAVE_SIGACTION ++#if defined (HAVE_SIGACTION) && defined (SA_RESTART) + struct sigaction old_winch; + +- memset (&old_winch, 0, sizeof (old_winch)); ++ sigemptyset (&old_winch.sa_mask); + old_winch.sa_handler = &tui_sigwinch_handler; ++ old_winch.sa_flags = SA_RESTART; + sigaction (SIGWINCH, &old_winch, NULL); + #else + signal (SIGWINCH, &tui_sigwinch_handler); diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index bbe21378248..90f7647aa05 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { description = "A WebDriver server for running Selenium tests on Chrome"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix new file mode 100755 index 00000000000..009d07d4456 --- /dev/null +++ b/pkgs/games/planetaryannihilation/default.nix @@ -0,0 +1,54 @@ +{ stdenv, config, fetchurl, patchelf, makeWrapper, xlibs, gtk, glib, udev, alsaLib, atk +, nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }: + +# TODO: use dynamic attributes once Nix 1.7 is out +assert ((config.planetary_annihilation or null).url or null) != null; +assert ((config.planetary_annihilation or null).sha256 or null) != null; + +/* to setup: + $ cat ~/.nixpkgs/config.nix + { + planetary_annihilation = { + url = "file:///home/user/PA_Linux_62857.tar.bz2"; + sha256 = "0imi3k5144dsn3ka9khx3dj76klkw46ga7m6rddqjk4yslwabh3k"; + }; +} +*/ + +stdenv.mkDerivation { + name = "planetary-annihalation"; + + src = fetchurl { + inherit (config.planetary_annihilation) url sha256; + }; + + buildInputs = [ patchelf makeWrapper ]; + + installPhase = '' + mkdir -p $out/{bin,lib} + + cp -R * $out/ + mv $out/*.so $out/lib + rm $out/libstdc++.so.6 + ln -s $out/PA $out/bin/PA + + ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 + + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" "$out/PA" + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.gcc.gcc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host.bin" + + wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.gcc.gcc}/lib64:${stdenv.glibc}/lib64" + + for f in $out/lib/*; do + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.gcc.gcc}/lib64:${stdenv.glibc}/lib64" $f + done + ''; + + meta = with stdenv.lib; { + homepage = http://www.uberent.com/pa/; + description = "next-generation RTS that takes the genre to a planetary scale"; + license = "unfree"; + platforms = platforms.linux; + maintainers = [ maintainers.iElectric ]; + }; +} diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index 88807ab6dea..1bd4d5f35b4 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = https://projects.kde.org/projects/playground/artwork/oxygen-gtk; license = licenses.lgpl2; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index a0ae59a5a5b..c9d45835cfd 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "acpid-2.0.21"; + name = "acpid-2.0.22"; src = fetchurl { url = "mirror://sourceforge/acpid2/${name}.tar.xz"; - sha256 = "0vv3zz8p3wxhlp35aqgqvzn6lda595wzn7php3k47jwci1cpxrn4"; + sha256 = "0cdbcy5xjdcyp2x6hzgpv6a9vg9bbxmypmfvv1qzgj43897la49x"; }; preBuild = '' diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 4938f7f4470..ffa91e951a8 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.12"; + name = "bluez-5.16"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "0zk183gjsxissq9gma962cyvyqxydai8n6jgslxx0mpk2m7mgvvm"; + sha256 = "0qxivd64az3qziw82axj2ksilllxq4fnb6fdrnlxr6d74550kmf8"; }; pythonPath = with pythonPackages; @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.bluez.org/; + repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git; description = "Bluetooth support for Linux"; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 086b792b4cd..3e95daba29e 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,5 +1,33 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl -, ncurses }: +{ stdenv, fetchurl, pkgconfig + +# dependencies +, glib, ncurses + +# optional features without extra dependencies +, mpdSupport ? true + +# optional features with extra dependencies +, x11Support ? false, x11 ? null +, xdamage ? false, libXdamage ? null +, wireless ? false, wirelesstools ? null +, luaSupport ? false, lua5 ? null + +, rss ? false +, weatherMetar ? false +, weatherXoap ? false +, curl ? null, libxml2 ? null +}: + +assert luaSupport -> lua5 != null; +assert wireless -> wirelesstools != null; +assert x11Support -> x11 != null; +assert xdamage -> x11Support && libXdamage != null; + +assert rss -> curl != null && libxml2 != null; +assert weatherMetar -> curl != null; +assert weatherXoap -> curl != null && libxml2 != null; + +with stdenv.lib; stdenv.mkDerivation rec { name = "conky-1.9.0"; @@ -9,17 +37,35 @@ stdenv.mkDerivation rec { sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds"; }; - patches = [ ./stdbool.patch ]; + buildInputs = [ pkgconfig glib ncurses ] + ++ optional luaSupport lua5 + ++ optional wireless wirelesstools + ++ optional x11Support x11 + ++ optional xdamage libXdamage + + ++ optionals rss [ curl libxml2 ] + ++ optional weatherMetar curl + ++ optionals weatherXoap [ curl libxml2 ] + ; - buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ncurses ]; configureFlags = - (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" ]) - ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" - "weather-metar" "weather-xoap" ]); + let flag = state: flags: if state then map (x: "--enable-${x}") flags + else map (x: "--disable-${x}") flags; + in flag mpdSupport [ "mpd" ] + + ++ flag luaSupport [ "lua" ] + ++ flag wireless [ "wlan" ] + ++ flag x11Support [ "x11" "xft" "argb" "double-buffer" "own-window" ] # conky won't compile without --enable-own-window + ++ flag xdamage [ "xdamage" ] + + ++ flag rss [ "rss" ] + ++ flag weatherMetar [ "weather-metar" ] + ++ flag weatherXoap [ "weather-xoap" ] + ; meta = { homepage = http://conky.sourceforge.net/; - description = "Conky is an advanced, highly configurable system monitor complied without X based on torsmo"; + description = "Conky is an advanced, highly configurable system monitor based on torsmo"; maintainers = [ stdenv.lib.maintainers.guibert ]; license = stdenv.lib.licenses.gpl3Plus; }; diff --git a/pkgs/os-specific/linux/conky/stdbool.patch b/pkgs/os-specific/linux/conky/stdbool.patch deleted file mode 100644 index 3f0b714a1f0..00000000000 --- a/pkgs/os-specific/linux/conky/stdbool.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/conky.c b/src/conky.c -index 5848b61..69a3d45 100644 ---- a/src/conky.c -+++ b/src/conky.c -@@ -34,6 +34,7 @@ - #include "common.h" - #include "timed_thread.h" - #include -+#include - #include - #include - #include diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix new file mode 100644 index 00000000000..349d690e4d1 --- /dev/null +++ b/pkgs/os-specific/linux/criu/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, protobuf, protobufc, asciidoc, xmlto, utillinux }: + +assert stdenv.system == "x86_64-linux"; +stdenv.mkDerivation rec { + name = "criu-${version}"; + version = "1.2"; + + src = fetchurl { + url = "http://download.openvz.org/criu/${name}.tar.bz2"; + sha256 = "04xlnqvgbjd5wfmi97m5rr76a3agkz8g96hdyzhc6x8gd52bbg9y"; + }; + + enableParallelBuilding = true; + buildInputs = [ protobuf protobufc asciidoc xmlto ]; + + patchPhase = '' + chmod +w ./scripts/gen-offsets.sh + substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump + ''; + + buildPhase = '' + make config PREFIX=$out + make PREFIX=$out + ''; + + installPhase = '' + mkdir -p $out/etc/logrotate.d + make install PREFIX=$out LIBDIR=$out/lib ASCIIDOC=${asciidoc}/bin/asciidoc XMLTO=${xmlto}/bin/xmlto + ''; + + meta = { + description = "userspace checkpoint/restore for Linux"; + homepage = "http://criu.org"; + license = stdenv.lib.licenses.gpl2; + platforms = [ "x86_64-linux" ]; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 834f98960df..e024a608a0b 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { description = "FireWire audio drivers"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 748611ab1b5..4c6e01271fb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.31"; + version = "3.10.33"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1nz8203avjjin3sivx6h6ddsramk37vp02g9lw2ix3hxji0lsz1m"; + sha256 = "0pdrzhdylan87nrhpz9dxx3da0008hkch4k1cjw46gg2jmxcryhh"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index d276de69446..e2ec7295a5f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.13"; + version = "3.12.14"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "08r4k64v0nkr0dnmir3n3x7f4i83akl3ahx9cl7rbj29zc4ninmd"; + sha256 = "1fv5mr8y5kn7077brajgv6l4shs8044i6pkh6phv7ms5ywacbllx"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index a7bfee210ad..294f616242d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.81"; + version = "3.4.83"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "17m8b9wcsz8ryakhk8v85iknylkjlbsx69wkj1rbvqi2f1sjihx5"; + sha256 = "1jammd31cgzymaqd2qwrm1shx5xwpaxmpnv658fix275fn35a8gb"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 22f9ee9d876..a41290168fe 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -44,12 +44,6 @@ rec { features.apparmor = true; }; - sec_perm_2_6_24 = - { name = "sec_perm-2.6.24"; - patch = ./sec_perm-2.6.24.patch; - features.secPermPatch = true; - }; - no_xsave = { name = "no-xsave"; patch = ./no-xsave.patch; @@ -81,8 +75,8 @@ rec { grsecurity_3_0_3_2_55 = { name = "grsecurity-3.0-3.2.55"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403142107.patch; - sha256 = "0v858lizqbvp0czpx5vg0h1sd5mb5kik1qhv4hh7y01cx6dywam2"; + url = http://grsecurity.net/stable/grsecurity-3.0-3.2.55-201403202347.patch; + sha256 = "19fwbpnfgq7iylrd0akazmh349xvxc9saxcsiqzhficfrsc4fyd3"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.55 @@ -92,8 +86,8 @@ rec { grsecurity_3_0_3_13_6 = { name = "grsecurity-3.0-3.13.6"; patch = fetchurl { - url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403142112.patch; - sha256 = "12wdibf7xfqjwr1cnar3nskgrlm04w68impaq4a3xg1blb9nxxhr"; + url = http://grsecurity.net/test/grsecurity-3.0-3.13.6-201403202349.patch; + sha256 = "0a1alz46k1g9nryx7qb040v5zf09ax7shj5wb0xj58gfpm67g86p"; }; features.grsecurity = true; # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.13.6 diff --git a/pkgs/os-specific/linux/kernel/sec_perm-2.6.24.patch b/pkgs/os-specific/linux/kernel/sec_perm-2.6.24.patch deleted file mode 100644 index de9b29949c3..00000000000 --- a/pkgs/os-specific/linux/kernel/sec_perm-2.6.24.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: linux-2.6.24-rc3/security/security.c -=================================================================== -RCS file: /ext1/sysadm/transparent/repository/linux-2.6.24-rc3/security/security.c,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -p -r1.1 -r1.2 ---- linux-2.6.24-rc3/security/security.c 21 Nov 2007 13:03:11 -0000 1.1 -+++ linux-2.6.24-rc3/security/security.c 21 Nov 2007 13:07:55 -0000 1.2 -@@ -409,6 +409,7 @@ int security_inode_permission(struct ino - return 0; - return security_ops->inode_permission(inode, mask, nd); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 8d58873d5c1..83f0dc1e82d 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "0.7"; + version = "0.8.1"; src = fetchurl { url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "111vmwn0ikrmy3s0w3rzpbzwrphawljrmcjya0isg5yam7lwxi0s"; + sha256 = "1fgm70s52x48dxjihs0rcwmpfsi2dxbjzcilxy9fzg0i39dz4kw4"; }; makeFlags = [ diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index bf3da195467..4c51c4fea6c 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { description = "A graphical boot animation"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 0b3389f903a..cd8a8eaec13 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation { - name = "procps-ng-3.3.9"; + name = "procps-3.3.9"; src = fetchurl { url = mirror://sourceforge/procps-ng/procps-ng-3.3.9.tar.xz; diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 4bb05a23faf..45a6c2189db 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.2.1"; + version = "3.2.4"; src = fetchurl { url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz"; - sha256 = "0j9yx64sdgkv0h20zjs65aa2ag6wwv50i6hd3x69m0cc6shzcc0f"; + sha256 = "17rvqhzcb7rscp228vmgixk0rsqi42m820jzxj9g5wid6qmzjc59"; }; buildInputs = diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index a89f10ad836..a52ca2b6871 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { # 'chrpath' is used to be able to run the tests from the source tree, but # we use $LD_LIBRARY_PATH instead. buildPhase = '' + patchShebangs . mkdir -p "$out" sed -e "s|python_lib_dir = .*|python_lib_dir = \"$out/lib/${pythonFull.python.libPrefix}/site-packages\"|" -i SConstruct scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \ diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix index d8304ba4dbe..ee0049ce08f 100644 --- a/pkgs/servers/http/tomcat/6.0.nix +++ b/pkgs/servers/http/tomcat/6.0.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "6.0.37"; in +let version = "6.0.39"; in stdenv.mkDerivation rec { name = "apache-tomcat-${version}"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz"; - sha256 = "000v63amhbyp8nkw3a4pff1vm4nxri5n9j7rknhnqaxzab3sp49y"; + sha256 = "19qix6affhc252n03smjf482drg3nxd27shni1gvhphgj3zfmgfy"; }; installPhase = diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix new file mode 100644 index 00000000000..738881e2aaf --- /dev/null +++ b/pkgs/servers/irc/ngircd/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, zlib, openssl, pam, libiconvOrNull }: + +stdenv.mkDerivation rec { + name = "ngircd-21"; + + src = fetchurl { + url = "http://ngircd.barton.de/pub/ngircd/${name}.tar.xz"; + sha256 = "19llx54zy6hc8k7kcs1f234qc20mqpnlnb30c663c42jxq5x6xii"; + }; + + configureFlags = [ + "--with-syslog" + "--with-zlib" + "--with-pam" + "--with-openssl" + "--enable-ipv6" + "--with-iconv" + ]; + + buildInputs = [ zlib pam openssl libiconvOrNull ]; + + meta = { + description = "Next Generation IRC Daemon"; + homepage = http://ngircd.barton.de; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index ba0b80fc61e..47c8c12edef 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -4,11 +4,11 @@ assert stdenv.isLinux; stdenv.mkDerivation { - name = "openafs-1.6.1-${kernel.version}"; + name = "openafs-1.6.6-${kernel.version}"; src = fetchurl { - url = http://www.openafs.org/dl/openafs/1.6.1/openafs-1.6.1-src.tar.bz2; - sha256 = "1c7mid0dwl2x0sikr70bi5cs881y6pa4dfwkdmr3jscvx3wgfpnh"; + url = http://www.openafs.org/dl/openafs/1.6.6/openafs-1.6.6-src.tar.bz2; + sha256 = "0xfa64hvz0avp89zgz8ksmp24s6ns0z3103m4mspshhhdlikypk3"; }; buildInputs = [ autoconf automake flex yacc ncurses perl which ]; @@ -41,6 +41,5 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.ipl10; platforms = stdenv.lib.platforms.linux; maintainers = stdenv.lib.maintainers.z77z; - broken = true; }; } diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 165a01517b4..c6939ce5f7a 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, makeWrapper, jre, utillinux }: stdenv.mkDerivation rec { - name = "elasticsearch-1.0.0"; + name = "elasticsearch-1.0.1"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "06ym7hl47339a5dav2hawnxv820y0lbvh9xxd0lfp1f815vbql01"; + sha256 = "0nwv7llw7gk94alfcpxxy0lybhnw7fggv30v7ylsxn20id9g7kba"; }; patches = [ ./es-home.patch ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index beca7414c36..6990da2352e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1569,6 +1569,16 @@ let buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + xf86videomodesetting = (stdenv.mkDerivation ((if overrides ? xf86videomodesetting then overrides.xf86videomodesetting else x: x) { + name = "xf86-video-modesetting-0.8.1"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-modesetting-0.8.1.tar.bz2; + sha256 = "1jhjhgji6169sj7489qahcnmi8cf7y22wvj8qsmrg537rgbxia1v"; + }; + buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ]; + })) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;}; + xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) { name = "xf86-video-neomagic-1.2.8"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 24279ac70f9..eccc931f42f 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -136,6 +136,7 @@ mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2 +mirror://xorg/individual/driver/xf86-video-modesetting-0.8.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 6e74af5fce5..f1cf34b160c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -12,12 +12,6 @@ let lib = import ../../../lib; in lib.makeOverridable ( , extraBuildInputs ? [] }: -if ! builtins ? langVersion then - - abort "This version of Nixpkgs requires Nix >= 1.2, please upgrade!" - -else - let allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1"; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix new file mode 100644 index 00000000000..311e420c6a3 --- /dev/null +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -0,0 +1,27 @@ +{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, hicolor_icon_theme, gdk_pixbuf, librsvg }: + +stdenv.mkDerivation { + name = "gvolicon"; + src = fetchgit { + url = "https://github.com/Unia/gvolicon"; + rev = "26343415de836e0b05aa0b480c0c69cc2ed9e419"; + sha256 = "68858840a45b5f74803e85116c6219f805d6d944c00354662889549910856cdd"; + }; + + buildInputs = [ pkgconfig makeWrapper alsaLib gnome3.gtk ]; + propagatedBuildInputs = [ gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic hicolor_icon_theme gdk_pixbuf librsvg ]; + installPhase = '' + make install PREFIX=$out + wrapProgram "$out/bin/gvolicon" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/gvolicon:$XDG_ICON_DIRS" + ''; + + meta = { + description = "A simple and lightweight volume icon that sits in your system tray."; + homepage = "https://github.com/Unia/gvolicon"; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3Plus; + maintainer = stdenv.lib.maintainers.bennofs; + }; +} \ No newline at end of file diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix new file mode 100644 index 00000000000..72f417ff10b --- /dev/null +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, libuuid }: + +stdenv.mkDerivation rec { + name = "f2fs-tools-${version}"; + version = "1.3.0"; + + src = fetchgit { + url = git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git; + rev = "refs/tags/v${version}"; + sha256 = "1r97k91qaf42jz623jqy0wm97yjq1ym034q4fdhfirq27s46sn6i"; + }; + + buildInputs = [ autoconf automake libtool pkgconfig libuuid ]; + + preConfigure = '' + sed -i '/AC_SUBST/d' configure.ac + autoreconf --install + ''; + + meta = { + homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/"; + description = "Userland tools for the f2fs filesystem"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 9b0a83725ea..fbd1778faef 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -2,11 +2,11 @@ freeglut, bzip2, libX11, libpng, expat, pkgconfig }: stdenv.mkDerivation rec { - name = "pfstools-1.8.3"; + name = "pfstools-1.8.5"; src = fetchurl { url = "mirror://sourceforge/pfstools/${name}.tar.gz"; - sha256 = "1j3pzwpxvsx9220176bfjallc73jyda61xqkvnmlxqfd3n7ycgx1"; + sha256 = "01kk2r8afrb3vrhm8abfjdhhan97lzpapc4n8w1mpdp3kv9miy9c"; }; configureFlags = "--with-moc=${qt4}/bin/moc"; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 2c7505260a6..960d85ab6be 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -16,6 +16,7 @@ in src = fetchgit { inherit rev; url = "https://github.com/wertarbyte/autorandr.git"; + sha256 = "1x8agg6mf5jr0imw7dznr8kxyw970bf252bda9q7b0z4yksya2zd"; }; patchPhase = '' diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 3edce28151e..986e0f449d2 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.03.12"; + version = "2014.03.18.1"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1fap7mx2bmfr1jv7v5n2khl72mbasnzlasqd8gi654cl9xp12p5x"; + sha256 = "0yyyvwa5av4ay8kxxlsav49mp2dcxflz6w0as0nklyg6k5zb5pn1"; }; buildInputs = [ python ]; diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 99cfb92a18b..e49c32aac70 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { # Make sane defaults and patch default config vars postInstall = '' - for prog in $(find "$out/share/easy-rsa" -executable); do + cp $out/share/easy-rsa/openssl-1.0.0.cnf $out/share/easy-rsa/openssl.cnf + for prog in $(find "$out/share/easy-rsa" -executable -type f); do makeWrapper "$prog" "$out/bin/$(basename $prog)" \ --set EASY_RSA "$out/share/easy-rsa" \ --set OPENSSL "${openssl}/bin/openssl" \ diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 86986ed9b95..ed01ccacd79 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,14 +1,13 @@ { fetchurl, stdenv, openssl, pkgconfig, db }: stdenv.mkDerivation rec { - name = "isync-1.0.6"; + name = "isync-1.1.0"; src = fetchurl { url = "mirror://sourceforge/isync/${name}.tar.gz"; - sha256 = "0bv3hw6mc9xi55q6lpyz1w3dyrk6rlxa8ny2x1b44mrnbrx7chz5"; + sha256 = "51f5618c239013fb770f98ae269f24ee417214efaaf7e22821b4a27cf9a9213c"; }; - patches = [ ./isync-recursice-imap.patch ]; # usefull patch to enable subfolders listing buildInputs = [ openssl pkgconfig db ]; meta = { diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 54f6689582d..b2943eb2ace 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,14 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib }: -let - name = "nbd-3.7"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "nbd-3.8"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "1k4bvg5rg4q6b58y4kd9qwj07sznsfbknlpc6y1bk6c48rgr3d0b"; + sha256 = "1qnkzrnc9m4n814ciqh95q9j8l7d6yd7sn36q8yn0dmi1rvj78j8"; }; buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 4d2dff22d11..6db55ada192 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ln -s ${networkmanager_openconnect}/libexec/* $out/libexec/ wrapProgram "$out/bin/nm-applet" \ --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \ + --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:${gnome3.gtk}/share:$out/share" \ --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \ --prefix PATH ":" "${gnome3.gconf}/bin" ''; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 0b68ec83b52..b0d1dba891b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { - name = "openssh-6.5p1"; + name = "openssh-6.6p1"; src = fetchurl { url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; - sha256 = "09wh7mi65aahyxd2xvq1makckhd5laid8c0pb8njaidrbpamw6d1"; + sha256 = "1fq3w86q05y5nn6z878wm312k0svaprw8k007188fd259dkg1ha8"; }; prePatch = stdenv.lib.optionalString hpnSupport diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix index c0dbf710ffb..9827b62c6c4 100644 --- a/pkgs/tools/networking/telnet/default.nix +++ b/pkgs/tools/networking/telnet/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation { name = "telnet-1.2"; src = fetchurl { - url = ftp://ftp.suse.com/pub/people/kukuk/ipv6/telnet-bsd-1.2.tar.bz2; + #url = ftp://ftp.suse.com/pub/people/kukuk/ipv6/telnet-bsd-1.2.tar.bz2; # broken + url = mirror://gentoo/distfiles/telnet-bsd-1.2.tar.bz2; sha256 = "0cs7ks22dhcn5qfjv2vl6ikhw93x68gg33zdn5f5cxgg81kx5afn"; }; diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix new file mode 100644 index 00000000000..078e7cc06e0 --- /dev/null +++ b/pkgs/tools/security/duo-unix/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pam, openssl, zlib }: + +stdenv.mkDerivation rec { + name = "duo-unix"; + version = "1.9.7"; + + src = fetchurl { + url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; + sha256 = "090kx9nixlhvy5nw0ywqmi7yhd4nz7wvdv38cpkgrspkridfl07j"; + }; + + buildInputs = [ pam openssl zlib ]; + configureFlags = + [ "--with-pam=$(out)/lib/security" + "--prefix=$(out)" + "--sysconfdir=$(out)/etc/duo" + "--with-openssl=${openssl}" + "--enable-lib64=no" + ]; + + meta = { + description = "Duo Security Unix login integration"; + homepage = "https://duosecurity.com"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 1b2e940540d..a6452cdb89b 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "nmap-6.40"; + name = "nmap-${version}"; + version = "6.40"; src = fetchurl { url = "http://nmap.org/dist/${name}.tar.bz2"; @@ -21,8 +22,11 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap libX11 gtk pkgconfig openssl python pygtk makeWrapper pysqlite ]; - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = maintainers.mornfall; + meta = { + description = "A free and open source utility for network discovery and security auditing."; + homepage = "http://www.nmap.org"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ mornfall thoughtpolice ]; }; } diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index d069c183842..7f13ffc8db5 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { # The OS should care on preparing the drivers into this location configureFlags = [ "--enable-usbdropdir=/var/lib/pcsc/drivers" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--enable-confdir=$(out)/etc" + "--with-systemdsystemunitdir=$out/etc/systemd/system" + "--enable-confdir=$out/etc" ]; buildInputs = [ udev dbus_libs perl ]; diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index ca2c9f43dfc..fe2a19491d9 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { meta = { description = "The scrypt encryption utility"; - homepage = https://www.tarsnap.com/scrypt.html; - license = "BSD"; - platforms = stdenv.lib.platforms.all; + homepage = https://www.tarsnap.com/scrypt.html; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix new file mode 100644 index 00000000000..66fdedc4906 --- /dev/null +++ b/pkgs/tools/security/ssdeep/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "ssdeep-${version}"; + version = "2.10"; + + src = fetchurl { + url = "mirror://sourceforge/ssdeep/${name}.tar.gz"; + sha256 = "1p7dgchq8hgadnxz5qh95ay17k5j74l4qyd15wspc54lb603p2av"; + }; + + postFixup = '' + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/ssdeep):$out/lib" $out/bin/ssdeep + ''; + + meta = { + description = "A program for calculating fuzzy hashes"; + homepage = "http://www.ssdeep.sf.net"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index e8c27c5f2b1..dd4d797825f 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.torproject.org/; + repositories.git = https://git.torproject.org/git/tor; description = "Tor, an anonymous network router to improve privacy on the Internet"; longDescription='' @@ -30,10 +31,7 @@ stdenv.mkDerivation rec { license="mBSD"; - maintainers = - [ # Russell O’Connor ? - stdenv.lib.maintainers.ludo - ]; + maintainers = with stdenv.lib.maintainers; [ phreedom ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix index 6ce09499780..f221a1b89e6 100644 --- a/pkgs/tools/security/vidalia/default.nix +++ b/pkgs/tools/security/vidalia/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.torproject.org/projects/vidalia.html.en; + repositories.git = git://git.torproject.org/vidalia; description = "a cross-platform graphical controller for the Tor software, built using the Qt framework"; license = licenses.gpl2Plus; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix index fc9e3785cf3..ccfeabaa73b 100644 --- a/pkgs/tools/text/podiff/default.nix +++ b/pkgs/tools/text/podiff/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = http://puszcza.gnu.org.ua/software/podiff; license = licenses.gpl3Plus; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index e8a1ee96505..d5d022c8063 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "b6993e077f650eb0976cbc924640665fa9b2499a899ecba5a6cad5cf9addfdff"; }; - NIX_LDFLAGS = "-lgcc_s"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; buildInputs = [ autoreconfHook pkgconfig pcre zlib lzma ]; diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index 0f54644eba5..c81e02b4399 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { similar ASCII characters, e.g. by stripping diacritics. ''; maintainers = [ "cillian.deroiste@gmail.com" ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22dee1d2a20..24f1543fc83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -855,6 +855,8 @@ let dtach = callPackage ../tools/misc/dtach { }; + duo-unix = callPackage ../tools/security/duo-unix { }; + duplicity = callPackage ../tools/backup/duplicity { inherit (pythonPackages) boto lockfile; gnupg = gnupg1; @@ -918,6 +920,8 @@ let expect = callPackage ../tools/misc/expect { }; + f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; + fabric = pythonPackages.fabric; fail2ban = callPackage ../tools/security/fail2ban { }; @@ -1148,6 +1152,8 @@ let inherit openssl gmp nettools iproute; }; + gvolicon = callPackage ../tools/audio/gvolicon {}; + gzip = callPackage ../tools/compression/gzip { }; gzrt = callPackage ../tools/compression/gzrt { }; @@ -1876,6 +1882,8 @@ let sg3_utils = callPackage ../tools/system/sg3_utils { }; sharutils = callPackage ../tools/archivers/sharutils { }; + + shotwell = callPackage ../applications/graphics/shotwell { }; shebangfix = callPackage ../tools/misc/shebangfix { }; @@ -1949,6 +1957,8 @@ let super = callPackage ../tools/security/super { }; + ssdeep = callPackage ../tools/security/ssdeep { }; + ssmtp = callPackage ../tools/networking/ssmtp { tlsSupport = true; }; @@ -2319,6 +2329,7 @@ let bashInteractive = appendToName "interactive" (callPackage ../shells/bash { interactive = true; + readline = readline63; # Includes many vi mode fixes }); bashCompletion = callPackage ../shells/bash-completion { }; @@ -3230,6 +3241,7 @@ let suitesparse = null; openjdk = null; gnuplot = null; + readline = readline63; }; octaveFull = (lowPrio (callPackage ../development/interpreters/octave { fltk = fltk13; @@ -3850,6 +3862,7 @@ let gdb = callPackage ../development/tools/misc/gdb { hurd = gnu.hurdCross; + readline = readline63; inherit (gnu) mig; }; @@ -4233,9 +4246,7 @@ let geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; - geoip = builderDefsPackage ../development/libraries/geoip { - inherit zlib; - }; + geoip = callPackage ../development/libraries/geoip { }; geoipjava = callPackage ../development/libraries/java/geoipjava { }; @@ -4697,9 +4708,7 @@ let libchamplain_0_6 = callPackage ../development/libraries/libchamplain/0.6.nix {}; - libchop = callPackage ../development/libraries/libchop { - gnutls = gnutls31; - }; + libchop = callPackage ../development/libraries/libchop { }; libcm = callPackage ../development/libraries/libcm { }; @@ -5572,7 +5581,7 @@ let raul = callPackage ../development/libraries/audio/raul { }; - readline = readline6; + readline = readline6; # 6.2 works, 6.3 breaks python, parted readline4 = callPackage ../development/libraries/readline/readline4.nix { }; @@ -5587,6 +5596,15 @@ let else stdenv; }; + readline63 = callPackage ../development/libraries/readline/readline6.3.nix { + stdenv = + # On Darwin, Readline uses `-arch_only', which is specific to + # Apple-GCC. So give it what it expects. + if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; + librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { }; @@ -6088,6 +6106,8 @@ let ack = perlPackages.ack; perlcritic = perlPackages.PerlCritic; + + planetary_annihilation = callPackage ../games/planetaryannihilation { }; ### DEVELOPMENT / PYTHON MODULES @@ -6113,10 +6133,10 @@ let python = python33; }); - python34Packages = import ./python-packages.nix { + python34Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; python = python34; - }; + }); python32Packages = import ./python-packages.nix { inherit pkgs; @@ -6331,6 +6351,8 @@ let nginx = callPackage ../servers/http/nginx { }; + ngircd = callPackage ../servers/irc/ngircd { }; + opensmtpd = callPackage ../servers/mail/opensmtpd { }; petidomo = callPackage ../servers/mail/petidomo { }; @@ -6583,12 +6605,23 @@ let cifs_utils = callPackage ../os-specific/linux/cifs-utils { }; - conky = callPackage ../os-specific/linux/conky { }; + conky = callPackage ../os-specific/linux/conky { + mpdSupport = config.conky.mpdSupport or true; + x11Support = config.conky.x11Support or false; + xdamage = config.conky.xdamage or false; + wireless = config.conky.wireless or false; + luaSupport = config.conky.luaSupport or false; + rss = config.conky.rss or false; + weatherMetar = config.conky.weatherMetar or false; + weatherXoap = config.conky.weatherXoap or false; + }; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; cryopid = callPackage ../os-specific/linux/cryopid { }; + criu = callPackage ../os-specific/linux/criu { }; + cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; cramfsswap = callPackage ../os-specific/linux/cramfsswap { }; @@ -6740,9 +6773,7 @@ let linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = - [ kernelPatches.sec_perm_2_6_24 - ]; + kernelPatches = []; }; grsecurityOverrider = args: { @@ -6790,9 +6821,7 @@ let linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = - [ kernelPatches.sec_perm_2_6_24 - ] ++ lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill ]; @@ -6812,10 +6841,7 @@ let linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - ] ++ lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 @@ -6833,10 +6859,7 @@ let linux_3_11 = makeOverridable (import ../os-specific/linux/kernel/linux-3.11.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - ] ++ lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 @@ -6845,10 +6868,7 @@ let linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - ] ++ lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 @@ -6857,10 +6877,7 @@ let linux_3_13 = makeOverridable (import ../os-specific/linux/kernel/linux-3.13.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - ] ++ lib.optionals ((platform.kernelArch or null) == "mips") + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 @@ -7090,9 +7107,11 @@ let prayer = callPackage ../servers/prayer { }; - procps = callPackage ../os-specific/linux/procps { }; + procps = procps-ng; - "procps-ng" = callPackage ../os-specific/linux/procps-ng { }; + procps-old = lowPrio (callPackage ../os-specific/linux/procps { }); + + procps-ng = callPackage ../os-specific/linux/procps-ng { }; qemu_kvm = lowPrio (qemu.override { x86Only = true; }); @@ -7501,11 +7520,9 @@ let antiword = callPackage ../applications/office/antiword {}; - ardour = callPackage ../applications/audio/ardour { - inherit (gnome) libgnomecanvas libgnomecanvasmm; - }; + ardour = ardour3; - ardour3 = lowPrio (callPackage ../applications/audio/ardour/ardour3.nix { + ardour3 = lowPrio (callPackage ../applications/audio/ardour { inherit (gnome) libgnomecanvas libgnomecanvasmm; }); @@ -7746,6 +7763,8 @@ let ed = callPackage ../applications/editors/ed { }; + ekho = callPackage ../applications/audio/ekho { }; + elinks = callPackage ../applications/networking/browsers/elinks { }; elvis = callPackage ../applications/editors/elvis { }; @@ -8661,6 +8680,8 @@ let ncdu = callPackage ../tools/misc/ncdu { }; + ncdc = callPackage ../applications/networking/p2p/ncdc { }; + nedit = callPackage ../applications/editors/nedit { motif = lesstif; }; @@ -8890,6 +8911,8 @@ let skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; + slrn = callPackage ../applications/networking/newsreaders/slrn { }; + ssvnc = callPackage ../applications/networking/remote/ssvnc { }; st = callPackage ../applications/misc/st { @@ -9124,13 +9147,12 @@ let else stdenv; }; - vimwrapper = callPackage ../applications/editors/vim/wrapper.nix { - inherit vim; - vimrc = config.vim.vimrc or null; - }; + vimWrapper = wrapVim vim; vimHugeX = vim_configurable; + vimHugeXWrapper = wrapVim vimHugeX; + vim_configurable = callPackage ../applications/editors/vim/configurable.nix { inherit (pkgs) fetchurl fetchhg stdenv ncurses pkgconfig gettext composableDerivation lib config glib gtk python perl tcl ruby; @@ -9163,6 +9185,11 @@ let flags = [ "python" "X11" ]; # only flag "X11" by now }); + wrapVim = vim: import ../applications/editors/vim/wrapper.nix { + inherit stdenv makeWrapper writeText vim; + vimrc = config.vim.vimrc or ""; + }; + virtviewer = callPackage ../applications/virtualization/virt-viewer {}; virtmanager = callPackage ../applications/virtualization/virt-manager { inherit (gnome) gnome_python; @@ -9197,10 +9224,7 @@ let graphicsSupport = false; }; - weechat = callPackage ../applications/networking/irc/weechat { - # weechat doesn't exit with gnutls32. Use 3.1 for now. - gnutls = gnutls31; - }; + weechat = callPackage ../applications/networking/irc/weechat { }; weston = callPackage ../applications/window-managers/weston { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d23471ffdd4..5b39974c315 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -758,6 +758,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x checkers = callPackage ../development/libraries/haskell/checkers {}; + chell = callPackage ../development/libraries/haskell/chell {}; + + chellQuickcheck = callPackage ../development/libraries/haskell/chell-quickcheck {}; + chunkedData = callPackage ../development/libraries/haskell/chunked-data {}; citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {}; @@ -856,6 +860,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; + cryptohashConduit = callPackage ../development/libraries/haskell/cryptohash-conduit {}; + cryptohashCryptoapi = callPackage ../development/libraries/haskell/cryptohash-cryptoapi {}; cryptoNumbers = callPackage ../development/libraries/haskell/crypto-numbers {}; @@ -984,6 +990,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x dlist = callPackage ../development/libraries/haskell/dlist {}; + dlistInstances = callPackage ../development/libraries/haskell/dlist-instances {}; + dns = callPackage ../development/libraries/haskell/dns {}; doctest = callPackage ../development/libraries/haskell/doctest {}; @@ -1000,6 +1008,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x DSH = callPackage ../development/libraries/haskell/DSH {}; + dsp = callPackage ../development/libraries/haskell/dsp {}; + dstring = callPackage ../development/libraries/haskell/dstring {}; dualTree = callPackage ../development/libraries/haskell/dual-tree {}; @@ -1441,13 +1451,19 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {}; - hspec = callPackage ../development/libraries/haskell/hspec {}; + hspec = callPackage ../development/libraries/haskell/hspec { + QuickCheck = self.QuickCheck_2_7_1; + quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_1; }; + }; hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {}; - hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {}; + hspecMeta = callPackage ../development/libraries/haskell/hspec-meta { + QuickCheck = self.QuickCheck_2_7_1; + quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_1; }; + }; hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; @@ -1604,6 +1620,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; + libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal { + systemd-journal = pkgs.systemd; + }; + libxmlSax = callPackage ../development/libraries/haskell/libxml-sax {}; liftedAsync = callPackage ../development/libraries/haskell/lifted-async {}; @@ -1625,14 +1645,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x llvmConfig = pkgs.llvm_33; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; }; - llvmGeneral_3_4_1_0 = callPackage ../development/libraries/haskell/llvm-general/3.4.1.0.nix { + llvmGeneral_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general/3.4.2.2.nix { llvmConfig = pkgs.llvm; }; - llvmGeneral = self.llvmGeneral_3_4_1_0; + llvmGeneral = self.llvmGeneral_3_4_2_2; llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { }; - llvmGeneralPure_3_4_1_0 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.1.0.nix {}; - llvmGeneralPure = self.llvmGeneralPure_3_4_1_0; + llvmGeneralPure_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.2.nix {}; + llvmGeneralPure = self.llvmGeneralPure_3_4_2_2; lrucache = callPackage ../development/libraries/haskell/lrucache {}; @@ -1646,6 +1666,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x lushtags = callPackage ../development/libraries/haskell/lushtags {}; + lzmaEnumerator = callPackage ../development/libraries/haskell/lzma-enumerator {}; + maccatcher = callPackage ../development/libraries/haskell/maccatcher {}; markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {}; @@ -1855,6 +1877,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x operational = callPackage ../development/libraries/haskell/operational {}; + options = callPackage ../development/libraries/haskell/options {}; + optparseApplicative = callPackage ../development/libraries/haskell/optparse-applicative {}; pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; @@ -2034,6 +2058,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; + QuickCheck_2_7_1 = callPackage ../development/libraries/haskell/QuickCheck/2.7.1.nix {}; QuickCheck1 = self.QuickCheck_1_2_0_1; QuickCheck2 = self.QuickCheck_2_6; QuickCheck = self.QuickCheck2; @@ -2347,6 +2372,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tagged = callPackage ../development/libraries/haskell/tagged {}; + tagshare = callPackage ../development/libraries/haskell/tagshare {}; + tagsoup = callPackage ../development/libraries/haskell/tagsoup {}; tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {}; @@ -2361,7 +2388,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {}; - tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {}; + tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck { + QuickCheck = self.QuickCheck_2_7_1; + }; tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {}; @@ -2397,6 +2426,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {}; + testingFeat = callPackage ../development/libraries/haskell/testing-feat {}; + texmath = callPackage ../development/libraries/haskell/texmath {}; text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; @@ -2415,6 +2446,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x textStreamDecode = callPackage ../development/libraries/haskell/text-stream-decode {}; + tfRandom = callPackage ../development/libraries/haskell/tf-random {}; + thespian = callPackage ../development/libraries/haskell/thespian {}; thDesugar = callPackage ../development/libraries/haskell/th-desugar {}; @@ -2446,8 +2479,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x timeCompat = callPackage ../development/libraries/haskell/time-compat {}; tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {}; - tls_1_2_2 = callPackage ../development/libraries/haskell/tls/1.2.2.nix {}; - tls = self.tls_1_2_2; + tls_1_2_3 = callPackage ../development/libraries/haskell/tls/1.2.3.nix {}; + tls = self.tls_1_2_3; tlsExtra = callPackage ../development/libraries/haskell/tls-extra { tls = self.tls_1_1_5; @@ -2860,6 +2893,25 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabal2nix = callPackage ../development/tools/haskell/cabal2nix {}; + # Build a cabal package given a local .cabal file + buildLocalCabal = src: name: let + cabalExpr = pkgs.stdenv.mkDerivation { + name = "${name}.nix"; + + LANG = "en_US.UTF-8"; + + LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive"; + + buildCommand = '' + ${self.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \ + | grep -v FILTERME | sed \ + -e 's/licenses.proprietary/licenses.unfree/' \ + -e 's/{ cabal/{ cabal, src/' \ + -e 's/pname = \([^\n]*\)/pname = \1\n inherit src;/' > $out + ''; + }; + in callPackage cabalExpr { inherit src; }; + cabalDev = callPackage ../development/tools/haskell/cabal-dev {}; cabal2Ghci = callPackage ../development/tools/haskell/cabal2ghci {}; @@ -2877,7 +2929,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x }; cabalInstall = self.cabalInstall_1_18_0_3; - gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {}; + gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex { + hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7_1; }; }; + }; githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {}; diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index 29a9bc91a1e..193928513cb 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -5370,5 +5370,27 @@ in }; }; + + "suds" = self."suds-0.4"; + + "suds-0.4" = self.buildPythonPackage { + name = "suds-0.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz"; + md5 = "b7502de662341ed7275b673e6bd73191"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + Lightweight SOAP client + ''; + homepage = "https://fedorahosted.org/suds"; + license = "UNKNOWN"; + }; + }; + } diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json index b5b7afab85b..b8ddcee3a47 100644 --- a/pkgs/top-level/python-packages.json +++ b/pkgs/top-level/python-packages.json @@ -137,5 +137,8 @@ }, { "name": "xlrd", "doCheck": false + }, + { "name": "suds", + "doCheck": false } ] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 254dcb7c988..ab605199e7f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2395,7 +2395,7 @@ rec { }; propagatedBuildInputs = with pkgs; [ - pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl + pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl modules.curses ]; postInstall = '' @@ -3212,12 +3212,12 @@ rec { hetzner = buildPythonPackage rec { name = "hetzner-${version}"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { url = "https://github.com/RedMoonStudios/hetzner/archive/" + "v${version}.tar.gz"; - sha256 = "1cgi77f453ahw3ad6hvqwbyp6fwnh90rlzfgl9cp79wg58wyar4w"; + sha256 = "1ldbhwy6yk18frv6n9znvdsrqfnpch4mfvc70jrpq3f9fw236src"; }; # not there yet, but coming soon.