diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000000..a636295ebd67
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,13 @@
+**/deps.nix linguist-generated
+**/node-packages.nix linguist-generated
+
+pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated
+pkgs/development/r-modules/*-packages.nix linguist-generated
+pkgs/development/haskell-modules/hackage-packages.nix linguist-generated
+pkgs/development/beam-modules/hex-packages.nix linguist-generated
+
+doc/** linguist-documentation
+doc/default.nix linguist-documentation=false
+
+nixos/doc/** linguist-documentation
+nixos/doc/default.nix linguist-documentation=false
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 039ca8545e9f..0f871395854c 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -871,8 +871,10 @@ Executing `python setup.py bdist_wheel` in a `nix-shell `fails with
```
ValueError: ZIP does not support timestamps before 1980
```
-This is because files are included that depend on items in the Nix store which have a timestamp of, that is, it corresponds to January the 1st, 1970 at 00:00:00. And as the error informs you, ZIP does not support that.
-The command `bdist_wheel` takes into account `SOURCE_DATE_EPOCH`, and `nix-shell` sets this to 1. By setting it to a value corresponding to 1980 or later, or by unsetting it, it is possible to build wheels.
+
+This is because files from the Nix store (which have a timestamp of the UNIX epoch of January 1, 1970) are included in the .ZIP, but .ZIP archives follow the DOS convention of counting timestamps from 1980.
+
+The command `bdist_wheel` reads the `SOURCE_DATE_EPOCH` environment variable, which `nix-shell` sets to 1. Unsetting this variable or giving it a value corresponding to 1980 or later enables building wheels.
Use 1980 as timestamp:
```shell
@@ -882,7 +884,7 @@ or the current time:
```shell
nix-shell --run "SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel"
```
-or unset:
+or unset `SOURCE_DATE_EPOCH`:
```shell
nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel"
```
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index 9ca818e86ffa..df6108dede7c 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -25,14 +25,14 @@ let
loginCfgFile = optional cfg.ssh.enable
{ source = pkgs.writeText "login_duo.conf" configFile;
mode = "0600";
- uid = config.ids.uids.sshd;
+ user = "sshd";
target = "duo/login_duo.conf";
};
pamCfgFile = optional cfg.pam.enable
{ source = pkgs.writeText "pam_duo.conf" configFile;
mode = "0600";
- uid = config.ids.uids.sshd;
+ user = "sshd";
target = "duo/pam_duo.conf";
};
in
diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix
index a0dc0d6d089d..95f31829882f 100644
--- a/nixos/modules/services/logging/graylog.nix
+++ b/nixos/modules/services/logging/graylog.nix
@@ -141,7 +141,7 @@ in
JAVA_HOME = jre;
GRAYLOG_CONF = "${confFile}";
};
- path = [ pkgs.openjdk8 pkgs.which pkgs.procps ];
+ path = [ pkgs.jre_headless pkgs.which pkgs.procps ];
preStart = ''
mkdir -p /var/lib/graylog -m 755
diff --git a/nixos/modules/services/misc/defaultUnicornConfig.rb b/nixos/modules/services/misc/defaultUnicornConfig.rb
index 84622622db70..0b58c59c7a51 100644
--- a/nixos/modules/services/misc/defaultUnicornConfig.rb
+++ b/nixos/modules/services/misc/defaultUnicornConfig.rb
@@ -1,205 +1,69 @@
-# The following was taken from github.com/crohr/syslogger and is BSD
-# licensed.
-require 'syslog'
-require 'logger'
-require 'thread'
-
-class Syslogger
-
- VERSION = "1.6.0"
-
- attr_reader :level, :ident, :options, :facility, :max_octets
- attr_accessor :formatter
-
- MAPPING = {
- Logger::DEBUG => Syslog::LOG_DEBUG,
- Logger::INFO => Syslog::LOG_INFO,
- Logger::WARN => Syslog::LOG_WARNING,
- Logger::ERROR => Syslog::LOG_ERR,
- Logger::FATAL => Syslog::LOG_CRIT,
- Logger::UNKNOWN => Syslog::LOG_ALERT
- }
-
- #
- # Initializes default options for the logger
- # ident:: the name of your program [default=$0].
- # options:: syslog options [default=Syslog::LOG_PID | Syslog::LOG_CONS].
- # Correct values are:
- # LOG_CONS : writes the message on the console if an error occurs when sending the message;
- # LOG_NDELAY : no delay before sending the message;
- # LOG_PERROR : messages will also be written on STDERR;
- # LOG_PID : adds the process number to the message (just after the program name)
- # facility:: the syslog facility [default=nil] Correct values include:
- # Syslog::LOG_DAEMON
- # Syslog::LOG_USER
- # Syslog::LOG_SYSLOG
- # Syslog::LOG_LOCAL2
- # Syslog::LOG_NEWS
- # etc.
- #
- # Usage:
- # logger = Syslogger.new("my_app", Syslog::LOG_PID | Syslog::LOG_CONS, Syslog::LOG_LOCAL0)
- # logger.level = Logger::INFO # use Logger levels
- # logger.warn "warning message"
- # logger.debug "debug message"
- #
- def initialize(ident = $0, options = Syslog::LOG_PID | Syslog::LOG_CONS, facility = nil)
- @ident = ident
- @options = options || (Syslog::LOG_PID | Syslog::LOG_CONS)
- @facility = facility
- @level = Logger::INFO
- @mutex = Mutex.new
- @formatter = Logger::Formatter.new
- end
-
- %w{debug info warn error fatal unknown}.each do |logger_method|
- # Accepting *args as message could be nil.
- # Default params not supported in ruby 1.8.7
- define_method logger_method.to_sym do |*args, &block|
- return true if @level > Logger.const_get(logger_method.upcase)
- message = args.first || block && block.call
- add(Logger.const_get(logger_method.upcase), message)
- end
-
- unless logger_method == 'unknown'
- define_method "#{logger_method}?".to_sym do
- @level <= Logger.const_get(logger_method.upcase)
- end
- end
- end
-
- # Log a message at the Logger::INFO level. Useful for use with Rack::CommonLogger
- def write(msg)
- add(Logger::INFO, msg)
- end
-
- # Logs a message at the Logger::INFO level.
- def <<(msg)
- add(Logger::INFO, msg)
- end
-
- # Low level method to add a message.
- # +severity+:: the level of the message. One of Logger::DEBUG, Logger::INFO, Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN
- # +message+:: the message string.
- # If nil, the method will call the block and use the result as the message string.
- # If both are nil or no block is given, it will use the progname as per the behaviour of both the standard Ruby logger, and the Rails BufferedLogger.
- # +progname+:: optionally, overwrite the program name that appears in the log message.
- def add(severity, message = nil, progname = nil, &block)
- if message.nil? && block.nil? && !progname.nil?
- message, progname = progname, nil
- end
- progname ||= @ident
-
- @mutex.synchronize do
- Syslog.open(progname, @options, @facility) do |s|
- s.mask = Syslog::LOG_UPTO(MAPPING[@level])
- communication = clean(message || block && block.call)
- if self.max_octets
- buffer = "#{tags_text}"
- communication.bytes do |byte|
- buffer.concat(byte)
- # if the last byte we added is potentially part of an escape, we'll go ahead and add another byte
- if buffer.bytesize >= self.max_octets && !['%'.ord,'\\'.ord].include?(byte)
- s.log(MAPPING[severity],buffer)
- buffer = ""
- end
- end
- s.log(MAPPING[severity],buffer) unless buffer.empty?
- else
- s.log(MAPPING[severity],"#{tags_text}#{communication}")
- end
- end
- end
- end
-
- # Set the max octets of the messages written to the log
- def max_octets=(max_octets)
- @max_octets = max_octets
- end
-
- # Sets the minimum level for messages to be written in the log.
- # +level+:: one of Logger::DEBUG, Logger::INFO, Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN
- def level=(level)
- level = Logger.const_get(level.to_s.upcase) if level.is_a?(Symbol)
-
- unless level.is_a?(Fixnum)
- raise ArgumentError.new("Invalid logger level `#{level.inspect}`")
- end
-
- @level = level
- end
-
- # Sets the ident string passed along to Syslog
- def ident=(ident)
- @ident = ident
- end
-
- # Tagging code borrowed from ActiveSupport gem
- def tagged(*tags)
- new_tags = push_tags(*tags)
- yield self
- ensure
- pop_tags(new_tags.size)
- end
-
- def push_tags(*tags)
- tags.flatten.reject{ |i| i.respond_to?(:empty?) ? i.empty? : !i }.tap do |new_tags|
- current_tags.concat new_tags
- end
- end
-
- def pop_tags(size = 1)
- current_tags.pop size
- end
-
- def clear_tags!
- current_tags.clear
- end
-
- protected
-
- # Borrowed from SyslogLogger.
- def clean(message)
- message = message.to_s.dup
- message.strip! # remove whitespace
- message.gsub!(/\n/, '\\n') # escape newlines
- message.gsub!(/%/, '%%') # syslog(3) freaks on % (printf)
- message.gsub!(/\e\[[^m]*m/, '') # remove useless ansi color codes
- message
- end
-
- private
-
- def tags_text
- tags = current_tags
- if tags.any?
- tags.collect { |tag| "[#{tag}] " }.join
- end
- end
-
- def current_tags
- Thread.current[:syslogger_tagged_logging_tags] ||= []
- end
-end
-
-worker_processes 2
-working_directory ENV["GITLAB_PATH"]
-pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid"
+worker_processes 3
listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024
+listen "/run/gitlab/gitlab.socket", :backlog => 1024
+
+working_directory ENV["GITLAB_PATH"]
+
+pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid"
timeout 60
-logger Syslogger.new
-
+# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
+# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
preload_app true
-
GC.respond_to?(:copy_on_write_friendly=) and
GC.copy_on_write_friendly = true
check_client_connection false
+before_fork do |server, worker|
+ # the following is highly recommended for Rails + "preload_app true"
+ # as there's no need for the master process to hold a connection
+ defined?(ActiveRecord::Base) and
+ ActiveRecord::Base.connection.disconnect!
+
+ # The following is only recommended for memory/DB-constrained
+ # installations. It is not needed if your system can house
+ # twice as many worker_processes as you have configured.
+ #
+ # This allows a new master process to incrementally
+ # phase out the old master process with SIGTTOU to avoid a
+ # thundering herd (especially in the "preload_app false" case)
+ # when doing a transparent upgrade. The last worker spawned
+ # will then kill off the old master process with a SIGQUIT.
+ old_pid = "#{server.config[:pid]}.oldbin"
+ if old_pid != server.pid
+ begin
+ sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
+ Process.kill(sig, File.read(old_pid).to_i)
+ rescue Errno::ENOENT, Errno::ESRCH
+ end
+ end
+
+ # Throttle the master from forking too quickly by sleeping. Due
+ # to the implementation of standard Unix signal handlers, this
+ # helps (but does not completely) prevent identical, repeated signals
+ # from being lost when the receiving process is busy.
+ # sleep 1
+end
+
after_fork do |server, worker|
+ # per-process listener ports for debugging/admin/migrations
+ # addr = "127.0.0.1:#{9293 + worker.nr}"
+ # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
+
+ # the following is *required* for Rails + "preload_app true",
defined?(ActiveRecord::Base) and
ActiveRecord::Base.establish_connection
+
+ # reset prometheus client, this will cause any opened metrics files to be closed
+ defined?(::Prometheus::Client.reinitialize_on_pid_change) &&
+ Prometheus::Client.reinitialize_on_pid_change
+
+ # if preload_app is true, then you may also want to check and
+ # restart any other shared sockets/descriptors such as Memcached,
+ # and Redis. TokyoCabinet file handles are safe to reuse
+ # between any number of forked children (assuming your kernel
+ # correctly implements pread()/pwrite() system calls)
end
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 9ed5875a0191..20d7ec90dcc9 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -143,6 +143,7 @@ let
GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/";
GITLAB_STATE_PATH = "${cfg.statePath}";
GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads";
+ SCHEMA = "${cfg.statePath}/db/schema.rb";
GITLAB_LOG_PATH = "${cfg.statePath}/log";
GITLAB_SHELL_PATH = "${cfg.packages.gitlab-shell}";
GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml";
@@ -500,7 +501,7 @@ in {
Type = "simple";
User = cfg.user;
Group = cfg.group;
- TimeoutSec = "300";
+ TimeoutSec = "infinity";
Restart = "on-failure";
WorkingDirectory = gitlabEnv.HOME;
ExecStart = "${cfg.packages.gitaly}/bin/gitaly ${gitalyToml}";
@@ -566,6 +567,7 @@ in {
mkdir -p ${cfg.statePath}/tmp/pids
mkdir -p ${cfg.statePath}/tmp/sockets
mkdir -p ${cfg.statePath}/shell
+ mkdir -p ${cfg.statePath}/db
rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
mkdir -p ${cfg.statePath}/config
@@ -580,6 +582,7 @@ in {
ln -sf ${cfg.statePath}/log /run/gitlab/log
ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
+ ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml
chown -R ${cfg.user}:${cfg.group} /run/gitlab
# Prepare home directory
@@ -587,6 +590,7 @@ in {
touch ${gitlabEnv.HOME}/.ssh/authorized_keys
chown -R ${cfg.user}:${cfg.group} ${gitlabEnv.HOME}/
+ cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
${optionalString cfg.smtp.enable ''
ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index daf2a0e53ef1..d7cce586b9b7 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -46,6 +46,8 @@ rec {
litecoin = callPackage ./litecoin.nix { withGui = true; };
litecoind = callPackage ./litecoin.nix { withGui = false; };
+ masari = callPackage ./masari.nix { };
+
memorycoin = callPackage ./memorycoin.nix { boost = boost165; withGui = true; };
memorycoind = callPackage ./memorycoin.nix { boost = boost165; withGui = false; };
diff --git a/pkgs/applications/altcoins/masari.nix b/pkgs/applications/altcoins/masari.nix
new file mode 100644
index 000000000000..02a6d25df516
--- /dev/null
+++ b/pkgs/applications/altcoins/masari.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost
+, lmdb, miniupnpc, readline }:
+
+stdenv.mkDerivation rec {
+ name = "masari-${version}";
+ version = "0.1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "masari-project";
+ repo = "masari";
+ rev = "v${version}";
+ sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ boost miniupnpc openssl lmdb unbound readline ];
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol";
+ homepage = "https://www.getmasari.org/";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ fpletz ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index e46ffec39795..b0d8ae8d3cf6 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -47,11 +47,6 @@ stdenv.mkDerivation rec {
postFixup = ''
# Unwrap accidentally wrapped library
mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so
-
- # Patched meson does not add internal libraries to rpath
- for elf in "$out/bin/.deja-dup-wrapped" "$out/libexec/deja-dup/.deja-dup-monitor-wrapped" "$out/libexec/deja-dup/tools/libduplicity.so"; do
- patchelf --set-rpath "$(patchelf --print-rpath "$elf"):$out/lib/deja-dup" "$elf"
- done
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index a02773f715c4..a4a71c12820e 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -234,12 +234,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2017.3.3"; /* updated by script */
+ version = "2017.3.4"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "0j090863y68ppw34qkldm8h4lpbhalhqn70gb0ifj9bglf17503d"; /* updated by script */
+ sha256 = "1yxjvsp89mkk7gghbz5lqh7bbqi6l1ihg876c60bhqg0f5m98zcg"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -247,12 +247,12 @@ in
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
- version = "2017.3.5"; /* updated by script */
+ version = "2017.3.7"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
- sha256 = "1hfy0mxdsvydjjklh8fwdz6f6qxajhngmcmyyzw0gdfhw6ldrv9c"; /* updated by script */
+ sha256 = "1pmkv1yd8xwqa4kdffg0vvk3whmnvrs9js7vnq4ilm39zzksqmpa"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
update-channel = "datagrip_2017_3";
@@ -260,12 +260,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
- version = "2017.3.2"; /* updated by script */
+ version = "2017.3.3"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
- sha256 = "0bhvj1xqlpy58yq2s5nrhhaw53i913zpr135b1f6r5s22nvkigvm"; /* updated by script */
+ sha256 = "073wwhg58hkd8w4jazvwngl78gbhnmilm63jhpirr98jk7i7a4mq"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "goland_release";
@@ -273,12 +273,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2017.3.4"; /* updated by script */
+ version = "2017.3.5"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "15qsfirzmmjhwzkhx36zr4n0z5lhs021n2n3wim01g309ymr4gl9"; /* updated by script */
+ sha256 = "124rzc46f4bqyhllwyb26lkavh7zwbj62axrwhif34rayl2rcmpm"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IDEA_Release";
@@ -286,12 +286,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2017.3.4"; /* updated by script */
+ version = "2017.3.5"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
- sha256 = "0f937s6zc1sv0gdlxf9kkc8l8rg78a5mxsfr2laab0g37rfy8c99"; /* updated by script */
+ sha256 = "10r3z37mhr8daxi14k011bhx3pxpx3lsj7jvikwll4wjlv1znhiw"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IDEA_Release";
@@ -299,12 +299,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2017.3.4"; /* updated by script */
+ version = "2017.3.5"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "1hxkn0p0lp021bbysypwn8s69iggb76iwq38jv5a1ql7v5r1nwvd"; /* updated by script */
+ sha256 = "1mcq8n7rd074aghmiyqf1yg3qvs28w97kk4dygj2a46y3s1ha4cd"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PS2017.3";
@@ -312,12 +312,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2017.3.3"; /* updated by script */
+ version = "2017.3.4"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "1j9pp8lfy62d9l3953d5mpij60s6sqyv3bcjimgy85hsrw570x3r"; /* updated by script */
+ sha256 = "027w73qrrj7aml2kdj3sx890q7jyj2jfnsg0pivi7i4kh8i11204"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm_Release";
@@ -325,12 +325,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2017.3.3"; /* updated by script */
+ version = "2017.3.4"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "180cwva49air4j7g409algrm4svvmcbapspf9als3djhazqmczgr"; /* updated by script */
+ sha256 = "0040ryx7kj64vwc10gvns43f1c97dvrgnwlmdm1m1506ldvaw0si"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm_Release";
@@ -351,12 +351,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
- version = "2017.3.2"; /* updated by script */
+ version = "2017.3.3"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "1dc14k7i0nfhkzi0j53hysqzxcls29j487jr9kv1aqp81k544bdy"; /* updated by script */
+ sha256 = "1b0y8pcg8wwprm1swrl4laajnmx2c359bi7ahsyfjfprlzwx7wck"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "rm2017.3";
@@ -364,12 +364,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2017.3.4"; /* updated by script */
+ version = "2017.3.5"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "0d5whqa6c76l6g5yj0yq8a3k1x6d9kxwnac1dwsiy5dbr5jk0cyj"; /* updated by script */
+ sha256 = "123v4m8p7acndj8p8frn1bjvycijlx904pa84ka9pv18c90qiym9"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WS_Release";
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index aee65803e53f..e698fb8f2341 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -3,11 +3,11 @@
assert fltk.glSupport;
stdenv.mkDerivation {
- name ="openexr_viewers-2.2.0";
+ name ="openexr_viewers-2.2.1";
src = fetchurl {
- url = "mirror://savannah/openexr/openexr_viewers-2.2.0.tar.gz";
- sha256 = "1s84vnas12ybx8zz0jcmpfbk9m4ab5bg2d3cglqwk3wys7jf4gzp";
+ url = "mirror://savannah/openexr/openexr_viewers-2.2.1.tar.gz";
+ sha256 = "1ixx2wbjp4rvsf7h3bkja010gl1ihjrcjzy7h20jnn47ikg12vj8";
};
configurePhase = ''
diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
index 6fb7182035b6..8df630d582cc 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "goxel-${version}";
- version = "0.7.2";
+ version = "0.7.3";
src = fetchFromGitHub {
owner = "guillaumechereau";
repo = "goxel";
rev = "v${version}";
- sha256 = "1d6waj8zz9iq3ddbi9wbpcnh200ajjy9x53xrj5bij01pb8jwskv";
+ sha256 = "114s1pbv3ixc2gzkg7n927hffd6ly5gg59izw4z6drgjcdhd7xj9";
};
nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index bba6a189b8f0..5a24a364587e 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,23 +1,23 @@
{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib
, gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook
-, itstool, libgdata }:
+, gobjectIntrospection, itstool, libgdata }:
# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling
let
pname = "shotwell";
- version = "0.27.4";
+ version = "0.28.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "0g2vphhpxrljpy9sryfsgaayix807i1i9plj9bay72dk0zphqab2";
+ sha256 = "1d797nmlz9gs6ri0h65b76s40ss6ma6h6405xqx03lhg5xni3kmg";
};
nativeBuildInputs = [
- meson ninja vala pkgconfig itstool gettext desktop-file-utils wrapGAppsHook
+ meson ninja vala pkgconfig itstool gettext desktop-file-utils wrapGAppsHook gobjectIntrospection
];
buildInputs = [
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 37afea2bb6f6..45bd417abb4f 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "CopyQ-${version}";
- version = "3.1.2";
+ version = "3.3.0";
src = fetchFromGitHub {
owner = "hluk";
repo = "CopyQ";
rev = "v${version}";
- sha256 = "0gdx1bqqqr4fk6wcrxqm9li6z48j1w84wjwyjpzp2cjzg96bp6bl";
+ sha256 = "0j46h87ifinkydi0m725p422m9svk3dpcz8dnrci4mxx0inn6qs3";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 21af05133bf8..76b61de56088 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -7,14 +7,14 @@ let
in
python3Packages.buildPythonApplication rec {
- version = "3.1.2";
+ version = "3.1.6";
name = "electron-cash-${version}";
src = fetchurl {
url = "https://electroncash.org/downloads/${version}/win-linux/ElectronCash-${version}.tar.gz";
# Verified using official SHA-1 and signature from
# https://github.com/fyookball/keys-n-hashes
- sha256 = "18h44jfbc2ksj34hdzgszvvq82xi28schl3wp3lkq9fjp7ny0mf3";
+ sha256 = "062k5iw0jcp10zxrffvgiyfg51c5xzs7gmm638icx01yy67d58dm";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix
new file mode 100644
index 000000000000..f99344b83d64
--- /dev/null
+++ b/pkgs/applications/misc/gnome-usage/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gettext
+, libxml2, desktop-file-utils, wrapGAppsHook
+, glib, gtk3, libgtop, gnome3 }:
+
+let
+ pname = "gnome-usage";
+ version = "3.28.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "0130bwinpkz307nalw6ndi5mk38k5g6jna4gbw2916d54df6a4nq";
+ };
+
+ nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ];
+
+ buildInputs = [ glib gtk3 libgtop gnome3.defaultIconTheme ];
+
+ postPatch = ''
+ chmod +x build-aux/meson/postinstall.sh
+ patchShebangs build-aux/meson/postinstall.sh
+ '';
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
+ meta = with stdenv.lib; {
+ description = "";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index f6d9f4edb627..b376e8283a2b 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null;
stdenv.mkDerivation rec {
name = "gqrx-${version}";
- version = "2.10";
+ version = "2.11.1";
src = fetchFromGitHub {
owner = "csete";
repo = "gqrx";
rev = "v${version}";
- sha256 = "1qc944sn1kjdnhdhcsdc39764vqcryk86808xxl49vy8sznqr0mf";
+ sha256 = "06l90m3lx05290lvgghrgqrcg6732p69dvv3bsyw7cyxy3fvdhm6";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index c9f00d48aecc..9bc9218305c3 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -10,7 +10,7 @@
with lib;
let
pname = "orca";
- version = "3.26.0";
+ version = "3.27.91";
in buildPythonApplication rec {
name = "${pname}-${version}";
@@ -18,7 +18,7 @@ in buildPythonApplication rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "0xk5k9cbswymma60nrfj00dl97wypx59c107fb1hwi75gm0i07a7";
+ sha256 = "0phlkn6ffqncvsg7ph3l4xw388baddav9s4pbkvqqa8myca9g4wg";
};
patches = [
diff --git a/pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch b/pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch
deleted file mode 100644
index 770cd8afa9ef..000000000000
--- a/pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From a79d2dcd1b6275904193454fb9d68614813929f3 Mon Sep 17 00:00:00 2001
-From: Sam Parkinson
-Date: Mon, 27 Nov 2017 11:17:35 +1100
-Subject: [PATCH] Remove post install script - handle in nix config instead
-
----
- meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index fc45296..2227f1f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -53,5 +53,3 @@ configure_file(
- configuration: conf,
- install_dir: bindir
- )
--
--meson.add_install_script('meson_post_install.py')
---
-2.15.0
-
-
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index d1741774d347..9d4c858298d6 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook
-, git, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3
+, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3, gobjectIntrospection
, gtkspell3, libsecret, python36, python36Packages, webkitgtk }:
stdenv.mkDerivation rec {
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "0.9.16";
src = fetchgit {
- url = "https://gitlab.gnome.org/gnumdk/eolie";
+ url = https://gitlab.gnome.org/gnumdk/eolie;
rev = version;
sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b";
};
@@ -19,10 +19,11 @@ stdenv.mkDerivation rec {
ninja
pkgconfig
wrapGAppsHook
+ gobjectIntrospection
];
buildInputs = [
- git # required to download ad blocking DB
+ glib
glib-networking
gsettings-desktop-schemas
gst_all_1.gstreamer
@@ -47,20 +48,18 @@ stdenv.mkDerivation rec {
wrapPrefixVariables = [ "PYTHONPATH" ];
- enableParallelBuilding = true;
-
- postInstall = ''
- ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+ postPatch = ''
+ chmod +x meson_post_install.py # patchShebangs requires executable file
+ patchShebangs meson_post_install.py
'';
patches = [
- ./0001-Remove-post-install-script-handle-in-nix-config-inst.patch
./0001-Extend-the-python-path-rather-than-replacing-it.patch
];
meta = with stdenv.lib; {
description = "A new GNOME web browser";
- homepage = https://gitlab.gnome.org/gnumdk/eolie;
+ homepage = https://wiki.gnome.org/Apps/Eolie;
license = licenses.gpl3;
maintainers = [ maintainers.samdroid-apps ];
platforms = platforms.linux;
diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 6a71afcaf60a..216569cc8210 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_32
-, automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook
+{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40
+, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobjectIntrospection
, glib-networking }:
stdenv.mkDerivation rec {
@@ -13,20 +13,24 @@ stdenv.mkDerivation rec {
sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n";
};
- preConfigure = ''
- ./autogen.sh
- '';
-
- nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ];
+ nativeBuildInputs = [
+ meson ninja vala_0_40 pkgconfig wrapGAppsHook
+ gobjectIntrospection # for setup hook
+ ];
buildInputs = [
- gtk3 json-glib sqlite libsoup gettext vala_0_32 gnome3.dconf gnome3.gspell glib-networking
+ glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking
] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]);
+ postPatch = ''
+ chmod +x data/meson_post_install.py # patchShebangs requires executable file
+ patchShebangs data/meson_post_install.py
+ '';
+
meta = {
description = "Native Gtk+ Twitter client for the Linux desktop";
longDescription = "Corebird is a modern, easy and fun Twitter client.";
- homepage = http://corebird.baedert.org;
+ homepage = https://corebird.baedert.org/;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.jonafato ];
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 134066cd352a..adf718a70ea1 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -6,10 +6,16 @@ in {
stable = true;
version = "1.2.6";
sha256Hash = "15g0m2wwqfp13wd7j31p8cx1kpylx5m8ljaksnsqdkgyr9l1ar8w";
+ # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
+ archPatchesRevision = "283641";
+ archPatchesHash = "0v4213vrabfa2dmwnqgb8n6hl54938mw9glaim3amyslxphmdrfb";
};
preview = mkTelegram {
stable = false;
version = "1.2.12";
sha256Hash = "1b9qc4a14jqjl30z4bjh1zbqsmgl25kdp0hj8p7xbj34zlkzfw5m";
+ # svn ls -v --depth empty svn://svn.archlinux.org/community/telegram-desktop/trunk
+ archPatchesRevision = "308775";
+ archPatchesHash = "0ggx64kdadrbd4bw5z0wi0fdg6hni7n9nxz9dp56p8hlw1wgpsls";
};
}
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index a165e90c3bdc..89bc3da56b8a 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -1,6 +1,6 @@
-{ stable, version, sha256Hash }:
+{ stable, version, sha256Hash, archPatchesRevision, archPatchesHash }:
-{ mkDerivation, lib, fetchgit, fetchpatch
+{ mkDerivation, lib, fetchgit, fetchsvn
, pkgconfig, pythonPackages, cmake, makeWrapper
, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
@@ -12,7 +12,7 @@ mkDerivation rec {
name = "telegram-desktop-${version}";
inherit version;
- # Submodules
+ # Telegram-Desktop with submodules
src = fetchgit {
url = "git://github.com/telegramdesktop/tdesktop";
rev = "v${version}";
@@ -20,29 +20,21 @@ mkDerivation rec {
fetchSubmodules = true;
};
- # TODO: Not active anymore.
- tgaur = fetchgit {
- url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
- rev = "1ed27ce40913b9e6e87faf7a2310660c2790b98e";
- sha256 = "1i7ipqgisaw54g1nbg2cvpbx89g9gyjjb3sak1486pxsasp1qhyc";
+ # Arch patches (svn export telegram-desktop/trunk)
+ archPatches = fetchsvn {
+ url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
+ rev = archPatchesRevision;
+ sha256 = archPatchesHash;
};
- patches = [ (if stable
- then (fetchpatch {
- name = "tdesktop.patch";
- url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/tdesktop.patch?h=packages/telegram-desktop&id=f0eefac36f529295f8b065a14b6d5f1a51d7614d";
- sha256 = "1a4wap5xnp6zn4913r3zdpy6hvkcfxcy4zzimy7fwzp7iwy20iqa";
- })
- else (fetchpatch {
- name = "tdesktop.patch";
- url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/tdesktop.patch?h=packages/telegram-desktop&id=59ca8bd4428cf2fb3f02d7f1e1a5558545a4c075";
- sha256 = "0jj2kifzx83f9nhk30csy2373avpyx0ci70a8bc7j2dm3wxym50l";
- }))
- ];
+ # TODO: libtgvoip.patch no-gtk2.patch
+ patches = [ "${archPatches}/tdesktop.patch" ];
postPatch = ''
- substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
- substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp --replace '"notify"' '"${libnotify}/lib/libnotify.so"'
+ substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
+ --replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
+ substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp \
+ --replace '"notify"' '"${libnotify}/lib/libnotify.so"'
'';
nativeBuildInputs = [ pkgconfig pythonPackages.gyp cmake makeWrapper ];
@@ -61,8 +53,8 @@ mkDerivation rec {
];
NIX_CFLAGS_COMPILE = [
- "-DTDESKTOP_DISABLE_AUTOUPDATE"
"-DTDESKTOP_DISABLE_CRASH_REPORTS"
+ "-DTDESKTOP_DISABLE_AUTOUPDATE"
"-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
"-I${minizip}/include/minizip"
# See Telegram/gyp/qt.gypi
@@ -74,13 +66,12 @@ mkDerivation rec {
"-I${getDev libopus}/include/opus"
"-I${getDev alsaLib}/include/alsa"
"-I${getDev libpulseaudio}/include/pulse"
- ]) [ "QtCore" "QtGui" "QtDBus" ];
+ ]) [ "QtCore" "QtGui" "QtDBus" ];
CPPFLAGS = NIX_CFLAGS_COMPILE;
preConfigure = ''
-
pushd "Telegram/ThirdParty/libtgvoip"
- patch -Np1 -i "${tgaur}/libtgvoip.patch"
+ patch -Np1 -i "${archPatches}/libtgvoip.patch"
popd
sed -i Telegram/gyp/telegram_linux.gypi \
@@ -102,22 +93,23 @@ mkDerivation rec {
--depth=Telegram/gyp \
--generator-output=../.. \
-Goutput_dir=out \
- --format=cmake \
+ --format=cmake \
Telegram/gyp/Telegram.gyp
cd out/Release
NUM=$((`wc -l < CMakeLists.txt` - 2))
- sed -i "$NUM r $tgaur/CMakeLists.inj" CMakeLists.txt
+ sed -i "$NUM r $archPatches/CMakeLists.inj" CMakeLists.txt
export ASM=$(type -p gcc)
'';
installPhase = ''
install -Dm755 Telegram $out/bin/telegram-desktop
+
mkdir -p $out/share/applications $out/share/kde4/services
- sed "s,/usr/bin,$out/bin,g" $tgaur/telegram-desktop.desktop > $out/share/applications/telegram-desktop.desktop
- sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol
+ install -m444 "$src/lib/xdg/telegramdesktop.desktop" "$out/share/applications/telegram-desktop.desktop"
+ sed "s,/usr/bin,$out/bin,g" $archPatches/tg.protocol > $out/share/kde4/services/tg.protocol
for icon_size in 16 32 48 64 128 256 512; do
install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
done
diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index 5e48f85852df..ae715aa4321c 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -18,7 +18,7 @@ buildPythonApplication rec {
];
buildInputs = [
- gtk3 (librsvg.override { enableIntrospection = true; })
+ gtk3 librsvg
libnotify
# Schemas with proxy configuration
gnome3.gsettings-desktop-schemas
diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix
index a30343dd0b9e..2925e601e32b 100644
--- a/pkgs/applications/science/math/jags/default.nix
+++ b/pkgs/applications/science/math/jags/default.nix
@@ -1,10 +1,10 @@
{stdenv, fetchurl, gfortran, openblas}:
stdenv.mkDerivation rec {
- name = "JAGS-4.1.0";
+ name = "JAGS-4.3.0";
src = fetchurl {
url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz";
- sha256 = "08pmrnbwibc0brgn5cx860jcl0s2xaw4amw7g45649r1bcdz7v25";
+ sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica";
};
buildInputs = [gfortran openblas];
configureFlags = [ "--with-blas=-lopenblas" "--with-lapack=-lopenblas" ];
diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile
index 2aaf872d109b..2b95446161b8 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitaly/Gemfile
@@ -1,11 +1,18 @@
source 'https://rubygems.org'
gem 'github-linguist', '~> 4.7.0', require: 'linguist'
-gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly'
-gem 'activesupport'
+gem 'gitlab-markup', '~> 1.6.2'
+gem 'gitaly-proto', '~> 0.83.0', require: 'gitaly'
+gem 'activesupport', '~> 5.0.2'
+gem 'rdoc', '~> 4.2'
gem 'gollum-lib', '~> 4.2', require: false
gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
+gem 'grpc', '~> 1.8.0'
+
+# Locked until https://github.com/google/protobuf/issues/4210 is closed
+gem 'google-protobuf', '= 3.5.1'
group :development, :test do
gem 'gitlab-styles', '~> 2.0.0', require: false
+ gem 'rspec', require: false
end
diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock
index f4e4ab10883e..cb53bb10122a 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitaly/Gemfile.lock
@@ -1,23 +1,23 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (5.0.0.1)
+ activesupport (5.0.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
- addressable (2.5.1)
- public_suffix (~> 2.0, >= 2.0.2)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
ast (2.3.0)
charlock_holmes (0.7.5)
concurrent-ruby (1.0.5)
diff-lcs (1.3)
escape_utils (1.1.1)
- faraday (0.12.2)
+ faraday (0.14.0)
multipart-post (>= 1.2, < 3)
gemojione (3.3.0)
json
- gitaly-proto (0.59.0)
+ gitaly-proto (0.83.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
@@ -31,6 +31,7 @@ GEM
diff-lcs (~> 1.1)
mime-types (>= 1.16)
posix-spawn (~> 0.3)
+ gitlab-markup (1.6.3)
gitlab-styles (2.0.0)
rubocop (~> 0.49)
rubocop-gitlab-security (~> 0.1.0)
@@ -48,21 +49,24 @@ GEM
gollum-rugged_adapter (0.4.4)
mime-types (>= 1.15)
rugged (~> 0.25)
- google-protobuf (3.4.0.2)
- googleauth (0.5.3)
+ google-protobuf (3.5.1)
+ googleapis-common-protos-types (1.0.1)
+ google-protobuf (~> 3.0)
+ googleauth (0.6.2)
faraday (~> 0.12)
- jwt (~> 1.4)
+ jwt (>= 1.4, < 3.0)
logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
os (~> 0.9)
signet (~> 0.7)
- grpc (1.6.0)
+ grpc (1.8.7)
google-protobuf (~> 3.1)
- googleauth (~> 0.5.1)
+ googleapis-common-protos-types (~> 1.0.0)
+ googleauth (>= 0.5.1, < 0.7)
i18n (0.8.1)
json (2.1.0)
- jwt (1.5.6)
+ jwt (2.1.0)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
@@ -73,7 +77,7 @@ GEM
mime-types-data (3.2016.0521)
mini_portile2 (2.3.0)
minitest (5.9.1)
- multi_json (1.12.1)
+ multi_json (1.13.1)
multipart-post (2.0.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
@@ -83,11 +87,25 @@ GEM
ast (~> 2.2)
posix-spawn (0.3.13)
powerpack (0.1.1)
- public_suffix (2.0.5)
+ public_suffix (3.0.1)
rainbow (2.2.2)
rake
rake (12.1.0)
+ rdoc (4.3.0)
rouge (2.2.1)
+ rspec (3.6.0)
+ rspec-core (~> 3.6.0)
+ rspec-expectations (~> 3.6.0)
+ rspec-mocks (~> 3.6.0)
+ rspec-core (3.6.0)
+ rspec-support (~> 3.6.0)
+ rspec-expectations (3.6.0)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.6.0)
+ rspec-mocks (3.6.0)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.6.0)
+ rspec-support (3.6.0)
rubocop (0.50.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
@@ -103,10 +121,10 @@ GEM
rugged (0.26.0)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
- signet (0.7.3)
+ signet (0.8.1)
addressable (~> 2.3)
faraday (~> 0.9)
- jwt (~> 1.5)
+ jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
stringex (2.7.1)
thread_safe (0.3.6)
@@ -118,12 +136,17 @@ PLATFORMS
ruby
DEPENDENCIES
- activesupport
- gitaly-proto (~> 0.59.0)
+ activesupport (~> 5.0.2)
+ gitaly-proto (~> 0.83.0)
github-linguist (~> 4.7.0)
+ gitlab-markup (~> 1.6.2)
gitlab-styles (~> 2.0.0)
gollum-lib (~> 4.2)
gollum-rugged_adapter (~> 0.4.4)
+ google-protobuf (= 3.5.1)
+ grpc (~> 1.8.0)
+ rdoc (~> 4.2)
+ rspec
BUNDLED WITH
- 1.16.0
+ 1.16.1
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index 43ac470dcd46..7a8ba0fda744 100644
--- a/pkgs/applications/version-management/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitaly/default.nix
@@ -7,14 +7,14 @@ let
gemdir = ./.;
};
in buildGoPackage rec {
- version = "0.59.2";
+ version = "0.81.0";
name = "gitaly-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "08f109rw3qxdr93l0kl8wxmrvn846a6vdkssvrp2zr40yn9wif7m";
+ sha256 = "01sw5y201xbd21k9r7xmzqiiypb924ac95nqqfhzplqnssa98n9y";
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";
diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix
index 81bb334085ac..efe786216628 100644
--- a/pkgs/applications/version-management/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitaly/gemset.nix
@@ -3,19 +3,19 @@
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vgjr48yiynwf9rh2nsxa8w134na0805l40chf9g9scii9k70rj9";
+ sha256 = "0g85lqq0smj71g8a2dxb54ajjzw59c9snana4p61knryc83q3yg6";
type = "gem";
};
- version = "5.0.0.1";
+ version = "5.0.6";
};
addressable = {
dependencies = ["public_suffix"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i8q32a4gr0zghxylpyy7jfqwxvwrivsxflg9mks6kx92frh75mh";
+ sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
type = "gem";
};
- version = "2.5.1";
+ version = "2.5.2";
};
ast = {
source = {
@@ -61,10 +61,10 @@
dependencies = ["multipart-post"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2";
+ sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr";
type = "gem";
};
- version = "0.12.2";
+ version = "0.14.0";
};
gemojione = {
dependencies = ["json"];
@@ -79,10 +79,10 @@
dependencies = ["google-protobuf" "grpc"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0s86126iqhbmkix6zs357ixlc1syyxmwk2blaimsav7f0x9swy82";
+ sha256 = "0z3asy104q36sshq9zhmgcm32sg8qr8jvy0mi19nakkq7prrkwqv";
type = "gem";
};
- version = "0.59.0";
+ version = "0.83.0";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -110,6 +110,14 @@
};
version = "2.8.2";
};
+ gitlab-markup = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1pvx257azpr00yvb74lgjpgnj72nwyd29l9a18280rgmp4cjniki";
+ type = "gem";
+ };
+ version = "1.6.3";
+ };
gitlab-styles = {
dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
source = {
@@ -149,28 +157,37 @@
google-protobuf = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl";
+ sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi";
type = "gem";
};
- version = "3.4.0.2";
+ version = "3.5.1";
+ };
+ googleapis-common-protos-types = {
+ dependencies = ["google-protobuf"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck";
+ type = "gem";
+ };
+ version = "1.0.1";
};
googleauth = {
dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli";
+ sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f";
type = "gem";
};
- version = "0.5.3";
+ version = "0.6.2";
};
grpc = {
- dependencies = ["google-protobuf" "googleauth"];
+ dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52";
+ sha256 = "02b80pyg4rgkiafyh1jqnfh6xp9abpd1x0a9c2h98f0851scw28b";
type = "gem";
};
- version = "1.6.0";
+ version = "1.8.7";
};
i18n = {
source = {
@@ -191,10 +208,10 @@
jwt = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4";
+ sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky";
type = "gem";
};
- version = "1.5.6";
+ version = "2.1.0";
};
little-plugger = {
source = {
@@ -257,10 +274,10 @@
multi_json = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
+ sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
type = "gem";
};
- version = "1.12.1";
+ version = "1.13.1";
};
multipart-post = {
source = {
@@ -323,10 +340,10 @@
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
+ sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637";
type = "gem";
};
- version = "2.0.5";
+ version = "3.0.1";
};
rainbow = {
dependencies = ["rake"];
@@ -345,6 +362,14 @@
};
version = "12.1.0";
};
+ rdoc = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13ba2mhqqcsp3k97x3iz9x29xk26rv4561lfzzzibcy41vvj1n4c";
+ type = "gem";
+ };
+ version = "4.3.0";
+ };
rouge = {
source = {
remotes = ["https://rubygems.org"];
@@ -353,6 +378,50 @@
};
version = "2.2.1";
};
+ rspec = {
+ dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1nd50hycab2a2vdah9lxi585g8f63jxjvmzmxqyln51grxwx9hzb";
+ type = "gem";
+ };
+ version = "3.6.0";
+ };
+ rspec-core = {
+ dependencies = ["rspec-support"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18np8wyw2g79waclpaacba6nd7x60ixg07ncya0j0qj1z9b37grd";
+ type = "gem";
+ };
+ version = "3.6.0";
+ };
+ rspec-expectations = {
+ dependencies = ["diff-lcs" "rspec-support"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "028ifzf9mqp3kxx40q1nbwj40g72g9zk0wr78l146phblkv96w0a";
+ type = "gem";
+ };
+ version = "3.6.0";
+ };
+ rspec-mocks = {
+ dependencies = ["diff-lcs" "rspec-support"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nv6jkxy24sag1i9w9wi3850k6skk2fm6yhcrgnmlz6vmwxvizp8";
+ type = "gem";
+ };
+ version = "3.6.0";
+ };
+ rspec-support = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "050paqqpsml8w88nf4a15zbbj3vvm471zpv73sjfdnz7w21wnypb";
+ type = "gem";
+ };
+ version = "3.6.0";
+ };
rubocop = {
dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
source = {
@@ -409,10 +478,10 @@
dependencies = ["addressable" "faraday" "jwt" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6";
+ sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
type = "gem";
};
- version = "0.7.3";
+ version = "0.8.1";
};
stringex = {
source = {
diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index ab0ff74f03f5..ca5b8a84fbf9 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,14 +1,14 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }:
stdenv.mkDerivation rec {
- version = "5.10.2";
+ version = "6.0.3";
name = "gitlab-shell-${version}";
srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
- sha256 = "16lwnzsppql7pkf8fka6cwkghdr57g225zvln9ii29w7nzz1hvaf";
+ sha256 = "073y41d9sqy6l6dxbiml6c13fq98qcb0jf86w9slld1mcw19cmrk";
};
buildInputs = [ ruby bundler go ];
@@ -30,29 +30,9 @@ stdenv.mkDerivation rec {
# code by default which doesn't work in nixos because it's a
# read-only filesystem
postPatch = ''
- substituteInPlace lib/gitlab_config.rb --replace\
- "File.join(ROOT_PATH, 'config.yml')"\
- "ENV['GITLAB_SHELL_CONFIG_PATH']"
-
- # Note that we're running gitlab-shell from current-system/sw
- # because otherwise updating gitlab-shell won't be reflected in
- # the hardcoded path of the authorized-keys file:
- substituteInPlace lib/gitlab_keys.rb --replace\
- "\"#{ROOT_PATH}/bin/gitlab-shell"\
- "\"GITLAB_SHELL_CONFIG_PATH=#{ENV['GITLAB_SHELL_CONFIG_PATH']} /run/current-system/sw/bin/gitlab-shell"
-
- # We're setting GITLAB_SHELL_CONFIG_PATH in the ssh authorized key
- # environment because we need it in gitlab_configrb
- # . unsetenv_others will remove that so we're not doing it for
- # now.
- #
- # TODO: Are there any security implications? The commit adding
- # unsetenv_others didn't mention anything...
- #
- # Kernel::exec({'PATH' => ENV['PATH'], 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'GL_ID' => ENV['GL_ID']}, *args, unsetenv_others: true)
- substituteInPlace lib/gitlab_shell.rb --replace\
- " *args, unsetenv_others: true)"\
- " *args)"
+ substituteInPlace lib/gitlab_config.rb --replace \
+ "File.join(ROOT_PATH, 'config.yml')" \
+ "'/run/gitlab/shell-config.yml'"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/gitlab-shell/fixes.patch b/pkgs/applications/version-management/gitlab-shell/fixes.patch
index 1c694266e470..b0ee31cf39dd 100644
--- a/pkgs/applications/version-management/gitlab-shell/fixes.patch
+++ b/pkgs/applications/version-management/gitlab-shell/fixes.patch
@@ -1,12 +1,11 @@
diff --git a/support/go_build.rb b/support/go_build.rb
-index 82f94d2..40ba35e 100644
+index 30a6b71..46b4dfa 100644
--- a/support/go_build.rb
+++ b/support/go_build.rb
-@@ -25,9 +25,8 @@ module GoBuild
- def run!(env, cmd)
+@@ -26,8 +26,8 @@ module GoBuild
raise "env must be a hash" unless env.is_a?(Hash)
raise "cmd must be an array" unless cmd.is_a?(Array)
--
+
- if !system(env, *cmd)
- abort "command failed: #{env.inspect} #{cmd.join(' ')}"
- end
diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
index f28e74b88c50..bc1aa8583867 100644
--- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
@@ -1,30 +1,3 @@
-diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb
-index 0b11ce3..ffc3faf 100644
---- a/lib/gitlab_projects.rb
-+++ b/lib/gitlab_projects.rb
-@@ -8,7 +8,7 @@ require_relative 'gitlab_metrics'
- require_relative 'gitlab_metrics'
-
- class GitlabProjects
-- GLOBAL_HOOKS_DIRECTORY = File.join(ROOT_PATH, 'hooks')
-+ GLOBAL_HOOKS_DIRECTORY = ENV['GITLAB_SHELL_HOOKS_PATH'] || File.join(ROOT_PATH, 'hooks')
-
- # Project name is a directory name for repository with .git at the end
- # It may be namespaced or not. Like repo.git or gitlab/repo.git
-diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
-index e7d0254..181ec8a 100644
---- a/lib/gitlab_shell.rb
-+++ b/lib/gitlab_shell.rb
-@@ -188,7 +188,8 @@ class GitlabShell
- end
-
- # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
-- Kernel::exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH)
-+ # Except we don't, because we're already in the right directory on nixos !
-+ Kernel::exec(env, *args, unsetenv_others: true)
- end
-
- def api
diff --git a/go/internal/config/config.go b/go/internal/config/config.go
index c57b4de..88cfc95 100644
--- a/go/internal/config/config.go
@@ -34,7 +7,21 @@ index c57b4de..88cfc95 100644
cfg.RootDir = dir
- configBytes, err := ioutil.ReadFile(path.Join(cfg.RootDir, configFile))
-+ configBytes, err := ioutil.ReadFile(os.Getenv("GITLAB_SHELL_CONFIG_PATH"))
++ configBytes, err := ioutil.ReadFile("/run/gitlab/shell-config.yml")
if err != nil {
return nil, err
}
+diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
+index 1452f95..2b40327 100644
+--- a/lib/gitlab_shell.rb
++++ b/lib/gitlab_shell.rb
+@@ -180,7 +180,8 @@ class GitlabShell
+ end
+
+ # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
+- Kernel::exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH)
++ # Except we don't, because we're already in the right directory on nixos!
++ Kernel::exec(env, *args, unsetenv_others: true)
+ end
+
+ def api
diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index c43b5ab2a1b6..6bb696406c9d 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitLab, git, go }:
stdenv.mkDerivation rec {
- version = "3.3.1";
+ version = "3.6.0";
name = "gitlab-workhorse-${version}";
srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
- sha256 = "19x9ryp99xygj39kq2r756rahh9mxp6j83hxvv09y33vgz64y8xh";
+ sha256 = "1vcxm9m82m1dcc86r29k5v8cp3zvpby4kszbkavl3frm3ws0w9lz";
};
buildInputs = [ git go ];
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index 916314f42f93..97d40857e117 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'default_value_for', '~> 3.0.0'
# Supported DBs
-gem 'mysql2', '~> 0.4.5', group: :mysql
+gem 'mysql2', '~> 0.4.10', group: :mysql
gem 'pg', '~> 0.18.2', group: :postgres
gem 'rugged', '~> 0.26.0'
@@ -25,7 +25,7 @@ gem 'devise', '~> 4.2'
gem 'doorkeeper', '~> 4.2.0'
gem 'doorkeeper-openid_connect', '~> 1.2.0'
gem 'omniauth', '~> 1.4.2'
-gem 'omniauth-auth0', '~> 1.4.1'
+gem 'omniauth-auth0', '~> 2.0.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9'
gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-facebook', '~> 4.0.0'
@@ -69,7 +69,15 @@ gem 'net-ldap'
# Git Wiki
# Required manually in config/initializers/gollum.rb to control load order
+# Before updating this gem, check if
+# https://github.com/gollum/gollum-lib/pull/292 has been merged.
+# If it has, then remove the monkey patch for update_page, rename_page and raw_data_in_committer
+# in config/initializers/gollum.rb
gem 'gollum-lib', '~> 4.2', require: false
+
+# Before updating this gem, check if
+# https://github.com/gollum/rugged_adapter/pull/28 has been merged.
+# If it has, then remove the monkey patch for tree_entry in config/initializers/gollum.rb
gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
# Language detection
@@ -78,7 +86,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist'
# API
gem 'grape', '~> 1.0'
gem 'grape-entity', '~> 0.6.0'
-gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
+gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
@@ -111,7 +119,7 @@ gem 'google-api-client', '~> 0.13.6'
gem 'unf', '~> 0.1.4'
# Seed data
-gem 'seed-fu', '2.3.6' # Upgrade to > 2.3.7 once https://github.com/mbleigh/seed-fu/issues/123 is solved
+gem 'seed-fu', '~> 2.3.7'
# Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0'
@@ -128,7 +136,7 @@ gem 'asciidoctor-plantuml', '0.0.7'
gem 'rouge', '~> 2.0'
gem 'truncato', '~> 0.7.9'
gem 'bootstrap_form', '~> 2.7.0'
-gem 'nokogiri', '~> 1.8.1'
+gem 'nokogiri', '~> 1.8.2'
# Diffs
gem 'diffy', '~> 3.1.0'
@@ -229,6 +237,9 @@ gem 'charlock_holmes', '~> 0.7.5'
# Faster JSON
gem 'oj', '~> 2.17.4'
+# Faster blank
+gem 'fast_blank'
+
# Parse time & duration
gem 'chronic', '~> 0.10.2'
gem 'chronic_duration', '~> 0.10.6'
@@ -263,7 +274,7 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
gem 'gettext_i18n_rails_js', '~> 1.2.0'
gem 'gettext', '~> 3.2.2', require: false, group: :development
-gem 'batch-loader'
+gem 'batch-loader', '~> 1.2.1'
# Perf bar
gem 'peek', '~> 1.0.1'
@@ -283,7 +294,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false
# Prometheus
- gem 'prometheus-client-mmap', '~> 0.7.0.beta43'
+ gem 'prometheus-client-mmap', '~> 0.9.1'
gem 'raindrops', '~> 0.18'
end
@@ -311,14 +322,14 @@ group :development, :test do
gem 'fuubar', '~> 2.2.0'
gem 'database_cleaner', '~> 1.5.0'
- gem 'factory_girl_rails', '~> 4.7.0'
+ gem 'factory_bot_rails', '~> 4.8.2'
gem 'rspec-rails', '~> 3.6.0'
gem 'rspec-retry', '~> 0.4.5'
gem 'spinach-rails', '~> 0.2.1'
gem 'spinach-rerun-reporter', '~> 0.0.2'
gem 'rspec_profiling', '~> 0.0.5'
gem 'rspec-set', '~> 0.1.3'
- gem 'rspec-parameterized'
+ gem 'rspec-parameterized', require: false
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 5.7.0'
@@ -334,13 +345,15 @@ group :development, :test do
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'spring-commands-spinach', '~> 1.1.0'
- gem 'rubocop', '~> 0.49.1', require: false
- gem 'rubocop-rspec', '~> 1.15.1', require: false
- gem 'rubocop-gitlab-security', '~> 0.1.0', require: false
- gem 'scss_lint', '~> 0.54.0', require: false
+ gem 'gitlab-styles', '~> 2.3', require: false
+ # Pin these dependencies, otherwise a new rule could break the CI pipelines
+ gem 'rubocop', '~> 0.52.1'
+ gem 'rubocop-rspec', '~> 1.22.1'
+
+ gem 'scss_lint', '~> 0.56.0', require: false
gem 'haml_lint', '~> 0.26.0', require: false
gem 'simplecov', '~> 0.14.0', require: false
- gem 'flay', '~> 2.8.0', require: false
+ gem 'flay', '~> 2.10.0', require: false
gem 'bundler-audit', '~> 0.5.0', require: false
gem 'benchmark-ips', '~> 2.3.0', require: false
@@ -379,9 +392,6 @@ gem 'ruby-prof', '~> 0.16.2'
# OAuth
gem 'oauth2', '~> 1.4'
-# Soft deletion
-gem 'paranoia', '~> 2.3.1'
-
# Health check
gem 'health_check', '~> 2.6.0'
@@ -400,16 +410,20 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly'
+# Locked until https://github.com/google/protobuf/issues/4210 is closed
+gem 'google-protobuf', '= 3.5.1'
gem 'toml-rb', '~> 0.3.15', require: false
# Feature toggles
-gem 'flipper', '~> 0.10.2'
-gem 'flipper-active_record', '~> 0.10.2'
+gem 'flipper', '~> 0.11.0'
+gem 'flipper-active_record', '~> 0.11.0'
+gem 'flipper-active_support_cache_store', '~> 0.11.0'
# Structured logging
gem 'lograge', '~> 0.5'
gem 'grape_logging', '~> 1.7'
-gem 'activerecord-nulldb-adapter'
+# Asset synchronization
+gem 'asset_sync', '~> 2.2.0'
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index c8915e9172c5..4022e2896116 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -33,8 +33,6 @@ GEM
activemodel (= 4.2.10)
activesupport (= 4.2.10)
arel (~> 6.0)
- activerecord-nulldb-adapter (0.3.7)
- activerecord (>= 2.0.0)
activerecord_sane_schema_dumper (0.2)
rails (>= 4, < 5)
activesupport (4.2.10)
@@ -60,6 +58,11 @@ GEM
asciidoctor (1.5.3)
asciidoctor-plantuml (0.0.7)
asciidoctor (~> 1.5)
+ asset_sync (2.2.0)
+ activemodel (>= 4.1.0)
+ fog-core
+ mime-types (>= 2.99)
+ unf
ast (2.3.0)
atomic (1.1.99)
attr_encrypted (3.0.3)
@@ -75,7 +78,7 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
babosa (1.0.2)
base32 (0.3.2)
- batch-loader (1.1.1)
+ batch-loader (1.2.1)
bcrypt (3.1.11)
bcrypt_pbkdf (1.0.0)
benchmark-ips (2.3.0)
@@ -192,10 +195,10 @@ GEM
excon (0.57.1)
execjs (2.6.0)
expression_parser (0.9.0)
- factory_girl (4.7.0)
+ factory_bot (4.8.2)
activesupport (>= 3.0.0)
- factory_girl_rails (4.7.0)
- factory_girl (~> 4.7.0)
+ factory_bot_rails (4.8.2)
+ factory_bot (~> 4.8.2)
railties (>= 3.0.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
@@ -204,18 +207,22 @@ GEM
faraday_middleware-multi_json (0.0.6)
faraday_middleware
multi_json
+ fast_blank (1.0.0)
fast_gettext (1.4.0)
ffaker (2.4.0)
ffi (1.9.18)
- flay (2.8.1)
+ flay (2.10.0)
erubis (~> 2.7.0)
path_expander (~> 1.0)
ruby_parser (~> 3.0)
sexp_processor (~> 4.0)
- flipper (0.10.2)
- flipper-active_record (0.10.2)
+ flipper (0.11.0)
+ flipper-active_record (0.11.0)
activerecord (>= 3.2, < 6)
- flipper (~> 0.10.2)
+ flipper (~> 0.11.0)
+ flipper-active_support_cache_store (0.11.0)
+ activesupport (>= 3.2, < 6)
+ flipper (~> 0.11.0)
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
@@ -278,7 +285,7 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
- gitaly-proto (0.59.0)
+ gitaly-proto (0.84.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
@@ -297,6 +304,10 @@ GEM
mime-types (>= 1.16)
posix-spawn (~> 0.3)
gitlab-markup (1.6.3)
+ gitlab-styles (2.3.2)
+ rubocop (~> 0.51)
+ rubocop-gitlab-security (~> 0.1.0)
+ rubocop-rspec (~> 1.19)
gitlab_omniauth-ldap (2.0.4)
net-ldap (~> 0.16)
omniauth (~> 1.3)
@@ -329,7 +340,9 @@ GEM
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
- google-protobuf (3.4.1.1)
+ google-protobuf (3.5.1)
+ googleapis-common-protos-types (1.0.1)
+ google-protobuf (~> 3.0)
googleauth (0.5.3)
faraday (~> 0.12)
jwt (~> 1.4)
@@ -356,9 +369,10 @@ GEM
rake
grape_logging (1.7.0)
grape
- grpc (1.4.5)
+ grpc (1.8.3)
google-protobuf (~> 3.1)
- googleauth (~> 0.5.1)
+ googleapis-common-protos-types (~> 1.0.0)
+ googleauth (>= 0.5.1, < 0.7)
haml (4.0.7)
tilt
haml_lint (0.26.0)
@@ -495,11 +509,11 @@ GEM
mustermann (1.0.0)
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
- mysql2 (0.4.5)
+ mysql2 (0.4.10)
net-ldap (0.16.0)
net-ssh (4.1.0)
netrc (0.11.0)
- nokogiri (1.8.1)
+ nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
numerizer (0.1.1)
oauth (0.5.1)
@@ -515,8 +529,8 @@ GEM
omniauth (1.4.2)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
- omniauth-auth0 (1.4.1)
- omniauth-oauth2 (~> 1.1)
+ omniauth-auth0 (2.0.0)
+ omniauth-oauth2 (~> 1.4)
omniauth-authentiq (0.3.1)
omniauth-oauth2 (~> 1.3, >= 1.3.1)
omniauth-azure-oauth2 (0.0.9)
@@ -569,14 +583,12 @@ GEM
rubypants (~> 0.2)
orm_adapter (0.5.0)
os (0.9.6)
- parallel (1.12.0)
- paranoia (2.3.1)
- activerecord (>= 4.0, < 5.2)
+ parallel (1.12.1)
parser (2.4.0.2)
ast (~> 2.3)
parslet (1.5.0)
blankslate (~> 2.0)
- path_expander (1.0.1)
+ path_expander (1.0.2)
peek (1.0.1)
concurrent-ruby (>= 0.9.0)
concurrent-ruby-ext (>= 0.9.0)
@@ -624,7 +636,7 @@ GEM
parser
unparser
procto (0.0.3)
- prometheus-client-mmap (0.7.0.beta43)
+ prometheus-client-mmap (0.9.1)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
@@ -641,7 +653,7 @@ GEM
rack (>= 0.4)
rack-attack (4.4.1)
rack
- rack-cors (0.4.0)
+ rack-cors (1.0.2)
rack-oauth2 (1.2.3)
activesupport (>= 2.3)
attr_required (>= 0.0.5)
@@ -685,6 +697,9 @@ GEM
rake
raindrops (0.18.0)
rake (12.3.0)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
rbnacl (4.0.2)
@@ -698,7 +713,7 @@ GEM
json
recursive-open-struct (1.0.0)
redcarpet (3.4.0)
- redis (3.3.3)
+ redis (3.3.5)
redis-actionpack (5.0.2)
actionpack (>= 4.0, < 6)
redis-rack (>= 1, < 3)
@@ -771,21 +786,21 @@ GEM
pg
rails
sqlite3
- rubocop (0.49.1)
+ rubocop (0.52.1)
parallel (~> 1.10)
- parser (>= 2.3.3.1, < 3.0)
+ parser (>= 2.4.0.2, < 3.0)
powerpack (~> 0.1)
- rainbow (>= 1.99.1, < 3.0)
+ rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
- rubocop-gitlab-security (0.1.0)
- rubocop (>= 0.47.1)
- rubocop-rspec (1.15.1)
- rubocop (>= 0.42.0)
+ rubocop-gitlab-security (0.1.1)
+ rubocop (>= 0.51)
+ rubocop-rspec (1.22.1)
+ rubocop (>= 0.52.1)
ruby-fogbugz (0.2.1)
crack (~> 0.4)
ruby-prof (0.16.2)
- ruby-progressbar (1.8.1)
+ ruby-progressbar (1.9.0)
ruby-saml (1.4.1)
nokogiri (>= 1.5.10)
ruby_parser (3.9.0)
@@ -799,7 +814,11 @@ GEM
safe_yaml (1.0.4)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
- sass (3.4.22)
+ sass (3.5.5)
+ sass-listen (~> 4.0.0)
+ sass-listen (4.0.0)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
@@ -809,11 +828,11 @@ GEM
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
- scss_lint (0.54.0)
+ scss_lint (0.56.0)
rake (>= 0.9, < 13)
- sass (~> 3.4.20)
+ sass (~> 3.5.3)
securecompare (1.0.0)
- seed-fu (2.3.6)
+ seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
select2-rails (3.5.9.3)
@@ -829,11 +848,11 @@ GEM
rack
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
- sidekiq (5.0.4)
+ sidekiq (5.0.5)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
- redis (~> 3.3, >= 3.3.3)
+ redis (>= 3.3.4, < 5)
sidekiq-cron (0.6.0)
rufus-scheduler (>= 3.3.0)
sidekiq (>= 4.2.1)
@@ -969,7 +988,6 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.3.2)
ace-rails-ap (~> 4.1.0)
- activerecord-nulldb-adapter
activerecord_sane_schema_dumper (= 0.2)
acts-as-taggable-on (~> 4.0)
addressable (~> 2.5.2)
@@ -978,11 +996,12 @@ DEPENDENCIES
asana (~> 0.6.0)
asciidoctor (~> 1.5.2)
asciidoctor-plantuml (= 0.0.7)
+ asset_sync (~> 2.2.0)
attr_encrypted (~> 3.0.0)
awesome_print (~> 1.2.0)
babosa (~> 1.0.2)
base32 (~> 0.3.0)
- batch-loader
+ batch-loader (~> 1.2.1)
bcrypt_pbkdf (~> 1.0)
benchmark-ips (~> 2.3.0)
better_errors (~> 2.1.0)
@@ -1014,12 +1033,14 @@ DEPENDENCIES
dropzonejs-rails (~> 0.7.1)
email_reply_trimmer (~> 0.1)
email_spec (~> 1.6.0)
- factory_girl_rails (~> 4.7.0)
+ factory_bot_rails (~> 4.8.2)
faraday (~> 0.12)
+ fast_blank
ffaker (~> 2.4)
- flay (~> 2.8.0)
- flipper (~> 0.10.2)
- flipper-active_record (~> 0.10.2)
+ flay (~> 2.10.0)
+ flipper (~> 0.11.0)
+ flipper-active_record (~> 0.11.0)
+ flipper-active_support_cache_store (~> 0.11.0)
fog-aliyun (~> 0.2.0)
fog-aws (~> 1.4)
fog-core (~> 1.44)
@@ -1035,15 +1056,17 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
- gitaly-proto (~> 0.59.0)
+ gitaly-proto (~> 0.84.0)
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.6.2)
+ gitlab-styles (~> 2.3)
gitlab_omniauth-ldap (~> 2.0.4)
gollum-lib (~> 4.2)
gollum-rugged_adapter (~> 0.4.4)
gon (~> 6.1.0)
google-api-client (~> 0.13.6)
+ google-protobuf (= 3.5.1)
gpgme
grape (~> 1.0)
grape-entity (~> 0.6.0)
@@ -1075,15 +1098,15 @@ DEPENDENCIES
method_source (~> 0.8)
minitest (~> 5.7.0)
mousetrap-rails (~> 1.4.6)
- mysql2 (~> 0.4.5)
+ mysql2 (~> 0.4.10)
net-ldap
net-ssh (~> 4.1.0)
- nokogiri (~> 1.8.1)
+ nokogiri (~> 1.8.2)
oauth2 (~> 1.4)
octokit (~> 4.6.2)
oj (~> 2.17.4)
omniauth (~> 1.4.2)
- omniauth-auth0 (~> 1.4.1)
+ omniauth-auth0 (~> 2.0.0)
omniauth-authentiq (~> 0.3.1)
omniauth-azure-oauth2 (~> 0.0.9)
omniauth-cas3 (~> 1.1.4)
@@ -1098,7 +1121,6 @@ DEPENDENCIES
omniauth-twitter (~> 1.2.0)
omniauth_crowd (~> 2.2.0)
org-ruby (~> 0.9.12)
- paranoia (~> 2.3.1)
peek (~> 1.0.1)
peek-gc (~> 0.0.2)
peek-host (~> 1.0.0)
@@ -1110,11 +1132,11 @@ DEPENDENCIES
peek-sidekiq (~> 1.0.3)
pg (~> 0.18.2)
premailer-rails (~> 1.9.7)
- prometheus-client-mmap (~> 0.7.0.beta43)
+ prometheus-client-mmap (~> 0.9.1)
pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1)
- rack-cors (~> 0.4.0)
+ rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.2.1)
rack-proxy (~> 0.6.0)
rails (= 4.2.10)
@@ -1141,9 +1163,8 @@ DEPENDENCIES
rspec-retry (~> 0.4.5)
rspec-set (~> 0.1.3)
rspec_profiling (~> 0.0.5)
- rubocop (~> 0.49.1)
- rubocop-gitlab-security (~> 0.1.0)
- rubocop-rspec (~> 1.15.1)
+ rubocop (~> 0.52.1)
+ rubocop-rspec (~> 1.22.1)
ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 0.16.2)
ruby_parser (~> 3.8)
@@ -1151,8 +1172,8 @@ DEPENDENCIES
rugged (~> 0.26.0)
sanitize (~> 2.0)
sass-rails (~> 5.0.6)
- scss_lint (~> 0.54.0)
- seed-fu (= 2.3.6)
+ scss_lint (~> 0.56.0)
+ seed-fu (~> 2.3.7)
select2-rails (~> 3.5.9)
selenium-webdriver (~> 3.5)
sentry-raven (~> 2.5.3)
@@ -1194,4 +1215,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.16.0
+ 1.16.1
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index d13e61395827..1c3d1928a8b0 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -18,11 +18,11 @@ let
};
};
- version = "10.3.4";
+ version = "10.5.6";
gitlabDeb = fetchurl {
url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
- sha256 = "0b6508hcahvhfpxyrqs05kz9a7c1wv658asm6a7ccish6hnwcica";
+ sha256 = "1kml7iz4q9g5gcfqqarivlnkmkmq9250wgm95yi4rgzynb5jndd0";
};
in
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "gitlabhq";
repo = "gitlabhq";
rev = "v${version}";
- sha256 = "0cvp4wwkc04qffsq738867j31igwzj7zlmahdl24yddbmpa5x8r1";
+ sha256 = "059h63jn552fcir2dgsjv85zv1ihbyiwzws4h2j15mwj2cdpjkh0";
};
buildInputs = [
@@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
patches = [
./remove-hardcoded-locations.patch
- ./nulladapter.patch
./fix-36783.patch
];
@@ -59,6 +58,8 @@ stdenv.mkDerivation rec {
substituteInPlace app/controllers/admin/background_jobs_controller.rb \
--replace "ps -U" "${procps}/bin/ps -U"
+ sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake
+
# required for some gems:
cat > config/database.yml < 1.0.3'
-
-diff --git a/Gemfile.lock b/Gemfile.lock
-index 38944248f9..08ce4486ba 100644
---- a/Gemfile.lock
-+++ b/Gemfile.lock
-@@ -33,6 +33,8 @@ GEM
- activemodel (= 4.2.8)
- activesupport (= 4.2.8)
- arel (~> 6.0)
-+ activerecord-nulldb-adapter (0.3.7)
-+ activerecord (>= 2.0.0)
- activerecord_sane_schema_dumper (0.2)
- rails (>= 4, < 5)
- activesupport (4.2.8)
-@@ -963,6 +965,7 @@ PLATFORMS
- DEPENDENCIES
- RedCloth (~> 4.3.2)
- ace-rails-ap (~> 4.1.0)
-+ activerecord-nulldb-adapter
- activerecord_sane_schema_dumper (= 0.2)
- acts-as-taggable-on (~> 4.0)
- addressable (~> 2.5.2)
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index acc615c63ca5..7a2bfea0c109 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -1,8 +1,8 @@
diff --git a/config/environments/production.rb b/config/environments/production.rb
-index c5cbfcf64c..e40f10e25f 100644
+index c5cbfcf64c..4d01f6fab8 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
-@@ -70,14 +70,16 @@ Rails.application.configure do
+@@ -70,10 +70,10 @@ Rails.application.configure do
config.action_mailer.delivery_method = :sendmail
# Defaults to:
@@ -11,23 +11,17 @@ index c5cbfcf64c..e40f10e25f 100644
- # # arguments: '-i -t'
- # # }
+ config.action_mailer.sendmail_settings = {
-+ location: '/run/wrappers/bin/sendmail',
++ location: '/usr/sbin/sendmail',
+ arguments: '-i -t'
+ }
config.action_mailer.perform_deliveries = true
config.action_mailer.raise_delivery_errors = true
- config.eager_load = true
-
- config.allow_concurrency = false
-+
-+ config.active_record.dump_schema_after_migration = false
- end
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 0b33783869..cd4e41d9bd 100644
+index bd696a7f2c..44e3863736 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
-@@ -574,7 +574,7 @@ production: &base
+@@ -590,7 +590,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git:
@@ -37,10 +31,10 @@ index 0b33783869..cd4e41d9bd 100644
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
-index 8ddf8e4d2e..559cf9adf7 100644
+index 0bea8a4f4b..290248547b 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
-@@ -252,7 +252,7 @@ Settings.gitlab['user'] ||= 'git'
+@@ -255,7 +255,7 @@ Settings.gitlab['user'] ||= 'git'
Settings.gitlab['user_home'] ||= begin
Etc.getpwnam(Settings.gitlab['user']).dir
rescue ArgumentError # no user configured
@@ -49,7 +43,7 @@ index 8ddf8e4d2e..559cf9adf7 100644
end
Settings.gitlab['time_zone'] ||= nil
Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
-@@ -491,7 +491,7 @@ Settings.backup['upload']['storage_class'] ||= nil
+@@ -507,7 +507,7 @@ Settings.backup['upload']['storage_class'] ||= nil
# Git
#
Settings['git'] ||= Settingslogic.new({})
@@ -58,29 +52,42 @@ index 8ddf8e4d2e..559cf9adf7 100644
# Important: keep the satellites.path setting until GitLab 9.0 at
# least. This setting is fed to 'rm -rf' in
+diff --git a/lib/api/api.rb b/lib/api/api.rb
+index e953f3d2ec..3a8d9f076b 100644
+--- a/lib/api/api.rb
++++ b/lib/api/api.rb
+@@ -2,7 +2,7 @@ module API
+ class API < Grape::API
+ include APIGuard
+
+- LOG_FILENAME = Rails.root.join("log", "api_json.log")
++ LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log")
+
+ NO_SLASH_URL_PART_REGEX = %r{[^/]+}
+ PROJECT_ENDPOINT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freeze
diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
-index 59b21149a9..4f4a39a06c 100644
+index a42e312b5d..ccaab9229e 100644
--- a/lib/gitlab/logger.rb
+++ b/lib/gitlab/logger.rb
-@@ -26,7 +26,7 @@
+@@ -26,7 +26,7 @@ module Gitlab
end
def self.full_log_path
- Rails.root.join("log", file_name)
-+ File.join(ENV["GITLAB_LOG_PATH"], file_name)
++ File.join(ENV["GITLAB_LOG_PATH"], file_name)
end
def self.cache_key
diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb
-index b5f4124052..f72c556983 100644
+index 7d7400bdab..cb25211d44 100644
--- a/lib/gitlab/uploads_transfer.rb
+++ b/lib/gitlab/uploads_transfer.rb
@@ -1,7 +1,7 @@
module Gitlab
class UploadsTransfer < ProjectTransfer
def root_dir
-- File.join(CarrierWave.root, FileUploader.base_dir)
-+ ENV['GITLAB_UPLOADS_PATH'] || File.join(CarrierWave.root, FileUploader.base_dir)
+- FileUploader.root
++ ENV['GITLAB_UPLOADS_PATH'] || FileUploader.root
end
end
end
@@ -98,7 +105,7 @@ index 3e0c436d6e..28cefc5514 100644
end
end
diff --git a/lib/system_check/app/uploads_directory_exists_check.rb b/lib/system_check/app/uploads_directory_exists_check.rb
-index 7026d0ba07..6d88b8b9fb 100644
+index 7026d0ba07..c56e1f7ed9 100644
--- a/lib/system_check/app/uploads_directory_exists_check.rb
+++ b/lib/system_check/app/uploads_directory_exists_check.rb
@@ -4,12 +4,13 @@ module SystemCheck
@@ -113,7 +120,7 @@ index 7026d0ba07..6d88b8b9fb 100644
+ uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads')
try_fixing_it(
- "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads"
-+ "sudo -u #{gitlab_user} mkdir #{uploads_dir}"
++ "sudo -u #{gitlab_user} mkdir #{uploads_dir}"
)
for_more_information(
see_installation_guide_section 'GitLab'
@@ -143,14 +150,3 @@ index b276a81eac..070e3ebd81 100644
end
end
end
---- a/lib/api/api.rb 1970-01-01 01:00:01.000000000 +0100
-+++ b/lib/api/api.rb 2017-09-28 19:37:24.953605705 +0200
-@@ -2,7 +2,7 @@
- class API < Grape::API
- include APIGuard
-
-- LOG_FILENAME = Rails.root.join("log", "api_json.log")
-+ LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log")
-
- use GrapeLogging::Middleware::RequestLogger,
- logger: Logger.new(LOG_FILENAME),
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index 02a19c935e73..f84e2e83761a 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -8,13 +8,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libopenshot-${version}";
- version = "0.1.7";
+ version = "0.1.9";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot";
rev = "v${version}";
- sha256 = "1dk40qild8d3s99p2kkm0mjvxfxrz2wns7ij1brzqmcdnaxqdhlp";
+ sha256 = "0c7q5cfnp481ysyvgzznvix7j4licq9knwrb83g3xqs4cx573xr3";
};
patchPhase = ''
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index a96d4f7a8eaf..513948d3b51f 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobjectIntrospection
, itstool, libxml2, python3Packages, at-spi2-core
, dbus, intltool, libwnck3 }:
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5";
};
- nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool intltool ];
+ nativeBuildInputs = [
+ pkgconfig wrapGAppsHook itstool intltool
+ gobjectIntrospection # For setup hook
+ ];
buildInputs = [
gtk3 libxml2 python3Packages.python python3Packages.pyatspi
python3Packages.pygobject3 python3Packages.ipython
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index 77ee086a950c..9da265e75d67 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "cheese-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/cheese/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "8ef52fc41de1817c4e4274e23eb7c29d28b64ae0f0d1fec52e184e99aea6c605";
+ sha256 = "06da5qc5hdvwwd5vkbgbx8pjx1l3mvr07yrnnv3v1hfc3wp7l7jw";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 82cf6447cc73..f41262d85b4e 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -5,13 +5,13 @@
, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
let
- version = "3.26.6";
+ version = "3.28.0";
in stdenv.mkDerivation rec {
name = "evolution-${version}";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1adqh5f5aijkj5cnj1qprig8cd594m0qb0mzxn0zx44k0b6z5m1p";
+ sha256 = "0b6yw664jdfc8ppd78akmrl36iximh7ipknf5mlzgga6lr6pl2nf";
};
propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit
nss nspr libnotify procps highlight gnome3.libgweather
gnome3.gsettings-desktop-schemas
- gnome3.libgnome-keyring gnome3.glib-networking openldap
+ gnome3.glib-networking openldap
];
nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 89f20ed6f150..a9148fa52dba 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -1,30 +1,39 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
-, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf, libnotify, nautilus }:
+{ stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive
+, file, json-glib, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
stdenv.mkDerivation rec {
name = "file-roller-${version}";
- version = "3.26.2";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/file-roller/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "3e677b8e1c2f19aead69cf4fc419a19fc3373aaf5d7bf558b4f077f10bbba8a5";
+ sha256 = "15pn2m80x45bzibig4zrqybnbr0n1f9wpqx7f2p6difldns3jwf1";
};
+ LANG = "en_US.UTF-8"; # postinstall.py
+
+ nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook glibcLocales desktop-file-utils ];
+
+ buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ];
+
+ PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
+
+ postPatch = ''
+ chmod +x postinstall.py # patchShebangs requires executable file
+ patchShebangs postinstall.py
+ '';
+
passthru = {
- updateScript = gnome3.updateScript { packageName = "file-roller"; attrPath = "gnome3.file-roller"; };
+ updateScript = gnome3.updateScript {
+ packageName = "file-roller";
+ attrPath = "gnome3.file-roller";
+ };
};
- nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
- buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive
- gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg
- gnome3.dconf libnotify nautilus ];
-
- installFlags = [ "nautilus_extensiondir=$(out)/lib/nautilus/extensions-3.0" ];
-
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/FileRoller;
description = "Archive manager for the GNOME desktop environment";
+ license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = gnome3.maintainers;
};
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index d8f272931d9a..864535794f87 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "gedit-${version}";
- version = "3.22.1";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gedit/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "aa7bc3618fffa92fdb7daf2f57152e1eb7962e68561a9c92813d7bbb7fc9492b";
+ sha256 = "0pyam0zi44xq776x20ycqnvmf86l98jns8ldv4m81gnp9wnhmycv";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index 3a294df3ffe3..577382a49866 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "glade-${version}";
- version = "3.20.4";
+ version = "3.22.0";
src = fetchurl {
url = "mirror://gnome/sources/glade/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1n9m4s81jd9fi60mrxsvlk4fi2vqrqmp95azsxp9jnqn6pkdz0jb";
+ sha256 = "1j7kpy4jisz4nkd3yb5af4vd4bapyqchvp2gvq6ypfw3b0x88rkc";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 674aa84dbc27..52fa45812fa3 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -1,51 +1,57 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, gettext, itstool, libvirt-glib
+{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig, gettext, itstool, libvirt-glib
, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice-gtk
, spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala
, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils
, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
-, libcap_ng, numactl, xen, libapparmor
+, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk
}:
# TODO: ovirt (optional)
-stdenv.mkDerivation rec {
+let
+ version = "3.27.92";
+in stdenv.mkDerivation rec {
name = "gnome-boxes-${version}";
- version = "3.26.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "d00fc083182963dc1bbdee5e743ceb28ba03fbf5a9ea87c78d29dca5fb5b9210";
+ sha256 = "1v1br4zh2w3w70np5imi31md6lnqamabiin521f806rdrxsnyggq";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-boxes"; attrPath = "gnome3.gnome-boxes"; };
- };
-
- enableParallelBuilding = true;
-
doCheck = true;
nativeBuildInputs = [
- makeWrapper pkgconfig gettext
+ meson ninja vala pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection desktop-file-utils
];
buildInputs = [
- itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc
- libvirt spice-gtk spice-protocol libsoup libosinfo systemd
- tracker tracker-miners vala libcap yajl gmp gdbm cyrus_sasl libusb libarchive
- gnome3.defaultIconTheme librsvg desktop-file-utils acl libgudev libsecret
+ libvirt-glib glib gtk3 gtkvnc libxml2
+ libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
+ tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
+ gnome3.defaultIconTheme librsvg acl libgudev libsecret
libcap_ng numactl xen libapparmor
];
preFixup = ''
- for prog in "$out/bin/"*; do
- wrapProgram "$prog" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
- --prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}"
- done
+ gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}")
'';
+ mesonFlags = [
+ "-Dovirt=false"
+ ];
+
+ postPatch = ''
+ chmod +x build-aux/post_install.py # patchShebangs requires executable file
+ patchShebangs build-aux/post_install.py
+ '';
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-boxes";
+ attrPath = "gnome3.gnome-boxes";
+ };
+ };
+
meta = with stdenv.lib; {
description = "Simple GNOME 3 application to access remote or virtual systems";
homepage = https://wiki.gnome.org/action/show/Apps/Boxes;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index 4da7db42ab98..35888b21c2e8 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -1,25 +1,28 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook
+{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib
, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup
, glib, gnome-online-accounts, gsettings-desktop-schemas }:
-stdenv.mkDerivation rec {
- name = "gnome-calendar-${version}";
- version = "3.26.3";
+let
+ pname = "gnome-calendar";
+ version = "3.28.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-calendar/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1clnfvvsaqw9vpxrs6qrxzmgpaw9x2nkjik2x2vwvm07pdvhddxn";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "1y5d6rgw7j5hy147i3ff73q9kkwj3nbyms7j705nfhri3s1ypqgs";
};
passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-calendar"; attrPath = "gnome3.gnome-calendar"; };
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
};
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ];
buildInputs = [
- gtk evolution-data-server libsoup glib gnome-online-accounts
+ gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
gsettings-desktop-schemas gnome3.defaultIconTheme
];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 5b36ea83ee13..7ca258483747 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -1,23 +1,32 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, gobjectIntrospection, gjs, gdk_pixbuf, librsvg }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook
+, gobjectIntrospection, gjs, gdk_pixbuf, librsvg, libunistring }:
stdenv.mkDerivation rec {
name = "gnome-characters-${version}";
- version = "3.26.2";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-characters/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "69d0218b4ce16451bef0e6ee9f9f18f5b7851aa3a758b13315d592b077374f7b";
+ sha256 = "14q92ysg7krawxlwv6ymgsxz2plk81wgfz6knlma7lm13jsczmf0";
};
+ postPatch = ''
+ chmod +x meson_post_install.py # patchShebangs requires executable file
+ patchShebangs meson_post_install.py
+ '';
+
passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-characters"; attrPath = "gnome3.gnome-characters"; };
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-characters";
+ attrPath = "gnome3.gnome-characters";
+ };
};
- nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
- buildInputs = [
- gtk3 gjs gdk_pixbuf gobjectIntrospection
- librsvg gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
+ nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook gobjectIntrospection ];
+ buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ];
+
+ mesonFlags = [
+ "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 47fd071bf839..09c006771997 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -1,33 +1,35 @@
{ stdenv, fetchurl
, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils
-, vala, gtk3, glib, gsound
+, vala, gobjectIntrospection, libxml2, gtk3, glib, gsound
, gnome3, gdk_pixbuf, geoclue2, libgweather }:
stdenv.mkDerivation rec {
name = "gnome-clocks-${version}";
- version = "3.26.1";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-clocks/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "2bd8d8df1d6aa0feddd4afc15d84b1308202fda59a3c3be42e3bce7e9ccd11f7";
+ sha256 = "1dd739vchb592mck1dia2hkywn4213cpramyqzgmlmwv8z80p3nl";
};
passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-clocks"; attrPath = "gnome3.gnome-clocks"; };
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-clocks";
+ attrPath = "gnome3.gnome-clocks";
+ };
};
doCheck = true;
nativeBuildInputs = [
- vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils
+ vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils libxml2
+ gobjectIntrospection # for finding vapi files
];
buildInputs = [
gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme
gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound
];
- prePatch = "patchShebangs build-aux/";
-
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Clocks;
description = "Clock application designed for GNOME 3";
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 8e90c0c516a2..3bd3222dc0c2 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -1,43 +1,52 @@
-{ stdenv, gettext, fetchurl, evince, gjs
+{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs
, pkgconfig, gtk3, glib, tracker, tracker-miners
-, itstool, libxslt, webkitgtk
+, itstool, libxslt, webkitgtk, libgdata, gnome-online-accounts
+, gnome-desktop, libzapojit, libgepub
, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
, gobjectIntrospection, json-glib, inkscape, poppler_utils
, gmp, desktop-file-utils, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "gnome-documents-${version}";
- version = "3.26.2";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-documents/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "0q7bp0mvmhqmsvm5sjavm46y7sz43na62d1hrl62vg19hdqr9ir4";
- };
-
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-documents"; attrPath = "gnome3.gnome-documents"; };
+ sha256 = "174q59gk9j0083bvv8sd2k66xrd4lydy2rcqbwsbzsy22fbhwcha";
};
doCheck = true;
- configureFlags = [ "--enable-getting-started" ];
+ mesonFlags = [ "-Dgetting-started=true" ];
- nativeBuildInputs = [ pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl wrapGAppsHook ];
- buildInputs = [ gtk3 glib inkscape poppler_utils
- gnome3.gsettings-desktop-schemas gmp
- gdk_pixbuf gnome3.defaultIconTheme librsvg evince
- libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
- tracker tracker-miners gnome3.libgdata gnome3.gnome-online-accounts
- gnome3.gnome-desktop gnome3.libzapojit json-glib gnome3.libgepub ];
+ nativeBuildInputs = [
+ meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl wrapGAppsHook
+ inkscape poppler_utils # building getting started
+ ];
+ buildInputs = [
+ gtk3 glib gnome3.gsettings-desktop-schemas
+ gdk_pixbuf gnome3.defaultIconTheme evince
+ libsoup webkitgtk gjs gobjectIntrospection
+ tracker tracker-miners libgdata
+ gnome-desktop libzapojit libgepub
+ ];
- enableParallelBuilding = true;
+ postPatch = ''
+ chmod +x meson_post_install.py # patchShebangs requires executable file
+ patchShebangs meson_post_install.py
+ '';
preFixup = ''
substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication"
-
- gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi')
'';
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-documents";
+ attrPath = "gnome3.gnome-documents";
+ };
+ };
+
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Documents;
description = "Document manager application designed to work with GNOME 3";
diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
index 8531fc1c7c04..3fc444dbdd4a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gnome-getting-started-docs-${version}";
- version = "3.26.2";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "34f45f6b5759a46547e834f1b706ae7485fd94e1af5354154420d8910ec67775";
+ sha256 = "09khgzrbvcqvgjkqh8rp609bx818v5c8gzq61nxy5582s8habg8g";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index 9f6c3153afb2..c184bcbb42d8 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -1,26 +1,26 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, libxml2, systemd }:
+, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd }:
stdenv.mkDerivation rec {
name = "gnome-logs-${version}";
- version = "3.26.3";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "0cbzl38haz1m6y7gcbvvab0jcrva781izhp8xv2dzmma4xlzdw0k";
- };
-
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-logs"; attrPath = "gnome3.gnome-logs"; };
+ sha256 = "0j3wkbz7c2snmx4kjmh767175nf2lqxx2p8b8xa2qslknxc3gq6b";
};
configureFlags = [ "--disable-tests" ];
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- gtk3 wrapGAppsHook intltool itstool libxml2
- systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
- ];
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 libxslt docbook_xsl docbook_xml_dtd_43 ];
+ buildInputs = [ gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-logs";
+ attrPath = "gnome3.gnome-logs";
+ };
+ };
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Logs;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index c03397a40d89..1c9d243c0c51 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -1,31 +1,31 @@
{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
, gobjectIntrospection, gdk_pixbuf, librsvg, libgweather, autoreconfHook
, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup
-, webkitgtk }:
+, webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }:
-stdenv.mkDerivation rec {
- name = "gnome-maps-${version}";
- version = "3.26.2";
+let
+ pname = "gnome-maps";
+ version = "3.28.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-maps/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "031d5c4a1aa79f1fbaf87f01fb790f7aab1d8dcd5d061cb5daf0fa96eaa18050";
- };
-
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-maps"; attrPath = "gnome3.gnome-maps"; };
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "1imcgw67cw1qkfz8m2my0f4qmss11fbqqqi4w7afcfq9p0rplgy0";
};
doCheck = true;
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool gobjectIntrospection wrapGAppsHook
- gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
- gnome3.geocode-glib libchamplain file libsoup
- gdk_pixbuf librsvg libgweather autoreconfHook
- gnome3.gsettings-desktop-schemas gnome3.evolution-data-server
- gnome3.gnome-online-accounts gnome3.defaultIconTheme
- webkitgtk ];
+ nativeBuildInputs = [ intltool wrapGAppsHook file autoreconfHook pkgconfig ];
+ buildInputs = [
+ gobjectIntrospection
+ gtk3 geoclue2 gjs libgee folks gfbgraph
+ geocode-glib libchamplain libsoup
+ gdk_pixbuf librsvg libgweather
+ gnome3.gsettings-desktop-schemas evolution-data-server
+ gnome-online-accounts gnome3.defaultIconTheme
+ webkitgtk
+ ];
# The .service file isn't wrapped with the correct environment
# so misses GIR files when started. By re-pointing from the gjs
@@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
"Exec=$out/bin/gnome-maps"
'';
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
+
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Maps;
description = "A map application for GNOME 3";
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 4053d287cc8c..47ea6768a04e 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -1,36 +1,47 @@
-{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker, tracker-miners
-, libxml2, python3Packages, libnotify, wrapGAppsHook
-, pkgconfig, gtk3, glib, cairo
-, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
+{ stdenv, meson, ninja, gettext, fetchurl, gdk_pixbuf, tracker
+, libxml2, python3, libnotify, wrapGAppsHook, libmediaart
+, gobjectIntrospection, gnome-online-accounts, grilo, grilo-plugins
+, pkgconfig, gtk3, glib, cairo, desktop-file-utils, appstream-glib
+, itstool, gnome3, gst_all_1 }:
-stdenv.mkDerivation rec {
- name = "gnome-music-${version}";
- version = "3.26.2";
+python3.pkgs.buildPythonApplication rec {
+ pname = "gnome-music";
+ version = "3.28.0.1";
+
+ format = "other";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-music/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "0mam7d0lzl7ljd9lym9gkvqwvddic122sdmcgpjir58pmmg9bx8b";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz";
+ sha256 = "0yyysmxwmk167n8wghcbmxz73kgl1y1j9js3mgkjjqsmkd9brk65";
};
+ nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ];
+ buildInputs = with gst_all_1; [
+ gtk3 glib libmediaart gnome-online-accounts
+ gdk_pixbuf gnome3.defaultIconTheme python3
+ grilo grilo-plugins libnotify
+ gnome3.gsettings-desktop-schemas tracker
+ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
+ ];
+ propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python requests pygobject3 ];
+
+
+ postPatch = ''
+ for f in meson_post_conf.py meson_post_install.py; do
+ chmod +x $f
+ patchShebangs $f
+ done
+ '';
+
+ doCheck = false;
+
passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-music"; attrPath = "gnome3.gnome-music"; };
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
};
- propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk3 glib intltool itstool gnome3.libmediaart
- gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python
- gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify
- python3Packages.pycairo python3Packages.dbus-python python3Packages.requests
- python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base
- gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook
- gnome3.gsettings-desktop-schemas makeWrapper tracker tracker-miners ];
-
- wrapPrefixVariables = [ "PYTHONPATH" ];
-
- enableParallelBuilding = true;
-
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Music;
description = "Music player and management application for the GNOME desktop environment";
diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
index 2837e1d093f5..2163e6e875e7 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
@@ -1,43 +1,48 @@
-{ stdenv, intltool, fetchurl, exempi, libxml2
+{ stdenv, gettext, fetchurl, libxml2, libgdata
, pkgconfig, gtk3, glib, tracker, tracker-miners
-, makeWrapper, itstool, gegl, babl, lcms2
-, desktop-file-utils, gmp, libmediaart, wrapGAppsHook
-, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode-glib
+, itstool, gegl, babl, libdazzle, gfbgraph, grilo-plugins
+, grilo, gnome-online-accounts
+, desktop-file-utils, wrapGAppsHook
+, gnome3, gdk_pixbuf, gexiv2, geocode-glib
, dleyna-renderer }:
-stdenv.mkDerivation rec {
- name = "gnome-photos-${version}";
- version = "3.26.3";
+let
+ pname = "gnome-photos";
+ version = "3.28.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-photos/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "028de4c8662b7d1dc3ca6c3fbe3ce7f6bb90dd097708e99f235a409756dbadab";
- };
-
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-photos"; attrPath = "gnome3.gnome-photos"; };
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "1n280j7crgwlzyf09j66f1zkrnnhfrr8pshn824njs1xyk3g0q11";
};
# doCheck = true;
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+ nativeBuildInputs = [ pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
+ buildInputs = [
+ gtk3 glib gegl babl libgdata libdazzle
+ gnome3.gsettings-desktop-schemas
+ gdk_pixbuf gnome3.defaultIconTheme
+ gfbgraph grilo-plugins grilo
+ gnome-online-accounts tracker
+ gexiv2 geocode-glib dleyna-renderer
+ tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
+ ];
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk3 glib intltool itstool gegl babl gnome3.libgdata
- gnome3.gsettings-desktop-schemas makeWrapper gmp libmediaart
- gdk_pixbuf gnome3.defaultIconTheme librsvg exempi
- gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
- gnome3.gnome-online-accounts gnome3.gnome-desktop
- lcms2 libexif tracker tracker-miners libxml2 desktop-file-utils
- wrapGAppsHook gexiv2 geocode-glib dleyna-renderer ];
- enableParallelBuilding = true;
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Photos;
- description = "Photos is an application to access, organize and share your photos with GNOME 3";
+ description = "Access, organize and share your photos";
maintainers = gnome3.maintainers;
- license = licenses.gpl2;
+ license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
index a295ef456df4..70ed4403f100 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
@@ -1,5 +1,5 @@
{ stdenv
-, intltool
+, gettext
, fetchurl
, pkgconfig
, gtk3
@@ -11,27 +11,30 @@
, wrapGAppsHook
, gnome3 }:
-stdenv.mkDerivation rec {
- name = "gnome-power-manager-${version}";
+let
+ pname = "gnome-power-manager";
version = "3.26.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-power-manager/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e";
};
passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-power-manager"; attrPath = "gnome3.gnome-power-manager"; };
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
};
- propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
nativeBuildInputs = [
meson
ninja
pkgconfig
wrapGAppsHook
- intltool
+ gettext
# needed by meson_post_install.sh
glib.dev
@@ -45,10 +48,8 @@ stdenv.mkDerivation rec {
gnome3.defaultIconTheme
];
- enableParallelBuilding = true;
-
meta = with stdenv.lib; {
- homepage = https://projects.gnome.org/gnome-power-manager/;
+ homepage = https://projects-old.gnome.org/gnome-power-manager/;
description = "View battery and power statistics provided by UPower";
maintainers = gnome3.maintainers;
license = licenses.gpl2Plus;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index 9e43a3c52b45..ad759bf5506a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs
-, libgweather, intltool, itstool, geoclue2 }:
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobjectIntrospection
+, libgweather, intltool, itstool, geoclue2, gnome-desktop }:
stdenv.mkDerivation rec {
name = "gnome-weather-${version}";
@@ -10,13 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-weather"; attrPath = "gnome3.gnome-weather"; };
- };
-
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
buildInputs = [
- gtk3 wrapGAppsHook gjs intltool itstool
+ gtk3 gjs gobjectIntrospection gnome-desktop
libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas
];
@@ -30,6 +26,13 @@ stdenv.mkDerivation rec {
"Exec=$out/bin/gnome-weather"
'';
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-weather";
+ attrPath = "gnome3.gnome-weather";
+ };
+ };
+
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Weather;
description = "Access current weather conditions and forecasts";
diff --git a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
index 2812e7673b40..7ac8b4dfe116 100644
--- a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
+++ b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix
@@ -1,18 +1,27 @@
{ stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }:
-stdenv.mkDerivation rec {
- name = "nautilus-sendto-${version}";
-
+let
+ pname = "nautilus-sendto";
version = "3.8.6";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+
src = fetchurl {
- url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/3.8/${name}.tar.xz";
sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d";
};
nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ];
buildInputs = [ glib ];
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
+
meta = with stdenv.lib; {
description = "Integrates Evolution and Pidgin into the Nautilus file manager";
maintainers = gnome3.maintainers;
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index f1d6dba21b08..4ae67f9b41d6 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -3,34 +3,35 @@
, pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib
, gnome3, wrapGAppsHook, telepathy-logger, gspell }:
-stdenv.mkDerivation rec {
- name = "polari-${version}";
- version = "3.26.2";
+let
+ pname = "polari";
+ version = "3.28.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/polari/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "2f36361dacf5d924d134f231fdb36ec4539f7495fce325d9b2f2728bd17cc190";
- };
-
- passthru = {
- updateScript = gnome3.updateScript { packageName = "polari"; attrPath = "gnome3.polari"; };
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "08zgdqrnxl752nv0gac1k7wvjd4j7h5n4c0flrq7q337p40k3dd5";
};
propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];
- nativeBuildInputs = [ meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2
- desktop-file-utils gobjectIntrospection appstream-glib ];
- buildInputs = [ gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas
- telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup ];
-
- patches = [
- (fetchpatch {
- url = https://gitlab.gnome.org/jtojnar/polari/commit/a6733a6ad95eac1813e7b18e3d0018a22ee7a377.diff;
- sha256 = "0f5ll49h5w0477lkh67kaa2j83z376z1jk7z3i2v7cq4d3hi5lf9";
- })
+ nativeBuildInputs = [
+ meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2
+ desktop-file-utils gobjectIntrospection appstream-glib
];
- enableParallelBuilding = true;
+ buildInputs = [
+ gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas
+ telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup
+ ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Polari;
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index 2178004a43ac..049b586f16db 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "adwaita-icon-theme-${version}";
- version = "3.26.1";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d";
+ sha256 = "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index 1ff67e35f0fd..693e284e2700 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -1,34 +1,34 @@
-{ stdenv, intltool, fetchurl, vala, libgtop
-, pkgconfig, gtk3, glib
-, bash, wrapGAppsHook, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
+{ stdenv, gettext, fetchurl, vala, desktop-file-utils
+, meson, ninja, pkgconfig, gtk3, glib, libxml2
+, wrapGAppsHook, itstool, gnome3 }:
-stdenv.mkDerivation rec {
- name = "baobab-${version}";
- version = "3.26.1";
+let
+ pname = "baobab";
+ version = "3.28.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/baobab/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "0qsx7vx5c3n4yxlxbr11sppw7qwcv9z3g45b5xb9y7wxw5lv42sk";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "baobab"; };
- };
+ nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
+ buildInputs = [ gtk3 glib gnome3.defaultIconTheme ];
doCheck = true;
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ vala gtk3 glib libgtop intltool itstool libxml2
- wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ];
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Baobab;
- description = "Graphical application to analyse disk usage in any Gnome environment";
- maintainers = gnome3.maintainers;
+ description = "Graphical application to analyse disk usage in any GNOME environment";
+ homepage = https://wiki.gnome.org/Apps/DiskUsageAnalyzer;
license = licenses.gpl2;
+ maintainers = gnome3.maintainers;
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index 47ddf6b64861..57c102d89cc5 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -1,24 +1,33 @@
-{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }:
+{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, dbus-glib, gtk3, gnome3
+, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobjectIntrospection }:
-stdenv.mkDerivation rec {
- name = "dconf-editor-${version}";
- version = "3.26.2";
+let
+ pname = "dconf-editor";
+ version = "3.28.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/dconf-editor/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "0nhcpwqrkmpxbhaf0cafvy6dlp6s7vhm5vknl4lgs3l24zc56ns5";
};
+ nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobjectIntrospection ];
+
+ buildInputs = [ glib dbus-glib gtk3 gnome3.defaultIconTheme gnome3.dconf ];
+
+ postPatch = ''
+ chmod +x meson_post_install.py
+ patchShebangs meson_post_install.py
+ '';
+
passthru = {
- updateScript = gnome3.updateScript { packageName = "dconf-editor"; attrPath = "gnome3.dconf-editor"; };
+ updateScript = gnome3.updateScript {
+ packageName = "${pname}";
+ attrPath = "gnome3.${pname}";
+ };
};
- nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
- buildInputs = [ vala libxslt glib dbus-glib gnome3.gtk libxml2 gnome3.defaultIconTheme
- intltool docbook_xsl docbook_xsl_ns gnome3.dconf ];
-
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = gnome3.maintainers;
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index a17228761216..9b1adeb953d6 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -1,28 +1,28 @@
-{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
+{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3
+, libxml2, docbook_xsl, makeWrapper }:
let
pname = "dconf";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
- version = "0.26.1";
+ version = "0.28.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "0da587hpiqy8h3pswn1102h4b905x8k6mk3ajpi7kf4kzkvv30ym";
+ sha256 = "0hn7v6769xabqz7kvyb2hfm19h46z1whkair7ff752zmbs3b7lv1";
};
+ postPatch = ''
+ chmod +x meson_post_install.py
+ patchShebangs meson_post_install.py
+ '';
+
outputs = [ "out" "lib" "dev" ];
- nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ];
+ nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 docbook_xsl ];
buildInputs = [ glib dbus-glib ];
- postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
- substituteInPlace client/Makefile \
- --replace "-soname=libdconf.so.1" "-install_name,libdconf.so.1"
- '';
-
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index bf83c7aa8a15..4da4c4802665 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
name = "empathy-${version}";
- version = "3.12.14";
+ version = "3.25.90";
src = fetchurl {
url = "mirror://gnome/sources/empathy/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3";
+ sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 1acd6eb69425..502485862614 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -1,30 +1,42 @@
-{ fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3
+{ fetchurl, stdenv, meson, ninja, gettext, itstool, pkgconfig, libxml2, libjpeg, libpeas, gnome3
+, gtk3, glib, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, lcms2, gdk_pixbuf, exempi
, shared-mime-info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }:
-stdenv.mkDerivation rec {
- name = "eog-${version}";
- version = "3.26.2";
+let
+ pname = "eog";
+ version = "3.28.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/eog/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "0d8fi5ydsh8n7d85dps8svl1bhid1p8jbnlwiqywj2gd2wpxpyjv";
};
+ nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection ];
+
+ buildInputs = [
+ libjpeg gtk3 gdk_pixbuf glib libpeas librsvg lcms2 gnome-desktop libexif exempi
+ gsettings-desktop-schemas shared-mime-info adwaita-icon-theme
+ ];
+
+ postPatch = ''
+ chmod +x meson_post_install.py
+ patchShebangs meson_post_install.py
+ '';
+
passthru = {
- updateScript = gnome3.updateScript { packageName = "eog"; attrPath = "gnome3.eog"; };
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
};
- nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection ];
-
- buildInputs = with gnome3;
- [ libxml2 libjpeg gtk glib libpeas librsvg
- gsettings-desktop-schemas shared-mime-info adwaita-icon-theme
- gnome-desktop libexif dconf ];
-
meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/EyeOfGnome;
- platforms = platforms.linux;
description = "GNOME image viewer";
+ homepage = https://wiki.gnome.org/Apps/EyeOfGnome;
+ license = licenses.gpl2Plus;
maintainers = gnome3.maintainers;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index a275040e1f4e..3bc32f99f3ef 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "epiphany-${version}";
- version = "3.26.6";
+ version = "3.28.0.1";
src = fetchurl {
url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1a1hyv326w4in4pl26gi2n3p9b38ih6zjdiigpqy0aiibnjnmc81";
+ sha256 = "023q6xnwsafac38lavxwgph5lcd2igxpiwqb4kr72mv56xlb0m3i";
};
passthru = {
@@ -38,13 +38,6 @@ stdenv.mkDerivation rec {
patchShebangs post_install.py
'';
- postFixup = ''
- # Patched meson does not add internal libraries to rpath
- for f in $out/bin/.*-wrapped $out/libexec/.*-wrapped $out/libexec/epiphany/.*-wrapped $out/lib/epiphany/*.so $out/lib/epiphany/web-extensions/*.so; do
- patchelf --set-rpath "$out/lib/epiphany:$(patchelf --print-rpath $f)" "$f"
- done
- '';
-
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Epiphany;
description = "WebKit based web browser for GNOME";
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index f2459d7885c7..c60087cf47bc 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib gtk3 pango atk gdk_pixbuf libxml2
- gnome3.libgnome-keyring gnome3.gsettings-desktop-schemas
+ gnome3.gsettings-desktop-schemas
poppler ghostscriptX djvulibre libspectre
libsecret librsvg gnome3.adwaita-icon-theme
] ++ stdenv.lib.optional supportXPS gnome3.libgxps;
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index ae97fbc0e4de..350c29fa9076 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,24 +1,22 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf
+{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf, gobjectIntrospection
, intltool, libsoup, libxml2, libsecret, icu, sqlite
-, p11-kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true
+, p11-kit, db, nspr, nss, libical, gperf, makeWrapper
, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:
stdenv.mkDerivation rec {
name = "evolution-data-server-${version}";
- version = "3.26.6";
+ version = "3.28.0";
+
+ outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1v0hwlrlm23bz5dmamdavm771f4gs64fyq82argrc0nwgn2a2fp4";
- };
-
- passthru = {
- updateScript = gnome3.updateScript { packageName = "evolution-data-server"; };
+ sha256 = "1ybyyy6nls11az8lbri1y9527snz5h7qbhyfqvk0vc6vzvald5gv";
};
nativeBuildInputs = [
- cmake ninja pkgconfig intltool python3 gperf makeWrapper
- ] ++ stdenv.lib.optional valaSupport vala;
+ cmake ninja pkgconfig intltool python3 gperf makeWrapper gobjectIntrospection vala
+ ];
buildInputs = with gnome3; [
glib libsoup libxml2 gtk gnome-online-accounts
gcr p11-kit libgweather libgdata libaccounts-glib json-glib
@@ -27,16 +25,14 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ libsecret nss nspr libical db ];
- # uoa irrelevant for now
cmakeFlags = [
"-DENABLE_UOA=OFF"
- ] ++ stdenv.lib.optionals valaSupport [
"-DENABLE_VALA_BINDINGS=ON"
"-DENABLE_INTROSPECTION=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
+ "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
];
- enableParallelBuilding = true;
preFixup = ''
for f in $(find $out/libexec/ -type f -executable); do
@@ -46,7 +42,15 @@ stdenv.mkDerivation rec {
done
'';
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "evolution-data-server";
+ };
+ };
+
meta = with stdenv.lib; {
+ description = "Unified backend for programs that work with contacts, tasks, and calendar information";
+ homepage = https://wiki.gnome.org/Apps/Evolution;
license = licenses.lgpl2;
maintainers = gnome3.maintainers;
platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix
index aa26c660768b..61c17a210b43 100644
--- a/pkgs/desktops/gnome-3/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/core/gcr/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gcr-${version}";
- version = "3.20.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gcr/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379";
+ sha256 = "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index ef9439a30291..999c3f05748b 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "gdm-${version}";
- version = "3.26.2.1";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57";
+ sha256 = "0i5rzr6fdvlm88gl85gvql1wf1yflkmg90x81dqjf39as3ixs81s";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
index e97e557e87a0..910ef01fcb9d 100644
--- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
+++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
@@ -1,24 +1,38 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json-glib }:
+{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobjectIntrospection, gnome3, libsoup, json-glib }:
stdenv.mkDerivation rec {
name = "geocode-glib-${version}";
- version = "3.24.0";
+ version = "3.25.4.1";
+
+ outputs = [ "out" "dev" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e";
+ sha256 = "0y6p5l2jrr78p7l4hijjhclzbap005y6h06g3aiglg9i5hk6j0gi";
};
+ nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobjectIntrospection ];
+ buildInputs = with gnome3; [ glib libsoup json-glib ];
+
+ patches = [
+ ./installed-tests-path.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace geocode-glib/tests/meson.build --subst-var-by "installedTests" "$installedTests"
+ '';
+
passthru = {
- updateScript = gnome3.updateScript { packageName = "geocode-glib"; attrPath = "gnome3.geocode-glib"; };
+ updateScript = gnome3.updateScript {
+ packageName = "geocode-glib";
+ attrPath = "gnome3.geocode-glib";
+ };
};
- buildInputs = with gnome3;
- [ intltool pkgconfig glib libsoup json-glib ];
-
meta = with stdenv.lib; {
- platforms = platforms.linux;
+ description = "A convenience library for the geocoding and reverse geocoding using Nominatim service";
+ license = licenses.lgpl2Plus;
maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
};
-
}
diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch b/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch
new file mode 100644
index 000000000000..499c68008088
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch
@@ -0,0 +1,8 @@
+--- a/geocode-glib/tests/meson.build
++++ b/geocode-glib/tests/meson.build
+@@ -1,4 +1,4 @@
+-install_dir = get_option('libexecdir') + '/installed-tests/geocode-glib'
++install_dir = '@installedTests@/libexec/installed-tests/geocode-glib'
+
+ e = executable('geo-uri',
+ 'geo-uri.c',
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 6e9f6c464df1..888eb073a46a 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gjs-${version}";
- version = "1.50.4";
+ version = "1.52.0";
src = fetchurl {
url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "b336e8709347e3c94245f6cbc3465f9a49f3ae491a25f49f8a97268f5235b93a";
+ sha256 = "1jm40imin4sxzfcxcbmf4v71apk8y9icccq1a4m4mlz1wm2s092m";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index 0aea3c4eac48..c52fe5c60492 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, intltool }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }:
stdenv.mkDerivation rec {
name = "gnome-backgrounds-${version}";
- version = "3.26.2";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f";
+ sha256 = "1qgim0yhzjgcq172y4vp5hqz4rh1ak38a7pgi6s7dq0wklyrcnxj";
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; };
};
- nativeBuildInputs = [ pkgconfig intltool ];
+ nativeBuildInputs = [ meson ninja pkgconfig gettext ];
meta = with stdenv.lib; {
platforms = platforms.unix;
diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index 11816f68ff48..d570a5414094 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "gnome-bluetooth-${version}";
- version = "3.26.1";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f";
+ sha256 = "0q7yzklrlayj99risj096mr5x35anx94wvr6nbf6pwbvvzv7453p";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 8376bea1a038..f30243003cbb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -1,33 +1,43 @@
-{ stdenv, intltool, fetchurl, pkgconfig, libxml2
-, bash, gtk3, glib, wrapGAppsHook
-, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup, libmpc }:
+{ stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2
+, gtk3, glib, gtksourceview3, wrapGAppsHook, gobjectIntrospection
+, gnome3, mpfr, gmp, libsoup, libmpc }:
stdenv.mkDerivation rec {
name = "gnome-calculator-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-calculator/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7";
+ sha256 = "1qnfvmf615v52c8h1f6zxbvpywi3512hnzyf9azvxb8a6q0rx1vn";
};
+ nativeBuildInputs = [
+ meson ninja pkgconfig vala gettext itstool wrapGAppsHook
+ gobjectIntrospection # for finding vapi files
+ ];
+
+ buildInputs = [
+ gtk3 glib libxml2 gtksourceview3 mpfr gmp
+ gnome3.defaultIconTheme
+ gnome3.gsettings-desktop-schemas libsoup libmpc
+ ];
+
+ doCheck = true;
+
+ postPatch = ''
+ chmod +x meson_post_install.py # patchShebangs requires executable file
+ patchShebangs meson_post_install.py
+ '';
+
passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-calculator"; attrPath = "gnome3.gnome-calculator"; };
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-calculator";
+ attrPath = "gnome3.gnome-calculator";
+ };
};
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
- propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
- nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-
- buildInputs = [ bash gtk3 glib intltool itstool
- libxml2 gnome3.gtksourceview mpfr gmp
- gdk_pixbuf gnome3.defaultIconTheme librsvg
- gnome3.gsettings-desktop-schemas gnome3.dconf libsoup libmpc ];
-
meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
+ homepage = https://wiki.gnome.org/Apps/Calculator;
description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
maintainers = gnome3.maintainers;
license = licenses.gpl3;
diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
index b5052281b2fa..9fcbbe814dce 100644
--- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
@@ -2,26 +2,18 @@
let
pname = "gnome-color-manager";
- version = "3.26.0";
+ version = "3.28.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1kbi46vk0qf0gxiwm4yhsx8931r7c9cg0c4244j8ncr0hph008b5";
+ sha256 = "1mixga6mq67wgxdsg6rnl7lvyh3z3yabxjmnyjq2k2v8ljgklczc";
};
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool desktop-file-utils ];
buildInputs = [ glib gtk3 libexif libtiff colord colord-gtk libcanberra-gtk3 lcms2 vte exiv2 ];
- patches = [
- # https://bugzilla.gnome.org/show_bug.cgi?id=791158
- (fetchurl {
- url = https://bugzilla.gnome.org/attachment.cgi?id=364865;
- sha256 = "1zh1aql6rwzfhy2xbdw0jqgzrl9l6wf0jcbdkjd67ykbmynh2cmv";
- })
- ];
-
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index 6c485bcbd3ff..9c9b26360aa8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -5,13 +5,13 @@
, vala, meson, ninja }:
let
- version = "3.26.1";
+ version = "3.28.0";
in stdenv.mkDerivation rec {
name = "gnome-contacts-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1jszv4b8rc5q8r460wb7qppvm1ssj4733b4z2vyavc95g00ik286";
+ sha256 = "1qqj6k5rvmvg6v6vg4cak98w6rqknpqfsm0vfrwva6l6wbql2v8i";
};
propagatedUserEnvPkgs = [ evolution-data-server ];
@@ -32,6 +32,12 @@ in stdenv.mkDerivation rec {
patchShebangs meson_post_install.py
'';
+ # In file included from src/gnome-contacts@exe/contacts-avatar-selector.c:30:0:
+ # /nix/store/*-cheese-3.28.0/include/cheese/cheese-widget.h:26:10: fatal error: clutter-gtk/clutter-gtk.h: No such file or directory
+ # #include
+ # ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+ NIX_CFLAGS_COMPILE = "-I${clutter-gtk}/include/clutter-gtk-1.0";
+
doCheck = true;
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index b49b13aae802..8966893bde72 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -1,24 +1,25 @@
-{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook
+{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook
, libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio
, gdk_pixbuf, librsvg, libnotify, libgudev, gnome-color-manager
, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
, cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
, libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd
-, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter-gtk
+, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese
, fontconfig, sound-theme-freedesktop, grilo }:
let
- version = "3.26.2";
+ pname = "gnome-control-center";
+ version = "3.28.0";
in stdenv.mkDerivation rec {
- name = "gnome-control-center-${version}";
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-control-center/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "0nyx5nl2rky0249rdcy0hsccnxf3angpya0q859rrbrwaixqnxh3";
};
nativeBuildInputs = [
- pkgconfig intltool wrapGAppsHook libtool libxslt docbook_xsl docbook_xsl_ns
+ meson ninja pkgconfig gettext wrapGAppsHook libtool libxslt docbook_xsl
shared-mime-info
];
@@ -28,7 +29,7 @@ in stdenv.mkDerivation rec {
gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk
accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify
grilo libpwquality cracklib vino libcanberra-gtk3 libgudev
- gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk
+ gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk cheese
networkmanager modemmanager gnome-bluetooth tracker
];
@@ -40,6 +41,11 @@ in stdenv.mkDerivation rec {
})
];
+ postPatch = ''
+ chmod +x meson_post_install.py # patchShebangs requires executable file
+ patchShebangs meson_post_install.py
+ '';
+
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:${sound-theme-freedesktop}/share"
@@ -48,14 +54,14 @@ in stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "${librsvg}/share"
)
for i in $out/share/applications/*; do
- substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
+ substituteInPlace $i --replace "Exec=gnome-control-center" "Exec=$out/bin/gnome-control-center"
done
'';
passthru = {
updateScript = gnome3.updateScript {
- packageName = "gnome-control-center";
- attrPath = "gnome3.gnome-control-center";
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
};
};
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 7e85e27d6be9..dad8d8177de6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gnome-desktop-${version}";
- version = "3.26.2";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a";
+ sha256 = "17fm5z3kfm1m3420kjpvk1y0pc34p42rqfpmb1npy51jkv1p3pzi";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 0937f5c30823..4dde871ec702 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "gnome-disk-utility-${version}";
- version = "3.26.2";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "aa2b96c2c64d8bde6cf802ff8da5796720d0becb21111342ced0637961e256f2";
+ sha256 = "0ad98mxyygyzq0y280m6z73anyv3xxr6irpkp6vc803lhdr5b7fc";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 3774ff32db04..7e76b8991fd4 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gnome-font-viewer-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "02768a62b4033de5ef9d00602e8c29e5de05255f879b0d9b4d731be9648fe9a0";
+ sha256 = "16mp22f255b8zqnnlqh25n6v79b9bd0gmli9ywqyapa0cfai09x3";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index f7f06e35d3ac..20ff00ff218b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python2, glib, libxslt
-, intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, wrapGAppsHook
+, intltool, pango, gcr, gdk_pixbuf, atk, p11-kit, openssh, wrapGAppsHook
, docbook_xsl, docbook_xml_dtd_42, gnome3 }:
stdenv.mkDerivation rec {
name = "gnome-keyring-${version}";
- version = "3.20.1";
+ version = "3.28.0.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp";
+ sha256 = "0qxxc3wx4abb07vmbhqy4gipdzilx3v8yba9hsfzpn8p15prjz6i";
};
passthru = {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
buildInputs = with gnome3; [
- dbus libgcrypt pam gtk3 libgnome-keyring
+ dbus libgcrypt pam gtk3 libgnome-keyring openssh
pango gcr gdk_pixbuf atk p11-kit
];
@@ -40,8 +40,7 @@ stdenv.mkDerivation rec {
patchShebangs build
'';
- # Tests are not deterministic https://bugzilla.gnome.org/show_bug.cgi?id=791932
- doCheck = false;
+ doCheck = true;
checkPhase = ''
export HOME=$(mktemp -d)
dbus-run-session \
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
index 2abe8b28c039..d3d14f555cfa 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -1,24 +1,20 @@
{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook
-, webkitgtk, json-glib, rest, libsecret, dbus-glib, gnome-common, gtk-doc
-, telepathy-glib, intltool, dbus_libs, icu, glib-networking
-, libsoup, docbook_xsl_ns, docbook_xsl, gnome3, gcr, kerberos
+, webkitgtk, json-glib, rest, libsecret, dbus-glib, gtk-doc
+, telepathy-glib, gettext, dbus_libs, icu, glib-networking
+, libsoup, docbook_xsl, docbook_xsl_ns, gnome3, gcr, kerberos
}:
-stdenv.mkDerivation rec {
- name = "gnome-online-accounts-${version}";
- version = "3.26.2";
+let
+ pname = "gnome-online-accounts";
+ version = "3.28.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-online-accounts/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "49f8760d86fe33057eaeeb4f1667bc7f6163e428591e7aed9575563be10b17d1";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-online-accounts"; attrPath = "gnome3.gnome-online-accounts"; };
- };
-
- NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
-
outputs = [ "out" "man" "dev" "devdoc" ];
configureFlags = [
@@ -32,14 +28,21 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [
- pkgconfig vala gnome-common intltool wrapGAppsHook
- libxslt docbook_xsl_ns docbook_xsl gtk-doc
+ pkgconfig vala gettext wrapGAppsHook
+ libxslt docbook_xsl docbook_xsl_ns gtk-doc
];
buildInputs = [
glib gtk webkitgtk json-glib rest libsecret dbus-glib telepathy-glib glib-networking icu libsoup
gcr kerberos
];
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
+
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = gnome3.maintainers;
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index c8bc61462213..d36e7ce7432e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -1,27 +1,33 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus-glib, json-glib, upower
-, libxslt, intltool, makeWrapper, systemd, xorg, epoxy }:
+{ fetchurl, stdenv, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas
+, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412
+, libxslt, gettext, makeWrapper, systemd, xorg, epoxy }:
stdenv.mkDerivation rec {
name = "gnome-session-${version}";
- version = "3.26.1";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-session/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708";
+ sha256 = "1ldcalj9i7qharvw8k8gf7pkcvwb1qwiag2ckffx9x8ic2d3v00b";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-session"; attrPath = "gnome3.gnome-session"; };
- };
+ mesonFlags = [ "-Dsystemd=true" ];
- configureFlags = "--enable-systemd";
+ nativeBuildInputs = [
+ meson ninja pkgconfig gettext makeWrapper
+ xmlto libxslt docbook_xsl docbook_xml_dtd_412
+ dbus # for DTD
+ ];
- buildInputs = with gnome3;
- [ pkgconfig glib gnome-desktop gtk dbus-glib json-glib libxslt
- gnome3.gnome-settings-daemon xorg.xtrans gnome3.defaultIconTheme
- gsettings-desktop-schemas upower intltool gconf makeWrapper systemd
- epoxy
- ];
+ buildInputs = [
+ glib gtk libICE gnome-desktop json-glib xorg.xtrans gnome3.defaultIconTheme
+ gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy
+ ];
+
+ postPatch = ''
+ chmod +x meson_post_install.py # patchShebangs requires executable file
+ patchShebangs meson_post_install.py
+ '';
# FIXME: glib binaries shouldn't be in .dev!
preFixup = ''
@@ -34,13 +40,22 @@ stdenv.mkDerivation rec {
--prefix PATH : "${glib.dev}/bin" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
- --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share" \
+ --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share"\
--suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg"
'';
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- maintainers = gnome3.maintainers;
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-session";
+ attrPath = "gnome3.gnome-session";
+ };
};
+ meta = with stdenv.lib; {
+ description = "GNOME session manager";
+ homepage = https://wiki.gnome.org/Projects/SessionManagement;
+ license = licenses.gpl2Plus;
+ maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
+ };
}
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index e3c84dfa9fd8..99b66fc1fe72 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -1,38 +1,57 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
-, libxkbfile, libpulseaudio, libcanberra-gtk3, upower, colord, libgweather, polkit
-, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager
-, docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config, tzdata }:
+{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst
+, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit
+, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
+, docbook_xsl, wrapGAppsHook, ibus, xkeyboard_config, tzdata, nss }:
stdenv.mkDerivation rec {
name = "gnome-settings-daemon-${version}";
- version = "3.26.2";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4";
+ sha256 = "1p3ccf4a4qbz73hqyx9i55hkp6l7c7la5kazqawcndl7bksywgny";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-settings-daemon"; attrPath = "gnome3.gnome-settings-daemon"; };
- };
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ inherit tzdata;
+ })
+ ];
# fatal error: gio/gunixfdlist.h: No such file or directory
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
- buildInputs = with gnome3;
- [ intltool pkgconfig ibus gtk glib gsettings-desktop-schemas networkmanager
- libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio
- libcanberra-gtk3 upower colord libgweather xkeyboard_config
- polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
- libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome-themes-standard ];
+ nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook ];
+
+ buildInputs = with gnome3; [
+ ibus gtk glib gsettings-desktop-schemas networkmanager
+ libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib
+ libcanberra-gtk3 upower colord libgweather xkeyboard_config nss
+ polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom
+ ];
+
+ mesonFlags = [
+ "-Dudev_dir=${placeholder "out"}/lib/udev"
+ ];
postPatch = ''
- substituteInPlace plugins/datetime/tz.h --replace /usr/share/zoneinfo/zone.tab ${tzdata}/share/zoneinfo/zone.tab
+ for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do
+ chmod +x $f
+ patchShebangs $f
+ done
'';
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- maintainers = gnome3.maintainers;
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-settings-daemon";
+ attrPath = "gnome3.gnome-settings-daemon";
+ };
};
+ meta = with stdenv.lib; {
+ license = licenses.gpl2Plus;
+ maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
+ };
}
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch
new file mode 100644
index 000000000000..2229302cab7c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch
@@ -0,0 +1,15 @@
+--- a/plugins/datetime/tz.h
++++ b/plugins/datetime/tz.h
+@@ -27,11 +27,7 @@
+
+ #include
+
+-#ifndef __sun
+-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
+-#else
+-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
+-#endif
++#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab"
+
+ typedef struct _TzDB TzDB;
+ typedef struct _TzLocation TzLocation;
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index a76dd35711a8..0d856e494c38 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -1,26 +1,27 @@
-{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, gnome3, file }:
+{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib, gnome3 }:
stdenv.mkDerivation rec {
name = "gnome-shell-extensions-${version}";
- version = "3.26.2";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "aefda4d810ef5ceb9402e2d620f4bdc1dc40c9cc4f6a51749840f7dd08628ab6";
+ sha256 = "00xm5r4q40c0ji80vrsqg2fkrvzb1nm75p3ikv6bsmd3gfvwwp91";
};
passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-shell-extensions"; attrPath = "gnome3.gnome-shell-extensions"; };
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-shell-extensions";
+ attrPath = "gnome3.gnome-shell-extensions";
+ };
};
doCheck = true;
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk3 glib libgtop intltool itstool
- makeWrapper file ];
+ nativeBuildInputs = [ meson ninja pkgconfig gettext glib ];
+ buildInputs = [ spidermonkey_52 ];
- configureFlags = [ "--enable-extensions=all" ];
+ mesonFlags = [ "-Dextension_set=all" ];
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 026f5436237a..70177d0a516e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -1,10 +1,10 @@
-{ fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret
+{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret
, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
-, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, p11-kit, unzip, glibcLocales
-, sqlite, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42
+, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
+, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42
, libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet
-, gst_all_1 }:
+, sassc, systemd, gst_all_1 }:
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
@@ -13,11 +13,11 @@ let
in stdenv.mkDerivation rec {
name = "gnome-shell-${version}";
- version = "3.26.2";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "e5a87f2f838d981db9823352b90b2ce2f40d24d31ed9f062dccfa41b820e0b1c";
+ sha256 = "0kmsh305cfr3fg40rhwykqbl466lwcq9djda25kf29ib7h6w1pn7";
};
# Needed to find /etc/NetworkManager/VPN
@@ -25,21 +25,26 @@ in stdenv.mkDerivation rec {
LANG = "en_US.UTF-8";
- nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ];
- buildInputs = with gnome3;
- [ gsettings-desktop-schemas gnome-keyring gnome-menus glib gcr json-glib accountsservice
- libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf
- (librsvg.override { enableIntrospection = true; })
- clutter networkmanager libstartup_notification telepathy-glib
- libXtst p11-kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution-data-server
- libical nss gtk gstreamer gdm
- libcanberra-gtk3 gnome-control-center geoclue2
- defaultIconTheme sqlite gnome3.gnome-bluetooth
- libgweather # not declared at build time, but typelib is needed at runtime
- gnome3.gnome-clocks # schemas needed
- at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon
- gst_all_1.gst-plugins-good # recording
- gobjectIntrospection (stdenv.lib.getLib dconf) ];
+ nativeBuildInputs = [
+ meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
+ sassc
+ ];
+ buildInputs = with gnome3; [
+ systemd caribou
+ gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
+ libcroco libsecret libsoup polkit gdk_pixbuf librsvg
+ clutter networkmanager libstartup_notification telepathy-glib
+ libXtst gjs mutter libpulseaudio evolution-data-server
+ libical gtk gstreamer gdm libcanberra-gtk3 geoclue2
+ defaultIconTheme gnome3.gnome-bluetooth
+ gnome3.gnome-clocks # schemas needed
+ at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon
+ gst_all_1.gst-plugins-good # recording
+ gobjectIntrospection
+
+ # not declared at build time, but typelib is needed at runtime
+ libgweather networkmanagerapplet
+ ];
propagatedUserEnvPkgs = [
# Needed to support on-screen keyboard used with touch screen devices
# see https://github.com/NixOS/nixpkgs/issues/25968
@@ -52,7 +57,10 @@ in stdenv.mkDerivation rec {
url = https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016;
sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm";
})
- ./fix-paths.patch
+ (substituteAll {
+ src = ./fix-paths.patch;
+ inherit unzip;
+ })
];
postPatch = ''
@@ -60,28 +68,34 @@ in stdenv.mkDerivation rec {
substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
- substituteInPlace js/ui/extensionDownloader.js --replace "unzip" "${unzip}/bin/unzip"
'';
postInstall = ''
glib-compile-schemas $out/share/glib-2.0/schemas
'';
- postFixup = ''
- # Patched meson does not add internal libraries to rpath
- patchelf --set-rpath "$out/lib/gnome-shell:$(patchelf --print-rpath $out/bin/.gnome-shell-wrapped)" $out/bin/.gnome-shell-wrapped
+ preFixup = ''
+ gappsWrapperArgs+=(
+ # Until glib’s xdgmime is patched
+ # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format”
+ --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+ )
'';
- enableParallelBuilding = true;
-
passthru = {
mozillaPlugin = "/lib/mozilla/plugins";
- updateScript = gnome3.updateScript { packageName = "gnome-shell"; attrPath = "gnome3.gnome-shell"; };
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-shell";
+ attrPath = "gnome3.gnome-shell";
+ };
};
meta = with stdenv.lib; {
- platforms = platforms.linux;
+ description = "Core user interface for the GNOME 3 desktop";
+ homepage = https://wiki.gnome.org/Projects/GnomeShell;
+ license = licenses.gpl2Plus;
maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
index b24049f9b9fd..7b7ff85a7c81 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
@@ -1,18 +1,11 @@
-diff --git a/meson.build b/meson.build
-index 4c1f5c63b..a9edb8795 100644
---- a/meson.build
-+++ b/meson.build
-@@ -59,12 +59,7 @@ servicedir = join_paths(datadir, 'dbus-1', 'services')
-
- plugindir = get_variable('BROWSER_PLUGIN_DIR', mozplugindir)
-
--keybindings_dep = dependency('gnome-keybindings', required: false)
--if keybindings_dep.found()
-- keysdir = keybindings_dep.get_pkgconfig_variable('keysdir')
--else
-- keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings')
--endif
-+keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings')
-
- atk_bridge_dep = dependency('atk-bridge-2.0')
- canberra_dep = dependency('libcanberra')
+--- a/js/ui/extensionDownloader.js
++++ b/js/ui/extensionDownloader.js
+@@ -86,7 +86,7 @@
+ stream.output_stream.write_bytes(contents, null);
+ stream.close(null);
+ let [success, pid] = GLib.spawn_async(null,
+- ['unzip', '-uod', dir.get_path(), '--', file.get_path()],
++ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()],
+ null,
+ GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
+ null);
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 8996a4cc3e93..2c4663b54ec7 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
-, glib, appstream-glib, libsoup, polkit, isocodes, gtkspell3, libxslt
+, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection
, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }:
stdenv.mkDerivation rec {
name = "gnome-software-${version}";
- version = "3.26.7";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "00lfzvlicqd8gk5ijnjdi36ikmhdzvfjj993rpf7mm04ncw4k0za";
+ sha256 = "0zwbgxzl805c4l8kwy5bn3p91s2qxlcn4syzzg4vd4kilc6nnjwk";
};
patches = [
@@ -20,19 +20,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42
- valgrind-light docbook_xsl gtk-doc desktop-file-utils
+ valgrind-light docbook_xsl gtk-doc desktop-file-utils gobjectIntrospection
];
buildInputs = [
gnome3.gtk glib packagekit appstream-glib libsoup
gnome3.gsettings-desktop-schemas gnome3.gnome-desktop
- gtkspell3 json-glib libsecret ostree
+ gspell json-glib libsecret ostree
polkit
];
- # https://gitlab.gnome.org/GNOME/gnome-software/issues/320
- NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
mesonFlags = [
"-Denable-flatpak=false"
"-Denable-rpm=false"
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch
index 239e1781bb1b..6f443a8a43ed 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch
@@ -5,7 +5,7 @@
/* find filename */
- filename = g_build_filename (DATADIR, "xml", "iso-codes", "iso_639.xml", NULL);
-+ filename = g_build_filename ("@isoCodes@", "share", "xml", "iso-codes", "iso_639.xml", NULL);
++ filename = g_build_filename ("@isocodes@", "share", "xml", "iso-codes", "iso_639.xml", NULL);
if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
g_free (filename);
filename = g_build_filename ("/usr", "share", "xml", "iso-codes", "iso_639.xml", NULL);
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index 0e64bc4362c7..5f707152aed8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -1,43 +1,41 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
+{ stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit
, bash, gtk3, glib, wrapGAppsHook
, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }:
stdenv.mkDerivation rec {
name = "gnome-system-monitor-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3";
- };
-
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-system-monitor"; attrPath = "gnome3.gnome-system-monitor"; };
+ sha256 = "1wvgx5p0a29d8yzp7rinpln90pg8vsjagqlvm4cxyhnl5hsdvrvn";
};
doCheck = true;
- propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ bash gtk3 glib intltool itstool libxml2
- gtkmm3 libgtop wrapGAppsHook
- gdk_pixbuf gnome3.defaultIconTheme librsvg
- gnome3.gsettings-desktop-schemas systemd ];
-
- preFixup = ''
- gappsWrapperArgs+=(
- --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share"
- )
- '';
+ nativeBuildInputs = [
+ pkgconfig gettext itstool wrapGAppsHook
+ polkit # for ITS file
+ ];
+ buildInputs = [
+ bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.defaultIconTheme librsvg
+ gnome3.gsettings-desktop-schemas systemd
+ ];
# fails to build without --enable-static
configureFlags = ["--enable-systemd" "--enable-static"];
enableParallelBuilding = true;
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-system-monitor";
+ attrPath = "gnome3.gnome-system-monitor";
+ };
+ };
+
meta = with stdenv.lib; {
- homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/;
+ homepage = https://wiki.gnome.org/Apps/SystemMonitor;
description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 703bb6fe110e..9e99e84cfd55 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gnome-terminal-${version}";
- version = "3.26.2";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-terminal/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0";
+ sha256 = "1i5wlcjb0aigm1lbmn16nmh9rkjqfdpzzgf6qw7mcrhgw7pdald5";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
new file mode 100644
index 000000000000..dd11da3b11e2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2
+, gdk_pixbuf }:
+
+let
+ pname = "gnome-themes-extra";
+ version = "3.27.92";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "04jwsg9f29vzhcmf146d3rr27c8ldra378m465ahsal9vaaiywcm";
+ };
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
+ nativeBuildInputs = [ pkgconfig intltool ];
+ buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.defaultIconTheme ];
+
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
deleted file mode 100644
index 720120b392de..000000000000
--- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2
-, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
- name = "gnome-themes-standard-${version}";
- version = "3.22.3";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-themes-standard/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a";
- };
-
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-themes-standard"; };
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool gtk3 librsvg pango atk gtk2 gdk_pixbuf
- gnome3.defaultIconTheme ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- maintainers = gnome3.maintainers;
- };
-}
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 8854e7a2d0c3..d4ba838bef3c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gnome-user-docs-${version}";
- version = "3.26.2.1";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "93136f5baffd160c14e1b39f0ac60b9768975edac2da2b30c945faef534af8f5";
+ sha256 = "0sx46j61kjn8kaf75303vym5sigki239pqzf5q4n72k1hwp7albp";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 642ee0badf1e..367485668807 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "gnome-user-share-${version}";
- version = "3.18.3";
+ version = "3.27.90";
src = fetchurl {
url = "mirror://gnome/sources/gnome-user-share/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "3092fa7ad137531e35484195dde4ecbbc75a8a3d9b8209aef4c852717cf4bbf1";
+ sha256 = "1wd183cjr1gmzpsq7bqwkwhmcdng0m105f6ymc89r17fz85f4jhy";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
index 89614a327a6a..e5ca314c69af 100644
--- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
+++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gsettings-desktop-schemas-${version}";
- version = "3.24.1";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gsettings-desktop-schemas/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7";
+ sha256 = "0rwidacwrxlc54x90h9g3wx2zlisc4vm49vmxi15azmpj1vwvd2c";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
index ae4f75bf76a7..0a37144d8f74 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gtksourceviewmm-${version}";
- version = "3.21.2";
+ version = "3.21.3";
src = fetchurl {
url = "mirror://gnome/sources/gtksourceviewmm/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "d21296d8624a1046841bfec082021b7b966df0b62e19ee300828519bc54dd9c6";
+ sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index ff9b232cb7a8..45a4a97205b8 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -1,18 +1,15 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3
+{ stdenv, intltool, fetchurl, pkgconfig, gtk3, defaultIconTheme
, glib, desktop-file-utils, bash, appdata-tools
, wrapGAppsHook, gnome3, itstool, libxml2
, callPackage, unzip, gobjectIntrospection }:
-# TODO: icons and theme still does not work
-# use packaged gnome3.adwaita-icon-theme
-
stdenv.mkDerivation rec {
name = "gucharmap-${version}";
- version = "10.0.3";
+ version = "10.0.4";
src = fetchurl {
url = "mirror://gnome/sources/gucharmap/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "ac07d75924e2d8f436d9492e8f7d54cf109404d34de06886a3967563cd1726a4";
+ sha256 = "00gh3lll6wykd2qg1lrj05a4wvscsypmrx7rpb6jsbvb4scnh9mv";
};
passthru = {
@@ -21,8 +18,6 @@ stdenv.mkDerivation rec {
doCheck = true;
- propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl";
nativeBuildInputs = [
@@ -30,7 +25,7 @@ stdenv.mkDerivation rec {
gnome3.yelp-tools libxml2 desktop-file-utils gobjectIntrospection
];
- buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas ];
+ buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas defaultIconTheme ];
unicode-data = callPackage ./unicode-data.nix {};
diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix
index cb771fc1989f..f43b1de46e50 100644
--- a/pkgs/desktops/gnome-3/core/libgepub/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgepub/default.nix
@@ -3,13 +3,13 @@
let
pname = "libgepub";
- version = "0.5.3";
+ version = "0.6.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "0gn14k1qnkfj0677i2wc42ig4m8biqib9apk23dnl92m3h1f2lmb";
+ sha256 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix
index ad14abb10008..7c513e9398a5 100644
--- a/pkgs/desktops/gnome-3/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix
@@ -1,30 +1,45 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
-, pango, gdk_pixbuf, atk, tzdata, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk, gettext, libsoup
+, gtk-doc, docbook_xsl, gobjectIntrospection, tzdata, geocode-glib, vala, gnome3 }:
-stdenv.mkDerivation rec {
- name = "libgweather-${version}";
- version = "3.26.1";
+let
+ pname = "libgweather";
+ version = "3.28.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/libgweather/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "13z12ra5fhn7xhsrskd7q8dnc2qnd1kylhndg6zlhk0brj6yfjsr";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "libgweather"; attrPath = "gnome3.libgweather"; };
- };
+ nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl gobjectIntrospection ];
+ buildInputs = [ glib gtk libsoup libxml2 geocode-glib ];
- configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-vala" ];
- propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode-glib ];
- nativeBuildInputs = [ pkgconfig intltool gnome3.vala ];
-
- # Prevent building vapi into ${vala} derivation directory
- prePatch = ''
- substituteInPlace libgweather/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
+ postPatch = ''
+ chmod +x meson/meson_post_install.py
+ patchShebangs meson/meson_post_install.py
'';
+ mesonFlags = [
+ "-Dzoneinfo_dir=${tzdata}/share/zoneinfo"
+ "-Denable_vala=true"
+ "-Dgtk_doc=true"
+ ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
+
meta = with stdenv.lib; {
- platforms = platforms.linux;
+ description = "A library to access weather information from online services for numerous locations";
+ homepage = https://wiki.gnome.org/Projects/LibGWeather;
+ license = licenses.gpl2Plus;
maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
index 11761bd3412b..10c6185fa821 100644
--- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix
+++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gtk, gnome-online-accounts, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, rest, libsoup, gnome-online-accounts, gnome3, gobjectIntrospection }:
let
pname = "libzapojit";
version = "0.0.3";
@@ -6,13 +6,15 @@ in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
+ outputs = [ "out" "dev" ];
+
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
};
- nativeBuildInputs = [ pkgconfig intltool ];
- buildInputs = [ glib json-glib rest libsoup gtk gnome-online-accounts ];
+ nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
+ propagatedBuildInputs = [ glib json-glib rest libsoup gnome-online-accounts ]; # zapojit-0.0.pc
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index dc89c8c674ab..623d2b1251e1 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "mutter-${version}";
- version = "3.26.2";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "83309feb05a4635c47713665c0592af8ab6d7f17a36e4bd626d67609b6422fab";
+ sha256 = "1c46sf10mgvwgym4c6hbjm7wa82dvfv8j8dx4zdbc7zj4n0grzsq";
};
passthru = {
@@ -29,15 +29,6 @@ stdenv.mkDerivation rec {
"--with-xwayland-path=${xwayland}/bin/Xwayland"
];
- patches = [
- # Pipewire 0.1.8 compatibility
- (fetchurl {
- name = "mutter-pipewire-0.1.8-compat.patch";
- url = https://bugzilla.gnome.org/attachment.cgi?id=367356;
- sha256 = "10bx5zf11wwhhy686w11ggikk56pbxydpbk9fbd947ir385x92cz";
- })
- ];
-
propagatedBuildInputs = [
# required for pkgconfig to detect mutter-clutter
libXtst
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 8ed7bb2f01a0..a52ec342675c 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -1,31 +1,28 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, wrapGAppsHook
, gtk, gnome3, gnome-autoar, glib, dbus-glib, shared-mime-info, libnotify, libexif
-, exempi, librsvg, tracker, tracker-miners, libselinux, gdk_pixbuf }:
+, exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }:
-stdenv.mkDerivation rec {
- name = "nautilus-${version}";
- version = "3.26.2";
+let
+ pname = "nautilus";
+ version = "3.28.0.1";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/nautilus/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "79c99404c665ea76b3db86f261fbd28a62b54c51429b05c3314462c9de2614b4";
- };
-
- passthru = {
- updateScript = gnome3.updateScript { packageName = "nautilus"; attrPath = "gnome3.nautilus"; };
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "1i3li3nd434vncd6j6has73xihbzjx1ab0xyw8wif11mym15ixrh";
};
nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop-file-utils ];
- buildInputs = [ dbus-glib shared-mime-info libexif gtk exempi libnotify libselinux
- tracker tracker-miners gnome3.gnome-desktop gnome3.adwaita-icon-theme
- gnome3.gsettings-desktop-schemas ];
+ buildInputs = [
+ dbus-glib shared-mime-info libexif gtk exempi libnotify libselinux
+ tracker tracker-miners gnome-desktop gexiv2
+ gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
+ ];
propagatedBuildInputs = [ gnome-autoar ];
- # fatal error: gio/gunixinputstream.h: No such file or directory
- NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
preFixup = ''
gappsWrapperArgs+=(
# Thumbnailers
@@ -35,16 +32,23 @@ stdenv.mkDerivation rec {
)
'';
-# hardeningDisable = [ "format" ];
- enableParallelBuilding = true;
-
postPatch = ''
patchShebangs build-aux/meson/postinstall.py
'';
patches = [ ./extension_dir.patch ];
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
+
meta = with stdenv.lib; {
+ description = "The file manager for GNOME";
+ homepage = https://wiki.gnome.org/Apps/Files;
+ license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = gnome3.maintainers;
};
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index a40a8fe8f81a..3528a9a93d9c 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "simple-scan-${version}";
- version = "3.26.3";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/simple-scan/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "0galkcc76j0p016fvwn16llh0kh4ykvjy4v7kc6qqnlp38g174n3";
+ sha256 = "0ki95d0v9l0pb5jvk1v8k49vb7snp9j7bnxw3m8q63m00yl33qhz";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
index ef6bc97b1c67..457cee3b3f25 100644
--- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gobjectIntrospection, gnome3 }:
stdenv.mkDerivation rec {
name = "totem-pl-parser-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
updateScript = gnome3.updateScript { packageName = "totem-pl-parser"; attrPath = "gnome3.totem-pl-parser"; };
};
- nativeBuildInputs = [ meson ninja pkgconfig gettext ];
+ nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
buildInputs = [ gmime libxml2 libsoup ];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
index 56292330e013..b612db9ce38b 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
@@ -9,25 +9,23 @@
, libsoup, json-glib, libseccomp
, libiptcdata }:
-stdenv.mkDerivation rec {
- name = "tracker-miners-${version}";
+let
+ pname = "tracker-miners";
version = "2.0.4";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/tracker-miners/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0mp9m2waii583sjgr61m1ni6py6dry11r0rzidgvw1g4cxhn89j6";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "tracker-miners"; attrPath = "gnome3.tracker-miners"; };
- };
-
NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
enableParallelBuilding = true;
nativeBuildInputs = [ vala pkgconfig intltool itstool libxslt wrapGAppsHook ];
- # TODO: add libgrss, libenca
+ # TODO: add libgrss, libenca, libosinfo
buildInputs = [
bzip2 evolution-data-server exempi flac giflib glib gnome3.totem-pl-parser
gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu
@@ -46,6 +44,13 @@ stdenv.mkDerivation rec {
})
];
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
+
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/Tracker;
description = "Desktop-neutral user information store, search tool and indexer";
diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch
index 9ed93fbcca93..847e3bf204dd 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch
@@ -1,5 +1,14 @@
--- a/src/libtracker-miners-common/tracker-domain-ontology.c
+++ b/src/libtracker-miners-common/tracker-domain-ontology.c
+@@ -313,7 +313,7 @@
+ goto end;
+ }
+ } else {
+- path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies",
++ path = g_build_filename ("@tracker@", "share", "tracker", "domain-ontologies",
+ DEFAULT_RULE, NULL);
+
+ if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
@@ -372,7 +372,7 @@
if (!priv->ontology_location) {
gchar *ontology_path;
diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index 61ae06ec0664..cbf16c6807ff 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchurl, intltool, pkgconfig
+{ stdenv, fetchurl, intltool, pkgconfig, gobjectIntrospection
, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt
, gnome3, icu, libuuid, networkmanager, libsoup, json-glib }:
-stdenv.mkDerivation rec {
- name = "tracker-${version}";
+let
+ pname = "tracker";
version = "2.0.3";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+
+ outputs = [ "out" "dev" ];
src = fetchurl {
- url = "mirror://gnome/sources/tracker/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1005w90vhk1cl8g6kxpy2vdzbskw2jskfjcl42lngv18q5sb4bss";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "tracker"; attrPath = "gnome3.tracker"; };
- };
-
enableParallelBuilding = true;
- nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook ];
+ nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook gobjectIntrospection ];
# TODO: add libstemmer
buildInputs = [
glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib
@@ -30,6 +30,13 @@ stdenv.mkDerivation rec {
patchShebangs utils/g-ir-merge/g-ir-merge
'';
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
+
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/Tracker;
description = "Desktop-neutral user information store, search tool and indexer";
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
index 4365451636ae..65c6ace8eec0 100644
--- a/pkgs/desktops/gnome-3/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
@@ -1,11 +1,8 @@
{ stdenv, fetchurl, lib, wrapGAppsHook
, pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup
, telepathySupport ? false, dbus-glib ? null, telepathy-glib ? null
-, libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null
-, zlib ? null, libjpeg ? null
-, libXdamage ? null, libXfixes ? null, libXext ? null
-, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
-, networkmanager ? null }:
+, libsecret, gnutls, libgcrypt, avahi, zlib, libjpeg, libXdamage, libXfixes, libXext
+, networkmanager }:
with lib;
@@ -18,28 +15,25 @@ stdenv.mkDerivation rec {
sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "vino"; attrPath = "gnome3.vino"; };
- };
-
doCheck = true;
- buildInputs = [
- wrapGAppsHook
- pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup
- ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ]
- ++ optional gnomeKeyringSupport libgnome-keyring3
- ++ filter (p: p != null) [
- libsecret gnutls libgcrypt avahi zlib libjpeg
- libXdamage libXfixes libXext networkmanager
- ];
+ nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ];
- preFixup = ''
- export GSETTINGS_SCHEMAS_PATH="$out/share/gsettings-schemas/${name}:$GSETTINGS_SCHEMAS_PATH"
- '';
+ buildInputs = [
+ gnome3.defaultIconTheme gtk3 glib libXtst libnotify libsoup
+ libsecret gnutls libgcrypt avahi zlib libjpeg
+ libXdamage libXfixes libXext networkmanager
+ ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "vino";
+ attrPath = "gnome3.vino";
+ };
+ };
meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/action/show/Projects/Vino;
+ homepage = https://wiki.gnome.org/Projects/Vino;
description = "GNOME desktop sharing server";
maintainers = with maintainers; [ lethalman domenkozar ];
license = licenses.gpl2;
diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix
index 4abeb2ba9618..73fd244c5489 100644
--- a/pkgs/desktops/gnome-3/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/core/vte/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "vte-${version}";
- version = "0.50.2";
+ version = "0.52.0";
src = fetchurl {
url = "mirror://gnome/sources/vte/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf";
+ sha256 = "0rq5gkg7bfrxlsm8mgdh4605hki81wljmjhhz8x4kbspvpfp5bnm";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
index 28e89cad9fb8..5a0a5bd43b5b 100644
--- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "yelp-tools-${version}";
- version = "3.18.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/yelp-tools/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932";
+ sha256 = "1b61dmlb1sd50fgq6zgnkcpx2s1py33q0x9cx67fzpsr4gmgxnw2";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index 341a7d7582ca..f904a90454f3 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "yelp-xsl-${version}";
- version = "3.20.1";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/yelp-xsl/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0";
+ sha256 = "14rznm1qpsnmkwksnkd5j7zplakl01kvrcw0fdmd5gdc65xz9kcc";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 661ddc1f12f4..60b91aaa04a3 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "yelp-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/yelp/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "e4cb02ed2f44cfec3c352c957f8a461d9689cbc06eb3b503a58ffe92e1753f1b";
+ sha256 = "05qzczxnxk374cp4an166gv60nkbd0jq3pp2fwy7s9rnkm55jz6v";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix
index fd55fd9f87a6..05637e200e31 100644
--- a/pkgs/desktops/gnome-3/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/core/zenity/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "zenity-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/zenity/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "6a7f34626dd62b751fe22bcdb32f3558f8a8fdddcc9406893dd264f0ac18e830";
+ sha256 = "1y3dha9faqgy5l8wqh3qp354gzdh36fx70q2kc9k1nw7p498yn2y";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 047d07aaae2e..c28695ed8e25 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -29,7 +29,7 @@ let
gtk3.out # for gtk-update-icon-cache
glib-networking gvfs dconf gnome-backgrounds gnome-control-center
gnome-menus gnome-settings-daemon gnome-shell
- gnome-themes-standard defaultIconTheme gnome-shell-extensions
+ gnome-themes-extra defaultIconTheme gnome-shell-extensions
pkgs.hicolor-icon-theme
];
@@ -38,11 +38,11 @@ let
gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
gnome-system-log gnome-system-monitor simple-scan
gnome-terminal gnome-user-docs evolution file-roller gedit
- gnome-clocks gnome-music gnome-tweak-tool gnome-photos
+ gnome-clocks gnome-music gnome-tweaks gnome-photos
nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool
gnome-getting-started-docs gnome-packagekit gnome-software
- gnome-power-manager
+ gnome-power-manager gnome-usage
];
gamesPackages = with gnome3; [ swell-foop lightsoff iagno
@@ -53,9 +53,9 @@ let
];
inherit (pkgs) atk glib gobjectIntrospection gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2
- libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf
- easytag meld orca rhythmbox shotwell
- clutter clutter-gst clutter-gtk cogl gtkvnc;
+ libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
+ easytag meld orca rhythmbox shotwell gnome-usage
+ clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle;
inherit (pkgs.gnome2) ORBit2;
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
@@ -64,7 +64,7 @@ let
gnome3 = self // { recurseForDerivations = false; };
gtk = gtk3;
gtkmm = gtkmm3;
- vala = pkgs.vala_0_38;
+ vala = pkgs.vala_0_40;
gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
# Simplify the nixos module and gnome packages
@@ -160,7 +160,7 @@ let
gnome-terminal = callPackage ./core/gnome-terminal { };
- gnome-themes-standard = callPackage ./core/gnome-themes-standard { };
+ gnome-themes-extra = callPackage ./core/gnome-themes-extra { };
gnome-user-docs = callPackage ./core/gnome-user-docs { };
@@ -174,8 +174,6 @@ let
gsound = callPackage ./core/gsound { };
- gtksourceview = callPackage ./core/gtksourceview { };
-
gtksourceviewmm = callPackage ./core/gtksourceviewmm { };
gucharmap = callPackage ./core/gucharmap { };
@@ -386,7 +384,7 @@ let
gspell = callPackage ./misc/gspell { };
- libgames-support = callPackage ./misc/libgames-support { };
+ libgnome-games-support = callPackage ./misc/libgnome-games-support { };
libgda = callPackage ./misc/libgda { };
@@ -396,7 +394,7 @@ let
gexiv2 = callPackage ./misc/gexiv2 { };
- gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
+ gnome-tweaks = callPackage ./misc/gnome-tweaks { };
gpaste = callPackage ./misc/gpaste { };
@@ -426,9 +424,12 @@ let
gnome_settings_daemon = gnome-settings-daemon; # added 2018-02-25
gnome_shell = gnome-shell; # added 2018-02-25
gnome_terminal = gnome-terminal; # added 2018-02-25
+ gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
+ gnome-tweak-tool = gnome-tweaks; # added 2018-03-21
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
+ libgames-support = libgnome-games-support; # added 2018-03-14
libgnome_keyring = libgnome-keyring; # added 2018-02-25
networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25
networkmanager_iodine = networkmanager-iodine; # added 2018-02-25
diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
index 419588f86842..0e50953b3dea 100644
--- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "anjuta-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/anjuta/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "fb895464c1a3c915bb2bb3ea5d236fd17202caa7205f6792f70a75affc343d70";
+ sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 321e887cba6d..786eece7194a 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -1,30 +1,34 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, webkitgtk, intltool, gsettings-desktop-schemas }:
+, glib, appstream-glib, gobjectIntrospection
+, webkitgtk, gettext, itstool, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
name = "devhelp-${version}";
- version = "3.26.1";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/devhelp/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "10bd468ae2188abd98af9ba7b81aced337d2206e9d843eb44520be5b00d77d8e";
+ sha256 = "1b4l71775p3mps1jsv7pz26v0lhd0qczsp6qr1dwv7hyslmpb5qn";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "devhelp"; attrPath = "gnome3.devhelp"; };
- };
-
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection ];
buildInputs = [
- gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
- gsettings-desktop-schemas
+ glib gtk3 webkitgtk
+ gnome3.defaultIconTheme gsettings-desktop-schemas
];
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "devhelp";
+ attrPath = "gnome3.devhelp";
+ };
+ };
+
meta = with stdenv.lib; {
- homepage = https://live.gnome.org/devhelp;
description = "API documentation browser for GNOME";
- maintainers = gnome3.maintainers;
+ homepage = https://wiki.gnome.org/Apps/Devhelp;
license = licenses.gpl2;
+ maintainers = gnome3.maintainers;
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/gnome-3/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/devtools/gdl/default.nix
index 07fc15f0d553..75f9bc48db65 100644
--- a/pkgs/desktops/gnome-3/devtools/gdl/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gdl/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gdl-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gdl/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "f3ad03f9a34f751f52464e22d962c0dec8ff867b7b7b37fe24907f3dcd54c079";
+ sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
index 3949e29089c8..57070f7ce38a 100644
--- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gnome-devel-docs-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-devel-docs/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "12eea77b550acfa617e14a89e4d24f93881294340abcc2c3abc7092c851703c3";
+ sha256 = "1py0zyfzpaws41p9iw4645ykfnmm408axfghsmq6gnwgp66vl074";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
index b194ac42bf24..77220124fcc1 100644
--- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "aisleriot-${version}";
- version = "3.22.4";
+ version = "3.22.5";
src = fetchurl {
url = "mirror://gnome/sources/aisleriot/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "fe8dee3ad771ab778d37740a26410778aa5c61e8eb75dd42b9a5e5719c6e34fb";
+ sha256 = "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
index 8806344f3b38..4115fda9f8df 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "five-or-more-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/five-or-more/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "7c24f7f2603df99299d38b40b14c005aaad88820113ed71e4b3765ac3b027772";
+ sha256 = "1fy4a7qdjqvabm0cl45d6xlx6hy4paxvm0b2paifff73bl250d5c";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 22032f16f477..bf21f7346809 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -1,25 +1,25 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, libcanberra-gtk3, librsvg, libxml2 }:
+, gettext, itstool, libcanberra-gtk3, librsvg, libxml2 }:
stdenv.mkDerivation rec {
name = "four-in-a-row-${version}";
- version = "3.22.2";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/four-in-a-row/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "bc4194e8ab6d1d2a6a63a2e91945cd5465f49ebf0dae2eecacc66e69db56a420";
+ sha256 = "1iszaay2r92swb0q67lmip6r1w3hw2dwmlgnz9v2h6blgdyncs4k";
};
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 ];
+ buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.defaultIconTheme ];
+
passthru = {
- updateScript = gnome3.updateScript { packageName = "four-in-a-row"; attrPath = "gnome3.four-in-a-row"; };
+ updateScript = gnome3.updateScript {
+ packageName = "four-in-a-row";
+ attrPath = "gnome3.four-in-a-row";
+ };
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- gtk3 wrapGAppsHook intltool itstool libcanberra-gtk3 librsvg
- libxml2 gnome3.defaultIconTheme
- ];
-
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Four-in-a-row;
description = "Make lines of the same color to win";
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index f50542770c4f..063b97801b4e 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -1,25 +1,30 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, librsvg, libxml2 }:
+{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, wrapGAppsHook, gobjectIntrospection
+, gettext, itstool, libxml2, gnome3, glib, gtk3, librsvg }:
stdenv.mkDerivation rec {
name = "gnome-chess-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-chess/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "a0f6f862ab7067626a3a86cdc9c14dde595e38e6719e0198cb967e11facf1f12";
+ sha256 = "1vxgb36njv4v3bgdpwxd89rvr6s6pkbh9d3xislxqry2yp4f03w0";
};
+ nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 wrapGAppsHook gobjectIntrospection ];
+ buildInputs = [ glib gtk3 librsvg gnome3.defaultIconTheme ];
+
+ postPatch = ''
+ chmod +x meson_post_install.py
+ patchShebangs meson_post_install.py
+ '';
+
passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-chess"; attrPath = "gnome3.gnome-chess"; };
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-chess";
+ attrPath = "gnome3.gnome-chess";
+ };
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- gtk3 wrapGAppsHook intltool itstool librsvg libxml2
- gnome3.defaultIconTheme
- ];
-
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Chess;
description = "Play the classic two-player boardgame of chess";
diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index c1f91092bb0d..fc75cd081f9a 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libxml2, intltool, itstool, libgee, libgames-support }:
+{ stdenv, fetchurl, pkgconfig, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils
+, glib, librsvg, libxml2, intltool, itstool, libgee, libgnome-games-support }:
-stdenv.mkDerivation rec {
- name = "gnome-klotski-${version}";
- version = "3.22.2";
+let
+ pname = "gnome-klotski";
+ version = "3.22.3";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/gnome-klotski/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "16hd6yk01rhb4pj8m01fyn72wykf41d72gsms81q0n4zm5bm1a4h";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "0prc0s28pdflgzyvk1g0yfx982q2grivmz3858nwpqmbkha81r7f";
};
+ nativeBuildInputs = [ pkgconfig vala wrapGAppsHook intltool itstool libxml2 appstream-glib desktop-file-utils ];
+ buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.defaultIconTheme ];
+
passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-klotski"; attrPath = "gnome3.gnome-klotski"; };
+ updateScript = gnome3.updateScript {
+ packageName = "${pname}";
+ attrPath = "gnome3.${pname}";
+ };
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support
- gnome3.defaultIconTheme
- ];
-
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Klotski;
description = "Slide blocks to solve the puzzle";
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index ce5dc8bc14c0..55dad369c108 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -1,25 +1,31 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2, libgames-support, libgee }:
+{ stdenv, fetchurl, meson, ninja, vala, gobjectIntrospection, pkgconfig, gnome3, gtk3, wrapGAppsHook
+, librsvg, gettext, itstool, libxml2, libgames-support, libgee }:
stdenv.mkDerivation rec {
name = "gnome-mines-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-mines/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "2b041eaf0d57307498c56d8e285b2e539f634fdba95d689f6af75aa4ed6edde9";
+ sha256 = "16w55hqaxipcv870n9gpn6qiywbqbyg7bjshaa02r75ias8dfxvf";
};
+ # gobjectIntrospection for finding vapi files
+ nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool libxml2 wrapGAppsHook ];
+ buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgames-support libgee ];
+
+ postPatch = ''
+ chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file
+ patchShebangs data/meson_compile_gschema.py
+ '';
+
passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-mines"; attrPath = "gnome3.gnome-mines"; };
+ updateScript = gnome3.updateScript {
+ packageName = "gnome-mines";
+ attrPath = "gnome3.gnome-mines";
+ };
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- gtk3 wrapGAppsHook librsvg intltool itstool libxml2
- gnome3.defaultIconTheme libgames-support libgee
- ];
-
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Mines;
description = "Clear hidden mines from a minefield";
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index aa5e00606c7a..e07e3c141522 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "gnome-robots-${version}";
- version = "3.22.2";
+ version = "3.22.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-robots/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "c5d63f0fcae66d0df9b10e39387d09875555909f0aa7e57ef8552621d852082f";
+ sha256 = "0dzcjd7rdmlzgr6rmljhrbccwif8wj0cr1xcrrj7malj33098wwk";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index b3380e6bb96c..1d467e542da9 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "gnome-sudoku-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-sudoku/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "8774c7093a97131b94d39142f1e044c8619cfdb6ad2546176271589fbb12d3a0";
+ sha256 = "07b4lzniaf3gjsss6zl1lslv18smwc4nrijykvn2z90f423q2xav";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 4f87fb50d619..855e496dfaf4 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "gnome-taquin-${version}";
- version = "3.26.1";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-taquin/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "de352bb2dfcd759de37f6bccf1e4790760e020b4bb06a1bc8d5f03d89613b6fd";
+ sha256 = "096a32nhcz243na56iq2wxixd4f3lbj33a5h718r3j6yppqazjx9";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index d31457f868c4..55dac4659d0f 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "iagno-${version}";
- version = "3.26.1";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/iagno/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "3476810d0c42aa1600484de2c111c94e0cf5247a98f071b23a0b5e3036362121";
+ sha256 = "12haq1vgrr6wf970rja55rcg0352sm0i3l5z7gj0ipr2isv8506x";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index 1a163352cfc8..73b7c092a66d 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
-, intltool, itstool, clutter, clutter-gtk, libxml2, dconf }:
+{ stdenv, fetchurl, vala, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
+, gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib }:
stdenv.mkDerivation rec {
name = "lightsoff-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/lightsoff/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "d12572bc7b70481320ec90c6130ad794b559a9990d08bef158a1d826aaa35976";
+ sha256 = "0rwh9kz6aphglp79cyrfjab6vy02vclq68f646zjgb9xgg6ar73g";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "lightsoff"; attrPath = "gnome3.lightsoff"; };
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf
- libxml2 clutter clutter-gtk wrapGAppsHook itstool intltool ];
+ nativeBuildInputs = [ vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2];
+ buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg clutter clutter-gtk ];
enableParallelBuilding = true;
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "lightsoff";
+ attrPath = "gnome3.lightsoff";
+ };
+ };
+
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Lightsoff;
description = "Puzzle game, where the objective is to turn off all of the tiles on the board";
diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
index 92da14fb5597..13b6f57d0fd2 100644
--- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
@@ -1,24 +1,31 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf
-, clutter, clutter-gtk, intltool, itstool, libxml2, wrapGAppsHook }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, glib, gtk3, gnome3, desktop-file-utils
+, clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook }:
-stdenv.mkDerivation rec {
- name = "swell-foop-${version}";
- version = "3.26.0";
+let
+ pname = "swell-foop";
+ version = "3.28.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/swell-foop/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "122e2b5a51ad0144ea6b5fd2736ac43b101c7892198948e697bfc4c014bbba22";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "1yjmg6sgi7mvp10fsqlkqshajmh8kgdmg6vyj5r8y48pv2ihfk64";
};
passthru = {
- updateScript = gnome3.updateScript { packageName = "swell-foop"; attrPath = "gnome3.swell-foop"; };
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
- dconf wrapGAppsHook itstool intltool clutter clutter-gtk libxml2 ];
+ nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook itstool gettext libxml2 desktop-file-utils ];
+ buildInputs = [ glib gtk3 gnome3.defaultIconTheme clutter clutter-gtk ];
- enableParallelBuilding = true;
+ postPatch = ''
+ chmod +x meson_post_install.py # patchShebangs requires executable file
+ patchShebangs meson_post_install.py
+ '';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Swell%20Foop;
diff --git a/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
deleted file mode 100644
index c229cc96094f..000000000000
--- a/pkgs/desktops/gnome-3/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8a94642..1ca6426 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS)
- GLIB_REQUIRED=2.38.0
- GTK_REQUIRED=3.12.2
- GEE_REQUIRED=0.10.5
--ECAL_REQUIRED=3.8.5
-+ECAL_REQUIRED=3.13.90
- LIBSOUP_REQUIRED=2.44
- GDATA_REQUIRED=0.14.0
- GOA_REQUIRED=3.8.3
-diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala
-index ee6a572..5009b5d 100644
---- a/src/backing/eds/backing-eds-calendar-source.vala
-+++ b/src/backing/eds/backing-eds-calendar-source.vala
-@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource {
-
- // Invoked by EdsStore prior to making it available outside of unit
- internal async void open_async(Cancellable? cancellable) throws Error {
-- client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS,
-+ client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1,
- cancellable);
-
- client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE);
-diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi
-index 6ead3ec..46fd711 100644
---- a/vapi/libecal-1.2.vapi
-+++ b/vapi/libecal-1.2.vapi
-@@ -23,7 +23,7 @@ namespace E {
- public bool check_save_schedules ();
- public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error;
- [CCode (finish_name = "e_cal_client_connect_finish")]
-- public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error;
-+ public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error;
- public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error;
- [CCode (finish_name = "e_cal_client_create_object_finish")]
- public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error;
diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix
index 73d3b555ba9f..c81238d24986 100644
--- a/pkgs/desktops/gnome-3/misc/california/default.nix
+++ b/pkgs/desktops/gnome-3/misc/california/default.nix
@@ -1,34 +1,36 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, makeWrapper
-, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }:
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, libgee, wrapGAppsHook, itstool, gobjectIntrospection
+, gnome-online-accounts, evolution-data-server, gnome3, glib, libsoup, libgdata, sqlite, xdg_utils }:
let
- majorVersion = "0.4";
-in
-stdenv.mkDerivation rec {
- name = "california-${majorVersion}.0";
+ pname = "california";
+ version = "0.4.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/california/${majorVersion}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj";
};
- propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ makeWrapper intltool vala_0_32 glib gtk3 gnome3.libgee
- libsoup libgdata gnome3.gnome-online-accounts gnome3.evolution-data-server
- sqlite itstool xdg_utils gnome3.gsettings-desktop-schemas ];
-
- preFixup = ''
- wrapProgram "$out/bin/california" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings-desktop-schemas}/share"
- '';
+ nativeBuildInputs = [ intltool itstool vala_0_32 pkgconfig wrapGAppsHook gobjectIntrospection ];
+ buildInputs = [ glib gtk3 libgee libsoup libgdata gnome-online-accounts evolution-data-server sqlite xdg_utils gnome3.gsettings-desktop-schemas ];
enableParallelBuilding = true;
- # Apply fedoras patch to build with evolution-data-server >3.13
- patches = [ ./0002-Build-with-evolution-data-server-3.13.90.patch ];
+ patches = [
+ # Apply Fedora patch to build with evolution-data-server > 3.13
+ (fetchurl {
+ url = https://src.fedoraproject.org/rpms/california/raw/c00bf9924d8fa8cb0a9ec06564d1a1b00c9055af/f/0002-Build-with-evolution-data-server-3.13.90.patch;
+ sha256 = "0g9923n329p32gzr1q52ad30f8vyz8vrri4rih0w8klmf02ga4pm";
+ })
+ ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/California;
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index f8c296252617..5a95802b81a7 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_38, enchant
-, wrapGAppsHook, gdk_pixbuf, cmake, desktop-file-utils
-, libnotify, libcanberra-gtk3, libsecret, gmime
-, libpthreadstubs, sqlite
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant
+, wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils
+, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes
+, gobjectIntrospection, libpthreadstubs, sqlite
, gnome3, librsvg, gnome-doc-utils, webkitgtk }:
let
@@ -17,10 +17,16 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
- nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop-file-utils gnome-doc-utils ];
- buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite
- libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr
- gdk_pixbuf librsvg gnome3.defaultIconTheme ];
+ nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ];
+ buildInputs = [
+ gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite
+ libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr isocodes
+ gdk_pixbuf librsvg gnome3.defaultIconTheme
+ ];
+
+ cmakeFlags = [
+ "-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes"
+ ];
preConfigure = ''
substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0'
@@ -31,8 +37,6 @@ stdenv.mkDerivation rec {
gappsWrapperArgs+=(--prefix PATH : "$out/bin")
'';
- enableParallelBuilding = true;
-
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Geary;
description = "Mail client for GNOME 3";
diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
index 94a29546fb97..8194e3f1699d 100644
--- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
@@ -1,5 +1,5 @@
{ stdenv, intltool, fetchurl, pkgconfig, glib
-, gnome3, libsoup, json-glib }:
+, gnome3, libsoup, json-glib, gobjectIntrospection }:
let
pname = "gfbgraph";
@@ -7,15 +7,19 @@ let
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
+ outputs = [ "out" "dev" "devdoc" ];
+
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
buildInputs = [ glib gnome3.gnome-online-accounts ];
propagatedBuildInputs = [ libsoup json-glib gnome3.rest ];
+ configureFlags = [ "--enable-introspection" ];
+
enableParallelBuilding = true;
passthru = {
diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
index ecc0711482fa..e3ff784b16fa 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "gnome-packagekit-${version}";
- version = "3.26.0";
+ version = "3.28.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-packagekit/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "6a219e16923d3976f424416c944bef06913922da24bc9e6644ec114c2d563417";
+ sha256 = "051q3hc78qa85mfh4jxxprfcrfj1hva6smfqsgzm0kx4zkkj1c1r";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
deleted file mode 100644
index 35c3a678e843..000000000000
--- a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ stdenv, meson, ninja, gettext, fetchurl, atk
-, pkgconfig, gtk3, glib, libsoup
-, bash, itstool, libxml2, python3Packages
-, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
- name = "gnome-tweak-tool-${version}";
- version = "3.26.4";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-tweak-tool/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "fda08044d22c258bbd93dbad326d282d4d1184b98795ae8e3e5f07f8275005df";
- };
-
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-tweak-tool"; attrPath = "gnome3.gnome-tweak-tool"; };
- };
-
- propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
- nativeBuildInputs = [
- meson ninja pkgconfig gettext itstool libxml2 file wrapGAppsHook
- ];
- buildInputs = [
- gtk3 glib gnome3.gsettings-desktop-schemas
- gdk_pixbuf gnome3.defaultIconTheme librsvg
- libnotify gnome3.gnome-shell python3Packages.pygobject3
- libsoup gnome3.gnome-settings-daemon gnome3.nautilus
- gnome3.mutter gnome3.gnome-desktop gobjectIntrospection
- ];
-
- postPatch = ''
- patchShebangs meson-postinstall.py
- '';
-
- preFixup = ''
- gappsWrapperArgs+=(
- --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH")
- '';
-
- patches = [
- (fetchurl {
- name = "find_gsettings.patch";
- url = https://bugzilla.gnome.org/attachment.cgi?id=365642;
- sha256 = "14ik1kad0w99xa2wn3d4ynrkhnwchjlqfbaij7p11y5zpiwhaha4";
- })
- (fetchurl {
- name = "0001-Search-for-themes-and-icons-in-system-data-dirs.patch";
- url = https://bugzilla.gnome.org/attachment.cgi?id=365643;
- sha256 = "1phq3c7hc9lryih6rp3m5wmp88rfbl6iv42ng4g6bzm1jphgl89f";
- })
- (fetchurl {
- name = "0001-appearance-Don-t-duplicate-the-cursor-theme-name.patch";
- url = https://bugzilla.gnome.org/attachment.cgi?id=365648;
- sha256 = "1n9vwsfz4sx72qsi1gd1y7460zmagwirvmi9qrfhc3ahanpyn4fr";
- })
- ];
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;
- description = "A tool to customize advanced GNOME 3 options";
- maintainers = gnome3.maintainers;
- license = licenses.gpl3;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
new file mode 100644
index 000000000000..75b5060d7b3d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, meson, ninja, gettext, fetchurl, atk
+, pkgconfig, gtk3, glib, libsoup
+, bash, itstool, libxml2, python3Packages
+, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
+
+let
+ pname = "gnome-tweaks";
+ version = "3.28.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "0d8zxfa8r4n4l6jzyzy6q58padxjlrad3c71mwqidm2ww8nm6i19";
+ };
+
+ nativeBuildInputs = [
+ meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook
+ ];
+ buildInputs = [
+ gtk3 glib gnome3.gsettings-desktop-schemas
+ gdk_pixbuf gnome3.defaultIconTheme
+ libnotify gnome3.gnome-shell python3Packages.pygobject3
+ libsoup gnome3.gnome-settings-daemon gnome3.nautilus
+ gnome3.mutter gnome3.gnome-desktop gobjectIntrospection
+ gnome3.nautilus
+ ];
+
+ postPatch = ''
+ patchShebangs meson-postinstall.py
+ '';
+
+ preFixup = ''
+ gappsWrapperArgs+=(
+ --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH")
+ '';
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;
+ description = "A tool to customize advanced GNOME 3 options";
+ maintainers = gnome3.maintainers;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
index aaedd6ef632d..b24b51a0c334 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix
@@ -2,12 +2,12 @@
, pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }:
stdenv.mkDerivation rec {
- version = "3.26.0";
+ version = "3.28.0";
name = "gpaste-${version}";
src = fetchurl {
url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
- sha256 = "0xlcbm9qnw61h6xwa1c0lz5mp1ca3vjjn5wpk0ahhhl6k94mzjs7";
+ sha256 = "15zigqmhd2x58ml0rl6srgvpx8ms7a3dapphcr75563pacv46mir";
};
nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ];
diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix
index 5d2dc08e7e35..ca1fc3724fca 100644
--- a/pkgs/desktops/gnome-3/misc/gspell/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix
@@ -1,23 +1,31 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk3, enchant2, isocodes, vala, gobjectIntrospection, gnome3 }:
-stdenv.mkDerivation rec {
- name = "gspell-${version}";
- version = "1.6.1";
+let
+ pname = "gspell";
+ version = "1.8.0";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+
+ outputs = [ "out" "dev" ];
+ outputBin = "dev";
src = fetchurl {
- url = "mirror://gnome/sources/gspell/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "f4d329348775374eec18158f8dcbbacf76f85be5ce002a92d93054ece70ec4de";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "0ickabxngl567lv1jax4fasr5brq29hg04ymaay47pjfp32w4zqv";
};
+ propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig
+
+ nativeBuildInputs = [ pkgconfig vala gobjectIntrospection libxml2 ];
+ buildInputs = [ glib gtk3 isocodes ];
+
passthru = {
- updateScript = gnome3.updateScript { packageName = "gspell"; attrPath = "gnome3.gspell"; };
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
};
- propagatedBuildInputs = [ enchant ]; # required for pkgconfig
-
- nativeBuildInputs = [ pkgconfig vala gobjectIntrospection ];
- buildInputs = [ glib gtk3 isocodes ];
-
meta = with stdenv.lib; {
description = "A spell-checking library for GTK+ applications";
homepage = https://wiki.gnome.org/Projects/gspell;
diff --git a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
similarity index 72%
rename from pkgs/desktops/gnome-3/misc/libgames-support/default.nix
rename to pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
index 29fdd3176561..5712d612e9a1 100644
--- a/pkgs/desktops/gnome-3/misc/libgames-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3, libintlOrEmpty }:
let
pname = "libgnome-games-support";
- version = "1.2.3";
+ version = "1.4.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1vwad7kqy7yd6wqyr71nq0blh7m53r3lz6ya16dmh942kd0w48v1";
+ sha256 = "0mhly6yhdc4kvg8ff09a0syabd6igvcmcm577ypfsjkxv92v328x";
};
- nativeBuildInputs = [ pkgconfig intltool ];
+ nativeBuildInputs = [ pkgconfig intltool ] ++ libintlOrEmpty;
buildInputs = [ glib gtk3 libgee ];
+ NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
- attrPath = "gnome3.libgames-support";
+ attrPath = "gnome3.${pname}";
};
};
diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix
index 009416dea6c2..17fd08faf69c 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel.nix
@@ -7,14 +7,14 @@ let
inherit (stdenv.lib) optional;
p_name = "xfce4-panel";
ver_maj = "4.12";
- ver_min = "1";
+ ver_min = "2";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1s52k80911pkp65zkxw9mrnczxsd81svr0djmmcfpjd9rj08pmck";
+ sha256 = "1s8cvsrgmkmmm84g6mghpj2k4777gm22g5lrsf8pdy5qh6xql1a2";
};
patches = [ ./xfce4-panel-datadir.patch ];
diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix
index d861e5f2d557..313a2662f039 100644
--- a/pkgs/desktops/xfce/core/xfwm4.nix
+++ b/pkgs/desktops/xfce/core/xfwm4.nix
@@ -3,14 +3,14 @@
let
p_name = "xfwm4";
ver_maj = "4.12";
- ver_min = "3";
+ ver_min = "4";
in
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac";
+ sha256 = "0dpvdrd5lclkcrzmdpva38gfsgvdf3xkqfknvy96x6k4fn508x7s";
};
buildInputs =
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 34d4932b7f23..6a020e11a4be 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -73,5 +73,13 @@ in rec {
extraBuildInputs = [ graphviz ];
};
+ vala_0_40 = generic {
+ major = "0.40";
+ minor = "0";
+ sha256 = "0wcfljl55a9qvslfcc4sf76wdpwgn83n96b7fgb7r49ib35qz20m";
+ extraNativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ expat ];
+ extraBuildInputs = [ graphviz ];
+ };
+
vala = vala_0_38;
}
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 658c5aebe5cb..da271db2ff0e 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -5,31 +5,37 @@
with pythonPackages;
-stdenv.mkDerivation {
- name = "renpy-6.99.12.4";
+stdenv.mkDerivation rec {
+ name = "renpy-${version}";
+ version = "6.99.14";
- meta = {
+ meta = with stdenv.lib; {
description = "Ren'Py Visual Novel Engine";
homepage = http://renpy.org/;
- license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.linux;
- # This is an ancient version, last updated in 2014 (3d59f42ce); it fails to
- # build with the most recent pygame version, and fails to run with 1.9.1.
- broken = true;
+ license = licenses.mit;
+ platforms = platforms.linux;
};
src = fetchurl {
- url = "http://www.renpy.org/dl/6.99.12.4/renpy-6.99.12.4-source.tar.bz2";
- sha256 = "035342rr39zp7krp08z0xhcl73gqbqyilshgmljq0ynfrxxckn35";
+ url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2";
+ sha256 = "00r1l9rd9wj8zfh279n7sak894xxhxqp3rcwg41g0md8yfiysc4h";
};
+ patches = [
+ ./launcherenv.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace launcher/game/choose_directory.rpy --replace /usr/bin/python ${python.interpreter}
+ '';
+
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- python cython wrapPython
+ python cython wrapPython tkinter
SDL2 libpng ffmpeg freetype glew libGLU_combined fribidi zlib pygame_sdl2 glib
];
- pythonPath = [ pygame_sdl2 ];
+ pythonPath = [ pygame_sdl2 tkinter ];
RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [
SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib
@@ -41,7 +47,9 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/share/renpy
- cp -r renpy renpy.py $out/share/renpy
+ cp -vr * $out/share/renpy
+ rm -rf $out/share/renpy/module
+
python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module
makeWrapper ${python}/bin/python $out/bin/renpy \
diff --git a/pkgs/development/interpreters/renpy/launcherenv.patch b/pkgs/development/interpreters/renpy/launcherenv.patch
new file mode 100644
index 000000000000..85a6c6439b9c
--- /dev/null
+++ b/pkgs/development/interpreters/renpy/launcherenv.patch
@@ -0,0 +1,14 @@
+# The launcher game starts projects in a separate python process
+# with the -E flag, which prevents the nix set PYTHONPATH envvar
+# from taking effect, preventing the loading of pygame_sdl2
+--- a/launcher/game/project.rpy
++++ b/launcher/game/project.rpy
+@@ -239,7 +239,7 @@
+ raise Exception("Python interpreter not found: %r", executables)
+
+ # Put together the basic command line.
+- cmd = [ executable, "-EO", sys.argv[0] ]
++ cmd = [ executable, "-O", sys.argv[0] ]
+
+ cmd.append(self.path)
+ cmd.extend(args)
diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix
index c71dced918ac..fc79cae36f83 100644
--- a/pkgs/development/libraries/apache-activemq/default.nix
+++ b/pkgs/development/libraries/apache-activemq/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "apache-activemq-${version}";
- version = "5.13.4";
+ version = "5.14.5";
src = fetchurl {
- sha256 = "0sp806bmv9vs19zbzlv71ag09p1jbl2wn2wpxfwa20mndri8lsmz";
+ sha256 = "0vm8z7rxb9n10xg5xjahy357704fw3q477hmpb83kd1zrc633g54";
url = "mirror://apache/activemq/${version}/${name}-bin.tar.gz";
};
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 1ccfa85591f4..2499a424c85c 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -4,16 +4,16 @@
, libuuid, json-glib, meson, gperf, ninja
}:
stdenv.mkDerivation rec {
- name = "appstream-glib-0.7.6";
+ name = "appstream-glib-0.7.7";
- outputs = [ "out" "dev" "man" ];
+ outputs = [ "out" "dev" "man" "installedTests" ];
outputBin = "dev";
src = fetchFromGitHub {
owner = "hughsie";
repo = "appstream-glib";
rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
- sha256 = "1nzm6w9n7fb2m06w88gwszaqf74bnip87ay0ca59wajq6y4mpfgv";
+ sha256 = "127m5ds355i1vfvmn9nd4zqqnqm16jpqcn4p2p2pvn7i4wqxra40";
};
nativeBuildInputs = [
@@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
"-Ddep11=false"
];
+ postInstall = ''
+ moveToOutput "share/installed-tests" "$installedTests"
+ '';
+
meta = with stdenv.lib; {
description = "Objects and helper methods to read and write AppStream metadata";
homepage = https://people.freedesktop.org/~hughsient/appstream-glib/;
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 9b1865d77f51..6f10c9c2f5a2 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib, libintlOrEmpty, gobjectIntrospection, gnome3 }:
let
pname = "atk";
@@ -12,19 +12,27 @@ stdenv.mkDerivation rec {
sha256 = "1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd";
};
- enableParallelBuilding = true;
+ patches = [
+ # darwin linker arguments https://bugzilla.gnome.org/show_bug.cgi?id=794326
+ (fetchurl {
+ url = https://bugzilla.gnome.org/attachment.cgi?id=369680;
+ sha256 = "11v8fhpsbapa04ifb2268cga398vfk1nq8i628441632zjz1diwg";
+ })
+ ];
outputs = [ "out" "dev" ];
buildInputs = libintlOrEmpty;
- nativeBuildInputs = [ pkgconfig perl gobjectIntrospection ];
+ nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
propagatedBuildInputs = [
# Required by atk.pc
glib
];
+ NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
doCheck = true;
passthru = {
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
new file mode 100644
index 000000000000..458b23c33e94
--- /dev/null
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }:
+
+let
+ version = "2.2.3";
+ pname = "enchant";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+
+ outputs = [ "out" "dev" ];
+
+ src = fetchurl {
+ url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${name}.tar.gz";
+ sha256 = "0v87p1ls0gym95qirijpclk650sjbkcjjl6ssk059zswcwaykn5b";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib hunspell ];
+ propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file
+
+ meta = with stdenv.lib; {
+ description = "Generic spell checking library";
+ homepage = https://abiword.github.io/enchant/;
+ license = licenses.lgpl21Plus; # with extra provision for non-free checkers
+ maintainers = with maintainers; [ jtojnar ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index ebb581bdbccd..020d04542864 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst-plugins-base
-, gst-python, gupnp-igd
+, gst-python, gupnp-igd, gobjectIntrospection
, gst-plugins-good, gst-plugins-bad, gst-libav
}:
@@ -7,21 +7,25 @@ let
inherit (pythonPackages) python pygobject2;
in stdenv.mkDerivation rec {
name = "farstream-0.2.8";
+
+ outputs = [ "out" "dev" ];
+
src = fetchurl {
- url = "http://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz";
+ url = "https://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz";
sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb";
};
buildInputs = [ libnice python pygobject2 gupnp-igd libnice ];
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
- propagatedBuildInputs = [ gstreamer gst-plugins-base gst-python
+ propagatedBuildInputs = [
+ gstreamer gst-plugins-base gst-python
gst-plugins-good gst-plugins-bad gst-libav
- ];
+ ];
meta = {
- homepage = http://www.freedesktop.org/wiki/Software/Farstream;
+ homepage = https://www.freedesktop.org/wiki/Software/Farstream;
description = "Audio/Video Communications Framework formely known as farsight";
maintainers = [ ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index a1a9b10fca63..ace1d687a91b 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,40 +1,46 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3
-, jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
+, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
+, jasper, shared-mime-info, libintlOrEmpty, gobjectIntrospection, doCheck ? false, makeWrapper }:
let
pname = "gdk-pixbuf";
- version = "2.36.7";
- # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
- # which apparently requires access to shared-mime-info files during runtime.
+ version = "2.36.11";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8";
+ sha256 = "1wz2vpciwdpdv612s8kbww08q80hgcs5dxrfsxp1a4q44n3snqmf";
};
- outputs = [ "out" "dev" "devdoc" ];
+ outputs = [ "out" "dev" "man" "devdoc" ];
setupHook = ./setup-hook.sh;
enableParallelBuilding = true;
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
- buildInputs = [ libX11 gobjectIntrospection ] ++ libintlOrEmpty;
+ buildInputs = [ libX11 ] ++ stdenv.lib.optional (!stdenv.isDarwin) shared-mime-info ++ libintlOrEmpty;
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [
+ meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
+ gtk-doc gobjectIntrospection makeWrapper
+ ];
propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
- configureFlags = "--with-libjasper --with-x11"
- + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
- ;
+ mesonFlags = [
+ # with_ & enable_will be removed in the future
+ "-Dwith_docs=true"
+ "-Denable_jasper=true"
+ "-Dx11=true" # will be added in the future (default atm)
+ "-Dwith_gir=${if gobjectIntrospection != null then "true" else "false"}"
+ ];
- # on darwin, tests don't link
- preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
- substituteInPlace Makefile --replace "docs tests" "docs"
+ postPatch = ''
+ chmod +x build-aux/* # patchShebangs only applies to executables
+ patchShebangs build-aux
'';
postInstall =
@@ -42,6 +48,17 @@ stdenv.mkDerivation rec {
''
moveToOutput "bin" "$dev"
moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
+
+ # We require runtime access to shared-mime-info
+ ${stdenv.lib.optionalString (!stdenv.isDarwin) ''
+ for f in $dev/bin/*; do
+ wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+ done
+ wrapProgram $out/bin/gdk-pixbuf-thumbnailer --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+ ''}
+
+ # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
+ $dev/bin/gdk-pixbuf-query-loaders --update-cache
'';
# The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix
index 66aa3b4a2188..b70163789dec 100644
--- a/pkgs/development/libraries/geoclue/2.0.nix
+++ b/pkgs/development/libraries/geoclue/2.0.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json-glib, libsoup, geoip
-, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook
+, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection
}:
with stdenv.lib;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [
- pkgconfig intltool wrapGAppsHook
+ pkgconfig intltool wrapGAppsHook gobjectIntrospection
];
buildInputs = libintlOrEmpty ++
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace "-Werror" ""
'';
- configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ] ++
+ configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--enable-introspection" ] ++
optionals stdenv.isDarwin [
"--disable-silent-rules"
"--disable-3g-source"
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Geolocation framework and some data providers";
+ homepage = https://freedesktop.org/wiki/Software/GeoClue/;
maintainers = with maintainers; [ raskin garbas ];
platforms = with platforms; linux ++ darwin;
license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 12a8469868bd..2e0e8cbb910e 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -1,33 +1,37 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy, gnome3
+{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, glib, gettext, gnutls, p11-kit, libproxy, gnome3
, gsettings-desktop-schemas }:
let
pname = "glib-networking";
- version = "2.54.1";
+ version = "2.56.0";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "0bq16m9nh3gcz9x2fvygr0iwxd2pxcbrm3lj3kihsnh1afv8g9za";
+ sha256 = "14vw8xwajd7m31bpavg2psk693plhjikwpk8bzf3jl1fmsy11za7";
};
outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
- configureFlags = if stdenv.isDarwin then "--without-ca-certificates"
- else "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
+ patches = [
+ # Use GNUTLS system trust for certificates
+ (fetchpatch {
+ url = https://git.gnome.org/browse/glib-networking/patch/?id=f1c8feee014007cc913b71357acb609f8d1200df;
+ sha256 = "1rbxqsrcb5if3xs2d18pqzd9xnjysdj715ijc41n5w326fsawg7i";
+ })
+ ];
- LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+ PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "${placeholder "out"}/lib/gio/modules";
- preBuild = ''
- sed -e "s@${glib.out}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
+ postPatch = ''
+ chmod +x meson_post_install.py # patchShebangs requires executable file
+ patchShebangs meson_post_install.py
'';
- nativeBuildInputs = [ pkgconfig intltool ];
- propagatedBuildInputs = [ glib gnutls libproxy gsettings-desktop-schemas ];
-
- NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+ nativeBuildInputs = [ meson ninja pkgconfig gettext ];
+ propagatedBuildInputs = [ glib gnutls p11-kit libproxy gsettings-desktop-schemas ];
doCheck = false; # tests need to access the certificates (among other things)
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index e5163e933e13..2c070ff3fa8c 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -42,7 +42,7 @@ let
ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
'';
- version = "2.54.3";
+ version = "2.56.0";
in
stdenv.mkDerivation rec {
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/glib/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8";
+ sha256 = "1iqgi90fmpl3l23jm2iv44qp7hqsxvnv7978s18933bvx4bnxvzc";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch
diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 75d9281dfb0e..6a112aedcc05 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -1,8 +1,6 @@
-diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
-index 89ec193..54f1d2e 100755
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
-@@ -94,6 +94,39 @@ def get_windows_option_group(parser):
+@@ -100,6 +100,39 @@
return group
@@ -42,7 +40,7 @@ index 89ec193..54f1d2e 100755
def _get_option_parser():
parser = optparse.OptionParser('%prog [options] sources')
parser.add_option('', "--quiet",
-@@ -200,6 +233,10 @@ match the namespace prefix.""")
+@@ -209,6 +242,10 @@
parser.add_option("", "--filelist",
action="store", dest="filelist", default=[],
help="file containing headers and sources to be scanned")
@@ -53,57 +51,50 @@ index 89ec193..54f1d2e 100755
group = get_preprocessor_option_group(parser)
parser.add_option_group(group)
-diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index 838d343..ca7fc0d 100644
--- a/giscanner/shlibs.py
+++ b/giscanner/shlibs.py
-@@ -53,10 +53,27 @@ def _resolve_libtool(options, binary, libraries):
- # Match absolute paths on OS X to conform to how libraries are usually
- # referenced on OS X systems.
- def _ldd_library_pattern(library_name):
-+ nix_store_dir = re.escape('@nixStoreDir@'.rstrip('/'))
- pattern = "(? 0:
-+ match = os.path.join(options.fallback_libpath, match)
-+ shlibs.append(match)
++ shlibs.append(os.path.join(options.fallback_libpath, m.group(1)))
break
if len(patterns) > 0:
-diff --git a/giscanner/utils.py b/giscanner/utils.py
-index 660081e..c9c767a 100644
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
-@@ -109,17 +109,11 @@ def extract_libtool_shlib(la_file):
+@@ -113,17 +113,11 @@
if dlname is None:
return None
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 825d66699071..3c884bb1224a 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -9,7 +9,7 @@
let
pname = "gobject-introspection";
- version = "1.54.1";
+ version = "1.56.0";
in
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "0zl7pfkzkm07733391b4f3cwjbnvb1nwvpmajf5bajh6bxgfv3dq";
+ sha256 = "1y50pbn5qqbcv2h9rkz96wvv5jls2gma9bkqjq6wapmaszx5jw0d";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 189af86708ef..c96139ddb576 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl
+{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info
, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection
, xorg, epoxy, json-glib, libxkbcommon, gmp
, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols
@@ -11,19 +11,21 @@ assert cupsSupport -> cups != null;
with stdenv.lib;
+let
+ version = "3.22.29";
+in
stdenv.mkDerivation rec {
name = "gtk+3-${version}";
- version = "3.22.28";
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${gnome3.versionBranch version}/gtk+-${version}.tar.xz";
- sha256 = "d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f";
+ sha256 = "1y5vzdbgww9l7xcrg13azff2rs94kggkywmpcsh39h7w76wn8zd0";
};
outputs = [ "out" "dev" ];
outputBin = "dev";
- nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
+ nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl makeWrapper ];
patches = [
./3.0-immodules.cache.patch
@@ -70,6 +72,11 @@ stdenv.mkDerivation rec {
moveToOutput bin/gtk-update-icon-cache "$out"
# Launcher
moveToOutput bin/gtk-launch "$out"
+
+ # TODO: patch glib directly
+ for f in $dev/bin/gtk-encode-symbolic-svg; do
+ wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+ done
'';
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch b/pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch
rename to pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch
diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
similarity index 83%
rename from pkgs/desktops/gnome-3/core/gtksourceview/default.nix
rename to pkgs/development/libraries/gtksourceview/3.x.nix
index a870b16f9252..608c6e7eacd2 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
+{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40
, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }:
let
@@ -12,10 +12,6 @@ in stdenv.mkDerivation rec {
sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gtksourceview"; attrPath = "gnome3.gtksourceview"; };
- };
-
propagatedBuildInputs = [
# Required by gtksourceview-3.0.pc
gtk3
@@ -25,7 +21,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection ]
+ nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection vala_0_40 ]
++ stdenv.lib.optionals doCheck checkInputs;
buildInputs = [ atk cairo glib pango libxml2 ];
@@ -34,7 +30,7 @@ in stdenv.mkDerivation rec {
substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
'';
- patches = [ ./nix_share_path.patch ];
+ patches = [ ./3.x-nix_share_path.patch ];
enableParallelBuilding = true;
@@ -46,6 +42,13 @@ in stdenv.mkDerivation rec {
make check
'';
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gtksourceview";
+ attrPath = "gnome3.gtksourceview";
+ };
+ };
+
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GtkSourceView;
platforms = with platforms; linux ++ darwin;
diff --git a/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch b/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch
new file mode 100644
index 000000000000..a35d9a88d0df
--- /dev/null
+++ b/pkgs/development/libraries/gtksourceview/4.x-nix_share_path.patch
@@ -0,0 +1,11 @@
+--- a/gtksourceview/gtksourceutils.c
++++ b/gtksourceview/gtksourceutils.c
+@@ -232,6 +232,8 @@
+ NULL));
+ }
+
++ g_ptr_array_add (dirs, g_build_filename (DATADIR, GSV_DATA_SUBDIR, basename, NULL));
++
+ g_ptr_array_add (dirs, NULL);
+
+ return (gchar **) g_ptr_array_free (dirs, FALSE);
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
new file mode 100644
index 000000000000..2501e0253b39
--- /dev/null
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40
+, libxml2, perl, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }:
+
+let
+ checkInputs = [ xvfb_run dbus ];
+in stdenv.mkDerivation rec {
+ name = "gtksourceview-${version}";
+ version = "4.0.0";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "0amkspjsvxr3rjznmnwjwsgw030hayf6bw49ya4nligslwl7lp3f";
+ };
+
+ propagatedBuildInputs = [
+ # Required by gtksourceview-4.0.pc
+ gtk3
+ # Used by gtk_source_language_manager_guess_language
+ shared-mime-info
+ ];
+
+ outputs = [ "out" "dev" ];
+
+ nativeBuildInputs = [ pkgconfig gettext perl gobjectIntrospection vala_0_40 ]
+ ++ stdenv.lib.optionals doCheck checkInputs;
+
+ buildInputs = [ atk cairo glib pango libxml2 ];
+
+ patches = [ ./4.x-nix_share_path.patch ];
+
+ enableParallelBuilding = true;
+
+ doCheck = stdenv.isLinux;
+ checkPhase = ''
+ export NO_AT_BRIDGE=1
+ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+ make check
+ '';
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "gtksourceview";
+ attrPath = "gnome3.gtksourceview";
+ };
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://wiki.gnome.org/Projects/GtkSourceView;
+ platforms = with platforms; linux ++ darwin;
+ license = licenses.lgpl21;
+ maintainers = gnome3.maintainers;
+ };
+}
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index 2e6ecd7b5204..90bc4fc7f820 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -1,18 +1,22 @@
-{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool}:
+{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobjectIntrospection}:
stdenv.mkDerivation rec {
name = "gtkspell-${version}";
version = "3.0.9";
+ outputs = [ "out" "dev" ];
+
src = fetchurl {
url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.xz";
sha256 = "09jdicmpipmj4v84gnkqwbmj4lh8v0i6pn967rb9jx4zg2ia9x54";
};
- nativeBuildInputs = [ pkgconfig intltool ];
+ nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
buildInputs = [ aspell gtk3 enchant isocodes ];
propagatedBuildInputs = [ enchant ];
+ configureFlags = [ "--enable-introspection" ];
+
meta = with stdenv.lib; {
homepage = http://gtkspell.sourceforge.net/;
description = "Word-processor-style highlighting GtkTextView widget";
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 964344d68922..b0b2d21e2bd4 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -1,37 +1,58 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libtool, gnome3
-, glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit
-, libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma
+{ stdenv, meson, ninja, fetchurl, pkgconfig, gettext, gnome3
+, glib, libgudev, udisks2, libgcrypt, libcap, polkit
+, libgphoto2, avahi, libarchive, fuse, libcdio
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
-, gnomeSupport ? false, gnome, makeWrapper }:
+, gnomeSupport ? false, gnome, makeWrapper
+, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
+, libsecret, libgdata
+}:
let
pname = "gvfs";
- version = "1.34.2.1";
+ version = "1.36.0";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1smmzix8wqrmj10pqy3xhrlv7xza6rpmg2v052gwk9ysxdric9fm";
+ sha256 = "1fsn6aa9a68cfbna9s00l1ry4ym1fr7ii2f45hzj2fipxfpqihwy";
};
+ postPatch = ''
+ chmod +x meson_post_install.py # patchShebangs requires executable file
+ patchShebangs meson_post_install.py
+ '';
+
nativeBuildInputs = [
- pkgconfig intltool libtool file makeWrapper
+ meson ninja
+ pkgconfig gettext makeWrapper
libxml2 libxslt docbook_xsl docbook_xml_dtd_42
];
buildInputs =
- [ glib dbus udev libgudev udisks2 libgcrypt
- libgphoto2 avahi libarchive fuse libcdio lzma bzip2
- samba libmtp libcap polkit
+ [ glib libgudev udisks2 libgcrypt
+ libgphoto2 avahi libarchive fuse libcdio
+ samba libmtp libcap polkit libimobiledevice libbluray
+ libcdio-paranoia libnfs openssh
# ToDo: a ligther version of libsoup to have FTP/HTTP support?
] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
- libsoup libgnome-keyring gconf gcr
- # ToDo: not working and probably useless until gnome3 from x-updates
+ libsoup gcr
+ gnome-online-accounts libsecret libgdata
]);
- configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr";
+ mesonFlags = [
+ "-Dgio_module_dir=${placeholder "out"}/lib/gio/modules"
+ "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
+ "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
+ "-Dtmpfilesdir=no"
+ ] ++ stdenv.lib.optionals (!gnomeSupport) [
+ "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
+ "-Dgoogle=false"
+ ] ++ stdenv.lib.optionals (samba == null) [
+ # Xfce don't want samba
+ "-Dsmb=false"
+ ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix
index 6f7a79f9eeac..fc857bf1ad46 100644
--- a/pkgs/development/libraries/libcloudproviders/default.nix
+++ b/pkgs/development/libraries/libcloudproviders/default.nix
@@ -13,6 +13,10 @@ in stdenv.mkDerivation rec {
sha256 = "1c3vfg8wlsv0fmi1lm9qhsqdvp4k33yvwn6j680rh49laayf7k3g";
};
+ patches = [
+ ./fix-include.patch
+ ];
+
outputs = [ "out" "dev" "devdoc" ];
mesonFlags = [
diff --git a/pkgs/development/libraries/libcloudproviders/fix-include.patch b/pkgs/development/libraries/libcloudproviders/fix-include.patch
new file mode 100644
index 000000000000..d6f626436a62
--- /dev/null
+++ b/pkgs/development/libraries/libcloudproviders/fix-include.patch
@@ -0,0 +1,11 @@
+--- a/meson.build
++++ b/meson.build
+@@ -46,7 +46,7 @@
+ bindir = get_option ('bindir')
+ datadir = get_option ('datadir')
+ servicedir = join_paths (datadir, 'dbus-1', 'services')
+-incdir = join_paths (prefix, 'include', 'cloudproviders')
++incdir = join_paths (prefix, get_option('includedir'), 'cloudproviders')
+
+ gnome = import('gnome')
+
diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
new file mode 100644
index 000000000000..50f03f3ac7ac
--- /dev/null
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, pkgs, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2
+, gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }:
+
+let
+ version = "3.28.0";
+ pname = "libdazzle";
+in
+stdenv.mkDerivation {
+ name = "${pname}-${version}";
+
+ outputs = [ "out" "dev" "devdoc" ];
+ outputBin = "dev";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0zq37i7gnmnc7qfngzhj71nqhf2wxl4m247s2ym9ykakxbi6zajp";
+ };
+
+ nativeBuildInputs = [ ninja meson pkgconfig vala gobjectIntrospection libxml2 gtk-doc docbook_xsl dbus xvfb_run ];
+ buildInputs = [ glib gtk3 ];
+
+ mesonFlags = [
+ "-Denable_gtk_doc=true"
+ ];
+
+ doCheck = true;
+
+ checkPhase = ''
+ export NO_AT_BRIDGE=1
+ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+ meson test --print-errorlogs
+ '';
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
+ meta = with stdenv.lib; {
+ description = "A library to delight your users with fancy features";
+ longDescription = ''
+ The libdazzle library is a companion library to GObject and Gtk+. It
+ provides various features that we wish were in the underlying library but
+ cannot for various reasons. In most cases, they are wildly out of scope
+ for those libraries. In other cases, our design isn't quite generic
+ enough to work for everyone.
+ '';
+ homepage = https://wiki.gnome.org/Apps/Builder;
+ license = licenses.gpl3Plus;
+ maintainers = gnome3.maintainers;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/libguestfs/appliance.nix b/pkgs/development/libraries/libguestfs/appliance.nix
new file mode 100644
index 000000000000..d47b0902818d
--- /dev/null
+++ b/pkgs/development/libraries/libguestfs/appliance.nix
@@ -0,0 +1,7 @@
+{ fetchzip }:
+
+fetchzip {
+ name = "libguestfs-appliance-1.38.0";
+ url = "http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz";
+ sha256 = "15rxwj5qjflizxk7slpbrj9lcwkd2lgm52f5yv101qba4yyn3g76";
+}
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index d7d0fbe8094d..258157c11789 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -3,19 +3,16 @@
, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor
, getopt, perlPackages, ocamlPackages
+, appliance ? null
, javaSupport ? false, jdk ? null }:
+assert appliance == null || stdenv.lib.isDerivation appliance;
assert javaSupport -> jdk != null;
stdenv.mkDerivation rec {
name = "libguestfs-${version}";
version = "1.38.0";
- appliance = fetchurl {
- url = "http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz";
- sha256 = "05481qxgidakga871yb5rgpyci2jaxmplmkh6y79anfh5m19nzhy";
- };
-
src = fetchurl {
url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz";
sha256 = "0cgapiad3x5ggwm097mq62hng3bv91p5gmrikrb6adfaasr1l6m3";
@@ -54,14 +51,31 @@ stdenv.mkDerivation rec {
postInstall = ''
for bin in $out/bin/*; do
wrapProgram "$bin" \
- --prefix "PATH" : "$out/bin:${hivex}/bin:${qemu}/bin" \
- --prefix "PERL5LIB" : "$PERL5LIB:$out/lib/perl5/site_perl"
+ --prefix PATH : "$out/bin:${hivex}/bin:${qemu}/bin" \
+ --prefix PERL5LIB : "$out/lib/perl5/site_perl"
done
'';
- postFixup = ''
- mkdir -p "$out/lib/guestfs"
- tar -Jxvf "$appliance" --strip 1 -C "$out/lib/guestfs"
+ postFixup = stdenv.lib.optionalString (appliance != null) ''
+ mkdir -p $out/{lib,lib64}
+ ln -s ${appliance} $out/lib64/guestfs
+ ln -s ${appliance} $out/lib/guestfs
+ '';
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ export HOME=$(mktemp -d) # avoid access to /homeless-shelter/.guestfish
+
+ ${qemu}/bin/qemu-img create -f qcow2 disk1.img 10G
+
+ $out/bin/guestfish <<'EOF'
+ add-drive disk1.img
+ run
+ list-filesystems
+ part-disk /dev/sda mbr
+ mkfs ext2 /dev/sda1
+ list-filesystems
+ EOF
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index c674b155fd10..6af3f5225d4d 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, meson, ninja, valadoc
+{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf
, gnome3, glib, json-glib, libarchive, libsoup, gobjectIntrospection }:
let
pname = "libhttpseverywhere";
- version = "0.8.0";
+ version = "0.8.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "0igq7g84kfczips3ywhyprxc8v67yrg3kj8lbgny4yyll67kksj3";
+ sha256 = "0vcnimlfcscyvjbh845xbnjb9qc8x0mliaqz2gczxxpakxrbl3gh";
};
- nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig valadoc ];
+ nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig ];
buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ];
mesonFlags = [ "-Denable_valadoc=true" ];
@@ -21,6 +21,8 @@ in stdenv.mkDerivation rec {
checkPhase = "(cd test && ./httpseverywhere_test)";
+ FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
+
outputs = [ "out" "devdoc" ];
passthru = {
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 31e9e06dacb5..4bb4db104382 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -1,9 +1,7 @@
{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
, bzip2, libcroco, libintlOrEmpty, darwin, rust, gnome3
, withGTK ? false, gtk3 ? null
-, gobjectIntrospection ? null, enableIntrospection ? false }:
-
-# no introspection by default, it's too big
+, vala, gobjectIntrospection }:
let
pname = "librsvg";
@@ -21,17 +19,16 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ]
- ++ stdenv.lib.optional enableIntrospection gobjectIntrospection;
+ buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ];
propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
- nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo ]
+ nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo vala gobjectIntrospection ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
ApplicationServices
]);
- configureFlags = [ "--enable-introspection=auto" ]
+ configureFlags = [ "--enable-introspection" "--enable-vala" ]
++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
NIX_CFLAGS_COMPILE
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 46b9273094a7..dad245d0791e 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, fetchpatch, glib, libxml2, pkgconfig, gnome3
-, gnomeSupport ? true, libgnome-keyring3, sqlite, glib-networking, gobjectIntrospection
-, valaSupport ? true, vala_0_38
+{ stdenv, fetchurl, glib, libxml2, pkgconfig, gnome3
+, gnomeSupport ? true, sqlite, glib-networking, gobjectIntrospection
+, valaSupport ? true, vala_0_40
, libintlOrEmpty
-, intltool, python }:
+, intltool, python3 }:
let
pname = "libsoup";
- version = "2.60.2";
+ version = "2.62.0";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "7263cfe18872e2e652c196f5667e514616d9c97c861dfca82a65a55f45f0da01";
+ sha256 = "1b5aff1igbsx1h4v3wmkffvzgiy8rscibqka7fmjf2lxs7l7lz5b";
};
prePatch = ''
@@ -22,27 +22,19 @@ stdenv.mkDerivation rec {
substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
'';
- patches = [
- # remove for >= 2.60.3
- (fetchpatch {
- name = "buffer-overflow.patch"; # https://bugzilla.gnome.org/show_bug.cgi?id=788037
- url = "https://git.gnome.org/browse/libsoup/patch/?id=b79689833ba";
- sha256 = "1azbk540mbm4c6ip54ixbg9d6w7nkls9y81fzm3csq9a5786r3d3";
- })
- ];
-
outputs = [ "out" "dev" ];
- buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]
- ++ stdenv.lib.optionals valaSupport [ vala_0_38 ];
- nativeBuildInputs = [ pkgconfig ];
- propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
- ++ stdenv.lib.optionals gnomeSupport [ libgnome-keyring3 ];
+ buildInputs = libintlOrEmpty ++ [ python3 sqlite ];
+ nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]
+ ++ stdenv.lib.optionals valaSupport [ vala_0_40 ];
+ propagatedBuildInputs = [ glib libxml2 ];
# glib-networking is a runtime dependency, not a compile-time dependency
- configureFlags = "--disable-tls-check"
- + " --enable-vala=${if valaSupport then "yes" else "no"}"
- + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome";
+ configureFlags = [
+ "--disable-tls-check"
+ "--enable-vala=${if valaSupport then "yes" else "no"}"
+ "--with-gnome=${if gnomeSupport then "yes" else "no"}"
+ ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index 83b2983d9c4b..0dbe30251bdd 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl
, nettle, libgcrypt, pythonPackages, gobjectIntrospection, libcap_ng, numactl
-, xen, libapparmor
+, xen, libapparmor, vala
}:
let
@@ -8,12 +8,14 @@ let
in stdenv.mkDerivation rec {
name = "libvirt-glib-1.0.0";
+ outputs = [ "out" "dev" ];
+
src = fetchurl {
url = "http://libvirt.org/sources/glib/${name}.tar.gz";
sha256 = "0iwa5sdbii52pjpdm5j37f67sdmf0kpcky4liwhy1nf43k85i4fa";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig vala ];
buildInputs = [
libvirt glib libxml2 intltool libtool yajl nettle libgcrypt
python pygobject2 gobjectIntrospection libcap_ng numactl libapparmor
diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
index 6a835157d96c..f2d05d14d693 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -1,28 +1,38 @@
-{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool}:
+{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobjectIntrospection, gnome3}:
-stdenv.mkDerivation rec{
- name = "libwnck-${version}";
- version = "${majorVer}.${minorVer}.${patchVer}";
-
- majorVer = "3";
- minorVer = "24";
- patchVer = "1";
+let
+ pname = "libwnck";
+ version = "3.24.1";
+in stdenv.mkDerivation rec{
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/libwnck/${majorVer}.${minorVer}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "010zk9zvydggxqnxfml3scml5yxmpjy90irpqcayrzw26lldr9mg";
};
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
- patches = [ ./install_introspection_to_prefix.patch ];
+ configureFlags = [ "--enable-introspection" ];
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool ];
+ nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
propagatedBuildInputs = [ libX11 gtk3 ];
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
+ PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
+ };
+ };
+
+ meta = with stdenv.lib; {
+ description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)";
+ license = licenses.lgpl21Plus;
+ platforms = platforms.linux;
+ maintainers = [];
};
}
diff --git a/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch b/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch
deleted file mode 100644
index 1bcf4a12ea31..000000000000
--- a/pkgs/development/libraries/libwnck/install_introspection_to_prefix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libwnck-3.4.7/configure 2013-08-20 14:46:14.000000000 +0000
-+++ libwnck-3.4.7-fix/configure 2014-01-05 17:18:56.665427787 +0000
-@@ -16150,7 +16150,7 @@ $as_echo "$found_introspection" >&6; }
- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-+ INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
-- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix
index 379848b0cb08..6ec288f985b0 100644
--- a/pkgs/development/libraries/mysocketw/default.nix
+++ b/pkgs/development/libraries/mysocketw/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl}:
+{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
name = "mysocketw-031026";
@@ -9,11 +9,14 @@ stdenv.mkDerivation rec {
patches = [ ./gcc.patch ];
- configurePhase = ''
- sed -i s,/usr/local,$out, Makefile.conf
+ buildInputs = [ openssl ];
+
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace src/Makefile \
+ --replace -Wl,-soname, -Wl,-install_name,$out/lib/
'';
- buildInputs = [ openssl ];
+ makeFlags = [ "PREFIX=$(out)" "CXX=c++" ];
meta = {
description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";
diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index 696df48bfbc9..8446a91cceca 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -9,11 +9,11 @@ let
mpiSupport = hdf5.mpiSupport;
mpi = hdf5.mpi;
in stdenv.mkDerivation rec {
- name = "netcdf-4.6.0";
+ name = "netcdf-4.6.1";
src = fetchurl {
url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz";
- sha256 = "099qmdjj059wkj5za13zqnz0lcziqkcvyfdf894j4n6qq4c5iw2b";
+ sha256 = "0hi61cdihwwvz5jz1l7yq712j7ca1cj4bhr8x0x7c2vlb1s9biw9";
};
nativeBuildInputs = [ m4 ];
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 05ddde9ddef7..a626abc6577b 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -11,6 +11,8 @@ let
in stdenv.mkDerivation rec {
name = "spice-gtk-0.34";
+ outputs = [ "out" "dev" ];
+
src = fetchurl {
url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2";
sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9";
@@ -34,6 +36,7 @@ in stdenv.mkDerivation rec {
configureFlags = [
"--with-gtk3"
+ "--enable-vala"
];
# usb redirection needs spice-client-glib-usb-acl-helper to run setuid root
diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix
index 7d59866d0431..ccd243e1f735 100644
--- a/pkgs/development/libraries/unixODBC/default.nix
+++ b/pkgs/development/libraries/unixODBC/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "unixODBC-${version}";
- version = "2.3.5";
+ version = "2.3.6";
src = fetchurl {
url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz";
- sha256 = "0ns93daph4wmk92d7m2w48x0yki4m1yznxnn97p1ldn6bkh742bn";
+ sha256 = "0sads5b8cmmj526gyjba7ccknl1vbhkslfqshv1yqln08zv3gdl8";
};
configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ];
diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.20.nix
similarity index 54%
rename from pkgs/development/libraries/webkitgtk/2.18.nix
rename to pkgs/development/libraries/webkitgtk/2.20.nix
index 9dec5a4c953d..8b44f11ee930 100644
--- a/pkgs/development/libraries/webkitgtk/2.18.nix
+++ b/pkgs/development/libraries/webkitgtk/2.20.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
-, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls
-, gtk3, wayland, libwebp, enchant, xorg, libxkbcommon, epoxy, at-spi2-core
+{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake, ninja
+, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt
+, gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit
, libidn, libedit, readline, libGLU_combined, libintlOrEmpty
, enableGeoLocation ? true, geoclue2, sqlite
, enableGtk2Plugins ? false, gtk2 ? null
-, gst-plugins-base, gst-plugins-bad
+, gst-plugins-base, gst-plugins-bad, woff2
}:
assert enableGeoLocation -> geoclue2 != null;
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "webkitgtk-${version}";
- version = "2.18.6";
+ version = "2.20.0";
meta = {
description = "Web content rendering engine, GTK+ port";
@@ -26,48 +26,29 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ ];
};
- postConfigure = optionalString stdenv.isDarwin ''
- substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \
- --replace "../../lib/libWTFGTK.a" ""
- substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
- --replace "../../lib/libbmalloc.a" ""
- sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \
- Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \
- Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \
- Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \
- Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \
- Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \
- Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \
- Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt
- substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
- --replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a"
- '';
-
src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz";
- sha256 = "0g5cpdijjv5hlrbi4i4dh97yrh5apnyvm90wpr9f84hgyk12r4ck";
+ sha256 = "0g0an3pc2yz13gzpaysfgch2yp510gw1qcpk0xr8m6mx43vl1xjp";
};
- # see if we can clean this up....
-
- patches = [ ./finding-harfbuzz-icu.patch ]
- ++ optionals stdenv.isDarwin [
- ./PR-152650-2.patch
- ./PR-153138.patch
- ./PR-157554.patch
- ./PR-157574.patch
+ patches = optionals stdenv.isDarwin [
+ ## TODO add necessary patches for Darwin
];
+ postPatch = ''
+ patchShebangs .
+ '';
+
cmakeFlags = [
"-DPORT=GTK"
"-DUSE_LIBHYPHEN=0"
+ "-DENABLE_INTROSPECTION=ON"
]
++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
++ optional stdenv.isLinux "-DENABLE_GLES2=ON"
++ optionals stdenv.isDarwin [
"-DUSE_SYSTEM_MALLOC=ON"
"-DUSE_ACCELERATE=0"
- "-DENABLE_INTROSPECTION=ON"
"-DENABLE_MINIBROWSER=OFF"
"-DENABLE_VIDEO=ON"
"-DENABLE_QUARTZ_TARGET=ON"
@@ -82,12 +63,12 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl";
nativeBuildInputs = [
- cmake perl python2 ruby bison gperf
+ cmake ninja perl python2 ruby bison gperf
pkgconfig gettext gobjectIntrospection
];
buildInputs = libintlOrEmpty ++ [
- libwebp enchant libnotify gnutls pcre nettle libidn
+ libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2
libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit
sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core
] ++ optional enableGeoLocation geoclue2
@@ -100,7 +81,5 @@ stdenv.mkDerivation rec {
libsoup gtk3
];
- enableParallelBuilding = true;
-
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch b/pkgs/development/libraries/webkitgtk/PR-152650-2.patch
deleted file mode 100644
index f87b8ee73e23..000000000000
--- a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 4607ea0a569b3c527ae8dce341ab55eb0d69d8f7 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia
-Date: Tue, 8 Mar 2016 17:26:23 -0800
-Subject: [PATCH 2/2] [GTK][Mac] Enable support for gtk-doc on Mac
-
-https://bugs.webkit.org/show_bug.cgi?id=152650
-
-Signed-off-by: Jeremy Huddleston Sequoia
----
- ChangeLog | 10 ++++++++++
- Source/PlatformGTK.cmake | 2 +-
- Source/cmake/OptionsGTK.cmake | 5 -----
- 3 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
-index af4d2e3..0b11b56 100644
---- a/Source/PlatformGTK.cmake
-+++ b/Source/PlatformGTK.cmake
-@@ -34,7 +34,7 @@ endmacro()
- add_gtkdoc_generator("docs-build.stamp" "")
- if (ENABLE_GTKDOC)
- add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
--elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE)
-+elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING)
- add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
-
- # Add a default build step which check that documentation does not have any warnings
-diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index 6b01f1a..b443d10 100644
---- a/Source/cmake/OptionsGTK.cmake
-+++ b/Source/cmake/OptionsGTK.cmake
-@@ -424,11 +424,6 @@ if (CMAKE_CROSSCOMPILING)
- set(ENABLE_INTROSPECTION OFF)
- endif ()
-
--# Override the cached variable, gtk-doc does not really work when building on Mac.
--if (APPLE)
-- set(ENABLE_GTKDOC OFF)
--endif ()
--
- set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
- set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
- set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
-diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
-index 4c8237b..a628ae0 100644
---- a/Tools/gtk/gtkdoc.py
-+++ b/Tools/gtk/gtkdoc.py
-@@ -322,6 +322,11 @@ class GTKDoc(object):
- env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
- else:
- env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
-+ current_dyld_library_path = env.get('DYLD_LIBRARY_PATH')
-+ if current_ld_library_path:
-+ env['RUN'] = 'DYLD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_dyld_library_path)
-+ else:
-+ env['RUN'] = 'DYLD_LIBRARY_PATH="%s" ' % self.library_path
-
- if ldflags:
- env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))
---
-2.7.2
-
diff --git a/pkgs/development/libraries/webkitgtk/PR-153138.patch b/pkgs/development/libraries/webkitgtk/PR-153138.patch
deleted file mode 100644
index 833921f68061..000000000000
--- a/pkgs/development/libraries/webkitgtk/PR-153138.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 07886d9eacb7587dd52a9bcae10c1fc8ab56a910 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia
-Date: Fri, 15 Jan 2016 11:53:07 -0800
-Subject: [PATCH] https://bugs.webkit.org/show_bug.cgi?id=153138
-
-Signed-off-by: Jeremy Huddleston Sequoia
----
- Source/JavaScriptCore/bytecode/StructureStubInfo.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
-index 1e4b4f5..9b27aed 100644
---- a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
-+++ b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
-@@ -26,6 +26,8 @@
- #include "config.h"
- #include "StructureStubInfo.h"
-
-+#include "JSCellInlines.h"
-+
- #include "JSObject.h"
- #include "PolymorphicAccess.h"
- #include "Repatch.h"
---
-2.7.0
-
diff --git a/pkgs/development/libraries/webkitgtk/PR-157554.patch b/pkgs/development/libraries/webkitgtk/PR-157554.patch
deleted file mode 100644
index 615e805c92ce..000000000000
--- a/pkgs/development/libraries/webkitgtk/PR-157554.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=157554
-
---- a/Source/WTF/wtf/OSRandomSource.cpp
-+++ b/Source/WTF/wtf/OSRandomSource.cpp
-@@ -29,7 +29,7 @@
- #include
- #include
-
--#if !OS(DARWIN) && OS(UNIX)
-+#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
- #include
- #include
- #include
-@@ -46,7 +46,7 @@
-
- namespace WTF {
-
--#if !OS(DARWIN) && OS(UNIX)
-+#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
- NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom()
- {
- CRASH();
-@@ -60,8 +56,8 @@ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToReadFromURandom()
-
- void cryptographicallyRandomValuesFromOS(unsigned char* buffer, size_t length)
- {
--#if OS(DARWIN)
-- RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length));
-+#if OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
-+ return arc4random_buf(buffer, length);
- #elif OS(UNIX)
- int fd = open("/dev/urandom", O_RDONLY, 0);
- if (fd < 0)
diff --git a/pkgs/development/libraries/webkitgtk/PR-157574.patch b/pkgs/development/libraries/webkitgtk/PR-157574.patch
deleted file mode 100644
index d9b0795afa5b..000000000000
--- a/pkgs/development/libraries/webkitgtk/PR-157574.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h
-index ab53183..1310dec 100644
---- a/Source/JavaScriptCore/API/WebKitAvailability.h
-+++ b/Source/JavaScriptCore/API/WebKitAvailability.h
-@@ -27,57 +27,12 @@
- #define __WebKitAvailability__
-
- #if defined(__APPLE__)
--
--#include
- #include
--
--#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
--/* To support availability macros that mention newer OS X versions when building on older OS X versions,
-- we provide our own definitions of the underlying macros that the availability macros expand to. We're
-- free to expand the macros as no-ops since frameworks built on older OS X versions only ship bundled with
-- an application rather than as part of the system.
--*/
--
--#ifndef __NSi_10_10 // Building from trunk rather than SDK.
--#define __NSi_10_10 introduced=10.0 // Use 10.0 to indicate that everything is available.
--#endif
--
--#ifndef __NSi_10_11 // Building from trunk rather than SDK.
--#define __NSi_10_11 introduced=10.0 // Use 10.0 to indicate that everything is available.
--#endif
--
--#ifndef __NSi_10_12 // Building from trunk rather than SDK.
--#define __NSi_10_12 introduced=10.0 // Use 10.0 to indicate that everything is available.
--#endif
--
--#ifndef __AVAILABILITY_INTERNAL__MAC_10_9
--#define __AVAILABILITY_INTERNAL__MAC_10_9
--#endif
--
--#ifndef __AVAILABILITY_INTERNAL__MAC_10_10
--#define __AVAILABILITY_INTERNAL__MAC_10_10
- #endif
-
--#ifndef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
--#define AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
--#endif
--
--#ifndef AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
--#define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
--#endif
--
--#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */
--
--#if defined(BUILDING_GTK__)
- #undef CF_AVAILABLE
- #define CF_AVAILABLE(_mac, _ios)
- #undef CF_ENUM_AVAILABLE
- #define CF_ENUM_AVAILABLE(_mac, _ios)
--#endif
--
--#else
--#define CF_AVAILABLE(_mac, _ios)
--#define CF_ENUM_AVAILABLE(_mac, _ios)
--#endif
-
- #endif /* __WebKitAvailability__ */
diff --git a/pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch b/pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch
deleted file mode 100644
index 14d58ef04f68..000000000000
--- a/pkgs/development/libraries/webkitgtk/finding-harfbuzz-icu.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- webkitgtk-2.6.1.orig/Source/cmake/FindHarfBuzz.cmake 2014-10-09 01:54:38.000000000 +0800
-+++ webkitgtk-2.6.1/Source/cmake/FindHarfBuzz.cmake 2014-10-15 13:41:29.832290412 +0800
-@@ -34,21 +34,39 @@
-
- pkg_check_modules(PC_HARFBUZZ harfbuzz>=0.9.7)
-
--find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
-- HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
--)
--
--find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz
-- HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
--)
--
- # HarfBuzz 0.9.18 split ICU support into a separate harfbuzz-icu library.
- if ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "0.9.17")
- pkg_check_modules(PC_HARFBUZZ_ICU harfbuzz-icu>=0.9.18 REQUIRED)
-- find_library(HARFBUZZ_ICU_LIBRARIES NAMES harfbuzz-icu
-+
-+ find_path(HARFBUZZ_ICU_INCLUDEDIR NAMES hb-icu.h
-+ HINTS ${PC_HARFBUZZ_ICU_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
-+ )
-+
-+ find_library(HARFBUZZ_ICU_LIBRARY NAMES harfbuzz-icu
- HINTS ${PC_HARFBUZZ_ICU_LIBRARY_DIRS} ${PC_HARFBUZZ_ICU_LIBDIR}
- )
-- list(APPEND HARFBUZZ_LIBRARIES "${HARFBUZZ_ICU_LIBRARIES}")
-+
-+ find_library(HARFBUZZ_LIBRARY NAMES harfbuzz
-+ HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
-+ )
-+
-+ set(HARFBUZZ_INCLUDE_DIRS
-+ ${PC_HARFBUZZ_INCLUDE_DIRS} ${HARFBUZZ_ICU_INCLUDEDIR}
-+ CACHE INTERNAL ""
-+ )
-+
-+ set(HARFBUZZ_LIBRARIES
-+ ${HARFBUZZ_LIBRARY} ${HARFBUZZ_ICU_LIBRARY}
-+ CACHE INTERNAL ""
-+ )
-+else ()
-+ find_path(HARFBUZZ_INCLUDE_DIRS NAMES hb.h
-+ HINTS ${PC_HARFBUZZ_INCLUDE_DIRS} ${PC_HARFBUZZ_INCLUDEDIR}
-+ )
-+
-+ find_library(HARFBUZZ_LIBRARIES NAMES harfbuzz
-+ HINTS ${PC_HARFBUZZ_LIBRARY_DIRS} ${PC_HARFBUZZ_LIBDIR}
-+ )
- endif ()
-
- include(FindPackageHandleStandardArgs)
diff --git a/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch b/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch
deleted file mode 100644
index 7c47db52abaa..000000000000
--- a/pkgs/development/libraries/webkitgtk/gstreamergl-2.17.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/Source/cmake/OptionsGTK.cmake w/Source/cmake/OptionsGTK.cmake
-index d3577a8..9620dc0 100644
---- i/Source/cmake/OptionsGTK.cmake
-+++ w/Source/cmake/OptionsGTK.cmake
-@@ -94,7 +94,7 @@ WEBKIT_OPTION_DEFINE(USE_LIBSECRET "Whether to enable the persistent credential
-
- # Private options specific to the GTK+ port. Changing these options is
- # completely unsupported. They are intended for use only by WebKit developers.
--WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE ON)
-+WEBKIT_OPTION_DEFINE(USE_GSTREAMER_GL "Whether to enable support for GStreamer GL" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(USE_GSTREAMER_MPEGTS "Whether to enable support for MPEG-TS" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(USE_REDIRECTED_XCOMPOSITE_WINDOW "Whether to use a Redirected XComposite Window for accelerated compositing in X11." PRIVATE ON)
-
diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix
index b6bb4e63df34..9fa1768f4dce 100644
--- a/pkgs/development/libraries/xercesc/default.nix
+++ b/pkgs/development/libraries/xercesc/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "xerces-c-${version}";
- version = "3.1.4";
+ version = "3.2.1";
src = fetchurl {
url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz";
- sha256 = "1xpccqzykpd3806kd788lgkl01pk7v5lklva6q4kp9zq9jnfv3n9";
+ sha256 = "18045nyjkr2hygkjc43pi2fmz6qcbn9p00kf42my3aa4i0mn1m3d";
};
meta = {
diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix
index eab56f9f7ac0..08c266da6963 100644
--- a/pkgs/development/python-modules/pygame_sdl2/default.nix
+++ b/pkgs/development/python-modules/pygame_sdl2/default.nix
@@ -1,18 +1,30 @@
-{ stdenv, pkgs, buildPythonPackage, fetchFromGitHub, isPy27
+{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy27, fetchpatch
, cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }:
buildPythonPackage rec {
pname = "pygame_sdl2";
- version = "6.99.10.1227";
- name = "${pname}-${version}";
+ version = "2.1.0";
+ renpy_version = "6.99.14";
+ name = "${pname}-${version}-${renpy_version}";
- src = fetchFromGitHub {
- owner = "renpy";
- repo = "${pname}";
- rev = "renpy-${version}";
- sha256 = "10n6janvqh5adn7pcijqwqfh234sybjz788kb8ac6b4l11hy2lx1";
+ src = fetchurl {
+ url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz";
+ sha256 = "1zsnb2bivbwysgxmfg9iv12arhpf3gqkmqinhciz955hlqv016b9";
};
+ # force rebuild of headers needed for install
+ prePatch = ''
+ rm -rf gen gen3
+ '';
+
+ patches = [
+ # fix for recent sdl2
+ (fetchpatch {
+ url = "https://github.com/apoleon/pygame_sdl2/commit/ced6051f4a4559a725804cc58c079e1efea0a573.patch";
+ sha256 = "08rqjzvdlmmdf8kyd8ws5lzjy1mrwnds4fdy38inkyw7saydcxyr";
+ })
+ ];
+
buildInputs = [
SDL2 SDL2_image SDL2_ttf SDL2_mixer
cython libjpeg libpng
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index 8816a005ca0f..b6c2702485b1 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, coreutils, makeWrapper }:
-let version = "1.9.6"; in
+let version = "1.10.2"; in
stdenv.mkDerivation {
name = "ant-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
- sha256 = "1cwd5vq175gyicw0hkm8idwa33zxwhf7xlxywaqxcqqdjql0jfx4";
+ sha256 = "0662qammjvibh9kgkxzadkayfn2r7iwnagbwaw28crqqclrb2rp1";
};
contrib = fetchurl {
diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
new file mode 100644
index 000000000000..b44289d74f54
--- /dev/null
+++ b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
@@ -0,0 +1,25 @@
+--- a/mesonbuild/coredata.py
++++ b/mesonbuild/coredata.py
+@@ -266,18 +266,13 @@
+ '''
+ if option.endswith('dir') and os.path.isabs(value) and \
+ option not in builtin_dir_noprefix_options:
+- # Value must be a subdir of the prefix
+ # commonpath will always return a path in the native format, so we
+ # must use pathlib.PurePath to do the same conversion before
+ # comparing.
+- if commonpath([value, prefix]) != str(PurePath(prefix)):
+- m = 'The value of the {!r} option is {!r} which must be a ' \
+- 'subdir of the prefix {!r}.\nNote that if you pass a ' \
+- 'relative path, it is assumed to be a subdir of prefix.'
+- raise MesonException(m.format(option, value, prefix))
+- # Convert path to be relative to prefix
+- skip = len(prefix) + 1
+- value = value[skip:]
++ if commonpath([value, prefix]) == str(PurePath(prefix)):
++ # Convert path to be relative to prefix
++ skip = len(prefix) + 1
++ value = value[skip:]
+ return value
+
+ def init_builtins(self, options):
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 27aa38cfa7e1..47e574236329 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, m4 }: let
+{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, substituteAll }: let
targetPrefix = lib.optionalString stdenv.isCross
(targetPlatform.config + "-");
in python3Packages.buildPythonApplication rec {
@@ -21,17 +21,29 @@ in python3Packages.buildPythonApplication rec {
'';
patches = [
+ # Upstream insists on not allowing bindir and other dir options
+ # outside of prefix for some reason:
+ # https://github.com/mesonbuild/meson/issues/2561
+ # We remove the check so multiple outputs can work sanely.
+ ./allow-dirs-outside-of-prefix.patch
+
# Unlike libtool, vanilla Meson does not pass any information
# about the path library will be installed to to g-ir-scanner,
# breaking the GIR when path other than ${!outputLib}/lib is used.
# We patch Meson to add a --fallback-library-path argument with
# library install_dir to g-ir-scanner.
./gir-fallback-path.patch
- ];
- postPatch = ''
- sed -i -e 's|e.fix_rpath(install_rpath)||' mesonbuild/scripts/meson_install.py
- '';
+ # In common distributions, RPATH is only needed for internal libraries so
+ # meson removes everything else. With Nix, the locations of libraries
+ # are not as predictable, therefore we need to keep them in the RPATH.
+ # At the moment we are keeping the paths starting with /nix/store.
+ # https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634
+ (substituteAll {
+ src = ./fix-rpath.patch;
+ inherit (builtins) storeDir;
+ })
+ ];
setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/pkgs/development/tools/build-managers/meson/fix-rpath.patch
new file mode 100644
index 000000000000..e52428a7db26
--- /dev/null
+++ b/pkgs/development/tools/build-managers/meson/fix-rpath.patch
@@ -0,0 +1,32 @@
+--- a/mesonbuild/compilers/compilers.py
++++ b/mesonbuild/compilers/compilers.py
+@@ -846,8 +848,10 @@
+ if paths != '':
+ paths += ':'
+ paths += build_rpath
+- if len(paths) < len(install_rpath):
+- padding = 'X' * (len(install_rpath) - len(paths))
++ store_paths = ':'.join(filter(lambda path: path.startswith('@storeDir@'), paths.split(':')))
++ extra_space_needed = len(install_rpath + (':' if install_rpath and store_paths else '') + store_paths) - len(paths)
++ if extra_space_needed > 0:
++ padding = 'X' * extra_space_needed
+ if not paths:
+ paths = padding
+ else:
+--- a/mesonbuild/scripts/depfixer.py
++++ b/mesonbuild/scripts/depfixer.py
+@@ -300,6 +300,14 @@
+ return
+ self.bf.seek(rp_off)
+ old_rpath = self.read_str()
++
++ if new_rpath:
++ new_rpath += b':'
++ else:
++ new_rpath = b''
++
++ new_rpath += b':'.join(filter(lambda path: path.startswith(b'@storeDir@'), old_rpath.split(b':')))
++
+ if len(old_rpath) < len(new_rpath):
+ sys.exit("New rpath must not be longer than the old one.")
+ # The linker does read-only string deduplication. If there is a
diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh
index 341b1ff9e6eb..36a7fe23ef5b 100644
--- a/pkgs/development/tools/build-managers/meson/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh
@@ -10,6 +10,15 @@ mesonConfigurePhase() {
crossMesonFlags="--cross-file=@crossFile@/cross-file.conf"
fi
+ # See multiple-outputs.sh and meson’s coredata.py
+ mesonFlags="\
+ --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \
+ --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \
+ --includedir=${!outputInclude}/include \
+ --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \
+ --localedir=${!outputLib}/share/locale \
+ $mesonFlags"
+
mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags"
echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}"
diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix
index 3fd92dfeba41..2e2fc1ad9273 100644
--- a/pkgs/development/tools/valadoc/default.nix
+++ b/pkgs/development/tools/valadoc/default.nix
@@ -1,12 +1,11 @@
-{stdenv, fetchgit, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobjectIntrospection, expat}:
+{stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobjectIntrospection, expat}:
stdenv.mkDerivation rec {
- version = "2016-11-11";
- name = "valadoc-unstable-${version}";
+ version = "0.36.1";
+ name = "valadoc-${version}";
- src = fetchgit {
- url = "git://git.gnome.org/valadoc";
- rev = "8080b626db9c16ac9a0a9802677b4f6ab0d36d4e";
- sha256 = "1y00yls4wgxggzfagm3hcmzkpskfbs3m52pjgl71lg4p85kv6msv";
+ src = fetchurl {
+ url = "mirror://gnome/sources/valadoc/${gnome3.versionBranch version}/${name}.tar.xz";
+ sha256 = "07501k2j9c016bd7rfr6xzaxdplq7j9sd18b5ixbqdbipvn6whnv";
};
nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobjectIntrospection ];
@@ -14,6 +13,12 @@ stdenv.mkDerivation rec {
preConfigure = "./autogen.sh";
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = "valadoc";
+ };
+ };
+
meta = with stdenv.lib; {
description = "valadoc is a documentation generator for generating API documentation from Vala source code";
homepage = http://valadoc.org;
diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index 03d296d30053..e34f29300ab4 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -5,20 +5,20 @@
let
name = "openrct2-${version}";
- version = "0.1.1";
+ version = "0.1.2";
openrct2-src = fetchFromGitHub {
owner = "OpenRCT2";
repo = "OpenRCT2";
rev = "v${version}";
- sha256 = "1xxwqx2gzvsdrsy76rz3sys9m4pyn9q25nbnkba3cw1z4l2b73lg";
+ sha256 = "1zqrdxr79c9yx4bdxz1r5866hhwq0lcs9qpv3vhisr56ar5n5wk3";
};
title-sequences-src = fetchFromGitHub {
owner = "OpenRCT2";
repo = "title-sequences";
- rev = "v0.1.0";
- sha256 = "17c926lhby90ilvyyl6jsiy0df8dw5jws97xigp3x8hddhvv7c16";
+ rev = "v0.1.2";
+ sha256 = "1yb1ynkfmiankii3fngr9km5wbc07rp30nh0apkj6wryrhy7imgm";
};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
index 1494d9f06a8a..41bdd5d12ac3 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "google-authenticator-libpam-${version}";
- version = "1.03";
+ version = "1.05";
src = fetchurl {
url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz";
- sha256 = "0wb95z5v1w4sk0p7y9pbn4v95w9hrbf80vw9k2z2sgs0156ljkb7";
+ sha256 = "026vljmddi0zqcb3c0vdpabmi4r17kahc00mh6fs3qbyjbb14946";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index adf9dbd818c9..4e086259036e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.28";
+ version = "4.14.29";
# branchVersion needs to be x.y
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0byx2824ml2ck97p66gfipnasbn9zz6rhjps61n6gprg3ac5fd07";
+ sha256 = "06a6q69jwvggns5rf473nfgfwlkfyj8zs6vrjppwf8lrrrq7pxhq";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
index 5c4a452dd12b..979e8fe05e13 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.15.11";
+ version = "4.15.12";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0rjzlkp24ch58vx0xljrf6l33i8xv2mal0x821kwfqp551npdxfc";
+ sha256 = "0j7l907m51y05cd1sqf3sn7vx4n6c07kn7q0ndnyg6wqb7h667h3";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix
index 36cbd1581a6b..c8b404c6be7f 100644
--- a/pkgs/os-specific/linux/open-isns/default.nix
+++ b/pkgs/os-specific/linux/open-isns/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "open-isns-${version}";
- version = "0.97";
+ version = "0.98";
src = fetchFromGitHub {
owner = "gonzoleeman";
repo = "open-isns";
rev = "v${version}";
- sha256 = "17aichjgkwjfp9dx1piw7dw8ddz1bgm5mk3laid2zvjks1h739k3";
+ sha256 = "055gjwz5hxaj5jk23bf7dy9wbxk9m8cfgl1msbzjc60gr2mmcbdg";
};
propagatedBuildInputs = [ openssl ];
diff --git a/pkgs/os-specific/linux/spl/const.patch b/pkgs/os-specific/linux/spl/const.patch
deleted file mode 100644
index 932e8a9eb1c4..000000000000
--- a/pkgs/os-specific/linux/spl/const.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c
-index eb00505..6f38cef 100644
---- a/module/spl/spl-proc.c
-+++ b/module/spl/spl-proc.c
-@@ -36,7 +36,7 @@
- #include
- #include
-
--#if defined(CONSTIFY_PLUGIN) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
-+#if defined(CONSTIFY_PLUGIN)
- typedef struct ctl_table __no_const spl_ctl_table;
- #else
- typedef struct ctl_table spl_ctl_table;
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 57698b5ad455..9460ee46c0f0 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -20,7 +20,7 @@ let
inherit rev sha256;
};
- patches = [ ./const.patch ./install_prefix.patch ];
+ patches = [ ./install_prefix.patch ];
nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies;
@@ -61,8 +61,8 @@ in
assert kernel != null;
{
splStable = common {
- version = "0.7.6";
- sha256 = "1l641d89k48ngmarx9mxh8gw2zzrf7fw7n8zmslhz4h1152plddb";
+ version = "0.7.7";
+ sha256 = "0mq7827x4173wdbpj361gvxvk8j9r96363gka75smzsc31i2wa5x";
};
splUnstable = common {
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 1e4df0d3f0ef..a792283e70e1 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -201,18 +201,6 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
- # The rpath to the shared systemd library is not added by meson. The
- # functionality was removed by a nixpkgs patch because it would overwrite
- # the existing rpath.
- postFixup = ''
- sharedLib=libsystemd-shared-${version}.so
- for prog in `find $out -type f -executable`; do
- (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && (
- patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog
- ) || true
- done
- '';
-
# The interface version prevents NixOS from switching to an
# incompatible systemd at runtime. (Switching across reboots is
# fine, of course.) It should be increased whenever systemd changes
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 868e354c7b55..aac1576261d4 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils, fetchpatch
+{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils
+, perl, fetchpatch
, configFile ? "all"
# Userspace dependencies
@@ -39,8 +40,12 @@ let
patches = extraPatches;
+ postPatch = optionalString buildKernel ''
+ patchShebangs scripts
+ '';
+
nativeBuildInputs = [ autoreconfHook nukeReferences ]
- ++ optional buildKernel kernel.moduleBuildDependencies;
+ ++ optional buildKernel (kernel.moduleBuildDependencies ++ [ perl ]);
buildInputs =
optionals buildKernel [ spl ]
++ optionals buildUser [ zlib libuuid python attr ]
@@ -142,9 +147,9 @@ in {
incompatibleKernelVersion = null;
# this package should point to the latest release.
- version = "0.7.6";
+ version = "0.7.7";
- sha256 = "1k3a69zfdk4ia4z2l69lbz0mj26bwdanxd2wynkdpm2kl3zjj18h";
+ sha256 = "0lrzy27sh1cinkf04ki2vfjrgpgbiza2s59i2by45qdd8kmkcc5r";
extraPatches = [
(fetchpatch {
diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix
index 02a4e3bd66f7..d489deb5944f 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/servers/mattermost/matterircd.nix
@@ -2,16 +2,16 @@
buildGoPackage rec {
name = "matterircd-${version}";
- version = "0.12.0";
+ version = "0.16.5";
src = fetchFromGitHub {
owner = "42wim";
repo = "matterircd";
rev = "v${version}";
- sha256 = "1fgpfyb78l1kl0kja2fjqc4ik1q869cmhx6xdmp9ff2qcqk22cj0";
+ sha256 = "1rsmc2dpf25rkl8c085xwssbry3hv1gv318m7rdj616agx4m7yr2";
};
- goPackagePath = "github.com/42vim/matterircd";
+ goPackagePath = "github.com/42wim/matterircd";
meta = with stdenv.lib; {
inherit (src.meta) homepage;
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 047585e2fc02..798f31c3458e 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "blackbox_exporter-${version}";
- version = "0.11.0";
+ version = "0.12.0";
rev = version;
goPackagePath = "github.com/prometheus/blackbox_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "prometheus";
repo = "blackbox_exporter";
- sha256 = "1zwhyvjkf222bwvgim28yizk2vq0777dviqfkkc3vdhiwl9amr8v";
+ sha256 = "0gd3vymk3qdfjnf0rx9kwc6v0jv7f8l30igvj2v7bljar2d6hzxf";
};
meta = with stdenv.lib; {
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix
index 8b70ad423e9c..497f20ac55ed 100644
--- a/pkgs/servers/monitoring/prometheus/node-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "node_exporter-${version}";
- version = "0.15.0";
+ version = "0.15.2";
rev = "v${version}";
goPackagePath = "github.com/prometheus/node_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "prometheus";
repo = "node_exporter";
- sha256 = "0v1m6m9fmlw66s9v50y2rfr5kbpb9mxbwpcab4cmgcjs1y7wcn49";
+ sha256 = "1vxbkps80ba8c0ndawijg07am5gyc8y49h8fd0ky5h05zmkp25qv";
};
# FIXME: megacli test fails
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index e6bf634b554c..3ec00dfa16e7 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -5,12 +5,12 @@
stdenv.mkDerivation rec {
name = "EventStore-${version}";
- version = "4.0.3";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "EventStore";
repo = "EventStore";
rev = "oss-v${version}";
- sha256 = "1905bnqyyiqprva67cp49rgib324iipw2l71jzj0ynzi7kxr4mgg";
+ sha256 = "0mvjz327kfg157fwvy8xkkf5h0g3v373pfwr70cslsy96n45jp10";
};
buildPhase = ''
diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix
index a24daa708123..bf2a51f65963 100644
--- a/pkgs/servers/sql/virtuoso/7.x.nix
+++ b/pkgs/servers/sql/virtuoso/7.x.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libxml2, openssl, readline, gawk }:
stdenv.mkDerivation rec {
- name = "virtuoso-opensource-7.0.0";
+ name = "virtuoso-opensource-7.2.4.2";
src = fetchurl {
url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
- sha256 = "1z0jdzayv45y57jj8kii6csqfjhswcs8s2krqqfhab54xy6gynbl";
+ sha256 = "12dqam1gc1v93l0bj0vlpvjqppki6y1hqrlznywxnw0rrz9pb002";
};
buildInputs = [ libxml2 openssl readline gawk ];
diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix
index 777e910038a8..4c76173a280e 100644
--- a/pkgs/servers/squid/4.nix
+++ b/pkgs/servers/squid/4.nix
@@ -2,11 +2,11 @@
, expat, libxml2, openssl }:
stdenv.mkDerivation rec {
- name = "squid-4.0.23";
+ name = "squid-4.0.24";
src = fetchurl {
url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
- sha256 = "0a8g0zs3xayfkxl8maq823b14lckvh9d5lf7ryh9rx303xh1mdqq";
+ sha256 = "01vayx86sakfy9zz2q5cvzv97865l1zb0jkqbh7wqz9hcgbs0789";
};
buildInputs = [
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8a9cd1c6dd47..92afb90c6c5d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1868,11 +1868,11 @@ let
}) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videoati = (mkDerivation "xf86videoati" {
- name = "xf86-video-ati-7.9.0";
+ name = "xf86-video-ati-18.0.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2;
- sha256 = "0xcq0lncb5p4sas5866qpkjyp1v8ksalw7m1gmqb3brhccp8gb9w";
+ url = mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2;
+ sha256 = "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
@@ -2264,11 +2264,11 @@ let
}) // {inherit randrproto videoproto xorgserver xproto ;};
xf86videovesa = (mkDerivation "xf86videovesa" {
- name = "xf86-video-vesa-2.3.4";
+ name = "xf86-video-vesa-2.4.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2;
- sha256 = "1haiw8r1z8ihk68d0jqph2wsld13w4qkl86biq46fvyxg7cg9pbv";
+ url = mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2;
+ sha256 = "1373vsxn6qh00na0s9c09kf09gj78rzi98zq93id8v5zsya3qi5z";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
@@ -2396,11 +2396,11 @@ let
}) // {inherit ;};
xinit = (mkDerivation "xinit" {
- name = "xinit-1.3.4";
+ name = "xinit-1.4.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/xinit-1.3.4.tar.bz2;
- sha256 = "1cq2g469mb2cfgr8k57960yrn90bl33vfqri4pdh2zm0jxrqvn3m";
+ url = mirror://xorg/individual/app/xinit-1.4.0.tar.bz2;
+ sha256 = "1vw2wlg74ig52naw0cha3pgzcwwk25l834j42cg8m5zmybp3a213";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 xproto ];
diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix
index 0af945317530..3e0680cac449 100644
--- a/pkgs/tools/X11/xdg-user-dirs/default.nix
+++ b/pkgs/tools/X11/xdg-user-dirs/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libxslt, docbook_xsl, makeWrapper }:
stdenv.mkDerivation rec {
- name = "xdg-user-dirs-0.16";
+ name = "xdg-user-dirs-0.17";
src = fetchurl {
url = "http://user-dirs.freedesktop.org/releases/${name}.tar.gz";
- sha256 = "1rp3c94hxjlfsryvwajklynfnrcvxplhwnjqc7395l89i0nb83vp";
+ sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra";
};
buildInputs = [ libxslt docbook_xsl makeWrapper ];
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 99c54b6d3964..451bcae1efd1 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "gparted-0.30.0";
+ name = "gparted-0.31.0";
src = fetchurl {
url = "mirror://sourceforge/gparted/${name}.tar.gz";
- sha256 = "0jngbsbvg8k8vbpsphqbk8br2cbmxhabbm2c5bmxm2q5zvpr64fk";
+ sha256 = "1fh7rpgb4xxdhgyjsirb83zvjfc5mfngb8a1pjbv7r6r6jj4jyrv";
};
configureFlags = [ "--disable-doc" ];
diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix
index f4631d39b010..064364e37ac3 100644
--- a/pkgs/tools/networking/modemmanager/default.nix
+++ b/pkgs/tools/networking/modemmanager/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, intltool, pkgconfig
+{ stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, gettext, pkgconfig
, libmbim, libqmi, systemd }:
stdenv.mkDerivation rec {
name = "ModemManager-${version}";
- version = "1.6.8";
+ version = "1.7.990";
src = fetchurl {
url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz";
- sha256 = "0xj3ng7qcqxkib5qkprwghcivaz0mn449fw08l67h1zbpz23bh7z";
+ sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl";
};
- nativeBuildInputs = [ intltool pkgconfig ];
+ nativeBuildInputs = [ gettext pkgconfig ];
buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ];
@@ -44,9 +44,11 @@ stdenv.mkDerivation rec {
$out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
'';
- meta = {
+ meta = with stdenv.lib; {
description = "WWAN modem manager, part of NetworkManager";
+ homepage = https://www.freedesktop.org/wiki/Software/ModemManager/;
+ license = licenses.gpl2Plus;
maintainers = [ ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 578505f1e247..dd32cebea111 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,45 +1,46 @@
-{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
-, libnotify, libsecret, polkit, isocodes, modemmanager
+{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3
+, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl
, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
-, udev, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk
+, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection
, libindicator-gtk3, libappindicator-gtk3, withGnome ? false }:
let
- pname = "network-manager-applet";
+ pname = "network-manager-applet";
version = "1.8.10";
in stdenv.mkDerivation rec {
- name = "${pname}-${version}";
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a";
};
- configureFlags = [
- "--sysconfdir=/etc"
- "--without-selinux"
- "--with-appindicator"
+ mesonFlags = [
+ "-Dselinux=false"
+ "-Dappindicator=true"
+ "-Dgcr=${if withGnome then "true" else "false"}"
];
- outputs = [ "out" "dev" ];
+ outputs = [ "out" "dev" "devdoc" ];
buildInputs = [
- gnome3.gtk libglade networkmanager libnotify libsecret gsettings-desktop-schemas
- polkit isocodes udev libgudev gnome3.libgnome-keyring
+ gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas
+ polkit isocodes libgudev
modemmanager jansson glib-networking
libindicator-gtk3 libappindicator-gtk3
- ] ++ stdenv.lib.optional withGnome webkitgtk;
+ ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr webkitgtk ];
- nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
+ nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ];
- propagatedUserEnvPkgs = [ gnome3.gnome-keyring hicolor-icon-theme ];
+ propagatedUserEnvPkgs = [ hicolor-icon-theme ];
- makeFlags = [
- ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
+ NIX_CFLAGS = [
+ ''-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
];
- preInstall = ''
- installFlagsArray=( "sysconfdir=$out/etc" )
+ postPatch = ''
+ chmod +x meson_post_install.py # patchShebangs requires executable file
+ patchShebangs meson_post_install.py
'';
passthru = {
@@ -50,10 +51,10 @@ in stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
- homepage = http://projects.gnome.org/NetworkManager/;
+ homepage = https://wiki.gnome.org/Projects/NetworkManager;
description = "NetworkManager control applet for GNOME";
- license = licenses.gpl2;
+ license = licenses.gpl2;
maintainers = with maintainers; [ phreedom rickynils ];
- platforms = platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index fc7d352757db..ebe40c6192cd 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -7,13 +7,13 @@
let
pname = "NetworkManager";
- version = "1.10.2";
+ version = "1.10.6";
in stdenv.mkDerivation rec {
name = "network-manager-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0nv2jm2lsidlrzn4dkbc5rpj8ma4cpzjqz8z8dmwkqvh0zsk970n";
+ sha256 = "0xmc3x41dbcaxjm85wfv405xq1a1n3xw8m8zg645ywm3avlb3w3a";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/network-manager/fix-paths.patch
new file mode 100644
index 000000000000..b735da28dca1
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/fix-paths.patch
@@ -0,0 +1,34 @@
+--- a/properties/nm-openvpn-editor.c
++++ b/properties/nm-openvpn-editor.c
+@@ -775,8 +775,7 @@
+ nm_find_openvpn (void)
+ {
+ static const char *openvpn_binary_paths[] = {
+- "/usr/sbin/openvpn",
+- "/sbin/openvpn",
++ "@openvpn@/bin/openvpn",
+ NULL
+ };
+ const char **openvpn_binary = openvpn_binary_paths;
+--- a/src/nm-openvpn-service.c
++++ b/src/nm-openvpn-service.c
+@@ -522,9 +522,7 @@
+ openvpn_binary_find_exepath (void)
+ {
+ static const char *paths[] = {
+- "/usr/sbin/openvpn",
+- "/sbin/openvpn",
+- "/usr/local/sbin/openvpn",
++ "@openvpn@/bin/openvpn",
+ };
+ int i;
+
+@@ -2326,7 +2324,7 @@
+ _LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting...");
+
+ if ( !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS)
+- && (system ("/sbin/modprobe tun") == -1))
++ && (system ("@kmod@/bin/modprobe tun") == -1))
+ return EXIT_FAILURE;
+
+ plugin = nm_openvpn_plugin_new (bus_name);
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix
index b924a02438fd..73aaea06c917 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix
@@ -3,13 +3,13 @@ networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }:
let
pname = "NetworkManager-fortisslvpn";
- version = "1.2.4";
+ version = "1.2.8";
in stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0wsbj5lvf9l1w8k5nmaqnzmldilh482bn4z4k8a3wnm62xfxgscr";
+ sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w";
};
buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ]
diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix
index edda84ab43e2..b1ee3da1b058 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn.nix
@@ -1,22 +1,29 @@
-{ stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager, libsecret
+{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, networkmanager, libsecret
, withGnome ? true, gnome3, procps, kmod }:
let
pname = "NetworkManager-openvpn";
- version = "1.8.0";
+ version = "1.8.2";
in stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1973n89g66a3jfx8r45a811fga4kadh6r1w35cb25cz1mlii2vhn";
+ sha256 = "0p9pjk81h1j1dk9jkkvvk17cq21wyq5kfa4j49fmx9b9yg8syqc8";
};
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ inherit kmod openvpn;
+ })
+ ];
+
buildInputs = [ openvpn networkmanager libsecret ]
++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring
gnome3.networkmanagerapplet ];
- nativeBuildInputs = [ intltool pkgconfig ];
+ nativeBuildInputs = [ intltool pkgconfig libxml2 ];
configureFlags = [
"${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}"
@@ -24,16 +31,6 @@ in stdenv.mkDerivation rec {
"--localstatedir=/" # needed for the management socket under /run/NetworkManager
];
- preConfigure = ''
- substituteInPlace "configure" \
- --replace "/sbin/sysctl" "${procps}/sbin/sysctl"
- substituteInPlace "src/nm-openvpn-service.c" \
- --replace "/sbin/openvpn" "${openvpn}/bin/openvpn" \
- --replace "/sbin/modprobe" "${kmod}/bin/modprobe"
- substituteInPlace "properties/auth-helpers.c" \
- --replace "/sbin/openvpn" "${openvpn}/bin/openvpn"
- '';
-
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index cdc035072daf..b40c8ea26aa2 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
name = "packagekit-${version}";
- version = "1.1.8";
+ version = "1.1.9";
src = fetchFromGitHub {
owner = "hughsie";
repo = "PackageKit";
rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}";
- sha256 = "0bn9flsjbzlwmlbv2gphqwgzy9sx8ahch28z6dzgak4csbz5wcws";
+ sha256 = "1zs7xkk3b2izdnis7ir5h93p8f2i9513663h2xhxb0sh6i2h18y4";
};
buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ]
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 976c58eb1e32..8c12e4e30c3e 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "clamav-${version}";
- version = "0.99.3";
+ version = "0.99.4";
src = fetchurl {
url = "https://www.clamav.net/downloads/production/${name}.tar.gz";
- sha256 = "114f7qk3h0klgm0zzn2394n5spcn91vjc9mq6m03l2p0ls955yh0";
+ sha256 = "0q94iwi729id9pyc72w6zlllbaz37qvpi6gc51g2x3fy7ckw6anp";
};
# don't install sample config files into the absolute sysconfdir folder
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre
];
- patches = [ ./fd-leak.patch ];
-
configureFlags = [
"--sysconfdir=/etc/clamav"
"--disable-llvm" # enabling breaks the build at the moment
diff --git a/pkgs/tools/security/clamav/fd-leak.patch b/pkgs/tools/security/clamav/fd-leak.patch
deleted file mode 100644
index 2c147901e446..000000000000
--- a/pkgs/tools/security/clamav/fd-leak.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/libclamav/scanners.c 2018-01-26 16:59:00.820231425 +0100
-+++ b/libclamav/scanners.c 2018-01-26 17:39:07.523633805 +0100
-@@ -1366,12 +1366,14 @@
-
- if ((ret = cli_ac_initdata(&tmdata, troot?troot->ac_partsigs:0, troot?troot->ac_lsigs:0, troot?troot->ac_reloff_num:0, CLI_DEFAULT_AC_TRACKLEN))) {
- free(tmpname);
-+ free(normalized);
- return ret;
- }
-
- if ((ret = cli_ac_initdata(&gmdata, groot->ac_partsigs, groot->ac_lsigs, groot->ac_reloff_num, CLI_DEFAULT_AC_TRACKLEN))) {
- cli_ac_freedata(&tmdata);
- free(tmpname);
-+ free(normalized);
- return ret;
- }
-
-@@ -1390,6 +1392,7 @@
- cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname);
- close(ofd);
- free(tmpname);
-+ free(normalized);
- return CL_EWRITE;
- }
- text_normalize_reset(&state);
-@@ -1424,6 +1427,8 @@
- if (ret) {
- cli_ac_freedata(&tmdata);
- free(tmpname);
-+ free(normalized);
-+ close(ofd);
- return ret;
- }
- }
-@@ -1466,11 +1471,9 @@
-
- }
-
-- if(ctx->engine->keeptmp) {
-- free(tmpname);
-- if (ofd >= 0)
-- close(ofd);
-- }
-+ if (ofd >= 0)
-+ close(ofd);
-+ free(tmpname);
- free(normalized);
-
- if(ret != CL_VIRUS || SCAN_ALL) {
diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix
index 9395d4acb8b9..e9dffa5dbfa9 100644
--- a/pkgs/tools/security/lastpass-cli/default.nix
+++ b/pkgs/tools/security/lastpass-cli/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "lastpass-cli-${version}";
- version = "1.2.2";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "lastpass";
repo = "lastpass-cli";
rev = "v${version}";
- sha256 = "0041z2awpmwq2fk8lbgp4fcia0r6wss2csvq5bxps0cx7fq69wc1";
+ sha256 = "0k3vnlibv05wnn6qn3qjlcyj2s07di7zkmdnijd6cp1hfk76z2r5";
};
nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ];
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 3d31596a43fc..a81fffa20357 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -19,11 +19,11 @@ let
in stdenv.mkDerivation rec {
name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
- version = "7.60";
+ version = "7.70";
src = fetchurl {
url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
- sha256 = "08bga42ipymmbxd7wy4x5sl26c0ir1fm3n9rc6nqmhx69z66wyd8";
+ sha256 = "063fg8adx23l4irrh5kn57hsmi1xvjkar4vm4k6g94ppan4hcyw4";
};
patches = ./zenmap.patch;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 07627daad5c1..4e91dee6a405 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -76,6 +76,7 @@ mapAliases (rec {
go-pup = pup; # added 2017-12-19
googleAuthenticator = google-authenticator; # added 2016-10-16
gnome_doc_utils = gnome-doc-utils; # added 2018-02-25
+ gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
grantlee5 = libsForQt5.grantlee; # added 2015-12-19
gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c313bda5fca7..c7f43bcde619 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6818,6 +6818,7 @@ with pkgs;
vala_0_34
vala_0_36
vala_0_38
+ vala_0_40
vala;
valadoc = callPackage ../development/tools/valadoc { };
@@ -7799,6 +7800,8 @@ with pkgs;
gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {};
+ gnome-usage = callPackage ../applications/misc/gnome-usage {};
+
gnum4 = callPackage ../development/tools/misc/gnum4 { };
gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
@@ -8669,6 +8672,8 @@ with pkgs;
enchant = callPackage ../development/libraries/enchant { };
+ enchant2 = callPackage ../development/libraries/enchant/2.x.nix { };
+
enet = callPackage ../development/libraries/enet { };
epoxy = callPackage ../development/libraries/epoxy {};
@@ -9229,6 +9234,12 @@ with pkgs;
gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {};
+ gtksourceview = gtksourceview3;
+
+ gtksourceview3 = callPackage ../development/libraries/gtksourceview/3.x.nix { };
+
+ gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { };
+
gtkspell2 = callPackage ../development/libraries/gtkspell { };
gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };
@@ -9625,6 +9636,8 @@ with pkgs;
libdap = callPackage ../development/libraries/libdap { };
+ libdazzle = callPackage ../development/libraries/libdazzle { };
+
libdbi = callPackage ../development/libraries/libdbi { };
libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers {
@@ -9836,8 +9849,10 @@ with pkgs;
libgudev = callPackage ../development/libraries/libgudev { };
+ libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {};
libguestfs = callPackage ../development/libraries/libguestfs {
inherit (perlPackages) libintlperl GetoptLong SysVirt;
+ appliance = libguestfs-appliance;
};
libhangul = callPackage ../development/libraries/libhangul { };
@@ -11718,7 +11733,7 @@ with pkgs;
wcslib = callPackage ../development/libraries/wcslib { };
- webkitgtk = webkitgtk218x;
+ webkitgtk = webkitgtk220x;
webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
harfbuzz = harfbuzz-icu-58;
@@ -11726,7 +11741,7 @@ with pkgs;
inherit (darwin) libobjc;
};
- webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.18.nix {
+ webkitgtk220x = callPackage ../development/libraries/webkitgtk/2.20.nix {
harfbuzz = harfbuzz-icu;
inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
stdenv = overrideCC stdenv gcc6;
@@ -14325,7 +14340,9 @@ with pkgs;
inherit (callPackages ../data/fonts/noto-fonts {})
noto-fonts noto-fonts-cjk noto-fonts-emoji;
- nullmailer = callPackage ../servers/mail/nullmailer { };
+ nullmailer = callPackage ../servers/mail/nullmailer {
+ stdenv = gccStdenv;
+ };
numix-icon-theme = callPackage ../data/icons/numix-icon-theme { };
@@ -19467,7 +19484,7 @@ with pkgs;
gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { };
- gnome-themes-standard = gnome3.gnome-themes-standard;
+ gnome-themes-extra = gnome3.gnome-themes-extra;
numix-gtk-theme = callPackage ../misc/themes/numix { };
@@ -20620,7 +20637,6 @@ with pkgs;
sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller {
inherit libusb1; # Shadow python.pkgs.libusb1.
- librsvg = librsvg.override { enableIntrospection = true; };
};
sct = callPackage ../tools/X11/sct {};