diff options
557 files changed, 5474 insertions, 4773 deletions
diff --git a/doc/meta.xml b/doc/meta.xml index fc0ff9777922..a0ed3069b680 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -117,6 +117,13 @@ hello-2.3 A program that produces a familiar, friendly greeting </varlistentry> <varlistentry> + <term><varname>branch</varname></term> + <listitem><para>Release branch. Used to specify that a package is not + going to receive updates that are not in this branch; for example, Linux + kernel 3.0 is supposed to be updated to 3.0.X, not 3.1.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>homepage</varname></term> <listitem><para>The package’s homepage. Example: <literal>http://www.gnu.org/software/hello/manual/</literal></para></listitem> diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 329a2fe8de06..263af793d991 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -39,6 +39,7 @@ chaoflow = "Florian Friesdorf <flo@chaoflow.net>"; christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>"; coconnor = "Corey O'Connor <coreyoconnor@gmail.com>"; + codyopel = "Cody Opel <codyopel@gmail.com>"; copumpkin = "Dan Peebles <pumpkingod@gmail.com>"; coroa = "Jonas Hörsch <jonas@chaoflow.net>"; cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>"; @@ -67,6 +68,7 @@ ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>"; iElectric = "Domen Kozar <domen@dev.si>"; iyzsong = "Song Wenwu <iyzsong@gmail.com>"; + jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>"; jcumming = "Jack Cummings <jack@mudshark.org>"; jgeerds = "Jascha Geerds <jg@ekby.de>"; joamaki = "Jussi Maki <joamaki@gmail.com>"; @@ -118,6 +120,7 @@ rycee = "Robert Helgesson <robert@rycee.net>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; sepi = "Raffael Mancini <raffael@mancini.lu>"; + shell = "Shell Turner <cam.turn@gmail.com>"; shlevy = "Shea Levy <shea@shealevy.com>"; simons = "Peter Simons <simons@cryp.to>"; skeidel = "Sven Keidel <svenkeidel@gmail.com>"; @@ -139,6 +142,7 @@ viric = "Lluís Batlle i Rossell <viric@viric.name>"; vizanto = "Danny Wilson <danny@prime.vc>"; vlstill = "Vladimír Štill <xstill@fi.muni.cz>"; + vozz = "Oliver Hunt <oliver.huntuk@gmail.com>"; winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>"; wizeman = "Ricardo M. Correia <rcorreia@wizy.org>"; wjlroe = "William Roe <willroe@gmail.com>"; diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index 5b0ef380f9af..3c9bcbbde9b0 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -13,6 +13,9 @@ trusted-binary-caches = http://hydra.nixos.org build-max-jobs = 4 EOF +echo "First of all, checking evaluation, including meta" +nix-env -f. -qa --json > /dev/null + if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then echo "Not a pull request, checking evaluation" nix-build pkgs/top-level/release.nix -A tarball diff --git a/maintainers/scripts/vanity-manual-equalities.txt b/maintainers/scripts/vanity-manual-equalities.txt index 392ff266e1ae..9b31e9dc07c3 100644 --- a/maintainers/scripts/vanity-manual-equalities.txt +++ b/maintainers/scripts/vanity-manual-equalities.txt @@ -1,3 +1,6 @@ viric viriketo@gmail.com Pjotr Prins pjotr.public01@thebird.nl Pjotr Prins pjotr.public05@thebird.nl +Wouter den Breejen wbreejen +MarcWeber marcweber +Ricardo Correia Ricardo M. Correia diff --git a/maintainers/scripts/vanity.sh b/maintainers/scripts/vanity.sh index 48c7d6dbef6b..5a1b8b08b601 100755 --- a/maintainers/scripts/vanity.sh +++ b/maintainers/scripts/vanity.sh @@ -3,7 +3,8 @@ export LANG=C LC_ALL=C LC_COLLATE=C # Load git log -git_data="$(git log | grep 'Author:' | +raw_git_log="$(git log)" +git_data="$(echo "$raw_git_log" | grep 'Author:' | sed -e 's/^ *Author://; s/\\//g; s/^ *//; s/ *$//; s/ @ .*//; s/ *[<]/\t/; s/[>]//')" @@ -13,15 +14,44 @@ maintainers="$(cat "$(dirname "$0")/../../lib/maintainers.nix" | grep '=' | sed -re 's/\\"/''/g; s/ *([^ =]*) *= *" *(.*[^ ]) *[<](.*)[>] *".*/\1\t\2\t\3/')" git_lines="$( ( echo "$git_data"; - cat vanity-manual-equalities.txt) | sort |uniq)" + cat "$(dirname "$0")/vanity-manual-equalities.txt") | sort |uniq)" + +emails="$( + ( echo "$maintainers" | cut -f 3; echo "$git_data" | cut -f 2 ) | + sort | uniq | grep -E ".+@.+[.].+" + )" + +fetchGithubName () { + commitid="$( + echo "$raw_git_log" | grep -B3 "Author: .*[<]$1[>]" | head -n 3 | + grep '^commit ' | tail -n 1 | sed -e 's/^commit //' + )" + userid="$( + curl https://github.com/NixOS/nixpkgs/commit/"$commitid" 2>/dev/null | + grep authored -B10 | grep 'href="/' | + sed -re 's@.* href="/@@; s@".*@@' | + grep -v "/commit/" + )"; + echo "$userid" +} + +[ -n "$NIXPKGS_GITHUB_NAME_CACHE" ] && { + echo "$emails" | while read email; do + line="$(grep "$email " "$NIXPKGS_GITHUB_NAME_CACHE")" + [ -z "$line" ] && { + echo "$email $(fetchGithubName "$email")" >> \ + "$NIXPKGS_GITHUB_NAME_CACHE" + } + done +} # For RDF normalize_name () { - sed -e 's/ /_/g; s/'\''/*/g; s/"/**/g;' + sed -e 's/%/%25/g; s/ /%20/g; s/'\''/%27/g; s/"/%22/g;' } denormalize_name () { - sed -e 's/_/ /g; s/[*][*]/"/g; s/[*]/'\''/g;' + sed -e 's/%20/ /g; s/%27/'\''/g; s/%22/"/g; s/%25/%/g;'; } n3="$(mktemp --suffix .n3)" @@ -37,6 +67,9 @@ echo "$maintainers" | sed -re 's@(.*)\t(.*)\t(.*)@<my://name/\3> <my://can-be> < echo "$git_lines" | grep ' ' | cut -f 1 | sed -e 's@.*@<my://name/&> <my://is-name> <my://0>.@' echo "$git_lines" | grep -v ' ' | cut -f 1 | sed -e 's@.*@<my://name/&> <my://is-name> <my://1>.@' echo "$maintainers" | cut -f 2 | sed -e 's@.*@<my://name/&> <my://is-name> <my://0>.@' +[ -n "$NIXPKGS_GITHUB_NAME_CACHE" ] && cat "$NIXPKGS_GITHUB_NAME_CACHE" | + grep -v " $" | + sed -re 's@(.*)\t(.*)@<my://name/\1> <my://at-github> <my://github/\2>.@' ) | normalize_name | grep -E '<my://[-a-z]+>' | sort | uniq > "$n3" # Get transitive closure @@ -51,6 +84,14 @@ name_list="$( sed -re 's@<my://name/@@g; s@<my://@@g; s@>@@g;' | sort -k 2,3 -t ' ' )" +github_name_list="$( + "$sparql" --results=TSV --data="$n3" " + select ?x ?y where { + ?x (<my://can-be>+ / <my://at-github>) ?y. + } + " | tail -n +2 | + sed -re 's@<my://(name|github)/@@g; s@<my://@@g; s@>@@g;' +)" # Take first spelling option for every person name_list_canonical="$(echo "$name_list" | cut -f 1,2 | uniq -f1)" @@ -58,8 +99,24 @@ name_list_canonical="$(echo "$name_list" | cut -f 1,2 | uniq -f1)" cleaner_script="$(echo "$name_list_canonical" | denormalize_name | sed -re 's/(.*)\t(.*)/s#^\2$#\1#g/g')" +# Add github usernames +if [ -n "$NIXPKGS_GITHUB_NAME_CACHE" ]; then + github_adder_script="$(echo "$github_name_list" | + grep -E "$(echo "$name_list_canonical" | cut -f 2 | + tr '\n' '|' )" | + sort | uniq | + sed -re 's/(.*)\t(.*)/s| \1$| \1\t\2|g;/' | + denormalize_name + )" +else + github_adder_script='' +fi + echo "$name_list" | denormalize_name echo -echo "$git_data" | cut -f 1 | sed -re "$cleaner_script" | sort | uniq -c | sort -k1n +echo "$git_data" | cut -f 1 | + sed -re "$cleaner_script" | + sort | uniq -c | sort -k1n | sed -re "$github_adder_script" | + sed -re 's/^ *([0-9]+) /\1\t/' diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 737f0abc52f0..8b38489a8c19 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -12,7 +12,7 @@ let # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps # using 32bit alsa on 64bit linux. - enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null); + enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.pulseaudio != null); ids = config.ids; @@ -126,8 +126,7 @@ in { (mkIf cfg.enable { environment.systemPackages = [ cfg.package - (lib.optional enable32BitAlsaPlugins pkgs_i686.pulseaudio) - ]; + ] ++ lib.optionals enable32BitAlsaPlugins [ pkgs_i686.pulseaudio ]; environment.etc = singleton { target = "asound.conf"; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index fa51f831481a..dc5d1b7a6d23 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -154,6 +154,9 @@ collectd = 144; consul = 145; mailpile = 146; + redmine = 147; + + prosody = 148; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -275,6 +278,9 @@ riemanndash = 138; uhub = 142; mailpile = 146; + redmine = 147; + + prosody = 148; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3db44a4d8de5..35706f874ce0 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -174,6 +174,7 @@ ./services/misc/nixos-manual.nix ./services/misc/nix-ssh-serve.nix ./services/misc/phd.nix + ./services/misc/redmine.nix ./services/misc/rippled.nix ./services/misc/rogue.nix ./services/misc/siproxd.nix @@ -250,6 +251,7 @@ ./services/networking/polipo.nix ./services/networking/prayer.nix ./services/networking/privoxy.nix + ./services/networking/prosody.nix ./services/networking/quassel.nix ./services/networking/radicale.nix ./services/networking/radvd.nix diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index df81ac142dc3..41f71be2365c 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -4,6 +4,9 @@ with lib; let cfg = config.services.logstash; + pluginPath = lib.concatStringsSep ":" cfg.plugins; + havePluginPath = lib.length cfg.plugins > 0; + ops = lib.optionalString; in @@ -20,12 +23,50 @@ in description = "Enable logstash."; }; + package = mkOption { + type = types.package; + default = pkgs.logstash; + example = literalExample "pkgs.logstash"; + description = "Logstash package to use."; + }; + + plugins = mkOption { + type = types.listOf types.path; + default = [ ]; + example = literalExample "[ pkgs.logstash-contrib ]"; + description = "The paths to find other logstash plugins in."; + }; + + watchdogTimeout = mkOption { + type = types.int; + default = 10; + description = "Set watchdog timeout value in seconds."; + }; + + filterWorkers = mkOption { + type = types.int; + default = 1; + description = "The quantity of filter workers to run."; + }; + enableWeb = mkOption { type = types.bool; default = false; description = "Enable the logstash web interface."; }; + address = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "Address on which to start webserver."; + }; + + port = mkOption { + type = types.str; + default = "9292"; + description = "Port on which to start webserver."; + }; + inputConfig = mkOption { type = types.lines; default = ''stdin { type => "example" }''; @@ -79,19 +120,25 @@ in wantedBy = [ "multi-user.target" ]; environment = { JAVA_HOME = jre; }; serviceConfig = { - ExecStart = "${logstash}/bin/logstash agent -f ${writeText "logstash.conf" '' - input { - ${cfg.inputConfig} - } + ExecStart = + "${cfg.package}/bin/logstash agent " + + "-w ${toString cfg.filterWorkers} " + + ops havePluginPath "--pluginpath ${pluginPath} " + + "--watchdog-timeout ${toString cfg.watchdogTimeout} " + + "-f ${writeText "logstash.conf" '' + input { + ${cfg.inputConfig} + } - filter { - ${cfg.filterConfig} - } + filter { + ${cfg.filterConfig} + } - output { - ${cfg.outputConfig} - } - ''} ${optionalString cfg.enableWeb "-- web"}"; + output { + ${cfg.outputConfig} + } + ''} " + + ops cfg.enableWeb "-- web -a ${cfg.address} -p ${cfg.port}"; }; }; }; diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix new file mode 100644 index 000000000000..d7e64590f503 --- /dev/null +++ b/nixos/modules/services/misc/redmine.nix @@ -0,0 +1,222 @@ +{ config, lib, pkgs, ... }: + +# TODO: support non-postgresql + +with lib; + +let + cfg = config.services.redmine; + + ruby = pkgs.ruby; + rubyLibs = pkgs.rubyLibs; + + databaseYml = '' + production: + adapter: postgresql + database: ${cfg.databaseName} + host: ${cfg.databaseHost} + password: ${cfg.databasePassword} + username: ${cfg.databaseUsername} + encoding: utf8 + ''; + + configurationYml = '' + default: + # Absolute path to the directory where attachments are stored. + # The default is the 'files' directory in your Redmine instance. + # Your Redmine instance needs to have write permission on this + # directory. + # Examples: + # attachments_storage_path: /var/redmine/files + # attachments_storage_path: D:/redmine/files + attachments_storage_path: ${cfg.stateDir}/files + + # Absolute path to the SCM commands errors (stderr) log file. + # The default is to log in the 'log' directory of your Redmine instance. + # Example: + # scm_stderr_log_file: /var/log/redmine_scm_stderr.log + scm_stderr_log_file: ${cfg.stateDir}/redmine_scm_stderr.log + + ${cfg.extraConfig} + ''; + + unpackTheme = unpack "theme"; + unpackPlugin = unpack "plugin"; + unpack = id: (name: source: + pkgs.stdenv.mkDerivation { + name = "redmine-${id}-${name}"; + buildInputs = [ pkgs.unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unpackFile ${source} + ''; + }); + +in { + + options = { + services.redmine = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the redmine service. + ''; + }; + + stateDir = mkOption { + type = types.str; + default = "/var/redmine"; + description = "The state directory, logs and plugins are stored here"; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = "Extra configuration in configuration.yml"; + }; + + themes = mkOption { + type = types.attrsOf types.path; + default = {}; + description = "Set of themes"; + }; + + plugins = mkOption { + type = types.attrsOf types.path; + default = {}; + description = "Set of plugins"; + }; + + #databaseType = mkOption { + # type = types.str; + # default = "postgresql"; + # description = "Type of database"; + #}; + + databaseHost = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Database hostname"; + }; + + databasePassword = mkOption { + type = types.str; + default = ""; + description = "Database user password"; + }; + + databaseName = mkOption { + type = types.str; + default = "redmine"; + description = "Database name"; + }; + + databaseUsername = mkOption { + type = types.str; + default = "redmine"; + description = "Database user"; + }; + }; + }; + + config = mkIf cfg.enable { + + assertions = [ + { assertion = cfg.databasePassword != ""; + message = "databasePassword must be set"; + } + ]; + + users.extraUsers = [ + { name = "redmine"; + group = "redmine"; + uid = config.ids.uids.redmine; + } ]; + + users.extraGroups = [ + { name = "redmine"; + gid = config.ids.gids.redmine; + } ]; + + systemd.services.redmine = { + after = [ "network.target" "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + environment.RAILS_ENV = "production"; + environment.RAILS_ETC = "${cfg.stateDir}/config"; + environment.RAILS_LOG = "${cfg.stateDir}/log"; + environment.RAILS_VAR = "${cfg.stateDir}/var"; + environment.RAILS_CACHE = "${cfg.stateDir}/cache"; + environment.RAILS_PLUGINS = "${cfg.stateDir}/plugins"; + environment.RAILS_PUBLIC = "${cfg.stateDir}/public"; + environment.RAILS_TMP = "${cfg.stateDir}/tmp"; + environment.SCHEMA = "${cfg.stateDir}/cache/schema.db"; + environment.HOME = "${pkgs.redmine}/share/redmine"; + environment.REDMINE_LANG = "en"; + environment.GEM_HOME = "${pkgs.redmine}/share/redmine/vendor/bundle/ruby/1.9.1"; + environment.GEM_PATH = "${rubyLibs.bundler}/lib/ruby/gems/1.9"; + path = with pkgs; [ + imagemagickBig + subversion + mercurial + cvs + config.services.postgresql.package + bazaar + gitAndTools.git + # once we build binaries for darc enable it + #darcs + ]; + preStart = '' + # TODO: use env vars + for i in plugins public/plugin_assets db files log config cache var/files tmp; do + mkdir -p ${cfg.stateDir}/$i + done + + chown -R redmine:redmine ${cfg.stateDir} + chmod -R 755 ${cfg.stateDir} + + rm -rf ${cfg.stateDir}/public/* + cp -R ${pkgs.redmine}/share/redmine/public/* ${cfg.stateDir}/public/ + for theme in ${concatStringsSep " " (mapAttrsToList unpackTheme cfg.themes)}; do + ln -fs $theme/* ${cfg.stateDir}/public/themes/ + done + + rm -rf ${cfg.stateDir}/plugins/* + for plugin in ${concatStringsSep " " (mapAttrsToList unpackPlugin cfg.plugins)}; do + ln -fs $plugin/* ${cfg.stateDir}/plugins/''${plugin##*-redmine-plugin-} + done + + ln -fs ${pkgs.writeText "database.yml" databaseYml} ${cfg.stateDir}/config/database.yml + ln -fs ${pkgs.writeText "configuration.yml" configurationYml} ${cfg.stateDir}/config/configuration.yml + + if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then + if ! test -e "${cfg.stateDir}/db-created"; then + psql postgres -c "CREATE ROLE redmine WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'" + ${config.services.postgresql.package}/bin/createdb --owner redmine redmine || true + touch "${cfg.stateDir}/db-created" + fi + fi + + cd ${pkgs.redmine}/share/redmine/ + ${ruby}/bin/rake db:migrate + ${ruby}/bin/rake redmine:plugins:migrate + ${ruby}/bin/rake redmine:load_default_data + ${ruby}/bin/rake generate_secret_token + ''; + + serviceConfig = { + PermissionsStartOnly = true; # preStart must be run as root + Type = "simple"; + User = "redmine"; + Group = "redmine"; + TimeoutSec = "300"; + WorkingDirectory = "${pkgs.redmine}/share/redmine"; + ExecStart="${ruby}/bin/ruby ${pkgs.redmine}/share/redmine/script/rails server webrick -e production -P ${cfg.stateDir}/redmine.pid"; + }; + + }; + + }; + +} diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix new file mode 100644 index 000000000000..51089d00244c --- /dev/null +++ b/nixos/modules/services/networking/prosody.nix @@ -0,0 +1,275 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.prosody; + + sslOpts = { ... }: { + + options = { + + # TODO: require attribute + key = mkOption { + type = types.str; + description = "Path to the key file"; + }; + + # TODO: require attribute + cert = mkOption { + type = types.str; + description = "Path to the certificate file"; + }; + }; + }; + + moduleOpts = { + + roster = mkOption { + default = true; + description = "Allow users to have a roster"; + }; + + saslauth = mkOption { + default = true; + description = "Authentication for clients and servers. Recommended if you want to log in."; + }; + + tls = mkOption { + default = true; + description = "Add support for secure TLS on c2s/s2s connections"; + }; + + dialback = mkOption { + default = true; + description = "s2s dialback support"; + }; + + disco = mkOption { + default = true; + description = "Service discovery"; + }; + + legacyauth = mkOption { + default = true; + description = "Legacy authentication. Only used by some old clients and bots"; + }; + + version = mkOption { + default = true; + description = "Replies to server version requests"; + }; + + uptime = mkOption { + default = true; + description = "Report how long server has been running"; + }; + + time = mkOption { + default = true; + description = "Let others know the time here on this server"; + }; + + ping = mkOption { + default = true; + description = "Replies to XMPP pings with pongs"; + }; + + console = mkOption { + default = false; + description = "telnet to port 5582"; + }; + + bosh = mkOption { + default = false; + description = "Enable BOSH clients, aka 'Jabber over HTTP'"; + }; + + httpserver = mkOption { + default = false; + description = "Serve static files from a directory over HTTP"; + }; + + }; + + createSSLOptsStr = o: + if o ? key && o ? cert then + ''ssl = { key = "${o.key}"; certificate = "${o.cert}"; };'' + else ""; + + vHostOpts = { ... }: { + + options = { + + # TODO: require attribute + domain = mkOption { + type = types.str; + description = "Domain name"; + }; + + enabled = mkOption { + default = false; + description = "Whether to enable the virtual host"; + }; + + ssl = mkOption { + description = "Paths to SSL files"; + default = null; + options = [ sslOpts ]; + }; + + extraConfig = mkOption { + default = ''''; + description = "Additional virtual host specific configuration"; + }; + + }; + + }; + +in + +{ + + ###### interface + + options = { + + services.prosody = { + + enable = mkOption { + default = false; + description = "Whether to enable the prosody server"; + }; + + allowRegistration = mkOption { + default = false; + description = "Allow account creation"; + }; + + modules = moduleOpts; + + extraModules = mkOption { + description = "Enable custom modules"; + default = []; + }; + + virtualHosts = mkOption { + + description = "Define the virtual hosts"; + + type = types.loaOf types.optionSet; + + example = { + myhost = { + domain = "my-xmpp-example-host.org"; + enabled = true; + }; + }; + + default = { + localhost = { + domain = "localhost"; + enabled = true; + }; + }; + + options = [ vHostOpts ]; + }; + + ssl = mkOption { + description = "Paths to SSL files"; + default = null; + options = [ sslOpts ]; + }; + + admins = mkOption { + description = "List of administrators of the current host"; + example = [ "admin1@example.com" "admin2@example.com" ]; + default = []; + }; + + extraConfig = mkOption { + default = ''''; + description = "Additional prosody configuration"; + }; + + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.prosody ]; + + environment.etc."prosody/prosody.cfg.lua".text = '' + + pidfile = "/var/lib/prosody/prosody.pid" + + + log = "*syslog" + + data_path = "/var/lib/prosody" + + allow_registration = ${ if cfg.allowRegistration then "true" else "false" }; + + ${ optionalString cfg.modules.console "console_enabled = true;" } + + ${ optionalString (cfg.ssl != null) (createSSLOptsStr cfg.ssl) } + + admins = { ${lib.concatStringsSep ", " (map (n: "\"${n}\"") cfg.admins) } }; + + modules_enabled = { + + ${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList + (name: val: optionalString val ''"${name}";'') + cfg.modules) } + + ${ optionalString cfg.allowRegistration "\"register\"\;" } + + ${ lib.concatStringsSep "\n" (map (x: "\"${x}\";") cfg.extraModules)} + + "posix"; + }; + + ${ cfg.extraConfig } + + ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: '' + VirtualHost "${v.domain}" + enabled = ${if v.enabled then "true" else "false"}; + ${ optionalString (v.ssl != null) (createSSLOptsStr v.ssl) } + ${ v.extraConfig } + '') cfg.virtualHosts) } + ''; + + users.extraUsers.prosody = { + uid = config.ids.uids.prosody; + description = "Prosody user"; + createHome = true; + group = "prosody"; + home = "/var/lib/prosody"; + }; + + users.extraGroups.prosody = { + gid = config.ids.gids.prosody; + }; + + systemd.services.prosody = { + + description = "Prosody XMPP server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "prosody"; + PIDFile = "/var/lib/prosody/prosody.pid"; + ExecStart = "${pkgs.prosody}/bin/prosodyctl start"; + }; + + }; + + }; + +} diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix index 9ce0bcbec7eb..ded3010ec5ae 100644 --- a/nixos/modules/services/scheduling/cron.nix +++ b/nixos/modules/services/scheduling/cron.nix @@ -25,6 +25,10 @@ let sendmailPath = "/var/setuid-wrappers/sendmail"; }; + allFiles = map (f: "\"${f}\"") ( + [ "${systemCronJobsFile}" ] ++ config.services.cron.cronFiles + ); + in { @@ -71,6 +75,15 @@ in ''; }; + cronFiles = mkOption { + type = types.listOf types.path; + default = []; + description = '' + A list of extra crontab files that will be read and appended to the main + crontab file when the cron service starts. + ''; + }; + }; }; @@ -78,14 +91,7 @@ in ###### implementation - config = mkIf config.services.cron.enable { - - environment.etc = singleton - # The system-wide crontab. - { source = systemCronJobsFile; - target = "crontab"; - mode = "0600"; # Cron requires this. - }; + config = mkIf (config.services.cron.enable && allFiles != []) { security.setuidPrograms = [ "crontab" ]; @@ -100,6 +106,10 @@ in preStart = '' + rm -f /etc/crontab + cat ${toString allFiles} > /etc/crontab + chmod 0600 /etc/crontab + mkdir -m 710 -p /var/cron # By default, allow all users to create a crontab. This diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index f14f105ef239..5a9beeeafa1d 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -368,6 +368,14 @@ exec 3>&- @postMountCommands@ +# Emit a udev rule for /dev/root to prevent systemd from complaining. +eval $(udevadm info --export --export-prefix=ROOT_ --device-id-of-file=$targetRoot || true) +if [ "$ROOT_MAJOR" -a "$ROOT_MINOR" -a "$ROOT_MAJOR" != 0 ]; then + mkdir -p /run/udev/rules.d + echo 'ACTION=="add|change", SUBSYSTEM=="block", ENV{MAJOR}=="'$ROOT_MAJOR'", ENV{MINOR}=="'$ROOT_MINOR'", SYMLINK+="root"' > /run/udev/rules.d/61-dev-root-link.rules +fi + + # Stop udevd. udevadm control --exit || true diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 1ec11e70e845..6b09559876ca 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -346,9 +346,6 @@ in (isYes "BLK_DEV_INITRD") ]; - # Prevent systemd from waiting for the /dev/root symlink. - systemd.units."dev-root.device".text = ""; - boot.initrd.supportedFilesystems = map (fs: fs.fsType) fileSystems; }; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 1c4bbc16b499..eb72bfba33c0 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -155,6 +155,7 @@ in systemd.services."zpool-import" = { description = "Import zpools"; after = [ "systemd-udev-settle.service" ]; + wantedBy = [ "local-fs.target" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 6f6000cf3397..22b52f77b145 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -773,29 +773,28 @@ in wantedBy = [ "network.target" (subsystemDevice n) ]; bindsTo = deps; after = deps; + before = [ "${n}-cfg.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.ifenslave pkgs.iproute ]; script = '' - # Remove Dead Interfaces - ip link set "${n}" down >/dev/null 2>&1 || true - ifenslave -d "${n}" >/dev/null 2>&1 || true - ip link del "${n}" >/dev/null 2>&1 || true - ip link add name "${n}" type bond # !!! There must be a better way to wait for the interface while [ ! -d /sys/class/net/${n} ]; do sleep 0.1; done; + # Ensure the link is down so that we can set options + ip link set "${n}" down + # Set the miimon and mode options ${optionalString (v.miimon != null) - "echo ${toString v.miimon} > /sys/class/net/${n}/bonding/miimon"} + "echo \"${toString v.miimon}\" >/sys/class/net/${n}/bonding/miimon"} ${optionalString (v.mode != null) - "echo \"${v.mode}\" > /sys/class/net/${n}/bonding/mode"} + "echo \"${v.mode}\" >/sys/class/net/${n}/bonding/mode"} ${optionalString (v.lacp_rate != null) - "echo \"${v.lacp_rate}\" > /sys/class/net/${n}/bonding/lacp_rate"} + "echo \"${v.lacp_rate}\" >/sys/class/net/${n}/bonding/lacp_rate"} ${optionalString (v.xmit_hash_policy != null) - "echo \"${v.xmit_hash_policy}\" > /sys/class/net/${n}/bonding/xmit_hash_policy"} + "echo \"${v.xmit_hash_policy}\" >/sys/class/net/${n}/bonding/xmit_hash_policy"} # Bring up the bond and enslave the specified interfaces ip link set "${n}" up @@ -804,8 +803,10 @@ in '')} ''; postStop = '' - ip link set "${n}" down >dev/null 2>&1 || true - ifenslave -d "${n}" >/dev/null 2>&1 || true + ${flip concatMapStrings v.interfaces (i: '' + ifenslave -d "${n}" "${i}" >/dev/null 2>&1 || true + '')} + ip link set "${n}" down >/dev/null 2>&1 || true ip link del "${n}" >/dev/null 2>&1 || true ''; }); diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index ca7ca2afb65f..5173c33cab71 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -47,12 +47,10 @@ in rec { (all nixos.iso_graphical) (all nixos.ova) - #(all nixos.tests.efi-installer.simple) #(all nixos.tests.containers) (all nixos.tests.firefox) (all nixos.tests.firewall) (all nixos.tests.gnome3) - #(all nixos.tests.installer.efi) (all nixos.tests.installer.grub1) (all nixos.tests.installer.lvm) (all nixos.tests.installer.separateBoot) diff --git a/nixos/release-small.nix b/nixos/release-small.nix new file mode 100644 index 000000000000..243dddcd12cf --- /dev/null +++ b/nixos/release-small.nix @@ -0,0 +1,91 @@ +# This jobset is used to generate a NixOS channel that contains a +# small subset of Nixpkgs, mostly useful for servers that need fast +# security updates. + +{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } +, stableBranch ? false +, supportedSystems ? [ "x86_64-linux" ] # no i686-linux +}: + +let + + nixpkgsSrc = nixpkgs; # urgh + + pkgs = import ./.. {}; + + lib = pkgs.lib; + + nixos' = import ./release.nix { + inherit stableBranch supportedSystems; + nixpkgs = nixpkgsSrc; + }; + + nixpkgs' = builtins.removeAttrs (import ../pkgs/top-level/release.nix { + inherit supportedSystems; + nixpkgs = nixpkgsSrc; + }) [ "unstable" ]; + +in rec { + + nixos = { + inherit (nixos') channel manual iso_minimal dummy; + tests = { + inherit (nixos'.tests) + containers + firewall + ipv6 + login + misc + nat + nfs3 + openssh + proxy + simple; + installer = { + inherit (nixos'.tests.installer) + grub1 + lvm + separateBoot + simple; + }; + }; + }; + + nixpkgs = { + inherit (nixpkgs') + apacheHttpd_2_2 + apacheHttpd_2_4 + cmake + cryptsetup + emacs + gettext + git + imagemagick + linux + mysql51 + mysql55 + nginx + openssh + php + postgresql92 + postgresql93 + python + rsyslog + stdenv + subversion + tarball + vim; + }; + + tested = pkgs.releaseTools.aggregate { + name = "nixos-${nixos.channel.version}"; + meta = { + description = "Release-critical builds for the NixOS channel"; + maintainers = [ lib.maintainers.eelco ]; + }; + constituents = + let all = x: map (system: x.${system}) supportedSystems; in + [ nixpkgs.tarball ] ++ lib.collect lib.isDerivation nixos; + }; + +} diff --git a/nixos/release.nix b/nixos/release.nix index 7337ad7e3f45..e782b0b7c63c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -132,6 +132,10 @@ in rec { manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages); + # Build the initial ramdisk so Hydra can keep track of its size over time. + initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk); + + iso_minimal = forAllSystems (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-minimal.nix; type = "minimal"; @@ -188,12 +192,15 @@ in rec { # Ensure that all packages used by the minimal NixOS config end up in the channel. dummy = forAllSystems (system: pkgs.runCommand "dummy" - { propagatedBuildInputs = (import lib/eval-config.nix { + { toplevel = (import lib/eval-config.nix { inherit system; - modules = lib.singleton ({ config, pkgs, ... }: { }); - }).config.environment.systemPackages; + modules = lib.singleton ({ config, pkgs, ... }: + { fileSystems."/".device = lib.mkDefault "/dev/sda1"; + boot.loader.grub.device = lib.mkDefault "/dev/sda"; + }); + }).config.system.build.toplevel; } - "mkdir $out; fixupPhase"); + "mkdir $out; ln -s $toplevel $out/dummy"); # Provide a tarball that can be unpacked into an SD card, and easily @@ -231,7 +238,6 @@ in rec { tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; - tests.installer.efi = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).efi.test); tests.installer.grub1 = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).grub1.test); tests.installer.lvm = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).lvm.test); tests.installer.rebuildCD = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).rebuildCD.test); diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index c4a00ee507b2..3500ad8ccc31 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -28,7 +28,7 @@ in nodes = { tracker = { config, pkgs, ... }: - { environment.systemPackages = [ pkgs.transmission ]; + { environment.systemPackages = [ pkgs.transmission pkgs.opentracker ]; # We need Apache on the tracker to serve the torrents. services.httpd.enable = true; @@ -86,7 +86,7 @@ in # Start the tracker. !!! use a less crappy tracker $tracker->waitForUnit("network.target"); - $tracker->succeed("bittorrent-tracker --port 6969 --dfile /tmp/dstate >&2 &"); + $tracker->succeed("opentracker -p 6969 >&2 &"); $tracker->waitForOpenPort(6969); # Start the initial seeder. diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 138a81ad8075..4ee0e064c100 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -35,7 +35,7 @@ let # The configuration to install. - makeConfig = { testChannel, useEFI, grubVersion, grubDevice, grubIdentifier + makeConfig = { testChannel, grubVersion, grubDevice, grubIdentifier , readOnly ? true, forceGrubReinstallCount ? 0 }: pkgs.writeText "configuration.nix" '' { config, pkgs, modulesPath, ... }: @@ -46,18 +46,13 @@ let <nixpkgs/nixos/modules/profiles/minimal.nix> ]; - ${if useEFI then '' - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.gummiboot.enable = true; - '' else '' - boot.loader.grub.version = ${toString grubVersion}; - ${optionalString (grubVersion == 1) '' - boot.loader.grub.splashImage = null; - ''} - boot.loader.grub.device = "${grubDevice}"; - boot.loader.grub.extraConfig = "serial; terminal_output.serial"; - boot.loader.grub.fsIdentifier = "${grubIdentifier}"; + boot.loader.grub.version = ${toString grubVersion}; + ${optionalString (grubVersion == 1) '' + boot.loader.grub.splashImage = null; ''} + boot.loader.grub.device = "${grubDevice}"; + boot.loader.grub.extraConfig = "serial; terminal_output.serial"; + boot.loader.grub.fsIdentifier = "${grubIdentifier}"; boot.loader.grub.configurationLimit = 100 + ${toString forceGrubReinstallCount}; @@ -100,16 +95,14 @@ let # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create # partitions and filesystems. - testScriptFun = { createPartitions, testChannel, useEFI, grubVersion, grubDevice, grubIdentifier }: + testScriptFun = { createPartitions, testChannel, grubVersion, grubDevice, grubIdentifier }: let # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html - iface = if useEFI || grubVersion == 1 then "scsi" else "virtio"; + iface = if grubVersion == 1 then "scsi" else "virtio"; qemuFlags = (if iso.system == "x86_64-linux" then "-m 768 " else "-m 512 ") + - (optionalString (iso.system == "x86_64-linux") "-cpu kvm64 ") + - (optionalString useEFI ''-L ${efiBios} -hda ''${\(Cwd::abs_path('harddisk'))} ''); - hdFlags = optionalString (!useEFI) - ''hda => "harddisk", hdaInterface => "${iface}", ''; + (optionalString (iso.system == "x86_64-linux") "-cpu kvm64 "); + hdFlags =''hda => "harddisk", hdaInterface => "${iface}", ''; in '' createDisk("harddisk", 4 * 1024); @@ -168,7 +161,7 @@ let $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2"); $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice grubIdentifier; } }", + "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier; } }", "/mnt/etc/nixos/configuration.nix"); # Perform the installation. @@ -189,11 +182,7 @@ let # Did /boot get mounted? $machine->waitForUnit("local-fs.target"); - ${if useEFI then '' - $machine->succeed("test -e /boot/efi"); - '' else '' - $machine->succeed("test -e /boot/grub"); - ''} + $machine->succeed("test -e /boot/grub"); # Did the swap device get activated? $machine->waitForUnit("swap.target"); @@ -206,7 +195,7 @@ let # We need to a writable nix-store on next boot $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice grubIdentifier; readOnly = false; forceGrubReinstallCount = 1; } }", + "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier; readOnly = false; forceGrubReinstallCount = 1; } }", "/etc/nixos/configuration.nix"); # Check whether nixos-rebuild works. @@ -223,7 +212,7 @@ let $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); $machine->waitForUnit("multi-user.target"); $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice grubIdentifier; readOnly = false; forceGrubReinstallCount = 2; } }", + "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier; readOnly = false; forceGrubReinstallCount = 2; } }", "/etc/nixos/configuration.nix"); $machine->succeed("nixos-rebuild boot >&2"); $machine->shutdown; @@ -237,13 +226,13 @@ let makeInstallerTest = name: - { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid" }: + { createPartitions, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid" }: makeTest { inherit iso; name = "installer-" + name; nodes = if testChannel then { inherit webserver; } else { }; testScript = testScriptFun { - inherit createPartitions testChannel useEFI grubVersion grubDevice grubIdentifier; + inherit createPartitions testChannel grubVersion grubDevice grubIdentifier; }; }; @@ -369,25 +358,6 @@ in { grubDevice = "/dev/sda"; }; - # Test an EFI install. - efi = makeInstallerTest "efi" - { createPartitions = - '' - $machine->succeed( - "sgdisk -Z /dev/sda", - "sgdisk -n 1:0:+256M -n 2:0:+1024M -N 3 -t 1:ef00 -t 2:8200 -t 3:8300 -c 1:boot -c 2:swap -c 3:root /dev/sda", - "mkfs.vfat -n BOOT /dev/sda1", - "mkswap /dev/sda2 -L swap", - "swapon -L swap", - "mkfs.ext3 -L nixos /dev/sda3", - "mount LABEL=nixos /mnt", - "mkdir /mnt/boot", - "mount LABEL=BOOT /mnt/boot", - ); - ''; - useEFI = true; - }; - # Rebuild the CD configuration with a little modification. rebuildCD = makeTest { inherit iso; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 3a125ef665dd..fd61c65dba2e 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.30.0"; + version = "0.31.0"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2"; - sha256 = "0fbapd1pcixzlqxgzb2s2q1c64g9z9lf4hz3vy73z55cnpk72vdx"; + sha256 = "0n3swk4xahspf42qglikfmvcz8my43wmp6sp4ns7h4m8hr9lgfk6"; }; buildInputs = [ diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 9fbf05a2feb1..ec9b1dd47ae2 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "An ncurses console audio player designed to be powerful and easy to use"; homepage = http://moc.daper.net/; license = licenses.gpl2; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub jagajaga ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index bc28108b7cb0..ec168486f6d3 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "00bp699k8gnilin2rvgj35334s9jrizp82qwlmzzvvfliwcgqlqw"; + sha256 = "0wz2bc0x0h989schwzqjj6sx9hvzxkw4jrkflwhyrzjini1pvkxz"; }; buildInputs = [ diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index f67f23e9e09b..48b9afc8c4db 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -17,7 +17,7 @@ let desktopItem = makeDesktopItem { name = loName; exec = loName; - comment = meta.longDescription; + comment = lib.replaceChars ["\n"] [" "] meta.longDescription; desktopName = product; genericName = meta.description; categories = "Application;Development;"; @@ -147,38 +147,38 @@ in android-studio = buildAndroidStudio rec { name = "android-studio-${version}"; - version = "0.8.10"; - build = "135.1428667"; + version = "0.8.12"; + build = "135.1503853"; description = "Android development environment based on IntelliJ IDEA"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" + "/android-studio-ide-${build}-linux.zip"; - sha256 = "5736a92ffda24233026ff45a47f1b4f9567ba40347cfa0c9f351112e729b5401"; + sha256 = "225c8b2f90b9159c465eae5797132350660994184a568c631d4383313a510695"; }; }; idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "13.1.4b"; - build = "IC-135.1230"; + version = "13.1.5"; + build = "IC-135.1289"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "8b4ee25fd2934e06b87230b50e1474183ed4b331c1626a7fee69b96294d9616d"; + sha256 = "e08b9adad0ed9aa62a43f3026a1b499d1663710314d00a3bec2e171a6c375f09"; }; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "13.1.4b"; - build = "IU-135.1230"; + version = "13.1.5"; + build = "IU-135.1289"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "84660d97c9c3e4e7cfd6c2708f4685dc7322157f1e1c2888feac64df119f0606"; + sha256 = "0800b1ffc135f884e46f1004289fb75850148d705afc447d3374cfd281c231a2"; }; }; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix new file mode 100644 index 000000000000..516377f0996e --- /dev/null +++ b/pkgs/applications/editors/sigil/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl, unzip, cmake, pkgconfig, makeWrapper +, hunspell, minizip, boost, xercesc, qt5 +}: + +let + version = "0.7.4"; + +in + +stdenv.mkDerivation rec { + name = "sigil-${version}"; + + src = fetchurl { + url = "https://sigil.googlecode.com/files/Sigil-${version}-Code.zip"; + sha256 = "68c7ca15ea8611921af0c435369563f55c6afd2ef1fb0945cf6c4a47429b0fb5"; + }; + + buildInputs = [ + unzip cmake pkgconfig + hunspell minizip boost xercesc qt5 + ]; + + # XXX: the compiler seems to treat the .h file inappropriately: + # + # COMMAND ${CMAKE_CXX_COMPILER} ${compile_flags} \ + # ${CMAKE_CURRENT_SOURCE_DIR}/${header_name}.h \ + # -o ${header_name}.h.gch + # + # but using -c or -x c++-header seems to work: + # + # COMMAND ${CMAKE_CXX_COMPILER} ${compile_flags} \ + # -c ${CMAKE_CURRENT_SOURCE_DIR}/${header_name}.h \ + # -o ${header_name}.h.gch + # + # COMMAND ${CMAKE_CXX_COMPILER} ${compile_flags} \ + # -x c++-header ${CMAKE_CURRENT_SOURCE_DIR}/${header_name}.h \ + # -o ${header_name}.h.gch + # + # Might be related to: + # + # http://permalink.gmane.org/gmane.comp.gcc.bugs/361195 + buildCommand = '' + mkdir -pv $out + mkdir -pv ${name}/src ${name}/build ${name}/run + cd ${name}/src + unzip -n ${src} + sed -i \ + -e 's|\(COMMAND\) \([^ ]\+\) \([^ ]\+\) \(.*\)|\1 \2 \3 -c \4|' \ + cmake_extras/CustomPCH.cmake + cd ../build + cmake -G "Unix Makefiles" \ + -DCMAKE_INSTALL_PREFIX=$out \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_BUILD_RPATH=ON \ + ../src + make + make install + ''; + + meta = { + description = "Free, open source, multi-platform ebook (ePub) editor"; + homepage = https://code.google.com/p/sigil/; + license = stdenv.lib.licenses.gpl3; + inherit version; + }; +} diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index da6838880630..e498533d63d2 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchurlGnome { project = "dia"; - major = "0"; minor = "97"; patchlevel = "2"; extension = "xz"; - sha256 = "1qgawm7rrf4wd1yc0fp39ywv8gbz4ry1s16k00dzg5w6p67lfqd7"; + major = "0"; minor = "97"; patchlevel = "3"; extension = "xz"; + sha256 = "0d3x6w0l6fwd0l8xx06y1h56xf8ss31yzia3a6xr9y28xx44x492"; }; correctPersistence = fetchurl { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; - patches = [ ./glib-top-level-header.patch ]; + patches = [ ]; # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command # It have no reasons to exist in a redistribuable package diff --git a/pkgs/applications/graphics/dia/glib-top-level-header.patch b/pkgs/applications/graphics/dia/glib-top-level-header.patch deleted file mode 100644 index 80460ae9d722..000000000000 --- a/pkgs/applications/graphics/dia/glib-top-level-header.patch +++ /dev/null @@ -1,471 +0,0 @@ -diff -Naur dia-0.97.2-orig/app/app_procs.c dia-0.97.2/app/app_procs.c ---- dia-0.97.2-orig/app/app_procs.c 2011-03-20 07:18:13.000000000 -0400 -+++ dia-0.97.2/app/app_procs.c 2012-07-15 10:49:08.192726306 -0400 -@@ -50,7 +50,7 @@ - #include <libxml/parser.h> - #include <libxml/xmlerror.h> - --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "app_procs.h" -diff -Naur dia-0.97.2-orig/app/dia-win-remote.c dia-0.97.2/app/dia-win-remote.c ---- dia-0.97.2-orig/app/dia-win-remote.c 2010-08-03 11:35:35.000000000 -0400 -+++ dia-0.97.2/app/dia-win-remote.c 2012-07-15 10:49:08.159726316 -0400 -@@ -35,7 +35,7 @@ - #include <shellapi.h> - #include <Shlwapi.h> - #include <glib.h> --#include <glib/gprintf.h> -+#include <glib.h> - - /** - * PROTOTYPES: -diff -Naur dia-0.97.2-orig/app/filedlg.c dia-0.97.2/app/filedlg.c ---- dia-0.97.2-orig/app/filedlg.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/app/filedlg.c 2012-07-15 10:49:08.227726294 -0400 -@@ -28,7 +28,7 @@ - #include <unistd.h> - #endif - #include <stdio.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #undef GTK_DISABLE_DEPRECATED /* gtk_file_chooser_dialog_new_with_backend */ - #include <gtk/gtk.h> -diff -Naur dia-0.97.2-orig/app/load_save.c dia-0.97.2/app/load_save.c ---- dia-0.97.2-orig/app/load_save.c 2011-09-25 07:55:11.000000000 -0400 -+++ dia-0.97.2/app/load_save.c 2012-07-15 10:49:08.203726303 -0400 -@@ -30,7 +30,7 @@ - #include <string.h> - - #include <glib.h> --#include <glib/gstdio.h> /* g_access() and friends */ -+#include <glib.h> /* g_access() and friends */ - #include <errno.h> - - #ifndef W_OK -diff -Naur dia-0.97.2-orig/app/sheets_dialog_callbacks.c dia-0.97.2/app/sheets_dialog_callbacks.c ---- dia-0.97.2-orig/app/sheets_dialog_callbacks.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/app/sheets_dialog_callbacks.c 2012-07-15 10:49:08.201726302 -0400 -@@ -44,7 +44,7 @@ - #endif - #endif - --#include <glib/gstdio.h> -+#include <glib.h> - #include <gmodule.h> - - #undef GTK_DISABLE_DEPRECATED /* GtkOptionMenu */ -diff -Naur dia-0.97.2-orig/ChangeLog.pre-git dia-0.97.2/ChangeLog.pre-git ---- dia-0.97.2-orig/ChangeLog.pre-git 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/ChangeLog.pre-git 2012-07-15 10:49:08.384726247 -0400 -@@ -4137,7 +4137,7 @@ - plug-ins/vdx/vdx-export.c plug-ins/vdx/vdx-import.c - plug-ins/wmf/wmf.cpp plug-ins/wpg/wpg.c - plug-ins/xfig/xfig-export.c plug-ins/xfig/xfig-import.c -- plug-ins/xslt/xslt.c : use <glib/gstdio.h> to match GLib's filename -+ plug-ins/xslt/xslt.c : use <glib.h> to match GLib's filename - encoding to the io functions used, that is: g_open, g_fopen, g_stat, - g_unlink, g_mkdir, g_rename (, g_access, g_lstat, g_remove, g_freopen, - g_chdir, g_rmdir). Also replace gzopen() with gzdopen(g_open(), ...) -@@ -5995,7 +5995,7 @@ - Also special case strings starting with \tex - i.e. dont escape them - - to keep the use-case of direct tex input. - -- * lib/debug.c : #include <glib/gprintf.h> not just <gprintf.h> -+ * lib/debug.c : #include <glib.h> - - - 2006-01-14 Hans Breuer <hans@breuer.org> -@@ -6207,7 +6207,7 @@ - * lib/makefile.msc : build debug.obj - - * plug-ins/makefile.msc : building pgf in the right alphabetical order -- * plug-ins/pgf/render_pgf.c : include <glib/gprintf.h> -+ * plug-ins/pgf/render_pgf.c : include <glib.h> - - 2005-12-08 Lars Clausen <lars@raeder.dk> - -diff -Naur dia-0.97.2-orig/lib/debug.c dia-0.97.2/lib/debug.c ---- dia-0.97.2-orig/lib/debug.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/lib/debug.c 2012-07-15 10:49:06.813726730 -0400 -@@ -21,7 +21,7 @@ - #include <config.h> - - #include <stdio.h> --#include <glib/gprintf.h> -+#include <glib.h> - #include <stdarg.h> - - #include "debug.h" -diff -Naur dia-0.97.2-orig/lib/dia_dirs.c dia-0.97.2/lib/dia_dirs.c ---- dia-0.97.2-orig/lib/dia_dirs.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/lib/dia_dirs.c 2012-07-15 10:49:06.740726750 -0400 -@@ -30,7 +30,7 @@ - #include <sys/stat.h> - #include <sys/types.h> - #endif --#include <glib/gstdio.h> -+#include <glib.h> - - /** Get the name of a subdirectory of our data directory. - * This function does not create the subdirectory, just make the correct name. -diff -Naur dia-0.97.2-orig/lib/dia_xml.c dia-0.97.2/lib/dia_xml.c ---- dia-0.97.2-orig/lib/dia_xml.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/lib/dia_xml.c 2012-07-15 10:49:06.770726743 -0400 -@@ -25,7 +25,7 @@ - #include <fcntl.h> - - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include <libxml/parser.h> - #include <libxml/parserInternals.h> -diff -Naur dia-0.97.2-orig/objects/custom/shape_typeinfo.c dia-0.97.2/objects/custom/shape_typeinfo.c ---- dia-0.97.2-orig/objects/custom/shape_typeinfo.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/objects/custom/shape_typeinfo.c 2012-07-15 10:49:06.639726783 -0400 -@@ -27,8 +27,8 @@ - #include "custom_util.h" - #include <string.h> - #include <stdarg.h> --#include <glib/gstrfuncs.h> --#include <glib/gstdio.h> -+#include <glib.h> -+#include <glib.h> - #include <libxml/parser.h> - - /* -diff -Naur dia-0.97.2-orig/objects/SISSI/sissi.c dia-0.97.2/objects/SISSI/sissi.c ---- dia-0.97.2-orig/objects/SISSI/sissi.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/objects/SISSI/sissi.c 2012-07-15 10:49:06.570726804 -0400 -@@ -42,7 +42,7 @@ - #include "dia_xml_libxml.h" - - #include <string.h> --#include <glib/gprintf.h> -+#include <glib.h> - - #define DEFAULT_WIDTH 1.0 - #define DEFAULT_HEIGHT 1.0 -diff -Naur dia-0.97.2-orig/objects/standard/image.c dia-0.97.2/objects/standard/image.c ---- dia-0.97.2-orig/objects/standard/image.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/objects/standard/image.c 2012-07-15 10:49:06.683726770 -0400 -@@ -25,7 +25,7 @@ - #ifdef HAVE_UNIST_H - #include <unistd.h> - #endif --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/cairo/diacairo.c dia-0.97.2/plug-ins/cairo/diacairo.c ---- dia-0.97.2-orig/plug-ins/cairo/diacairo.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/plug-ins/cairo/diacairo.c 2012-07-15 10:49:06.433726846 -0400 -@@ -28,7 +28,7 @@ - #include <errno.h> - #define G_LOG_DOMAIN "DiaCairo" - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - /* - * To me the following looks rather suspicious. Why do we need to compile -diff -Naur dia-0.97.2-orig/plug-ins/cairo/diacairo-renderer.c dia-0.97.2/plug-ins/cairo/diacairo-renderer.c ---- dia-0.97.2-orig/plug-ins/cairo/diacairo-renderer.c 2011-01-07 06:54:21.000000000 -0500 -+++ dia-0.97.2/plug-ins/cairo/diacairo-renderer.c 2012-07-15 10:49:06.435726846 -0400 -@@ -28,7 +28,7 @@ - #include <errno.h> - #define G_LOG_DOMAIN "DiaCairo" - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #ifdef HAVE_PANGOCAIRO_H - #include <pango/pangocairo.h> -diff -Naur dia-0.97.2-orig/plug-ins/cgm/cgm.c dia-0.97.2/plug-ins/cgm/cgm.c ---- dia-0.97.2-orig/plug-ins/cgm/cgm.c 2009-12-27 11:22:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/cgm/cgm.c 2012-07-15 10:49:06.425726846 -0400 -@@ -31,7 +31,7 @@ - #include <glib.h> - #include <errno.h> - --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/drs/dia-render-script.c dia-0.97.2/plug-ins/drs/dia-render-script.c ---- dia-0.97.2-orig/plug-ins/drs/dia-render-script.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/plug-ins/drs/dia-render-script.c 2012-07-15 10:49:06.427726848 -0400 -@@ -54,7 +54,7 @@ - - #define G_LOG_DOMAIN "DiaRenderScript" - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "filter.h" -diff -Naur dia-0.97.2-orig/plug-ins/dxf/dxf-export.c dia-0.97.2/plug-ins/dxf/dxf-export.c ---- dia-0.97.2-orig/plug-ins/dxf/dxf-export.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/dxf/dxf-export.c 2012-07-15 10:49:06.421726850 -0400 -@@ -29,7 +29,7 @@ - #include <math.h> - #include <glib.h> - #include <errno.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "autocad_pal.h" - -diff -Naur dia-0.97.2-orig/plug-ins/dxf/dxf-import.c dia-0.97.2/plug-ins/dxf/dxf-import.c ---- dia-0.97.2-orig/plug-ins/dxf/dxf-import.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/dxf/dxf-import.c 2012-07-15 10:49:06.419726851 -0400 -@@ -30,7 +30,7 @@ - #include <string.h> - #include <math.h> - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/hpgl/hpgl.c dia-0.97.2/plug-ins/hpgl/hpgl.c ---- dia-0.97.2-orig/plug-ins/hpgl/hpgl.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/hpgl/hpgl.c 2012-07-15 10:49:06.487726830 -0400 -@@ -37,7 +37,7 @@ - #include <errno.h> - - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/libart/export_png.c dia-0.97.2/plug-ins/libart/export_png.c ---- dia-0.97.2-orig/plug-ins/libart/export_png.c 2011-07-03 06:56:08.000000000 -0400 -+++ dia-0.97.2/plug-ins/libart/export_png.c 2012-07-15 10:49:06.415726849 -0400 -@@ -29,7 +29,7 @@ - #include <errno.h> - #include <stdlib.h> - --#include <glib/gstdio.h> -+#include <glib.h> - #include <gtk/gtk.h> - - #include "intl.h" -diff -Naur dia-0.97.2-orig/plug-ins/metapost/render_metapost.c dia-0.97.2/plug-ins/metapost/render_metapost.c ---- dia-0.97.2-orig/plug-ins/metapost/render_metapost.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/metapost/render_metapost.c 2012-07-15 10:49:06.396726857 -0400 -@@ -43,7 +43,7 @@ - #endif - #include <errno.h> - --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "render_metapost.h" -diff -Naur dia-0.97.2-orig/plug-ins/pgf/render_pgf.c dia-0.97.2/plug-ins/pgf/render_pgf.c ---- dia-0.97.2-orig/plug-ins/pgf/render_pgf.c 2011-01-07 07:11:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/pgf/render_pgf.c 2012-07-15 10:49:06.445726842 -0400 -@@ -61,8 +61,8 @@ - #endif - #include <errno.h> - --#include <glib/gprintf.h> --#include <glib/gstdio.h> -+#include <glib.h> -+#include <glib.h> - - #include "intl.h" - #include "render_pgf.h" -diff -Naur dia-0.97.2-orig/plug-ins/postscript/paginate_psprint.c dia-0.97.2/plug-ins/postscript/paginate_psprint.c ---- dia-0.97.2-orig/plug-ins/postscript/paginate_psprint.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/postscript/paginate_psprint.c 2012-07-15 10:49:06.451726838 -0400 -@@ -31,7 +31,7 @@ - #include <errno.h> - #include <sys/stat.h> - --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/postscript/render_eps.c dia-0.97.2/plug-ins/postscript/render_eps.c ---- dia-0.97.2-orig/plug-ins/postscript/render_eps.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/postscript/render_eps.c 2012-07-15 10:49:06.451726838 -0400 -@@ -55,7 +55,7 @@ - #include <locale.h> - #include <errno.h> - --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "render_eps.h" -diff -Naur dia-0.97.2-orig/plug-ins/pstricks/render_pstricks.c dia-0.97.2/plug-ins/pstricks/render_pstricks.c ---- dia-0.97.2-orig/plug-ins/pstricks/render_pstricks.c 2011-01-07 07:11:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/pstricks/render_pstricks.c 2012-07-15 10:49:06.410726853 -0400 -@@ -50,7 +50,7 @@ - #endif - #include <errno.h> - --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "render_pstricks.h" -diff -Naur dia-0.97.2-orig/plug-ins/python/pydia-render.c dia-0.97.2/plug-ins/python/pydia-render.c ---- dia-0.97.2-orig/plug-ins/python/pydia-render.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/python/pydia-render.c 2012-07-15 10:49:06.503726822 -0400 -@@ -21,7 +21,7 @@ - - #include <Python.h> - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include <locale.h> - -diff -Naur dia-0.97.2-orig/plug-ins/shape/shape-export.c dia-0.97.2/plug-ins/shape/shape-export.c ---- dia-0.97.2-orig/plug-ins/shape/shape-export.c 2009-11-08 06:14:56.000000000 -0500 -+++ dia-0.97.2/plug-ins/shape/shape-export.c 2012-07-15 10:49:06.489726827 -0400 -@@ -40,7 +40,7 @@ - #include <unistd.h> - #endif - --#include <glib/gstdio.h> -+#include <glib.h> - - /* the dots per centimetre to render this diagram at */ - /* this matches the setting `100%' setting in dia. */ -diff -Naur dia-0.97.2-orig/plug-ins/svg/render_svg.c dia-0.97.2/plug-ins/svg/render_svg.c ---- dia-0.97.2-orig/plug-ins/svg/render_svg.c 2011-12-17 11:30:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/svg/render_svg.c 2012-07-15 10:49:06.392726859 -0400 -@@ -30,7 +30,7 @@ - #endif - - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include <libxml/entities.h> - #include <libxml/tree.h> -diff -Naur dia-0.97.2-orig/plug-ins/vdx/vdx-export.c dia-0.97.2/plug-ins/vdx/vdx-export.c ---- dia-0.97.2-orig/plug-ins/vdx/vdx-export.c 2009-12-27 11:22:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/vdx/vdx-export.c 2012-07-15 10:55:17.066579728 -0400 -@@ -32,11 +32,12 @@ - - #include <string.h> - #include <math.h> -+#include <sys/stat.h> - #include <glib.h> - #include <stdlib.h> - #include <errno.h> - #include <locale.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/vdx/vdx-import.c dia-0.97.2/plug-ins/vdx/vdx-import.c ---- dia-0.97.2-orig/plug-ins/vdx/vdx-import.c 2009-12-27 11:22:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/vdx/vdx-import.c 2012-07-15 10:49:06.466726836 -0400 -@@ -28,7 +28,7 @@ - #include <string.h> - #include <math.h> - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - #include <stdlib.h> - #include <ctype.h> - #include <libxml/tree.h> -diff -Naur dia-0.97.2-orig/plug-ins/wmf/wmf.cpp dia-0.97.2/plug-ins/wmf/wmf.cpp ---- dia-0.97.2-orig/plug-ins/wmf/wmf.cpp 2011-03-13 09:07:48.000000000 -0400 -+++ dia-0.97.2/plug-ins/wmf/wmf.cpp 2012-07-15 10:49:06.482726831 -0400 -@@ -25,7 +25,7 @@ - #include <string.h> - #include <math.h> - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/wpg/wpg.c dia-0.97.2/plug-ins/wpg/wpg.c ---- dia-0.97.2-orig/plug-ins/wpg/wpg.c 2009-11-07 09:28:34.000000000 -0500 -+++ dia-0.97.2/plug-ins/wpg/wpg.c 2012-07-15 10:49:06.406726855 -0400 -@@ -40,7 +40,7 @@ - #include <errno.h> - - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/xfig/xfig-export.c dia-0.97.2/plug-ins/xfig/xfig-export.c ---- dia-0.97.2-orig/plug-ins/xfig/xfig-export.c 2011-12-17 11:30:38.000000000 -0500 -+++ dia-0.97.2/plug-ins/xfig/xfig-export.c 2012-07-15 10:49:06.400726856 -0400 -@@ -16,7 +16,7 @@ - #include <locale.h> - - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/xfig/xfig-import.c dia-0.97.2/plug-ins/xfig/xfig-import.c ---- dia-0.97.2-orig/plug-ins/xfig/xfig-import.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/plug-ins/xfig/xfig-import.c 2012-07-15 10:49:06.402726853 -0400 -@@ -40,7 +40,7 @@ - #include <locale.h> - - #include <glib.h> --#include <glib/gstdio.h> -+#include <glib.h> - - #include "intl.h" - #include "message.h" -diff -Naur dia-0.97.2-orig/plug-ins/xslt/xslt.c dia-0.97.2/plug-ins/xslt/xslt.c ---- dia-0.97.2-orig/plug-ins/xslt/xslt.c 2009-11-07 12:13:53.000000000 -0500 -+++ dia-0.97.2/plug-ins/xslt/xslt.c 2012-07-15 10:49:06.440726844 -0400 -@@ -27,7 +27,7 @@ - #include <string.h> - #include <errno.h> - --#include <glib/gstdio.h> -+#include <glib.h> - - #include "filter.h" - #include "intl.h" -diff -Naur dia-0.97.2-orig/tests/test-boundingbox.c dia-0.97.2/tests/test-boundingbox.c ---- dia-0.97.2-orig/tests/test-boundingbox.c 2009-11-07 09:28:35.000000000 -0500 -+++ dia-0.97.2/tests/test-boundingbox.c 2012-07-15 10:49:06.986726677 -0400 -@@ -29,7 +29,7 @@ - #include <glib-object.h> - - #if GLIB_CHECK_VERSION(2,16,0) --#include <glib/gtestutils.h> -+#include <glib.h> - #endif - #include "dialib.h" - -diff -Naur dia-0.97.2-orig/tests/test-objects.c dia-0.97.2/tests/test-objects.c ---- dia-0.97.2-orig/tests/test-objects.c 2009-11-07 09:28:35.000000000 -0500 -+++ dia-0.97.2/tests/test-objects.c 2012-07-15 10:49:06.985726677 -0400 -@@ -29,7 +29,7 @@ - #include <glib-object.h> - - #if GLIB_CHECK_VERSION(2,16,0) --#include <glib/gtestutils.h> -+#include <glib.h> - #endif - - #include "object.h" diff --git a/pkgs/applications/graphics/f-spot/default.nix b/pkgs/applications/graphics/f-spot/default.nix index 8ecfc0df1622..291f0adce582 100644 --- a/pkgs/applications/graphics/f-spot/default.nix +++ b/pkgs/applications/graphics/f-spot/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://tarballs.nixos.org/f-spot-0.0.10.tar.bz2; - md5 = "19cc6e067ccc261b0502ff6189b79832"; + sha256 = "1hgls6hzvxsnk09j9y6hq10qxsc92i864mdg3gk2cimbkbr0mh8b"; }; patches = [./dllmap.patch]; diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index ad8735a6dff3..b4becafdb0b4 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, lzip, texinfo }: stdenv.mkDerivation rec { - name = "ocrad-0.23"; + name = "ocrad-0.24"; src = fetchurl { url = "mirror://gnu/ocrad/${name}.tar.lz"; - sha256 = "0vx0v4sz8ivgcp04zggdq9cv9sb5zxnn7j1nm15cds0zq1wr9g7m"; + sha256 = "0hhlx072d00bi9qia0nj5izsq4qkscpfz2mpbyfc72msl3hfvslv"; }; buildInputs = [ lzip texinfo ]; diff --git a/pkgs/applications/graphics/sxiv/146.patch b/pkgs/applications/graphics/sxiv/146.patch new file mode 100644 index 000000000000..ad1b030e1a46 --- /dev/null +++ b/pkgs/applications/graphics/sxiv/146.patch @@ -0,0 +1,25 @@ +From b901236261dc717dc08ed10f63e2d5cd3f3031f8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b@bpiotrowski.pl> +Date: Tue, 27 May 2014 11:46:06 +0200 +Subject: [PATCH] Fix build with giflib >= 5.1.0. + +--- + image.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/image.c b/image.c +index e62a69f..7eec544 100644 +--- a/image.c ++++ b/image.c +@@ -278,7 +278,11 @@ bool img_load_gif(img_t *img, const fileinfo_t *file) + } + } while (rec != TERMINATE_RECORD_TYPE); + ++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1 ++ DGifCloseFile(gif, NULL); ++#else + DGifCloseFile(gif); ++#endif + + if (err && !file->loaded) + warn("corrupted gif file: %s", file->name); diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 30513577d04b..9997d5ec734b 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl, libX11, imlib2, giflib }: -stdenv.mkDerivation { - name = "sxiv-1.1.1"; +stdenv.mkDerivation rec { + name = "sxiv-1.2"; src = fetchurl { - url = "https://github.com/muennich/sxiv/archive/v1.1.1.tar.gz"; - name = "sxiv-1.1.tar.gz"; - sha256 = "07r8125xa8d5q71ql71s4i1dx4swy8hypxh2s5h7z2jnn5y9nmih"; + url = "https://github.com/muennich/sxiv/archive/v1.2.tar.gz"; + name = "${name}.tar.gz"; + sha256 = "1wwcxy2adc67xd8x6c2sayy1cjcwrv2lvv1iwln7y4w992gbcxmc"; }; + patches = [ ./146.patch ]; + buildInputs = [ libX11 imlib2 giflib ]; prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index dbfda4e58195..3de3d6cdd5a9 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -2,12 +2,12 @@ , libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview, lensfun }: stdenv.mkDerivation rec { - name = "ufraw-0.19.2"; + name = "ufraw-0.20"; src = fetchurl { # XXX: These guys appear to mutate uploaded tarballs! url = "mirror://sourceforge/ufraw/${name}.tar.gz"; - sha256 = "1lxba7pb3vcsq94dwapg9bk9mb3ww6r3pvvcyb0ah5gh2sgzxgkk"; + sha256 = "1q51p0ynzayxwfpilj0s38aapgkfga00gbl7xi0ndx9q6bvk1kbd"; }; buildInputs = diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index d1b3b2840526..d96236c94ee0 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/cdrtools/${name}.tar.bz2"; - md5 = "d44a81460e97ae02931c31188fe8d3fd"; + sha256 = "08kc5w4z5k2ka7i05an7gfzzp0fsrc403riav7bw8xws0rsn32vj"; }; patches = [./cdrtools-2.01-install.patch]; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index c290cdfb6908..581081975e53 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,14 +1,14 @@ { stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }: let py = python27Packages; - version = "14.07"; + version = "14.09"; in stdenv.mkDerivation rec { name = "cura-${version}"; src = fetchurl { url = "https://github.com/daid/Cura/archive/${version}.tar.gz"; - sha256 = "1jfgkb2qh1syakcssk66yhnfjm9p9qcx48v34bbza9nryrdlmxdb"; + sha256 = "1nr26hfqa6chim5qch92wpk0s28wfvznvcf3kkzgf23hw707f40v"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 7ff253fd4e8d..eafa5c104058 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.3"; + name = "gphoto2-2.5.5"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0i6qjyvgn3aaspiblmiwv51mfy92gm73xpbd3z41ki8mw7plg53i"; + sha256 = "1d0lvp5gsrss72597wixhgh8prcw4g7izfg3zdzzsswjgnlsxsal"; }; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index fab492d5c099..f611eb823bb0 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20140227"; + version = "3.20140916"; lib = stdenv.lib; in @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "1bbpqs4c1la1yqcxcxj3xip3wadjnjq0wawv19j6d6baymm66cr3"; + sha256 = "05nws8jkcbhg767wqgn7in1p8zbcx2kdnhxz19fq52ncfzk2ndn0"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index b3fafbc40169..e47e87d6338c 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "keepass-${version}"; - version = "2.27"; + version = "2.28"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}.zip"; - sha256 = "1qi7pls5xrv7ma53bwka738idvnxk82dvhk06m1snc8c29dws7fa"; + sha256 = "0rlll6qriflaibqpw9qqfgqqr7cvhl404c3ph6n2i22j7xn5mizh"; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 17b5c92406b0..978dd19e3dfa 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -4,13 +4,13 @@ let mkSweetHome3D = - { name, module, version, src, license, description }: + { name, module, version, src, license, description, icon }: stdenv.mkDerivation rec { - inherit name version src description; + inherit name version src description icon; exec = stdenv.lib.toLower module; sweethome3dItem = makeDesktopItem { - inherit name exec; + inherit name exec icon; comment = description; desktopName = name; genericName = "Computer Aided (Interior) Design"; @@ -61,6 +61,10 @@ in rec { module = module; tag = "V_" + d2u version; }; + icon = fetchurl { + url = "http://sweethome3d.cvs.sourceforge.net/viewvc/sweethome3d/SweetHome3D/src/com/eteks/sweethome3d/viewcontroller/resources/help/images/sweethome3d.png"; + sha256 = "0lnv2sz2d3m8jx25hz92gzardf0iblykhy5q0q2cyb7mw2qb2p92"; + }; }; } diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 8d73dfebb188..65201f2495b9 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,23 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, alsaCore, alsaMixer, dbus, filepath, hinotify, HTTP -, libmpd, libXrandr, mtl, parsec, regexCompat, stm, time -, timezoneOlson, timezoneSeries, utf8String, wirelesstools, X11 -, X11Xft +, libmpd, libXpm, libXrandr, mtl, parsec, regexCompat, stm, time +, timezoneOlson, timezoneSeries, transformers, utf8String +, wirelesstools, X11, X11Xft }: cabal.mkDerivation (self: { pname = "xmobar"; - version = "0.21"; - sha256 = "1h0gsb808zm4j4kmw7fl4339wllc16ldy1ki96l8w3fvj30bcxpm"; + version = "0.22.1"; + sha256 = "0mnwwcfk0xf4fi3cnw19s6lxcg8sbsdlvg7zwvf5xf0y9q365swz"; isLibrary = false; isExecutable = true; buildDepends = [ alsaCore alsaMixer dbus filepath hinotify HTTP libmpd mtl parsec - regexCompat stm time timezoneOlson timezoneSeries utf8String X11 - X11Xft + regexCompat stm time timezoneOlson timezoneSeries transformers + utf8String X11 X11Xft ]; - extraLibraries = [ libXrandr wirelesstools ]; + extraLibraries = [ libXpm libXrandr wirelesstools ]; configureFlags = "-fall_extensions"; meta = { homepage = "http://xmobar.org"; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 00e9ab0c810c..3365e62f8be3 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "xterm-303"; + name = "xterm-312"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "0n7hay16aam9kfn642ri0wj5yzilbjm3l8znxc2p5dx9pn3rkwla"; + sha256 = "0vpkhls3i12ly4r68igz91vh6s9179wihjkdy0gvwr752hdqxm7s"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index e85369f763b7..0640a6abd09c 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "39.0.2171.7"; - sha256 = "1wxi601zsi10jw7ypa4i0a2g5hd3hqrb5pqkkry1pgbdimw69sb8"; - sha256bin32 = "11isyislr5mbbhwk625b347xyyp1x3xgws844sjbbcx83gf0ij7y"; - sha256bin64 = "16b0yzlm8j7kx8pc6fhzwiizl7zrzxmfal40q45848715jyln8hf"; + version = "40.0.2182.3"; + sha256 = "1713y6f2q5qh32wg027nphkv6p6rgq0q1awqcy543ypbk9p1jvbm"; + sha256bin32 = "0qf0ccfg77qc17iy5cndkp827s8li3qyxasmgjq224g579wcj0bl"; + sha256bin64 = "07f97m548kj7indpzyyvksa4gisndxc1s8qslk43mgsx26kz62rf"; }; beta = { - version = "38.0.2125.101"; - sha256 = "12hrl7i0xrjdwz8yaap5jhc6bzn29pk6dcz96743n6j7mcckac6k"; - sha256bin32 = "178nffl5pgqajg7vxxisycl79vnyv1iqqz04riywgj88mw7mjwpg"; - sha256bin64 = "0akwvnl987w8wli4h4k2x8xnpkzk9n8hn9wbp1lw87ch08sr7zfm"; + version = "39.0.2171.19"; + sha256 = "19j86hzh552a73mvabzgdiq0s1ypr30b6lkn4kfxc2vhs1ds8nmg"; + sha256bin32 = "06imcc3r6g4f7yi8b4mzknqk11khzk44pjrw0qnw40kgjf0kkgd3"; + sha256bin64 = "0qd594rbg049g1h4s7lgw9abcccx6wrl3fggkd1z9bl8ihj54j4b"; }; stable = { - version = "37.0.2062.120"; - sha256 = "1yvf1hzza5cdsa67dg302ifcwb759r8sf2z21p9q9wyanrc3f1xk"; - sha256bin32 = "07zwf5yn3ig8x9ysjdpm7w1fh4rcyxzfsnqvxmabc0bkrv2r1hg7"; - sha256bin64 = "02qc5qq5v9k55c5bxmndjh1xl6j1qaxk7k4r8mm0k5nxxyqih1p2"; + version = "38.0.2125.101"; + sha256 = "12hrl7i0xrjdwz8yaap5jhc6bzn29pk6dcz96743n6j7mcckac6k"; + sha256bin32 = "1c35j4wx53njcqbdqznz2m0791bb9lpmhnpkrll36051437f25wl"; + sha256bin64 = "1k8hrrxlqc1mv88v2qkyq8188lfaibvqpqg0g8qgj2ha5vsnvwvw"; }; } diff --git a/pkgs/applications/networking/browsers/links/default.nix b/pkgs/applications/networking/browsers/links/default.nix index 6bbd0fc800c1..8e78a0bd89cb 100644 --- a/pkgs/applications/networking/browsers/links/default.nix +++ b/pkgs/applications/networking/browsers/links/default.nix @@ -4,6 +4,6 @@ stdenv.mkDerivation { name = "links-1.00pre15"; src = fetchurl { url = http://artax.karlin.mff.cuni.cz/~mikulas/links/download/links-1.00pre15.tar.gz; - md5 = "f64823b9a1ac2d79df578a991dfae8b8"; + sha256 = "0yzgzc6jm9vhv7rgbj5s9zwxn9fnf4nyap9l6dzgpwsn7m18vprv"; }; } diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index cdbc4233cf48..320e7094d484 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,51 +1,43 @@ -x@{builderDefsPackage - , guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool - , libunwind, ncurses - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchgit +, guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool +, libunwind, ncurses, curl, jansson, texinfo +, automake, autoconf +}: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { +let + s = rec { baseName="freetalk"; - version="3.2"; + version="4.0rc6"; name="${baseName}-${version}"; - url="mirror://savannah/${baseName}/${name}.tar.gz"; - hash="12dn7yj9k5xsrrjlnma77wzpvsdxjccwla1q0wy3lacl5l2p0jms"; + url="https://github.com/GNUFreetalk/freetalk"; + rev = "refs/tags/v${version}"; + sha256="0sj3bwq9n6ijwv552nmi038sz7wayq8r3zaj6ngn2cnkn2b5nwbz"; }; + buildInputs = [ + guile pkgconfig glib loudmouth gmp libidn readline libtool + libunwind ncurses curl jansson texinfo + autoconf automake + ]; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; +stdenv.mkDerivation { + inherit (s) name version; inherit buildInputs; + src = fetchgit { + inherit (s) url rev sha256; + name = "git-export-${s.name}"; + }; - patches = [./01_callbacks_const_fix.diff]; + preConfigure = '' + patchShebangs . + ./autogen.sh + ''; - /* doConfigure should be removed if not needed */ - phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; - meta = { - description = "Console XMPP client"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl3Plus; + inherit (s) version; + description = "Console XMPP client"; + license = stdenv.lib.licenses.gpl3Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://www.gnu.org/software/freetalk/"; }; - passthru = { - updateInfo = { - downloadPage = "http://www.gnu.org/software/freetalk/"; - }; - }; -}) x - +} diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index d5902d143590..8584eb84273d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,21 +22,15 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.15.4"; + version = "0.16"; src = fetchurl { - url = "http://www.gajim.org/downloads/0.15/gajim-${version}.tar.gz"; - sha256 = "1g4m5j777vqqdwqvr2m6l09ljjx65ilag45d5kfc78z7frm0cz7g"; + url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2"; + sha256 = "14x15jwgl0c6vwj02ccpzmxr3fczp632mnj50cpklbaj4bxqvgbs"; }; patches = [ (fetchurl { - name = "gajim-drill-srv.patch"; - url = "https://projects.archlinux.org/svntogit/packages.git/" - + "plain/trunk/gajim-drill.patch?h=packages/gajim"; - sha256 = "1k8zz3ns0l0kriffq41jgkv5ym6jvyd24171l7s98v9d81prdw1w"; - }) - (fetchurl { name = "gajim-icon-index.patch"; url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb"; sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv"; @@ -69,6 +63,7 @@ stdenv.mkDerivation rec { pythonPackages.pygobject pythonPackages.pyGtkGlade pythonPackages.sqlite3 pythonPackages.pyasn1 pythonPackages.pyxdg + pythonPackages.nbxmpp pyopenssl pythonDBus ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ] ++ optional enableE2E pythonPackages.pycrypto @@ -88,5 +83,7 @@ stdenv.mkDerivation rec { description = "Jabber client written in PyGTK"; license = licenses.gpl3Plus; maintainers = [ maintainers.raskin maintainers.aszlig ]; + downloadPage = "http://gajim.org/downloads.php"; + updateWalker = true; }; } diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index db1f2011f113..11655d0e28d9 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.1.tar.gz; - md5 = "004c2c005a1b78739e22bc49d33e244d"; + sha256 = "12n059j9iihhpf6spmlaspqzxz3wqan6kkpnhmlj08jdijpnk84m"; }; patchPhase = '' diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 67e06be08830..8d8913cf3cd6 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { - name = "irssi-0.8.15"; + name = "irssi-0.8.16"; src = fetchurl { url = "http://irssi.org/files/${name}.tar.bz2"; - sha256 = "19m0aah9bhc70dnhh7kpydbsz5n35l0l9knxav1df0sic3xicbf1"; + sha256 = "15wzs4h754jzs1l4z7qzsyjllk9wdx3qfb6gymdiykvmlb9gwyiz"; }; buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ]; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix new file mode 100644 index 000000000000..b66d749daafa --- /dev/null +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -0,0 +1,86 @@ +{ fetchurl, stdenv +, curl, dbus, dbus_glib, enchant, gtk, gnutls, gnupg, gpgme, libarchive +, libcanberra, libetpan, libnotify, libsoup, libxml2, networkmanager, openldap +, perl, pkgconfig, poppler, python, webkitgtk2 + +# Build options +# TODO: A flag to build the manual. +# TODO: Plugins that complain about their missing dependencies, even when +# provided: +# gdata requires libgdata +# geolocation requires libchamplain +# python requires python +, enableLdap ? false +, enableNetworkManager ? false +, enablePgp ? false +, enablePluginArchive ? false +, enablePluginFancy ? false +, enablePluginNotificationDialogs ? true +, enablePluginNotificationSounds ? true +, enablePluginPdf ? false +, enablePluginRavatar ? false +, enablePluginRssyl ? false +, enablePluginSmime ? false +, enablePluginSpamassassin ? false +, enablePluginSpamReport ? false +, enablePluginVcalendar ? false +, enableSpellcheck ? false +}: + +with stdenv.lib; + +let version = "3.10.1"; in + +stdenv.mkDerivation { + name = "claws-mail-${version}"; + + meta = { + description = "The user-friendly, lightweight, and fast email client"; + homepage = http://www.claws-mail.org/; + license = licenses.gpl3; + platforms = platforms.linux; + }; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/claws-mail/Claws%20Mail/${version}/claws-mail-${version}.tar.bz2"; + sha256 = "634d35dee311a288fb8fcba36d26987afdcd5485730cf67d00554110f414178e"; + }; + + buildInputs = + [ dbus dbus_glib gtk gnutls libetpan perl pkgconfig python ] + ++ optional enableSpellcheck enchant + ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] + ++ optional enablePluginArchive libarchive + ++ optional enablePluginNotificationSounds libcanberra + ++ optional enablePluginNotificationDialogs libnotify + ++ optional enablePluginFancy libsoup + ++ optional + (enablePluginFancy || enablePluginRavatar || enablePluginRssyl + || enablePluginSpamassassin || enablePluginSpamReport + || enablePluginVcalendar) + curl + ++ optional enablePluginRssyl libxml2 + ++ optional enableNetworkManager networkmanager + ++ optional enableLdap openldap + ++ optional enablePluginPdf poppler + ++ optional enablePluginFancy webkitgtk2; + + configureFlags = + optional (!enableLdap) "--disable-ldap" + ++ optional (!enableNetworkManager) "--disable-networkmanager" + ++ optionals (!enablePgp) [ + "--disable-pgpcore-plugin" + "--disable-pgpinline-plugin" + "--disable-pgpmime-plugin" + ] + ++ optional (!enablePluginArchive) "--disable-archive-plugin" + ++ optional (!enablePluginFancy) "--disable-fancy-plugin" + ++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin" + ++ optional (!enablePluginRavatar) "--disable-libravatar-plugin" + ++ optional (!enablePluginRssyl) "--disable-rssyl-plugin" + ++ optional (!enablePluginSmime) "--disable-smime-plugin" + ++ optional (!enablePluginSpamassassin) "--disable-spamassassin-plugin" + ++ optional (!enablePluginSpamReport) "--disable-spam_report-plugin" + ++ optional (!enablePluginVcalendar) "--disable-vcalendar-plugin" + ++ optional (!enableSpellcheck) "--disable-enchant"; +} diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 4ab85026dedc..695e2b381576 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -2,14 +2,14 @@ pythonPackages.buildPythonPackage rec { name = "mailpile-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchgit { url = "git://github.com/pagekite/Mailpile"; - rev = "af3e2554dcef892cc44e044ce61e1693f09228c0"; - sha256 = "0p8j5w5281rjl0nigsw7glfp7inz13p6iqlr9g3m3vh72i9pvl7h"; + rev = "refs/tags/${version}"; + sha256 = "0h84cc9kwb0m4admqjkpg4pllxlh095rmzvrql45kz71fpnxs780"; }; - + patchPhase = '' substituteInPlace setup.py --replace "data_files.append((dir" "data_files.append(('lib/${pythonPackages.python.libPrefix}/site-packages/' + dir" ''; @@ -31,4 +31,4 @@ pythonPackages.buildPythonPackage rec { platforms = platforms.linux; maintainers = [ maintainers.iElectric ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 7b9396ff5ffb..80db3020ba5f 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "mumble-" + version; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { url = "mirror://sourceforge/mumble/${name}.tar.gz"; - sha256 = "0zjqkkdkcvgmqic6np87hj6b6f851lkzyd6y3cqj6zzacjvps31d"; + sha256 = "0ng1xd7i0951kqnd9visf84y2dcwia79a1brjwfvr1wnykgw6bsc"; }; patches = optional jackSupport ./mumble-jack-support.patch; diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix new file mode 100644 index 000000000000..32ceeb6fc8d5 --- /dev/null +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, libowfat, zlib }: + +stdenv.mkDerivation { + name = "opentracker"; + src = fetchgit { + url = "https://github.com/masroore/opentracker.git"; + rev = "9a26b3d203755577879315ecc2b515d0e22793cb"; + sha256 = "74a7a6cbe80932fefb1698524809ce89be696f0fe3afd38fcb2b99fa59c9c891"; + }; + + buildInputs = [ libowfat zlib ]; + + installPhase = '' + mkdir -p $out/bin + cp opentracker $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/masroore/opentracker; + license = "beer-ware"; + platforms = platforms.linux; + description = "Bittorrent tracker project aiminf for minimal resource usage and is intended to run at your wlan router"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/networking/sync/akunambol/default.nix b/pkgs/applications/networking/sync/akunambol/default.nix deleted file mode 100644 index 2aedfd7f8334..000000000000 --- a/pkgs/applications/networking/sync/akunambol/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchgit, kdepimlibs, funambol, liblikeback }: - -stdenv.mkDerivation rec { - name = "akunambol-20110304"; - - src = fetchgit { - url = git://anongit.kde.org/akunambol.git; - rev = "1d832bbbce84f474e3f1e5d2f9fa8a4079b0c8e5"; - sha256 = "1d2x42lbw32qyawri7z0mrbafz36r035w5bxjpq51awyqjwkbb2d"; - }; - - buildInputs = [ kdepimlibs funambol liblikeback ]; - KDEDIRS = liblikeback; - - patches = [ ./non-latin.diff ]; -} diff --git a/pkgs/applications/networking/sync/akunambol/non-latin.diff b/pkgs/applications/networking/sync/akunambol/non-latin.diff deleted file mode 100644 index 905a6a894bdf..000000000000 --- a/pkgs/applications/networking/sync/akunambol/non-latin.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/qtgui/standardsourcesettings.cpp b/qtgui/standardsourcesettings.cpp -index a14a737..5d4712e 100644 ---- a/qtgui/standardsourcesettings.cpp -+++ b/qtgui/standardsourcesettings.cpp -@@ -83,9 +83,9 @@ void StandardSourceSettings::populateCollections() - foreach( const Collection &collection, colls ) { - if (collection.contentMimeTypes().contains(source->getAkonadiMimeType())) { - i++; -- const char* dn = collection.name().toUtf8(); -- LOG.debug("Adding collection id %lld named %s", collection.id(), dn); -- collections->addItem(dn); -+ LOG.debug("Adding collection id %lld named %s", collection.id(), -+ collection.name().toLocal8Bit().data()); -+ collections->addItem(collection.name()); - idList.append(collection.id()); - } - } diff --git a/pkgs/applications/science/astronomy/xplanet/giflib.patch b/pkgs/applications/science/astronomy/xplanet/giflib.patch index aaf024198fbc..653b9c8dc7d6 100644 --- a/pkgs/applications/science/astronomy/xplanet/giflib.patch +++ b/pkgs/applications/science/astronomy/xplanet/giflib.patch @@ -1,6 +1,6 @@ -diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c +diff -wbBur xplanet-1.3.0/src/libimage/gif.c xplanet-1.3.0.my/src/libimage/gif.c --- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300 -+++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c 2013-07-30 18:21:17.412474692 +0400 ++++ xplanet-1.3.0.my/src/libimage/gif.c 2014-05-29 18:59:14.830652716 +0400 @@ -20,7 +20,7 @@ #include <stdio.h> @@ -59,6 +59,15 @@ diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686 return(0); } } +@@ -154,7 +154,7 @@ + + free(buffer); + +- DGifCloseFile(infile); ++ DGifCloseFile(infile, NULL); + return(1); + } + @@ -178,7 +178,7 @@ return(0); } @@ -119,11 +128,13 @@ diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686 return(0); } ptr += width; -@@ -233,7 +233,7 @@ +@@ -232,8 +232,8 @@ + EGifSpew(outfile); - if (EGifCloseFile(outfile) == GIF_ERROR) +- if (EGifCloseFile(outfile) == GIF_ERROR) - PrintGifError(); ++ if (EGifCloseFile(outfile, NULL) == GIF_ERROR) + printf("%s\n", GifErrorString(GIF_ERROR)); free(buffer); diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix new file mode 100644 index 000000000000..0ac189c4ef8e --- /dev/null +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, qt5, boost }: + +stdenv.mkDerivation rec { + + version = "0.9.0b"; + name = "fritzing"; + + src = fetchurl { + url = "http://fritzing.org/download/${version}/source-tarball/fritzing-${version}.source.tar_1.bz2"; + sha256 = "181qnknq1j5x075icpw2qk0sc4wcj9f2hym533vs936is0wxp2gk"; + }; + + unpackPhase = '' + tar xjf ${src} + ''; + + buildInputs = [ qt5 boost ]; + + configurePhase = '' + cd fritzing-${version}.source + qmake PREFIX=$out phoenix.pro + ''; + + meta = { + description = "An open source prototyping tool for Arduino-based projects"; + homepage = http://fritzing.org/; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.robberer ]; + }; +} diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index 4081465fbd27..bf426bc42c2f 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -2,8 +2,8 @@ {stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: -let - version = "8.5pre-01feb42"; +let + version = "8.5pre-2313bde0"; coq-version = "8.5"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; @@ -17,8 +17,8 @@ stdenv.mkDerivation { src = fetchgit { url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "01feb4206d26b41bfaab9bd45a7b2fc4db569baf"; - sha256 = "e6d44ebc3019b2650c6e320218b264f5bde68bf6f222b356d41b0a38918e839f"; + rev = "2313bde0116a5916912bebbaca77d291f7b2760a"; + sha256 = "116b8060a47a7b2d0cac72d86f7e320bec99b6d450614d1e6b92ff919619c509"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix new file mode 100644 index 000000000000..5b2e9c54d6f8 --- /dev/null +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, gmp, libantlr3c, boost}: + +stdenv.mkDerivation { + name = "cvc4-1.4"; + src = fetchurl { + url = http://cvc4.cs.nyu.edu/builds/src/cvc4-1.4.tar.gz; + sha256 = "093h7zgv4z4ad503j30dpn8k2pz9m90pvd7gi5axdmwsxgwlzzkn"; + }; + + buildInputs = [ gmp libantlr3c boost ]; + + preConfigure = "patchShebangs ./src/"; + + doChecks = true; + + meta = with stdenv.lib; { + description = "An efficient open-source automatic theorem prover for satisfiability modulo theories (SMT) problems"; + homepage = http://cvc4.cs.nyu.edu/web/; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 71ff1cc7fb47..70149522393a 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "why3-${version}"; - version = "0.83"; + version = "0.85"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/33490/${name}.tar.gz"; - sha256 = "1jcs5vj91ppbgh4q4hch89b63wgakjhg35pm3r4jwhp377lnggya"; + url = "https://gforge.inria.fr/frs/download.php/34074/why3-0.85.tar.gz"; + sha256 = "0sj1pd50lqvnvyss1f8ysgigdi64s91rrpdrmp7crmcy1npa8apf"; }; buildInputs = with ocamlPackages; [ coq ocaml findlib lablgtk ocamlgraph zarith ]; - meta = { - description = "why is a software verification platform"; + meta = with stdenv.lib; { + description = "A platform for deductive program verification"; homepage = "http://why3.lri.fr/"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice vbgl ]; }; } diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 3277d94d99b6..ddd5dc5d6bb4 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.33.0"; + version = "5.34.1"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "13axm11xw0f3frx5b0qdidi7igkn1524fzz77s9rbpl2yy2nrbz2"; + sha256 = "1dw9vfzldpj7lv303xbw0wpyn6ra6i2yzwlrjbcx7j0jm5n43ji0"; }; buildInputs = [sbcl texinfo perl makeWrapper]; diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 823638669b68..d58c9ed15c8f 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ed }: stdenv.mkDerivation rec { - name = "rcs-5.9.2"; + name = "rcs-5.9.3"; src = fetchurl { url = "mirror://gnu/rcs/${name}.tar.xz"; - sha256 = "0wdmmplga9k05d9k7wjqv4zb6xvvzsli8hmn206pvangki1g66k5"; + sha256 = "0isvzwfvqkg7zcsznra6wqh650z49ib113n7gp6ncxv5p30x3c38"; }; buildInputs = [ ed ]; diff --git a/pkgs/applications/version-management/redmine/2002_FHS_through_env_vars.patch b/pkgs/applications/version-management/redmine/2002_FHS_through_env_vars.patch new file mode 100644 index 000000000000..889b8c930e73 --- /dev/null +++ b/pkgs/applications/version-management/redmine/2002_FHS_through_env_vars.patch @@ -0,0 +1,100 @@ +Description: FHS through env vars +Forwarded: not-needed +Author: Jérémy Lal <kapouer@melix.org> +Last-Update: 2013-09-28 +--- redmine.orig/app/models/attachment.rb ++++ redmine/app/models/attachment.rb +@@ -46,10 +46,10 @@ class Attachment < ActiveRecord::Base + "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"} + + cattr_accessor :storage_path +- @@storage_path = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, "files") ++ @@storage_path = Redmine::Configuration['attachments_storage_path'] || ENV['RAILS_VAR'] ? File.join(ENV['RAILS_VAR'], "files") : File.join(Rails.root, "files") + + cattr_accessor :thumbnails_storage_path +- @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails") ++ @@thumbnails_storage_path = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], "thumbnails") : File.join(Rails.root, "tmp", "thumbnails") + + before_save :files_to_final_location + after_destroy :delete_from_disk +--- redmine.orig/lib/redmine/configuration.rb ++++ redmine/lib/redmine/configuration.rb +@@ -32,7 +32,7 @@ module Redmine + # * <tt>:file</tt>: the configuration file to load (default: config/configuration.yml) + # * <tt>:env</tt>: the environment to load the configuration for (default: Rails.env) + def load(options={}) +- filename = options[:file] || File.join(Rails.root, 'config', 'configuration.yml') ++ filename = options[:file] || ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'configuration.yml') : File.join(Rails.root, 'config', 'configuration.yml') + env = options[:env] || Rails.env + + @config = @defaults.dup +@@ -103,7 +103,7 @@ module Redmine + end + + def load_deprecated_email_configuration(env) +- deprecated_email_conf = File.join(Rails.root, 'config', 'email.yml') ++ deprecated_email_conf = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'email.yml') : File.join(Rails.root, 'config', 'email.yml') + if File.file?(deprecated_email_conf) + warn "Storing outgoing emails configuration in config/email.yml is deprecated. You should now store it in config/configuration.yml using the email_delivery setting." + @config.merge!({'email_delivery' => load_from_yaml(deprecated_email_conf, env)}) +--- redmine.orig/lib/redmine/export/pdf.rb ++++ redmine/lib/redmine/export/pdf.rb +@@ -38,7 +38,7 @@ module Redmine + attr_accessor :footer_date + + def initialize(lang, orientation='P') +- @@k_path_cache = Rails.root.join('tmp', 'pdf') ++ @@k_path_cache = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], 'pdf') : Rails.root.join('tmp', 'pdf') + FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache) + set_language_if_valid lang + pdf_encoding = l(:general_pdf_encoding).upcase +--- redmine.orig/config/application.rb ++++ redmine/config/application.rb +@@ -52,8 +63,21 @@ module RedmineApp + # Do not include all helpers + config.action_controller.include_all_helpers = false + ++ # move tmp directory to RAILS_TMP ++ config.paths['tmp'] = ENV['RAILS_TMP'] ++ + config.session_store :cookie_store, :key => '_redmine_session' + ++ # log path ++ config.paths['log'] = File.join(ENV['RAILS_LOG'], "#{Rails.env}.log") unless !ENV['RAILS_LOG'] ++ ++ config.paths['public'] = ENV['RAILS_PUBLIC'] unless !ENV['RAILS_PUBLIC'] ++ ++ config.cache_store = :file_store, File.join(ENV['RAILS_TMP'], "cache") ++ ++ # Set Active Record's database.yml path ++ config.paths['config/database'] = File.join(ENV['RAILS_ETC'], 'database.yml') unless !ENV['RAILS_ETC'] ++ + if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb')) + instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb')) + end +--- redmine.orig/lib/plugins/rfpdf/lib/tcpdf.rb ++++ redmine/lib/plugins/rfpdf/lib/tcpdf.rb +@@ -89,10 +89,10 @@ class TCPDF + @@k_small_ratio = 2/3.0 + + cattr_accessor :k_path_cache +- @@k_path_cache = Rails.root.join('tmp') ++ @@k_path_cache = ENV['RAILS_TMP'] ? ENV['RAILS_TMP'] : Rails.root.join('tmp') + + cattr_accessor :k_path_url_cache +- @@k_path_url_cache = Rails.root.join('tmp') ++ @@k_path_url_cache = ENV['RAILS_TMP'] ? ENV['RAILS_TMP'] : Rails.root.join('tmp') + + attr_accessor :barcode + +--- redmine.orig/lib/redmine/scm/adapters/abstract_adapter.rb ++++ redmine/lib/redmine/scm/adapters/abstract_adapter.rb +@@ -222,7 +222,7 @@ module Redmine + if @stderr_log_file.nil? + writable = false + path = Redmine::Configuration['scm_stderr_log_file'].presence +- path ||= Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s ++ path ||= ENV['RAILS_LOG'] ? File.join(ENV['RAILS_LOG'], "#{Rails.env}.scm.stderr.log").to_s : Rails.root.join("log/#{Rails.env}.scm.stderr.log").to_s + if File.exists?(path) + if File.file?(path) && File.writable?(path) + writable = true diff --git a/pkgs/applications/version-management/redmine/2003_externalize_session_config.patch b/pkgs/applications/version-management/redmine/2003_externalize_session_config.patch new file mode 100644 index 000000000000..39af8e02e556 --- /dev/null +++ b/pkgs/applications/version-management/redmine/2003_externalize_session_config.patch @@ -0,0 +1,72 @@ +Description: Externalize session config to yml in /etc +Forwarded: not-needed +Author: Jérémy Lal <kapouer@melix.org> +Last-Update: 2010-01-10 +--- redmine.orig/lib/tasks/initializers.rake ++++ redmine/lib/tasks/initializers.rake +@@ -1,11 +1,12 @@ + desc 'Generates a secret token for the application.' ++task :generate_secret_token do + +-file 'config/initializers/secret_token.rb' do +- path = File.join(Rails.root, 'config', 'initializers', 'secret_token.rb') +- secret = SecureRandom.hex(40) +- File.open(path, 'w') do |f| +- f.write <<"EOF" +-# This file was generated by 'rake generate_secret_token', and should ++filename = ENV['YML_SESSION_FILENAME'] ? ENV['YML_SESSION_FILENAME'] : 'session.yml' ++path = File.join(ENV['RAILS_ETC'] ? ENV['RAILS_ETC'] : File.join(Rails.root, 'config'), filename) ++secret = SecureRandom.hex(40) ++File.open(path, 'w') do |f| ++ f.write <<"EOF" ++# This file was generated by 'rake generate_session_store', + # not be made visible to public. + # If you have a load-balancing Redmine cluster, you will need to use the + # same version of this file on each machine. And be sure to restart your +@@ -15,10 +18,18 @@ file 'config/initializers/secret_token.r + # change this key, all old sessions will become invalid! Make sure the + # secret is at least 30 characters and all random, no regular words or + # you'll be exposed to dictionary attacks. +-RedmineApp::Application.config.secret_token = '#{secret}' ++ ++production: ++ key: _redmine_ ++ secret: #{secret} ++ ++development: ++ key: _redmine_ ++ secret: #{secret} ++ ++test: ++ key: _redmine_ ++ secret: #{secret} + EOF + end + end +- +-desc 'Generates a secret token for the application.' +-task :generate_secret_token => ['config/initializers/secret_token.rb'] +--- redmine.orig/config/application.rb ++++ redmine/config/application.rb +@@ -66,7 +66,20 @@ module RedmineApp + # move tmp directory to RAILS_TMP + config.paths['tmp'] = ENV['RAILS_TMP'] + +- config.session_store :cookie_store, :key => '_redmine_session' ++ # loads cookie based session session and secret keys ++ # this is needed here because initializers are loaded after plugins, ++ # and some plugins initialize ActionController which requires a secret to be set. ++ # crash if file not found ++ relativeUrlRoot = ENV['RAILS_RELATIVE_URL_ROOT'] ++ filename = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'session.yml') : File.join(File.dirname(__FILE__), '..', 'session.yml') ++ if File.exists?(filename) ++ sessionconfig = YAML::load_file(filename) ++ config.session_store :cookie_store, :key => sessionconfig[Rails.env]['key'], :path => (relativeUrlRoot.blank?) ? '/' : relativeUrlRoot ++ config.secret_token = sessionconfig[Rails.env]['secret'] ++ else ++ # temporary settings before session.yml is created ++ config.session_store :cookie_store, :key => '_redmine_session', :path => (relativeUrlRoot.blank?) ? '/' : relativeUrlRoot ++ end + + # log path + config.paths['log'] = File.join(ENV['RAILS_LOG'], "#{Rails.env}.log") unless !ENV['RAILS_LOG'] diff --git a/pkgs/applications/version-management/redmine/2004_FHS_plugins_assets.patch b/pkgs/applications/version-management/redmine/2004_FHS_plugins_assets.patch new file mode 100644 index 000000000000..d9a6844a6a35 --- /dev/null +++ b/pkgs/applications/version-management/redmine/2004_FHS_plugins_assets.patch @@ -0,0 +1,11 @@ +--- redmine.orig/lib/redmine/plugin.rb ++++ redmine/lib/redmine/plugin.rb +@@ -47,7 +47,7 @@ module Redmine #:nodoc: + self.directory = File.join(Rails.root, 'plugins') + + cattr_accessor :public_directory +- self.public_directory = File.join(Rails.root, 'public', 'plugin_assets') ++ self.public_directory = ENV['RAILS_TMP'] ? File.join(ENV['RAILS_TMP'], 'plugin_assets') : File.join(Rails.root, 'public', 'plugin_assets') + + @registered_plugins = {} + class << self diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock new file mode 100644 index 000000000000..7d83583c019d --- /dev/null +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -0,0 +1,152 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (3.2.19) + actionpack (= 3.2.19) + mail (~> 2.5.4) + actionpack (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.19) + activesupport (= 3.2.19) + builder (~> 3.0.0) + activerecord (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + activesupport (3.2.19) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + arel (3.0.3) + awesome_nested_set (2.1.6) + activerecord (>= 3.0.0) + builder (3.0.0) + capybara (2.1.0) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + childprocess (0.5.5) + ffi (~> 1.0, >= 1.0.11) + coderay (1.1.0) + erubis (2.7.0) + fastercsv (1.5.5) + ffi (1.9.5) + hike (1.2.3) + i18n (0.6.11) + journey (1.0.4) + jquery-rails (2.0.3) + railties (>= 3.1.0, < 5.0) + thor (~> 0.14) + json (1.8.1) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + metaclass (0.0.4) + mime-types (1.25.1) + mini_portile (0.6.0) + mocha (1.0.0) + metaclass (~> 0.0.1) + multi_json (1.10.1) + net-ldap (0.3.1) + nokogiri (1.6.3.1) + mini_portile (= 0.6.0) + pg (0.17.1) + polyglot (0.3.5) + rack (1.4.5) + rack-cache (1.2) + rack (>= 0.4) + rack-openid (1.4.2) + rack (>= 1.1.0) + ruby-openid (>= 2.1.8) + rack-ssl (1.3.4) + rack + rack-test (0.6.2) + rack (>= 1.0) + rails (3.2.19) + actionmailer (= 3.2.19) + actionpack (= 3.2.19) + activerecord (= 3.2.19) + activeresource (= 3.2.19) + activesupport (= 3.2.19) + bundler (~> 1.0) + railties (= 3.2.19) + railties (3.2.19) + actionpack (= 3.2.19) + activesupport (= 3.2.19) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (10.1.1) + rdoc (3.12.2) + json (~> 1.4) + redcarpet (2.3.0) + rmagick (2.13.3) + ruby-openid (2.3.0) + rubyzip (1.1.6) + selenium-webdriver (2.43.0) + childprocess (~> 0.5) + multi_json (~> 1.0) + rubyzip (~> 1.0) + websocket (~> 1.0) + shoulda (3.3.2) + shoulda-context (~> 1.0.1) + shoulda-matchers (~> 1.4.1) + shoulda-context (1.0.2) + shoulda-matchers (1.4.1) + activesupport (>= 3.0.0) + sprockets (2.2.2) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + thor (0.19.1) + tilt (1.4.1) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.41) + websocket (1.2.1) + xpath (2.0.0) + nokogiri (~> 1.3) + yard (0.8.7.4) + +PLATFORMS + ruby + +DEPENDENCIES + activerecord-jdbc-adapter (~> 1.3.2) + activerecord-jdbcpostgresql-adapter + awesome_nested_set (= 2.1.6) + builder (= 3.0.0) + capybara (~> 2.1.0) + coderay (~> 1.1.0) + fastercsv (~> 1.5.0) + jquery-rails (~> 2.0.2) + mime-types + mocha (~> 1.0.0) + net-ldap (~> 0.3.1) + pg (>= 0.11.0) + rack-openid + rails (= 3.2.19) + rake (~> 10.1.1) + rdoc (>= 2.4.2) + redcarpet (~> 2.3.0) + rmagick (>= 2.0.0) + ruby-openid (~> 2.3.0) + selenium-webdriver + shoulda (~> 3.3.2) + yard diff --git a/pkgs/applications/version-management/redmine/Gemfile.nix b/pkgs/applications/version-management/redmine/Gemfile.nix new file mode 100644 index 000000000000..a7339097b146 --- /dev/null +++ b/pkgs/applications/version-management/redmine/Gemfile.nix @@ -0,0 +1,332 @@ +[ +{ +name = "actionmailer"; +hash = "cd9f0b22f755b0adeae13cf949adaf63fa1c068c72d0a100572c6a11aecd3ba7"; +url = "http://rubygems.org/downloads/actionmailer-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "actionpack"; +hash = "c58ca2342aff2062f4f478551ce46d81918ac93200bc62d099764d2cd7499fcd"; +url = "http://rubygems.org/downloads/actionpack-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "activemodel"; +hash = "4ea3abf790eca9ee8228e9e2a465350e258294270a639b63f0e1dfad236fe70e"; +url = "http://rubygems.org/downloads/activemodel-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "activerecord"; +hash = "052945ad510744aaa3e35a817a6f515a2316e7dd96df6460f75b36067bb60372"; +url = "http://rubygems.org/downloads/activerecord-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "activeresource"; +hash = "8617d24537ca937cc67aac46aaa29782510d66136605426d0a23a3585a839daf"; +url = "http://rubygems.org/downloads/activeresource-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "activesupport"; +hash = "2c837a59250da14b12a6b0cfb6774f0afae90aa749fd96ad4347344d8417ad3d"; +url = "http://rubygems.org/downloads/activesupport-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "arel"; +hash = "c0006e2169deee3b8cc2d258296388822eeb2db59832450b9b7316e1387d0da4"; +url = "http://rubygems.org/downloads/arel-3.0.3.gem"; +version = "3.0.3"; +} +{ +name = "awesome_nested_set"; +hash = "0dcd801aea5048f5ab907b62b4174b6763b191eaa4e1e11bb83f996f01349af8"; +url = "http://rubygems.org/downloads/awesome_nested_set-2.1.6.gem"; +version = "2.1.6"; +} +{ +name = "builder"; +hash = "fbd3e15e5de02245f7d649b3415b2c2875cdc9a14dccde89aa30fc14a314618e"; +url = "http://rubygems.org/downloads/builder-3.0.0.gem"; +version = "3.0.0"; +} +{ +name = "capybara"; +hash = "a9a19f8d6bb2dfcb1f05ea3e1727cb556d1cba0d234d1712b481e8d4f7bbb91e"; +url = "http://rubygems.org/downloads/capybara-2.1.0.gem"; +version = "2.1.0"; +} +{ +name = "childprocess"; +hash = "9b583295a11932d2eeffa1e8f5b8fb2fb0064a2f0111ad98c3b752b94f80bf33"; +url = "http://rubygems.org/downloads/childprocess-0.5.5.gem"; +version = "0.5.5"; +} +{ +name = "coderay"; +hash = "5a943c59e36f7ef9dd2677855735656413af02e3f302431e9c548aabe89f3c15"; +url = "http://rubygems.org/downloads/coderay-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "erubis"; +hash = "63653f5174a7997f6f1d6f465fbe1494dcc4bdab1fb8e635f6216989fb1148ba"; +url = "http://rubygems.org/downloads/erubis-2.7.0.gem"; +version = "2.7.0"; +} +{ +name = "fastercsv"; +hash = "d098199e62e4e10eec436a9ea9b8c189dacd5c06f2825f00d1e0f1c29fdbc3b5"; +url = "http://rubygems.org/downloads/fastercsv-1.5.5.gem"; +version = "1.5.5"; +} +{ +name = "ffi"; +hash = "0d2ef90163eef8545689e8dfc27fb1245a2d82e3500d587de1e38290629e662f"; +url = "http://rubygems.org/downloads/ffi-1.9.5.gem"; +version = "1.9.5"; +} +{ +name = "hike"; +hash = "154e2f2593845e5bcd8ed2ba3092600c55c6ad8c630722857de3fdaf334ccc44"; +url = "http://rubygems.org/downloads/hike-1.2.3.gem"; +version = "1.2.3"; +} +{ +name = "i18n"; +hash = "b37dda25b30484f2674a851e24ae098a38564a61c976fa91a34bf8fceaa3923b"; +url = "http://rubygems.org/downloads/i18n-0.6.11.gem"; +version = "0.6.11"; +} +{ +name = "journey"; +hash = "7454b8612530784000fbb17ea2df749a71b70702a0ac8ebef4a1e7f05aecc10f"; +url = "http://rubygems.org/downloads/journey-1.0.4.gem"; +version = "1.0.4"; +} +{ +name = "jquery-rails"; +hash = "cc4eab342fb3b1fcbb2fc1c9a61b09ecd86d795b1f74d607994b0bc6fd5ef444"; +url = "http://rubygems.org/downloads/jquery-rails-2.0.3.gem"; +version = "2.0.3"; +} +{ +name = "json"; +hash = "961bfbbfa9fda1e857e9c791e964e6664e0d43bf687b19669dfbc7cdbc5e0200"; +url = "http://rubygems.org/downloads/json-1.8.1.gem"; +version = "1.8.1"; +} +{ +name = "mail"; +hash = "446585c38b062121252688dcc9cc70af1f470822e30db021bb97d185969e257c"; +url = "http://rubygems.org/downloads/mail-2.5.4.gem"; +version = "2.5.4"; +} +{ +name = "metaclass"; +hash = "8569685c902108b1845be4e5794d646f2a8adcb0280d7651b600dab0844fe942"; +url = "http://rubygems.org/downloads/metaclass-0.0.4.gem"; +version = "0.0.4"; +} +{ +name = "mime-types"; +hash = "88ef3c596481678710ffd4018fa40f1999b02d97babea39682ba7d5badd21f56"; +url = "http://rubygems.org/downloads/mime-types-1.25.1.gem"; +version = "1.25.1"; +} +{ +name = "mini_portile"; +hash = "762b3e241362de24b2eb2bb1b98638399b931e9e51bece5f8e2df7611eb16c26"; +url = "http://rubygems.org/downloads/mini_portile-0.6.0.gem"; +version = "0.6.0"; +} +{ +name = "mocha"; +hash = "788fd93c8009a7e0eebd155509953e5987f4681902aad666a294283baa09899a"; +url = "http://rubygems.org/downloads/mocha-1.0.0.gem"; +version = "1.0.0"; +} +{ +name = "multi_json"; +hash = "2c98979877e87df0b338ebf5c86091b390f53d62c11a8232bd51ca007e0b82d2"; +url = "http://rubygems.org/downloads/multi_json-1.10.1.gem"; +version = "1.10.1"; +} +{ +name = "net-ldap"; +hash = "953551665fb0d398740a72a26314c6d34bd70fa35419c96dc58351f17d9a5081"; +url = "http://rubygems.org/downloads/net-ldap-0.3.1.gem"; +version = "0.3.1"; +} +{ +name = "nokogiri"; +hash = "91761a654439406b5bed71adf6092d49829e26332b4c0e7c8a23a2e628442585"; +url = "http://rubygems.org/downloads/nokogiri-1.6.3.1.gem"; +version = "1.6.3.1"; +} +{ +name = "pg"; +hash = "e7933e8f7f184c28e820ed85ddfb3ad8a13933b2b2ab8656aa8f81cb0aa610a6"; +url = "http://rubygems.org/downloads/pg-0.17.1.gem"; +version = "0.17.1"; +} +{ +name = "polyglot"; +hash = "59d66ef5e3c166431c39cb8b7c1d02af419051352f27912f6a43981b3def16af"; +url = "http://rubygems.org/downloads/polyglot-0.3.5.gem"; +version = "0.3.5"; +} +{ +name = "rack"; +hash = "f7bf3faa8e09a2ff26475372de36a724e7470d6bdc33d189a0ec34b49605f308"; +url = "http://rubygems.org/downloads/rack-1.4.5.gem"; +version = "1.4.5"; +} +{ +name = "rack-cache"; +hash = "02bfed05f8b3266db804f2fa445801636ca2c6d211a3137ec796f88af5756e1c"; +url = "http://rubygems.org/downloads/rack-cache-1.2.gem"; +version = "1.2"; +} +{ +name = "rack-openid"; +hash = "8cd2305e738463a7da98791f9ac4df4cf3f6ed27908d982350430694ac2fe869"; +url = "http://rubygems.org/downloads/rack-openid-1.4.2.gem"; +version = "1.4.2"; +} +{ +name = "rack-ssl"; +hash = "d703764fa2a0d44a2163d6add65be89f5dba4477d1959b90d3727682a9c37dcf"; +url = "http://rubygems.org/downloads/rack-ssl-1.3.4.gem"; +version = "1.3.4"; +} +{ +name = "rack-test"; +hash = "7e920b6aac888e4a3846e5997fb1cbf456bdb5846322b58dc31697a54a38b306"; +url = "http://rubygems.org/downloads/rack-test-0.6.2.gem"; +version = "0.6.2"; +} +{ +name = "rails"; +hash = "33b64cf78dfcf3206d961ce03e8fe6d260081da696e60da39d0b2a4a160fe22b"; +url = "http://rubygems.org/downloads/rails-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "railties"; +hash = "c569009ee5c005190d208ac228087fdc094b10c6f0cf209f1d12c552b447cc10"; +url = "http://rubygems.org/downloads/railties-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "rake"; +hash = "85e446590871dd3469c80dfe70a0296c20b76a9006af6b728c1f47d0b460412d"; +url = "http://rubygems.org/downloads/rake-10.1.1.gem"; +version = "10.1.1"; +} +{ +name = "rdoc"; +hash = "a8e2b78f7e5ec4cc4716cd863975645f2f2377dc6db267a15e427e5fae2633ed"; +url = "http://rubygems.org/downloads/rdoc-3.12.2.gem"; +version = "3.12.2"; +} +{ +name = "redcarpet"; +hash = "5c9bcc307fba97ff5a25eec74f08365c17e929d2a5c707db32d6fc99ec81f0b9"; +url = "http://rubygems.org/downloads/redcarpet-2.3.0.gem"; +version = "2.3.0"; +} +{ +name = "rmagick"; +hash = "109f3b8be90afdea9abbdd2a79a955cd808b5cad65d937ed12676da22870d3b4"; +url = "http://rubygems.org/downloads/rmagick-2.13.3.gem"; +version = "2.13.3"; +} +{ +name = "ruby-openid"; +hash = "f69ed004e95f7094e23bfd8bc9ebfb1dc88a7b46637252ca2907a1189870ea7b"; +url = "http://rubygems.org/downloads/ruby-openid-2.3.0.gem"; +version = "2.3.0"; +} +{ +name = "rubyzip"; +hash = "a996435ee9698be6a09d3748f4d23ee15aaf45cbfef1749def165af6ea3c0a9e"; +url = "http://rubygems.org/downloads/rubyzip-1.1.6.gem"; +version = "1.1.6"; +} +{ +name = "selenium-webdriver"; +hash = "09fe4374d1541cb45403ad1238c2d88129f3afb985218635af087a06c99a521a"; +url = "http://rubygems.org/downloads/selenium-webdriver-2.43.0.gem"; +version = "2.43.0"; +} +{ +name = "shoulda"; +hash = "52e70b71cbfb7c01dace14e268a62d86c21ddd1e5ec0116c8b1e632d8e04e412"; +url = "http://rubygems.org/downloads/shoulda-3.3.2.gem"; +version = "3.3.2"; +} +{ +name = "shoulda-context"; +hash = "ee5559aa13248c70fdec6868a3c144adf7438c904c59d1a76b04a002e5151de5"; +url = "http://rubygems.org/downloads/shoulda-context-1.0.2.gem"; +version = "1.0.2"; +} +{ +name = "shoulda-matchers"; +hash = "c35693cbfa84213212dffbc2c87487427ef364927340151329a842f0a06086b9"; +url = "http://rubygems.org/downloads/shoulda-matchers-1.4.1.gem"; +version = "1.4.1"; +} +{ +name = "sprockets"; +hash = "fae893b7e86e83c1936f6f2a64db3550510f86eabdd5fa9f0f23fb25d7e0cf96"; +url = "http://rubygems.org/downloads/sprockets-2.2.2.gem"; +version = "2.2.2"; +} +{ +name = "thor"; +hash = "9ff834f031b5550c743bb8a3139317fefdae9cdebd02d60de376658f427fe522"; +url = "http://rubygems.org/downloads/thor-0.19.1.gem"; +version = "0.19.1"; +} +{ +name = "tilt"; +hash = "39820562c4f5db45fe18de87ccc30a0e77a998bf5334b1d8c10a2f7dbc1f5903"; +url = "http://rubygems.org/downloads/tilt-1.4.1.gem"; +version = "1.4.1"; +} +{ +name = "treetop"; +hash = "ffa68f201c0f62c26b0a1d13233d73194400596964696843f87ebb5d812f12ff"; +url = "http://rubygems.org/downloads/treetop-1.4.15.gem"; +version = "1.4.15"; +} +{ +name = "tzinfo"; +hash = "381b22fd1744a35d0a0239f563f505773681e626e6d900063b14cb9b1b68e98c"; +url = "http://rubygems.org/downloads/tzinfo-0.3.41.gem"; +version = "0.3.41"; +} +{ +name = "websocket"; +hash = "e626c8c3e8593735d900265fb1fc3439fd06b394069860177d8f40733b12ae9e"; +url = "http://rubygems.org/downloads/websocket-1.2.1.gem"; +version = "1.2.1"; +} +{ +name = "xpath"; +hash = "9ca4a1cc88d9ab16c591468cce7b5d00ee06a8a76b841f8438970c7a44c86c12"; +url = "http://rubygems.org/downloads/xpath-2.0.0.gem"; +version = "2.0.0"; +} +{ +name = "yard"; +hash = "e65a26f9b9dc6e2aa9b1d1d2e1a45bee3edf540a6a7e6c30fa6aa1df7f7a29b4"; +url = "http://rubygems.org/downloads/yard-0.8.7.4.gem"; +version = "0.8.7.4"; +} +] diff --git a/pkgs/applications/version-management/redmine/README b/pkgs/applications/version-management/redmine/README new file mode 100644 index 000000000000..1cc4772568a4 --- /dev/null +++ b/pkgs/applications/version-management/redmine/README @@ -0,0 +1,6 @@ +to regenerate Gemfile.nix and Gemfile.lock you need to + + % nix-build bootstrap.nix + % cp result/Gemfile.nix ./ + % cp result/Gemfile.lock ./ + diff --git a/pkgs/applications/version-management/redmine/bootstrap.nix b/pkgs/applications/version-management/redmine/bootstrap.nix new file mode 100644 index 000000000000..4b4359603c9b --- /dev/null +++ b/pkgs/applications/version-management/redmine/bootstrap.nix @@ -0,0 +1,45 @@ +{ pkgs ? import <nixpkgs> {} +}: + +with pkgs; + +let + +in stdenv.mkDerivation rec { + version = "2.5.2"; + name = "redmine-${version}"; + __noChroot = true; + src = fetchurl { + url = "http://www.redmine.org/releases/${name}.tar.gz"; + sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0"; + }; + buildInputs = [ + ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig + libffi imagemagickBig postgresql which stdenv + ]; + installPhase = '' + unset http_proxy + unset ftp_proxy + + cp -R . $out + cp ${./generate_nix_requirements.rb} $out/generate_nix_requirements.rb + cd $out + + cat > config/database.yml <<EOF + production: + adapter: postgresql + EOF + + bundle config --local build.nokogiri --use-system-libraries \ + --with-iconv-dir=${libiconv} \ + --with-xslt-dir=${libxslt} \ + --with-xml2-dir=${libxml2} \ + --with-pkg-config \ + --with-pg-config=${postgresql}/bin/pg_config + + bundle install --verbose --without development test rmagick --path /tmp/redmine-${version} + + HOME="/tmp/redmine-${version}" ruby generate_nix_requirements.rb + rm -R /tmp/gems + ''; +} diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix new file mode 100644 index 000000000000..4655a16671ee --- /dev/null +++ b/pkgs/applications/version-management/redmine/default.nix @@ -0,0 +1,73 @@ +{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libxslt, libxml2, pkgconfig, libffi, imagemagickBig, postgresql }: + +let + gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix); +in stdenv.mkDerivation rec { + version = "2.5.2"; + name = "redmine-${version}"; + + src = fetchurl { + url = "http://www.redmine.org/releases/${name}.tar.gz"; + sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0"; + }; + + # taken from redmine (2.5.1-2~bpo70+3) in debian wheezy-backports + # needed to separate run-time and build-time directories + patches = [ + ./2002_FHS_through_env_vars.patch + ./2004_FHS_plugins_assets.patch + ./2003_externalize_session_config.patch + ]; + postPatch = '' + substituteInPlace lib/redmine/plugin.rb --replace "File.join(Rails.root, 'plugins')" "ENV['RAILS_PLUGINS']" + substituteInPlace lib/redmine/plugin.rb --replace "File.join(Rails.root, 'plugins', id.to_s, 'db', 'migrate')" "File.join(ENV['RAILS_PLUGINS'], id.to_s, 'db', 'migrate')" + substituteInPlace config/routes.rb --replace '"plugins/*", Rails.root' 'ENV["RAILS_PLUGINS"] + "/*"' + ''; + + buildInputs = [ + ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig libffi + imagemagickBig postgresql + ]; + + installPhase = '' + mkdir -p $out/share/redmine/ + cp -R . $out/share/redmine/ + cd $out/share/redmine + ln -s ${./Gemfile.lock} Gemfile.lock + export HOME=$(pwd) + + cat > config/database.yml <<EOF + production: + adapter: postgresql + EOF + + mkdir -p vendor/cache + ${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)} + + bundle config build.nokogiri \ + --use-system-libraries \ + --with-iconv-dir=${libiconv} \ + --with-xslt-dir=${libxslt} \ + --with-xml2-dir=${libxml2} \ + --with-pkg-config \ + --with-pg-config=${postgresql}/bin/pg_config + + bundle install --verbose --local --deployment + + # make sure we always load pg package + echo "gem \"pg\"" >> Gemfile + + # make rails server happy + mkdir -p tmp/pids + + # cleanup + rm config/database.yml + ''; + + meta = with stdenv.lib; { + homepage = http://www.redmine.org/; + platforms = platforms.linux; + maintainers = [ maintainers.garbas ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/version-management/redmine/generate_nix_requirements.rb b/pkgs/applications/version-management/redmine/generate_nix_requirements.rb new file mode 100644 index 000000000000..ed47d52c9c1b --- /dev/null +++ b/pkgs/applications/version-management/redmine/generate_nix_requirements.rb @@ -0,0 +1,56 @@ +#!/usr/bin/env ruby + +require 'rubygems' +require 'bundler' +require 'fileutils' +require 'net/http' +require 'net/https' +require 'uri' + +TMP_DIR = "/tmp/gems" + +FileUtils.rm_rf(TMP_DIR) if File.exists?(TMP_DIR) +FileUtils.mkdir TMP_DIR + +GEMSERVER = "http://rubygems.org" + +# inspect Gemfile.lock +lockfile = Bundler::LockfileParser.new(Bundler.read_file("Gemfile.lock")) + +to_mirror = {} + +uri = URI(GEMSERVER) +http = Net::HTTP.new(uri.host, uri.port) +http.use_ssl = uri.scheme == 'https' + +requirements = {} + +lockfile.specs.each do |s| + possible_gem_name = "#{s.name}-#{s.version.to_s}.gem" + + Dir.chdir TMP_DIR do + filename = `gem fetch #{s.name} -v #{s.version.to_s}`.split()[1] + hash = `sha256sum #{filename}.gem` + url = "#{GEMSERVER}/downloads/#{filename}.gem" + puts url + requirements[s.name] = { :version => s.version.to_s, + :hash => hash.split().first, + :url => url,} + + end +end + +filename = 'Gemfile.nix' + +File.open(filename, 'w') do |file| + file.puts "[" + requirements.each do |name, info| + file.puts "{" + file.puts ['name = ', '"', name, '";'].join('') + file.puts ['hash = ', '"', info[:hash], '";'].join('') + file.puts ['url = ', '"', info[:url], '";'].join('') + file.puts ['version = ', '"', info[:version], '";'].join('') + file.puts "}" + end + file.puts "]" +end diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index 8c51c4f35a3b..e3e52425ebde 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "kdenlive-${version}"; - version = "0.9.8"; + version = "0.9.10"; src = fetchurl { url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2"; - sha256 = "17x5srgywcwlbpbs598jwwc62l8313n4dbqx3sdk7p6lyvwk3jln"; + sha256 = "0qxpxnfbr8g6xq0h32skgqqi2xylrv2bnmyx5x1cws9y2wwxp3zn"; }; buildInputs = [ diff --git a/pkgs/applications/video/smplayer/basegui.cpp.patch b/pkgs/applications/video/smplayer/basegui.cpp.patch new file mode 100644 index 000000000000..05664ee96e62 --- /dev/null +++ b/pkgs/applications/video/smplayer/basegui.cpp.patch @@ -0,0 +1,11 @@ +--- a/src/basegui.cpp 2014-08-20 01:04:51.000000000 +0100 ++++ b/src/basegui.cpp 2014-10-11 10:25:57.561983556 +0100 +@@ -5235,7 +5235,7 @@ + #ifdef YOUTUBE_SUPPORT + void BaseGui::showTubeBrowser() { + qDebug("BaseGui::showTubeBrowser"); +- QString exec = Paths::appPath() + "/smtube"; ++ QString exec = "smtube"; + qDebug("BaseGui::showTubeBrowser: '%s'", exec.toUtf8().constData()); + if (!QProcess::startDetached(exec, QStringList())) { + QMessageBox::warning(this, "SMPlayer", diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 018be742a160..4e4d7a3e4b5b 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "smplayer-14.3.0"; + name = "smplayer-14.9.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "9b8db20043d1528ee5c6054526779e88a172d2c757429bd7095c794d65ecbc18"; + sha256 = "04yzgmdj9hm9v7ln49zm2aa1r9mm9q12pym4bvfww7yzsvnx96j2"; }; + patches = [ ./basegui.cpp.patch ]; + buildInputs = [ qt4 ]; preConfigure = '' diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix new file mode 100644 index 000000000000..d648b5866e04 --- /dev/null +++ b/pkgs/applications/video/smtube/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, qt4}: + +stdenv.mkDerivation { + name = "smtube-14.8.0"; + src = fetchurl { + url = mirror://sourceforge/smplayer/smtube-14.8.0.tar.bz2; + sha256 = "0h0kw4dvdj9sbxp0p6bdib9y8i7854f45lsmrdkykzk6rmgrf1cw"; + }; + + buildInputs = [qt4]; + + preConfigure = '' + makeFlags="PREFIX=$out" + ''; + + meta = with stdenv.lib; { + description = "Play and download Youtube videos"; + homepage = http://smplayer.sourceforge.net/smtube.php; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ vbgl ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/xbmc/plugins.nix b/pkgs/applications/video/xbmc/plugins.nix index d34fba9ade73..fe1be7a1e24c 100644 --- a/pkgs/applications/video/xbmc/plugins.nix +++ b/pkgs/applications/video/xbmc/plugins.nix @@ -16,7 +16,9 @@ let installPhase = '' d=$out${pluginDir}/${namespace} mkdir -p $d - cp -R $src/* $d + sauce="." + [ -d ${namespace} ] && sauce=${namespace} + cp -R $sauce/* $d ''; }; @@ -53,6 +55,28 @@ in }; + genesis = mkXBMCPlugin rec { + + plugin = "genesis"; + namespace = "plugin.video.genesis"; + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "lambda81"; + repo = "lambda-xbmc-addons"; + rev = "f8aa34064bf31fffbb3c264af32c66bbdaf0a59e"; + sha256 = "0d197fd6n3m9knpg38frnmfhqyabvh00ridpmikyw4vzk3hx11km"; + }; + + meta = with stdenv.lib; { + homepage = "http://forums.tvaddons.ag/forums/148-lambda-s-xbmc-addons"; + description = "The origins of streaming"; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + + }; + svtplay = mkXBMCPlugin rec { plugin = "svtplay"; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 269875656369..713ca591578d 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -2,7 +2,8 @@ , xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, lgi, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, rxvt_unicode -, which, dbus, nettools, git, asciidoc, doxygen }: +, which, dbus, nettools, git, asciidoc, doxygen, xmlto, docbook_xml_dtd_45 +, docbook_xsl }: let version = "3.5.5"; @@ -52,8 +53,11 @@ stdenv.mkDerivation rec { xlibs.xcbutilkeysyms xlibs.xcbutilrenderutil xlibs.xcbutilwm + xmlto docbook_xml_dtd_45 docbook_xsl ]; + cmakeFlags = "-DGENERATE_MANPAGES=ON"; + LD_LIBRARY_PATH = "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib"; GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0"; LUA_CPATH = "${lgi}/lib/lua/5.1/?.so"; diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 2ec66152f7dc..a62abf54efd7 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "man-pages-3.73"; + name = "man-pages-3.74"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "01qcafrq9z55kh5q97fir13l9cg2a1ls7ijkgzj99kgc6vkc90h5"; + sha256 = "10c6jra95ccdhz22xhmpskxcn29xvirkxzwr8dhz3jazyqwhq58y"; }; preBuild = diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 9e2679c04380..5bf86ea6b326 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, cmake }: stdenv.mkDerivation rec { - name = "poppler-data-0.4.6"; + name = "poppler-data-0.4.7"; src = fetchurl { url = "http://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "1yhaz74b50hjkz3ii077kmq3qg3p3kdyxm33cv6r1njvz8fr01pk"; + sha256 = "1pm7wg6xqj4sppb5az4pa7psfdk4yxxkw52j85bm9fksibcb0lp7"; }; buildInputs = [ cmake ]; diff --git a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix index 75c82607a024..d09b17df697a 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, +{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3_12, gtk3, gst_plugins_base, glib, gobjectIntrospection, hicolor_icon_theme }: @@ -6,13 +6,11 @@ stdenv.mkDerivation rec { name = "gnome-shell-pomodoro-0.10.2-11-gd5f5b69"; - src = fetchurl { - url = - "https://codeload.github.com/codito/gnome-shell-pomodoro/" + - "legacy.tar.gz/gnome-3.12"; - sha256 = - "6c86203f56f69a52675c2df21e580a785f8894a2a9cdf4322d44743603504d10"; - name = "${name}.tar.gz"; + src = fetchFromGitHub { + owner = "codito"; + repo = "gnome-shell-pomodoro"; + rev = "0.10.2"; + sha256 = "1jd4xmcx0fbcn57d1qj7b4xkj0dv4i75s367nifabm47akqzyn4f"; }; configureScript = ''./autogen.sh''; @@ -47,4 +45,4 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix index 48a086014071..f87431653c93 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix @@ -2,12 +2,12 @@ , pango, gtk3, gnome3, dbus, clutter, appdata-tools, makeWrapper }: stdenv.mkDerivation rec { - version = "3.12.3"; + version = "3.12.3.1"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "03f48kaidgbnyi4c7qgkwvnxs5rz7nk9m3iqfpsbhc512c8qnc1f"; + sha256 = "05afbhn3gw015cf2z3045lvlnj4cz06p6libkglb2wqsfb7azbl0"; }; buildInputs = [ intltool autoreconfHook pkgconfig vala glib diff --git a/pkgs/desktops/kde-4.12/applications/kate.nix b/pkgs/desktops/kde-4.12/applications/kate.nix deleted file mode 100644 index e7a6476dd6df..000000000000 --- a/pkgs/desktops/kde-4.12/applications/kate.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}: - -kde { - - buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4 ]; - - meta = { - description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/applications/konsole.nix b/pkgs/desktops/kde-4.12/applications/konsole.nix deleted file mode 100644 index bd4e9e58cd05..000000000000 --- a/pkgs/desktops/kde-4.12/applications/konsole.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, kde, kdelibs, kde_baseapps }: - -kde { - - buildInputs = [ kdelibs kde_baseapps ]; - - meta = { - description = "Konsole, the KDE terminal emulator"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/default.nix b/pkgs/desktops/kde-4.12/default.nix deleted file mode 100644 index ffcd3115de71..000000000000 --- a/pkgs/desktops/kde-4.12/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.4" }: - -let - branch = "4.12"; - - # Need callPackageOrig to avoid infinite cycle - kde = callPackageOrig ./kde-package { - inherit release branch ignoreList extraSubpkgs callPackage; - }; - - # The list of igored individual modules - ignoreList = { - # Doesn't work yet - kdeutils = [ "ksecrets" ]; - # kdeadmin/strigi-analyzer has no real code - kdeadmin = [ "strigi-analyzer" ]; - # Most of kdebindings do not compile due to a bug in the buildsystem - kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ]; - }; - - # Extra subpackages in the manifest format - extraSubpkgs = {}; - -in - -kde.modules // kde.individual // -{ - inherit (kde) manifest modules individual splittedModuleList; - - akonadi = callPackage ./support/akonadi { }; - - qt4 = qt48; - - kdebase_workspace = kde.modules.kde_workspace; - - inherit release; - - full = stdenv.lib.attrValues kde.modules; - - l10n = callPackage ./l10n { - inherit release branch; - inherit (kde.manifest) stable; - }; -} diff --git a/pkgs/desktops/kde-4.12/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.12/files/kde-wallpapers-buildsystem.patch deleted file mode 100644 index 378cdb646940..000000000000 --- a/pkgs/desktops/kde-4.12/files/kde-wallpapers-buildsystem.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3d3e247..f78db67 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,10 @@ --find_package(KDE4 REQUIRED) --include(KDE4Defaults) -+project(kde-wallpapers NONE) -+if( WALLPAPER_INSTALL_DIR ) -+ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}") -+else() -+ find_package(KDE4 REQUIRED) -+ include(KDE4Defaults) -+endif() - - install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) - diff --git a/pkgs/desktops/kde-4.12/files/kdelibs-cve-2014-5033.patch b/pkgs/desktops/kde-4.12/files/kdelibs-cve-2014-5033.patch deleted file mode 100644 index c85eccd6beb6..000000000000 --- a/pkgs/desktops/kde-4.12/files/kdelibs-cve-2014-5033.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -+++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -@@ -144,7 +144,7 @@ - - Action::AuthStatus Polkit1Backend::actionStatus(const QString &action) - { -- PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid()); -+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID())); - PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject, - PolkitQt1::Authority::None); - switch (r) { -@@ -160,21 +160,12 @@ - - QByteArray Polkit1Backend::callerID() const - { -- QByteArray a; -- QDataStream s(&a, QIODevice::WriteOnly); -- s << QCoreApplication::applicationPid(); -- -- return a; -+ return QDBusConnection::systemBus().baseService().toUtf8(); - } - - bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID) - { -- QDataStream s(&callerID, QIODevice::ReadOnly); -- qint64 pid; -- -- s >> pid; -- -- PolkitQt1::UnixProcessSubject subject(pid); -+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID)); - PolkitQt1::Authority *authority = PolkitQt1::Authority::instance(); - - PolkitResultEventLoop e; - diff --git a/pkgs/desktops/kde-4.12/files/polkit-install.patch b/pkgs/desktops/kde-4.12/files/polkit-install.patch deleted file mode 100644 index d2ecac663ec5..000000000000 --- a/pkgs/desktops/kde-4.12/files/polkit-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake ---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200 -+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200 -@@ -139,7 +139,7 @@ - ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR - ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) - -- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING -+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING - "Where policy files generated by KAuth will be installed" FORCE) - elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") - set (KAUTH_COMPILING_FAKE_BACKEND TRUE) diff --git a/pkgs/desktops/kde-4.12/kactivities.nix b/pkgs/desktops/kde-4.12/kactivities.nix deleted file mode 100644 index 06381bb13d7d..000000000000 --- a/pkgs/desktops/kde-4.12/kactivities.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, nepomuk_core }: - -kde { - propagatedBuildInputs = [ kdelibs nepomuk_core ]; - - meta = { - description = "KDE activities library and daemon"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kde-base-artwork.nix b/pkgs/desktops/kde-4.12/kde-base-artwork.nix deleted file mode 100644 index 3f416cebddc4..000000000000 --- a/pkgs/desktops/kde-4.12/kde-base-artwork.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, kdelibs }: - -kde { - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Base artwork"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix deleted file mode 100644 index a65f33e13de1..000000000000 --- a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, kde, kdelibs, htmlTidy, kactivities -, nepomuk_core, nepomuk_widgets, libXt }: - -kde { - buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ]; - - meta = { - description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix b/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix deleted file mode 100644 index 9b5a53cee48d..000000000000 --- a/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix +++ /dev/null @@ -1,444 +0,0 @@ -{stable=true; -hashes=builtins.listToAttrs[ - {name="amor";value="0c8298z7c3a71yj6nik7h8h7rngqzrz6rc95kl990p37jp2ng0d9";} - {name="analitza";value="0l122nh81nf7r4bm73gc6dp9k4jh2dxc7majrzjq37hb8pi77njh";} - {name="ark";value="155bhqqyw3afm99c47b3pxqf9fiqcz6gqg1pavsx9q4rmk7rp8m6";} - {name="audiocd-kio";value="1c5234s1hdh6jc8szyb4nwqr1h8hhwlmin0iyxabsl0c45pss9pa";} - {name="blinken";value="0q0y3xfv3pjrw0h8mnbigpywwrqk8wb2lqbjcgk755j6syinhphh";} - {name="bomber";value="1f12qmg58n9sj6vjqdj57ch50pq5f0h6anx06x9bhhs502w6aqwy";} - {name="bovo";value="10x4qy4vdp76iv3n60iy24lk1wbsjdfr88l1m9xifj4k942wk2ir";} - {name="cantor";value="1x5rxshdbgl40cqx6h5r0hx49rrc6gwnabsl8b7kzimh0kbv2ma9";} - {name="cervisia";value="0ia78cjkq606232jy14ps7cpm77pq4xdmcfimv4l6p0xjpq8jzsg";} - {name="dolphin-plugins";value="08h278jpbll7wc1mhz58cklj1bkrk61dfwjlflag6fnlm6i4xx8k";} - {name="dragon";value="16gyr0dl50nl9r3yc2fkwmqlrfgzzyim6bdlb9a76winzbz8mgxr";} - {name="ffmpegthumbs";value="01cmwm6w1z2gsllwdmrzsl9882fw5k59lr1k7z114kkrh1l0b2j4";} - {name="filelight";value="01rs1r80ixm1dj5d73a22893rdz2srxqp4dv5pysw1fhn02zdkkf";} - {name="granatier";value="1ia85yxfbbi8qxdyn0vwgmdjrxwssb6nadbia1yqsjdncfsnhbvs";} - {name="gwenview";value="01p5b1z05v3c7f192fxrrfp6x3ss7gx8pxv29czkp641hpmcg3jl";} - {name="jovie";value="1hfkj3vlvm63sgb4gx3xl7nksb5cfqnh7shs7wqm3gl6yj2rwhjj";} - {name="juk";value="1vxnrxz6gbyk7fd15akhiyczpgq03cym3nldi61m958cx4khd4y7";} - {name="kaccessible";value="0a9r2bk8a5h7mpl37li3bqbsz5dfgn8rsxnri93msvc6555pnyzv";} - {name="kactivities";value="1fl638cyj3abxfmbqcfqsd3idmdmys1xim4flf1jpbqa29psl75j";} - {name="kajongg";value="19awqjqn9hqhprzi7mjb6nkrgvb3mzhignkgalfjd4j5rga7vzz0";} - {name="kalgebra";value="1bj88nh7znk86i6a4d3jcjyqp46kzipfc99xvhxvqdsy8drbrwjp";} - {name="kalzium";value="00pjpdbd11jgzs443kgh8y6pxf3ff0ypgl5j3zfa6gbj18cnkkq0";} - {name="kamera";value="12mcjw8l0nh2jbi04myx1y1irbf92x9bx93gdymw939lawaalqic";} - {name="kanagram";value="1yd5agh61nv4ajlrijxg5g3hvw0xjxdvnc6h3lbz5mgvc8smvazk";} - {name="kapman";value="1aa78q6y2s9dig2603b9nry5rx5jbbxz2pb3jxr323hmqxp6jy1z";} - {name="kapptemplate";value="08j8xh9spk6ymlichl74n1v2zn342d94m6f4jragnx2jvif2163k";} - {name="kate";value="1cxc9bgzvfpns7dhmmafzxhnyjqxyq0adr0l1mbwsahxpkblc30r";} - {name="katomic";value="01lk7ajlj98rjbs76xd9r3hnd98dy49xv809m2zchm5ria7hdh48";} - {name="kblackbox";value="1sgbs0flllmy6d3518wwnzmdr14kqkxsi76h2p4xyk3bq2g9q2xg";} - {name="kblocks";value="1zinpxbvri52r26qiiiv4j4r02a22947hcrchf1z3n6lf817vqwv";} - {name="kbounce";value="0f9ssdpicvkiv7dxnj75h1cmz24mz2sy2zyp7rw7mvr9ynnl8w21";} - {name="kbreakout";value="02ix39kfkagmsqs8icqrqy9cz90lbl2wqajyjzrshw1vi29iahc7";} - {name="kbruch";value="0mfqdgwd5d8sy3bdiicpd5927dgg6zhm521f2q853qd2sqjbspgl";} - {name="kcachegrind";value="0dydarm1a2i64nazcl59s0a8b8z7znnm20wdmx2gfm5377j98y8x";} - {name="kcalc";value="1znrv4fqwaf56djf9qg6fxcp7nfi7fzza2whjlkayvc9kxv3ah9y";} - {name="kcharselect";value="0mbl9zvb9hp0xdi58v0vb8z0by71xkz22pr9flnkar5b1klnjpdb";} - {name="kcolorchooser";value="1d1cyaqi0rhwfnmjbxpjjavgwjhr3pd2rywlxxb9g4q3rv8k7wg5";} - {name="kcron";value="033f0s14crqpsirhgysi309b9pj02vwsd7fr28n6n2sh5imj30a0";} - {name="kdeartwork";value="08snjhaqiddiaj5jfd0vx1fjijsyqwngy7p1mkpdfhj7575sbx7c";} - {name="kde-baseapps";value="0k0mfbpvmv0n2brrb8hc0rd1wz04m3cyr1byb0z34a7x7kk1h1i4";} - {name="kde-base-artwork";value="0vmkbmir7hviqkv7nqrbqd6skj2srp9w4nrs8rkcvq7c8n76rk5w";} - {name="kde-dev-scripts";value="0l5frvb1akhy86j3yic3n1jirclj8r1jwjn760fi89vl1xysrarq";} - {name="kde-dev-utils";value="0807c8mq8rqqk8vf9r1idqmqrlfv9bsc8rjn8mfv2ch49mzzdrdj";} - {name="kdegraphics-mobipocket";value="1m6lnkr460261iq634lz887dbhvmj56p97k4llch3h80ra10mlh8";} - {name="kdegraphics-strigi-analyzer";value="1rqb1lzqb39p95xpf8c26pm9rxhcmycd518hxzp8arz6k2chazj8";} - {name="kdegraphics-thumbnailers";value="04aaxjznb176ym89f06gp4bycg67zndwc451mkdr33mal58jh0zs";} - {name="kdelibs";value="0dn0z1fs4vym7cp2749viw171dhay9ql2dp65a4hphmsdmk9bzv4";} - {name="kdenetwork-filesharing";value="1r3a5y9nmcf06nqsdh8k4jny7dmrhya8xi3jwz0d1mfzlfjksyf7";} - {name="kdenetwork-strigi-analyzers";value="0gqj5b91q3l5hna6zbgm17wi54g7g058n605adc1mch97yshqyrd";} - {name="kdepim";value="00lsyg6762kd2qvhhqq6vrrrl1fbk07yd3ha8w1yyjwiy9cnsy7z";} - {name="kdepimlibs";value="1h7k5ravilwz9r5lh7dqjnzh9h8hz43plbdaicjwk2sg4mqwzzhh";} - {name="kdepim-runtime";value="1z631kag1gpmk2ljk64vhscr3lad3mj3599phh0i8jqlxvr4007c";} - {name="kdeplasma-addons";value="0lfza3454hzbicqpz0ipjys9brjkblmpsngqg5njxd6ph9mzg34a";} - {name="kde-runtime";value="05n5cllsjyf03bgisykrbc74i7a3nm5f0k6hnq9sphf8xnxl318x";} - {name="kdesdk-kioslaves";value="045kf44s2gg3i2xl6087zn3cz80y7li26fzxdvvv89ywcq0npg59";} - {name="kdesdk-strigi-analyzers";value="15xxpgiy5bp6m78crw448mzv3yijjzipsrybadrbwqz6p7dpysbv";} - {name="kdesdk-thumbnailers";value="039rgq5p4mkdrilcvkf6k1d9d45swk74hdg3qnsbz3m47vqqf92h";} - {name="kde-wallpapers";value="0z7ffz2i410k2xxl1cr8m74mm90c5sizpbhmhyqxwjlsbz1gwfya";} - {name="kdewebdev";value="0ljwbzdcshjaz2dv7yp4ckj0c0jxa60ka6vjbhdmc4x7nvwnx737";} - {name="kdf";value="0s8ms5h5gdfa3697xg1yzz0h2hijlv68gi2g7n7g3xwpawbqrzv1";} - {name="kdiamond";value="10v7zrj4d96ppawjib1jgdz00455h8334w4vb619g448pj5h66sn";} - {name="kfloppy";value="1fd7wwbxngaiy0fbxvqp027rp61jg8fwajz70lx7acs20kcs0301";} - {name="kfourinline";value="1s2gc7zk932ks89c24pyimcsspnmabbmsdjh520xkzzxrp41gz0b";} - {name="kgamma";value="0n19zrarda9fvhimgnm84mdcaqgcqn4qfr0yw6i76la24pjbl46y";} - {name="kgeography";value="0w32841fligd3gyjl34q2f31jldw2vl47bi6cljwp7nlkdlp0lkn";} - {name="kget";value="1kls245b5s2dlxcrpa4d969zlr2lw797p7p2ilyhb4rbv871c0wd";} - {name="kgoldrunner";value="10xq9827gwib6w9h4hhys1v896rxqd50mz66k3frnrqals04zbbk";} - {name="kgpg";value="1wa5ymibiqnjxl5ck94y1xh3qk0bx3v7k7n2y3jcvprmhglffx6j";} - {name="khangman";value="1jfi30cb17gkn7v3i42wj0pqgaq3mr4fjbwh60ikvhxxd0nf5nny";} - {name="kig";value="1z0f50m1hgr5jj79v5v610bdggy4knlqnbxpnwf6ihj60v3cn0x0";} - {name="kigo";value="1klcgh3bpl3gqyh5zvij7ah754wjjf409a9l1xqxjigz4samnism";} - {name="killbots";value="04vy4zybgqls4whymqnzgkfbmzb17cc1m2xf2hp32bq5fq0r8103";} - {name="kimono";value="1bqbgch1z2nm143sp4lwnh3swvmvavhkj4scgx6d17m24jgd69hn";} - {name="kiriki";value="04r7p5f9a2iwv7c40pcnbga5ldcfjjig31fx81ww0b6p62dv2vrl";} - {name="kiten";value="1fxyy805b1q2sxdkd0hq2fr6plbnawzyascsbwychsqsasw2rmng";} - {name="kjumpingcube";value="0q2hn6lvz5grwz10nqq5jkcg3j1lgqsmmmhmx0glr4c732hg1z1d";} - {name="klettres";value="1w4340gaaip8imwy5d0058600v6fi7wnifppay2l7kvlp09iwmws";} - {name="klickety";value="088xvrb1jn8f3cfh39387pzw9simrjan63c24hn76290fkqjadgq";} - {name="klines";value="0n3bsvf5skr4816mjrd7zqjnh8vp5klvgx3h0025hwcbqyfa64bs";} - {name="kmag";value="0x91b1fwvwppiwzsnvc0647429ffhn56gndykmmyzr27i45znk3r";} - {name="kmahjongg";value="19qz7q5sr5xphzwxjf84h5vg0fll45fvs3pi5q9a5x5g4dy14wsv";} - {name="kmines";value="1nm7di7xs727jvfvv2039hpgkxzddgfv6vvrw3jwls975akl1wmb";} - {name="kmix";value="19s9z6m1v3wk5prngmm612r34013z7dkira83ap6kn3v32cfciry";} - {name="kmousetool";value="1zf7d3k1jf5ydaiw7v7a34hd5w4fmgkd4g9427546x64n27vx0a2";} - {name="kmouth";value="12n1x1imy7w3rn8g8zawmfivic0avzgrpmwm71hy7kxw9ya24yjg";} - {name="kmplot";value="1zji3lkq332zgvccnlisdavwxh0d1x81131xcy25r36q9c42syj3";} - {name="knavalbattle";value="0ibbahwck80z1dhycvm52k4nnj0pifzf9vi7j64kczc54z20b6d2";} - {name="knetwalk";value="0j8lyv60rvs5w214vhpmkf0807vi8b2vc8lglmmvz66cpw42c45z";} - {name="kolf";value="060dmnpr84g1512l0c0myxf1h1qp4jdsfgnxg5vwpciqk0dc9qhy";} - {name="kollision";value="033x8dg57f5amsnignri6ln8adavbaw1l3sydlf0jrw7ww3qvw1h";} - {name="kolourpaint";value="0c7i95cplwvxxm6aqgsk70q8ny8yfarcah9113vk6b81llbwn5sc";} - {name="kompare";value="0mq2v9nissb5s41lwvjbpba6fznkzwah9a7yisjq1nq47rp4ymqb";} - {name="konquest";value="0bsqxr12x9qgk4al21s2hrm48hv15ir98792z8jna3d5w6j0a2zy";} - {name="konsole";value="13kv6pmziqfis4qxkfxbmm3yiy2w3fy2l2qi68l0s6yiaqkd9y37";} - {name="kopete";value="012zjq0zmqkgahnzzj02xaqhsh800bn1x7sj8vmv1mxqyi66srvy";} - {name="korundum";value="1qyk8gvzcjwi5pi7s0a74glyvi1mi7k5z5ilza16y0z5k6ffgvck";} - {name="kpat";value="0lmhygv4l1vkmbf7vmrbns6fl1anbcxsnldn0hccdpp73x1py88g";} - {name="kppp";value="0nnz137c384xlnrvy625zdjfzzrp6yrcfnn9gw6fs81cq4zwrr64";} - {name="krdc";value="0g7p94q0h3i3j9wwcmmiylz0604v4z9f0b2dppfiaq5bnz9m5pdl";} - {name="kremotecontrol";value="1hg4fq6ypws4zb07glsrflmr7vq35h7qqmjf5r5b5j53xqmgr6hp";} - {name="kreversi";value="059xsi9x6jhsdsgrxrk08haz1v4p4i46l7zkg8id64s9kvywgn5j";} - {name="krfb";value="01l8jv5ad3gc5kxjbr7k4ggcipc5903z82pq9616mk0qpd96j6jb";} - {name="kross-interpreters";value="0cdb9kaq9fdjaxks83z3gvjwwhz94g4kgjq1rp6wmzwydk28ip6i";} - {name="kruler";value="0i9n2znhm6llriipvrrjh8yymj76a17895w7kbcyd41srk0akk5i";} - {name="ksaneplugin";value="1fqkbf47ajw7ckzipphdjpnpv4gk426k1rpq3z1qlbag9f9wvxsd";} - {name="kscd";value="1f8099bhylrr5m3a5lrmjxz2rz59k3qi1abfjs63hk2z523p99n3";} - {name="kshisen";value="1nhq2rxiylzr7klpqqbhl35v7s4prv15wrckgx84mdm5hmyh4nsw";} - {name="ksirk";value="0s577h7sswqr44mzmm2a5gi62w8lpzivy9xy5jpib3iw768a9gxy";} - {name="ksnakeduel";value="09jp1cd138cqv131h7m3c994zwxbn97yw77fq1yrcfgyspmdx0x9";} - {name="ksnapshot";value="1fiqracij106c22b0ws6n047wn4fww5fzli8rqjas5m25931azl4";} - {name="kspaceduel";value="1a2n9kyn6y62yps5apclgpmzbchdrfn3lck9fl68alk0bpqdnz1n";} - {name="ksquares";value="1bg9na03ph1lignnl6fdxkvcbsq77dskbgn8d7hyq1p800n7jx7q";} - {name="kstars";value="1wf13434sxxwikrp29jl5klggmv0ln73a57rs0m4gr4zrjvbrs2s";} - {name="ksudoku";value="1nq4nj1q723s7gv1d0l3wafs2d6wz67xhir2sa1wsw12dzh856vf";} - {name="ksystemlog";value="0khb92vxr0hfny2yxwnww33ahgm9gmmrf5h7qaj0lqnyrh5fcl6c";} - {name="kteatime";value="13jzf4mcq8glkhg5szpawj2k0ss4qfzrjhpmjn3m3grz1zf167sw";} - {name="ktimer";value="0y6q9khxlmb7pgds4f9a83aqnbn0gwbi3r15s8vf72qr3qj3f5xc";} - {name="ktouch";value="1swdkzvm9q4r8ily7n4cs91y186zlzys7kjs3lf2q46d63l9nfdz";} - {name="ktuberling";value="0fzd17hvb2zaqwd0fw6f3rq0mlq8xrmz155dyg916jg2alslicxh";} - {name="kturtle";value="1hlfv77g0v48qfqwpqqnw5qf8fcl4v38612v3jy5z038g4sacxkx";} - {name="ktux";value="0shib3f2gcdgf88zh2w67kizbmj7gz0vqy8ff5vmr75fp44111b4";} - {name="kubrick";value="1dkd7rzkxyk71hd4r9l6nlvcl3zj8vf6i9v1gqi8zjrqwpxvf188";} - {name="kuser";value="1qc4wk5q9y7mmkfjqndcby7782z2aaj7x1cc4dcmds01glm2bw6j";} - {name="kwalletmanager";value="1f0ncnx3d6z3v373095nhydj844hiva64qh80cc7rmb624vlcsa4";} - {name="kwordquiz";value="1m0zi0gldw7shjy4nhiw2azgrfvhcmm5h423gckjczpqd9f17ihd";} - {name="libkcddb";value="0k1xr8z3dmfq08qh7fkjhi2v523lhy1inmggnk3gaxzarlvhqxxa";} - {name="libkcompactdisc";value="03ch51firb2xcqwy3p6q5j5zr9570nvqa5cgd5yj7pjnzdwcjxv8";} - {name="libkdcraw";value="1ypamhdk8y7vb9y250vilmv5dgxf1svvsw329yxc146ii0pb4nwr";} - {name="libkdeedu";value="0m20vxa9x2ww7xmq1a7j4pmqsdj5pp05hsg4q64slz69m5npi30r";} - {name="libkdegames";value="1hz02x2k7iiw0i78ifa4ji60l87by855v5f6pm3ksw3rdw0ipz9v";} - {name="libkexiv2";value="0mz88j3kszqxf518h7n0fjnql2iqwx780hv4jhvrkraclf4czng9";} - {name="libkipi";value="0x4d356c20fdjaqadzaqhsf43v9c9bgbwbyy304q2w329m8ab058";} - {name="libkmahjongg";value="0911knwvhwa77hr0ncqwjqzfcyvgi806ckyldglrhvm0gw0mgy60";} - {name="libkomparediff2";value="0rn5xhbnywjjbk9qx3xw3gss57l105a4a4v05gh9vvl82hc5sfzx";} - {name="libksane";value="19zibd1y96sxwnpdxkd752jiky83b8is85qi7six60g5kkzi948m";} - {name="lokalize";value="0sl9i146rx0ls3rii6893alkvsjv8ln0d5yabd72f8kagsaw42h7";} - {name="lskat";value="1flx7l8svf51fkr3lw0z85d0gkrabjzi73w4qn2wnsaz9wr6kahi";} - {name="marble";value="1gvlq0si76bk4yd8dfbixzwxj618ifd2jlr7fq6f9mx498cvifpi";} - {name="mplayerthumbs";value="1nw01216mghwxz7zhkf7px5kkb2d4dqdk7par20agvw2raan9axi";} - {name="nepomuk-core";value="0gavipa1hn5aw77q3xrdv9464l8qpabq6kawlvjvv90hjvs8clis";} - {name="nepomuk-widgets";value="1cr4v4s567vcx1046gj066xfmhrqx4g6lipffr6d3wdq9cgy5y5i";} - {name="okteta";value="0maadxyngj8an0hl3kidvmgj538n6vzpz964yilzj6qrry9f46wc";} - {name="okular";value="0cmcaqpaxx8910qmsvag6spjbchdbv6j9hgbizw6qq09kz4d9a7k";} - {name="oxygen-icons";value="00l7qy95za3c323hkjiihavmq2vjm2yi81yn4cgwpnc5l336pynb";} - {name="pairs";value="15kafhp54dsrv2466j9gnn0c8iqbfx4frrql0r6v5qza015vybr9";} - {name="palapeli";value="0bx7qqidywxwkj9vdbzpqsy2fvkjgf9vj8nqk5ypx7jm7da87y94";} - {name="parley";value="163xnfd9h8r6dp3riqs3s32qaramyf225bhy6y9laknbrr9lxnsm";} - {name="perlkde";value="05ybh43ckfq5qh03pklkgiajc2s6b6cmvp5alx0dvq605h5z881f";} - {name="perlqt";value="1fn3gxb8b4kx7g24pnrbg42dv17hn2wv70g53yfr6z277ljinxzl";} - {name="picmi";value="19gli6mii15qya9hi6qyb52rsk2n2dk6r4kzla99ps3cs8n4h9x8";} - {name="poxml";value="11cwhjil8vdwwpmp1l61335b5j9714hbxiyqw0wyxcr6yccasbdf";} - {name="print-manager";value="0v940bsksw04ymxq56lgm6sprkdlyzjm5fgsm24yb564nay3x42h";} - {name="pykde4";value="00gpjqgsfv83xfk1xmglr8c32ln9cc05m4nf1qbd3gvr5jb6cxmg";} - {name="qtruby";value="1312v8vn091q5lh81cm5z5wkgidigdngqkjs3kf7lp9d1k50ai47";} - {name="qyoto";value="0sjii1i31x1cxhr5y5ijaain9ql75fbba9ss1cxz9agswp95kpcz";} - {name="rocs";value="0h72mrb65gnk36g9d4l55bm7kfldh3v95hbv0wxad0p9v7baxmn2";} - {name="smokegen";value="0x4qz1pk8wn4vq0fmy344v9m1gh12dav3n71z6xi4pnpmpmq7kna";} - {name="smokekde";value="1wl88jy9yvvrykzknj1vy7rqhfxr52q053y2jmay53hvx1iaqjxm";} - {name="smokeqt";value="1lphdjxcvysn1lkq6yj7z5pmhzlwpkj3xx7izfdk1g6a1pkjwr7j";} - {name="step";value="0ma7748ixi00zw9hrjjlgbb7d1a4cr124ka3ymn45sa4q4mza3zh";} - {name="superkaramba";value="0xbs2k863p2yg2k7wn70gbwvriin4lv2hv78r5m6fwvb4rsjygsb";} - {name="svgpart";value="1svwqxcxl2wp4wq9s3q6crys7jmz072wp4qz69fvqcvp1cd92gsp";} - {name="sweeper";value="19lsqw192h3863fbd265didviy7m4wk6qwfgnhc7sxaxxccm19y4";} - {name="umbrello";value="0lmygjjsqiw0xnv4d3d1yb1b5zlnj18lh01k954ycl8f50cxsv9a";} - {name="zeroconf-ioslave";value="1324mx9gsr6ghi7m1qk4kwr91g8wfd3jsw3rzp26nhrlwjsa5j6a";} -]; -modules=[ -{ - module="kdemultimedia"; - split=true; - pkgs=[ - { name="audiocd-kio"; sane="audiocd_kio"; } - { name="dragon"; } - { name="ffmpegthumbs"; } - { name="juk"; } - { name="kmix"; } - { name="kscd"; } - { name="libkcddb"; } - { name="libkcompactdisc"; } - { name="mplayerthumbs"; } - ]; -} -{ - module="kdegraphics"; - split=true; - pkgs=[ - { name="gwenview"; } - { name="kamera"; } - { name="kcolorchooser"; } - { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } - { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } - { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } - { name="kgamma"; } - { name="kolourpaint"; } - { name="kruler"; } - { name="ksaneplugin"; } - { name="ksnapshot"; } - { name="libkdcraw"; } - { name="libkexiv2"; } - { name="libkipi"; } - { name="libksane"; } - { name="okular"; } - { name="svgpart"; } - ]; -} -{ - module="kdelibs"; - split=true; - pkgs=[ - { name="kdelibs"; } - { name="nepomuk-core"; sane="nepomuk_core"; } - { name="nepomuk-widgets"; sane="nepomuk_widgets"; } - ]; -} -{ - module="kdenetwork"; - split=true; - pkgs=[ - { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; } - { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; } - { name="zeroconf-ioslave"; } - { name="kget"; } - { name="kopete"; } - { name="kppp"; } - { name="krdc"; } - { name="krfb"; } - ]; -} -{ - module="kdeutils"; - split=true; - pkgs=[ - { name="ark"; } - { name="filelight"; } - { name="kcalc"; } - { name="kcharselect"; } - { name="kdf"; } - { name="kfloppy"; } - { name="kgpg"; } - { name="kremotecontrol"; } - { name="ktimer"; } - { name="kwalletmanager"; } - { name="print-manager"; sane="print_manager"; } - { name="superkaramba"; } - { name="sweeper"; } - ]; -} -{ - module="applications"; - split=true; - pkgs=[ - { name="kate"; } - { name="konsole"; } - ]; -} -{ - module="kdetoys"; - split=true; - pkgs=[ - { name="amor"; } - { name="kteatime"; } - { name="ktux"; } - ]; -} -{ - module="kdesdk"; - split=true; - pkgs=[ - { name="cervisia"; } - { name="dolphin-plugins"; sane="dolphin_plugins"; } - { name="kapptemplate"; } - { name="kcachegrind"; } - { name="kde-dev-scripts"; sane="kde_dev_scripts"; } - { name="kde-dev-utils"; sane="kde_dev_utils"; } - { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; } - { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; } - { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; } - { name="kompare"; } - { name="libkomparediff2"; } - { name="lokalize"; } - { name="okteta"; } - { name="poxml"; } - { name="umbrello"; } - ]; -} -{ - module="kdegames"; - split=true; - pkgs=[ - { name="bomber"; } - { name="bovo"; } - { name="granatier"; } - { name="kajongg"; } - { name="kapman"; } - { name="katomic"; } - { name="kblackbox"; } - { name="kblocks"; } - { name="kbounce"; } - { name="kbreakout"; } - { name="kdiamond"; } - { name="kfourinline"; } - { name="kgoldrunner"; } - { name="kigo"; } - { name="killbots"; } - { name="kiriki"; } - { name="kjumpingcube"; } - { name="klickety"; } - { name="klines"; } - { name="kmahjongg"; } - { name="kmines"; } - { name="knavalbattle"; } - { name="knetwalk"; } - { name="kolf"; } - { name="kollision"; } - { name="konquest"; } - { name="kpat"; } - { name="kreversi"; } - { name="kshisen"; } - { name="ksirk"; } - { name="ksnakeduel"; } - { name="kspaceduel"; } - { name="ksquares"; } - { name="ksudoku"; } - { name="ktuberling"; } - { name="kubrick"; } - { name="libkdegames"; } - { name="libkmahjongg"; } - { name="lskat"; } - { name="palapeli"; } - { name="picmi"; } - ]; -} -{ - module="kdeedu"; - split=true; - pkgs=[ - { name="analitza"; } - { name="blinken"; } - { name="cantor"; } - { name="kalgebra"; } - { name="kalzium"; } - { name="kanagram"; } - { name="kbruch"; } - { name="kgeography"; } - { name="khangman"; } - { name="kig"; } - { name="kiten"; } - { name="klettres"; } - { name="kmplot"; } - { name="kstars"; } - { name="ktouch"; } - { name="kturtle"; } - { name="kwordquiz"; } - { name="libkdeedu"; } - { name="marble"; } - { name="pairs"; } - { name="parley"; } - { name="rocs"; } - { name="step"; } - ]; -} -{ - module="kdeadmin"; - split=true; - pkgs=[ - { name="kcron"; } - { name="ksystemlog"; } - { name="kuser"; } - ]; -} -{ - module="kdebindings"; - split=true; - pkgs=[ - { name="kimono"; } - { name="korundum"; } - { name="kross-interpreters"; sane="kross_interpreters"; } - { name="perlkde"; } - { name="perlqt"; } - { name="pykde4"; } - { name="qtruby"; } - { name="qyoto"; } - { name="smokegen"; } - { name="smokekde"; } - { name="smokeqt"; } - ]; -} -{ - module="kdeaccessibility"; - split=true; - pkgs=[ - { name="jovie"; } - { name="kaccessible"; } - { name="kmag"; } - { name="kmousetool"; } - { name="kmouth"; } - ]; -} -{ - module="kde-baseapps"; -sane="kde_baseapps"; split=true; - pkgs=[ - { name="kde-baseapps"; sane="kde_baseapps"; } - ]; -} -{ module="kactivities"; split=false;} -{ module="kdeartwork"; split=false; - pkgs=[ - { name="ColorSchemes"; } - { name="IconThemes"; } - { name="emoticons"; } - { name="kscreensaver"; } - { name="kwin-styles"; sane="kwin_styles";} - { name="styles"; } - { name="wallpapers"; } - { name="HighResolutionWallpapers"; } - { name="WeatherWallpapers"; } - { name="desktopthemes"; } - ]; - -} -{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;} -{ module="kdelibs"; split=false;} -{ module="kdepim"; split=false;} -{ module="kdepimlibs"; split=false;} -{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} -{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} -{ module="kde-runtime"; sane="kde_runtime"; split=false;} -{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} -{ module="kdewebdev"; split=false; - pkgs=[ - { name="klinkstatus"; } - { name="kfilereplace"; } - { name="kimagemapeditor"; } - { name="kommander"; } - ]; - -} -{ module="kde-workspace"; sane="kde_workspace"; split=false;} -{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} -]; -} diff --git a/pkgs/desktops/kde-4.12/kde-package/default.nix b/pkgs/desktops/kde-4.12/kde-package/default.nix deleted file mode 100644 index 6b4e1ba0ad87..000000000000 --- a/pkgs/desktops/kde-4.12/kde-package/default.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4 -, release, branch, ignoreList, extraSubpkgs -}: - -let - inherit (stdenv.lib) filter fold; - inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head; -in -rec { - manifest = import (./. + "/${release}.nix"); - - # src attribute for $name tarball - kdesrc = name: fetchurl { - url = "mirror://kde/" + (if manifest.stable then "" else "un") - + "stable/${release}/src/${name}-${release}.tar.xz"; - sha256 = getAttr name manifest.hashes; - }; - - # Default meta attribute - defMeta = { - homepage = http://www.kde.org; - inherit branch; - platforms = stdenv.lib.platforms.linux; - inherit (qt4.meta) maintainers; - }; - - # KDE package built from the whole tarball - # This function is used both for monolithic modules and modules which are - # released as individual tarballs - kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, version ? release, ...}: - stdenv.mkDerivation ({ - name = "${name}-${version}"; - src = kdesrc name; - meta = defMeta // meta; - enableParallelBuilding = true; - } // (removeAttrs a [ "meta" "name" ])); - - # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs - # API. - kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name; - - # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz - kdeSubdirPkg = module: - {name, subdir ? name, sane ? name}: - let name_ = name; in - a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}: - stdenv.mkDerivation ({ - name = "${name}-${release}"; - src = kdesrc module; - cmakeFlags = - [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" - "-DBUILD_doc=TRUE" - "-DBUILD_${subdir}=TRUE" - ] ++ cmakeFlags; - meta = defMeta // meta; - enableParallelBuilding = module.enableParallelBuilding or true; - } // (removeAttrs a [ "meta" "name" "cmakeFlags" ])); - - # A KDE monolithic module - kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; }; - - # Combine packages in one module. - # Arguments: - # * pkgFun --- a function of the following signature: - # module: manifest_attrs: manual_attrs: derivation; - # * module --- name of the module - # * pkgs --- list of packages in manifest format - combinePkgs = pkgFun: module: pkgs: - let - f = p@{name, ...}: - callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; }; - list = map f pkgs; - attrs = listToAttrs (map - ({name, sane ? name, ...}@p: { name = sane; value = f p; }) - pkgs); - in - runCommand "${module}-${release}" - ({passthru = attrs // { - propagatedUserEnvPackages = list; - projects = attrs; - };}) - '' - mkdir -pv $out/nix-support - echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages - ''; - - # Given manifest module data, return the module - kdeModule = { module, sane ? module, split, pkgs ? [] }: - let - pkgs_ = filterPkgs module pkgs; - in - # Module is splitted by upstream - if split then combinePkgs kdeSplittedPkg module pkgs_ - # Monolithic module - else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix") - # Module is splitted by us - else combinePkgs kdeSubdirPkg module pkgs_; - - # The same, as nameValuePair with sane name - kdeModuleNV = a@{ module, sane ? module, ... }: - { name = sane; value = kdeModule a; }; - - filterPkgs = module: (p: - removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p - ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs)); - - # Remove attrsets with x.name in subst. Optimized for empty subst. - removeNames = subst: big: - fold (s: out: filter (x: x.name != s) out) big subst; - - modules = listToAttrs (map kdeModuleNV manifest.modules); - - splittedModuleList = - let - splitted = filter (a: a ? pkgs) manifest.modules; - names = map ({module, sane ? module, ...}: sane) splitted; - in - map (m: m.projects) (stdenv.lib.attrVals names modules); - - individual = - stdenv.lib.zipAttrsWith - ( - name: list: - if tail list == [] - then head list - else abort "Multiple modules define ${name}" - ) - splittedModuleList; -} diff --git a/pkgs/desktops/kde-4.12/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.12/kde-package/kde-manifest.sh deleted file mode 100755 index e964ce3ddc11..000000000000 --- a/pkgs/desktops/kde-4.12/kde-package/kde-manifest.sh +++ /dev/null @@ -1,146 +0,0 @@ -#! /bin/sh - -# Usage: download kde release to $dir, then run -# $0 $dir - -dir="$1" - -# Detect release number & whether it is a stable release -if [[ ! -d "${dir}" ]]; then - echo "${dir} is not a directory (or doesn't exist)!" >&2 - exit 1 -fi - -release=$(ls "${dir}"/kdelibs-*.tar.xz | \ - sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//') - -if [[ ${release##*.} -gt 50 ]]; then - stable="false" -else - stable="true" -fi - -echo "Detected release ${release}" >&2 - -declare -A hash -declare -A modules -declare -a packages -declare -a top_level - -# xsltproc output declares -A module -if [[ ! -f kde_projects.xml ]]; then - curl -O -J http://projects.kde.org/kde_projects.xml -fi -eval `xsltproc kde-submodules.xslt kde_projects.xml` - -module[kde-baseapps]=kde-baseapps -unset module[kactivities] - -print_sane() { - echo "Called print_sane $1" >&2 - sane="${1//[^a-z0-9_]/_}" - if [[ "$sane" != "$1" ]]; then - echo "Sane version is $sane" >&2 - echo -n "sane=\"$sane\";" - fi -} - -for i in `cd "${dir}"; ls *-${release}.tar.xz`; do - package=${i%-${release}.tar.xz} - packages+=( "$package" ) - echo -n "${package}.. " >&2 - hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") - echo -n ${hash[$package]} >&2 - - if [ -n "${module[$package]}" ]; then - m="${module[$package]}" - echo " (${m})" >&2 - modules[$m]=1 - else - top_level+=( "$package" ) - echo " (top-level)" >&2 - fi - #nix-store --add-fixed sha256 "${dir}/${i}" >&2 -done - - -print_pkg_hash() { - echo " {name=\"${1}\";value=\"${hash[$1]}\";}" -} - -print_hashes(){ - echo "hashes=builtins.listToAttrs[" - for p in "${packages[@]}"; do print_pkg_hash "$p"; done - echo "];" -} - -print_split_module(){ - echo -n "$1:" >&2 - echo -e "{\n module=\"$1\";" - print_sane "$1" - echo " split=true;" - echo " pkgs=[" - for p in "${packages[@]}"; do - if [[ "${module[$p]}" == "$1" ]]; then - echo -n " { name=\"$p\"; " - print_sane "$p" - echo " }" - echo -n " $p" >&2 - fi - done - echo " ];" - echo "}" - echo >&2 -} - -print_mono_module(){ - echo -en "{ module=\"$1\"; " - print_sane "$1" - echo -n "$1 ... " >&2 - echo -n " split=false;" - cml="$1-$release/CMakeLists.txt" - tar -xf "${dir}/$1-${release}.tar.xz" "$cml" - if grep '^[^#]*add_subdirectory' $cml >/dev/null; then - if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then - echo " is monolithic (has unconditionally added subdirs)" >&2 - else - subdirs=( `grep '^[^#]*add_subdirectory' $cml | - sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' | - grep -v '\(doc\|cmake\)'` ) - echo " seems splittable, subdirs: ${subdirs[*]}" >&2 - echo -e "\n pkgs=[" - for s in "${subdirs[@]}"; do - echo -en " {" - echo -n " name=\"${s//\//-}\"; " - print_sane "$s" - if [[ $s != "${s//\//-}" ]]; then - echo -n "subdir=\"$s\"; " - fi - echo "}" - done - echo -e " ];\n" - fi - else - echo " is monolithic (has no subdirs)" >&2 - fi - rm $cml - rmdir $1-$release - echo "}" -} - -print_modules(){ - echo "modules=[" - echo "Printing modules splitted by upstream" >&2 - for m in "${!modules[@]}"; do print_split_module "$m"; done - echo >&2 - echo "Printing modules not splitted by upstream (${top_level[*]})" >&2 - for m in "${top_level[@]}"; do print_mono_module "$m"; done - echo "];" -} - -echo "Writing ${release}.nix" >&2 -exec > "${release}.nix" -echo "{stable=${stable};" -print_hashes -print_modules -echo "}" diff --git a/pkgs/desktops/kde-4.12/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.12/kde-package/kde-submodules.xslt deleted file mode 100644 index 952a05a9d274..000000000000 --- a/pkgs/desktops/kde-4.12/kde-package/kde-submodules.xslt +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- xslt file for http://projects.kde.org/kde_projects.xml --> - -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - - <xsl:output method="text" /> - <xsl:template match="/"> - <xsl:for-each select="kdeprojects/component[@identifier='kde']"> - <xsl:text>declare -A module </xsl:text> - <xsl:for-each select="module"> - <xsl:variable name="module" select='@identifier' /> - <xsl:for-each select=".//project[repo]"> - <xsl:text>module["</xsl:text> - <xsl:value-of select='@identifier' /> - <xsl:text>"]="</xsl:text> - <xsl:value-of select="$module" /> - <xsl:text>" </xsl:text> - </xsl:for-each> - </xsl:for-each> - </xsl:for-each> - </xsl:template> -</xsl:stylesheet> diff --git a/pkgs/desktops/kde-4.12/kde-runtime.nix b/pkgs/desktops/kde-4.12/kde-runtime.nix deleted file mode 100644 index 1c9706f4f4bf..000000000000 --- a/pkgs/desktops/kde-4.12/kde-runtime.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2 -, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, pulseaudio -, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme -}: - -kde { - buildInputs = [ - kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack - qca2 samba libcanberra pulseaudio gpgme - networkmanager kactivities kdepimlibs openexr -#todo: add openslp -#todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late - ]; - - nativeBuildInputs = [ pkgconfig ]; - - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - - passthru.propagatedUserEnvPackages = [ virtuoso ]; - - meta = { - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kde-wallpapers.nix b/pkgs/desktops/kde-4.12/kde-wallpapers.nix deleted file mode 100644 index 393d90824ebe..000000000000 --- a/pkgs/desktops/kde-4.12/kde-wallpapers.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kde, cmake }: - -kde { - nativeBuildInputs = [ cmake ]; - - patches = [ ./files/kde-wallpapers-buildsystem.patch ]; - - cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers"; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1yg9c780xdxa60bw832cqj60v87cbvjxp27k6gacj2lwk7rm5hwg"; - - meta = { - description = "Wallpapers for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kde-workspace.nix b/pkgs/desktops/kde-4.12/kde-workspace.nix deleted file mode 100644 index 38e28225d94a..000000000000 --- a/pkgs/desktops/kde-4.12/kde-workspace.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors -, pciutils, libraw1394, libusb1, python, libqalculate, akonadi -, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison -, libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl -}: - -kde { - - version = "4.11.6"; - - src = fetchurl { - url = "mirror://kde/stable/4.12.2/src/kde-workspace-4.11.6.tar.xz"; - sha256 = "0lk3k9zl4x4il5dqpw7mf25gv8a3y48fd3jq3jvgmwwlviwcpcz1"; - }; - -#todo: wayland, xmms, libusb isn't found - buildInputs = - [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg - xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp - xorg.libxkbfile xorg.libXcomposite xorg.libXtst - xorg.libXdamage - - python boost boost.lib qjson lm_sensors gpsd libraw1394 pciutils udev - akonadi pam libusb1 libqalculate kdepimlibs prison - kactivities - ]; - - nativeBuildInputs = [ pkgconfig ]; - - preConfigure = - '' - # Fix incorrect path to kde4-config. - substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config - - # Fix the path to the keyboard configuration files. - substituteInPlace kcontrol/keyboard/xkb_rules.cpp \ - --replace /usr/share/X11 ${xkeyboard_config}/etc/X11 - ''; - - enableParallelBuilding = false; # frequent problems on Hydra - - meta = { - description = "KDE workspace components such as Plasma, Kwin and System Settings"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/jovie.nix deleted file mode 100644 index d38c80c4c36a..000000000000 --- a/pkgs/desktops/kde-4.12/kdeaccessibility/jovie.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, speechd }: - -kde { - buildInputs = [ kdelibs speechd ]; - - meta = { - description = "Text-to-speech synthesis daemon"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kaccessible.nix deleted file mode 100644 index 98fae7c983f8..000000000000 --- a/pkgs/desktops/kde-4.12/kdeaccessibility/kaccessible.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, speechd }: - -kde { - buildInputs = [ kdelibs speechd ]; - - meta = { - description = "Bridge that provides accessibility services to applications"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kmag.nix deleted file mode 100644 index 606c61cddb63..000000000000 --- a/pkgs/desktops/kde-4.12/kdeaccessibility/kmag.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { -#todo: package qaccessibilityclient - buildInputs = [ kdelibs ]; - - meta = { - description = "Screen magnifier for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kmousetool.nix deleted file mode 100644 index 8e0caa76ed9c..000000000000 --- a/pkgs/desktops/kde-4.12/kdeaccessibility/kmousetool.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libXtst, libXt }: - -kde { - buildInputs = [ kdelibs libXtst libXt ]; - - meta = { - description = "A program that clicks the mouse for you"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.12/kdeaccessibility/kmouth.nix deleted file mode 100644 index 4159501967cd..000000000000 --- a/pkgs/desktops/kde-4.12/kdeaccessibility/kmouth.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A type-and-say front end for speech synthesizers"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.12/kdeadmin/kcron.nix deleted file mode 100644 index f585461af381..000000000000 --- a/pkgs/desktops/kde-4.12/kdeadmin/kcron.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Configure and schedule tasks"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.12/kdeadmin/ksystemlog.nix deleted file mode 100644 index 88757a6b91c7..000000000000 --- a/pkgs/desktops/kde-4.12/kdeadmin/ksystemlog.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "System log viewer tool"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.12/kdeadmin/kuser.nix deleted file mode 100644 index 6118cf558bbd..000000000000 --- a/pkgs/desktops/kde-4.12/kdeadmin/kuser.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kdepimlibs }: - -kde { - buildInputs = [ kdelibs kdepimlibs ]; - - meta = { - description = "User management tool"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.12/kdeartwork/ColorSchemes.nix deleted file mode 100644 index acccf66976fc..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/ColorSchemes.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-color-schemes"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE color schemes"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.12/kdeartwork/FindXscreensaver.cmake deleted file mode 100644 index 499ed75268e9..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/FindXscreensaver.cmake +++ /dev/null @@ -1,73 +0,0 @@ -#Macro to find xscreensaver directory - -# Copyright (c) 2006, Laurent Montel, <montel@kde.org> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -if (NOT XSCREENSAVER_FOUND) - FIND_PATH(XSCREENSAVER_DIR deco - HINTS - ${KDE4_INCLUDE_DIR} - PATHS - /usr - /usr/local - /opt/local - /usr/X11R6 - /opt/kde - /opt/kde3 - /usr/kde - /usr/local/kde - /usr/local/xscreensaver - /usr/openwin/lib/xscreensaver - /etc - PATH_SUFFIXES - lib${LIB_SUFFIX}/xscreensaver - lib${LIB_SUFFIX}/misc/xscreensaver - lib/xscreensaver - lib64/xscreensaver - lib/misc/xscreensaver - libexec/xscreensaver - bin/xscreensaver-hacks - hacks) - message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>") - - FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml - PATHS - ${KDE4_INCLUDE_DIR} - /usr/ - /usr/local/ - /opt/local/ - /usr/X11R6/ - /opt/kde/ - /opt/kde3/ - /usr/kde/ - /usr/local/kde/ - /usr/openwin/lib/xscreensaver/ - /etc/ - PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config - ) - MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") - -endif(NOT XSCREENSAVER_FOUND) - -#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") -#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>") - -# Need to fix hack -if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) - set(XSCREENSAVER_FOUND TRUE) -endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) - -if (XSCREENSAVER_FOUND) - if (NOT Xscreensaver_FIND_QUIETLY) - message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>") - endif (NOT Xscreensaver_FIND_QUIETLY) -else (XSCREENSAVER_FOUND) - if (Xscreensaver_FIND_REQUIRED) - message(FATAL_ERROR "XScreenSaver not found") - endif (Xscreensaver_FIND_REQUIRED) -endif (XSCREENSAVER_FOUND) - - -MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR) diff --git a/pkgs/desktops/kde-4.12/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.12/kdeartwork/HighResolutionWallpapers.nix deleted file mode 100644 index edffca1562e1..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/HighResolutionWallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-wallpapers-high-resolution"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE wallpapers in high resolution"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.12/kdeartwork/IconThemes.nix deleted file mode 100644 index 43071e8bd142..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/IconThemes.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kdeartwork-icon-themes"; - - # Sources contain primary and kdeclassic as well but they're not installed - - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE nuvola and mono icon themes"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.12/kdeartwork/WeatherWallpapers.nix deleted file mode 100644 index 947e5e17ab0c..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/WeatherWallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-weather-wallpapers"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE wallpapers (weather)"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.12/kdeartwork/desktopthemes.nix deleted file mode 100644 index 93dd361af738..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/desktopthemes.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-desktop-themes"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE desktop themes"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.12/kdeartwork/emoticons.nix deleted file mode 100644 index 5ef9f78a7195..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/emoticons.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-emotion-icons"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE emotion icons (smiles)"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.12/kdeartwork/kscreensaver.nix deleted file mode 100644 index 84cb008056e4..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/kscreensaver.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }: - -kde { - buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ]; - - nativeBuildInputs = [ pkgconfig ]; - - prePatch = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; - - cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ]; - - meta = { - description = "KDE screensavers"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.12/kdeartwork/kwin-styles.nix deleted file mode 100644 index b5d769b216db..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/kwin-styles.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kde_workspace }: - -kde { - buildInputs = [ kdelibs kde_workspace ]; - - meta = { - description = "Styles for KWin"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/styles.nix b/pkgs/desktops/kde-4.12/kdeartwork/styles.nix deleted file mode 100644 index 6a1306c37100..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/styles.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-style-phase"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Phase, a widget style for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.12/kdeartwork/wallpapers.nix deleted file mode 100644 index 7c9846fbf9e8..000000000000 --- a/pkgs/desktops/kde-4.12/kdeartwork/wallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kdeartwork-wallpapers"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE wallpapers"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.12/kdebindings/perlqt.nix deleted file mode 100644 index 48eed141ce64..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/perlqt.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, cmake, smokeqt, perl }: - -kde { - - # TODO: qscintilla2, qwt5 - - buildInputs = [ smokeqt perl ]; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "Perl bindings for Qt library"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix deleted file mode 100644 index b298cdbc8167..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, - polkit_qt_1, boost, lndir, pkgconfig }: - -let pydir = "lib/python${python.majorVersion}"; in - -kde { - - # todo: polkit isn't found by the build system - - buildInputs = [ - python kdepimlibs shared_desktop_ontologies - boost boost.lib polkit_qt_1 - ]; - - nativeBuildInputs = [ pkgconfig ]; - - propagatedBuildInputs = [ pyqt4 sip ]; - - preConfigure = - '' - # Symlink PyQt into PyKDE. This is necessary because PyQt looks - # in its PyQt4/uic/widget-plugins directory for plugins, and KDE - # needs to install a plugin. - mkdir -pv $out/${pydir} - ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir} - cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" ) - ''; - - meta = { - description = "Python bindings for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.12/kdebindings/qtruby-install-prefix.patch deleted file mode 100644 index bd95a0d8bd3d..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/qtruby-install-prefix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 33078b4..30aec0e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY) - return() - endif (NOT COMPILE_RUBY) - --SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" ) --SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" ) -+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR}) -+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR}) - - # compute an overall version number which can be compared at once - MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}") diff --git a/pkgs/desktops/kde-4.12/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.12/kdebindings/qtruby.nix deleted file mode 100644 index 03e9dc9a007f..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/qtruby.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kde, cmake, smokeqt, ruby }: - -kde { - - # TODO: scintilla2, qwt5 - - buildInputs = [ smokeqt ruby ]; - - nativeBuildInputs = [ cmake ]; - - # The patch is not ready for upstream submmission. - # I should add an option() instead. - patches = [ ./qtruby-install-prefix.patch ]; - - cmakeFlags="-DRUBY_ROOT_DIR=${ruby}"; - - meta = { - description = "Ruby bindings for Qt library"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.12/kdebindings/smokegen-CMakeLists.txt-nix.patch deleted file mode 100644 index f0811d335a73..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/smokegen-CMakeLists.txt-nix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000 -+++ smokegen-4.10.5/CMakeLists.txt 2013-07-31 19:15:17.000000000 +0000 -@@ -36,6 +36,10 @@ - set (CMAKE_SKIP_BUILD_RPATH FALSE) - set (CMAKE_SKIP_RPATH FALSE) - -+# add the automatically determined parts of the RPATH -+# which point to directories outside the build tree to the install RPATH -+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+ - configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY ) - - add_executable(smokegen ${generator_SRC}) \ No newline at end of file diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.12/kdebindings/smokegen-nix.patch deleted file mode 100644 index 53257e836e04..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/smokegen-nix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in ---- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in 2013-06-28 17:14:50.000000000 +0000 -+++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in 2013-07-30 21:26:33.000000000 +0000 -@@ -80,8 +80,7 @@ - set(SMOKE_API_BIN "@SMOKE_API_BIN@") - - find_library(SMOKE_BASE_LIBRARY smokebase -- PATHS "@SMOKE_LIBRARY_PREFIX@" -- NO_DEFAULT_PATH) -+ PATHS "@SMOKE_LIBRARY_PREFIX@") - - if (NOT SMOKE_BASE_LIBRARY) - if (Smoke_FIND_REQUIRED) diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix deleted file mode 100644 index 5708d0f96eb2..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, kde, qt4, cmake }: - -kde { - buildInputs = [ qt4 ]; - nativeBuildInputs = [ cmake ]; - - patches = [ ./smokegen-nix.patch ./smokegen-CMakeLists.txt-nix.patch ]; - - meta = { - description = "C++ parser used to generate language bindings for Qt/KDE"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.12/kdebindings/smokekde.nix deleted file mode 100644 index 4474c1d9731e..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/smokekde.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular -, shared_desktop_ontologies, attica, pkgconfig }: - -kde { - - # TODO: attica, akonadi and kdepimlibs are disabled due to smokegen crash - # okular is disabled because the code generated is broken - buildInputs = [ - smokeqt kdelibs shared_desktop_ontologies - ]; - - nativeBuildInputs = [ cmake pkgconfig ]; - - LD_LIBRARY_PATH = "${smokeqt}/lib/"; - - meta = { - description = "SMOKE bindings for kdelibs"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix deleted file mode 100644 index 494bc85e6465..000000000000 --- a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, kde, qt4, cmake, phonon, qimageblitz, smokegen }: - -kde { - -# TODO: Qwt5, QScintilla2 - - propagatedBuildInputs = [ qt4 phonon qimageblitz ]; - nativeBuildInputs = [ cmake ]; - propagatedNativeBuildInputs = [ smokegen ]; - - meta = { - description = "C++ parser used to generate language bindings for Qt/KDE"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/analitza.nix b/pkgs/desktops/kde-4.12/kdeedu/analitza.nix deleted file mode 100644 index 74c3a1ebb200..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/analitza.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, readline }: -kde { - buildInputs = [ kdelibs readline ]; - - meta = { - description = "Library part of KAlgebra"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/blinken.nix b/pkgs/desktops/kde-4.12/kdeedu/blinken.nix deleted file mode 100644 index cdf9728833c2..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/blinken.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Memory Enhancement Game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/cantor.nix b/pkgs/desktops/kde-4.12/kdeedu/cantor.nix deleted file mode 100644 index a8cd2e44957a..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/cantor.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, libspectre, analitza, R, pkgconfig, libqalculate, python }: -kde { - -# TODO: R is not found - - buildInputs = [ kdelibs libspectre analitza R libqalculate python ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "KDE Frontend to Mathematical Software"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.12/kdeedu/kalgebra.nix deleted file mode 100644 index 3675c3a225f4..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kalgebra.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu, analitza }: -kde { - buildInputs = [ kdelibs libkdeedu analitza ]; - - meta = { - description = "2D and 3D Graph Calculator"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.12/kdeedu/kalzium.nix deleted file mode 100644 index 09de79ce1c05..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kalzium.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro, pkgconfig }: -kde { - -# TODO: chemical mime data - - buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Periodic Table of Elements"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.12/kdeedu/kanagram.nix deleted file mode 100644 index 8759c96d78c4..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kanagram.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu }: -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "Letter Order Game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.12/kdeedu/kbruch.nix deleted file mode 100644 index dc50f1e85a37..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kbruch.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Practice Fractions"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.12/kdeedu/kgeography.nix deleted file mode 100644 index bd8d27c8d6e2..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kgeography.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Geography Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/khangman.nix b/pkgs/desktops/kde-4.12/kdeedu/khangman.nix deleted file mode 100644 index 997b50e906a2..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/khangman.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu }: -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "KDE hangman game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kig.nix b/pkgs/desktops/kde-4.12/kdeedu/kig.nix deleted file mode 100644 index fb442e2ef629..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kig.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, boost, python}: -kde { - buildInputs = [ kdelibs boost boost.lib python ]; - - cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1"; - meta = { - description = "KDE Interactive Geometry"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kiten.nix b/pkgs/desktops/kde-4.12/kdeedu/kiten.nix deleted file mode 100644 index 939b7a9f77a2..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kiten.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Japanese Reference/Study Tool"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/klettres.nix b/pkgs/desktops/kde-4.12/kdeedu/klettres.nix deleted file mode 100644 index 7a0fa83078e3..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/klettres.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE alphabet tutorial"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.12/kdeedu/kmplot.nix deleted file mode 100644 index fc7b0578c27b..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kmplot.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE mathematical function plotter"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kstars.nix b/pkgs/desktops/kde-4.12/kdeedu/kstars.nix deleted file mode 100644 index 0832dc2121e2..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kstars.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, kdelibs, eigen, xplanet, indilib, pkgconfig }: - -kde { - -# TODO: wcslib, astrometry - - buildInputs = [ kdelibs eigen xplanet indilib ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "A KDE graphical desktop planetarium"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.12/kdeedu/ktouch.nix deleted file mode 100644 index 9e606adde336..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/ktouch.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libxkbfile }: - -kde { - buildInputs = [ kdelibs libxkbfile ]; - - meta = { - description = "Touch Typing Tutor"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.12/kdeedu/kturtle.nix deleted file mode 100644 index 1e1922b1410d..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kturtle.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Educational Programming Environment"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.12/kdeedu/kwordquiz.nix deleted file mode 100644 index 1b33ba2e469f..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/kwordquiz.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libkdeedu }: - -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "Flash Card Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.12/kdeedu/libkdeedu.nix deleted file mode 100644 index def6c85fefe2..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/libkdeedu.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Libraries used by KDE Education applications"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/marble.nix b/pkgs/desktops/kde-4.12/kdeedu/marble.nix deleted file mode 100644 index 2dc07d14a0d9..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/marble.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, gpsd }: - -kde { - -# TODO: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate, quazip - - buildInputs = [ kdelibs gpsd ]; - - meta = { - description = "Marble Virtual Globe"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/pairs.nix b/pkgs/desktops/kde-4.12/kdeedu/pairs.nix deleted file mode 100644 index 36c4aba9604b..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/pairs.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A memory and pairs game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/parley.nix b/pkgs/desktops/kde-4.12/kdeedu/parley.nix deleted file mode 100644 index f9f86dde150d..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/parley.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libkdeedu, attica }: - -kde { - buildInputs = [ kdelibs libkdeedu attica ]; - - meta = { - description = "Vocabulary Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/rocs.nix b/pkgs/desktops/kde-4.12/kdeedu/rocs.nix deleted file mode 100644 index 135598ded90a..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/rocs.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, kdelibs, boost, grantlee }: -let - boostpkg = boost.override { enableExceptions = true; }; -in -kde { - buildInputs = [ kdelibs boostpkg boostpkg.lib grantlee ]; - - NIX_CFLAGS_COMPILE = "-fexceptions"; - - meta = { - description = "A KDE graph theory viewer"; - kde = { - name = "rocs"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeedu/step.nix b/pkgs/desktops/kde-4.12/kdeedu/step.nix deleted file mode 100644 index f36ccef9b7cd..000000000000 --- a/pkgs/desktops/kde-4.12/kdeedu/step.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, gsl, libqalculate, eigen, pkgconfig }: - -kde { - - buildInputs = [ kdelibs gsl libqalculate eigen ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "A KDE interactive physical simulator"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/bomber.nix b/pkgs/desktops/kde-4.12/kdegames/bomber.nix deleted file mode 100644 index 026227910f21..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/bomber.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/bovo.nix b/pkgs/desktops/kde-4.12/kdegames/bovo.nix deleted file mode 100644 index b0e7d99c589f..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/bovo.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board"; - }; - -} diff --git a/pkgs/desktops/kde-4.12/kdegames/granatier.nix b/pkgs/desktops/kde-4.12/kdegames/granatier.nix deleted file mode 100644 index 9f1ab0053099..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/granatier.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kajongg.nix b/pkgs/desktops/kde-4.12/kdegames/kajongg.nix deleted file mode 100644 index 9a6f5e836955..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kajongg.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, libkdegames, pythonPackages, sqlite, pykde4 }: -kde rec { - - buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath; - - pythonPath = [ pythonPackages.twisted pykde4 ]; - - postInstall = "wrapPythonPrograms"; - - meta = { - description = "an ancient Chinese board game for 4 players"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kapman.nix b/pkgs/desktops/kde-4.12/kdegames/kapman.nix deleted file mode 100644 index f10e099da3cc..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kapman.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a clone of the well known game Pac-Man"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/katomic.nix b/pkgs/desktops/kde-4.12/kdegames/katomic.nix deleted file mode 100644 index a9936c04f0ea..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/katomic.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a fun and educational puzzle game built around molecular geometry"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.12/kdegames/kblackbox.nix deleted file mode 100644 index 27eeff2f65bb..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kblackbox.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kblocks.nix b/pkgs/desktops/kde-4.12/kdegames/kblocks.nix deleted file mode 100644 index 98cf068de09a..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kblocks.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a classic single player falling blocks puzzle game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kbounce.nix b/pkgs/desktops/kde-4.12/kdegames/kbounce.nix deleted file mode 100644 index 77fa0db63529..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kbounce.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a single player arcade game with the elements of puzzle"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.12/kdegames/kbreakout.nix deleted file mode 100644 index 3a484d919bbb..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kbreakout.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.12/kdegames/kdiamond.nix deleted file mode 100644 index 06dfcee5ac39..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kdiamond.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a single player puzzle game. The object of the game is to build lines of three similar diamonds"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.12/kdegames/kfourinline.nix deleted file mode 100644 index 11b8838e7082..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kfourinline.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a board game for two players based on the Connect-Four game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.12/kdegames/kgoldrunner.nix deleted file mode 100644 index 6217c47a8065..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kgoldrunner.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "an action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kigo.nix b/pkgs/desktops/kde-4.12/kdegames/kigo.nix deleted file mode 100644 index 32eee67cc1e0..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kigo.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "an open-source implementation of the popular Go game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/killbots.nix b/pkgs/desktops/kde-4.12/kdegames/killbots.nix deleted file mode 100644 index d9c1472495e7..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/killbots.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a simple game of evading killer robots"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kiriki.nix b/pkgs/desktops/kde-4.12/kdegames/kiriki.nix deleted file mode 100644 index 72f7ab67501b..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kiriki.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "an addictive and fun dice game, designed to be played by as many as six players"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.12/kdegames/kjumpingcube.nix deleted file mode 100644 index a6d22cff51c3..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kjumpingcube.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a simple dice driven tactical game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/klickety.nix b/pkgs/desktops/kde-4.12/kdegames/klickety.nix deleted file mode 100644 index b592bc40641f..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/klickety.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a puzzle game where the player removes groups of colored marbles to clear the board"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/klines.nix b/pkgs/desktops/kde-4.12/kdegames/klines.nix deleted file mode 100644 index 90952fe91c07..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/klines.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.12/kdegames/kmahjongg.nix deleted file mode 100644 index 946b531ff127..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kmahjongg.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames, libkmahjongg }: -kde { - buildInputs = [ kdelibs libkdegames libkmahjongg ]; - meta = { - description = "the tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kmines.nix b/pkgs/desktops/kde-4.12/kdegames/kmines.nix deleted file mode 100644 index 538454e95984..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kmines.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a classic Minesweeper game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.12/kdegames/knavalbattle.nix deleted file mode 100644 index 42ffd2fcb4d5..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/knavalbattle.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a Battle Ship game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.12/kdegames/knetwalk.nix deleted file mode 100644 index a16e578ce848..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/knetwalk.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a small game where you have to build up a computer network by rotating the wires to connect the terminals to the server"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kolf.nix b/pkgs/desktops/kde-4.12/kdegames/kolf.nix deleted file mode 100644 index 78815ee57996..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kolf.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a miniature golf game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kollision.nix b/pkgs/desktops/kde-4.12/kdegames/kollision.nix deleted file mode 100644 index 3147c7305ea0..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kollision.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a simple ball dodging game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/konquest.nix b/pkgs/desktops/kde-4.12/kdegames/konquest.nix deleted file mode 100644 index 53ddd64928cc..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/konquest.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "the KDE version of Gnu-Lactic Konquest"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kpat.nix b/pkgs/desktops/kde-4.12/kdegames/kpat.nix deleted file mode 100644 index f8d9bad36dc5..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kpat.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a relaxing card sorting game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kreversi.nix b/pkgs/desktops/kde-4.12/kdegames/kreversi.nix deleted file mode 100644 index 2aed981428e1..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kreversi.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kshisen.nix b/pkgs/desktops/kde-4.12/kdegames/kshisen.nix deleted file mode 100644 index 9c8880340388..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kshisen.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames, libkmahjongg }: -kde { - buildInputs = [ kdelibs libkdegames libkmahjongg ]; - meta = { - description = "a solitaire-like game played using the standard set of Mahjong tiles"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/ksirk.nix b/pkgs/desktops/kde-4.12/kdegames/ksirk.nix deleted file mode 100644 index 767eb67971a8..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/ksirk.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames, qca2 }: -kde { - buildInputs = [ kdelibs libkdegames qca2 ]; - meta = { - description = "a computerized version of the well known strategic board game Risk"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.12/kdegames/ksnakeduel.nix deleted file mode 100644 index ccf1fb551e9a..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/ksnakeduel.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a simple Tron-Clone"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.12/kdegames/kspaceduel.nix deleted file mode 100644 index 5285f7916cad..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kspaceduel.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/ksquares.nix b/pkgs/desktops/kde-4.12/kdegames/ksquares.nix deleted file mode 100644 index a17be2da6325..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/ksquares.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a game modeled after the well known pen and paper based game of Dots and Boxes"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.12/kdegames/ksudoku.nix deleted file mode 100644 index ea4e13a5e4f3..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/ksudoku.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a logic-based symbol placement puzzle"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.12/kdegames/ktuberling.nix deleted file mode 100644 index 1a6ba9d653c2..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/ktuberling.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a simple constructor game suitable for children and adults alike"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/kubrick.nix b/pkgs/desktops/kde-4.12/kdegames/kubrick.nix deleted file mode 100644 index 9bdc6879db4b..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/kubrick.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a game based on the Rubik's Cube™ puzzle"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/libkdegames.nix b/pkgs/desktops/kde-4.12/kdegames/libkdegames.nix deleted file mode 100644 index 3819dcdc9ae2..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/libkdegames.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, openal, libsndfile }: -kde { - buildInputs = [ kdelibs openal libsndfile ]; - meta = { - description = "KDE games library"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.12/kdegames/libkmahjongg.nix deleted file mode 100644 index 383b347dc330..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/libkmahjongg.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a library for KMahjongg game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/lskat.nix b/pkgs/desktops/kde-4.12/kdegames/lskat.nix deleted file mode 100644 index 2a5050cd6676..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/lskat.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/palapeli.nix b/pkgs/desktops/kde-4.12/kdegames/palapeli.nix deleted file mode 100644 index 010dbd5d6232..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/palapeli.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - -# TODO: package qvoronoi - - buildInputs = [ kdelibs libkdegames ]; - - meta = { - description = "a single-player jigsaw puzzle game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegames/picmi.nix b/pkgs/desktops/kde-4.12/kdegames/picmi.nix deleted file mode 100644 index 165d7422f95b..000000000000 --- a/pkgs/desktops/kde-4.12/kdegames/picmi.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "a single player logic-based puzzle game"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix deleted file mode 100644 index 3ce9b3dcc78a..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core -, libjpeg, pkgconfig, kactivities, lcms2 }: - -kde { - - buildInputs = - [ kdelibs exiv2 nepomuk_core kactivities kde_baseapps libkipi libjpeg lcms2 ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Gwenview, the KDE image viewer"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix deleted file mode 100644 index d9aa11c54afa..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libgphoto2 }: - -kde { - buildInputs = [ kdelibs libgphoto2 ]; - - meta = { - description = "KDE camera interface library"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix deleted file mode 100644 index e06c1b5d307c..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A small utility to select a color"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix deleted file mode 100644 index e834762feb52..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, okular }: - -kde { - buildInputs = [ kdelibs okular ]; - - meta = { - description = "A collection of plugins to handle mobipocket files"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix deleted file mode 100644 index d9d35808ac50..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libtiff }: - -kde { - buildInputs = [ kdelibs libtiff ]; - - meta = { - description = "Strigi analyzers for various graphics file formats"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix deleted file mode 100644 index d6207689512f..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }: - -kde { - - buildInputs = [ kdelibs libkexiv2 libkdcraw ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Thumbnailers for various graphics file formats"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix deleted file mode 100644 index 016312c199e5..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libXxf86vm }: - -kde { - buildInputs = [ kdelibs libXxf86vm ]; - - meta = { - description = "KDE monitor calibration tool"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix deleted file mode 100644 index ecf34e5ae9e5..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, qimageblitz }: - -kde { - buildInputs = [ kdelibs qimageblitz ]; - - meta = { - description = "KDE paint program"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix deleted file mode 100644 index 209331d9e83d..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE screen ruler"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix deleted file mode 100644 index f541c4bdb4df..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libksane }: - -kde { - buildInputs = [ kdelibs libksane ]; - - meta = { - description = "A KScan plugin that implements the scanning through libksane"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix deleted file mode 100644 index a9897d270bb6..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libkipi }: - -kde { - buildInputs = [ kdelibs libkipi ]; - - meta = { - description = "KDE screenshot utility"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix deleted file mode 100644 index 1d5c6e2fcb4a..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, kde, kdelibs, pkgconfig, libraw, lcms2 }: - -kde { - - buildInputs = [ kdelibs libraw lcms2 ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Library for decoding RAW images"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix deleted file mode 100644 index 46ec45fad01a..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, exiv2 }: - -kde { - buildInputs = [ kdelibs exiv2 ]; - - meta = { - description = "Exiv2 support library"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix deleted file mode 100644 index 65e6c52bd44f..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Interface library to kipi-plugins"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix deleted file mode 100644 index 6c3543eef370..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, saneBackends }: - -kde { - buildInputs = [ kdelibs saneBackends ]; - - meta = { - description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix deleted file mode 100644 index 092833388a78..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 -, qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }: - -kde { - -# TODO: package activeapp, qmobipocket - - buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre popplerQt4 - qca2 qimageblitz libtiff kactivities libkexiv2 ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Okular, the KDE document viewer"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix deleted file mode 100644 index 2fc0e373dbdf..000000000000 --- a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "SVG KPart"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix deleted file mode 100644 index 5db693e6ea07..000000000000 --- a/pkgs/desktops/kde-4.12/kdelibs/kdelibs.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ kde, gcc, cmake, perl -, qt4, bzip2, fam, shared_mime_info, giflib, jasper, strigi -, openexr, avahi, kerberos, shared_desktop_ontologies, libXScrnSaver -, automoc4, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee -, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, acl, attr, libXtst -, udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt -, pkgconfig -}: - -kde { - -# TODO: media-player-info - - buildInputs = - [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq - libdbusmenu_qt libXScrnSaver polkit_qt_1 qca2 acl jasper libxslt - shared_desktop_ontologies xz udev libjpeg kerberos openexr - libXtst attr - ]; - - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - - propagatedBuildInputs = [ qt4 soprano phonon strigi ]; - - propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ]; - - # TODO: make sonnet plugins (dictionaries) really work. - # There are a few hardcoded paths. - # Split plugins from libs? - - patches = [ - ../files/polkit-install.patch - ../files/kdelibs-cve-2014-5033.patch # Security patch, remove when updating to 4.14.0 or more - ]; - - cmakeFlags = [ - "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" - "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" - "-DHUPNP_ENABLED=ON" - "-DWITH_SOLID_UDISKS2=ON" - ]; - - passthru.wantsUdisks2 = true; - - meta = { - description = "KDE libraries"; - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix deleted file mode 100644 index d90e1455ce99..000000000000 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4 -, pkgconfig, doxygen, ebook_tools -}: - -kde { - -# TODO: qmobipocket - - buildInputs = [ - kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg - popplerQt4 ebook_tools - ]; - - nativeBuildInputs = [ pkgconfig doxygen ]; - - meta = { - description = "NEPOMUK core"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix deleted file mode 100644 index b0fc5ad8900d..000000000000 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, kde, kdelibs, nepomuk_core }: - -kde { - - buildInputs = [ kdelibs nepomuk_core ]; - - meta = { - description = "NEPOMUK Widgets"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.12/kdemultimedia/audiocd-kio.nix deleted file mode 100644 index 4c56e7529dd7..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/audiocd-kio.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkcompactdisc, cdparanoia, libkcddb, libvorbis, flac, lame }: -kde { - buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ]; - meta = { - description = "transparent audio CD access for applications using the KDE Platform"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.12/kdemultimedia/dragon.nix deleted file mode 100644 index 006300742ecd..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/dragon.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - meta = { - description = "a multimedia player with the focus on simplicity"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.12/kdemultimedia/ffmpegthumbs.nix deleted file mode 100644 index 45f6c9abcb66..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/ffmpegthumbs.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, ffmpeg }: -kde { - buildInputs = [ kdelibs ffmpeg ]; - meta = { - description = "a video thumbnail generator for KDE file managers like Dolphin and Konqueror"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.12/kdemultimedia/juk.nix deleted file mode 100644 index 5d7b1db224ea..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/juk.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, taglib, libtunepimp }: -kde { - -# TODO: opusfile - - buildInputs = [ kdelibs taglib libtunepimp ]; - meta = { - description = "an audio jukebox application"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.12/kdemultimedia/kmix.nix deleted file mode 100644 index 1dd8108166f2..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/kmix.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libcanberra, pulseaudio }: -kde { - buildInputs = [ kdelibs libcanberra pulseaudio ]; - meta = { - description = "sound mixer, an application to allow you to change the volume of your sound card"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/kscd.nix b/pkgs/desktops/kde-4.12/kdemultimedia/kscd.nix deleted file mode 100644 index e99ae53935b9..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/kscd.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libmusicbrainz }: -kde { - buildInputs = [ kdelibs libmusicbrainz ]; - meta = { - description = "KDE CD player"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.12/kdemultimedia/libkcddb.nix deleted file mode 100644 index 720b01d1861e..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/libkcddb.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { -#todo: libmusicbrainz5 - buildInputs = [ kdelibs ]; - meta = { - description = "a library used to retrieve audio CD meta data from the internet"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/libkcompactdisc.nix b/pkgs/desktops/kde-4.12/kdemultimedia/libkcompactdisc.nix deleted file mode 100644 index 6ed08af89f33..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/libkcompactdisc.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - meta = { - description = "KDE library for playing & ripping CDs"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.12/kdemultimedia/mplayerthumbs.nix deleted file mode 100644 index c88ebcc2a5a3..000000000000 --- a/pkgs/desktops/kde-4.12/kdemultimedia/mplayerthumbs.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - meta = { - description = "a video thumbnail generator for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-filesharing.nix deleted file mode 100644 index 0330511a258b..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-filesharing.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE properties dialog plugin to share a directory with the local network"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix deleted file mode 100644 index 9a76863c8e04..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, boost }: - -kde { - buildInputs = [ kdelibs boost boost.lib ]; - - meta = { - description = "Strigi analyzers for various network protocols"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kget.nix b/pkgs/desktops/kde-4.12/kdenetwork/kget.nix deleted file mode 100644 index d7527ca6a60d..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/kget.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kde, kdelibs, libktorrent, kde_workspace, sqlite, boost -, kde_baseapps, libmms, qca2, nepomuk_core, nepomuk_widgets -, pkgconfig }: - -kde { - -# TODO: QGpgME - - buildInputs = - [ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2 - libmms kde_baseapps kde_workspace boost boost.lib ]; - - nativeBuildInputs = [ pkgconfig ]; - - KDEDIRS = libktorrent; - - meta = { - description = "KDE download manager"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix deleted file mode 100644 index e8eab764419a..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ kde, kdelibs, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent, - jasper, libidn, mediastreamer, pkgconfig, libxslt, giflib, - libgadu, boost, qca2, sqlite, jsoncpp, - ortp, srtp, libv4l }: - -kde { - -# TODO: libmeanwhile, xmms, jsoncpp(not found), kleopatra(from kdepim but doesn't install headers?), - - buildInputs = [ - kdelibs qca2 mediastreamer libgadu jsoncpp - kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib - libidn libxslt boost boost.lib - ortp srtp libv4l - ]; - - nativeBuildInputs = [ pkgconfig ]; - - KDEDIRS = libktorrent; - - cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ]; - - meta = { - description = "A KDE multi-protocol IM client"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.12/kdenetwork/kppp.nix deleted file mode 100644 index 4c6bd65769f7..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/kppp.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "PPP(Dial-Up) client tool"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.12/kdenetwork/krdc.nix deleted file mode 100644 index 80557e827fe0..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/krdc.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libvncserver, freerdp, telepathy_qt }: - -kde { - buildInputs = [ kdelibs libvncserver freerdp telepathy_qt ]; - - meta = { - description = "KDE remote desktop client"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.12/kdenetwork/krfb.nix deleted file mode 100644 index cb4857965a34..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/krfb.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg, telepathy_qt }: - -kde { - buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg telepathy_qt ]; - - meta = { - description = "KDE desktop sharing"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdenetwork/zeroconf-ioslave.nix b/pkgs/desktops/kde-4.12/kdenetwork/zeroconf-ioslave.nix deleted file mode 100644 index f65960cc337b..000000000000 --- a/pkgs/desktops/kde-4.12/kdenetwork/zeroconf-ioslave.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE tool that monitors the network for DNS-SD services"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdepim-runtime.nix b/pkgs/desktops/kde-4.12/kdepim-runtime.nix deleted file mode 100644 index 484d3e1933a2..000000000000 --- a/pkgs/desktops/kde-4.12/kdepim-runtime.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies }: - -kde { - -# TODO: libkgapi(2), LibKFbAPI,libkolab, libkolabxml - - buildInputs = [ - kdepimlibs akonadi boost boost.lib shared_desktop_ontologies - libxslt - ]; - - meta = { - description = "KDE PIM runtime"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdepim.nix b/pkgs/desktops/kde-4.12/kdepim.nix deleted file mode 100644 index 0f5d868837e5..000000000000 --- a/pkgs/desktops/kde-4.12/kdepim.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime -, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison -, nepomuk_widgets, kactivities, libXScrnSaver, qjson -, pkgconfig }: - -kde { - -# TODO: LinkGrammar - - buildInputs = - [ kdepimlibs boost boost.lib shared_desktop_ontologies akonadi - nepomuk_widgets libxslt cyrus_sasl gpgme libassuan grantlee prison - kactivities libXScrnSaver qjson - ]; - - nativeBuildInputs = [ pkgconfig ]; - - passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ]; - - meta = { - description = "KDE PIM tools"; - longDescription = '' - Contains various personal information management tools for KDE, such as an organizer. - ''; - license = "GPL"; - homepage = http://pim.kde.org; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdepimlibs.nix b/pkgs/desktops/kde-4.12/kdepimlibs.nix deleted file mode 100644 index 90d2717b8805..000000000000 --- a/pkgs/desktops/kde-4.12/kdepimlibs.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison -, kdelibs, akonadi, libxslt, nepomuk_core -, shared_desktop_ontologies, qjson }: - -kde { - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = - [ boost boost.lib gpgme libical libxslt qjson prison - openldap cyrus_sasl akonadi shared_desktop_ontologies - ]; - - propagatedBuildInputs = [ kdelibs nepomuk_core ]; - - meta = { - description = "KDE PIM libraries"; - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeplasma-addons.nix b/pkgs/desktops/kde-4.12/kdeplasma-addons.nix deleted file mode 100644 index afc925c79aab..000000000000 --- a/pkgs/desktops/kde-4.12/kdeplasma-addons.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig -, boost, eigen, kde_workspace, attica, qca2, qimageblitz -, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt -, qjson, qoauth }: - -kde { - -# TODO: qwt, scim, ibus - - KDEDIRS=marble; - - buildInputs = [ kdelibs boost boost.lib kde_workspace kdepimlibs attica qjson - qoauth eigen qca2 libXtst qimageblitz libqalculate - shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt - ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "KDE Plasma Addons"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.12/kdesdk/cervisia.nix deleted file mode 100644 index 1dabe46cd429..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/cervisia.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE CVS frontend"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.12/kdesdk/dolphin-plugins.nix deleted file mode 100644 index ad8132a850e5..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/dolphin-plugins.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, kde_baseapps }: - -kde { - - # Needs kdebase for libkonq - buildInputs = [ kdelibs kde_baseapps ]; - - meta = { - description = "Svn, mercurial, git and bazaar plugins for dolphin"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.12/kdesdk/kapptemplate.nix deleted file mode 100644 index 391536248dd3..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kapptemplate.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE 4 project template generator"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.12/kdesdk/kcachegrind.nix deleted file mode 100644 index 65d410cca48d..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kcachegrind.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Frontend for Callgrind/Cachegrind"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kde-dev-scripts.nix b/pkgs/desktops/kde-4.12/kdesdk/kde-dev-scripts.nix deleted file mode 100644 index df81145e5d60..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kde-dev-scripts.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Various scripts to ease KDE development"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.12/kdesdk/kde-dev-utils.nix deleted file mode 100644 index 215c0a3c613a..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kde-dev-utils.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, gcc, libtool }: - -kde { - buildInputs = [ kdelibs libtool ]; - - preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}"; - - meta = { - description = "various KDE development utilities"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-kioslaves.nix b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-kioslaves.nix deleted file mode 100644 index 98bbce35a97c..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-kioslaves.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, subversionClient, apr, aprutil,perl }: - -kde { - - buildInputs = [ kdelibs subversionClient apr aprutil perl ]; - - cmakeFlags = [ "-DBUILD_perldoc=ON" ]; - - meta = { - description = "Subversion and perldoc kioslaves"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-strigi-analyzers.nix b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-strigi-analyzers.nix deleted file mode 100644 index 4d579b88ba8a..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-strigi-analyzers.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Strigi analyzers for diff, po and ts"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.12/kdesdk/kdesdk-thumbnailers.nix deleted file mode 100644 index d707fe9038fe..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kdesdk-thumbnailers.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, gettext }: - -kde { - - buildInputs = [ kdelibs gettext ]; - - meta = { - description = "PO file format thumbnailer"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/kompare.nix b/pkgs/desktops/kde-4.12/kdesdk/kompare.nix deleted file mode 100644 index 644c7c48dc97..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/kompare.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libkomparediff2 }: - -kde { - buildInputs = [ kdelibs libkomparediff2 ]; - - meta = { - description = "A program to view the differences between files and optionally generate a diff"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/libkomparediff2.nix b/pkgs/desktops/kde-4.12/kdesdk/libkomparediff2.nix deleted file mode 100644 index 5933682c70a0..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/libkomparediff2.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A library to compare files and strings"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.12/kdesdk/lokalize.nix deleted file mode 100644 index 1565426eb1fc..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/lokalize.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, hunspell }: - -kde { - buildInputs = [ kdelibs hunspell ]; - - meta = { - description = "KDE 4 Computer-aided translation system"; - longDescription = '' - Computer-aided translation system. - Do not translate what had already been translated. - ''; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/okteta.nix b/pkgs/desktops/kde-4.12/kdesdk/okteta.nix deleted file mode 100644 index 058636596ad8..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/okteta.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, qca2 }: - -kde { - buildInputs = [ kdelibs qca2 ]; - -# TODO: Look what does -DBUILD_mobile add - - enableParallelBuilding = false; - - meta = { - description = "KDE byte editor"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/poxml.nix b/pkgs/desktops/kde-4.12/kdesdk/poxml.nix deleted file mode 100644 index 6e46c3e3ab4f..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/poxml.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, antlr, gettext }: - -kde { - buildInputs = [ kdelibs antlr gettext ]; - - meta = { - description = "Po<->xml tools"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix deleted file mode 100644 index 2dbccdef9450..000000000000 --- a/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt, boost }: - -kde { - buildInputs = [ kdelibs libxml2 libxslt boost boost.lib ]; - - meta = { - description = "Umbrello UML modeller"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdetoys/amor.nix b/pkgs/desktops/kde-4.12/kdetoys/amor.nix deleted file mode 100644 index 936d63d544a9..000000000000 --- a/pkgs/desktops/kde-4.12/kdetoys/amor.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE creature for your desktop"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.12/kdetoys/kteatime.nix deleted file mode 100644 index dacf54def4b0..000000000000 --- a/pkgs/desktops/kde-4.12/kdetoys/kteatime.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE utility for making a fine cup of tea"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdetoys/ktux.nix b/pkgs/desktops/kde-4.12/kdetoys/ktux.nix deleted file mode 100644 index 108f9be7c722..000000000000 --- a/pkgs/desktops/kde-4.12/kdetoys/ktux.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kde_workspace }: - -kde { - buildInputs = [ kdelibs kde_workspace ]; - - meta = { - description = "Tux Screen Saver"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/ark.nix b/pkgs/desktops/kde-4.12/kdeutils/ark.nix deleted file mode 100644 index 99844b909fd7..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/ark.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ makeWrapper, kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson -, unzip }: - -kde { - buildInputs = [ - makeWrapper kdelibs kde_baseapps libarchive bzip2 lzma qjson - ]; - - postInstall = '' - wrapProgram $out/bin/ark \ - --prefix PATH ":" "${unzip}/bin" - ''; - - meta = { - description = "KDE Archiving Tool"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/filelight.nix b/pkgs/desktops/kde-4.12/kdeutils/filelight.nix deleted file mode 100644 index 25ecabed27ce..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/filelight.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Tool to visualise file and directory sizes"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.12/kdeutils/kcalc.nix deleted file mode 100644 index 08b202e8f0e8..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/kcalc.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, gmp }: - -kde { - buildInputs = [ kdelibs gmp ]; - - meta = { - description = "KDE Calculator"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.12/kdeutils/kcharselect.nix deleted file mode 100644 index d4c9c06f483d..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/kcharselect.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE character selection utility"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/kdf.nix b/pkgs/desktops/kde-4.12/kdeutils/kdf.nix deleted file mode 100644 index 3f9da58d0a62..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/kdf.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE free disk space utility"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.12/kdeutils/kfloppy.nix deleted file mode 100644 index 2434a4fa671f..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/kfloppy.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Floppy disk formatting utility"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix deleted file mode 100644 index 11b62f499a47..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, kdepimlibs, boost }: - -kde { - - buildInputs = [ kdelibs kdepimlibs boost boost.lib ]; - - meta = { - description = "Simple KDE GUI for GPG"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.12/kdeutils/kremotecontrol.nix deleted file mode 100644 index 70311a789f99..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/kremotecontrol.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libXtst }: - -kde { - buildInputs = [ kdelibs libXtst ]; - - meta = { - description = "KDE remote control"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.12/kdeutils/ktimer.nix deleted file mode 100644 index 5700977349e3..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/ktimer.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Timer"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/kwalletmanager.nix b/pkgs/desktops/kde-4.12/kdeutils/kwalletmanager.nix deleted file mode 100644 index 9ec0e6c0396c..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/kwalletmanager.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Wallet (password storage) management tool"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.12/kdeutils/print-manager.nix deleted file mode 100644 index ae72becd1e49..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/print-manager.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ kde, kdelibs -, pythonPackages, cups, pyqt4, pykde4, pycups, system_config_printer }: - -let s_c_p = system_config_printer.override { withGUI = false; }; in - -kde rec { - buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython - ] ++ pythonPath; - - pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ]; - - passthru.propagatedUserEnvPackages = [ s_c_p ]; - - postInstall = - '' - wrapPythonPrograms - - # "system-config-printer" supplies some D-Bus policy that we need. - mkdir -p $out/nix-support - echo ${s_c_p} > $out/nix-support/propagated-user-env-packages - ''; - - meta = { - description = "KDE printer manager"; - longDescription = "Applet to view current print jobs and configure new printers"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.12/kdeutils/superkaramba.nix deleted file mode 100644 index cbe7a2856062..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/superkaramba.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, qimageblitz, python }: - -kde { - buildInputs = [ kdelibs qimageblitz python ]; - - cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ]; - - meta = { - description = "A KDE Eye-candy Application"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.12/kdeutils/sweeper.nix deleted file mode 100644 index 78d56c7df30e..000000000000 --- a/pkgs/desktops/kde-4.12/kdeutils/sweeper.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Helps clean unwanted traces the user leaves on the system"; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.12/kdewebdev/kfilereplace.nix deleted file mode 100644 index 55e37809e07b..000000000000 --- a/pkgs/desktops/kde-4.12/kdewebdev/kfilereplace.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Batch search and replace tool"; - homepage = http://www.kdewebdev.org; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.12/kdewebdev/kimagemapeditor.nix deleted file mode 100644 index 6d22f72461f9..000000000000 --- a/pkgs/desktops/kde-4.12/kdewebdev/kimagemapeditor.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "An HTML imagemap editor"; - homepage = http://www.nongnu.org/kimagemap/; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix deleted file mode 100644 index 36630ef8fc69..000000000000 --- a/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }: - -kde { - -# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old - - buildInputs = [ kdelibs kdepimlibs htmlTidy boost boost.lib ]; - - meta = { - description = "A KDE link checker"; - homepage = http://klinkstatus.kdewebdev.org; - }; -} diff --git a/pkgs/desktops/kde-4.12/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.12/kdewebdev/kommander.nix deleted file mode 100644 index d5f4337f714d..000000000000 --- a/pkgs/desktops/kde-4.12/kdewebdev/kommander.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A graphical editor of scripted dialogs"; - }; -} diff --git a/pkgs/desktops/kde-4.12/l10n/default.nix b/pkgs/desktops/kde-4.12/l10n/default.nix deleted file mode 100644 index fa6406043b1b..000000000000 --- a/pkgs/desktops/kde-4.12/l10n/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }: - -let - - inherit (stdenv.lib) attrByPath singleton; - - kdeL10nDerivation = - { lang, saneName, sha256 }: - - stdenv.mkDerivation rec { - name = "kde-l10n-${saneName}-${release}"; - - src = fetchurl { - url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz"; - name = "${name}.tar.xz"; - inherit sha256; - }; - - buildInputs = [ gettext kdelibs ]; - - cmakeFlags = "-Wno-dev"; - - meta = { - description = "KDE translation for ${lang}"; - inherit branch; - license = "GPL"; - platforms = stdenv.lib.platforms.linux; - inherit (kdelibs.meta) maintainers homepage; - }; - }; - - kdeL10nRelease = - builtins.listToAttrs ( - map ({lang, saneName, sha256}: - { - name = saneName; - value = kdeL10nDerivation { inherit lang saneName sha256; }; - } - ) (import (./manifest + "-${release}.nix")) - ); - -in -{ - inherit kdeL10nDerivation; - recurseForDerivations = true; -} // kdeL10nRelease diff --git a/pkgs/desktops/kde-4.12/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.12/l10n/l10n-manifest.sh deleted file mode 100755 index ec159a1e2047..000000000000 --- a/pkgs/desktops/kde-4.12/l10n/l10n-manifest.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -# Usage: download kde-l10n to $dir, then run -# $0 $dir - -dir=$1 - -if [[ ! -d "${dir}" ]]; then - echo "${dir} is not a directory (or doesn't exist)!" >&2 - exit 1 -fi - -release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \ - sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//') - -echo "Detected release ${release}" >&2 - -exec > "manifest-${release}.nix" -echo "[" -for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do - lang=${i%-${release}.tar.xz} - lang=${lang#kde-l10n-} - echo -n "${lang}.. " >&2 - hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") - echo "{" - echo " lang = \"${lang}\";" - echo " saneName = \"$(echo $lang | sed s^@^_^g)\";" - echo " sha256 = \"${hash}\";" - echo "}" - echo $hash >&2 -done -echo "]" diff --git a/pkgs/desktops/kde-4.12/l10n/manifest-4.12.4.nix b/pkgs/desktops/kde-4.12/l10n/manifest-4.12.4.nix deleted file mode 100644 index e646e3528877..000000000000 --- a/pkgs/desktops/kde-4.12/l10n/manifest-4.12.4.nix +++ /dev/null @@ -1,262 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "1pygy9kckankwhlm4j61fk42zinafw2insc9kkpgmh9mvb8gv0jk"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "1qqbl7l84j3d5928gmdq7f7s0i31gw0rlf4y74p5zx8m80xbdd6l"; -} -{ - lang = "bs"; - saneName = "bs"; - sha256 = "0cg143wlalplw0qr10h60i6srn0avsim94m1hjbm8xrlg71iihjj"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "15s85xmqbnv7bm7ywivkyi62481ip4vy6yyw81m720hza0imbj9z"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "1d0bhndwf8b0pmglf3sx28r6s3li72x7a05kc39n026ha5zyx5f1"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "1dx5c6fkgn4hglx8qacrdnxn0l9p7dqbaz6cd7h9pa8b9zri5j9w"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "1ynh8s17999pa60bzwr2595pcd744h1n8zznyzr5lq302ir8f8qj"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "1da01wd1n64g3l57pagvrb8mn2jj50ni1qhicnlwylk8n2krw0pf"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "1qf9g5in9zr39gkip06hr80pzc4frchb2x9q76sqs36h58az5yfd"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "1lhrbfh74sqglqxl7yh68qkx0gmppg7iir194vxhm2s1j0jxq8r4"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "0qz39nxkiivgk720lgdbfgxdp3wn5wrvx2zf0phvb8g6q5rl68kw"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "1i9h68pfsnbi4gw5f4mb6q8jq56hdmi1lqxhwzj6vrbqiip7b9gl"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "020b1p164v82pj6x0jxz6d41w539786ygkfmgrf9dr20zwhchzha"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "0vs8bqr6if32bmwvjzdmakyqdl5fz13igg31mzwga4aqlzalxa1w"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "1wcd9gzf754150i62zl3fa24jq8p7vskn6adaa8x5qy208c0d6v1"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "0fpsc36sk7zh3flxgnvfgxig4cm5hm56sgdgbl01dfg1mac6dckq"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "1hrbsd595q2w09mym9h56hymikkpxbq0qmdxvphap5wsh0xsfxms"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "1q2y9js6j32rbm5jg8yn6s9zw0jh6yq1q4z6hxy9nss1gh6diqda"; -} -{ - lang = "hi"; - saneName = "hi"; - sha256 = "0zaknfk8kzcid7839wsj61qgn81gjz0hbpis7q2q1syky4nzjwsb"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "1d14h5kdfz8np5p27darraxq4ps0yhxhczg9yli436kgiflbvp88"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "0p29dybsalnjk00f7l3gni7pxzv1ig95m100svhhkmcwvh065kjf"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "1qqbn3v30z058580qr9qyq0sy6g4jw0far8w7ywgnhks4aapy97a"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "1gfm0k2j2jvff9lab87yjrywc1j0gayw2fxibzifvpygr9bl60i7"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "11zax6c3qfscadqfamls5k78hw36iwadqsgyiphl574ijz9q48ba"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "1ab658x0a44kydzs05zgzq7nks6dfl0z8m69ank5ngd12qnhb38s"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "0n26860ah421x8q2jmz8mh3mdzy26s8ckbfpnyph1vc23zqx9vqv"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "05ad1d5klc11s138zb5fj4h2kfida83xqr4z1m6nhv0igwzmza0g"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "14kchh6yixgrkzrrkdz25xaj2q91il6yshz79n4h0yk01lfc3sq5"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "0aa4spy2nc1hfbx1z2b4k3sahha0pdxih1k3pl6n9223cjgwcbqp"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "14341a4qr8p7idvsw6zp23kyva5lb4684wjygm24d9wj69nkc2c4"; -} -{ - lang = "mr"; - saneName = "mr"; - sha256 = "02rq9spp8vzvv8bvzny48qwksimrnqj6y9rpc3xh6bmzfhvr7qsa"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "1s2gbynxdbpi32rwdgddabsp3n10ngwpnh6za3yjp4is93ici6rm"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "18nmh605ya47w0x2nkglg8lrfks7l9pxr6mjnw3z3lsazafigvx1"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "1jxd109m2y7ky0c4im70ipx07rysbr0ndl2fpjb3myxb2nks106h"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "117zl85myjnnb957c4gx0h65ks842sk3gbw9dfp8hpzdwg8zvsn4"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "1q5c61a2swxvyhdw5rambibyms40hj34093ihx32ad73kb4mn72w"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "0wg4nlra1z6pf8mxlz3w0jq68k0qfhxrhsqij35l9zml5y203n4y"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "0rryyjfgplar77fz332jv2w0lv7d6273gv022pb1m83w945pzkf9"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "0aglgvj1ljfdf6gjs478l4wisp2z4dzkkbhz1sgry00p4q1417ab"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "14aqlg64lp287m09zhh9r9l6ywfwzz7f2nz0vr1fg3wqsdrchglw"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "0cq6xacyrb9wrrwbl8xrb2ah3h7s7a9vr7kz3fy5rf2rgq0phfd7"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "07i0plzmg0nykfalyjvwnhg5qrcfdf1h6i18b34xyrp3y4gm540a"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "0gw1iv550nr307ibgb8i48fxcq03liq5r2x7fr9pl0n9xknh3c8a"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "0489n0l9c9wig5567dfh4apyyy6xws7yxq79r4jl00zxl1j43bla"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "1n4ckll9ngj8qn976nikxfljf23qsvphblbjnjm0vk4713bnpf9h"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "0pzjdnanhynalcjlsg94g88i92hwdsqz02x85yxxg87vn74p13ks"; -} -{ - lang = "ug"; - saneName = "ug"; - sha256 = "1z9mjzh0w6i2a75ys0dx5ksm8fpwyw8wrwdh14bvbnxpnkx0jv8x"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "032vjcjpl19dyyc36z1nwyc9h696iys8dfyadpw9rhcllpk4ck67"; -} -{ - lang = "vi"; - saneName = "vi"; - sha256 = "0sd6vzb1qmbbxk6d1vfq21gkq009lp7qxnpdcr7jbykcf0licq7i"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "1m6fa0adfjzfqakjyrrjwak4p0y5wwdkkq61qx9wvzdb78qm83rw"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "11is37g7fafxhk7ydydgbxdg0x1s5cxr8v1pjzwqb858n1cq5x1h"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "1vbr0pjm8d25lxbmhqz8d4x57sjc411a5fkvyxh4rr34fd7xxhwq"; -} -] diff --git a/pkgs/desktops/kde-4.12/oxygen-icons.nix b/pkgs/desktops/kde-4.12/oxygen-icons.nix deleted file mode 100644 index 01020e095f91..000000000000 --- a/pkgs/desktops/kde-4.12/oxygen-icons.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake }: - -kde { - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "06qddsbq0sadj9jh2x1qkbm69b7cnd2474b3h0zrzrqgnrsf8jn2"; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "KDE Oxygen theme icons"; - longDescription = "Icons for KDE's default theme"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.12/support/akonadi/default.nix b/pkgs/desktops/kde-4.12/support/akonadi/default.nix deleted file mode 100644 index 824fd3e6616b..000000000000 --- a/pkgs/desktops/kde-4.12/support/akonadi/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }: - -stdenv.mkDerivation rec { - name = "akonadi-1.11.0"; - - src = fetchurl { - url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; - sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc"; - }; - - buildInputs = [ qt4 soprano libxslt boost boost.lib sqlite ]; - - nativeBuildInputs = [ cmake automoc4 shared_mime_info ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "KDE PIM Storage Service"; - license = "LGPL"; - homepage = http://pim.kde.org/akonadi; - maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix new file mode 100644 index 000000000000..7506ece43dc1 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }: + +stdenv.mkDerivation rec { + majorVersion = "0.3"; + minorVersion = "0.1"; + name = "pantheon-terminal-${majorVersion}.${minorVersion}"; + src = fetchurl { + url = "https://launchpad.net/pantheon-terminal/${majorVersion}.x/${majorVersion}.${minorVersion}/+download/${name}.tgz"; + sha256 = "14wspqxp79myyyjngr1x7jg1kw15g3nm2pav2zffp8xs16s1i5za"; + }; + + preConfigure = '' + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${granite}/lib64/pkgconfig" + ''; + + preFixup = '' + for f in $out/bin/*; do + wrapProgram $f \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" + done + ''; + + buildInputs = [perl cmake vala pkgconfig glib gtk3 granite gnome3.vte gnome3.libgee libnotify gettext makeWrapper]; + meta = { + description = "elementary OS's terminal"; + longDescription = "A super lightweight, beautiful, and simple terminal. It's designed to be setup with sane defaults and little to no configuration. It's just a terminal, nothing more, nothing less. Designed for elementary OS."; + homepage = https://launchpad.net/pantheon-terminal; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.vozz ]; + }; +} diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index f1be290b190e..94336cc9e2b4 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }: +{ stdenv, fetchFromGitHub, jdk, jre, ant, coreutils, gnugrep }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.0.6"; name = "arduino-core"; - src = fetchurl { - url = "http://arduino.googlecode.com/files/arduino-${version}-src.tar.gz"; - sha256 = "0nszl2hdjjgxk87gyk0xi0ww9grbq83hch3iqmpaf9yp4y9bra0x"; + src = fetchFromGitHub { + owner = "arduino"; + repo = "Arduino"; + rev = "${version}"; + sha256 = "0nr5b719qi03rcmx6swbhccv6kihxz3b8b6y46bc2j348rja5332"; }; buildInputs = [ jdk ant ]; - phases = "unpackPhase patchPhase buildPhase installPhase"; - - patchPhase = '' - # - ''; - buildPhase = '' cd ./core && ant cd ../build && ant @@ -34,9 +30,9 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Arduino libraries"; + description = "Libraries for the open-source electronics prototyping platform"; homepage = http://arduino.cc/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.antono ]; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.antono stdenv.lib.maintainers.robberer ]; }; } diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix index 6ea377387ec6..ae4d73d6e209 100644 --- a/pkgs/development/compilers/epic/default.nix +++ b/pkgs/development/compilers/epic/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "epic"; - version = "0.9.3"; - sha256 = "1x8y3ljha8r52pw83mjfv5i49dq0b7i1xbxg8j9hlvr2vwfa4237"; + version = "0.9.3.2"; + sha256 = "1l73absns4ci20brkdjg1r1l9p4xxx88vax736diqik7rl7zrx9h"; isLibrary = true; isExecutable = true; buildDepends = [ Cabal mtl ]; @@ -16,7 +16,5 @@ cabal.mkDerivation (self: { description = "Compiler for a simple functional language"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 99e893c79d1c..179c70a5f47d 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fsharp-${version}"; - version = "3.1.1.25"; + version = "3.1.1.26"; src = fetchurl { url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; - sha256 = "1vrgw7qk4g78mjjapc1a1frribcgya4cdrwahv3i26z9s10g5h3d"; + sha256 = "1yz3cq8ys6ryc6x3a0qyc100swrg2q3az8x8in1lp7c2c0l02zb2"; }; buildInputs = [ mono pkgconfig autoconf automake which ]; diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index ca117baca787..3c465c3471f0 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -8,8 +8,8 @@ let loaderArm = "${glibc}/lib/ld-linux.so.3"; srcs = { golang = fetchurl { - url = https://storage.googleapis.com/golang/go1.3.2.src.tar.gz; - sha256 = "1yq6xygc5lhn3b9d4sbddlf8dzi3wihyzjwyc8rhiwrb3hj8hx1y"; + url = https://storage.googleapis.com/golang/go1.3.3.src.tar.gz; + sha1 = "b54b7deb7b7afe9f5d9a3f5dd830c7dede35393a"; }; tools = fetchhg { url = https://code.google.com/p/go.tools/; @@ -20,7 +20,7 @@ let in stdenv.mkDerivation { - name = "go-1.3.2"; + name = "go-1.3.3"; src = srcs.golang; diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix index c9697bac36c7..48b5dbb35a3b 100644 --- a/pkgs/development/compilers/icedtea-web/default.nix +++ b/pkgs/development/compilers/icedtea-web/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "icedtea-web-${version}"; - version = "1.5"; + version = "1.5.1"; src = fetchurl { url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz"; - sha256 = "0bbwa944kaam0r8ldlqrrj9z9zj54v6zdc3q663ck59shw5z828w"; + sha256 = "1581j1bmg4pavh10dd13q5zchr54j2hf11i2wcd4yml4z9b67w83"; }; buildInputs = [ gtk2 xulrunner zip pkgconfig npapi_sdk ]; diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index 63af45643749..c97d74ec9af3 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "11"; + patchVersion = "20"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256_i686 = "3981e6fb7d35b20ac3c05ec56fb3798ac1cd872a9e968bb3d77a718af7b146d1"; - sha256_x86_64 = "f3593b248b64cc53bf191f45b92a1f10e8c5099c2f84bd5bd5d6465dfd07a8e9"; + sha256_i686 = "fa013b3fcbb1308040bf0e75bbd6ef7e8396b547cbc8dd79e3cb8153604bfd06"; + sha256_x86_64 = "3e717622ae48af5ca7298e7797cb71d4d545238f362741a83e69c097ca055de4"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59"; diff --git a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch index 21e6576e4e35..8701cd3c9829 100644 --- a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch +++ b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch @@ -1,5 +1,5 @@ diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs -index 6332485..9500a23 100644 +index 1cc60fc..2e94b99 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -383,18 +383,9 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri @@ -35,4 +35,3 @@ index 060dda5..fecf76b 100644 + None => "@arPath@" }; let mut cmd = Command::new(ar); - diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index f81539fad9a3..27d02a3757d3 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -18,7 +18,7 @@ assert stdenv.gcc.gcc != null; */ -with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-a2e7c4da9"; }); +with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-3edcdbb0";}); let snapshot = if stdenv.system == "i686-linux" then "555aca74f9a268f80cab2df1147dc6406403e9e4" @@ -40,8 +40,8 @@ in stdenv.mkDerivation { src = fetchgit { url = https://github.com/rust-lang/rust; - rev = "a2e7c4da9b331d337fba0b3911c6d3d7f48e8305"; - sha256 = "1lpncqx3lfyjk6llfc7pd1iqxzfhj32hjqvj09zks73r4isc02n4"; + rev = "3edcdbb0c01187a0cc6456ca29cd858579459b18"; + sha256 = "0s125x71r0wi7m142nnynpc6vcwlmq4bh8rbysn9cg3bvj5ddgrm"; }; # We need rust to build rust. If we don't provide it, configure will try to download it. diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index ec1fda10d8c3..f752ad35a6d4 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "yasm-1.2.0"; + name = "yasm-1.3.0"; src = fetchurl { url = "http://www.tortall.net/projects/yasm/releases/${name}.tar.gz"; - sha256 = "0cfg7ji3ia2in628w42wrfvw2ixmmm4rghwmv2k202mraysgm3vn"; + sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; }; meta = { diff --git a/pkgs/development/coq-modules/bedrock/default.nix b/pkgs/development/coq-modules/bedrock/default.nix new file mode 100644 index 000000000000..7aadead54281 --- /dev/null +++ b/pkgs/development/coq-modules/bedrock/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, coq}: + +stdenv.mkDerivation rec { + + name = "coq-bedrock-${coq.coq-version}-${version}"; + version = "20140722"; + + src = fetchurl { + url = "http://plv.csail.mit.edu/bedrock/bedrock-${version}.tgz"; + sha256 = "0aaa98q42rsy9hpsxji21bqznizfvf6fplsw6jq42h06j0049k80"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + enableParallelBuilding = true; + + buildFlags = "cito"; + + installPhase = '' + COQLIB=$out/lib/coq/${coq.coq-version}/ + mkdir -p $COQLIB/user-contrib/Bedrock + cp -pR src $COQLIB/user-contrib/Bedrock + ''; + + meta = with stdenv.lib; { + homepage = http://plv.csail.mit.edu/bedrock/; + description = "Bedrock is a library that turns Coq into a tool much like classical verification systems"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/containers/default.nix b/pkgs/development/coq-modules/containers/default.nix index 8c20d64d8c7d..92ac9d16cf69 100644 --- a/pkgs/development/coq-modules/containers/default.nix +++ b/pkgs/development/coq-modules/containers/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://coq.inria.fr/pylons/contribs/files/Containers/v8.4/Containers.tar.gz; - sha256 = "1y9x2lwrskv2231z9ac3kv4bmg6h1415xpp4gl7v5w90ba6p6w8w"; + sha256 = "0z7yk0g7zkniwc73ka7wwb5jjg5a2wr1krrn3akr7kn5z3gvy2mc"; }; buildInputs = [ coq.ocaml coq.camlp5 ]; @@ -19,7 +19,6 @@ stdenv.mkDerivation { description = "A typeclass-based Coq library of finite sets/maps"; maintainers = with maintainers; [ vbgl ]; platforms = coq.meta.platforms; - broken = true; /* the source hash is wrong */ }; } diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix new file mode 100644 index 000000000000..44173843033a --- /dev/null +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchgit, coq}: + +stdenv.mkDerivation rec { + + name = "coq-ext-lib-${coq.coq-version}-${version}"; + version = "c2c71a2a"; + + src = fetchgit { + url = git://github.com/coq-ext-lib/coq-ext-lib.git; + rev = "c2c71a2a90ac87f2ceb311a6da53a6796b916816"; + sha256 = "01sihw3nmvvpc8viwyr01qnqifdcmlg016034xmrfmv863yp8c4g"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}"; + + meta = with stdenv.lib; { + homepage = https://github.com/coq-ext-lib/coq-ext-lib; + description = "A collection of theories and plugins that may be useful in other Coq developments"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/domains/darcs_context b/pkgs/development/coq-modules/domains/darcs_context new file mode 100644 index 000000000000..5dac711c0c0a --- /dev/null +++ b/pkgs/development/coq-modules/domains/darcs_context @@ -0,0 +1,809 @@ + +Context: + +[additional facts about limits on cuts +robdockins@fastmail.fm**20140818025955 + Ignore-this: 6f9c952db425df6ae9d2a14139a8a3d1 +] + +[work on limits +robdockins@fastmail.fm**20140817221707 + Ignore-this: 9811e0cd669b48f3beb7a56d47cbe3c3 +] + +[finish proving that Q field ops commute with injq +robdockins@fastmail.fm**20140817060600 + Ignore-this: a1f6c62b39983e6f6f01d28aca5f8534 +] + +[split up realdom.v and perform associated code motion +robdockins@fastmail.fm**20140817030034 + Ignore-this: 24c74cd459d2ab15dcd3d83ba06f7081 +] + +[recip is canonical and converges +robdockins@fastmail.fm**20140725211947 + Ignore-this: c100dbd94114cca9576b2a3f46c9ddc7 +] + +[improve the proof that 1 is a unit for multiplication +robdockins@fastmail.fm**20140724150124 + Ignore-this: c5ec976f8a9858a7ba1f704b4e84d02e +] + +[complete proof the interval multiplication converges; other minor stuff +robdockins@fastmail.fm**20140724015132 + Ignore-this: bc717baa4c8f9ec31b821c5cfae5b499 +] + +[further progress in realdom.v +robdockins@fastmail.fm**20140723004023 + Ignore-this: f33e18d22ae69c9b6209e28151d18017 +] + +[unmessify rational_intervals patch +robdockins@fastmail.fm**20140721123718 + Ignore-this: 4a125b192a9964a508a1063845e9f160 +] + +[messy updates to rational_intervals.v +robdockins@fastmail.fm**20140721015810 + Ignore-this: 858dac9c55426167c6f397a71ef3fda5 +] + +[implicit arguments for "fixes" +robdockins@fastmail.fm**20140721015739 + Ignore-this: 229ecdd48265fc855319141e399bc522 +] + +[metadata +robdockins@fastmail.fm**20140714201441 + Ignore-this: aa16faaf09c1c404bdc6eaf0d0c39912 +] + +[further beautification +robdockins@fastmail.fm**20140714200516 + Ignore-this: 47d74c51d9fe130a5ac12706b1ddb1d4 +] + +[start working on the recripricol function +robdockins@fastmail.fm**20140714180055 + Ignore-this: c7f93cea17f46daa78a1ea14e86dfcaf +] + +[tweaks to the lambda models +robdockins@fastmail.fm**20140714180031 + Ignore-this: 219788fe70f42f0f6e60176cab464f19 +] + +[beauty edits in st_lam* +robdockins@fastmail.fm**20140714180006 + Ignore-this: a40aa7ae00ed27595ee04073918bd028 +] + +[move stuff to rational_intervals.v / define real_mult and prove some properties +robdockins@fastmail.fm**20140712053232 + Ignore-this: 398c5c03aac9ff37526d4d7c9e1a82c0 +] + +[finish correctness proof for interval multiplication +robdockins@fastmail.fm**20140711191547 + Ignore-this: c9ab138a0ca43fe0b133b208419bbcc4 +] + +[break out facts about rational intervals +robdockins@fastmail.fm**20140711012320 + Ignore-this: b7fe6e9377629a89b5debe3019ae1aa +] + +[updates to ideal completion +robdockins@fastmail.fm**20140707053800 + Ignore-this: 90d1efbd0e5833d8c83f0df056d7a74c +] + +[a pile of additional properties in realdom.v +robdockins@fastmail.fm**20140707053519 + Ignore-this: 7edba1e72a1856f297ef11e698ed989f +] + +[some properties of converging prereals +robdockins@fastmail.fm**20140706041401 + Ignore-this: 273bfbb245302becd7ff402831827ffb +] + +[make realdom compile +robdockins@fastmail.fm**20140630015439 + Ignore-this: 8bfc8eaeed4a1596450b0bb9ddef9aaa +] + +[renaming +robdockins@fastmail.fm**20140630011639 + Ignore-this: a287e083af095790cbf2b48df7a58739 +] + +[reorganize some code +robdockins@fastmail.fm**20140630011446 + Ignore-this: f1375b9e7ad822cb92f0c83d4001eddd +] + +[build the retract for realdom +robdockins@fastmail.fm**20140630001245 + Ignore-this: 4eb9da621588417d1b7b2fc980c7bf70 +] + +[fill out lemmas about cPLT +robdockins@fastmail.fm**20140630001140 + Ignore-this: add9e45c14621e3d6328684098bf8461 +] + +[more facts about cPLT +robdockins@fastmail.fm**20140628073731 + Ignore-this: 101a131ed114902924a1707eff7ebc70 +] + +[continuous domains as retracts of bifinite domains +robdockins@fastmail.fm**20140628035522 + Ignore-this: 5e7c61d49cf8424412b0d94f5fcb5ee6 +] + +[start implementing arithmetic operations in RealDom +robdockins@fastmail.fm**20140620003249 + Ignore-this: c28479b8a933cba263765bdddb112264 +] + +[define the domain of rational intervals +robdockins@fastmail.fm**20140619040809 + Ignore-this: 6cbe1a9cc690e5a9d77f37ee299154b + this domain is useful for describing the semantics of exact real arithmetic. +] + +[show that every effective CUSL is Plotkin +robdockins@fastmail.fm**20140619034433 + Ignore-this: d529a4b1d6d698f79572caa805072394 +] + +[fix notation for octothorpe +robdockins@fastmail.fm**20140614222130 + Ignore-this: 3dc815825f11ceaf4f4f53e4668e6382 +] + +[fix for coq 8.4pl4 +robdockins@fastmail.fm**20140614222049 + Ignore-this: 9745904845aaf54e5569df982fc93d65 +] + +[move swelling lemma into finsets +robdockins@fastmail.fm**20140504080535 + Ignore-this: ffa560e9aa4e4f8b15a55c1f9b1da72e +] + +[documentation improvements and code motion +robdockins@fastmail.fm**20140504070008 + Ignore-this: da7847f82403990342732a8ce226315c +] + +[replace the old finprod +robdockins@fastmail.fm**20140504005534 + Ignore-this: 606cf44422f68d66c8d2d90049e67b93 +] + +[remove the old finprod +robdockins@fastmail.fm**20140504005137 + Ignore-this: 38bd54e16c87d27bbede08496c37bfba +] + +[update st_lam_fix to use the new finprod +robdockins@fastmail.fm**20140504003627 + Ignore-this: 95d0a66e99ccead89bdfef09a1c8c109 +] + +[update st_lam to use the new termmodel +robdockins@fastmail.fm**20140503230854 + Ignore-this: c3d6b2155674b414c5c2e14b85b13760 +] + +[new version of finprod with a better term model +robdockins@fastmail.fm**20140503222035 + Ignore-this: db63e3a063bdb6f2f579644c7b63bd1b +] + +[a few more (hopefully final) lemmas about union +robdockins@fastmail.fm**20140422223924 + Ignore-this: 7b95c75abef9b0d45863b5e33d1c5a37 +] + +[finish proofs about union +robdockins@fastmail.fm**20140422065034 + Ignore-this: 2929c3cdb013c028a48022b0293b2f18 +] + +[powerdomain progress +robdockins@fastmail.fm**20140421064325 + Ignore-this: 592f9c6046f05a27897b460edb2efe10 + Show that powerdomains are endofunctors on PLT. Further, they are monads with + the 'singleton' and 'join' operations. Also make some progress on the additive + portion of the theory, dealing with emptyset and union. +] + +[tweak makefile +robdockins@fastmail.fm**20140420031337 + Ignore-this: d5954b26f731bfed3d79cefacab322fb +] + +[show that semvalue is the weakest condition allowing beta-reduction of strict functions +robdockins@fastmail.fm**20140420020447 + Ignore-this: 16a7ed23f04879f1fb324bdac8a2ffaf +] + +[some additional operations relating to the PLT adjunction +robdockins@fastmail.fm**20140420020351 + Ignore-this: db8eec6e3f74cce3acb67d2b660b104e +] + +[finish building power domain fmap +robdockins@fastmail.fm**20140420020217 + Ignore-this: 556e1cb87576de36cb26f8add3a1b163 +] + +[fix up st_lam.v +robdockins@fastmail.fm**20140329015058 + Ignore-this: 1c31d674b759fbd0cc74fb3125579f96 +] + +[push some proofs into finprod +robdockins@fastmail.fm**20140329000401 + Ignore-this: 49070fdd951e49473e60d3cd0ec431c6 +] + +[documentation and aesthetic changeds +robdockins@fastmail.fm**20140327043141 + Ignore-this: be27b24b78ea6af722a307117e59f5b3 +] + +[finish the st_lam_fix example +robdockins@fastmail.fm**20140322011153 + Ignore-this: e702f564b6eab2f8c11ab16bcb62504b +] + +[clarafications re: countable choice; remove unfinished example from build order +robdockins@fastmail.fm**20140321212852 + Ignore-this: 2a9d5c79c05ba088e1815feab99a5f6c +] + +[break the "fixes" operator into a separate file and prove some facts about it +robdockins@fastmail.fm**20140318013247 + Ignore-this: 80c506cef0719a974a049a1f5870f676 +] + +[minor fix to skiy.v +robdockins@fastmail.fm**20140317054057 + Ignore-this: ffef6fcaf5fa7f8cea80d2808caf4f4c +] + +[add the fixpoint operator; admit proofs +robdockins@fastmail.fm**20140317044648 + Ignore-this: 97ca18e980cdf46a9b40c8252badef14 +] + +[remove the evaluation case for variables +robdockins@fastmail.fm**20140317032932 + Ignore-this: e46d634e735e5b21a18518a48777168d +] + +[start on STLC with fixpoints -- but without fixpoints for now +robdockins@fastmail.fm**20140317031953 + Ignore-this: 3458bc18c73d967bef58418bc73e06cb +] + +[add the eliminator for booleans to st_lam; other additional utility lemmas +robdockins@fastmail.fm**20140317031753 + Ignore-this: 369dd375755cbd9ae5e3c969f3ef6ec +] + +[some minor code motion +robdockins@fastmail.fm**20140228064927 + Ignore-this: 804828472ddb0c5fafc72460fce8387b +] + +[plug final holes in st_lam and add to build order +robdockins@fastmail.fm**20140228044729 + Ignore-this: 3edc7f36bfa97775ba33ffa27c80df59 +] + +[reduce st_lam.v to facts I believe about fresh variables +robdockins@fastmail.fm**20140228010832 + Ignore-this: bde3e73291ddd32337d6fb999e4b1c02 +] + +[fix breakages +robdockins@fastmail.fm**20140226073930 + Ignore-this: 9be54f5255f8ed9d53a79260e9bdf565 +] + +[more work on lambdas +robdockins@fastmail.fm**20140226043753 + Ignore-this: 7f7452670221e2643067a3c7cc180998 +] + +[use new finprod implementation +robdockins@fastmail.fm**20140226043700 + Ignore-this: c9e05df5fcfd31254ed7318fe693490c +] + +[remove old finprod +robdockins@fastmail.fm**20140226043642 + Ignore-this: 2705703a2c782da21a152fbb27c8a972 +] + +[rearrange the interfact to finprod +robdockins@fastmail.fm**20140226043541 + Ignore-this: c44d7c478948f42b188eb8d06469abbf +] + +[fill remaining holes in finprod2 +robdockins@fastmail.fm**20140225205242 + Ignore-this: 1eeb9b8beef92790c28918292f2a9cf4 +] + +[rework some stuff dealing with semidecidable predicates +robdockins@fastmail.fm**20140225092149 + Ignore-this: 32b5ccb2927e08979ea92b9ef67c40f4 +] + +[lots of work on alpha-congrunce in lambdas +robdockins@fastmail.fm**20140225035601 + Ignore-this: fbbec9dac4cb328ff4e0b25df646e0c7 +] + +[terminate is universal in PLT +robdockins@fastmail.fm**20140225035538 + Ignore-this: abc6cd1a60578c435bf9ca596d8d0922 +] + +[new attack on nominal finite products +robdockins@fastmail.fm**20140225035516 + Ignore-this: 3875e713acc6aa5193696612f3ede76d +] + +[push forward a little on lambdas +robdockins@fastmail.fm**20140221095249 + Ignore-this: c690a1b03075702e3fd84aac7e268211 +] + +[update finprod for various changes +robdockins@fastmail.fm**20140221095230 + Ignore-this: a6d787930ed356ae2b0a003af1f4d44 +] + +[better discrete cases lemma +robdockins@fastmail.fm**20140219051301 + Ignore-this: f0ec88e8207257e7657ced933cf687e7 +] + +[start working on simply-typed lambdas +robdockins@fastmail.fm**20140219051238 + Ignore-this: 69bea345376ea39cd1addc0849a43077 +] + +[more messing about with advanced category theory stuff +robdockins@fastmail.fm**20140211095003 + Ignore-this: 9cd3c9d961349e8797f109f716c5f678 +] + +[minor rearrangements and code motion +robdockins@fastmail.fm**20140211041724 + Ignore-this: 642ad6f1395fde7ecd81e5a905fd5428 +] + +[some basic bicategory theory +robdockins@fastmail.fm**20140210083634 + Ignore-this: f47a898fa045a397d3ee70e1512b8baa +] + +[even more notation futzing +robdockins@fastmail.fm**20140209072416 + Ignore-this: d2061652cb3e80f6994f567a9e677b32 +] + +[additional notational futzing +robdockins@fastmail.fm**20140209043308 + Ignore-this: ac42cbbc94df227e6d5e70b96ae65fd3 +] + +[futz around with notations, various other cleanup activities +robdockins@fastmail.fm**20140209005551 + Ignore-this: 3f41a52650aadd956ac490b62e59c1c3 +] + +[complete adequacy for SKI+Y +robdockins@fastmail.fm**20140206050414 + Ignore-this: f730587ac7a42f3e35740976a1439f2e +] + +[minor changes in cpo +robdockins@fastmail.fm**20140206014745 + Ignore-this: 95244704faf1e6c336d62dc7912f9022 +] + +[push through most of SKI+Y adequacy +robdockins@fastmail.fm**20140205214805 + Ignore-this: dc998ef45f2e919e9373bfa21a5ef8c7 +] + +[major simplification of the adequacy proof for SKI +robdockins@fastmail.fm**20140205185605 + Ignore-this: f1f0dc46274db05f3393038dfe2775e2 +] + +[push forward on SKI+Y +robdockins@fastmail.fm**20140205044216 + Ignore-this: daf255aa940b42c1c68ba947a356370d +] + +[continue futzing with the LR statement +robdockins@fastmail.fm**20140203055601 + Ignore-this: f5ef9f06d3b1a11d76317b52cec691ab +] + +[start pushing on adequacy for SKI+Y +robdockins@fastmail.fm**20140202085948 + Ignore-this: 956844809340fad0c13c19e9fa729b5c +] + +[mostly finish soundness for SKI+Y +robdockins@fastmail.fm**20140202060633 + Ignore-this: 4c75fd9eeefa1d6dad6866662abea0fd +] + +[start working on a CCL example +robdockins@fastmail.fm**20140202020748 + Ignore-this: 44c5d7854cc19b0f90414c2be6b3df68 +] + +[make id(A) a parsing-only notation +robdockins@fastmail.fm**20140202020724 + Ignore-this: 68f51f754c0b89e2e815da47b901e4b1 +] + +[the PLT adjunction is strong monodial +robdockins@fastmail.fm**20140202020637 + Ignore-this: 7b29b9a6a5e8efa07440c528ec12d7bd +] + +[fix my broken version of lfp and fixup proofs +robdockins@fastmail.fm**20140202020615 + Ignore-this: 3ac283481318622cbf38378e815a4f09 +] + +[more work on SKI + Y +robdockins@fastmail.fm**20140202020516 + Ignore-this: d1f63e2ef610c6f93d03806c5426cfa5 +] + +[start work on SKI + Y +robdockins@fastmail.fm**20140201085039 + Ignore-this: fb7a405830cf90526cddd8ce37f4da40 +] + +[doc corrections +robdockins@fastmail.fm**20140130015908 + Ignore-this: bca4c04267bfdac8cb202651a0960d92 +] + +[lots of additional inline documentation +robdockins@fastmail.fm**20140129234834 + Ignore-this: ab2c59add5514f44a898de1f0eece98b +] + +[powerdomains form continuous functors in EMBED +robdockins@fastmail.fm**20140126234115 + Ignore-this: d2ee08902f0bdb52efd7f7ce2c594469 +] + +[complete the powerdomain constructions; build some operations +robdockins@fastmail.fm**20140125225202 + Ignore-this: 9c8f2632df05e84fc3794a338ff8720d +] + +[construct the basic powerdomains--still some holes left +robdockins@fastmail.fm**20140125064541 + Ignore-this: c3206d2e1e925096b3e9ff49afacef2f +] + +[generalize the lfp construction to a generic chain_sup operation +robdockins@fastmail.fm**20140124183103 + Ignore-this: 4cc2c1011b9f79365dcb7c76784fbfa6 +] + +[update makefile +robdockins@fastmail.fm**20140124073734 + Ignore-this: a0b7db8383262caa314c21b99e146222 +] + +[new file for recursive lambda domains +robdockins@fastmail.fm**20140124070023 + Ignore-this: 300c02b4da83b6ebd734aa2ccb21cd2d +] + +[more lemmas about antistrict homs +robdockins@fastmail.fm**20140124065953 + Ignore-this: 483c7b350dc3cab59c8ff50e1ac73b8c +] + +[fix breakage related to implicit arguments +robdockins@fastmail.fm**20140124065805 + Ignore-this: 561693d3280851299c6a49a2a34546b3 +] + +[notation tweaks in cpo.v +robdockins@fastmail.fm**20140124053800 + Ignore-this: 83e92d8c14568448074a940ceafbe2c9 +] + +[add if/then/else to the SKI system +robdockins@fastmail.fm**20140124023630 + Ignore-this: 37a9737932a05393a6338380226ca346 +] + +[case analysis for finite types +robdockins@fastmail.fm**20140124012505 + Ignore-this: 6ec1076b2a74f5832501a105a28a6dba +] + +[finish adequacy proof for SKI +robdockins@fastmail.fm**20140123211322 + Ignore-this: 1fe3e626e33431c27e2aa186b3bf91d2 +] + +[additional lemmas about domains +robdockins@fastmail.fm**20140123090037 + Ignore-this: fcad2dd816f805b8b5e7d1be3df60db8 +] + +[most of a proof of adequacy for SKI +robdockins@fastmail.fm**20140123085839 + Ignore-this: d1595c02a6387297018e7f316a3e751 +] + +[more work on finite products +robdockins@fastmail.fm**20140121061158 + Ignore-this: c2f8212e041478104dd4c81c225b42d5 +] + +[begin work on a more flexible "finprod" domain +robdockins@fastmail.fm**20140119021653 + Ignore-this: 249718a2c31964733171b21c84d2effb +] + +[mess with implicit arguments in categories.v +robdockins@fastmail.fm**20140113041450 + Ignore-this: 314cad9207f706e949bd686aaa5c5e1b +] + +[products for CPO, uniformity of lfp +robdockins@fastmail.fm**20140113041421 + Ignore-this: e533abe995e634c732a35e71d66ddb6a +] + +[define the LFP in pointed CPOs, prove the Scott induction principle +robdockins@fastmail.fm**20140112231843 + Ignore-this: 2014174b1c6914bef376d614f34d073f +] + +[build the forgetful functor from EMBED to PLT +robdockins@fastmail.fm**20140110014909 + Ignore-this: 1dacbfc0383e48f4ab35fe0a5fd11cec +] + +[notation changes, prove sum_cases and curry preserve order and equality +robdockins@fastmail.fm**20140110014820 + Ignore-this: d1c6a1d0346a9eba14f3529ac30b5e2f +] + +[prove addl facts about pairs, tweak implicit arguments +robdockins@fastmail.fm**20140110010319 + Ignore-this: 9f0af8abc268b2b22d8b5450d6a4136 +] + +[make 'ob' a coercion +robdockins@fastmail.fm**20140110010204 + Ignore-this: 467c0b0a8b086a7f44bf98875a4380d6 +] + +[copyright notices +robdockins@fastmail.fm**20140106232333 + Ignore-this: f59bafa0ec99e259bd9b4319f2cdbc67 +] + +[add ord_dec coercion +robdockins@fastmail.fm**20140104052750 + Ignore-this: 4ed1cacfd27979f0fe518862be5ac27c +] + +[define the model for CBV lambda calculus +robdockins@fastmail.fm**20140104050626 + Ignore-this: 88ca796d4697bfebb044d3fae27d6129 +] + +[proof a fixpoint lemma for unpointed domains +robdockins@fastmail.fm**20140103231818 + Ignore-this: 4939eb02d09b6a4eecf145c887c64393 +] + +[prove that the adjoint functors between PLT and PPLT extend to continuous functors in EMBED +robdockins@fastmail.fm**20140103000915 + Ignore-this: 54da0101f581731ebe512ed514e0603e +] + +[notation changes for PLT +robdockins@fastmail.fm**20140102234446 + Ignore-this: ad1f82f22d1bf0e057f11c3508a81716 +] + +[move embeddings into their own file; pull TPLT and PPLT into profinite.v +robdockins@fastmail.fm**20140102234424 + Ignore-this: 3704996af47ae32415ba3e539d67cf5c +] + +[Show that PLT is cocartesian; rearrange proof that EMBED(true) is terminated +robdockins@fastmail.fm**20140102213805 + Ignore-this: 3470df6910e7a3e4bda478c0c6ecea62 +] + +[remove unnecessary "inh" hypothesis in the definition of Plotkin order; fixup the fallout +robdockins@fastmail.fm**20140102213646 + Ignore-this: b6a5ad59296f938b377d71852120d48b +] + +[move proofs that empty and unit preorders are effective plotkin +robdockins@fastmail.fm**20140102205530 + Ignore-this: 7324843510fd938d356aa82003c9ec68 +] + +[make epi/mono/iso morphisms into categories +robdockins@fastmail.fm**20131228082442 + Ignore-this: ee75a2b6eb1f3d6fa47f17d6734e5015 +] + +[define the cocartesian and distributive categories +robdockins@fastmail.fm**20131226001612 + Ignore-this: 11e9d8a88bef42bcb800b31d85d28d16 +] + +[remove uses of maximally implict arguments +robdockins@fastmail.fm**20131226001536 + Ignore-this: c0d93a5398aea58cbcc4fbbca3b59b17 +] + +[fixpoints and binary sums for NOMINAL +robdockins@fastmail.fm**20131121092931 + Ignore-this: 8a660dfe2ab16a8208ae559dcf2b7ed0 +] + +[modify bilimit.v to use the general construction from cont_functors.v +robdockins@fastmail.fm**20131120075848 + Ignore-this: 17ea36107ade1646eab5c99aec3561a9 +] + +[generic fixpoint construction for categories with initial objects and directed colimits +robdockins@fastmail.fm**20131119092522 + Ignore-this: 25674dff855a1cecdb4ee919f8bf3a5d +] + +[remove some irritating unit parameters, fix doc typos +robdockins@fastmail.fm**20131118093204 + Ignore-this: 38342d58567d8a13471620d5b7c2b7d4 +] + +[improvements to categories; complete some constructions in nominal +robdockins@fastmail.fm**20131118085737 + Ignore-this: e58cb49a01d0210dabdb021250910adb +] + +[build fixes +robdockins@fastmail.fm**20131113004305 + Ignore-this: 5abffcd1d6b44f816749c5e0cfd5b6e9 +] + +[Documentation additions +robdockins@fastmail.fm**20131113004254 + Ignore-this: 79a913d3a8652866f3fdc64891f6304d +] + +[lots of inline documentation additions +robdockins@fastmail.fm**20131112192736 + Ignore-this: 6aa38112c10ceed3bf43e35dbda98312 +] + +[update makefiles +robdockins@fastmail.fm**20131112192706 + Ignore-this: d834beaa532cdf994cfa0a0b5a562e4f +] + +[continuous functors for binary sum and products +robdockins@fastmail.fm**20131112192605 + Ignore-this: 61520e6e315df909465a02f854816366 +] + +[add the category of nominal types +robdockins@fastmail.fm**20131112192520 + Ignore-this: f0351c5eb0bdacdfe192a6863d9c0bc6 +] + +[split the proof that expF is a continuous functor into a separate file; rearrange some defintions +robdockins@fastmail.fm**20130924013328 + Ignore-this: 4eacee37bb6474d1bdfffe416b98b4c1 +] + +[rearrange definitions of continuous functors. Prove enough plumbing to build the model: D = D->D +robdockins@fastmail.fm**20130924002837 + Ignore-this: a66f9e8833601e244048b70e8bfaab96 +] + +[show that the function space is a continuous functor; other junk +robdockins@fastmail.fm**20130923060521 + Ignore-this: d8f406450688c633ebc1fe1eb0343c91 +] + +[some name changes, other cosmetic fixes +robdockins@fastmail.fm**20130909043234 + Ignore-this: cdd24d1c96a34fb3573c1806153df9fb +] + +[additional cosmetic changes and rearrangements +robdockins@fastmail.fm**20130909020137 + Ignore-this: 77d28bc9452f6c93915194033118dab7 +] + +[reorganize profinite code +robdockins@fastmail.fm**20130909011437 + Ignore-this: 8511bf92ca6998ff8c69d5537624bdb8 +] + +[cosmetic changes +robdockins@fastmail.fm**20130908183909 + Ignore-this: e19039701e58fd26ca4eab79d7b49d14 +] + +[complete the bilimit construction, show how to take fixpoints of continuous functors +robdockins@fastmail.fm**20130908175228 + Ignore-this: 82feab8fdc0c944f13d91605c6a8e571 +] + +[find a MUCH easier path to a bilimit construction +robdockins@fastmail.fm**20130907012151 + Ignore-this: fcc72ad140b045ef37e4b03ad38a8fb0 +] + +[lots of progress, mostly on defining bilimits +robdockins@fastmail.fm**20130905204959 + Ignore-this: abf4bcf03a49fa009f9fb2200ee3abf2 +] + +[start working on the theory of finite preorders, which form a basis for plokin orders +robdockins@fastmail.fm**20130812054451 + Ignore-this: 5be36257a8fdf486bcc31f587d93c457 +] + +[parameterize plotkin orders, build category PPLT +robdockins@fastmail.fm**20130811063623 + Ignore-this: 3f273841bc72098acee0fd618627dbd5 +] + +[complete the details showing PLT is cartesian closed +robdockins@fastmail.fm**20130809230336 + Ignore-this: 13fd1b5a8172dd263cf655421f7584f7 +] + +[add files missed in the first import +robdockins@fastmail.fm**20130809080742 + Ignore-this: 6b59cce866a486d70559f7c80fe99053 +] + +[initial import of development +robdockins@fastmail.fm**20130809080409 + Ignore-this: 44cb5a0df2f1643d289f07dcd4227cbf + First major steps toward a fully effective and usable formalized + domain theory. We formalize the plotkin preorders and show that + they form a cartesian closed category. +] diff --git a/pkgs/development/coq-modules/domains/default.nix b/pkgs/development/coq-modules/domains/default.nix new file mode 100644 index 000000000000..975260c839bd --- /dev/null +++ b/pkgs/development/coq-modules/domains/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchdarcs, coq}: + +stdenv.mkDerivation rec { + + name = "coq-domains-${coq.coq-version}-${version}"; + version = "ce1a9806"; + + src = fetchdarcs { + url = http://hub.darcs.net/rdockins/domains; + context = ./darcs_context; + sha256 = "0zdqiw08b453i8gdxwbk7nia2dv2r3pncmxsvgr0kva7f3dn1rnc"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + homepage = http://rwd.rdockins.name/domains/; + description = "A Coq library for domain theory"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix new file mode 100644 index 000000000000..5f31fe6dc341 --- /dev/null +++ b/pkgs/development/coq-modules/heq/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, coq, unzip}: + +stdenv.mkDerivation rec { + + name = "coq-heq-${coq.coq-version}-${version}"; + version = "0.92"; + + src = fetchurl { + url = "https://www.mpi-sws.org/~gil/Heq/download/Heq-${version}.zip"; + sha256 = "03y71c4qs6cmy3s2hjs05g7pcgk9sqma6flj15394yyxbvr9is1p"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 unzip ]; + propagatedBuildInputs = [ coq ]; + + preBuild = "cd src"; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}"; + + meta = with stdenv.lib; { + homepage = https://www.mpi-sws.org/~gil/Heq/; + description = "Heq : a Coq library for Heterogeneous Equality"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix new file mode 100644 index 000000000000..c885d14aa3f2 --- /dev/null +++ b/pkgs/development/coq-modules/paco/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, coq, unzip}: + +stdenv.mkDerivation rec { + + name = "coq-paco-${coq.coq-version}-${version}"; + version = "1.2.7"; + + src = fetchurl { + url = "http://plv.mpi-sws.org/paco/paco-${version}.zip"; + sha256 = "010fs74c0cmb9sz5dmrgzg4pmb2mgwia4gm0g9l7j2fq5xxcschb"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 unzip ]; + propagatedBuildInputs = [ coq ]; + + preBuild = "cd src"; + + installPhase = '' + COQLIB=$out/lib/coq/${coq.coq-version}/ + mkdir -p $COQLIB/user-contrib/Paco + cp -pR *.vo $COQLIB/user-contrib/Paco + ''; + + meta = with stdenv.lib; { + homepage = http://plv.mpi-sws.org/paco/; + description = "Paco is a Coq library implementing parameterized coinduction"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix new file mode 100644 index 000000000000..e47ffbdd4562 --- /dev/null +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchsvn, coq}: + +stdenv.mkDerivation { + + name = "coq-tlc-${coq.coq-version}"; + + src = fetchsvn { + url = svn://scm.gforge.inria.fr/svn/tlc/branches/v3.1; + rev = 240; + sha256 = "0mjnb6n9wzb13y2ix9cvd6irzd9d2gj8dcm2x71wgan0jcskxadm"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + installPhase = '' + COQLIB=$out/lib/coq/${coq.coq-version}/ + mkdir -p $COQLIB/user-contrib/Tlc + cp -p *.vo $COQLIB/user-contrib/Tlc + ''; + + meta = with stdenv.lib; { + homepage = http://www.chargueraud.org/softs/tlc/; + description = "TLC is a general purpose Coq library that provides an alternative to Coq's standard library"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/ynot/default.nix b/pkgs/development/coq-modules/ynot/default.nix new file mode 100644 index 000000000000..555945068b1a --- /dev/null +++ b/pkgs/development/coq-modules/ynot/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchgit, coq}: + +stdenv.mkDerivation rec { + + name = "coq-ynot-${coq.coq-version}-${version}"; + version = "ce1a9806"; + + src = fetchgit { + url = git://github.com/Ptival/ynot.git; + rev = "ce1a9806c26ffc6e7def41da50a9aac1433cb2f8"; + sha256 = "1pcmcl5zamiimkcg1xvynxnfbv439y02vg1mnz79hqq9mnjyfnpw"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq ]; + + preBuild = "cd src"; + + installPhase = '' + COQLIB=$out/lib/coq/${coq.coq-version}/ + mkdir -p $COQLIB/user-contrib/Ynot + cp -pR coq/*.vo $COQLIB/user-contrib/Ynot + ''; + + meta = with stdenv.lib; { + homepage = http://ynot.cs.harvard.edu/; + description = "Ynot is a library for writing and verifying imperative programs"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix index 521933b0ed1f..66f53831374f 100644 --- a/pkgs/development/interpreters/clisp/2.44.1.nix +++ b/pkgs/development/interpreters/clisp/2.44.1.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { homepage = http://clisp.cons.org; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + branch = "2.44"; }; } diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix index d9fb32aa43ea..2bcfb2787df6 100644 --- a/pkgs/development/interpreters/perl/5.20/default.nix +++ b/pkgs/development/interpreters/perl/5.20/default.nix @@ -11,11 +11,11 @@ with { }; stdenv.mkDerivation rec { - name = "perl-5.20.0"; + name = "perl-5.20.1"; src = fetchurl { - url = "mirror://cpan/src/${name}.tar.gz"; - sha256 = "00ndpgw4bjing9gy2y6jvs3q46mv2ll6zrxjkhpr12fcdsnji32f"; + url = "mirror://cpan/authors/id/S/SH/SHAY/${name}.tar.gz"; + sha256 = "1dfl4v5fngnkd1c4278gcdjgcapsw7laxq0b34nxrx76z4805wgy"; }; patches = diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index c1d02064fe1c..4de87f20d8ed 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -10,7 +10,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.3.28"; + version = "5.3.29"; name = "php-${version}"; @@ -228,7 +228,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "04w53nn6qacpkd1x381mzd41kqh6k8kjnbyg44yvnkqwcl69db0c"; + sha256 = "1480pfp4391byqzmvdmbxkdkqwdzhdylj63sfzrcgadjf9lwzqf4"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 4f378ddff4f7..4d70ba0e3587 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.32"; + version = "5.4.33"; name = "php-${version}"; @@ -249,7 +249,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "09n8lxnc5p2xfwk0ql2lh183h78hha1axhrdsa6g3650d5v73l16"; + sha256 = "1d8bwiw24k5p34fzkdqv8j8ndq50k2ahv66kdj4bhx2yhg8b4x8s"; }; meta = { diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index 84ae789150da..c2cd71b999e1 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -1,52 +1,33 @@ -x@{builderDefsPackage - , llvm, gmp, mpfr, readline, bison, flex, makeWrapper - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ lib, stdenv, fetchurl, makeWrapper, + llvm, gmp, mpfr, readline, bison, flex }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="pure"; - project="pure-lang"; - version="0.58"; - name="${baseName}-${version}"; - extension="tar.gz"; +stdenv.mkDerivation rec { + baseName="pure"; + project="pure-lang"; + version="0.62"; + name="${baseName}-${version}"; + extension="tar.gz"; + + src = fetchurl { url="https://bitbucket.org/purelang/${project}/downloads/${name}.${extension}"; - hash="180ygv8nmfy8v4696km8jdahn5cnr454sc8i1av7s6z4ss7mrxmi"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256="77df64e8154ef6f8fac66f8bcc471dc8f994862d1ee77b7c98003607757a013b"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall" "doWrap"]; + buildInputs = [ bison flex makeWrapper ]; + propagatedBuildInputs = [ llvm gmp mpfr readline ]; - doWrap = a.makeManyWrappers ''$out/bin/pure'' ''--prefix LD_LIBRARY_PATH : "${llvm}/lib"''; + postInstall = '' + wrapProgram $out/bin/pure --prefix LD_LIBRARY_PATH : ${llvm}/lib + ''; meta = { - description = "A purely functional programming language based on term rewriting"; - maintainers = with a.lib.maintainers; + description = "A modern-style functional programming language based on term rewriting"; + maintainers = with lib.maintainers; [ raskin ]; - platforms = with a.lib.platforms; + platforms = with lib.platforms; linux; - license = a.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; - passthru = { - updateInfo = { - downloadPage = "https://bitbucket.org/purelang/pure-lang/downloads"; - }; - }; -}) x - +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 64e21b755691..3b2239791ae0 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -178,8 +178,6 @@ let deps = [ sqlite ]; }; - ssl = null; - tkinter = buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 ]; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index c19430862c21..cf1d4bdc8da7 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -192,8 +192,6 @@ let deps = [ sqlite ]; }; - ssl = null; - tkinter = buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 libX11 ]; diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 312bf247de7c..4ce659389ec6 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}.1"; + version = "${majorVersion}.2"; fullVersion = "${version}"; buildInputs = filter (p: p != null) [ @@ -31,13 +31,11 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; - sha256 = "1i7dgbzyvj24i6gfhb5q2zwr9nn1ni6w1ig1rcgh96a321is35f5"; + sha256 = "1vrd9gqdqw7rw0kiiprqvng7ywnfc2hbyys7gr9mdh25s619cv8w"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - patches = [ ./issue21121-3.patch ]; - preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity substituteInPlace ./setup.py --replace $i /no-such-path diff --git a/pkgs/development/interpreters/python/3.4/issue21121-3.patch b/pkgs/development/interpreters/python/3.4/issue21121-3.patch deleted file mode 100644 index 506d9ea9b3d9..000000000000 --- a/pkgs/development/interpreters/python/3.4/issue21121-3.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -71,12 +71,17 @@ - BASECFLAGS= @BASECFLAGS@ - BASECPPFLAGS= @BASECPPFLAGS@ - CONFIGURE_CFLAGS= @CFLAGS@ -+# CFLAGS_NODIST is used for building the interpreter and stdlib C extensions. -+# Use it when a compiler flag should _not_ be part of the distutils CFLAGS -+# once Python is installed (Issue #21121). -+CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@ - CONFIGURE_CPPFLAGS= @CPPFLAGS@ - CONFIGURE_LDFLAGS= @LDFLAGS@ - # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the - # command line to append to these values without stomping the pre-set - # values. - PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -+PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST) - # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to - # be able to build extension modules using the directories specified in the - # environment variables -@@ -91,7 +96,7 @@ - # Extra C flags added for building the interpreter object files. - CFLAGSFORSHARED=@CFLAGSFORSHARED@ - # C flags used for building the interpreter object files --PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE -+PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE - - - # Machine-dependent subdirectories -diff --git a/configure b/configure ---- a/configure -+++ b/configure -@@ -662,6 +662,7 @@ - LIBTOOL_CRUFT - OTHER_LIBTOOL_OPT - UNIVERSAL_ARCH_FLAGS -+CFLAGS_NODIST - BASECFLAGS - OPT - ABIFLAGS -@@ -6504,7 +6505,7 @@ - - if test $ac_cv_declaration_after_statement_warning = yes - then -- BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement" -+ CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement" - fi - - # if using gcc on alpha, use -mieee to get (near) full IEEE 754 -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -1147,6 +1147,7 @@ - fi - - AC_SUBST(BASECFLAGS) -+AC_SUBST(CFLAGS_NODIST) - - # The -arch flags for universal builds on OSX - UNIVERSAL_ARCH_FLAGS= -@@ -1231,7 +1232,7 @@ - - if test $ac_cv_declaration_after_statement_warning = yes - then -- BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement" -+ CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement" - fi - - # if using gcc on alpha, use -mieee to get (near) full IEEE 754 -diff --git a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -19,6 +19,12 @@ - - cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ - -+# Add special CFLAGS reserved for building the interpreter and the stdlib -+# modules (Issue #21121). -+cflags = sysconfig.get_config_var('CFLAGS') -+py_cflags_nodist = sysconfig.get_config_var('PY_CFLAGS_NODIST') -+sysconfig.get_config_vars()['CFLAGS'] = cflags + ' ' + py_cflags_nodist -+ - def get_platform(): - # cross build - if "_PYTHON_HOST_PLATFORM" in os.environ: diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix index 6fc4bcb9dea8..a036388f15ee 100644 --- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix +++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix @@ -20,7 +20,22 @@ stdenv.mkDerivation rec { export LIBXUL_DIST=$out ''; - configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ]; + # Explained below in configureFlags for ARM + patches = stdenv.lib.optionals stdenv.isArm [ + ./findvanilla.patch + ]; + + patchFlags = "-p3"; + + # On the Sheevaplug, ARM, its nanojit thing segfaults in japi-tests in + # "make check". Disabling tracejit makes it work, but then it needs the + # patch findvanilla.patch do disable a checker about allocator safety. In case + # of polkit, which is what matters most, it does not override the allocator + # so the failure of that test does not matter much. + configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++ + stdenv.lib.optionals stdenv.isArm [ + "--with-cpu-arch=armv5t" + "--disable-tracejit" ]; # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}"; diff --git a/pkgs/development/interpreters/spidermonkey/findvanilla.patch b/pkgs/development/interpreters/spidermonkey/findvanilla.patch new file mode 100644 index 000000000000..f6dab5497a0a --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/findvanilla.patch @@ -0,0 +1,19 @@ +diff --git a/js/src/Makefile.in b/js/src/Makefile.in +index a85e055..92ef441 100644 +--- a/js/src/Makefile.in ++++ b/js/src/Makefile.in +@@ -580,14 +580,6 @@ check-valgrind:: + $(check-sync-dirs) $(srcdir)/build $(MOZ_SYNC_BUILD_FILES)/build + endif + +-# The "find any vanilla new/new[] calls" script is tailored to Linux, so +-# only run it there. That should be enough to catch any such calls that +-# creep in. +-ifeq ($(OS_ARCH),Linux) +-check:: +- $(srcdir)/config/find_vanilla_new_calls $(LIBRARY) +-endif +- + ifdef ENABLE_TRACEJIT + ifndef WINCE + JITFLAGS = ,m,j,mj,mjp,am,amj,amjp,amd diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index b5ed6f30e34b..699030b8fe53 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, boost, openssl}: stdenv.mkDerivation rec { - name = "asio-1.10.2"; + name = "asio-1.10.4"; src = fetchurl { url = "mirror://sourceforge/asio/${name}.tar.bz2"; - sha256 = "1lqxm3gc8rzzjq0m843l59ggbw32bih7smm5spry1j5khfc86p41"; + sha256 = "0jminwr84wphwpph7j820cql7cbaqlj2zv4gfjk2imazpmlhsfri"; }; propagatedBuildInputs = [ boost ]; diff --git a/pkgs/development/libraries/box2d/2.0.1.nix b/pkgs/development/libraries/box2d/2.0.1.nix index c15e27695ac9..0d1f3bb14ee9 100644 --- a/pkgs/development/libraries/box2d/2.0.1.nix +++ b/pkgs/development/libraries/box2d/2.0.1.nix @@ -72,6 +72,7 @@ rec { platforms = with a.lib.platforms; linux; license = "bsd"; + branch = "2.0.1"; }; passthru = { updateInfo = { diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 3e75cb45a733..ade48cb22888 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }: stdenv.mkDerivation { - name = "ccrtp-2.0.6"; + name = "ccrtp-2.0.9"; src = fetchurl { - url = mirror://gnu/ccrtp/ccrtp-2.0.6.tar.gz; - sha256 = "06rqwk2w5sikfb3l5bcpxszhq4g7ra840gqx1f011xrmhvclrzir"; + url = mirror://gnu/ccrtp/ccrtp-2.0.9.tar.gz; + sha256 = "1prh2niwa4lzvskk12j4ckr7dv141dfh8yjmpkbhbnv4gmpifci0"; }; buildInputs = [ openssl pkgconfig libgcrypt ]; diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix index 0f42e7cd0407..f489e95f5d4f 100644 --- a/pkgs/development/libraries/celt/0.5.1.nix +++ b/pkgs/development/libraries/celt/0.5.1.nix @@ -37,6 +37,7 @@ rec { platforms = with a.lib.platforms; linux; license = "free"; + branch = "0.5.1"; }; passthru = { updateInfo = { diff --git a/pkgs/development/libraries/celt/0.7.nix b/pkgs/development/libraries/celt/0.7.nix index 5c5dae866bb8..35cfae9ebb16 100644 --- a/pkgs/development/libraries/celt/0.7.nix +++ b/pkgs/development/libraries/celt/0.7.nix @@ -37,6 +37,7 @@ rec { platforms = with a.lib.platforms; linux; license = "free"; + branch = "0.7"; }; passthru = { updateInfo = { diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index 4095c1ae2f4b..200bf034dc64 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz; - md5 = "ff4104b0e58bca1b61d528edbd902769"; + sha256 = "1lhbbf5rrqxb44y5clga7iifcfrh8sfjwpj4phnr3qabk92wdn3i"; }; builder = ./builder.sh; diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index 0e584c0d4993..276f1219444a 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "concurrencykit-${version}"; - version = "0.4.3"; + version = "0.4.4"; src = fetchurl { url = "http://concurrencykit.org/releases/ck-${version}.tar.gz"; - sha256 = "1fjdvbj6wazblg6qy0gdqs3kach2y2p6xrcvssmcvxr0nfyaadg2"; + sha256 = "0m3gzv5l7hw3zwhndjjvwmkhh66lvgnk0mspa2s12r1hlzc91zi3"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix index a00fbff50b9e..fb290cbcbeba 100644 --- a/pkgs/development/libraries/dclib/default.nix +++ b/pkgs/development/libraries/dclib/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = ftp://ftp.debian.nl/pub/freebsd/ports/distfiles/dclib-0.3.7.tar.bz2; - md5 = "d35833414534bcac8ce2c8a62ce903a4"; + sha256 = "02jdzm5hqzs1dv2rd596vgpcjaapm55pqqapz5m94l30v4q72rfc"; }; buildInputs = [libxml2 openssl bzip2]; diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index 6317dfe5887d..4ea9f068d39e 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { license = licenses.lgpl3Plus; homepage = http://eigen.tuxfamily.org ; maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; + branch = "2"; }; } diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 6d7d7a838790..dfd2c75184ee 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; - md5 = "b5897e9c664967f5042e57070037ff18"; + sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; }; buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix new file mode 100644 index 000000000000..e100b82ae9ed --- /dev/null +++ b/pkgs/development/libraries/gdcm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + version = "2.4.4"; + name = "gdcm-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; + sha256 = "07svgp7c928sw712gq6rx4h0c6wp2kr1n8fmxjlzb031l51jzkf5"; + }; + + dontUseCmakeBuildDir = true; + preConfigure = '' + cmakeDir=$PWD + mkdir ../build + cd ../build + ''; + + cmakeFlags = '' + -DGDCM_BUILD_APPLICATIONS=ON + -DGDCM_BUILD_SHARED_LIBS=ON + ''; + + enableParallelBuilding = true; + buildInputs = [ cmake ]; + propagatedBuildInputs = [ ]; + + meta = { + description = "The grassroots cross-platform DICOM implementation."; + longDescription = '' + Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly. + GDCM includes a file format definition and a network communications protocol, both of which should be extended to provide a full set of tools for a researcher or small medical imaging vendor to interface with an existing medical database. + ''; + homepage = http://gdcm.sourceforge.net/; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 2b4c291f7f59..99a566cf1955 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "1.6.0"; in +let version = "1.6.2"; in stdenv.mkDerivation { name = "geoip-${version}"; @@ -15,5 +15,7 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.raskin ]; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; + homepage = "http://geolite.maxmind.com/"; + downloadPage = "http://geolite.maxmind.com/download/"; }; } diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 010a2aee88e2..a5b62c6b04ef 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "glm-0.9.5.3"; + name = "glm-0.9.5.4"; src = fetchurl { url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; - sha256 = "0ndwaw2mp7pzcwwm4dghbv5qqax5a8c5plnwdgnpc9adm79gj1rl"; + sha256 = "0v14xssysy3q1h2mga6rqlz722mwbis4rrx76zmvhjqh17qh4l62"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix new file mode 100644 index 000000000000..5a2ff5daa11b --- /dev/null +++ b/pkgs/development/libraries/granite/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: + +stdenv.mkDerivation rec { + majorVersion = "0.3"; + minorVersion = "0"; + name = "granite-${majorVersion}.${minorVersion}"; + src = fetchurl { + url = "https://code.launchpad.net/granite/${majorVersion}/${majorVersion}/+download/${name}.tar.gz"; + sha256 = "1laa109dz7kbd8zxddqw2p1b67yzva7cc5h3smqkj8a9jzbhv5fz"; + }; + cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; + buildInputs = [perl cmake vala pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext]; + meta = { + description = "An extension to GTK+ used by elementary OS"; + longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; + homepage = https://launchpad.net/granite; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.vozz ]; + }; +} diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix index d7a8474bd5b2..137171b77500 100644 --- a/pkgs/development/libraries/haskell/Boolean/default.nix +++ b/pkgs/development/libraries/haskell/Boolean/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Boolean"; - version = "0.2.2"; - sha256 = "1awi9ff2gb9gddalzn2hgp8klvcsizicqpd7xb5fds5j3278qrdz"; + version = "0.2.3"; + sha256 = "1lsm06y7hgjp9qmlr6csf24x3wgna7sbf8dgh6sfl2rhs7fn8kgn"; meta = { description = "Generalized booleans and numbers"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix index ee99ccc4fee6..0b7910a7e0f4 100644 --- a/pkgs/development/libraries/haskell/GLUtil/default.nix +++ b/pkgs/development/libraries/haskell/GLUtil/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "GLUtil"; - version = "0.8.1"; - sha256 = "026w6rsgs0vmjx9fj4x3r93rifdyjygb83spcwmch31a7qng6l7w"; + version = "0.8.2"; + sha256 = "0z8fi4fd0jrywg595cc67w8pqcn7pgy651hxb4zkqb3400n4jak3"; buildDepends = [ cpphs filepath JuicyPixels linear OpenGL OpenGLRaw transformers vector diff --git a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix b/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix index d5cc70855382..46368ec54b75 100644 --- a/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix +++ b/pkgs/development/libraries/haskell/HaskellNet-SSL/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HaskellNet-SSL"; - version = "0.2.4"; - sha256 = "0rwj69rz8i84qj6n1zd9fllp4333azfxppd7blzd486bczzkgkbb"; + version = "0.2.5.1"; + sha256 = "0qkc0bw0p201wi3v8ck348j8m32x9dn8lkf6r787sd1bxhrsd2z7"; buildDepends = [ connection dataDefault HaskellNet network tls ]; meta = { homepage = "https://github.com/dpwright/HaskellNet-SSL"; diff --git a/pkgs/development/libraries/haskell/HaskellNet/default.nix b/pkgs/development/libraries/haskell/HaskellNet/default.nix index 940bdbd678d3..284bdce97376 100644 --- a/pkgs/development/libraries/haskell/HaskellNet/default.nix +++ b/pkgs/development/libraries/haskell/HaskellNet/default.nix @@ -1,12 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, base64String, Crypto, mimeMail, mtl, network, text }: +{ cabal, base64String, cryptohash, mimeMail, mtl, network, text }: cabal.mkDerivation (self: { pname = "HaskellNet"; - version = "0.3.1"; - sha256 = "168w6y5rizszq1428amxbkhww65sy3b7czxpjyrzzq3dhjn517nr"; - buildDepends = [ base64String Crypto mimeMail mtl network text ]; + version = "0.4"; + sha256 = "152ayk35czl8fi2mar1g6c5mi3pikvnpcy967prg97a9vy0ld1yp"; + buildDepends = [ + base64String cryptohash mimeMail mtl network text + ]; meta = { homepage = "https://github.com/jtdaugherty/HaskellNet"; description = "Client support for POP3, SMTP, and IMAP"; diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix index e5b918a5ad55..38fbbfdbfbf8 100644 --- a/pkgs/development/libraries/haskell/NumInstances/default.nix +++ b/pkgs/development/libraries/haskell/NumInstances/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "NumInstances"; - version = "1.3"; - sha256 = "0w1hls5azsg95c0v510xqgr8hs195y2rxzjc7hpjg8q44d4z78sh"; + version = "1.4"; + sha256 = "0ycnwn09izajv330l7a31mc0alifqmxjsn9qmfswwnbg6i4jmnyb"; meta = { homepage = "https://github.com/conal/NumInstances"; description = "Instances of numeric classes for functions and tuples"; diff --git a/pkgs/development/libraries/haskell/WAVE/default.nix b/pkgs/development/libraries/haskell/WAVE/default.nix new file mode 100644 index 000000000000..6082f5e76cf5 --- /dev/null +++ b/pkgs/development/libraries/haskell/WAVE/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, parseargs }: + +cabal.mkDerivation (self: { + pname = "WAVE"; + version = "0.1.3"; + sha256 = "1cgla9y1lwcsdad5qdspymd7s6skdw961fgzh02kvi7gjbrrcyi7"; + isLibrary = true; + isExecutable = true; + buildDepends = [ parseargs ]; + meta = { + homepage = "http://github.com/BartMassey/WAVE"; + description = "WAVE audio file IO library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix index c7067dd66020..ab2e682fdc89 100644 --- a/pkgs/development/libraries/haskell/acid-state/default.nix +++ b/pkgs/development/libraries/haskell/acid-state/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "acid-state"; - version = "0.12.2"; - sha256 = "0hwi2254bj84djxmah23vy3xw8binh75fsn8ac6y89rwc8i35w1f"; + version = "0.12.3"; + sha256 = "099n8a5qxrjzhw0jgmshcpkvynkj2v4a8a6lwy9fvg586nhcy9j1"; buildDepends = [ cereal extensibleExceptions filepath mtl network safecopy stm ]; diff --git a/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix b/pkgs/development/libraries/haskell/aeson/0.8.0.1.nix index de9708f25461..32cc221d5b4a 100644 --- a/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix +++ b/pkgs/development/libraries/haskell/aeson/0.8.0.1.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.8.0.0"; - sha256 = "0p2x03wjawhav87jp57vwclra0gjwn1gqk74zgnji25ypwsvgkk4"; + version = "0.8.0.1"; + sha256 = "0363pzla3kjk2ckmm7j07hav3bgq31jkrya5jhl9dn0nv4l4slxk"; buildDepends = [ attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index b77e31663543..45981490749f 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cairo"; - version = "0.13.0.0"; - sha256 = "1sw1f50kmqln1mkvrr6g85b46dn0ipwnvyl13kxzhq5g581rra92"; + version = "0.13.0.3"; + sha256 = "0jlxgxsby8qscyfq517xlaib8xkp310gbjbmk9yyi7sd5bnmblh9"; buildDepends = [ mtl text utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index af77f37abdb7..906222c3bbb3 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cereal"; - version = "0.4.0.1"; - sha256 = "12g23cbjxxgh3xzv6hvs093zpycl29h8fmc7kv6jx43ws4cxy2jv"; + version = "0.4.1.0"; + sha256 = "0m0iwjf9bds4nwk1rgr19rvjri4kncn37k51l1n9y869r104b8lb"; meta = { description = "A binary serialization library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/clean-unions/default.nix b/pkgs/development/libraries/haskell/clean-unions/default.nix new file mode 100644 index 000000000000..50b8617f6b7e --- /dev/null +++ b/pkgs/development/libraries/haskell/clean-unions/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "clean-unions"; + version = "0.1"; + sha256 = "1nh4gy2ql2h9njvcx05gl2ng8g3hnvyiqq87nnh1xalsvrkh6j0v"; + meta = { + homepage = "https://github.com/fumieval/clean-unions"; + description = "Open unions without need for Typeable"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/clock/default.nix b/pkgs/development/libraries/haskell/clock/default.nix index 60bea4fed839..e97195cb5fc3 100644 --- a/pkgs/development/libraries/haskell/clock/default.nix +++ b/pkgs/development/libraries/haskell/clock/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "clock"; - version = "0.4.1.1"; - sha256 = "0xbhx16sa0rwidaljp8lklb5ifhdc8cccbyznrpxqqwh8icm5pjp"; + version = "0.4.1.3"; + sha256 = "0wqhg8gb10lby01f0v4fl4yp23l4ilizywp5xnsbja03svnb4f0d"; meta = { homepage = "http://corsis.github.com/clock/"; description = "High-resolution clock functions: monotonic, realtime, cputime"; diff --git a/pkgs/development/libraries/haskell/cmdtheline/default.nix b/pkgs/development/libraries/haskell/cmdtheline/default.nix index 8943eacdd217..aa83ae1a0ec6 100644 --- a/pkgs/development/libraries/haskell/cmdtheline/default.nix +++ b/pkgs/development/libraries/haskell/cmdtheline/default.nix @@ -1,13 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, filepath, HUnit, parsec, testFramework, testFrameworkHunit -, transformers +, transformers, fetchpatch }: cabal.mkDerivation (self: { pname = "cmdtheline"; version = "0.2.3"; sha256 = "1jwbr34xgccjbz6nm58bdsg1vqyv87rh45yia5j36vlfbaclyb04"; + doCheck = false; + patches = [ (fetchpatch { url = "https://github.com/eli-frey/cmdtheline/pull/29.patch"; sha256 = "089rfvvjc44wnhph2ricpbz4iifhyvm1qzg8wsd596v81gy0zvrr"; }) ]; buildDepends = [ filepath parsec transformers ]; testDepends = [ filepath HUnit parsec testFramework testFrameworkHunit transformers @@ -18,6 +20,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index 8443a4909fc1..1bcdd8f25e7e 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { async attoparsec blazeBuilder conduit exceptions hspec resourcet stm text transformers transformersBase ]; + doCheck = false; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Batteries included conduit: adapters for common libraries"; diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 5a5ce89f732d..01ea05575652 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "criterion"; - version = "1.0.1.0"; - sha256 = "1mp4rm6jd8g38yyhfrxk1xzhp6mxrwwns9kl6494ylsdpsv0v4ll"; + version = "1.0.2.0"; + sha256 = "02mcb49hiv0gijj5343gffdd3r8hjf4d52llv2gradaijz4zdqhx"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/direct-sqlite/default.nix b/pkgs/development/libraries/haskell/direct-sqlite/default.nix index 07eca858972a..c3be0f888ac2 100644 --- a/pkgs/development/libraries/haskell/direct-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/direct-sqlite/default.nix @@ -4,12 +4,12 @@ cabal.mkDerivation (self: { pname = "direct-sqlite"; - version = "2.3.13"; - sha256 = "0d16jmls41cwyzg91fpd32dv8vvx1v3ilypv1wd7ya8j08fwfvdn"; + version = "2.3.14"; + sha256 = "0xxvr2wln54snkvs2r46fkkn7yhm6i2afgww40vnfqamg8g81x5w"; buildDepends = [ text ]; testDepends = [ base16Bytestring HUnit text ]; meta = { - homepage = "http://ireneknapp.com/software/"; + homepage = "https://github.com/IreneKnapp/direct-sqlite"; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/ekg-carbon/default.nix b/pkgs/development/libraries/haskell/ekg-carbon/default.nix index 06daad669676..2339009a138b 100644 --- a/pkgs/development/libraries/haskell/ekg-carbon/default.nix +++ b/pkgs/development/libraries/haskell/ekg-carbon/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ekg-carbon"; - version = "1.0.1"; - sha256 = "1slaykn1a6f09dzn78v2aqw8snmidycvaw5cfyr4f0ndd88vi77d"; + version = "1.0.2"; + sha256 = "0m8cv2hsn1745f7pj552rp9sjsyfh7fbgjw6k2ippqcbxmhqmf4i"; buildDepends = [ ekgCore network networkCarbon text time unorderedContainers vector ]; diff --git a/pkgs/development/libraries/haskell/ekg-core/default.nix b/pkgs/development/libraries/haskell/ekg-core/default.nix index 2bdf088aea3d..6e2189dbadb6 100644 --- a/pkgs/development/libraries/haskell/ekg-core/default.nix +++ b/pkgs/development/libraries/haskell/ekg-core/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ekg-core"; - version = "0.1.0.1"; - sha256 = "1zha9r43nalxdw22s79mf89fwfzi8lq0q9ldhw7f6c63dnwxyjja"; + version = "0.1.0.2"; + sha256 = "0iipj2q4msawxlvzzikiy7jls22ncbx7v3ldi7y75d52cyl2lmpg"; buildDepends = [ text unorderedContainers ]; meta = { homepage = "https://github.com/tibbe/ekg-core"; diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix index 07c522b98188..4bf39315dad9 100644 --- a/pkgs/development/libraries/haskell/ekg/default.nix +++ b/pkgs/development/libraries/haskell/ekg/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ekg"; - version = "0.4.0.2"; - sha256 = "0svw43dnlg93nyaxiq310sp5csbf0w68ipbhqkxm052yvc9k6fv9"; + version = "0.4.0.3"; + sha256 = "0fynng6r0aj25k4j8ba3fvq4a6kgijil4m9ygd99xq8c1cvj2zyy"; buildDepends = [ aeson ekgCore filepath network snapCore snapServer text time transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix index 3470aab9b2b3..a28c9fc4683c 100644 --- a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix +++ b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "enclosed-exceptions"; - version = "1.0.0.2"; - sha256 = "1jbgqqavkhz2x5br17bdhv17rcmyi7a5mxplakhgyyg73wkjq04h"; + version = "1.0.1"; + sha256 = "1kid1hi392h88a1am0jkm7dhwl3v78lw5wfcyhmh0x454yr3b6zz"; buildDepends = [ async deepseq liftedBase monadControl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix index d3d21aaf27a5..49fb11535a12 100644 --- a/pkgs/development/libraries/haskell/exception-mtl/default.nix +++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix @@ -4,11 +4,11 @@ cabal.mkDerivation (self: { pname = "exception-mtl"; - version = "0.3.0.4"; - sha256 = "16airfs3z1qmx42qww22m21fryr8210m7ji5rgkl2amjvj4lllvc"; + version = "0.3.0.5"; + sha256 = "1rqrh1wbm67w9rbh1gg5zsavlsw9nfw0hnbs9q2djglh73pq3iqj"; buildDepends = [ exceptionTransformers mtl transformers ]; meta = { - homepage = "http://www.eecs.harvard.edu/~mainland/"; + homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Exception monad transformer instances for mtl2 classes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix index e6c778e981d3..2e2f828cb307 100644 --- a/pkgs/development/libraries/haskell/exception-transformers/default.nix +++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix @@ -1,15 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, HUnit, stm, transformers }: +{ cabal, HUnit, stm, testFramework, testFrameworkHunit +, transformers +}: cabal.mkDerivation (self: { pname = "exception-transformers"; - version = "0.3.0.3"; - sha256 = "0z3z5pppaqqbndd4fgv1czr8f9f4a8r86bwc3bcv88yf7y8cfbwz"; + version = "0.3.0.4"; + sha256 = "1m4mwgzynymdjvrrrvl90q468pgwik07yy2lsff9spxhcd43w2ra"; buildDepends = [ stm transformers ]; - testDepends = [ HUnit transformers ]; + testDepends = [ + HUnit testFramework testFrameworkHunit transformers + ]; meta = { - homepage = "http://www.eecs.harvard.edu/~mainland/"; + homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Type classes and monads for unchecked extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix index b35f994caaaf..0eb53c9165ac 100644 --- a/pkgs/development/libraries/haskell/fb/default.nix +++ b/pkgs/development/libraries/haskell/fb/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "fb"; - version = "1.0.5"; - sha256 = "1y4i6w659v4zm6kxz8fnzrwm0gjv7siqlh1wdsm03rcadkicyxmr"; + version = "1.0.6"; + sha256 = "16dwvh2xn14gpni0qpabqfifywrkdz1p0mmq6yyf3k19ix3xg9im"; buildDepends = [ aeson attoparsec base16Bytestring base64Bytestring cereal conduit conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault diff --git a/pkgs/development/libraries/haskell/free-game/default.nix b/pkgs/development/libraries/haskell/free-game/default.nix index ee47e6bb3f5b..acd217f73f61 100644 --- a/pkgs/development/libraries/haskell/free-game/default.nix +++ b/pkgs/development/libraries/haskell/free-game/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "free-game"; - version = "1.1.78"; - sha256 = "11f3ib4nx0madbx58gscaqwc1k5mxw70klrq7z7lac9w61phkws6"; + version = "1.1.79"; + sha256 = "0dlkkcbi7442cbl3ibzy234alaixh34hkc20wr7p75z47w1r5fbx"; buildDepends = [ boundingboxes colors controlBool filepath free freetype2 GLFWB hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL diff --git a/pkgs/development/libraries/haskell/generic-aeson/default.nix b/pkgs/development/libraries/haskell/generic-aeson/default.nix index 7cea462a1cb1..47b2a7d26ad8 100644 --- a/pkgs/development/libraries/haskell/generic-aeson/default.nix +++ b/pkgs/development/libraries/haskell/generic-aeson/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "generic-aeson"; - version = "0.2.0.0"; - sha256 = "0w7bwmbjsskynyfisnhp4piikdw2jkr4zg24c9ipsp28szy8qsb9"; + version = "0.2.0.1"; + sha256 = "0k5zkfmwffdv4q0c9zgysq4654gjwnz1nbl37y8aq7g3rsfzfbf5"; buildDepends = [ aeson attoparsec genericDeriving mtl tagged text unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix index 704c820797ef..a7032f5a2509 100644 --- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -1,12 +1,13 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, binary, transformers }: +{ cabal, binary, deepseq, transformers }: cabal.mkDerivation (self: { pname = "ghc-heap-view"; - version = "0.5.1"; - sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n"; + version = "0.5.3"; + sha256 = "1jcqi4gahxmhd61hl75wgb9dp99kxld68860jnd9x4hnp5cd33q0"; buildDepends = [ binary transformers ]; + testDepends = [ deepseq ]; postInstall = '' ensureDir "$out/share/ghci" ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname" @@ -16,8 +17,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ andres ]; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version; - }; }) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index af4b76f7b780..6235dc711506 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -1,21 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, async, Cabal, convertible, deepseq, djinnGhc, doctest -, emacs, filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint -, hspec, ioChoice, makeWrapper, monadControl, monadJournal, mtl -, split, syb, text, time, transformers, transformersBase +{ cabal, async, Cabal, convertible, dataDefault, deepseq, djinnGhc +, doctest, emacs, filepath, ghcPaths, ghcSybUtils, haskellSrcExts +, hlint, hspec, ioChoice, makeWrapper, monadControl, monadJournal +, mtl, split, syb, text, time, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "5.1.0.2"; - sha256 = "0jdni0n5qzz0ncaa3ja4b6vcfykbl7swiafak4wyvm9izssjh8ra"; + version = "5.1.1.0"; + sha256 = "0msx2x976ap4jx506mzp48sdigc29vq4ypjbxiyn30mjw52rg53w"; isLibrary = true; isExecutable = true; buildDepends = [ - async Cabal convertible deepseq djinnGhc filepath ghcPaths - ghcSybUtils haskellSrcExts hlint ioChoice monadControl monadJournal - mtl split syb text time transformers transformersBase + async Cabal convertible dataDefault deepseq djinnGhc filepath + ghcPaths ghcSybUtils haskellSrcExts hlint ioChoice monadControl + monadJournal mtl split syb text time transformers transformersBase ]; testDepends = [ Cabal convertible deepseq djinnGhc doctest filepath ghcPaths diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 741523011eca..fadc69bae29d 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.7.2.3"; - sha256 = "1gl059n85yxksnq8y7i1vrsjdg4al6himzpdmw95v61y59bbs6c2"; + version = "0.7.2.5"; + sha256 = "15dp34dvcqs3b0np1xpi3s6543svhgmxy1kzggw0rmflmq2whsd8"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot @@ -22,6 +22,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ andres ]; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix index 63468acf27f4..443a15ff7a9e 100644 --- a/pkgs/development/libraries/haskell/gio/default.nix +++ b/pkgs/development/libraries/haskell/gio/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gio"; - version = "0.13.0.0"; - sha256 = "05mycm6nrwwpjflcmm3w33b5nmm6fgyzwzrx1piqazvd1magwcyj"; + version = "0.13.0.1"; + sha256 = "03194npzv48flg6pba3m8c5gfmmy34z0545y84wa979z21fbv22m"; buildDepends = [ glib mtl ]; buildTools = [ gtk2hsBuildtools ]; pkgconfigDepends = [ glib ]; diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 4a17862c966a..57a0b05dcd77 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "glib"; - version = "0.13.0.1"; - sha256 = "0xbv7y1lmy35k6h2cgav7mxvpywvwfw47jq7qkcjj8mmr2sizp8i"; + version = "0.13.0.4"; + sha256 = "1ckl6liw6x4hqirki1vcxrvdca0cf17kpxnngrfnxvndlwghly68"; buildDepends = [ text utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index bb6676916771..03c814d359f1 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtk"; - version = "0.13.0.0"; - sha256 = "04xi1415i3qaiif9ha5wnmyzxxw8ix17zpvvfjn61nrxlk6p973m"; + version = "0.13.0.2"; + sha256 = "0m5gvs2zsm8y742yvfcd8h6qqihgjjyhhz8f4dxg589bhckv3amj"; buildDepends = [ cairo gio glib mtl pango text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index 1fe97ad01aa0..2081f7467d79 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gtk2hs-buildtools"; - version = "0.13.0.1"; - sha256 = "0ngdg44hxpyga9kwm70340c8jhsh9wl5rja3wx9mfx194idivaxa"; + version = "0.13.0.2"; + sha256 = "14yx2v2y3k0cvjsgknff9qbv0pfnbar4j1b1hpz9ygjhb8kd5kjl"; isLibrary = false; isExecutable = true; buildDepends = [ filepath hashtables random ]; diff --git a/pkgs/development/libraries/haskell/gtk3/default.nix b/pkgs/development/libraries/haskell/gtk3/default.nix index 99d76c03c526..c6365eb8000c 100644 --- a/pkgs/development/libraries/haskell/gtk3/default.nix +++ b/pkgs/development/libraries/haskell/gtk3/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtk3"; - version = "0.13.0.0"; - sha256 = "0aq58gf6bcwnk085in0xilg7p8zyd2v079aqk1c47gjyrcg7p78f"; + version = "0.13.0.2"; + sha256 = "0j5df9xah5ya91x3d7cyy5zw7mkw3j2y7n0vv5s78w0adchaxzzl"; isLibrary = true; isExecutable = true; buildDepends = [ cairo gio glib mtl pango text time transformers ]; diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index 393c1f076825..cee7f9737fd0 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtksourceview2"; - version = "0.13.0.0"; - sha256 = "0md4dwg68cgq5qj80rjvsrckwn2ap9d1xp0hy8w1iiyii8dfqcnn"; + version = "0.13.1.0"; + sha256 = "1znmr694jxam9n5lgikrhf8wb4jwdml82a3mgnpfr482a8knndbn"; buildDepends = [ glib gtk mtl text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/here/default.nix b/pkgs/development/libraries/haskell/here/default.nix index 2179ad0d85f0..a7a1527cd1d1 100644 --- a/pkgs/development/libraries/haskell/here/default.nix +++ b/pkgs/development/libraries/haskell/here/default.nix @@ -1,20 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -# The file was later edited to add the state patch. -# https://github.com/np/here/commit/3c16a4e4ce16c08904454972c0d9b43007d1c0cc -{ cabal, haskellSrcMeta, mtl, parsec, fetchpatch }: +{ cabal, haskellSrcMeta, mtl, parsec }: cabal.mkDerivation (self: { pname = "here"; - version = "1.2.5"; - sha256 = "0r7hjsvbx7vshbdhi60955mdfnq6arg5ihfz9f2zyilh4l5cyzwb"; + version = "1.2.6"; + sha256 = "1c7b0a5a42ki8ndvc2k35jnsj433f1nv1j40vviasxksm7acbwif"; buildDepends = [ haskellSrcMeta mtl parsec ]; - patches = [ (fetchpatch { url = "https://github.com/np/here/commit/3c16a4e4ce16c08904454972c0d9b43007d1c0cc.patch"; sha256 = "1qibwbcpnl1cg35zvvdd2k8nr6bgd36qbla3naim3g08qaapm82h"; }) ]; - meta = with self.stdenv.lib; { + meta = { homepage = "https://github.com/tmhedberg/here"; description = "Here docs & interpolated strings via quasiquotation"; - license = licenses.bsd3; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with self.stdenv.lib.maintainers; [ edwtjo ]; }; }) diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix index 9e2e6d93f839..63e92de9424d 100644 --- a/pkgs/development/libraries/haskell/hexpat/default.nix +++ b/pkgs/development/libraries/haskell/hexpat/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hexpat"; - version = "0.20.6"; - sha256 = "02ms6lchj6k0krqjk47bibfb0cbpbc16ip9f22c4rgp04qkzp60b"; + version = "0.20.7"; + sha256 = "03r5j54a250f01km6i8qja1h1k512ds2bp7r0yk2jpbbar2y7c08"; buildDepends = [ deepseq List text transformers utf8String ]; meta = { homepage = "http://haskell.org/haskellwiki/Hexpat/"; diff --git a/pkgs/development/libraries/haskell/ieee754/default.nix b/pkgs/development/libraries/haskell/ieee754/default.nix index 1dd734af6100..de0ce49c83eb 100644 --- a/pkgs/development/libraries/haskell/ieee754/default.nix +++ b/pkgs/development/libraries/haskell/ieee754/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ieee754"; - version = "0.7.3"; - sha256 = "0gq747h15inxbxbgmzmchb9a8p57rhv3bmj69idx5arh0d3whgv0"; + version = "0.7.4"; + sha256 = "1pxbkfa21mvc869n18nn7r29hcinxdbsnk68nlldzld8f6m13g1h"; meta = { homepage = "http://github.com/patperry/hs-ieee754"; description = "Utilities for dealing with IEEE floating point numbers"; diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix index 875759a17eb8..cc62218a928d 100644 --- a/pkgs/development/libraries/haskell/interpolate/default.nix +++ b/pkgs/development/libraries/haskell/interpolate/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, doctest, haskellSrcMeta, hspec, QuickCheck -, quickcheckInstances, text +{ cabal, haskellSrcMeta, hspec, QuickCheck, quickcheckInstances +, text }: cabal.mkDerivation (self: { pname = "interpolate"; - version = "0.0.4"; - sha256 = "0yr0pahb07r7p6d7hb4bqafa64a4jkd37bchr6vkan2zbffwcrcm"; + version = "0.1.0"; + sha256 = "0wlc10qd1bq3xj64a3yq2gzds9kas9zyylkm9kxd46gy35fns6id"; buildDepends = [ haskellSrcMeta ]; testDepends = [ - doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text + haskellSrcMeta hspec QuickCheck quickcheckInstances text ]; meta = { description = "String interpolation done right"; diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix index 962f30de8a09..8c552654bac0 100644 --- a/pkgs/development/libraries/haskell/intervals/default.nix +++ b/pkgs/development/libraries/haskell/intervals/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "intervals"; - version = "0.7"; - sha256 = "00kwq57x72xi5kca7symb98nzs1j82r6bkgvr83aqpvq0ql9ka9d"; + version = "0.7.0.1"; + sha256 = "02qb44ga2yfsymkfixy3fdp943r2flwrsaqhb0pjddr3ixzm4ap9"; buildDepends = [ distributive ]; testDepends = [ doctest filepath ]; meta = { diff --git a/pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix b/pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix deleted file mode 100644 index f7f83cd973e3..000000000000 --- a/pkgs/development/libraries/haskell/libmpd/0.8.0.5.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, attoparsec, dataDefault, filepath, hspec, HUnit, mtl -, network, QuickCheck, text, time, utf8String -}: - -cabal.mkDerivation (self: { - pname = "libmpd"; - version = "0.8.0.5"; - sha256 = "0jxd2xl9imfvb3dz7zqwzx392aw2cb2pl3drx5wkygbywbi5ijhh"; - buildDepends = [ - attoparsec dataDefault filepath mtl network text time utf8String - ]; - testDepends = [ - dataDefault hspec HUnit mtl network QuickCheck text time utf8String - ]; - jailbreak = true; - doCheck = false; - meta = { - homepage = "http://github.com/joachifm/libmpd-haskell#readme"; - description = "An MPD client library"; - license = "LGPL"; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/libmpd/0.9.0.1.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index 6dc0aede0699..6dc0aede0699 100644 --- a/pkgs/development/libraries/haskell/libmpd/0.9.0.1.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix diff --git a/pkgs/development/libraries/haskell/linux-inotify/default.nix b/pkgs/development/libraries/haskell/linux-inotify/default.nix new file mode 100644 index 000000000000..2c5dc577f0ff --- /dev/null +++ b/pkgs/development/libraries/haskell/linux-inotify/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hashable }: + +cabal.mkDerivation (self: { + pname = "linux-inotify"; + version = "0.2.0.1"; + sha256 = "1970v1zkbp45amylmg79bbdfhk8kg6vzxjznd76gfl5kff2cv12r"; + buildDepends = [ hashable ]; + meta = { + description = "Thinner binding to the Linux Kernel's inotify interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/objective/default.nix b/pkgs/development/libraries/haskell/objective/default.nix new file mode 100644 index 000000000000..9ed48a45e923 --- /dev/null +++ b/pkgs/development/libraries/haskell/objective/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cleanUnions, free, transformers }: + +cabal.mkDerivation (self: { + pname = "objective"; + version = "0.4"; + sha256 = "0zcls4b6i5b9yazy6d6fq2vpc6gbq16cqbycyc909bm7kkqzmb86"; + buildDepends = [ cleanUnions free transformers ]; + meta = { + homepage = "https://github.com/fumieval/objective"; + description = "Extensible objects"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix b/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix new file mode 100644 index 000000000000..bef76ab73ee6 --- /dev/null +++ b/pkgs/development/libraries/haskell/optparse-applicative/0.11.0.1.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, ansiWlPprint, transformers, transformersCompat }: + +cabal.mkDerivation (self: { + pname = "optparse-applicative"; + version = "0.11.0.1"; + sha256 = "0jdzajj9w0dghv751m59l3imzm2x9lx9cqb6094mncnx8k6cf6f9"; + buildDepends = [ ansiWlPprint transformers transformersCompat ]; + jailbreak = true; + meta = { + homepage = "https://github.com/pcapriotti/optparse-applicative"; + description = "Utilities and combinators for parsing command line options"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/sdl2/default.nix b/pkgs/development/libraries/haskell/sdl2/default.nix index d60a69ae9281..dc8ef033c028 100644 --- a/pkgs/development/libraries/haskell/sdl2/default.nix +++ b/pkgs/development/libraries/haskell/sdl2/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "sdl2"; - version = "1.1.1"; - sha256 = "0kqs211ksp25pgkzy9rz8zcfi3pqrbl1zmbjh1vx8r2lkf79z1y5"; + version = "1.1.2"; + sha256 = "1viy6f8iqbw264hmsvfqjf8b27h8klyybywd5976yin6ianbqm2a"; extraLibraries = [ SDL2 ]; pkgconfigDepends = [ SDL2 ]; meta = { diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 6deaa209dc87..10659c72266f 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.5.5"; - sha256 = "1865f5z5wm2qf3ccws9jy8ps7n8slkmfgn0l2m9apja3q2jajqb1"; + version = "1.5.6"; + sha256 = "1vnn0s3i3n76286b7rc70qjzgkmfwllpg7w4zin627v6466pfpzl"; buildDepends = [ async enclosedExceptions exceptions liftedAsync liftedBase monadControl mtl systemFileio systemFilepath text time transformers diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index 087871bbc53e..8d30afc77add 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -4,10 +4,10 @@ cabal.mkDerivation (self: { pname = "srcloc"; - version = "0.4.0"; - sha256 = "00af562n4m3nwlhl86x8rx7hhpnhwaijin61wk574pp47bh2jg0k"; + version = "0.4.1"; + sha256 = "0cd15d9dval7zi4li48yd6a3jk62861d4qxwvhxz4a98m63519cz"; meta = { - homepage = "http://www.eecs.harvard.edu/~mainland/"; + homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Data types for managing source code locations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/trivia/default.nix b/pkgs/development/libraries/haskell/trivia/default.nix new file mode 100644 index 000000000000..b32653032b54 --- /dev/null +++ b/pkgs/development/libraries/haskell/trivia/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, comonad, distributive }: + +cabal.mkDerivation (self: { + pname = "trivia"; + version = "0.0"; + sha256 = "03xmzjqwk6492jmmbq6066ymsxb0wk0pmyf0c5f018nfps0g3i78"; + buildDepends = [ comonad distributive ]; + meta = { + homepage = "https://github.com/fumieval/trivia"; + description = "The trivial monad and comonad"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/uri/default.nix b/pkgs/development/libraries/haskell/uri/default.nix index 11276f2bc4ae..633818d9518d 100644 --- a/pkgs/development/libraries/haskell/uri/default.nix +++ b/pkgs/development/libraries/haskell/uri/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "uri"; - version = "0.1.6.2"; - sha256 = "0f2ms8awm4x7pw8ms6in0mxspqmnhv8bxas0947rkrzc5m9k0h3s"; + version = "0.1.6.3"; + sha256 = "1dhmrn4mq3ia0iv3y2k5pw71a6677q3vdqqf2w4b3aksi6wna49j"; buildDepends = [ parsec safe utf8String ]; meta = { homepage = "http://gitorious.org/uri"; diff --git a/pkgs/development/libraries/haskell/webkit/default.nix b/pkgs/development/libraries/haskell/webkit/default.nix index 0d47aeb79551..10cd225cee41 100644 --- a/pkgs/development/libraries/haskell/webkit/default.nix +++ b/pkgs/development/libraries/haskell/webkit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "webkit"; - version = "0.13.0.0"; - sha256 = "152rbb01fq9cxjxqm26s1qcv3nashzymkbjy52ql06y7s1n5i3q5"; + version = "0.13.0.2"; + sha256 = "1dagfc5v5ihg7hm8vkymg1jyhxqhlxb8f4bnbmjcv4sffbm9q14f"; buildDepends = [ cairo glib gtk mtl pango text ]; buildTools = [ gtk2hsBuildtools ]; pkgconfigDepends = [ webkit ]; diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index 2dadfcbfd686..ea3991eebe9d 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yst"; - version = "0.4.1"; - sha256 = "199awgpxn9131a7ijxvvbc4mi1yasnllbpj77k27brx00j87v3nq"; + version = "0.4.1.1"; + sha256 = "0i69pjzrxc330kfy3nvhzf59640h4p9w5lxpjlr31xbl7w1qqx12"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix index e4519c473585..4b7c333c07cc 100644 --- a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "zeromq4-haskell"; - version = "0.6.1"; - sha256 = "14ai6sp39qv6kmj33basnvvfqhzbiqxskv3crjwfdaxbijh23mif"; + version = "0.6.2"; + sha256 = "07dbsapzc4hqq9sg63v4wyjad13sqh9zsx3ckwc5hg5z6vknpafb"; buildDepends = [ async exceptions semigroups transformers ]; testDepends = [ async QuickCheck tasty tastyHunit tastyQuickcheck diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index bb1f6b630845..9d5b11501fc1 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }: let - version = "2.2.1"; + version = "2.3"; in stdenv.mkDerivation { name = "http-parser-${version}"; src = fetchurl { url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "0p8wmchqsj9kwa8pg2is7v0h83q5lqns3vnm6sxrld7gaz979zh5"; + sha256 = "1qnm466wp8zncr8na4xj2wndfzzfiahafhsaigj8cv35nx56pziv"; }; patches = [ ./build-shared.patch ]; diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index 4d94624ce78b..0ea1e96947ea 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -9,6 +9,6 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz; - md5 = "19f27ddd2dda4b2d26a559a4f0f402a7"; + sha256 = "0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97"; }; } diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index 27aaad7598a0..d8193926fef5 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "imlib-1.9.15"; src = fetchurl { url = http://tarballs.nixos.org/imlib-1.9.15.tar.gz; - md5 = "2a5561457e7f8b2e04d88f73508fd13a"; + sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; }; configureFlags = " diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 987e1a25d35f..9477aca59733 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gettext, python, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.51"; + name = "iso-codes-3.56"; src = fetchurl { url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; - sha256 = "0zyp99l4m8cd6301x8zi3xxhziam6v0ic1h8qxb1l0mcjafzf8jj"; + sha256 = "0vnfygd03jg21i7r238n450wy2hp354f3ank0v3k34zchbjydl2m"; }; patchPhase = '' for i in `find . -name \*.py` diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 521118f31757..8bb015a6c5f4 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libtiff, libjpeg, zlib}: stdenv.mkDerivation rec { - name = "lcms2-2.5"; + name = "lcms2-2.6"; src = fetchurl { url = "mirror://sourceforge/lcms/${name}.tar.gz"; - sha256 = "0ax71bmscjzlpmg1r8vj3dypxf2jr7j9qfx5vc8j22j78hmpf9v7"; + sha256 = "1c8lgq8gfs3nyplvbx9k8wzfj6r2bqi3f611vb1m8z3476454wji"; }; propagatedBuildInputs = [ libtiff libjpeg zlib ]; diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 8479551d28d0..21c95066b336 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, perl}: stdenv.mkDerivation rec { - name = "ldns-1.6.16"; + name = "ldns-1.6.17"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz"; - sha256 = "15gn9m95r6sq2n55dw4r87p2aljb5lvy1w0y0br70wbr0p5zkci4"; + sha256 = "1kf8pkwhcssvgzhh6ha1pjjiziwvwmfaali7kaafh6118mcy124b"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix new file mode 100644 index 000000000000..5f0b1ccd18ec --- /dev/null +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "libantlr3c-3.4"; + src = fetchurl { + url = http://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz; + sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; + }; + + configureFlags = if stdenv.is64bit then "--enable-64bit" else ""; + + meta = with stdenv.lib; { + description = "C runtime libraries of ANTLR v3"; + homepage = http://www.antlr3.org/; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 34352484738c..b1a937c1a012 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -13,12 +13,12 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { baseName = "libbluray"; - version = "0.6.0"; + version = "0.6.2"; name = "${baseName}-${version}"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2"; - sha256 = "0zsk16p7rxwbyizm87i7x2fcy3gwjfnlfd2gi2n17fv6gajvsyv2"; + sha256 = "1l2wr9mwz5pikqxlxkjfw3rwz0l1j0n7x9hl80sfiqm1lk41194c"; }; nativeBuildInputs = with stdenv.lib; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 758f86e5f9a5..bc88d8dc12cd 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: -let name = "libbsd-0.3.0"; +let name = "libbsd-0.7.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://libbsd.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "fbf36ed40443e1d0d795adbae8d461952509e610c3ccf0866ae160b723f7fe38"; + url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; + sha256 = "1fqhbi0vd6xjxazf633x388cc8qyn58l78704s0h6k63wlbhwfqg"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index ac7b428bfb00..02dd10841c16 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }: stdenv.mkDerivation rec { - name = "libcdio-0.92"; + name = "libcdio-0.93"; src = fetchurl { - url = "mirror://gnu/libcdio/${name}.tar.gz"; - sha256 = "1b9zngn8nnxb1yyngi1kwi73nahp4lsx59j17q1bahzz58svydik"; + url = "mirror://gnu/libcdio/${name}.tar.bz2"; + sha256 = "1a6x2c5bvpnkn7lhmxkjgz4axmh93m1clrlv41s1wzkc48lnc9zq"; }; buildInputs = [ libcddb pkgconfig ncurses help2man ]; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index bc5f6a1d7a03..afde4e260e8f 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libraw1394, libusb1 }: stdenv.mkDerivation rec { - name = "libdc1394-2.2.1"; + name = "libdc1394-2.2.3"; src = fetchurl { url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; - sha256 = "1wkcx4ff094qba1fwllmlr81i7xg7l8dzq7y7pvy3wlbpwd3634j"; + sha256 = "1p9b4ciy97s04gmp7656cybr1zfd79hlw0ffhfb52m3zcn07h6aa"; }; buildInputs = [ libraw1394 libusb1 ]; diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index 40fa337bd66e..8632da12c735 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libdvdcss-1.2.13"; + name = "libdvdcss-1.3.0"; src = fetchurl { - url = http://download.videolan.org/pub/libdvdcss/1.2.13/libdvdcss-1.2.13.tar.bz2; - sha256 = "0b5s25awn2md4jr00rwg5siwvi3kivyaxkjgfxzzh7ggrykbpwc4"; + url = http://download.videolan.org/pub/libdvdcss/1.3.0/libdvdcss-1.3.0.tar.bz2; + sha256 = "158k9zagmbk5bkbz96l6lwhh7xcgfcnzflkr4vblskhcab6llhbw"; }; meta = { diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index c3c73381acd1..f3ea67ce93e1 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www.libee.org/download/files/download/libee-0.4.1.tar.gz; - md5 = "7bbf4160876c12db6193c06e2badedb2"; + sha256 = "09xhgzmsq0g3jsyj24vy67bhzk2fv971w5ixdkhfwgar70cw1nn0"; }; buildInputs = [pkgconfig libestr]; diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix new file mode 100644 index 000000000000..e628490f159a --- /dev/null +++ b/pkgs/development/libraries/libetpan/default.nix @@ -0,0 +1,24 @@ +{ autoconf, automake, fetchgit, libtool, stdenv, openssl }: + +let version = "1.5"; in + +stdenv.mkDerivation { + name = "libetpan-${version}"; + + meta = with stdenv.lib; { + description = "An efficient, portable library for different kinds of mail access: IMAP, SMTP, POP, and NNTP"; + homepage = http://www.etpan.org/libetpan.html; + license = licenses.bsd3; + platforms = platforms.linux; + }; + + src = fetchgit { + url = "git://github.com/dinhviethoa/libetpan"; + rev = "refs/tags/" + version; + sha256 = "bf9465121a0fb09418215ee3474a400ea5bc5ed05a6811a2978afe4905e140c9"; + }; + + buildInputs = [ autoconf automake libtool openssl ]; + + configureScript = "./autogen.sh"; +} diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 2776a3c0614c..981dcd13a626 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.2"; + name = "libevdev-1.2.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "0h54ym5rsmicl4gx7gcdaifpyndakbl38c5dcxgr27f0cy0635a1"; + sha256 = "0f0yvfg9bwl5xgpcz4kj37l5awcd4l9c78ghxiq3w32gwaz25ibw"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libgdiplus/giflib.patch b/pkgs/development/libraries/libgdiplus/giflib.patch index b1135f47f3ac..7b90d9863fd6 100644 --- a/pkgs/development/libraries/libgdiplus/giflib.patch +++ b/pkgs/development/libraries/libgdiplus/giflib.patch @@ -1,8 +1,7 @@ -diff --git a/src/gifcodec.c b/src/gifcodec.c -index 8dee0eb..564beed 100644 +diff -Naur libgdiplus-2.10.9-orig/src/gifcodec.c libgdiplus-2.10.9/src/gifcodec.c --- src/gifcodec.c +++ src/gifcodec.c -@@ -39,8 +39,10 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0 +@@ -39,8 +39,10 @@ #include "gifcodec.h" @@ -13,7 +12,7 @@ index 8dee0eb..564beed 100644 /* Data structure used for callback */ typedef struct -@@ -105,7 +107,7 @@ gdip_gif_inputfunc (GifFileType *gif, GifByteType *data, int len) +@@ -105,7 +107,7 @@ */ static int @@ -22,7 +21,7 @@ index 8dee0eb..564beed 100644 { ExtensionBlock *ep; -@@ -129,7 +131,7 @@ AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) +@@ -129,7 +131,7 @@ if (ExtData) { memcpy(ep->Bytes, ExtData, Len); @@ -31,7 +30,7 @@ index 8dee0eb..564beed 100644 } return (GIF_OK); -@@ -232,20 +234,20 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *TrailingExtensions) +@@ -232,20 +234,20 @@ } case EXTENSION_RECORD_TYPE: { @@ -55,7 +54,7 @@ index 8dee0eb..564beed 100644 } break; } -@@ -303,12 +305,19 @@ gdip_load_gif_image (void *stream, GpImage **image, BOOL from_file) +@@ -303,12 +305,19 @@ result = NULL; loop_counter = FALSE; @@ -76,7 +75,25 @@ index 8dee0eb..564beed 100644 if (gif == NULL) { goto error; } -@@ -660,11 +669,22 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) +@@ -581,7 +590,7 @@ + } + + FreeExtensionMono(&global_extensions); +- DGifCloseFile (gif); ++ DGifCloseFile (gif, NULL); + + *image = result; + return Ok; +@@ -597,7 +606,7 @@ + + if (gif != NULL) { + FreeExtensionMono (&global_extensions); +- DGifCloseFile (gif); ++ DGifCloseFile (gif, NULL); + } + + *image = NULL; +@@ -660,11 +669,22 @@ return InvalidParameter; } @@ -99,7 +116,7 @@ index 8dee0eb..564beed 100644 if (!fp) { return FileNotFound; -@@ -848,8 +868,15 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) +@@ -848,8 +868,15 @@ Buffer[0] = 1; Buffer[1] = ptr[0]; Buffer[2] = ptr[1]; @@ -115,3 +132,12 @@ index 8dee0eb..564beed 100644 } } +@@ -923,7 +950,7 @@ + } + } + +- EGifCloseFile (fp); ++ EGifCloseFile (fp, NULL); + + return Ok; + diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix new file mode 100644 index 000000000000..cef34fe6db8d --- /dev/null +++ b/pkgs/development/libraries/libibverbs/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libibverbs-1.1.8"; + + src = fetchurl { + url = "https://www.openfabrics.org/downloads/verbs/${name}.tar.gz"; + sha256 = "13w2j5lrrqxxxvhpxbqb70x7wy0h8g329inzgfrvqv8ykrknwxkw"; + }; + + meta = with stdenv.lib; { + homepage = https://www.openfabrics.org/; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 701b4df3cd81..ad578ac272b1 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake }: -let version = "1.0.8"; in +let version = "1.0.9"; in stdenv.mkDerivation rec { name = "liblastfm-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/lastfm/liblastfm/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "17jjhsgbwrzh09i0wcqsnmxzyrqy1png5ixpnx6rbqmhp54a3jn3"; + sha256 = "09qiaxsxw6g2m7mvkffpfsi5wis8nl1x4lgnk0sa30859z54iw53"; }; prefixKey = "--prefix "; diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 10bc9e5eebfe..938c995e755b 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "libmtp-1.1.6"; + name = "libmtp-1.1.8"; propagatedBuildInputs = [ libusb1 ]; buildInputs = [ pkgconfig ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "02nbf1cigxmv9sak201f4m5c1d21q6avgzjlxd941plimy1iq71s"; + sha256 = "10i2vnj8r6hyd61xgyhmxbsissq971g50fhm1h6mc3m4d99qg7iz"; }; meta = { diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index 714870fab160..99c253cdb358 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz"; - md5 = "f4824d0a75bdeeef1e45cc88de7bb58a"; + sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z"; }; meta = { diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 2dce6db1bf26..c17045d5e4be 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }: stdenv.mkDerivation rec { - name = "libofx-0.9.9"; + name = "libofx-0.9.10"; src = fetchurl { url = "mirror://sourceforge/libofx/${name}.tar.gz"; - sha256 = "08vvfj1rq0drcdfchrgb5zp05a2xl3a5aapsfgj0gqy3rp2qivwl"; + sha256 = "15gnbh4mszfxk70srdcjkdykk7dbhzqxi3pxgh48a9zg8i4nmqjl"; }; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix new file mode 100644 index 000000000000..aaa1abacab80 --- /dev/null +++ b/pkgs/development/libraries/libowfat/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libowfat-0.29"; + + src = fetchurl { + url = "http://dl.fefe.de/${name}.tar.bz2"; + sha256 = "09v4phf1d4y617fdqwn214jmkialf7xqcsyx3rzk7x5ysvpbvbab"; + }; + + makeFlags = "prefix=$(out)"; + + meta = with stdenv.lib; { + homepage = http://www.fefe.de/libowfat/; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix new file mode 100644 index 000000000000..a3b549e83b4b --- /dev/null +++ b/pkgs/development/libraries/libqb/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig }: + +stdenv.mkDerivation rec{ + name = "libqb-0.16.0"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/q/u/quarterback/${name}.tar.xz"; + sha256 = "0j3zl5g5nnx98jb16p89q8w61har3gbvnlnmma8yj31xngps3kdq"; + }; + + buildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + homepage = https://github.com/clusterlabs/libqb; + description = "a library providing high performance logging, tracing, ipc, and poll"; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix new file mode 100644 index 000000000000..0f5500478b4d --- /dev/null +++ b/pkgs/development/libraries/librdmacm/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, libibverbs }: + +stdenv.mkDerivation rec { + name = "librdmacm-1.0.19.1"; + + src = fetchurl { + url = "https://www.openfabrics.org/downloads/rdmacm/${name}.tar.gz"; + sha256 = "0aq9x2aq62j9qn5yqifp4f2y7w2l35571ns260bwd2c60jf5fjlm"; + }; + + buildInputs = [ libibverbs ]; + + meta = with stdenv.lib; { + homepage = https://www.openfabrics.org/; + platforms = platforms.unix; + license = licenses.bsd2; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix new file mode 100644 index 000000000000..32fec68ad012 --- /dev/null +++ b/pkgs/development/libraries/libsieve/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: +stdenv.mkDerivation rec { + version = "2.3.1"; + name = "libsieve-${version}"; + + src = fetchurl { + url = "https://github.com/downloads/sodabrew/libsieve/libsieve-${version}.tar.gz"; + sha256 = "1gllhl9hbmc86dq3k98d4kjs5bwk0p2rlk7ywqj3fjn7jw6mbhcj"; + }; + + meta = with stdenv.lib; { + description = "An interpreter for RFC 3028 Sieve and various extensions"; + homepage = "http://sodabrew.com/libsieve/"; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix new file mode 100644 index 000000000000..36327327b4dd --- /dev/null +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libstatgrab-0.91"; + + src = fetchurl { + url = "http://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz"; + sha256 = "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83"; + }; + + meta = with stdenv.lib; { + homepage = http://www.i-scream.org/libstatgrab/; + description = "a library that provides cross platforms access to statistics about the running system"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index f6bdbdb3c75f..da6c61b064e9 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -37,13 +37,14 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf libtool automake libsodium ncurses - libconfig pkgconfig + check libconfig pkgconfig ] ++ stdenv.lib.optionals (!stdenv.isArm) [ libopus ]; propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ]; + # Some tests fail in the Sheevaplug due to timeout doCheck = !stdenv.isArm; meta = { diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index 64ef4ed66b6d..ac06b4893f1e 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/libusb/libusb-0.1.12.tar.gz; - md5 = "caf182cbc7565dac0fd72155919672e6"; + sha256 = "0i4bacxkyr7xyqxbmb00ypkrv4swkgm0mghbzjsnw6blvvczgxip"; }; } diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index afce119e3961..09d2e9dfc43c 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libvirt-glib-0.1.8"; + name = "libvirt-glib-0.1.9"; src = fetchurl { url = "http://libvirt.org/sources/glib/${name}.tar.gz"; - sha256 = "0ld7g9vlpdzx8rm90i8y1gnpygkn20x5z12gvsgms7dy5nala3ns"; + sha256 = "0n59hp0kwn80z9136g2n7pwkrlhlsxksr6gy4w7783d71qk3cfq5"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index a4c8c167b39a..deba645a39b9 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -2,16 +2,19 @@ , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng , dnsmasq, libnl +, pythonPackages }: -let version = "1.2.7"; in +let version = "1.2.9"; in + +assert version == pythonPackages.libvirt.version; stdenv.mkDerivation rec { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.gz"; - sha256 = "1z6yfzzbf9rvqjq1my7x1br73g8dz8kij3khpb4x520ip8n4dyrx"; + sha256 = "1i4ggs50dipz1hm0qlk6kak1n3klll8sx9fnffmvjlgla9d1m4wm"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index 25c2117b059d..106106c0915f 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "1.11"; + version = "1.12"; name = "libyubikey-${version}"; src = fetchurl { url = "http://opensource.yubico.com/yubico-c/releases/${name}.tar.gz"; - sha256 = "19pm4rqsnm9r0n5j26bqkxa1jpimdavzcvg5g7p416vkjhxc6lw9"; + sha256 = "1f0plzmr1gwry4rfgq9q70v6qwqny009hac289ad5m6sj7vqflxr"; }; meta = diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index ae9f3fc6c18d..5c67aaa4c197 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/loudmouth/1.4/${name}.tar.bz2"; - md5 = "55339ca42494690c3942ee1465a96937"; + sha256 = "1qr9z73i33y49pbpq6zy7q537g0iyc8sm56rjf0ylwcv01fkzacm"; }; patches = [ ./glib-2.32.patch ]; diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 2d37a2506c4f..7fbd44b3fa4a 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = "mirror://sourceforge/martyr/martyr-0.3.9.tar.gz"; - md5 = "b716a6aaabd5622b65d6126438766260"; + sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; }; inherit stdenv apacheAnt; } diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index 419978a10117..844c2e580093 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -2,7 +2,7 @@ , gst_plugins_base }: let - version = "4.7.0"; + version = "4.7.2"; pname = "phonon-backend-gstreamer"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0zg7hnaywk9wpcvzgskx2334cgfz09ii77pvasrn00ikcqqnnxrs"; + sha256 = "1cfjk450aajr8hfhnfq7zbmryprxiwr9ha5x585dsh7mja82mdw0"; }; buildInputs = [ phonon qt4 gstreamer gst_plugins_base ]; diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix index 060f4c45a486..8a196463639c 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix @@ -2,7 +2,7 @@ let pname = "phonon-backend-vlc"; - v = "0.7.0"; + v = "0.7.2"; vlc_ = vlc.override { inherit qt4; }; #Force using the same qt version in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz"; - sha256 = "1rhzc3d188l6ygxgfxwikscj71pyy0nchzikvkkq465r9ajavdgd"; + sha256 = "1acmbn8pmmq16gcz825dlzaf3haj6avp1bmcxzpkjd1fvxh86y0a"; }; nativeBuildInputs = [ cmake pkgconfig automoc4 xz ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index b29deae9260c..7fd99ab0244a 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, automoc4, qt4, pulseaudio }: let - v = "4.7.1"; + v = "4.7.2"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${v}/${name}.tar.xz"; - sha256 = "0pdpj7xnalr511zx12akxg6smz7x5gybkpliclb5f5dcxqnq1xsg"; + sha256 = "1ghidabmi6vnnmz8q272qi259nb8bbqlbayqk52ln98fs8s9g7l1"; }; buildInputs = [ qt4 pulseaudio ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 083c9bae6b5b..c29da1438f39 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,8 +4,8 @@ }: let - version = "0.26.3"; # even major numbers are stable - sha256 = "1ca2lrwvhxzq0g4blbvq099vyydfjyz839jki301p1jgazrimjw8"; + version = "0.26.5"; # even major numbers are stable + sha256 = "1vni6kqpcx4jy9q8mhhxphfjych76xxmgs3jyg8yacbl6gxfazfy"; qtcairo_patches = let qtcairo = fetchgit { # the version for poppler-0.24 diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 15e89d9210a1..55ae69e6e643 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://samba.org/ftp/talloc/${name}.tar.gz"; - md5 = "c6e736540145ca58cb3dcb42f91cf57b"; + sha256 = "1d694zyi451a5zr03l5yv0n8yccyr3r8pmzga17xaaaz80khb0av"; }; configureFlags = "--enable-talloc-compat1 --enable-largefile"; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index f8c437f2b0f1..4f2b6ec49d7c 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { description = "Library for scalable cross-language services"; homepage = http://thrift.apache.org/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index d74a85a9162d..2fa3a58e8fb3 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, libuuid, zlib }: stdenv.mkDerivation { - name = "xapian-1.2.8"; + name = "xapian-1.3.1"; src = fetchurl { - url = http://oligarchy.co.uk/xapian/1.2.8/xapian-core-1.2.8.tar.gz; - sha256 = "00411ebac66a5592b87fc57ccfeb234c84b929ed23c185befb5df9929df3d4f9"; + url = http://oligarchy.co.uk/xapian/1.3.1/xapian-core-1.3.1.tar.gz; + sha256 = "03z31z0xpj9a4aryr5hcq3y8wwv8qc1dn487ahzkfgir7rv0zvk4"; }; buildInputs = [ libuuid zlib ]; + configureFlags = [ "--program-suffix=" ]; + meta = { description = "Search engine library"; homepage = "http://xapian.org"; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 80f4e2fc8604..3fba451c7111 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool }: let - version = "1.2.19"; + version = "1.2.20"; in stdenv.mkDerivation rec { name = "xmlsec-${version}"; src = fetchurl { url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "1h5ar0h8n0l8isgic82w00cwfpw7i9wxw17kbdb6q3yvzb4zgj1g"; + sha256 = "01bkbv2y3x8d1sf4dcln1x3y2jyj391s3208d9a2ndhglly5j89j"; }; buildInputs = [ libxml2 gnutls libxslt pkgconfig libgcrypt libtool ]; diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 2b3bb3339481..114482655751 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { src = if stdenv.system == "i686-linux" then fetchurl { url = "http://dl.google.com/android/ndk/${name}-linux-x86.tar.bz2"; - md5 = "6c1d7d99f55f0c17ecbcf81ba0eb201f"; + sha256 = "0lrxx8rclmda72dynh0qjr6xpcnv5vs3gc96jcia37h8mmn2xv6m"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.tar.bz2"; - md5 = "c7c775ab3342965408d20fd18e71aa45"; + sha256 = "16miwrnf3c7x7rlpmssmjx9kybmapsjyamjyivhabb2wm21x3q8l"; } else throw "platform not ${stdenv.system} supported!"; diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 6c71116b5e81..34edc10913b5 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.2.3.GA"}: +{pkgs, pkgs_i686, xcodeVersion ? "6.0", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.4.0.GA"}: let # We have to use Oracle's JDK. On Darwin, just simply expose the host system's @@ -25,12 +25,14 @@ rec { xcodeenv = if pkgs.stdenv.system == "x86_64-darwin" then pkgs.xcodeenv.override { version = xcodeVersion; + inherit xcodeBaseDir; } else null; titaniumsdk = let titaniumSdkFile = if tiVersion == "3.1.4.GA" then ./titaniumsdk-3.1.nix else if tiVersion == "3.2.3.GA" then ./titaniumsdk-3.2.nix else if tiVersion == "3.3.0.GA" then ./titaniumsdk-3.3.nix + else if tiVersion == "3.4.0.GA" then ./titaniumsdk-3.4.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index d595db408178..13198922c754 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -1,7 +1,8 @@ { nixpkgs ? <nixpkgs> , systems ? [ "x86_64-linux" "x86_64-darwin" ] -, xcodeVersion ? "5.0" -, tiVersion ? "3.2.3.GA" +, xcodeVersion ? "6.0.1" +, xcodeBaseDir ? "/Applications/Xcode.app" +, tiVersion ? "3.4.0.GA" , rename ? false , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "" , allowUnfree ? false @@ -18,7 +19,7 @@ rec { in import ./kitchensink { inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; inherit tiVersion; target = "android"; }); @@ -29,7 +30,7 @@ rec { in import ./kitchensink { inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; inherit tiVersion; target = "android"; release = true; @@ -60,21 +61,21 @@ rec { rec { kitchensink_ios_development = import ./kitchensink { inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; inherit tiVersion; target = "iphone"; }; simulate_kitchensink_iphone = import ./simulate-kitchensink { inherit (pkgs) stdenv; - xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; }; + xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; }; kitchensink = kitchensink_ios_development; device = "iPhone"; }; simulate_kitchensink_ipad = import ./simulate-kitchensink { inherit (pkgs) stdenv; - xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; }; + xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; }; kitchensink = kitchensink_ios_development; device = "iPad"; }; @@ -85,7 +86,7 @@ rec { { kitchensink_ipa = import ./kitchensink { inherit (pkgs) stdenv fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; }; + titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; target = "iphone"; inherit tiVersion; release = true; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix new file mode 100644 index 000000000000..1baf57a94cfb --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix @@ -0,0 +1,77 @@ +{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: + +stdenv.mkDerivation { + name = "mobilesdk-3.4.0.GA"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com/mobile/3.4.0/mobilesdk-3.4.0.GA-linux.zip; + sha1 = "c281a3a3f3af35adc95fc00dcd525b84516c2083"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com/mobile/3.4.0/mobilesdk-3.4.0.GA-osx.zip; + sha1 = "2f10426462e5f8e487be83c8038f2934d5079f0d"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + yes y | unzip $src + + # Fix shebang header for python scripts + + find . -name \*.py | while read i + do + sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i + done + + # Rename ugly version number + cd mobilesdk/* + cd 3.4.0.GA + + # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that + # Yes, I know it's nasty :-) + + cd android + + sed -i -f ${./fixtiverify.sed} builder.py + sed -i -f ${./fixtiprofiler.sed} builder.py + sed -i -f ${./fixso.sed} builder.py + sed -i -f ${./fixnativelibs.sed} builder.py + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 + '' + else ""} + + # Wrap builder script + + mv builder.py .builder.py + cat > builder.py <<EOF + #!${python}/bin/python + + import os, sys + + os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)' + os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}' + + os.execv('$(pwd)/.builder.py', sys.argv) + EOF + + chmod +x builder.py + + '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work. + sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py + + sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js + ''; +} diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index 6af7ce250772..48aaf9725037 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, ocaml, findlib}: stdenv.mkDerivation { - name = "ocaml-calendar-2.03.2"; + name = "ocaml-calendar-2.5"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/915/calendar-2.03.2.tar.gz; + url = https://forge.ocamlcore.org/frs/download.php/915/calendar-2.5.tar.bz2; sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f"; }; diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index ff344ef6f327..e3ab1d37b15a 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "camlimages"; version = "4.0.1"; in @@ -14,9 +13,9 @@ stdenv.mkDerivation { sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; }; - buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng giflib freetype libXpm ]; + buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ]; - propagatedbuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; + propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; createFindlibDestdir = true; @@ -32,12 +31,10 @@ stdenv.mkDerivation { omake install ''; - #makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib"; - - meta = { - homepage = http://cristal.inria.fr/camlimages; - description = "Image manipulation library"; - license = stdenv.lib.licenses.gpl2; -# maintainers = [ stdenv.lib.maintainers.roconnor ]; + meta = with stdenv.lib; { + homepage = https://bitbucket.org/camlspotter/camlimages; + description = "OCaml image processing library"; + license = licenses.lgpl2; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 8b611c65a41d..59da5473ab10 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib}: +{stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "070xw033r4pk6f4l0wcknm75y9qm4mp622a4cgzmcfhm58v6kssn"; }; - buildInputs = [ocaml_pcre ocamlnet ocaml findlib]; + buildInputs = [ocaml_pcre ocamlnet ocaml findlib camlp4]; createFindlibDestdir = true; @@ -30,10 +30,10 @@ stdenv.mkDerivation { make all opt ''; - meta = { + meta = with stdenv.lib; { homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/"; description = "do it yourself (OCaml) HTTP daemon"; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + license = licenses.lgpl2; + maintainers = with maintainers; [ roconnor vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgl/META.patch b/pkgs/development/ocaml-modules/lablgl/META.patch new file mode 100644 index 000000000000..bf5b2184ac0a --- /dev/null +++ b/pkgs/development/ocaml-modules/lablgl/META.patch @@ -0,0 +1,18 @@ +diff -r 562eb6ecb8ca META +--- a/META Wed Oct 01 20:09:24 2014 +0100 ++++ b/META Wed Oct 01 20:22:15 2014 +0100 +@@ -1,6 +1,5 @@ +-description "Bindings for OpenGL" ++description="Bindings for OpenGL" + version="1.05" +-directory="+lablGL" + archive(byte) = "lablgl.cma" + archive(native) = "lablgl.cmxa" + +@@ -16,4 +15,4 @@ + requires = "lablgl" + archive(byte) = "lablglut.cma" + archive(native) = "lablglut.cmxa" +-) +\ No newline at end of file ++) diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 7cefe26746f8..115f66ab9834 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut } : +{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } : let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,9 +14,10 @@ stdenv.mkDerivation { sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; }; - buildInputs = [ocaml findlib lablgtk mesa freeglut ]; + buildInputs = [ocaml findlib lablgtk freeglut camlp4]; + propagatedBuildInputs = [ mesa ]; - patches = [ ./Makefile.config.patch ]; + patches = [ ./Makefile.config.patch ./META.patch ]; preConfigure = '' substituteInPlace Makefile.config \ @@ -35,10 +36,10 @@ stdenv.mkDerivation { cp ./META $out/lib/ocaml/${ocaml_version}/site-lib/lablgl ''; - meta = { + meta = with stdenv.lib; { homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; description = "OpenGL bindings for ocaml"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.pSub ]; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 7499be9c5dd3..19b0bf63ee39 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -3,16 +3,16 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgtk"; - version = "2.16.0"; + version = "2.18.2"; in assert stdenv.lib.versionAtLeast ocaml_version "3.12"; -stdenv.mkDerivation (rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/979/${name}.tar.gz"; - sha256 = "a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f"; + url = https://forge.ocamlcore.org/frs/download.php/1456/lablgtk-2.18.2.tar.gz; + sha256 = "0f9rs4av0v7p5k8hifcq4b49xx8jmmfch3sdk9pij8a8jfgwxvfy"; }; buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4]; @@ -25,14 +25,13 @@ stdenv.mkDerivation (rec { export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH ''; - meta = { + meta = with stdenv.lib; { platforms = ocaml.meta.platforms; - maintainers = [ - stdenv.lib.maintainers.z77z - stdenv.lib.maintainers.roconnor + maintainers = with maintainers; [ + z77z roconnor vbgl ]; - homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html; - description = "LablGTK is is an Objective Caml interface to gtk+"; - license = stdenv.lib.licenses.lgpl21Plus; + homepage = http://lablgtk.forge.ocamlcore.org/; + description = "An OCaml interface to gtk+"; + license = licenses.lgpl21Plus; }; -}) +} diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix new file mode 100644 index 000000000000..f2d13ad1f137 --- /dev/null +++ b/pkgs/development/ocaml-modules/macaque/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, ocaml, findlib, pgocaml, camlp4}: + +stdenv.mkDerivation { + name = "ocaml-macaque-0.7.1"; + src = fetchurl { + url = https://github.com/ocsigen/macaque/archive/0.7.1.tar.gz; + sha256 = "0wnq3pgpcrfpivr8j7p827rhag6hdx0yr0bdvma0hw1g30vwf9qa"; + }; + + buildInputs = [ ocaml findlib camlp4 ]; + propagatedBuildInputs = [ pgocaml ]; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + description = "Macros for Caml Queries"; + homepage = https://github.com/ocsigen/macaque; + license = licenses.lgpl2; + platforms = ocaml.meta.platforms; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index 5f72afcf7666..bfffb67d4b0e 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, ounit}: +{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, ounit, camlp4}: stdenv.mkDerivation { name = "ocaml-data-notation-0.0.11"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; }; - buildInputs = [ocaml findlib ocaml_typeconv ounit]; + buildInputs = [ocaml findlib ocaml_typeconv ounit camlp4]; createFindlibDestdir = true; @@ -16,13 +16,13 @@ stdenv.mkDerivation { buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; - meta = { + meta = with stdenv.lib; { description = "Store data using OCaml notation"; homepage = https://forge.ocamlcore.org/projects/odn/; - license = stdenv.lib.licenses.lgpl21; + license = licenses.lgpl21; platforms = ocaml.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ - z77z + maintainers = with maintainers; [ + vbgl z77z ]; }; } diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix new file mode 100644 index 000000000000..f1166d1c3249 --- /dev/null +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, ocaml, findlib, camlp4, calendar, csv, ocaml_pcre}: + +stdenv.mkDerivation { + name = "ocaml-pgocaml-2.1"; + src = fetchurl { + url = http://forge.ocamlcore.org/frs/download.php/1413/pgocaml-2.1.tgz; + sha256 = "0m7whlmhm7z58pfaarvkyiwaylmrz05aj6fr773zd9xlv07ljiym"; + }; + + buildInputs = [ocaml findlib camlp4]; + propagatedBuildInputs = [calendar csv ocaml_pcre]; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + description = "An interface to PostgreSQL databases for OCaml applications"; + homepage = http://pgocaml.forge.ocamlcore.org/; + license = licenses.lgpl2; + platforms = ocaml.meta.platforms; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix new file mode 100644 index 000000000000..eecae885302f --- /dev/null +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, ocaml, findlib, ocaml_react, opam}: + +let + ocamlVersion = stdenv.lib.getVersion ocaml; +in + +assert stdenv.lib.versionAtLeast ocamlVersion "3.11"; + +stdenv.mkDerivation { + name = "ocaml-reactiveData-0.1"; + src = fetchurl { + url = https://github.com/hhugo/reactiveData/archive/0.1.tar.gz; + sha256 = "056y9in6j6rpggdf8apailvs1m30wxizpyyrj08xyfxgv91mhxgw"; + }; + + buildInputs = [ocaml findlib opam]; + propagatedBuildInputs = [ocaml_react]; + + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; + + installPhase = '' + opam-installer --script --prefix=$out reactiveData.install > install.sh + sed -i s!lib/reactiveData!lib/ocaml/${ocamlVersion}/site-lib/reactiveData! install.sh + sh install.sh + ''; + + meta = with stdenv.lib; { + description = "An OCaml module for functional reactive programming (FRP) based on React"; + homepage = https://github.com/hhugo/reactiveData; + license = licenses.lgpl21; + platforms = ocaml.meta.platforms; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 9a495002f1de..ad75b4a3dac0 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -2,7 +2,7 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.4.4"; + version = "0.4.7"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://debian/pool/main/o/ocaml-ssl/ocaml-ssl_${version}.orig.tar.gz"; - sha256 = "1m45d0bd4ndxswaa1symp6c1npzjmm9pz0nf7w0q15gflqhba5ch"; + sha256 = "0i0j89b10n3xmmawcq4qfwa42133pddw4x5nysmsnpd15srv5gp9"; }; buildInputs = [which openssl ocaml findlib]; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 10ac88bcb90b..2f679da977d7 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -3,13 +3,16 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; in + +assert stdenv.lib.versionAtLeast ocaml_version "3.12.1"; + stdenv.mkDerivation rec { name = "zarith-${version}"; - version = "1.2.1"; + version = "1.3"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/1199/${name}.tgz"; - sha256 = "0i21bsx41br0jgw8xmlpnky5zamzqkpbykrq0z53z7ar77602s4i"; + url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz; + sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll"; }; buildInputs = [ ocaml findlib pkgconfig gmp perl ]; @@ -22,11 +25,11 @@ stdenv.mkDerivation rec { ''; preInstall = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib"; - meta = { + meta = with stdenv.lib; { description = "fast, arbitrary precision OCaml integers"; homepage = "http://forge.ocamlcore.org/projects/zarith"; - license = stdenv.lib.licenses.lgpl2; + license = licenses.lgpl2; platforms = ocaml.meta.platforms; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice vbgl ]; }; } diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index 62c282949aab..8eb44095e084 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/pkgs/development/pharo/vm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xlibs, alsaLib }: +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xlibs, alsaLib, cairo }: stdenv.mkDerivation rec { @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { unzip ${sources30Zip} -d $prefix/lib/pharo-vm/ ''; - buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xlibs.libX11 xlibs.libICE xlibs.libSM alsaLib ]; + buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xlibs.libX11 xlibs.libICE xlibs.libSM alsaLib cairo ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; @@ -98,4 +98,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.DamienCassou ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix new file mode 100644 index 000000000000..9e82580018fc --- /dev/null +++ b/pkgs/development/tools/golint/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "golint"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o lint github.com/golang/lint/golint + ''; + + installPhase = '' + mkdir -p $out/bin + mv lint $out/bin/golint + ''; + + meta = with lib; { + description = "Linter for Go source code."; + homepage = https://github.com/golang/lint; + license = licenses.mit; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/golint/deps.nix b/pkgs/development/tools/golint/deps.nix new file mode 100644 index 000000000000..47b8ade22982 --- /dev/null +++ b/pkgs/development/tools/golint/deps.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/golang/lint"; + src = fetchFromGitHub { + owner = "golang"; + repo = "lint"; + rev = "8ca23475bcb43213a55dd8210b69363f6b0e09c1"; + sha256 = "16wbykik6dw3x9s7iqi4ln8kvzsh3g621wb8mk4nfldw7lyqp3cs"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix new file mode 100644 index 000000000000..5fec8c181a89 --- /dev/null +++ b/pkgs/development/tools/gotags/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gotags"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o gotags github.com/jstemmer/gotags + ''; + + installPhase = '' + mkdir -p $out/bin + mv gotags $out/bin + ''; + + meta = with lib; { + description = "Ctags-compatible tag generator for Go"; + homepage = https://github.com/nsf/gotags; + license = licenses.mit; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/gotags/deps.nix b/pkgs/development/tools/gotags/deps.nix new file mode 100644 index 000000000000..97e77bdd977e --- /dev/null +++ b/pkgs/development/tools/gotags/deps.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/jstemmer/gotags"; + src = fetchFromGitHub { + owner = "jstemmer"; + repo = "gotags"; + rev = "a60c6a1b171faedc44354bd437d965e5e3bdc220"; + sha256 = "1drbypby0isdmkq44jmlv59k3jrwvq2jciaccxx2qc2nnx444fkq"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix index 4acc8f38f175..4a2ed055cf8f 100644 --- a/pkgs/development/tools/haskell/BNFC/default.nix +++ b/pkgs/development/tools/haskell/BNFC/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, alex, deepseq, filepath, happy, hspec, HUnit, mtl +{ cabal, alex, deepseq, doctest, filepath, happy, hspec, HUnit, mtl , QuickCheck, temporary }: cabal.mkDerivation (self: { pname = "BNFC"; - version = "2.7.0.1"; - sha256 = "18009jrpd5kcaz06j4ksay4c7c65m4zrc7jrp3rjx81bs6gkrwk1"; + version = "2.7.1"; + sha256 = "1n9l64wzga3i7ifh2k5rwhxp60gb0av5fszygw5mvr31r64cf4fp"; isLibrary = true; isExecutable = true; buildDepends = [ deepseq filepath mtl ]; testDepends = [ - deepseq filepath hspec HUnit mtl QuickCheck temporary + deepseq doctest filepath hspec HUnit mtl QuickCheck temporary ]; buildTools = [ alex happy ]; meta = { diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 07ba2a4a09ec..044ebfad4346 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -14,7 +14,7 @@ cabal.mkDerivation (self: { Cabal filepath hackageDb mtl regexPosix transformers ]; testDepends = [ doctest ]; - doCheck = self.stdenv.lib.versionOlder "7.6" self.ghc.version; + doCheck = self.stdenv.lib.versionOlder "7.8" self.ghc.version; meta = { homepage = "http://github.com/NixOS/cabal2nix"; description = "Convert Cabal files into Nix build instructions"; diff --git a/pkgs/development/tools/haskell/hsb2hs/default.nix b/pkgs/development/tools/haskell/hsb2hs/default.nix new file mode 100644 index 000000000000..9efebdf1db76 --- /dev/null +++ b/pkgs/development/tools/haskell/hsb2hs/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, preprocessorTools }: + +cabal.mkDerivation (self: { + pname = "hsb2hs"; + version = "0.2"; + sha256 = "013n3l80449wxmbfmcidg8mdjk4nkxv7s3jcbfy5g4jps6gsg1fx"; + isLibrary = false; + isExecutable = true; + buildDepends = [ filepath preprocessorTools ]; + meta = { + description = "Preprocesses a file, adding blobs from files as string literals"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix index a07383778ed1..bcc7b7c35d69 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "timeplot"; - version = "1.0.25"; - sha256 = "14zyzr53gpp0i7wx49zzdrndqdhsw3q4z3w5hdl8c4m541pr25fw"; + version = "1.0.27"; + sha256 = "072bxa0pfxyia4xvj0w0h8v3yfk05bbq5j905sj6jf9apjr9h558"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -20,7 +20,5 @@ cabal.mkDerivation (self: { description = "A tool for visualizing time series from log files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 8194ffc22a81..76e74d7623e9 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { description = ''A lightweight and flexible command-line JSON processor''; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix index 23b781902e7b..9d84011e3657 100644 --- a/pkgs/development/tools/misc/epm/default.nix +++ b/pkgs/development/tools/misc/epm/default.nix @@ -1,17 +1,21 @@ {stdenv, fetchurl, rpm}: -stdenv.mkDerivation { - name = "epm-4.1"; +stdenv.mkDerivation rec { + name = "epm-${version}"; + version = "4.2"; src = fetchurl { - url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/epm/4.1/epm-4.1-source.tar.bz2; - sha256 = "18xq1h9hx410x28bfccabydrqb1c0dqnq62qa17wc3846rwf234n"; + url = "http://www.msweet.org/files/project2/epm-4.2-source.tar.bz2"; + sha256 = "13imglm1fgd7p5y9lc0xsl6x4cdjsk5lnan5sn8f7m4jwbx8kik6"; }; - buildInputs = [rpm]; + buildInputs = [ rpm ]; - meta = { + meta = with stdenv.lib; { description = "The ESP Package Manager generates distribution archives for a variety of platforms"; - homepage = http://www.easysw.com/epm/index.php; + homepage = http://www.msweet.org/projects.php?Z2; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 14bfe74821de..a27b2318b95f 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev, libX11, libXext, libXv, libXrandr, glib, bison }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.7"; + name = "intel-gpu-tools-1.8"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "0yi0024kr1xzglkkhyjpxr081bmwvdakb61az6wiidfrpd1j6q92"; + sha256 = "0n9pzwjzx4xiffcy3nkc7q7689sid2ry8m9xx4vgxxspr8ds3qpz"; }; configureFlags = [ "--disable-tests" ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 4c0176de7e88..4afb8bfdbdfd 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation { - name = "ocaml-findlib-1.4.1"; + name = "ocaml-findlib-1.5.3"; src = fetchurl { - url = http://download.camlcity.org/download/findlib-1.4.1.tar.gz; - sha256 = "0cdbr716r5686zvf86b9zm5ikdz0dw727m67b1f4rjjisp5v2zyf"; + url = http://download.camlcity.org/download/findlib-1.5.3.tar.gz; + sha256 = "1kw2siv4pc8q060m9xpgxvjs07ic1kiphyxmkwcz6nyb91p8286r"; }; buildInputs = [m4 ncurses ocaml]; diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch index 4729885bcefe..f152feaaecfb 100644 --- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -1,12 +1,11 @@ ---- findlib-1.3.3/src/findlib/Makefile -+++ findlib-1.3.3/src/findlib/Makefile -@@ -82,7 +82,7 @@ clean: +--- findlib-1.5.3/src/findlib/Makefile 2014-09-16 13:21:46.000000000 +0200 ++++ findlib-1.5.3/src/findlib/Makefile.new 2014-10-01 14:30:54.141082521 +0200 +@@ -89,7 +89,7 @@ install: all mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" mkdir -p "$(prefix)$(OCAMLFIND_BIN)" - test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" + test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)" - files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \ + files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs META` && \ cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ - diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index a5260b499c45..3f172e6aaf2b 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv, +{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv, camlp4, ocamlmod, ocamlify, ounit, expect}: stdenv.mkDerivation { - name = "ocaml-oasis-0.4.1"; + name = "ocaml-oasis-0.4.4"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1355/oasis-0.4.1.tar.gz; + url = http://forge.ocamlcore.org/frs/download.php/1355/oasis-0.4.4.tar.bz2; sha256 = "1lsnw9f1jh6106kphxg40qp0sia6cbkbb9ahs5y6ifnfkmllkjhj"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ - ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit + ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit camlp4 ]; propagatedBuildInputs = [ ocaml_data_notation ]; @@ -22,13 +22,13 @@ stdenv.mkDerivation { buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; - meta = { + meta = with stdenv.lib; { homepage = http://oasis.forge.ocamlcore.org/; description = "Configure, build and install system for OCaml projects"; - license = stdenv.lib.licenses.lgpl21; + license = licenses.lgpl21; platforms = ocaml.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ - z77z + maintainers = with maintainers; [ + vbgl z77z ]; }; } diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 1b99c4d4d43b..10025ff8a96b 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.14"; + version = "1.15"; name = "utop-${version}"; src = fetchurl { - url = https://github.com/diml/utop/archive/1.14.tar.gz; - sha256 = "17dqinvdrpba2fjs7sl6gxs47rrx6j8a5bbjhc7flp6bdls898zk"; + url = https://github.com/diml/utop/archive/1.15.tar.gz; + sha256 = "106v0x6sa2x10zgmjf73mpzws7xiqanxswivd00iqnpc0bcpkmrr"; }; buildInputs = [ ocaml findlib makeWrapper]; diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 5ff4f8ec9db7..4176182ab621 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "re2c-${version}"; - version = "0.13.7.4"; + version = "0.13.7.5"; src = fetchurl { url = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz"; - sha256 = "0j42s2gpz0rgiadwyb7ksqgc7i02l0q2qnmiyaj5f1w5rfa2c7yy"; + sha256 = "0qdly4493d4p6jif0anf79c8h6ylc34aw622zk4n8icyax8gv2nm"; }; meta = { diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 157d1b42af62..bd8d926769e6 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-2.0.0.tar.gz; sha256 = "1n9lkx97h987bq8z586jgissdhs07xyfr0xfdk7m2wpw4yhw10k1"; }; - buildInputs = [ autoconf autoconf automake pkgconfig SDL SDL_mixer SDL_net ]; + buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net ]; patchPhase = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ./autogen.sh --prefix=$out diff --git a/pkgs/games/chocolate-doom/master.nix b/pkgs/games/chocolate-doom/master.nix index f0dc62aaaae7..3681a6781d87 100644 --- a/pkgs/games/chocolate-doom/master.nix +++ b/pkgs/games/chocolate-doom/master.nix @@ -1,13 +1,13 @@ { stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, git, fetchgit }: stdenv.mkDerivation rec { - name = "chocolate-doom-20140902"; + name = "chocolate-doom-20141008"; src = fetchgit { url = git://github.com/fragglet/chocolate-doom.git; - rev = "204814c7bb16a8ad45435a15328072681978ea57"; - sha256 = "1xcdxpkgb9dk3zwqf4xcr3qn7dh5rx6hmniky67imbvi1h74p587"; + rev = "63e1c884911f9e3382936f84a388e941b29343e6"; + sha256 = "1855a70widf1ni7lrfvp3hwxs1fhg1v5l738ckai88xpbak8i14m"; }; - buildInputs = [ autoconf autoconf automake pkgconfig SDL SDL_mixer SDL_net git ]; + buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net git ]; patchPhase = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ./autogen.sh --prefix=$out diff --git a/pkgs/games/keen4/default.nix b/pkgs/games/keen4/default.nix index 4d6189603a97..562df3ac1b60 100644 --- a/pkgs/games/keen4/default.nix +++ b/pkgs/games/keen4/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { dist = fetchurl { url = http://tarballs.nixos.org/keen4.zip; - md5 = "ffcdd9e3bce224d92797166bc3f56f1c"; + sha256 = "12rnc9ksl7v6l8wsxvr26ylkafzq80dbsa7yafzw9pqc8pafkhx1"; }; buildInputs = [unzip]; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix new file mode 100644 index 000000000000..298417971488 --- /dev/null +++ b/pkgs/games/megaglest/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchgit, cmake, git, curl, SDL, xercesc, openal, lua +, libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng +, fontconfig, freetype, xlibs, makeWrapper, bash, which, gnome3, mesa_glu +, mesa_drivers }: +let + version = "3.9.2"; + lib-env = buildEnv { + name = "megaglest-lib-env"; + paths = [ SDL xlibs.libSM xlibs.libICE xlibs.libX11 xlibs.libXext + xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype + stdenv.gcc.gcc glew mesa_glu mesa_drivers wxGTK ]; + }; + path-env = buildEnv { + name = "megaglest-path-env"; + paths = [ bash which gnome3.zenity ]; + }; +in +stdenv.mkDerivation { + name = "megaglest-${version}"; + + src = fetchgit { + url = "git://github.com/MegaGlest/megaglest-source"; + rev = "refs/tags/${version}"; + sha256 = "0jdgcpsv16vdxkwym7pw764pggifn4g98f3dzg615xl9h4wkymm0"; + }; + + buildInputs = [ cmake git curl SDL xercesc openal lua libjpeg wxGTK + cppunit ftgl glew libogg libvorbis makeWrapper mesa_glu mesa_drivers ]; + + configurePhase = '' + cmake -DCMAKE_INSTALL_PREFIX=$out -DBUILD_MEGAGLEST_TESTS=ON + ''; + + postInstall = '' + for i in $out/bin/*; do + wrapProgram $i \ + --prefix LD_LIBRARY_PATH ":" "${lib-env}/lib" \ + --prefix PATH ":" "${path-env}/bin" + done + ''; + + meta = { + description = "MegaGlest is an entertaining free (freeware and free software) and open source cross-platform 3D real-time strategy (RTS) game"; + license = stdenv.lib.licenses.gpl3; + homepage = "http://megaglest.org/"; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/quake3/demo/default.nix b/pkgs/games/quake3/demo/default.nix index 99c07a9a7e04..a25a7caa8c18 100644 --- a/pkgs/games/quake3/demo/default.nix +++ b/pkgs/games/quake3/demo/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { # This is needed for pak0.pk3. demo = fetchurl { url = http://tarballs.nixos.org/linuxq3ademo-1.11-6.x86.gz.sh; - md5 = "484610c1ce34272223a52ec331c99d5d"; + sha256 = "1v54a1hx1bczk9hgn9qhx8vixsy7xn7wj2pylhfjsybfkgvf7pk4"; }; # This is needed for the additional pak?.pk3 files. update = fetchurl { url = http://tarballs.nixos.org/linuxq3apoint-1.31.x86.run; - md5 = "2620b9eefb6d0775f766b6570870157a"; + sha256 = "1kp689452zb8jhd67ghisz2055pqxy9awz4vi0hq5qmp7xrp1x58"; }; # Don't rebuild if the inputs change, since the output is guaranteed diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index f175894dfe74..51f6fdf0eee1 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; assert stdenv.isi686; stdenv.mkDerivation { - name = "tibia-10.57"; + name = "tibia-10.59"; src = fetchurl { - url = http://static.tibia.com/download/tibia1057.tgz; - sha256 = "1bhfrz66n1cvvy11ybr3yfn3i3vr98nnp3q11gssk8nby5bqm2fi"; + url = http://static.tibia.com/download/tibia1059.tgz; + sha256 = "0g9f4g7d461yj47rsiv5fpvh4wry9rsx4j6q1jajq4liv5xdlhl7"; }; shell = stdenv.shell; diff --git a/pkgs/games/ut2004demo/default.nix b/pkgs/games/ut2004demo/default.nix index 04efc0049dd0..a828d22ca0b0 100644 --- a/pkgs/games/ut2004demo/default.nix +++ b/pkgs/games/ut2004demo/default.nix @@ -8,7 +8,7 @@ let { name = "ut2004-demo-3120"; src = fetchurl { url = http://ftp.gameaholic.com/pub/demos/ut2004-lnx-demo-3120.run.bz2; - md5 = "da200b043add9d083f6aa7581e6829f0"; + sha256 = "1lravfkb1gsallqqird5dcbz42vwjg36m1qk76nmmnyyyghwqnli"; }; builder = ./builder.sh; }; diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix new file mode 100644 index 000000000000..9ca2cee47960 --- /dev/null +++ b/pkgs/misc/apulse/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, alsaLib, cmake, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "apulse-${version}"; + version = "0.1.2"; + + src = fetchurl { + url = "https://github.com/i-rinat/apulse/archive/v${version}.tar.gz"; + sha256 = "02906a8iwwjzzkjvhqqai2yd1636cgz9vl69vwq0vkv2v6cn21ky"; + }; + + buildInputs = + [ alsaLib cmake pkgconfig glib ]; + + meta = with stdenv.lib; { + description = "PulseAudio emulation for ALSA."; + homepage = "https://github.com/i-rinat/apulse"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.jagajaga ]; + }; +} diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index b5e4adfa0b91..2fc09c498e3c 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "beep-1.3"; src = fetchurl { url = http://www.johnath.com/beep/beep-1.3.tar.gz; - md5 = "49c340ceb95dbda3f97b2daafac7892a"; + sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r"; }; makeFlags = "INSTALL_DIR=\${out}/bin/ MAN_DIR=\${out}/man/man1/"; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index bb1f60ed5db0..c332dc021546 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { passthru = { inherit version; }; src = fetchurl { - url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; - md5 = "de3006e5cf1ee78a9c6145ce62c4e982"; + url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; + sha256 = "1rfhlv9b37120d6shngvyrcp99vh4a3lwdkrfanv3sjqid7068w0"; }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 5b1576bd97ca..c2a4c7d3d8b8 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; rom = fetchurl { url = mirror://sourceforge/atari800/xf25.zip; - md5 = "4dc3b6b4313e9596c4d474785a37b94d"; + sha256 = "12jbawxs04i0wm3910n7f3phsybdp8nndxc0xlsnzp8k0k8hmblq"; }; buildInputs = [unzip zlib SDL]; configureFlags = "--target=sdl"; diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 3f1c1a9a57b1..3dd3f4378def 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec{ - majorVersion="2.16"; + majorVersion="2.18"; minorVersion="2"; version="${majorVersion}.${minorVersion}"; name = "lilypond-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec{ src = fetchurl { url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; - sha256 = "1jx11bk3rk3w7bnh0829yy280627ywsvwg6fhdm0fqwkiz7jchqz"; + sha256 = "01xs9x2wjj7w9appaaqdhk15r1xvvdbz9qwahzhppfmhclvp779j"; }; preConfigure='' diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index bc1504ab2e9b..a41fe5afb9ee 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/rss-glx/rss-glx_0.8.1.tar.bz2; - md5 = "a2bdf0e10ee4e89c8975f313c5c0ba6f"; + sha256 = "1fs2xavyf9i6vcdmdnpyi9rbnrg05ldd49bvlcwpn5igv2g400yg"; }; buildInputs = [x11 mesa pkgconfig imagemagick libtiff bzip2]; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 8dd17c074a7a..7177f10e3a23 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -141,6 +141,8 @@ in rec # TODO: support llvm based C completion, See README of git repository installPhase = ":"; + path = "YouCompleteMe"; + meta = { description = "fastest non utf-8 aware word and C completion engine for Vim"; homepage = http://github.com/Valloric/YouCompleteMe; @@ -323,7 +325,7 @@ in rec }; vimproc = simpleDerivation rec { - version = "7788b5f934bc7460c1e9134b51fe5690b21de83c"; + version = "21a79bf4edca3ae97555df3fc729d208c7e19b9c"; name = "vimproc-${version}"; meta = with stdenv.lib; { @@ -338,7 +340,7 @@ in rec src = fetchgit { url = "https://github.com/Shougo/vimproc.vim.git"; rev = "${version}"; - sha256 = "0ahmnzccf5rv8rwg7b6pfgxh8pcmq955aznjv64slyh0mjqmh6jl"; + sha256 = "16mlrhmd1hq4rgg7bl9gajhb4nmn1x8jxfaxfwiy2bm1phgljgq0"; }; buildInputs = [ which ]; @@ -573,6 +575,7 @@ in rec rev = "0c4e94281e57c475752e799adc261f7d5e4ab124"; sha256 = "f6a085f7b8198747fae3fff0bc38e4d030e5c97aaeb84958fbf96fa658bbe862"; }; + patches = [ (fetchurl { url = "https://github.com/eagletmt/ghcmod-vim/pull/57.diff"; md5 = "cafbb9f725afbba26b52b6c3344ee89a"; }) ]; path = "ghcmod"; }; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index f7b2a984e406..8407f270f484 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, kernel }: +assert stdenv.lib.versionOlder kernel.version "3.17"; + let base = "batman-adv-2014.3.0"; in stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index a8988f0a4529..f8081127d515 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "2.1"; + version = "2.3"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "121gpcs1ws7m2v8jk091jhmz3pm2xmhwkv96gqkyb4k0bgsi0waw"; + sha256 = "1pxlkfj1r2k5lxph2x9l02jrn652b3whcfh6l604rbbghxv2nk69"; }; buildInputs = [ libnl openssl pkgconfig ]; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 52d003a2970b..50bc13191981 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,17 +60,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.19"; - revision = "201409282024"; + { kversion = "3.14.20"; + revision = "201410062037"; branch = "stable"; - sha256 = "05xjfllw6kx6y2cs0pwvlp5cpspqb7nf7kgfzk2z5gd04vc8ywqm"; + sha256 = "0vs5s7xlnsrs5w59vhi57xhsnx3fryqfpvdgsfg2rxqnc1a5b3sp"; }; grsecurity_unstable = grsecPatch - { kversion = "3.16.3"; - revision = "201409282025"; + { kversion = "3.16.4"; + revision = "201410062041"; branch = "test"; - sha256 = "14vzg513xkqa71hp9drs2z9smamhxh87fxxyfjdbi3k93cbvkk22"; + sha256 = "17g993gwjbj10gp2in534ycsv5hwggi5hrbqrsar1lm95m3d6pbc"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 1554715a613c..6fa59e4ae5fb 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { name = "lockdep-${version}"; - version = "3.16.1"; + version = "3.17"; + fullver = "3.17.0"; # The library ver is 3.17.0, but the kernel is 3.17 src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0wbxqlmk7w9047ir51dsz6vi7ww0hpycgrb43mk2a189xaldsdxy"; + sha256 = "0lb2yyh3j932789jq4gxx9xshgy6rfdnl3lm8yr43kaz7k4kw5gm"; }; preConfigure = "cd tools/lib/lockdep"; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { cp -R include/liblockdep $out/include make install DESTDIR=$out prefix="" - substituteInPlace $out/bin/lockdep --replace "./liblockdep.so" "$out/lib/liblockdep.so.$version" + substituteInPlace $out/bin/lockdep --replace "./liblockdep.so" "$out/lib/liblockdep.so.$fullver" ''; meta = { diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 12305687c299..7827dc228b14 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "lxc-1.0.3"; + name = "lxc-1.0.6"; src = fetchurl { url = "http://github.com/lxc/lxc/archive/${name}.tar.gz"; - sha256 = "04k45jgj2i501yhm467s1a1yk7h7q0fjhspys158w1a2m1hari4z"; + sha256 = "075i5h136b3dnf8nk6mpailz6i18yv1zcsj0jdpr9kg2i6d1ksia"; }; buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ]; diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index c77faa6a9e70..3d6b6faccca1 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, kernel, zlib }: +assert stdenv.lib.versionOlder kernel.version "3.17"; + stdenv.mkDerivation { name = "netatop-${kernel.version}-0.3"; diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix index 2be869e73e3a..1eee7dbdac2b 100644 --- a/pkgs/os-specific/linux/pam_ldap/default.nix +++ b/pkgs/os-specific/linux/pam_ldap/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.padl.com/download/${name}.tar.gz"; - md5 = "c0ad81e9d9712ddc6599a6e7a1688778"; + sha256 = "1l0mlwvas9dnsfcgbszbzq3bzhdkibn1c3x15fczq3i82faf5g5a"; }; preInstall = " diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index cd8a8eaec133..241d605ec132 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation { - name = "procps-3.3.9"; + name = "procps-3.3.10"; src = fetchurl { - url = mirror://sourceforge/procps-ng/procps-ng-3.3.9.tar.xz; - sha256 = "0qw69v7wx8hilwylyk9455k3h1xg8sc13vxh0pvdss7rml7wpw00"; + url = mirror://sourceforge/procps-ng/procps-ng-3.3.10.tar.xz; + sha256 = "013z4rzy3p5m1zp6mmynpblv0c6zlcn91pw4k2vymz2djyc6ybm0"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 944fb6ff554c..7f1dad248e6f 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1qqzyj2if5wai4jiwml4i8s6v8k7hbi7jmiph800lhkk5j8s72l9"; }; - patches = [ ./install_prefix.patch ./const.patch ]; + patches = [ ./install_prefix.patch ./const.patch ./kernel-3.16.patch ./kernel-3.17.patch ]; buildInputs = [ perl autoconf automake libtool ]; diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index d3ed285ccfef..93629495164b 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0mcivbddms8kbapbs9x6achqyvh5i6h1rd2b3jm8g5yjn0flc5gl"; }; - patches = [ ./install_prefix.patch ./const.patch ]; + patches = [ ./install_prefix.patch ./const.patch ./kernel-3.16.patch ./kernel-3.17.patch ]; buildInputs = [ perl autoconf automake libtool ]; diff --git a/pkgs/os-specific/linux/spl/kernel-3.16.patch b/pkgs/os-specific/linux/spl/kernel-3.16.patch new file mode 100644 index 000000000000..25641c7a384f --- /dev/null +++ b/pkgs/os-specific/linux/spl/kernel-3.16.patch @@ -0,0 +1,34 @@ +From e3020723dc43af2bc22af0d68571a61daf9b44d0 Mon Sep 17 00:00:00 2001 +From: Turbo Fredriksson <turbo@bayour.com> +Date: Sun, 14 Sep 2014 15:47:22 +0000 +Subject: [PATCH] Linux 3.16 compat: smp_mb__after_clear_bit() + +The smp_mb__{before,after}_clear_bit functions have been renamed +smp_mb__{before,after}_atomic. Rather than adding a compatibility +function to handle this the code has been updated to use smp_wmb(). + +This has the advantage of being a stable functionally equivalent +interface. On many architectures smp_mb__after_clear_bit() expands +to smp_wmb(). Others might be able to do something slightly more +efficient but this will be safe and correct on all of them. + +Signed-off-by: Turbo Fredriksson <turbo@bayour.com> +Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> +Closes #386 +--- + module/spl/spl-kmem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c +index 6de513e..79954eb 100644 +--- a/module/spl/spl-kmem.c ++++ b/module/spl/spl-kmem.c +@@ -2365,7 +2365,7 @@ spl_kmem_cache_reap_now(spl_kmem_cache_t *skc, int count) + + spl_slab_reclaim(skc, count, 1); + clear_bit(KMC_BIT_REAPING, &skc->skc_flags); +- smp_mb__after_clear_bit(); ++ smp_wmb(); + wake_up_bit(&skc->skc_flags, KMC_BIT_REAPING); + out: + atomic_dec(&skc->skc_ref); diff --git a/pkgs/os-specific/linux/spl/kernel-3.17.patch b/pkgs/os-specific/linux/spl/kernel-3.17.patch new file mode 100644 index 000000000000..f5ce2c8805d8 --- /dev/null +++ b/pkgs/os-specific/linux/spl/kernel-3.17.patch @@ -0,0 +1,175 @@ +From 2fc44f66ec9b83069593d87cf311069458c0d5ae Mon Sep 17 00:00:00 2001 +From: Ned Bass <bass6@llnl.gov> +Date: Fri, 8 Aug 2014 17:41:22 -0700 +Subject: [PATCH] Linux 3.17 compat: remove wait_on_bit action function + +Linux kernel 3.17 removes the action function argument from +wait_on_bit(). Add autoconf test and compatibility macro to support +the new interface. + +The former "wait_on_bit" interface required an 'action' function to +be provided which does the actual waiting. There were over 20 such +functions in the kernel, many of them identical, though most cases +can be satisfied by one of just two functions: one which uses +io_schedule() and one which just uses schedule(). This API change +was made to consolidate all of those redundant wait functions. + +References: torvalds/linux@7431620 + +Signed-off-by: Ned Bass <bass6@llnl.gov> +Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> +Closes #378 +--- + config/spl-build.m4 | 26 ++++++++++++++++++++++++++ + include/linux/Makefile.am | 1 + + include/linux/wait_compat.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ + include/sys/types.h | 1 + + module/spl/spl-kmem.c | 11 ++--------- + 5 files changed, 75 insertions(+), 9 deletions(-) + create mode 100644 include/linux/wait_compat.h + +diff --git a/config/spl-build.m4 b/config/spl-build.m4 +index eef5233..2514d8c 100644 +--- a/config/spl-build.m4 ++++ b/config/spl-build.m4 +@@ -94,6 +94,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [ + SPL_AC_2ARGS_VFS_GETATTR + SPL_AC_USLEEP_RANGE + SPL_AC_KMEM_CACHE_ALLOCFLAGS ++ SPL_AC_WAIT_ON_BIT + ]) + + AC_DEFUN([SPL_AC_MODULE_SYMVERS], [ +@@ -2570,3 +2571,28 @@ AC_DEFUN([SPL_AC_KMEM_CACHE_ALLOCFLAGS], [ + ]) + ]) + ]) ++ ++dnl # ++dnl # 3.17 API change, ++dnl # wait_on_bit() no longer requires an action argument. The former ++dnl # "wait_on_bit" interface required an 'action' function to be provided ++dnl # which does the actual waiting. There were over 20 such functions in the ++dnl # kernel, many of them identical, though most cases can be satisfied by one ++dnl # of just two functions: one which uses io_schedule() and one which just ++dnl # uses schedule(). This API change was made to consolidate all of those ++dnl # redundant wait functions. ++dnl # ++AC_DEFUN([SPL_AC_WAIT_ON_BIT], [ ++ AC_MSG_CHECKING([whether wait_on_bit() takes an action]) ++ SPL_LINUX_TRY_COMPILE([ ++ #include <linux/wait.h> ++ ],[ ++ int (*action)(void *) = NULL; ++ wait_on_bit(NULL, 0, action, 0); ++ ],[ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_WAIT_ON_BIT_ACTION, 1, [yes]) ++ ],[ ++ AC_MSG_RESULT(no) ++ ]) ++]) +diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am +index 59f2ec5..ec7023d 100644 +--- a/include/linux/Makefile.am ++++ b/include/linux/Makefile.am +@@ -17,6 +17,7 @@ KERNEL_H = \ + $(top_srcdir)/include/linux/sysctl_compat.h \ + $(top_srcdir)/include/linux/time_compat.h \ + $(top_srcdir)/include/linux/uaccess_compat.h \ ++ $(top_srcdir)/include/linux/wait_compat.h \ + $(top_srcdir)/include/linux/zlib_compat.h + + USER_H = +diff --git a/include/linux/wait_compat.h b/include/linux/wait_compat.h +new file mode 100644 +index 0000000..66f9a9a +--- /dev/null ++++ b/include/linux/wait_compat.h +@@ -0,0 +1,45 @@ ++/*****************************************************************************\ ++ * Copyright (C) 2007-2014 Lawrence Livermore National Security, LLC. ++ * Copyright (C) 2007 The Regents of the University of California. ++ * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). ++ * Written by Brian Behlendorf <behlendorf1@llnl.gov>. ++ * UCRL-CODE-235197 ++ * ++ * This file is part of the SPL, Solaris Porting Layer. ++ * For details, see <http://zfsonlinux.org/>. ++ * ++ * The SPL is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * The SPL is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with the SPL. If not, see <http://www.gnu.org/licenses/>. ++\*****************************************************************************/ ++ ++#ifndef _SPL_WAIT_COMPAT_H ++#define _SPL_WAIT_COMPAT_H ++ ++ ++#ifndef HAVE_WAIT_ON_BIT_ACTION ++# define spl_wait_on_bit(word, bit, mode) wait_on_bit(word, bit, mode) ++#else ++ ++static inline int ++spl_bit_wait(void *word) ++{ ++ schedule(); ++ return 0; ++} ++ ++#define spl_wait_on_bit(word, bit, mode) \ ++ wait_on_bit(word, bit, spl_bit_wait, mode) ++ ++#endif /* HAVE_WAIT_ON_BIT_ACTION */ ++ ++#endif /* SPL_WAIT_COMPAT_H */ +diff --git a/include/sys/types.h b/include/sys/types.h +index decb6bb..fcec0fa 100644 +--- a/include/sys/types.h ++++ b/include/sys/types.h +@@ -43,6 +43,7 @@ + #include <linux/zlib_compat.h> + #include <linux/mm_compat.h> + #include <linux/delay.h> ++#include <linux/wait_compat.h> + + #ifndef HAVE_UINTPTR_T + typedef unsigned long uintptr_t; +diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c +index 0a9d775..6de513e 100644 +--- a/module/spl/spl-kmem.c ++++ b/module/spl/spl-kmem.c +@@ -1900,13 +1900,6 @@ spl_cache_grow_wait(spl_kmem_cache_t *skc) + return !test_bit(KMC_BIT_GROWING, &skc->skc_flags); + } + +-static int +-spl_cache_reclaim_wait(void *word) +-{ +- schedule(); +- return 0; +-} +- + /* + * No available objects on any slabs, create a new slab. Note that this + * functionality is disabled for KMC_SLAB caches which are backed by the +@@ -1928,8 +1921,8 @@ spl_cache_grow(spl_kmem_cache_t *skc, int flags, void **obj) + * then return so the local magazine can be rechecked for new objects. + */ + if (test_bit(KMC_BIT_REAPING, &skc->skc_flags)) { +- rc = wait_on_bit(&skc->skc_flags, KMC_BIT_REAPING, +- spl_cache_reclaim_wait, TASK_UNINTERRUPTIBLE); ++ rc = spl_wait_on_bit(&skc->skc_flags, KMC_BIT_REAPING, ++ TASK_UNINTERRUPTIBLE); + SRETURN(rc ? rc : -EAGAIN); + } + diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 7944f612fb05..69940ceb1328 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -15,14 +15,8 @@ stdenv.mkDerivation rec { export PATH_CHKCONFIG=/no-such-program export BZIP=${bzip2}/bin/bzip2 export SYSTEMCTL=systemctl - makeFlagsArray=(SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y CHOWN=true) - installFlagsArray=(SA_DIR=$TMPDIR/dummy) - # Note: --enable-install-cron actually installs systemd units. - configureFlagsArray+=(--with-systemdsystemunitdir=$out/lib/systemd/system --enable-install-cron) - ''; - - preInstall = '' - mkdir -p $out/lib/systemd/system + makeFlagsArray=(DESTDIR=$out SYSCONFIG_DIR=$out/etc IGNORE_MAN_GROUP=y CHOWN=true) + installTargets="install_base install_nls install_man" ''; meta = { diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 09731d54ab75..780eeb68d1df 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -3,14 +3,19 @@ , libxslt, docbook_xsl, utillinux }: stdenv.mkDerivation rec { - name = "udisks-1.0.4"; + name = "udisks-1.0.5"; src = fetchurl { url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5"; + sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j"; }; - patches = [ ./purity.patch ./no-pci-db.patch ./cve-2014-0004.patch ]; + patches = [ ./purity.patch ./no-pci-db.patch ]; + + preConfigure = + '' + configureFlagsArray+=(--with-systemdsystemunitdir=$out/lib/systemd/system) + ''; postPatch = '' diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix index 6ad255caef45..1b3366f86f8d 100644 --- a/pkgs/os-specific/linux/upstart/default.nix +++ b/pkgs/os-specific/linux/upstart/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://upstart.ubuntu.com/download/${version}/${name}.tar.gz"; - md5 = "870920a75f8c13f3a3af4c35916805ac"; + sha256 = "01w4ab6nlisz5blb0an1sxjkndwikr7sjp0cmz4lg00g3n7gahmx"; }; buildInputs = [ pkgconfig dbus libnih ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 937f65089e97..988242e3c42c 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -5,13 +5,13 @@ assert readlineSupport -> readline != null; stdenv.mkDerivation rec { - version = "2.2"; + version = "2.3"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "1vf8jc4yyksbxf86narvsli3vxfbm8nbnim2mdp66nd6d3yvin70"; + sha256 = "0skvkl6c10ls4s48b2wmf47h9j1y40nlzxnzn8hyaw2j0prmpapa"; }; extraConfig = @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { echo "$extraConfig" >> .config cat .config substituteInPlace Makefile --replace /usr/local $out + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo "${libnl}"/include/libnl*/)" ''; buildInputs = [ openssl dbus_libs libnl ] @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - patches = [ ./libnl.patch ]; + patches = []; postInstall = '' mkdir -p $out/share/man/man5 $out/share/man/man8 diff --git a/pkgs/os-specific/linux/wpa_supplicant/libnl.patch b/pkgs/os-specific/linux/wpa_supplicant/libnl.patch deleted file mode 100644 index 477f8dd55f69..000000000000 --- a/pkgs/os-specific/linux/wpa_supplicant/libnl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak ---- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo 2012-03-02 16:11:43.176448714 -0600 -+++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak 2012-03-02 16:12:29.759866341 -0600 -@@ -48,7 +48,7 @@ NEED_RFKILL=y - ifdef CONFIG_LIBNL32 - DRV_LIBS += -lnl-3 - DRV_LIBS += -lnl-genl-3 -- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0` - else - ifdef CONFIG_LIBNL_TINY - DRV_LIBS += -lnl-tiny - diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix new file mode 100644 index 000000000000..cd87e0530554 --- /dev/null +++ b/pkgs/servers/corosync/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb +, dbus ? null +, librdmacm ? null, libibverbs ? null +, libstatgrab ? null +, net_snmp ? null +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "corosync-2.3.4"; + + src = fetchurl { + url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz"; + sha256 = "1m276b060fjghr93hdzfag81whi5ph65dc2ka8ln1igm3kxr7bix"; + }; + + buildInputs = [ + makeWrapper pkgconfig nss nspr libqb + dbus librdmacm libibverbs libstatgrab net_snmp + ]; + + # Remove when rdma libraries gain pkgconfig support + ibverbs_CFLAGS = optionalString (libibverbs != null) + "-I${libibverbs}/include/infiniband"; + ibverbs_LIBS = optionalString (libibverbs != null) "-libverbs"; + rdmacm_CFLAGS = optionalString (librdmacm != null) + "-I${librdmacm}/include/rdma"; + rdmacm_LIBS = optionalString (librdmacm != null) "-lrdmacm"; + + configureFlags = [ + "--enable-watchdog" + "--enable-qdevices" + ] ++ optional (dbus != null) "--enable-dbus" + ++ optional (librdmacm != null && libibverbs != null) "--enable-rdma" + ++ optional (libstatgrab != null) "--enable-monitoring" + ++ optional (net_snmp != null) "--enable-snmp"; + + postInstall = '' + wrapProgram $out/bin/corosync-blackbox \ + --prefix PATH ":" "$out/sbin:${libqb}/sbin" + ''; + + meta = { + homepage = http://corosync.org/; + description = "a Group Communication System with features for implementing high availability within applications."; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index d9166382be35..f691f362bb24 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -8,6 +8,6 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/jetty/jetty-5.1.4.zip; - md5 = "5d16bb1ea4a62dff93c0b7f7de00430f"; + sha256 = "1lzvsrlybrf3zzzv4hi2v82qzpkfkib3xbwwlya8c08gf0360mrk"; }; } diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 0bb3d96b37b7..53a7f916c9ac 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "thttpd-${version}"; - version = "2.25b"; + version = "2.26"; src = fetchurl { url = "http://acme.com/software/thttpd/${name}.tar.gz"; - sha256 = "0q13sfkh6amn5wk0ccbmxq3mnhlm8g5pnyk910fa5xngn449nw87"; + sha256 = "1dybhpyfrly0m285cdn9jah397bqzylrwzi26gin2h451z3gdcqm"; }; prePatch = '' diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index b45bef0cce8c..74033be8cf86 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - name = "memcached-1.4.17"; + name = "memcached-1.4.20"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha1 = "2b4fc706d39579cf355e3358cfd27b44d40bd79c"; + sha256 = "0620llasj8xgffk6hk2ml15z0c5i34455wwg60i1a2zdir023l95"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 30317d25cff7..9e3ebc3795d8 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { "--with-persistent-directory=/var/lib/net-snmp" ]; - buildInputs = [ autoreconfHook file openssl perl unzip ]; + buildInputs = [ autoreconfHook file perl unzip ]; + propagatedBuildInputs = [ openssl ]; enableParallelBuilding = true; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index c8a6434cac3e..1621a494c7a5 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -27,10 +27,10 @@ let mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; in stdenv.mkDerivation rec { - name = "mpd-0.18.12"; + name = "mpd-0.18.16"; src = fetchurl { - url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; - sha256 = "09qphjcpqcs2jn5d8ga1skhif2mj5qk1ix9li76z2gyq3lf0rpz6"; + url = "http://www.musicpd.org/download/mpd/0.18/${name}.tar.gz"; + sha256 = "0xpmc70ccp0s2s10vsi4hkijiv497dy42a7g225y77axp5ncf364"; }; buildInputs = [ pkgconfig glib ] @@ -92,7 +92,7 @@ in stdenv.mkDerivation rec { description = "A flexible, powerful daemon for playing music"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; license = licenses.gpl2; - maintainers = with maintainers; [ astsmtl ]; + maintainers = with maintainers; [ astsmtl fuuzetsu ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 1a44aa6a804f..e733ef3d009e 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "redis-2.8.9"; + name = "redis-2.8.17"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "7834c37f2ff186c46aef8e4a066dfbf1d6772a285aa31c19c58162f264f1007f"; + sha256 = "19rnwapbsvfhd9pwdjdshrpqimf1ms0pzakvgnjrywkijmiwrisk"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch b/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch new file mode 100644 index 000000000000..d8f922aba374 --- /dev/null +++ b/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch @@ -0,0 +1,48 @@ +From: Marc Dionne <marc.dionne@your-file-system.com> +Date: Thu, 25 Sep 2014 10:52:12 +0000 (-0300) +Subject: Linux 3.17: Deal with d_splice_alias errors +X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=af7f1d59135526ea584a4403b6400106dc92a992;hp=880401913d6190054bb0511093606a206b16326c + +Linux 3.17: Deal with d_splice_alias errors + +In 3.17 the logic in d_splice_alias has changed. Of interest to +us is the fact that it will now return an EIO error if it finds +an existing connected directory for the dentry, where it would +previously have added a new alias for it. As a result the end +user can get EIO errors when accessing any file in a volume +if the volume was first accessed through a different path (ex: +RO path vs RW path). + +This commit just restores the old behaviour, adding the directory +alias manually in the error case, which is what older versions +of d_splice_alias used to do. + +Change-Id: I5558c64760e4cad2bd3dc648067d81020afc69b6 +--- + +diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c +index e03187f..0cdd9e0 100644 +--- a/src/afs/LINUX/osi_vnodeops.c ++++ b/src/afs/LINUX/osi_vnodeops.c +@@ -1593,9 +1593,18 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp) + /* It's ok for the file to not be found. That's noted by the caller by + * seeing that the dp->d_inode field is NULL. + */ +- if (!code || code == ENOENT) +- return newdp; +- else ++ if (!code || code == ENOENT) { ++ /* ++ * d_splice_alias can return an error (EIO) if there is an existing ++ * connected directory alias for this dentry. ++ */ ++ if (!IS_ERR(newdp)) ++ return newdp; ++ else { ++ d_add(dp, ip); ++ return NULL; ++ } ++ } else + return ERR_PTR(afs_convert_code(code)); + } + diff --git a/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch b/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch new file mode 100644 index 000000000000..f8844915f85c --- /dev/null +++ b/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch @@ -0,0 +1,55 @@ +From 880401913d6190054bb0511093606a206b16326c Mon Sep 17 00:00:00 2001 +From: Marc Dionne <marc.dionne@your-file-system.com> +Date: Tue, 9 Sep 2014 10:39:55 -0300 +Subject: [PATCH] Linux 3.17: No more typedef for ctl_table + +The typedef has been removed so we need to use the structure +directly. + +Note that the API for register_sysctl_table has also changed +with 3.17, but it reverted back to a form that existed +before and the configure tests handle it correctly. + +Change-Id: If1fd9d27f795dee4b5aa2152dd09e0540d643a69 +--- + src/afs/LINUX/osi_sysctl.c | 4 ++-- + src/cf/linux-test4.m4 | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c +index a8f7fac..834e8ad 100644 +--- a/src/afs/LINUX/osi_sysctl.c ++++ b/src/afs/LINUX/osi_sysctl.c +@@ -34,7 +34,7 @@ extern afs_int32 afs_pct2; + #ifdef CONFIG_SYSCTL + static struct ctl_table_header *afs_sysctl = NULL; + +-static ctl_table afs_sysctl_table[] = { ++static struct ctl_table afs_sysctl_table[] = { + { + #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME) + #if defined(CTL_UNNUMBERED) +@@ -234,7 +234,7 @@ static ctl_table afs_sysctl_table[] = { + {0} + }; + +-static ctl_table fs_sysctl_table[] = { ++static struct ctl_table fs_sysctl_table[] = { + { + #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME) + #if defined(CTL_UNNUMBERED) +diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4 +index dad91d9..228b491 100644 +--- a/src/cf/linux-test4.m4 ++++ b/src/cf/linux-test4.m4 +@@ -395,7 +395,7 @@ AC_DEFUN([LINUX_REGISTER_SYSCTL_TABLE_NOFLAG], [ + AC_CHECK_LINUX_BUILD([whether register_sysctl_table has an insert_at_head argument], + [ac_cv_linux_register_sysctl_table_noflag], + [#include <linux/sysctl.h>], +- [ctl_table *t; register_sysctl_table (t);], ++ [struct ctl_table *t; register_sysctl_table (t);], + [REGISTER_SYSCTL_TABLE_NOFLAG], + [define if register_sysctl_table has no insert_at head flag], + []) +-- +1.7.1 diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 4b5eb80b9741..4f4ec5cbc069 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { patches = [ ./f3c0f74186f4a323ffc5f125d961fe384d396cac.patch ./ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch + ./I5558c64760e4cad2bd3dc648067d81020afc69b6.patch + ./If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch ]; buildInputs = [ autoconf automake flex yacc ncurses perl which ]; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 0efdd542fa4e..04f820223731 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mariadb-${version}"; - version = "10.0.13"; + version = "10.0.14"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "039wz89vs03a27anpshj5xaqknm7cqi7mrypvwingqkq26ns0mhs"; + sha256 = "07g3w841q8qw0mwi6grk65a2iky9x3axpxkb4c2a72i7pd7cl3mc"; }; buildInputs = [ cmake ncurses openssl bison boost libxml2 judy libevent groff ] diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 4807052478c0..b4611a4bb10c 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.4.21"; in +let version = "8.4.22"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "388f67e59f2a16c27e84f50656f5d755adf3d0a883138366d091aa0c727c1e2c"; + sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix new file mode 100644 index 000000000000..4bd1b594c268 --- /dev/null +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, lua5, luasocket, luasec, luaexpat, luafilesystem, libidn, openssl, makeWrapper }: + +let + libs = [ luasocket luasec luaexpat luafilesystem ]; + getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}"; + getLuaPath = lib : getPath lib "lua"; + getLuaCPath = lib : getPath lib "so"; + luaPath = stdenv.lib.concatStringsSep ";" (map getLuaPath libs); + luaCPath = stdenv.lib.concatStringsSep ";" (map getLuaCPath libs); +in + +stdenv.mkDerivation rec { + version = "0.9.4"; + name = "prosody-${version}"; + src = fetchurl { + url = "http://prosody.im/downloads/source/${name}.tar.gz"; + sha256 = "be87cf31901a25477869b4ebd52e298f63a5effacae526911a0be876cc82e1c6"; + }; + + buildInputs = [ lua5 luasocket luasec luaexpat libidn openssl makeWrapper ]; + + configureFlags = [ + "--ostype=linux" + "--with-lua-include=${lua5}/include" + "--with-lua=${lua5}" + ]; + + postInstall = '' + wrapProgram $out/bin/prosody \ + --set LUA_PATH '"${luaPath};"' \ + --set LUA_CPATH '"${luaCPath};"' + wrapProgram $out/bin/prosodyctl \ + --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \ + --set LUA_PATH '"${luaPath};"' \ + --set LUA_CPATH '"${luaCPath};"' + ''; + + meta = { + description = "Open-source XMPP application server written in Lua"; + license = stdenv.lib.licenses.mit; + homepage = http://www.prosody.im; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.flosse ]; + }; +} diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 03ecc290d14c..d165f2f386a1 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fish-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "http://fishshell.com/files/${version}/${name}.tar.gz"; - sha256 = "0i7h3hx8iszli3d4kphw79sz9m07f2lc2c9hr9smdps5s7wpllmg"; + sha256 = "b7e4d3c3d55fc3859edcb20462fcf0d14ab26e920eddcd503072e8105284d924"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 349d1719e567..9887e8f1b6f4 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.0.6"; + version = "5.0.7"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2"; - sha256 = "1mngi85q56szzlrdzv60vg7wl03lih8vlnl800gwr0i6d1laawxj"; + sha256 = "1wgw16r7z6k3mbr94mwfc8f13yc4ds2d9qk41hvsiv6rm5dnds23"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2"; - sha256 = "0ic86y35v82d87ixjzdb6zrnzf002b7gn573jnva6cqm2jdm1jl4"; + sha256 = "1cq4cz7ngvmbg399dva3g6njcz5d92gprmyi2swqc0klh7g2fkjl"; }; buildInputs = [ ncurses coreutils pcre ]; diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix index 12bb2903107c..ca010063cb19 100644 --- a/pkgs/tools/X11/xmacro/default.nix +++ b/pkgs/tools/X11/xmacro/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/xmacro/xmacro-pre0.3-20000911.tar.gz; - md5 = "d2956b82f3d5380e58a75ccc721fb746"; + sha256 = "04gzgxhp8bx98zrcvmsm7mn72r9g9588skbf64cqvkp4yz6kfqhb"; }; preBuild = '' diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index 1db7a7a42ebc..7e2934a8f88a 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl}: +{stdenv, fetchurl, perl, bash}: stdenv.mkDerivation rec { name = "atool-0.39.0"; @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl ]; + configureScript = "${bash}/bin/bash configure"; meta = { homepage = http://www.nongnu.org/atool; diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index fdba02d12b72..342c975fa1f5 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, fuse, perl }: stdenv.mkDerivation rec { - name = "cromfs-1.5.10.1"; + name = "cromfs-1.5.10.2"; src = fetchurl { url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; - sha256 = "0fg6vnbxr5jk4gqj31yqc9fj1gp3bj955qhxav28nvc6sbql7ac2"; + sha256 = "0xy2x1ws1qqfp7hfj6yzm80zhrxzmhn0w2yns77im1lmd2h18817"; }; patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure''; diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix index 47db0877dd20..f900a81caa0e 100644 --- a/pkgs/tools/bluetooth/obexd/default.nix +++ b/pkgs/tools/bluetooth/obexd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez, libical }: stdenv.mkDerivation rec { - name = "obexd-0.47"; + name = "obexd-0.48"; src = fetchurl { - url = "mirror://kernel/linux/bluetooth/${name}.tar.gz"; - sha256 = "15zw008098qr5az9y1c010yv8gkw1f6hi3mnfcvpmwxwh23kfh4i"; + url = "mirror://kernel/linux/bluetooth/${name}.tar.bz2"; + sha256 = "1i20dnibvnq9lnkkhajr5xx3kxlwf9q5c4jm19kyb0q1klzgzlb8"; }; buildInputs = [ glib dbus.libs openobex bluez libical ]; diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 218ea9a1e7ff..c5595fab2e0b 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }: stdenv.mkDerivation rec { - name = "xorriso-1.3.4"; + name = "xorriso-1.3.8"; src = fetchurl { url = "mirror://gnu/xorriso/${name}.tar.gz"; - sha256 = "0wvxbvkpdydcbmqi9xz7nv8cna6vp9726ahmmxxyx56cz4xifr4x"; + sha256 = "0zhhj9lr9z7hnb2alac54mc28w1l0mbanphhpmy3ylsi8rih84lh"; }; doCheck = true; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index cc304d9aa1e5..196fce0d98ac 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, less }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "gzip-1.6"; diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 2c6907fa373e..b3d407c98ef1 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { - name = "lzip-1.15"; + name = "lzip-1.16"; buildInputs = [ texinfo ]; src = fetchurl { url = "mirror://savannah/lzip/${name}.tar.gz"; - sha256 = "1dh5vmj5apizfawnsm50y7z064yx7cz3313przph16gwd3dgrlvw"; + sha256 = "0l9724rw1l3hg2ldr3n7ihqich4m9nc6y7l302bvdj4jmxdw530j"; }; configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3"; diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix index a07deac41486..db47cf71910c 100644 --- a/pkgs/tools/compression/zdelta/default.nix +++ b/pkgs/tools/compression/zdelta/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { builder = ./builder.sh; src = fetchurl { url = "${meta.homepage}/downloads/${name}.tar.gz"; - md5 = "c69583a64f42f69a39e297d0d27d77e5"; + sha256 = "0k6y0r9kv5qiglnr2j4a0yvfynjkvm0pyv8ly28j0pr3w6rbxrh3"; }; meta = { diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index c68eaab14d16..7edf0f37e05d 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -14,18 +14,15 @@ let in stdenv.mkDerivation rec { name="ceph-${version}"; - version="0.85"; + version="0.86"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; - rev = "refs/tags/v0.85"; - sha256 = "0g98cgrs3gfsc8azg3k0n61bgna2w906qm69j4qbjkb61l83ld1z"; + rev = "refs/tags/v${version}"; + sha256 = "19bl96z97kvsrliwid4g6dl7s3i0nw5z9nmg964i7jdwlsl98cfj"; }; - patches = [ - ./0001-Cleanup-boost-optionals.patch # Remove in 0.86 - ./0001-Makefile-env-Don-t-force-sbin.patch - ]; + patches = [ ./0001-Makefile-env-Don-t-force-sbin.patch ]; nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]; buildInputs = [ diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index bec5592ccaed..facaac8cea79 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, xz }: stdenv.mkDerivation rec { - name = "squashfs-4.2"; + name = "squashfs-4.3"; src = fetchurl { - url = mirror://sourceforge/squashfs/squashfs4.2.tar.gz; - sha256 = "15if08j0pl5hmnz9pwshwrp4fjp0jsm9larjxmjvdnr2m5d1kq6r"; + url = mirror://sourceforge/squashfs/squashfs4.3.tar.gz; + sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d"; }; buildInputs = [ zlib xz ]; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 07fbbc967d91..fcc06871ef15 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { meta = { description = "A program for visualising graphs"; homepage = http://www.graphviz.org/; + branch = "2.0"; }; } diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 0a86a8924174..801795397014 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ]; inherit version; + branch = "2.32"; }; } diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 1984ab7b1de8..bc1f86e36612 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "optipng-0.7.4"; + name = "optipng-0.7.5"; src = fetchurl { url = "mirror://sourceforge/optipng/${name}.tar.gz"; - sha256 = "1zrphbz17rhhfl1l95q5s979rrhifbwczl2xj1fdrnq5jid5s2sj"; + sha256 = "17b197437z5wn29llpwklk7ihgx8bhc913gvjf4zyb81idwlprbl"; }; buildInputs = [ libpng ]; diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index cf3722bbf1f6..f540029cbc73 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { builder = ./builder.sh; src = fetchurl { url = ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz; - md5 = "742de0f7a3cae74d247bbd0c70dd9dd7"; + sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4"; }; buildInputs = [zlib libjpeg libpng imake]; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 71ec1276c7c9..9f91a1acc608 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -3,11 +3,11 @@ , automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection }: stdenv.mkDerivation rec { - name = "colord-1.1.7"; + name = "colord-1.2.3"; src = fetchurl { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; - sha256 = "295395526ee0be30917ae9c352e68bfeb20c7fc266a605725bef969f20547f44"; + sha256 = "1z3l6hb3b08fixfra6m887a2j3lvhib6vp798ik16jfh375gr490"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix new file mode 100644 index 000000000000..dabf843fc83b --- /dev/null +++ b/pkgs/tools/misc/datamash/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "datamash-${version}"; + version = "1.0.6"; + + src = fetchurl { + url = "http://ftp.gnu.org/gnu/datamash/${name}.tar.gz"; + sha256 = "0154c25c45b5506b6d618ca8e18d0ef093dac47946ac0df464fb21e77b504118"; + }; + + meta = { + description = "GNU datamash"; + homepage = http://www.gnu.org/software/datamash/; + platforms = stdenv.lib.platforms.all; + }; + +} diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix index f433db68a640..fd0f647bf5df 100644 --- a/pkgs/tools/misc/dbacl/default.nix +++ b/pkgs/tools/misc/dbacl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dbacl-1.14"; src = fetchurl { url = "http://www.lbreyer.com/gpl/${name}.tar.gz"; - md5 = "85bfd88bc20f326dc0f31e794948e21c"; + sha256 = "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7"; }; meta = { diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index 41bc2ffc99df..d181388f6c7b 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -5,6 +5,6 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = http://tarballs.nixos.org/getopt-1.1.4.tar.gz; - md5 = "02188ca68da27c4175d6e9f3da732101"; + sha256 = "1arvjfzw6p310zbgv629w5hkyslrj44imf3r3s2r4ry2jfcks221"; }; } diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 4f4931e004f2..ae437b3c3e78 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; - md5 = "cd3f3eb54446be6003156158d51f4884"; + sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; }; # Lots of patches from Gentoo, in particular splash screen support diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix index 2d0b0015f9dc..376550200620 100644 --- a/pkgs/tools/misc/gummiboot/default.nix +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-45.tar.xz/5d4957390e959cb9f325b87712ddd3f1/gummiboot-45.tar.xz; - md5 = "5d4957390e959cb9f325b87712ddd3f1"; + sha256 = "15227d6abi90vg7rs234fm13af511nsd6dv87c3jvsjhgb9ib0hm"; }; meta = { diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix index 96acc6c8ab93..7d0963c2bb0f 100644 --- a/pkgs/tools/misc/ised/default.nix +++ b/pkgs/tools/misc/ised/default.nix @@ -1,42 +1,17 @@ -x@{builderDefsPackage - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="ised"; - version = "2.6.0"; - name="${baseName}-${version}"; - url="mirror://sourceforge/project/ised/${name}.tar.bz2"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; +stdenv.mkDerivation rec { + name = "ised-${version}"; + version = "2.6.0"; + src = fetchurl { + url = "mirror://sourceforge/project/ised/${name}.tar.bz2"; sha256 = "0rf9brqkrad8f3czpfc1bxq9ybv3nxci9276wdxas033c82cqkjs"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - meta = { description = "A numeric sequence editor"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl3Plus; - inherit version; + maintainers = with stdenv.lib.maintainers; [ raskin ]; + platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl3Plus; }; -}) x - +} diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 6d03b09c588f..39987a3b605a 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "lbdb-${version}"; src = fetchurl { url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz"; - md5 = "a8e65f1400c90818ff324dc4fd67eba2"; + sha256 = "1279ssfrh4cqrjzq5q47xbdlw5qx3aazxjshi86ljm4cw6xxvgar"; }; buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) finger_bsd; diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 48e31246426a..615063bbbcc8 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "less-468"; + name = "less-470"; src = fetchurl { url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz"; - sha256 = "1s36hppwcrvf2csw5xyjrbkyyfgshqp5vfg32ms480hdn76bbs28"; + sha256 = "1vw6bp9wkr2ymvhmf0ikrv8m1zm5ww78s48ny7ks0zjf2i8xr4gi"; }; # Look for ‘sysless’ in /etc. diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix new file mode 100644 index 000000000000..c019803f9035 --- /dev/null +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchzip }: + +# Note that plugins are supposed to be installed as: +# $path/logstash/{inputs,codecs,filters,outputs}/*.rb +stdenv.mkDerivation rec { + version = "1.4.2"; + name = "logstash-contrib-${version}"; + + src = fetchzip { + url = "http://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz"; + sha256 = "1yj8sf3b526gixh3c6zhgkfpg4f0c72p1lzhfhdx8b3lw7zjkj0k"; + }; + + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + + installPhase = '' + mkdir -p $out/logstash + cp -r lib/* $out + ''; + + meta = with lib; { + description = "Community-maintained logstash plugins"; + homepage = https://github.com/elasticsearch/logstash-contrib; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/tools/misc/mssys/default.nix b/pkgs/tools/misc/mssys/default.nix index 6d3634ea7af9..3e37009c723b 100644 --- a/pkgs/tools/misc/mssys/default.nix +++ b/pkgs/tools/misc/mssys/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/ms-sys/ms-sys-2.1.3.tgz; - md5 = "6fad0a69ac89440ad4f696dbbbf11497"; + sha256 = "05djdqp7gqfrfb4czrmbgxgd8qr0h3781gzqvsp3qhfx6ay37z0p"; }; buildInputs = [gettext]; diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index cf41de29c500..b8b90333c00f 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonPackage rec { src = fetchurl { url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2"; - md5 = "b771872a9483cf92be90a3e4420fd3c9"; + sha256 = "1rl854izwn1fpaaib6zj7a1a9bis8n7w4zfxcapgfffj37zj0dy2"; }; configurePhase = "export DETERMINISTIC_BUILD=1"; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 6e3f8edbb9ca..daf9d3444009 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc" + configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc --enable-colors256" sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in ''; diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 84f0f63bd252..85d3049b2707 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "units-2.10"; + name = "units-2.11"; src = fetchurl { - url = mirror://gnu/units/units-2.10.tar.gz; - sha256 = "0fa4bk5aqyis5zisz6l8mqqk76njj6zgx3pbrjp5kvraz1dz78lc"; + url = mirror://gnu/units/units-2.11.tar.gz; + sha256 = "1gjs3wc212aaiq4r76hx9nl1h3fa39n0ljwl9420d6ixl3rdmdjk"; }; meta = { diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix index b7f2be179c47..4206f468ec76 100644 --- a/pkgs/tools/misc/venus/default.nix +++ b/pkgs/tools/misc/venus/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = "python runtests.py"; - buildInputs = [ python python.modules.bsddb python.modules.ssl libxslt + buildInputs = [ python python.modules.bsddb libxslt libxml2 pythonPackages.genshi pythonPackages.lxml makeWrapper ]; installPhase = '' diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 94c466612ef5..8c85d99f2173 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssh}: stdenv.mkDerivation { - name = "autossh-1.4c"; + name = "autossh-1.4d"; src = fetchurl { - url = "http://www.harding.motd.ca/autossh/autossh-1.4c.tgz"; - sha256 = "07gxqxfsk24msd0py0hirvmlblh9iyxkcrq86bwbsils81mbmjkg"; + url = "http://www.harding.motd.ca/autossh/autossh-1.4d.tgz"; + sha256 = "05nwvqfyk0kbalwabj4z3xx11i0qdqg6xadzk17ckr5xb3j8y000"; }; buildInputs = [ openssh ]; diff --git a/pkgs/tools/networking/cutter/default.nix b/pkgs/tools/networking/cutter/default.nix index 5d383f072102..ad7d25404069 100644 --- a/pkgs/tools/networking/cutter/default.nix +++ b/pkgs/tools/networking/cutter/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.digitage.co.uk/digitage/files/cutter/${name}.tgz"; - md5 = "50093db9b64277643969ee75b83ebbd1"; + sha256 = "05cn22wi70l9ybhmzw0sy3fd6xxz0lq49fws4zxzm2i0qb3zmx2d"; }; installPhase = '' diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 7fdb548e7b05..952771318be6 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -2,7 +2,7 @@ a : let s = import ./src-for-default.nix; buildInputs = with a; [ - openssl gmp + openssl gmp zlib ]; in rec { diff --git a/pkgs/tools/networking/gvpe/src-for-default.nix b/pkgs/tools/networking/gvpe/src-for-default.nix index 88264c5d7715..3db30de0bdd9 100644 --- a/pkgs/tools/networking/gvpe/src-for-default.nix +++ b/pkgs/tools/networking/gvpe/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="2.24"; - name="gvpe-2.24"; - hash="1szwia7n24fx9n40yvmdidna55b97459ccq6d2c4863q4pfkqpjy"; - url="mirror://gnu/gvpe/gvpe-${version}.tar.gz"; - advertisedUrl="http://ftp.gnu.org/gnu/gvpe/gvpe-2.24.tar.gz"; + version="2.25"; + name="gvpe-2.25"; + hash="1gsipcysvsk80gvyn9jnk9g0xg4ng9yd5zp066jnmpgs52d2vhvk"; + url="http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; + advertisedUrl="http://ftp.gnu.org/gnu/gvpe/gvpe-2.25.tar.gz"; } diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index ce90bed30106..a821684e5b4b 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, gnutls }: -stdenv.mkDerivation rec { - name = "inadyn-1.98.1"; +let + ver = "1.99.10"; +in +stdenv.mkDerivation { + name = "inadyn-${ver}"; src = fetchurl { - url = "https://github.com/downloads/troglobit/inadyn/${name}.tar.bz2"; - sha256 = "1qkwmln9ccqbs5cldwximi1maapvzkm7mssxgff71n981d8ad83j"; + url = "https://github.com/troglobit/inadyn/archive/${ver}.tar.gz"; + sha256 = "0m3qnnq99siwf1ybcvbzdawk68lxf61vd13fw1f2ssl2m07hfxg3"; }; preConfigure = '' export makeFlags=prefix=$out ''; + buildInputs = [ gnutls ]; + meta = { homepage = http://inadyn.sourceforge.net/; description = "Free dynamic DNS client"; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 51ab3478ac93..4a491d8ad04d 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gnutls, pkgconfig, readline, zlib }: stdenv.mkDerivation rec { - name = "lftp-4.5.2"; + name = "lftp-4.5.5"; src = fetchurl { - url = "http://lftp.yar.ru/ftp/${name}.tar.gz"; - sha256 = "106llhq9lgvdxlf4r1p94r66fcy5ywfdfvins4dfn9irg0k5gzyv"; + url = "http://lftp.yar.ru/ftp/${name}.tar.bz2"; + sha256 = "11885mj0xk5b1mnvf63s33874x7fcg87bszsyalxwsab4yfplam3"; }; patches = [ ./no-gets.patch ]; diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index c7bbf3892d29..8619eb798479 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.105.orig.tar.gz"; - md5 = "7e67b22f1ad41a1b7effbb59ff28fca1"; + sha256 = "07i1vcz8ycnfwsvz356rqmim8akfh8yhjzmhc5mqf5hmdkk3yra0"; }) (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.105-7.debian.tar.gz"; - md5 = "e914f8eb7eda5c75c679dd77787ac76b"; + sha256 = "0qxkhbwcifrps34s5mzzg79cmkvz3f96gphd3pl978pygwr5krzf"; }) ]; diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix index 94ae6ea0630c..5ad5540438c7 100644 --- a/pkgs/tools/networking/netcat/default.nix +++ b/pkgs/tools/networking/netcat/default.nix @@ -4,6 +4,6 @@ stdenv.mkDerivation { name = "netcat-gnu-0.7.1"; src = fetchurl { url = mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2; - md5 = "0a29eff1736ddb5effd0b1ec1f6fe0ef"; + sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"; }; } diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix index ffa360f3de4b..246a32f134c2 100644 --- a/pkgs/tools/networking/p2p/azureus/default.nix +++ b/pkgs/tools/networking/p2p/azureus/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = http://tarballs.nixos.org/Azureus2.3.0.6.jar; - md5 = "84f85b144cdc574338c2c84d659ca620"; + sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd"; }; # buildInputs = [unzip]; inherit jdk swt; diff --git a/pkgs/tools/networking/p2p/libtorrent/git.nix b/pkgs/tools/networking/p2p/libtorrent/git.nix new file mode 100644 index 000000000000..9a46740de51b --- /dev/null +++ b/pkgs/tools/networking/p2p/libtorrent/git.nix @@ -0,0 +1,28 @@ +{ stdenv, autoconf, automake, cppunit, fetchFromGitHub, pkgconfig, openssl, libsigcxx, libtool, zlib }: + +stdenv.mkDerivation { + name = "libtorrent-git"; + + src = fetchFromGitHub rec { + owner = "rakshasa"; + repo = "libtorrent"; + rev = "c60d2b9475804e41649356fa0301e9f770798f8d"; + sha256 = "1x78g5yd4q0ksdsw91awz2a1ax8zyfy5b53gbbil4fpjy96vb577"; + }; + + buildInputs = [ autoconf automake cppunit pkgconfig openssl libsigcxx libtool zlib ]; + + configureFlags = "--disable-dependency-tracking --enable-aligned"; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = "http://libtorrent.rakshasa.no/"; + description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ codyopel ]; + }; +} \ No newline at end of file diff --git a/pkgs/tools/networking/p2p/rtorrent/git.nix b/pkgs/tools/networking/p2p/rtorrent/git.nix new file mode 100644 index 000000000000..6320a75f726a --- /dev/null +++ b/pkgs/tools/networking/p2p/rtorrent/git.nix @@ -0,0 +1,63 @@ +{ stdenv, autoconf, automake, cppunit, curl, fetchFromGitHub +, fetchurl, libsigcxx, libtool, libtorrent-git, ncurses, openssl +, pkgconfig, zlib, xmlrpc_c +, colorSupport ? false +}: + +# NOTICE: changes since 0.9.4 break the current configuration syntax, an +# example configuration file using the latest changes can be found at +# https://github.com/codyopel/dotfiles/blob/master/dotfiles/rtorrent.rc + +stdenv.mkDerivation { + name = "rtorrent-git"; + + src = fetchFromGitHub { + owner = "rakshasa"; + repo = "rtorrent"; + rev = "7537a3c2a91d0915f1c4c89b01cd583629dc5fd4"; + sha256 = "1xnyjjff575jfq9c542yq3rr9q03z5x6xbg84d000wkjphbq7h7q"; + }; + + buildInputs = [ + autoconf + automake + cppunit + libtorrent-git + ncurses + pkgconfig + libsigcxx + libtool + curl + zlib + openssl + xmlrpc_c + ]; + + configureFlags = "--with-xmlrpc-c"; + + # Optional patch adds support for custom configurable colors + # https://github.com/Chlorm/chlorm_overlay/blob/master/net-p2p/rtorrent/README.md + + patches = stdenv.lib.optional colorSupport (fetchurl { + url = "https://gist.githubusercontent.com/codyopel/a816c2993f8013b5f4d6/raw/b952b32da1dcf14c61820dfcf7df00bc8918fec4/rtorrent-color.patch"; + sha256 = "00gcl7yq6261rrfzpz2k8bd7mffwya0ifji1xqcvhfw50syk8965"; + }); + + preConfigure = '' + ./autogen.sh + ''; + + # postInstall = '' + # mkdir -p $out/share/man/man1 $out/share/rtorrent + # mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 + # mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc + # ''; + + meta = with stdenv.lib; { + homepage = "http://libtorrent.rakshasa.no/"; + description = "An ncurses client for libtorrent, ideal for use with screen or dtach"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ codyopel ]; + }; +} \ No newline at end of file diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index c94ab37f1ea9..bb5bee8868f9 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/parchive/par2cmdline-0.4.tar.gz; - md5 = "1551b63e57e3c232254dc62073b723a9"; + sha256 = "0xznx4vgf9nd0ijm2xi2zrb42wb891ypa948z54q5jkvrzdvfcly"; }; patches = [ diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 15bd74ea387d..039f9bc09139 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.03"; + version = "5.05"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "00yx7r46rad3yhdqfwk4grqs87wc6fiq055i91pnwxgscsa3c7ls"; + # SHA256 provided by upstream. + sha256 = "c7e1653345150db7e48d00e1129cf571c7c85de8e7e1aa70b21cf1d76b1e31ef"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 2db270c3f666..6744fb7c5515 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.5.1"; + name = "tcpdump-4.6.2"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "15hb7zkzd66nag102qbv100hcnf7frglbkylmr8adwr8f5jkkaql"; + sha256 = "1f701387jyxq7rjhv4hiig3b3g55m4b4403rd0zncv1sx3cf8kjj"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index 3300d12ebfa3..0762254b706f 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Tracks the route taken by packets over an IP network"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.koral ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index 2190a1ffbe63..24d88517b6a4 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "apg-2.2.3"; + name = "apg-2.3.0b"; src = fetchurl { url = "http://www.adel.nursat.kz/apg/download/${name}.tar.gz"; - sha256 = "1fkxpaifv925i385krsyslrig42ksws5y19hfq5asn1rwv6zmjb9"; + sha256 = "14lbq81xrcsmpk1b9qmqyz7n6ypf08zcxvcvp6f7ybcyf0lj1rfi"; }; configurePhase = '' substituteInPlace Makefile --replace /usr/local "$out" diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix index 53f784396a72..3675c8bc390f 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { - name = "gnupg-1.4.17"; + name = "gnupg-1.4.18"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0nvv1bd8v13gh2m1429azws7ks0ix9y1yv87ak9k9i1dsqcrvpg6"; + sha256 = "1233bppjvdpbbl425ii6l7xvgy0879ghhnmwrph5b6c4g3dgvddp"; }; buildInputs = [ readline bzip2 ]; diff --git a/pkgs/tools/security/mkrand/default.nix b/pkgs/tools/security/mkrand/default.nix new file mode 100644 index 000000000000..5d1cfdd40232 --- /dev/null +++ b/pkgs/tools/security/mkrand/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mkrand-0.1.0"; + + src = fetchurl { + url = "https://github.com/mknight-tag/MKRAND/releases/download/v0.1.0/mkrand-0.1.0.tar.gz"; + sha256 = "1irwyv2j5c3606k3qbq77yrd65y27rcq3jdlp295rz875q8iq9fs"; + }; + + doCheck = true; + + meta = { + description = "A Digital Random Bit Generator"; + longDescription = "MKRAND is a utility for generating random information."; + homepage = https://github.com/mknight-tag/MKRAND/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; + } diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix index 377639ce2e60..117f1e016ac6 100644 --- a/pkgs/tools/security/p0f/default.nix +++ b/pkgs/tools/security/p0f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "p0f-${version}"; - version = "3.06b"; + version = "3.07b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/p0f3/releases/${name}.tgz"; - sha256 = "1rydqvr78a3rjp9iwfbw4bs7jfb4p22962makdgw8yjmw8dr6lfi"; + sha256 = "18hbkwvh8maswhka0cyq0rwznz8yacnf4h1jmvb8krz0695rmz2w"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index c5c474417046..fd97a6e618d5 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -2,17 +2,13 @@ stdenv.mkDerivation rec { name = "ssdeep-${version}"; - version = "2.10"; + version = "2.11"; src = fetchurl { url = "mirror://sourceforge/ssdeep/${name}.tar.gz"; - sha256 = "1p7dgchq8hgadnxz5qh95ay17k5j74l4qyd15wspc54lb603p2av"; + sha256 = "1izzkvrng4cc2p8gxp3w32k1v60l2yaq2y2hkifgq9s1yh30xk42"; }; - postFixup = stdenv.lib.optionalString stdenv.isLinux '' - 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"; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 167c369e3bb9..1448aa93c7d7 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.10p3"; + name = "sudo-1.8.11"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "002l6h27pnhb77b65frhazbhknsxvrsnkpi43j7i0qw1lrgi7nkf"; + sha256 = "0if82pvmz7m3qkj3sc9yy8mpcd7lmbn0mhrgnd1zpszvnpkps5x3"; }; configureFlags = [ diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index 71f7d25155f3..3a52b9050244 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "hydra-7.5"; + name = "thc-hydra-7.5"; src = fetchurl { url = "http://www.thc.org/releases/${name}.tar.gz"; diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix index 4491bf7e4841..fd17cef8f1ca 100644 --- a/pkgs/tools/system/ansible/default.nix +++ b/pkgs/tools/system/ansible/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pythonPackages, python }: pythonPackages.buildPythonPackage rec { - version = "1.7.1"; + version = "1.7.2"; name = "ansible-${version}"; namePrefix = ""; src = fetchurl { url = "http://releases.ansible.com/ansible/ansible-${version}.tar.gz"; - sha1 = "4f4be4d45f28f52e4ab0c063efb66c7b9f482a51"; + sha256 = "1b4qhh6a8z18q7lfa7laxb3p0f7sacvv7nlbr2lix0vznhbffz51"; }; prePatch = '' diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index 0cf29a67b9da..e465b16b614a 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cron-4.1"; src = fetchurl { url = ftp://ftp.isc.org/isc/cron/cron_4.1.shar; - md5 = "5e1be9dbde66295821ac7899f2e1f561"; + sha256 = "16n3dras4b1jh7g958nz1k54pl9pg5fwb3fvjln8z67varvq6if4"; }; unpackCmd = "(mkdir cron && cd cron && sh $curSrc)"; diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix index a652a1e84ef4..5827a11714d6 100644 --- a/pkgs/tools/system/fakechroot/default.nix +++ b/pkgs/tools/system/fakechroot/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/dex4er/fakechroot/archive/${version}.tar.gz"; - md5 = "e614f62972efa4654fc780ae7e4affad"; + sha256 = "0z4cxj4lb8cfb63sw82dbc31hf082fv3hshbmhk49cqkc0f673q3"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 6fa374ebe55a..027017247b74 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -2,14 +2,14 @@ let pkgname = "ipmitool"; - version = "1.8.13"; + version = "1.8.14"; in stdenv.mkDerivation { name = "${pkgname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pkgname}/${pkgname}-${version}.tar.gz"; - sha256 = "0drkfa1spqh1vlzrx7jwm3cw1qar46a9xvqsgycn92ylgsr395n1"; + sha256 = "1avlb0lwqncd28hp6p5w3rkcnhgy84rgv1jdgkyy0gzqhx2wx6zy"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix new file mode 100644 index 000000000000..3eaa85e41eaa --- /dev/null +++ b/pkgs/tools/system/proot/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, talloc }: + +stdenv.mkDerivation rec { + name = "proot-${version}"; + version = "4.0.3"; + + src = fetchgit { + url = "git://github.com/cedric-vincent/proot.git"; + rev = "refs/tags/v${version}"; + sha256 = "95a52b2fa47b2891eb2c6b6b0e14d42f6d48f6fd5181e359b007831f1a046e84"; + }; + + buildInputs = [ talloc ]; + + preBuild = '' + substituteInPlace GNUmakefile --replace "/usr/local" "$out" + ''; + + sourceRoot = "git-export/src"; + + meta = with stdenv.lib; { + homepage = http://proot.me; + description = "User-space implementation of chroot, mount --bind and binfmt_misc"; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.ianwookim ]; + }; +} + diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 0290d1961ce5..87f19640f7ff 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -9,11 +9,11 @@ let }; in stdenv.mkDerivation rec { - name = "smartmontools-6.2"; + name = "smartmontools-6.3"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; - sha256 = "0nq6jvfh8nqwfrvp6fb6qs2rdydi3i9xgpi7p7vb83xvg42ncvs8"; + sha256 = "06gy71jh2d3gcfmlbbrsqw7215knkfq59q3j6qdxfrar39fhcxx7"; }; patchPhase = '' diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix new file mode 100644 index 000000000000..ff846ac0933d --- /dev/null +++ b/pkgs/tools/text/discount/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl}: +stdenv.mkDerivation rec { + version = "2.1.6"; + name = "discount-${version}"; + + src = fetchurl { + url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2"; + sha256 = "15h726m5yalq15hkxxfw4bxwd6wkwkan5q7s80pgi1z32ygb4avh"; + }; + patches = ./fix-configure-path.patch; + configureScript = "./configure.sh"; + + meta = with stdenv.lib; { + description = "Implementation of Markdown markup language in C"; + homepage = "http://www.pell.portland.or.us/~orc/Code/discount/"; + license = licenses.bsd3; + maintainers = [ maintainers.shell ]; + }; +} diff --git a/pkgs/tools/text/discount/fix-configure-path.patch b/pkgs/tools/text/discount/fix-configure-path.patch new file mode 100644 index 000000000000..045b369b4b69 --- /dev/null +++ b/pkgs/tools/text/discount/fix-configure-path.patch @@ -0,0 +1,12 @@ +diff -rupN discount-2.1.6-original/configure.inc discount-2.1.6/configure.inc +--- discount-2.1.6-original/configure.inc 2014-10-10 15:34:24.158325345 +0100 ++++ discount-2.1.6/configure.inc 2014-10-10 15:34:33.553325321 +0100 +@@ -32,7 +32,7 @@ + # this preamble code is executed when this file is sourced and it picks + # interesting things off the command line. + # +-ac_default_path="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin" ++ac_default_path=$PATH + + ac_standard="--src=DIR where the source lives (.) + --prefix=DIR where to install the final product (/usr/local) diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix new file mode 100644 index 000000000000..1ac9901a8e17 --- /dev/null +++ b/pkgs/tools/text/gist/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchurl +, makeWrapper +, ruby +, rake +}: + +let version = "v4.3.0"; +in stdenv.mkDerivation rec { + name = "gist-${version}"; + + src = fetchurl { + url = "https://github.com/defunkt/gist/archive/${version}.tar.gz"; + sha256 = "92b91ffe07cc51ca8576b091e7123b851ee0d7d2d3f0e21d18b19d8bd8f9aa47"; + }; + + buildInputs = [ rake makeWrapper ]; + + installPhase = '' + rake install prefix=$out + + wrapProgram $out/bin/gist \ + --prefix PATH : ${ruby}/bin \ + ''; + + meta = { + homepage = "http://defunkt.io/gist/"; + description = "upload code to https://gist.github.com (or github enterprise)"; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix index be49ba509200..619e1f8d9b1b 100644 --- a/pkgs/tools/text/peco/default.nix +++ b/pkgs/tools/text/peco/default.nix @@ -3,27 +3,27 @@ let go-flags = fetchgit { url = "git://github.com/jessevdk/go-flags"; - rev = "4f0ca1e2d1349e9662b633ea1b8b8d48e8a32533"; - sha256 = "5f22f4c5a0529ff0da8e507462ad910bb73c513fde49d58dd4baf7332787ca3d"; + rev = "ef51ed2000ee1721c7153e958511907b844b4a9c"; + sha256 = "1abzc7ksglicaz6g6nry006vwvflsidvyzyig85pi3p852z6sc2j"; }; go-runewidth = fetchgit { url = "git://github.com/mattn/go-runewidth"; - rev = "36f63b8223e701c16f36010094fb6e84ffbaf8e0"; - sha256 = "718e9e04659441744b8d43bd3d7e806836194cf322962712a6e019311d407ecf"; + rev = "63c378b851290989b19ca955468386485f118c65"; + sha256 = "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d"; }; termbox-go = fetchgit { url = "git://github.com/nsf/termbox-go"; - rev = "4e63c3a917c197694cb4fef6c55582500b3741e3"; - sha256 = "00ecc0dcf0919a42ea06fe3bd93480a17241160c434ff3872b6f5e418eb18069"; + rev = "bb19a81afd4bc2729799d1fedb19f7bd7ee284cf"; + sha256 = "1zc8pb594l16yipis6xg2ra84bg315p63wqxa5abyam1y0333sn0"; }; in stdenv.mkDerivation rec { name = "peco-${version}"; - version = "0.2.3"; + version = "0.2.10"; src = fetchgit { url = "git://github.com/peco/peco"; - rev = "b8e0c8f37d3eed68e64c931b0edb77728f3723f9"; - sha256 = "f178e01ab0536770b17eddcefd863e68c2d65b527b5da1fc3fb9efb19c12635f"; + rev = "4952013023ae1d92c10d826e6970c5a68959678d"; + sha256 = "02fwmxhaydx9m6q146amq1aw44abzisskkblmv1sjxrm37x81l31"; }; buildInputs = [ go ]; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index aea3ab2bd968..74f7e08900a7 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libxml2, libxslt }: stdenv.mkDerivation rec { - name = "xmlstarlet-1.5.0"; + name = "xmlstarlet-1.6.1"; src = fetchurl { url = "mirror://sourceforge/xmlstar/${name}.tar.gz"; - sha256 = "1fmvqvzrzyfcg53j39sdz01v7klzyhd011m3y9br54525q2fvd27"; + sha256 = "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m"; }; buildInputs = [ pkgconfig libxml2 libxslt ]; diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index 3ff89294ab1d..e1957333b3fb 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://tarballs.nixos.org/xpf-0.2.tar.gz; - md5 = "d92658828139e1495e052d0cfe25d312"; + sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz"; }; buildInputs = [python libxml2]; diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index cbbeecc96d33..1545b626a7f2 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "xmlroff-0.3.98"; src = fetchurl { url = mirror://sourceforge/xmlroff/xmlroff-0.3.98.tar.gz; - md5 = "6c1d05b6480e98870751bf9102ea68e2"; + sha256 = "0pg7zc8ri0xzmdk30vnyd84wy8yn973h1bnrvibv71q44s6xhwp2"; }; buildInputs = [ diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index f2f77bd84cd4..55f54e2cf3de 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonPackage rec { src = fetchurl { url = "http://pypi.python.org/packages/source/v/vnc2flv/${name}.tar.gz"; - md5 = "8492e46496e187b49fe5569b5639804e"; + sha256 = "14d4nm8yim0bm0nd3wyj7z4zdsg5zk3d9bhhvwdc36x03r8d0sbq"; }; # error: invalid command 'test' diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index ae488b0f359d..84dc7c3c0719 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -10,7 +10,7 @@ pythonPackages.buildPythonPackage rec { sha256 = "caef5a3e2c9b515fd815034b5b7304acc878a0b9777ae4208dc033b0bf39da2b"; }; - pythonPath = [ pythonPackages.boto pythonPackages.m2crypto pythonPackages.ssl ]; + pythonPath = [ pythonPackages.boto pythonPackages.m2crypto ]; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad3fd64af52f..502c2f565e5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -476,6 +476,8 @@ let apt-offline = callPackage ../tools/misc/apt-offline { }; + apulse = callPackage ../misc/apulse { }; + archivemount = callPackage ../tools/filesystems/archivemount { }; arandr = callPackage ../tools/X11/arandr { }; @@ -649,6 +651,8 @@ let consul_ui = consul.ui; + corosync = callPackage ../servers/corosync { }; + chntpw = callPackage ../tools/security/chntpw { }; coprthr = callPackage ../development/libraries/coprthr { @@ -659,8 +663,12 @@ let cv = callPackage ../tools/misc/cv { }; + datamash = callPackage ../tools/misc/datamash { }; + direnv = callPackage ../tools/misc/direnv { }; + discount = callPackage ../tools/text/discount { }; + ditaa = callPackage ../tools/graphics/ditaa { }; dlx = callPackage ../misc/emulators/dlx { }; @@ -675,6 +683,8 @@ let fop = callPackage ../tools/typesetting/fop { }; + gist = callPackage ../tools/text/gist { }; + mcrl = callPackage ../tools/misc/mcrl { }; mcrl2 = callPackage ../tools/misc/mcrl2 { }; @@ -1152,7 +1162,7 @@ let freeipmi = callPackage ../tools/system/freeipmi {}; freetalk = callPackage ../applications/networking/instant-messengers/freetalk { - guile = guile_1_8; + automake = automake114x; }; freetds = callPackage ../development/libraries/freetds { }; @@ -1338,7 +1348,7 @@ let gupnptools = callPackage ../tools/networking/gupnp-tools {}; gvpe = builderDefsPackage ../tools/networking/gvpe { - inherit openssl gmp nettools iproute; + inherit openssl gmp nettools iproute zlib; }; gvolicon = callPackage ../tools/audio/gvolicon {}; @@ -1494,6 +1504,8 @@ let logstash = callPackage ../tools/misc/logstash { }; + logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; + logstash-forwarder = callPackage ../tools/misc/logstash-forwarder { }; kippo = callPackage ../servers/kippo { }; @@ -1544,12 +1556,20 @@ let libshout = callPackage ../development/libraries/libshout { }; + libqb = callPackage ../development/libraries/libqb { }; + libqmi = callPackage ../development/libraries/libqmi { }; libmbim = callPackage ../development/libraries/libmbim { }; libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; + libtorrent-git = callPackage ../tools/networking/p2p/libtorrent/git.nix { }; + + libibverbs = callPackage ../development/libraries/libibverbs { }; + + librdmacm = callPackage ../development/libraries/librdmacm { }; + logcheck = callPackage ../tools/system/logcheck { inherit (perlPackages) mimeConstruct; }; @@ -1651,6 +1671,8 @@ let mkpasswd = callPackage ../tools/security/mkpasswd { }; + mkrand = callPackage ../tools/security/mkrand { }; + mktemp = callPackage ../tools/security/mktemp { }; mktorrent = callPackage ../tools/misc/mktorrent { }; @@ -1878,6 +1900,8 @@ let spCompat = callPackage ../tools/text/sgml/opensp/compat.nix { }; + opentracker = callPackage ../applications/networking/p2p/opentracker { }; + openvpn = callPackage ../tools/networking/openvpn { }; openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; @@ -2081,6 +2105,8 @@ let privateer = callPackage ../games/privateer { }; + redmine = callPackage ../applications/version-management/redmine { }; + rtmpdump = callPackage ../tools/video/rtmpdump { }; reaverwps = callPackage ../tools/networking/reaver-wps {}; @@ -2145,6 +2171,8 @@ let rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; + rtorrent-git = callPackage ../tools/networking/p2p/rtorrent/git.nix { }; + rubber = callPackage ../tools/typesetting/rubber { }; rxp = callPackage ../tools/text/xml/rxp { }; @@ -2209,6 +2237,8 @@ let siege = callPackage ../tools/networking/siege {}; + sigil = callPackage ../applications/editors/sigil { }; + silc_client = callPackage ../applications/networking/instant-messengers/silc-client { }; silc_server = callPackage ../servers/silc-server { }; @@ -3198,6 +3228,7 @@ let icedtea7_jdk = callPackage ../development/compilers/icedtea rec { jdk = openjdk; jdkPath = "${openjdk}/lib/openjdk"; + giflib = giflib_5_0; } // { outputs = [ "out" ]; }; icedtea7_jre = (lib.setName "icedtea7-${lib.getVersion pkgs.icedtea7_jdk.jre}" (lib.addMetaAttrs @@ -3469,6 +3500,8 @@ let lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { }; + macaque = callPackage ../development/ocaml-modules/macaque { }; + menhir = callPackage ../development/ocaml-modules/menhir { }; merlin = callPackage ../development/tools/ocaml/merlin { }; @@ -3511,7 +3544,10 @@ let inherit pcre; }; + pgocaml = callPackage ../development/ocaml-modules/pgocaml {}; + ocaml_react = callPackage ../development/ocaml-modules/react { }; + reactivedata = callPackage ../development/ocaml-modules/reactivedata {}; ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { }; @@ -3791,7 +3827,6 @@ let lua = lua5; lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); - lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); luaPackages = lua52Packages; @@ -3882,7 +3917,7 @@ let polyml = callPackage ../development/compilers/polyml { }; pure = callPackage ../development/interpreters/pure { - llvm = llvm_33 ; + llvm = llvm_34 ; }; python = python2; @@ -3928,6 +3963,8 @@ let pypi2nix = python27Packages.pypi2nix; + svg2tikz = python27Packages.svg2tikz; + pyrex = pyrex095; pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { }; @@ -4971,6 +5008,8 @@ let gdal = callPackage ../development/libraries/gdal { }; + gdcm = callPackage ../development/libraries/gdcm { }; + ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {}; giblib = callPackage ../development/libraries/giblib { }; @@ -5188,6 +5227,8 @@ let else stdenv; }; + granite = callPackage ../development/libraries/granite { }; + gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { cupsSupport = config.gtk2.cups or stdenv.isLinux; }; @@ -5367,6 +5408,8 @@ let usePulseAudio = config.pulseaudio or true; }; + libantlr3c = callPackage ../development/libraries/libantlr3c {}; + libarchive = callPackage ../development/libraries/libarchive { }; libass = callPackage ../development/libraries/libass { }; @@ -5486,6 +5529,8 @@ let libelf = callPackage ../development/libraries/libelf { }; + libetpan = callPackage ../development/libraries/libetpan { }; + libfm = callPackage ../development/libraries/libfm { }; libfm-extra = callPackage ../development/libraries/libfm { extraOnly = true; @@ -5640,6 +5685,8 @@ let libsamplerate = callPackage ../development/libraries/libsamplerate { }; + libsieve = callPackage ../development/libraries/libsieve { }; + libspectre = callPackage ../development/libraries/libspectre { }; libgsf = callPackage ../development/libraries/libgsf { }; @@ -5850,6 +5897,8 @@ let libspatialite = callPackage ../development/libraries/libspatialite { }; + libstatgrab = callPackage ../development/libraries/libstatgrab { }; + libtar = callPackage ../development/libraries/libtar { }; libtasn1 = callPackage ../development/libraries/libtasn1 { }; @@ -5885,7 +5934,7 @@ let libupnp = callPackage ../development/libraries/pupnp { }; - giflib = giflib_5_0; + giflib = giflib_5_1; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { }; giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { }; @@ -7171,6 +7220,12 @@ let erlang = erlangR16; }; + prosody = recurseIntoAttrs ( + callPackage ../servers/xmpp/prosody { + lua5 = lua5_1; + inherit (lua51Packages) luasocket luasec luaexpat luafilesystem; + }); + elasticmq = callPackage ../servers/elasticmq { }; etcdctl = callPackage ../development/tools/etcdctl { }; @@ -8071,6 +8126,10 @@ let gocode = callPackage ../development/tools/gocode { }; + gotags = callPackage ../development/tools/gotags { }; + + golint = callPackage ../development/tools/golint { }; + gogoclient = callPackage ../os-specific/linux/gogoclient { }; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; @@ -8756,6 +8815,10 @@ let cinelerra = callPackage ../applications/video/cinelerra { }; + clawsMail = callPackage ../applications/networking/mailreaders/claws-mail { + enableNetworkManager = config.networking.networkmanager.enable or false; + }; + clipit = callPackage ../applications/misc/clipit { }; cmplayer = callPackage ../applications/video/cmplayer { @@ -9108,6 +9171,8 @@ let fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { }; + fritzing = callPackage ../applications/science/electronics/fritzing { }; + fvwm = callPackage ../applications/window-managers/fvwm { }; geany = callPackage ../applications/editors/geany { }; @@ -9577,6 +9642,8 @@ let inherit (gnome) libglade; }; + libowfat = callPackage ../development/libraries/libowfat { }; + librecad = callPackage ../applications/misc/librecad { }; librecad2 = callPackage ../applications/misc/librecad/2.0.nix { }; @@ -9830,6 +9897,8 @@ let smplayer = callPackage ../applications/video/smplayer { }; + smtube = callPackage ../applications/video/smtube {}; + sup = with rubyLibs; callPackage ../applications/networking/mailreaders/sup { ruby = ruby_1_9_3.override { cursesSupport = true; @@ -10613,6 +10682,7 @@ let plugins = let inherit (lib) optional; in with xbmcPlugins; ([] ++ optional (config.xbmc.enableAdvancedLauncher or false) advanced-launcher + ++ optional (config.xbmc.enableGenesis or false) genesis ++ optional (config.xbmc.enableSVTPlay or false) svtplay ); }; @@ -10949,6 +11019,8 @@ let mars = callPackage ../games/mars { }; + megaglest = callPackage ../games/megaglest {}; + micropolis = callPackage ../games/micropolis { }; mnemosyne = callPackage ../games/mnemosyne { @@ -11214,15 +11286,7 @@ let kakasi = callPackage ../tools/text/kakasi { }; - kde4 = recurseIntoAttrs pkgs.kde412; - - kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde414 ); - - kde412 = kdePackagesFor (pkgs.kde412 // { - eigen = eigen2; - libusb = libusb1; - libcanberra = libcanberra_kde; - }) ../desktops/kde-4.12; + kde4 = recurseIntoAttrs pkgs.kde414; kde414 = kdePackagesFor (pkgs.kde414 // { libusb = libusb1; @@ -11243,8 +11307,6 @@ let recurseForRelease = true; - akunambol = callPackage ../applications/networking/sync/akunambol { }; - amarok = callPackage ../applications/audio/amarok { }; bangarang = callPackage ../applications/video/bangarang { }; @@ -11379,6 +11441,11 @@ let kwooty = callPackage ../applications/networking/newsreaders/kwooty { }; }; + pantheon = recurseIntoAttrs rec { + callPackage = newScope pkgs.pantheon; + pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { }; + }; + redshift = callPackage ../applications/misc/redshift { inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm xf86vidmodeproto; @@ -11535,17 +11602,32 @@ let mkCoqPackages_8_4 = self: let callPackage = newScope self; in { + bedrock = callPackage ../development/coq-modules/bedrock {}; + containers = callPackage ../development/coq-modules/containers {}; + coqExtLib = callPackage ../development/coq-modules/coq-ext-lib {}; + + domains = callPackage ../development/coq-modules/domains {}; + + heq = callPackage ../development/coq-modules/heq {}; + mathcomp = callPackage ../development/coq-modules/mathcomp {}; + paco = callPackage ../development/coq-modules/paco {}; + ssreflect = callPackage ../development/coq-modules/ssreflect {}; + tlc = callPackage ../development/coq-modules/tlc {}; + + ynot = callPackage ../development/coq-modules/ynot {}; + }; coqPackages = recurseIntoAttrs (mkCoqPackages_8_4 coqPackages); cvc3 = callPackage ../applications/science/logic/cvc3 {}; + cvc4 = callPackage ../applications/science/logic/cvc4 {}; ekrhyper = callPackage ../applications/science/logic/ekrhyper {}; @@ -11743,22 +11825,22 @@ let ### SCIENCE / PHYSICS geant4 = callPackage ../development/libraries/physics/geant4 { - enableMultiThreading = true; + enableMultiThreading = true; enableG3toG4 = false; enableInventor = false; enableGDML = false; enableQT = false; enableXM = false; - enableOpenGLX11 = true; + enableOpenGLX11 = true; enableRaytracerX11 = false; - # Optional system packages, otherwise internal GEANT4 packages are used. - clhep = null; + # Optional system packages, otherwise internal GEANT4 packages are used. + clhep = null; expat = expat; - zlib = null; + zlib = null; # For enableGDML. - xercesc = null; + xercesc = null; # For enableQT. qt = null; # qt4SDK or qt5SDK diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 4fcab8e9d6de..eaa050243615 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -37,6 +37,7 @@ attoparsec = self.attoparsec_0_11_3_1; binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_1; }; bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_1; }; }; + cabal2nix = super.cabal2nix.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_18_1_3; }; }; criterion = super.criterion.override { statistics = self.statistics.override { vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_1; }; @@ -138,6 +139,7 @@ systemFileio = super.systemFileio.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + tfRandom = null; # does not compile time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; zlib = super.zlib.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6e49451e6f69..ccb608ff7d62 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,8 +143,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; }; aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; }; - aeson_0_8_0_0 = callPackage ../development/libraries/haskell/aeson/0.8.0.0.nix { blazeBuilder = null; }; - aeson = self.aeson_0_8_0_0; + aeson_0_8_0_1 = callPackage ../development/libraries/haskell/aeson/0.8.0.1.nix { blazeBuilder = null; }; + aeson = self.aeson_0_8_0_1; aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {}; @@ -435,6 +435,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in clay = callPackage ../development/libraries/haskell/clay {}; + cleanUnions = callPackage ../development/libraries/haskell/clean-unions {}; + clientsession = callPackage ../development/libraries/haskell/clientsession {}; clock = callPackage ../development/libraries/haskell/clock {}; @@ -463,9 +465,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; - compdata = if (pkgs.stdenv.lib.versionOlder "7.8" ghc.version) - then callPackage ../development/libraries/haskell/compdata {} - else null; + compdata = callPackage ../development/libraries/haskell/compdata {}; compdataParam = callPackage ../development/libraries/haskell/compdata-param {}; @@ -517,7 +517,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cprngAes = callPackage ../development/libraries/haskell/cprng-aes {}; - criterion = callPackage ../development/libraries/haskell/criterion {}; + criterion = callPackage ../development/libraries/haskell/criterion { + optparseApplicative = self.optparseApplicative_0_11_0_1; + }; Crypto = callPackage ../development/libraries/haskell/Crypto {}; @@ -1257,8 +1259,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hsdns = callPackage ../development/libraries/haskell/hsdns {}; - hsemail = if (pkgs.stdenv.lib.versionOlder ghc.version "7") then null else - callPackage ../development/libraries/haskell/hsemail {}; + hsemail = callPackage ../development/libraries/haskell/hsemail {}; hslua = callPackage ../development/libraries/haskell/hslua { lua = pkgs.lua5_1; @@ -1505,11 +1506,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in libjenkins = callPackage ../development/libraries/haskell/libjenkins {}; - libmpd_0_8_0_5 = callPackage ../development/libraries/haskell/libmpd/0.8.0.5.nix {}; - - libmpd_0_9_0_1 = callPackage ../development/libraries/haskell/libmpd/0.9.0.1.nix {}; - - libmpd = self.libmpd_0_9_0_1; + libmpd = callPackage ../development/libraries/haskell/libmpd {}; liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; @@ -1525,6 +1522,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in linear = callPackage ../development/libraries/haskell/linear {}; + linuxInotify = callPackage ../development/libraries/haskell/linux-inotify {}; + List = callPackage ../development/libraries/haskell/List {}; lists = callPackage ../development/libraries/haskell/lists {}; @@ -1799,6 +1798,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in OneTuple = callPackage ../development/libraries/haskell/OneTuple {}; + objective = callPackage ../development/libraries/haskell/objective {}; + ObjectName = callPackage ../development/libraries/haskell/ObjectName {}; oeis = callPackage ../development/libraries/haskell/oeis {}; @@ -1829,6 +1830,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in optparseApplicative_0_9_1_1 = callPackage ../development/libraries/haskell/optparse-applicative/0.9.1.1.nix {}; optparseApplicative_0_10_0 = callPackage ../development/libraries/haskell/optparse-applicative/0.10.0.nix {}; + optparseApplicative_0_11_0_1 = callPackage ../development/libraries/haskell/optparse-applicative/0.11.0.1.nix {}; optparseApplicative = self.optparseApplicative_0_10_0; pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; @@ -2551,8 +2553,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in textStreamDecode = callPackage ../development/libraries/haskell/text-stream-decode {}; - tfRandom = if (pkgs.stdenv.lib.versionOlder ghc.version "7") then null else - callPackage ../development/libraries/haskell/tf-random {}; + tfRandom = callPackage ../development/libraries/haskell/tf-random {}; these = callPackage ../development/libraries/haskell/these {}; @@ -2619,6 +2620,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in trifecta = callPackage ../development/libraries/haskell/trifecta {}; + trivia = callPackage ../development/libraries/haskell/trivia {}; + tuple = callPackage ../development/libraries/haskell/tuple {}; twitterConduit = callPackage ../development/libraries/haskell/twitter-conduit {}; @@ -2771,6 +2774,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in warpTls = callPackage ../development/libraries/haskell/warp-tls {}; + WAVE = callPackage ../development/libraries/haskell/WAVE {}; + wcwidth = callPackage ../development/libraries/haskell/wcwidth {}; webdriver = callPackage ../development/libraries/haskell/webdriver {}; @@ -3006,6 +3011,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hp2anyManager = callPackage ../development/tools/haskell/hp2any-manager {}; + hsb2hs = callPackage ../development/tools/haskell/hsb2hs {}; + hscolour = callPackage ../development/tools/haskell/hscolour {}; hscolourBootstrap = self.hscolour.override { cabal = self.cabal.override { @@ -3063,9 +3070,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in xlsx = callPackage ../development/libraries/haskell/xlsx {}; - xmobar = callPackage ../applications/misc/xmobar { - libmpd = self.libmpd_0_8_0_5; - }; + xmobar = callPackage ../applications/misc/xmobar {}; xmonad = callPackage ../applications/window-managers/xmonad {}; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 8a44a997c071..6a9b5c09555e 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,15 +5,15 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, -pcre, oniguruma, gnulib, tre, glibc, -sqlite }: +{ fetchurl, stdenv, lua, callPackage, unzip, zziplib +, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat +}: let - isLua51 = lua.luaversion == "5.1"; - isLua52 = lua.luaversion == "5.2"; - self = _self; - _self = with self; { + isLua51 = lua.luaversion == "5.1"; + isLua52 = lua.luaversion == "5.2"; + self = _self; + _self = with self; { inherit (stdenv.lib) maintainers; #define build lua package function @@ -23,7 +23,32 @@ let inherit lua; }; - luafilesystem = buildLuaPackage { + luaexpat = buildLuaPackage rec { + version = "1.3.0"; + name = "expat-${version}"; + isLibrary = true; + src = fetchurl { + url = "https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz"; + sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h"; + }; + + buildInputs = [ expat ]; + + preBuild = '' + makeFlagsArray=( + LUA_LDIR="$out/share/lua/${lua.luaversion}" + LUA_INC="-I${lua}/include" LUA_CDIR="$out/lib/lua/${lua.luaversion}" + EXPAT_INC="-I${expat}/include"); + ''; + + meta = { + homepage = "http://matthewwild.co.uk/projects/luaexpat"; + hydraPlatforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.flosse ]; + }; + }; + + luafilesystem = buildLuaPackage rec { name = "filesystem-1.6.2"; src = fetchurl { url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; @@ -36,18 +61,44 @@ let }; }; + luasec = buildLuaPackage rec { + version = "0.5"; + name = "sec-${version}"; + src = fetchurl { + url = "https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"; + sha256 = "08rm12cr1gjdnbv2jpk7xykby9l292qmz2v0dfdlgb4jfj7mk034"; + }; + + buildInputs = [ openssl ]; + + preBuild = '' + makeFlagsArray=( + linux + LUAPATH="$out/lib/lua/${lua.luaversion}" + LUACPATH="$out/lib/lua/${lua.luaversion}" + INC_PATH="-I${lua}/include" + LIB_PATH="-L$out/lib"); + ''; + + meta = { + homepage = "https://github.com/brunoos/luasec"; + hydraPlatforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.flosse ]; + }; + }; + luasocket = buildLuaPackage rec { name = "socket-${version}"; version = "2.0.2"; src = fetchurl { - url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz"; - sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag"; + url = "http://files.luaforge.net/releases/luasocket/luasocket/luasocket-${version}/luasocket-${version}.tar.gz"; + sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag"; }; disabled = isLua52; patchPhase = '' - sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua.luaversion}," \ - -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua.luaversion}," \ - -i config + sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua.luaversion}," \ + -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua.luaversion}," \ + -i config ''; meta = { homepage = "http://w3.impa.br/~diego/software/luasocket/"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 452144e0087c..adf0a8071701 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -229,7 +229,7 @@ let self = _self // overrides; _self = with self; { name = "Archive-Zip-1.16"; src = fetchurl { url = http://tarballs.nixos.org/Archive-Zip-1.16.tar.gz; - md5 = "e28dff400d07b1659d659d8dde7071f1"; + sha256 = "1ghgs64by3ybjlb0bj65kxysb03k72i7iwmw63g41bj175l44ima"; }; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 700547450ec2..ab5057010a3f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -64,7 +64,7 @@ let self = with self; { src = pkgs.fetchurl { url = "http://xcache.lighttpd.net/pub/Releases/${version}/${name}.tar.bz2"; - md5 = "e5816d47d52be200b959bf69a673ff74"; + sha256 = "1saysvzwkfmcyg53za4j7qnranxd6871spjzfpclhdlqm043xbw6"; }; configureFlags = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9613fe5f83fa..a4c7c515cb2b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23,7 +23,6 @@ let sqlite3 = null; curses = null; curses_panel = null; - ssl = null; crypt = null; }; @@ -512,11 +511,11 @@ let }); astroid = buildPythonPackage (rec { - name = "astroid-1.1.1"; + name = "astroid-1.2.1"; propagatedBuildInputs = [ logilab_common ]; src = fetchurl { - url = "https://pypi.python.org/packages/source/a/astroid/${name}.tar.gz"; - sha256 = "1x7103mlzndgg66yas6xrfwkwpihcq4bi9m8py1fjnhz8p5ka1vq"; + url = "https://pypi.python.org/packages/source/a/astroid/${name}.zip"; + md5 = "337017c82a28c97741797493fb2c980f"; }; }); @@ -762,6 +761,33 @@ let maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; + + circus = buildPythonPackage rec { + name = "circus-0.11.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/c/circus/${name}.tar.gz"; + md5 = "5c07cdbe9bb4a9b82e52737ad590617b"; + }; + + doCheck = false; # weird error + + propagatedBuildInputs = with pythonPackages; [ iowait psutil pyzmq tornado mock ]; + }; + + iowait = buildPythonPackage rec { + name = "iowait-0.2"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/i/iowait/${name}.tar.gz"; + md5 = "f49ca7766fe4a67e03a731e575614f87"; + }; + + meta = with stdenv.lib; { + description = "Platform-independent module for I/O completion events"; + homepage = https://launchpad.net/python-iowait; + }; + }; responses = pythonPackages.buildPythonPackage rec { name = "responses-0.2.2"; @@ -1013,7 +1039,7 @@ let # rev = "refs/tags/0.9.3"; # }; # - # propagatedBuildInputs = [ pythonPackages.argparse modules.ssl ]; + # propagatedBuildInputs = [ pythonPackages.argparse ]; # # doCheck = false; # @@ -4856,11 +4882,11 @@ let rainbowstream = buildPythonPackage rec { name = "rainbowstream-${version}"; - version = "0.9.5"; + version = "1.1.6"; src = fetchurl { url = "https://pypi.python.org/packages/source/r/rainbowstream/${name}.tar.gz"; - sha256 = "0v79xiihgsfjipxkzzi92l8y1f8vxxachpv71gyzyhxdsl2zfj57"; + sha256 = "04i2a8a5k6n6lgfpa9bzzbkhvywgd4bn3qlspl97pn8ply9kgszm"; }; doCheck = false; @@ -4870,9 +4896,16 @@ let export LC_ALL="en_US.UTF-8" ''; + postInstall = '' + for prog in "$out/bin/"*; do + wrapProgram "$prog" \ + --prefix PYTHONPATH : "$PYTHONPATH" + done + ''; + buildInputs = [ pkgs.libjpeg pkgs.freetype pkgs.zlib - pillow twitter pyfiglet requests arrow dateutil modules.readline + pillow twitter pyfiglet requests arrow dateutil modules.readline pysocks ]; meta = { @@ -5213,12 +5246,12 @@ let nbxmpp = buildPythonPackage rec { - name = "nbxmpp-0.5"; + name = "nbxmpp-0.5.1"; src = fetchurl { name = "${name}.tar.gz"; - url = "https://python-nbxmpp.gajim.org/downloads/5"; - sha256 = "0y270c9v4i9n58p4ghlm18h50qcfichmfkgcpqd3bypx4fkmdx90"; + url = "https://python-nbxmpp.gajim.org/downloads/6"; + sha256 = "0agr0ikfdmna5rjvm7lm0mx52cdwqp5b2xbx3inagp70whmdv219"; }; meta = { @@ -6512,11 +6545,11 @@ let pyfiglet = buildPythonPackage rec { name = "pyfiglet-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { url = "https://pypi.python.org/packages/source/p/pyfiglet/${name}.tar.gz"; - sha256 = "14lgwg47gnnad7sfkmmwhknwysbfmr74c9b2a6d9wgjmydycc6ka"; + sha256 = "0v8a18wvaqnb1jksyv5dc5n6zj0vrkyhz0ivmm8gfwpa0ky6n68y"; }; doCheck = false; @@ -6833,6 +6866,24 @@ let }; }; + pysocks = buildPythonPackage rec { + name = "pysocks-${version}"; + version = "1.5.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/PySocks/PySocks-${version}.tar.gz"; + sha256 = "10wq5311qrnk8rvzsh6gwzxi7h51pgvzw3d7s1mb39fsvf0vyjdk"; + }; + + doCheck = false; + + meta = { + description = "SOCKS module for Python"; + license = licenses.bsd3; + maintainers = [ maintainers.thoughtpolice ]; + }; + }; + python_fedora = buildPythonPackage (rec { name = "python-fedora-0.3.33"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; @@ -8994,11 +9045,11 @@ let twitter = buildPythonPackage rec { name = "twitter-${version}"; - version = "1.14.3"; + version = "1.15.0"; src = fetchurl { url = "https://pypi.python.org/packages/source/t/twitter/${name}.tar.gz"; - sha256 = "1nhhjajbq0jik43q2makpnz094qcziq9p8rj35jxamybd0hwwzs9"; + sha256 = "1m6b17irb9klc345k8174pni724jzy2973z2x2jg69h83hipjw2c"; }; doCheck = false; @@ -9315,7 +9366,7 @@ let md5 = "8437607c0cc00c35f658f972516ffb55"; }; - propagatedBuildInputs = [ nose modules.ssl ]; + propagatedBuildInputs = [ nose ]; meta = { description = "WSGI request and response object"; @@ -10228,13 +10279,13 @@ let tornadokick = buildPythonPackage rec { - name = "tornadokick-2014.07.23"; + name = "tornadokick-0.2.1"; propagatedBuildInputs = [ tornado ]; src = fetchurl { url = "https://pypi.python.org/packages/source/t/tornadokick/${name}.tar.gz"; - md5 = "201d26de2993a554b16140af3b4ee1b6"; + md5 = "95ee5a295ce3f361c6f843c4f39cbb8c"; }; meta = { @@ -10506,6 +10557,24 @@ let }; + ujson = buildPythonPackage rec { + name = "ujson-1.33"; + + disabled = isPyPy; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/u/ujson/${name}.zip"; + md5 = "8148a2493fff78940feab1e11dc0a893"; + }; + + meta = { + homepage = http://pypi.python.org/pypi/ujson; + description = "Ultra fast JSON encoder and decoder for Python"; + license = licenses.bsd3; + }; + }; + + unidecode = buildPythonPackage rec { name = "Unidecode-0.04.12"; @@ -10837,11 +10906,11 @@ let libvirt = pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; - version = "1.2.7"; + version = "1.2.9"; src = fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "0wg0pnvrwfjdl8haxr2dyfhdasddq97zy6l27xwrvd1hnh1394f1"; + sha256 = "1vbrkwvsvcfgibdw4drcypg2n6zcpi3zv23zw20nkk5fjfp26w4g"; }; buildInputs = [ python pkgs.pkgconfig pkgs.libvirt lxml ]; @@ -11078,6 +11147,24 @@ let }; }; + svg2tikz = pythonPackages.buildPythonPackage { + name = "svg2tikz-1.0.0"; + + propagatedBuildInputs = [lxml]; + + src = pkgs.fetchgit { + url = "https://github.com/kjellmf/svg2tikz"; + sha256 = "429428ec435e53672b85cdfbb89bb8af0ff9f8238f5d05970729e5177d252d5f"; + rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4"; + }; + + meta = { + homepage = https://github.com/kjellmf/svg2tikz; + description = "An SVG to TikZ converter"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with pkgs.stdenv.lib.maintainers; [gal_bolle]; + }; + }; thumbor = pythonPackages.buildPythonPackage rec { name = "thumbor-4.0.4"; |