From 6f634e3c3abdffdaac9405c872f683f4fcf465fe Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Mon, 11 May 2015 01:57:15 +0800 Subject: Add kbdlight package and setuid wrapper update nixos/modules/programs/kbdlight.nix to use mkEnableOption --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/kbdlight.nix | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 nixos/modules/programs/kbdlight.nix (limited to 'nixos') diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bf70715cea4c..959d19a25ab6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -62,6 +62,7 @@ ./programs/environment.nix ./programs/info.nix ./programs/ibus.nix + ./programs/kbdlight.nix ./programs/light.nix ./programs/nano.nix ./programs/screen.nix diff --git a/nixos/modules/programs/kbdlight.nix b/nixos/modules/programs/kbdlight.nix new file mode 100644 index 000000000000..0172368e968f --- /dev/null +++ b/nixos/modules/programs/kbdlight.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.kbdlight; + +in +{ + options.programs.kbdlight.enable = mkEnableOption "kbdlight"; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.kbdlight ]; + security.setuidPrograms = [ "kbdlight" ]; + }; +} -- cgit 1.4.1 From 1938dc9b54963ecc79c5f74ae502e09235873300 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 11 May 2015 16:27:53 -0700 Subject: nixos/consul: Remove the joinNodes and joinRetries options as they are now built in consul options --- nixos/modules/services/networking/consul.nix | 37 +++------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 5308fd995085..23e5b2f5e7ea 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -6,11 +6,9 @@ let dataDir = "/var/lib/consul"; cfg = config.services.consul; - configOptions = { - data_dir = dataDir; - } - // (if cfg.webUi then { ui_dir = "${pkgs.consul.ui}"; } else { }) - // cfg.extraConfig; + configOptions = { data_dir = dataDir; } // + (if cfg.webUi then { ui_dir = "${pkgs.consul.ui}"; } else { }) // + cfg.extraConfig; configFiles = [ "/etc/consul.json" "/etc/consul-addrs.json" ] ++ cfg.extraConfigFiles; @@ -52,23 +50,6 @@ in ''; }; - joinNodes = mkOption { - type = types.listOf types.str; - default = [ ]; - description = '' - A list of addresses of nodes which should be joined at startup if the - current node is in a left state. - ''; - }; - - joinRetries = mkOption { - type = types.int; - default = 10; - description = '' - The number of times to retry connecting to the join nodes. - ''; - }; - interface = { advertise = mkOption { @@ -219,18 +200,6 @@ in + '' echo "}" >> /etc/consul-addrs.json ''; - postStart = '' - # Issues joins to nodes which we statically connect to - ${flip concatMapStrings cfg.joinNodes (addr: '' - for i in {0..${toString cfg.joinRetries}}; do - # Try to join the other nodes ${toString cfg.joinRetries} times before failing - consul join "${addr}" && break - sleep 1 - done & - '')} - wait - exit 0 - ''; }; systemd.services.consul-alerts = mkIf (cfg.alerts.enable) { -- cgit 1.4.1 From b6e26aa8df5fc37c0d7f9e89f3c2716871697d2d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 11 May 2015 16:45:04 -0700 Subject: nixos/consul: Support a config directory for health checks --- nixos/modules/services/networking/consul.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 23e5b2f5e7ea..75e2a6921410 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -144,6 +144,8 @@ in environment = { etc."consul.json".text = builtins.toJSON configOptions; + # We need consul.d to exist for consul to start + etc."consul.d/dummy.json".text = "{ }"; systemPackages = with pkgs; [ consul ]; }; @@ -151,10 +153,12 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ] ++ systemdDevices; bindsTo = systemdDevices; - restartTriggers = [ config.environment.etc."consul.json".source ]; + restartTriggers = [ config.environment.etc."consul.json".source ] + ++ mapAttrsToList (_: d: d.source) + (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc); serviceConfig = { - ExecStart = "@${pkgs.consul}/bin/consul consul agent" + ExecStart = "@${pkgs.consul}/bin/consul consul agent -config-dir /etc/consul.d" + concatMapStrings (n: " -config-file ${n}") configFiles; ExecReload = "${pkgs.consul}/bin/consul reload"; PermissionsStartOnly = true; -- cgit 1.4.1 From 2806491cc410527aace39395fa521d6df1326967 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 11 May 2015 17:44:07 -0700 Subject: nixos/consul: Add shell for health checks --- nixos/modules/services/networking/consul.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'nixos') diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 75e2a6921410..53a9f4626254 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -140,6 +140,8 @@ in users.extraUsers."consul" = { description = "Consul agent daemon user"; uid = config.ids.uids.consul; + # The shell is needed for health checks + shell = "/run/current-system/sw/bin/bash"; }; environment = { -- cgit 1.4.1 From 92317259efd591a6107c01123a606c3c96b9066b Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Wed, 13 May 2015 14:22:06 +0200 Subject: cups: First attempt to fix our printing tests; wait until cups is fully initialized --- nixos/tests/printing.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'nixos') diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 708ff5391570..e8c41140045c 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -34,6 +34,7 @@ import ./make-test.nix ({pkgs, ... }: { # Make sure that cups is up on both sides. $server->waitForUnit("cups.service"); $client->waitForUnit("cups.service"); + $client->sleep(10); # wait until cups is fully initialized $client->succeed("lpstat -r") =~ /scheduler is running/ or die; $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; $client->succeed("curl --fail http://localhost:631/"); -- cgit 1.4.1 From e9679ce32a43488b15cccfb77d362561dc6fa9ce Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 13 May 2015 15:03:01 +0300 Subject: postgresql-backup: use system postgresql package --- nixos/modules/services/backup/postgresql-backup.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index 1f7b123eca37..c4127543f10d 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -9,7 +9,7 @@ let postgresqlBackupCron = db: '' - ${config.services.postgresqlBackup.period} root ${postgresql}/bin/pg_dump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz + ${config.services.postgresqlBackup.period} root ${config.services.postgresql.package}/bin/pg_dump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz ''; in -- cgit 1.4.1 From fc8011ad8d23411bcb950b03c80bd5ceb56c068c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 May 2015 16:22:53 +0200 Subject: Ensure that nscd, sshd are created as system users c0f70b4694bb2be1c25ef0e23e3f11f9d718d162 removed the fixed uid assignment, but then it becomes necessary to set isSystemUser. http://hydra.nixos.org/build/22182588 --- nixos/modules/services/networking/ssh/sshd.nix | 4 ++-- nixos/modules/services/system/nscd.nix | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index c25532511a07..6cc86b4e4b5a 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -282,8 +282,8 @@ in config = mkIf cfg.enable { users.extraUsers.sshd = - { description = "SSH privilege separation user"; - home = "/var/empty"; + { isSystemUser = true; + description = "SSH privilege separation user"; }; environment.etc = authKeysFiles ++ [ diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index caedc2e42173..3c0d2043ed5d 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -42,7 +42,10 @@ in config = mkIf cfg.enable { - users.extraUsers.nscd.description = "Name service cache daemon user"; + users.extraUsers.nscd = + { isSystemUser = true; + description = "Name service cache daemon user"; + }; systemd.services.nscd = { description = "Name Service Cache Daemon"; -- cgit 1.4.1 From 15ffb9ad88e557cbc3310b81dbd99c00722e350e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 May 2015 16:23:57 +0200 Subject: Remove fixed uid in tests --- nixos/tests/common/user-account.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'nixos') diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix index aa3a0b82bcde..ded8275000af 100644 --- a/nixos/tests/common/user-account.nix +++ b/nixos/tests/common/user-account.nix @@ -1,10 +1,9 @@ -{ pkgs, ... }: +{ lib, ... }: -{ users.extraUsers = pkgs.lib.singleton +{ users.extraUsers = lib.singleton { isNormalUser = true; name = "alice"; description = "Alice Foobar"; password = "foobar"; - uid = 1000; }; } -- cgit 1.4.1 From fd8cb1ff2d53cad7fee74e2db73d1f01056a964d Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 13 May 2015 20:54:25 +0300 Subject: nix-serve: Add nixos module This allows sharing the Nix store of the machine as a binary cache simply by setting 'services.nix-serve.enable = true'. --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/nix-serve.nix | 56 +++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 nixos/modules/services/networking/nix-serve.nix (limited to 'nixos') diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e869b350e716..0b41e394b1ac 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -289,6 +289,7 @@ ./services/networking/nat.nix ./services/networking/networkmanager.nix ./services/networking/ngircd.nix + ./services/networking/nix-serve.nix ./services/networking/notbit.nix ./services/networking/nsd.nix ./services/networking/ntopng.nix diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix new file mode 100644 index 000000000000..c2c579c3177e --- /dev/null +++ b/nixos/modules/services/networking/nix-serve.nix @@ -0,0 +1,56 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.nix-serve; +in +{ + options = { + services.nix-serve = { + enable = mkEnableOption "nix-serve, the standalone Nix binary cache server"; + + port = mkOption { + type = types.int; + default = 5000; + description = '' + Port number where nix-serve will listen on. + ''; + }; + + bindAddress = mkOption { + type = types.string; + default = "0.0.0.0"; + description = '' + IP address where nix-serve will bind its listening socket. + ''; + }; + + extraParams = mkOption { + type = types.string; + default = ""; + description = '' + Extra command line parameters for nix-serve. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.nix-serve = { + description = "nix-serve binary cache server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + path = [ config.nix.package pkgs.bzip2 ]; + environment.NIX_REMOTE = "daemon"; + + serviceConfig = { + ExecStart = "${pkgs.nix-serve}/bin/nix-serve " + + "--port ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}"; + User = "nobody"; + Group = "nogroup"; + }; + }; + }; +} -- cgit 1.4.1 From 779b65f0193ca0d18b3d815a99cccd5886ef2126 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 14 May 2015 17:45:59 +0200 Subject: cups: Second attempt to fix our printing tests; add more sleep statements --- nixos/tests/printing.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'nixos') diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index e8c41140045c..1e3a0057c657 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -68,6 +68,7 @@ import ./make-test.nix ({pkgs, ... }: { # Print the file on the client. $client->succeed("lp $file"); + $client->sleep(10); $client->succeed("lpq") =~ /active.*root.*$fn/ or die; # Ensure that a raw PCL file appeared in the server's queue @@ -75,11 +76,13 @@ import ./make-test.nix ({pkgs, ... }: { # course, since there is no actual USB printer attached, the # file will stay in the queue forever. $server->waitForFile("/var/spool/cups/d00001-001"); + $server->sleep(10); $server->succeed("lpq -a") =~ /$fn/ or die; # Delete the job on the client. It should disappear on the # server as well. $client->succeed("lprm"); + $client->sleep(10); $client->succeed("lpq -a") =~ /no entries/; Machine::retry sub { return 1 if $server->succeed("lpq -a") =~ /no entries/; -- cgit 1.4.1 From 6a0d21eb86105ac8e631621e9425eabbab3c0a1d Mon Sep 17 00:00:00 2001 From: Jussi Maki Date: Wed, 13 May 2015 08:31:32 +0000 Subject: VMWare guest support and open-vm-tools package --- nixos/modules/module-list.nix | 1 + nixos/modules/virtualisation/vmware-guest.nix | 47 ++++++++++++++++++++++ .../virtualization/open-vm-tools/default.nix | 43 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 4 files changed, 96 insertions(+) create mode 100644 nixos/modules/virtualisation/vmware-guest.nix create mode 100644 pkgs/applications/virtualization/open-vm-tools/default.nix (limited to 'nixos') diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bf70715cea4c..c1677ff05731 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -460,5 +460,6 @@ ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/virtualbox-guest.nix + ./virtualisation/vmware-guest.nix ./virtualisation/xen-dom0.nix ] diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix new file mode 100644 index 000000000000..3f19f6a28b2b --- /dev/null +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.vmwareGuest; + open-vm-tools = pkgs.open-vm-tools; +in +{ + options = { + services.vmwareGuest.enable = mkEnableOption "Enable VMWare Guest Support"; + }; + + config = mkIf cfg.enable { + assertions = [ { + assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64; + message = "VMWare guest is not currently supported on ${pkgs.stdenv.system}"; + } ]; + + environment.systemPackages = [ open-vm-tools ]; + + systemd.services.vmware = + { description = "VMWare Guest Service"; + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd"; + }; + + services.xserver = { + videoDrivers = mkOverride 50 [ "vmware" ]; + + config = '' + Section "InputDevice" + Identifier "VMMouse" + Driver "vmmouse" + EndSection + ''; + + serverLayoutSection = '' + InputDevice "VMMouse" + ''; + + displayManager.sessionCommands = '' + ${open-vm-tools}/bin/vmware-user-suid-wrapper + ''; + }; + }; +} diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix new file mode 100644 index 000000000000..4f32ec55a0e1 --- /dev/null +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchurl, makeWrapper, autoconf, automake, + libmspack, openssl, pam, xercesc, icu, libdnet, procps, + x11, libXinerama, libXi, libXrender, libXrandr, libXtst, + pkgconfig, glib, gtk, gtkmm }: + +let + majorVersion = "9.10"; + minorVersion = "0"; + patchSet = "2476743"; + version = "${majorVersion}.${minorVersion}-${patchSet}"; + +in stdenv.mkDerivation { + name = "open-vm-tools-${version}"; + src = fetchurl { + url = "mirror://sourceforge/project/open-vm-tools/open-vm-tools/stable-${majorVersion}.x/open-vm-tools-${version}.tar.gz"; + sha256 = "15lwayrz9bpx4z12fj616hsn25m997y72licwwz7kms4sx9ssip1"; + }; + + buildInputs = + [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps + pkgconfig glib gtk gtkmm x11 libXinerama libXi libXrender libXrandr libXtst ]; + + patchPhase = '' + sed -i s,-Werror,,g configure.ac + sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am + sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am + ''; + + preConfigure = "autoreconf"; + configureFlags = "--without-kernel-modules --without-xmlsecurity"; + + meta = with stdenv.lib; { + homepage = "https://github.com/vmware/open-vm-tools"; + description = "Set of tools for VMWare guests to improve host-guest interaction"; + longDescription = '' + A set of services and modules that enable several features in VMware products for + better management of, and seamless user interactions with, guests. + ''; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ joamaki ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00737083a7b3..2c5433784d1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9547,6 +9547,11 @@ let numactl = callPackage ../os-specific/linux/numactl { }; + open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { + inherit (xlibs) libXinerama libXi libXrender libXrandr libXtst; + inherit (gnome) gtk gtkmm; + }; + gocode = callPackage ../development/tools/gocode { }; gotags = callPackage ../development/tools/gotags { }; -- cgit 1.4.1 From c59c20ca0f1163b868efa843a98cfcb55cfbbd56 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 16 May 2015 14:12:11 -0500 Subject: Update HPLIP to 3.15.4 --- nixos/doc/manual/release-notes/rl-unstable.xml | 9 +++++++++ pkgs/misc/drivers/hplip/default.nix | 16 ++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) (limited to 'nixos') diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index c4691aa663f4..9563dcbb343b 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -61,6 +61,15 @@ was accordingly renamed to bomi + + + HPLIP (printer, scanner, and fax drivers for HP devices) has + been updated to version 3.15.4. This release + adds support for the arm6l-linux and + arm7l-linux platforms. + + + diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 7c4e6f45bb4d..bb790be7c268 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -6,11 +6,11 @@ let - name = "hplip-3.15.2"; + name = "hplip-3.15.4"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0z7n62vdbr0p0kls1m2sr3nhvkhx3rawcbzd0zdl0lnq8fkyq0jz"; + sha256 = "0s1yiifp002n8qy0i4cv6j0hq9ikp4jabki5w3xzlaqgd4bjz1x3"; }; hplip_state = @@ -21,9 +21,17 @@ let version = (builtins.parseDrvName name).version; }; + hplip_arch = + { + "i686-linux" = "x86_32"; + "x86_64-linux" = "x86_64"; + "arm6l-linux" = "arm32"; + "arm7l-linux" = "arm32"; + }."${stdenv.system}" or (abort "Unsupported platform ${stdenv.system}"); + plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "1pzxv9yway1x1m5grz6042p54ldh7jcgv4qrkjhlcb4vr9plwql9"; + sha256 = "00zhaq48m7p6nrxfy16086hzghf2pfr32s53sndbpp2514v2j392"; }; in @@ -135,7 +143,7 @@ stdenv.mkDerivation { license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; maintainers = with maintainers; [ ttuegel jgeerds ]; }; } -- cgit 1.4.1 From 25f95555990b2681a269b066c47bf790e3bcbf3f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 18 May 2015 10:48:05 +0200 Subject: Drop GNOME 3.12 --- .../services/x11/desktop-managers/gnome3.nix | 5 +- nixos/tests/gnome3_16.nix | 34 --- pkgs/applications/video/byzanz/default.nix | 4 +- .../desktops/gnome-3/3.12/apps/bijiben/default.nix | 40 --- .../gnome-3/3.12/apps/evolution/default.nix | 50 ---- .../gnome-3/3.12/apps/file-roller/default.nix | 33 --- pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix | 39 --- pkgs/desktops/gnome-3/3.12/apps/glade/default.nix | 36 --- .../gnome-3/3.12/apps/gnome-boxes/default.nix | 46 ---- .../gnome-3/3.12/apps/gnome-clocks/default.nix | 40 --- .../gnome-3/3.12/apps/gnome-documents/default.nix | 56 ---- .../gnome-3/3.12/apps/gnome-music/default.nix | 44 --- .../gnome-3/3.12/apps/gnome-photos/default.nix | 47 ---- .../gnome-3/3.12/apps/nautilus-sendto/default.nix | 22 -- pkgs/desktops/gnome-3/3.12/apps/polari/default.nix | 35 --- .../gnome-3/3.12/apps/pomodoro/default.nix | 49 ---- .../gnome-3/3.12/apps/seahorse/default.nix | 40 --- pkgs/desktops/gnome-3/3.12/core/baobab/default.nix | 40 --- .../desktops/gnome-3/3.12/core/caribou/default.nix | 27 -- pkgs/desktops/gnome-3/3.12/core/dconf/default.nix | 28 -- .../desktops/gnome-3/3.12/core/empathy/default.nix | 54 ---- pkgs/desktops/gnome-3/3.12/core/eog/default.nix | 29 -- .../gnome-3/3.12/core/epiphany/default.nix | 53 ---- .../3.12/core/epiphany/libxml_missing_dep.patch | 10 - pkgs/desktops/gnome-3/3.12/core/evince/default.nix | 68 ----- .../3.12/core/evolution-data-server/default.nix | 34 --- pkgs/desktops/gnome-3/3.12/core/folks/default.nix | 40 --- pkgs/desktops/gnome-3/3.12/core/gconf/default.nix | 32 --- pkgs/desktops/gnome-3/3.12/core/gcr/default.nix | 28 -- pkgs/desktops/gnome-3/3.12/core/gdm/default.nix | 41 --- .../gnome-3/3.12/core/gdm/propagate_env.patch | 13 - .../gnome-3/3.12/core/gdm/sessions_dir.patch | 17 -- .../gnome-3/3.12/core/gdm/xserver_path.patch | 15 -- .../gnome-3/3.12/core/geocode-glib/default.nix | 20 -- pkgs/desktops/gnome-3/3.12/core/gjs/default.nix | 21 -- .../3.12/core/gnome-backgrounds/default.nix | 16 -- .../gnome-3/3.12/core/gnome-bluetooth/default.nix | 22 -- .../gnome-3/3.12/core/gnome-calculator/default.nix | 36 --- .../gnome-3/3.12/core/gnome-common/default.nix | 17 -- .../core/gnome-contacts/configure_dbus_glib.patch | 10 - .../gnome-3/3.12/core/gnome-contacts/default.nix | 51 ---- .../3.12/core/gnome-control-center/default.nix | 60 ----- .../search_providers_dir.patch | 17 -- .../gnome-control-center/vpn_plugins_path.patch | 19 -- .../gnome-3/3.12/core/gnome-desktop/default.nix | 27 -- .../gnome-3/3.12/core/gnome-dictionary/default.nix | 38 --- .../3.12/core/gnome-disk-utility/default.nix | 41 --- .../3.12/core/gnome-font-viewer/default.nix | 37 --- .../core/gnome-icon-theme-symbolic/default.nix | 28 -- .../gnome-3/3.12/core/gnome-icon-theme/default.nix | 18 -- .../gnome-3/3.12/core/gnome-keyring/default.nix | 38 --- .../gnome-3/3.12/core/gnome-menus/default.nix | 24 -- .../3.12/core/gnome-online-accounts/default.nix | 22 -- .../3.12/core/gnome-online-miners/default.nix | 35 --- .../gnome-3/3.12/core/gnome-screenshot/default.nix | 37 --- .../gnome-3/3.12/core/gnome-session/default.nix | 30 --- .../3.12/core/gnome-settings-daemon/default.nix | 35 --- .../3.12/core/gnome-shell-extensions/default.nix | 26 -- .../gnome-3/3.12/core/gnome-shell/default.nix | 55 ---- .../gnome-3/3.12/core/gnome-system-log/default.nix | 37 --- .../3.12/core/gnome-system-monitor/default.nix | 39 --- .../gnome-3/3.12/core/gnome-terminal/default.nix | 34 --- .../3.12/core/gnome-themes-standard/default.nix | 15 -- .../gnome-3/3.12/core/gnome-user-docs/default.nix | 20 -- .../gnome-3/3.12/core/gnome-user-share/default.nix | 51 ---- .../gnome-3/3.12/core/grilo-plugins/default.nix | 27 -- pkgs/desktops/gnome-3/3.12/core/grilo/default.nix | 31 --- .../core/gsettings-desktop-schemas/default.nix | 21 -- .../gnome-3/3.12/core/gtksourceview/default.nix | 28 -- .../3.12/core/gtksourceview/nix_share_path.patch | 11 - .../gnome-3/3.12/core/gucharmap/default.nix | 38 --- .../gnome-3/3.12/core/libcroco/default.nix | 18 -- .../gnome-3/3.12/core/libgdata/default.nix | 25 -- pkgs/desktops/gnome-3/3.12/core/libgee/default.nix | 25 -- .../3.12/core/libgee/fix_introspection_paths.patch | 13 - .../gnome-3/3.12/core/libgnome-keyring/default.nix | 26 -- .../gnome-3/3.12/core/libgnomekbd/default.nix | 24 -- .../gnome-3/3.12/core/libgweather/default.nix | 21 -- .../desktops/gnome-3/3.12/core/libgxps/default.nix | 20 -- .../desktops/gnome-3/3.12/core/libpeas/default.nix | 29 -- .../gnome-3/3.12/core/libzapojit/default.nix | 16 -- pkgs/desktops/gnome-3/3.12/core/mutter/default.nix | 33 --- .../gnome-3/3.12/core/nautilus/default.nix | 29 -- .../gnome-3/3.12/core/nautilus/extension_dir.patch | 24 -- pkgs/desktops/gnome-3/3.12/core/rest/default.nix | 18 -- pkgs/desktops/gnome-3/3.12/core/sushi/default.nix | 38 --- .../gnome-3/3.12/core/totem-pl-parser/default.nix | 20 -- pkgs/desktops/gnome-3/3.12/core/totem/default.nix | 47 ---- .../desktops/gnome-3/3.12/core/tracker/default.nix | 55 ---- pkgs/desktops/gnome-3/3.12/core/vino/default.nix | 33 --- pkgs/desktops/gnome-3/3.12/core/vte/default.nix | 43 --- .../gnome-3/3.12/core/vte/expose_select_text.patch | 227 ---------------- .../gnome-3/3.12/core/yelp-tools/default.nix | 22 -- .../gnome-3/3.12/core/yelp-xsl/default.nix | 23 -- pkgs/desktops/gnome-3/3.12/core/yelp/default.nix | 36 --- pkgs/desktops/gnome-3/3.12/core/zenity/default.nix | 23 -- pkgs/desktops/gnome-3/3.12/default.nix | 299 --------------------- .../gnome-3/3.12/desktop/rarian/default.nix | 16 -- .../gnome-3/3.12/devtools/anjuta/default.nix | 28 -- .../desktops/gnome-3/3.12/devtools/gdl/default.nix | 24 -- pkgs/desktops/gnome-3/3.12/misc/geary/default.nix | 49 ---- .../gnome-3/3.12/misc/geary/disable_valadoc.patch | 24 -- pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix | 25 -- .../gnome-3/3.12/misc/gfbgraph/default.nix | 23 -- pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix | 45 ---- .../gnome-3/3.12/misc/gnome-tweak-tool/default.nix | 45 ---- .../misc/gnome-tweak-tool/find_gsettings.patch | 22 -- pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix | 37 --- .../desktops/gnome-3/3.12/misc/goffice/default.nix | 36 --- .../gnome-3/3.12/misc/goffice/pcre_info.patch | 13 - pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix | 43 --- .../desktops/gnome-3/3.12/misc/gtkhtml/default.nix | 17 -- pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix | 30 --- .../gnome-3/3.12/misc/libgit2-glib/default.nix | 21 -- .../gnome-3/3.12/misc/libmediaart/default.nix | 19 -- .../3.16/core/gnome-control-center/default.nix | 6 +- .../gnome-3/3.16/core/gnome-shell/default.nix | 7 +- pkgs/desktops/gnome-3/3.16/default.nix | 18 +- pkgs/development/libraries/clutter/1.18.nix | 52 ---- pkgs/development/libraries/cogl/1.18.nix | 57 ---- pkgs/development/libraries/gtk+/3.16.nix | 69 ----- pkgs/development/libraries/gtk+/3.x.nix | 16 +- pkgs/development/libraries/gtkmm/3.16.nix | 42 --- pkgs/development/libraries/gtkmm/3.x.nix | 4 +- pkgs/top-level/all-packages.nix | 21 +- 125 files changed, 23 insertions(+), 4254 deletions(-) delete mode 100644 nixos/tests/gnome3_16.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/glade/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/polari/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/baobab/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/caribou/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/dconf/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/empathy/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/eog/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/evince/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/folks/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gconf/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gcr/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gjs/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/grilo/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgee/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/mutter/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/rest/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/sushi/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/totem/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/tracker/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/vino/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/vte/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/core/zenity/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/geary/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix delete mode 100644 pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix delete mode 100644 pkgs/development/libraries/clutter/1.18.nix delete mode 100644 pkgs/development/libraries/cogl/1.18.nix delete mode 100644 pkgs/development/libraries/gtk+/3.16.nix delete mode 100644 pkgs/development/libraries/gtkmm/3.16.nix (limited to 'nixos') diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index d53f119c9558..cf6d2cab3492 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -45,7 +45,7 @@ in { environment.gnome3.packageSet = mkOption { default = null; - example = literalExample "pkgs.gnome3_12"; + example = literalExample "pkgs.gnome3_16"; description = "Which GNOME 3 package set to use."; apply = p: if p == null then pkgs.gnome3 else p; }; @@ -109,9 +109,6 @@ in { # Override default mimeapps export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share - # Let gnome-control-center find gnome-shell search providers. GNOME 3.12 compatibility. - export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/ - # Let nautilus find extensions export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/ diff --git a/nixos/tests/gnome3_16.nix b/nixos/tests/gnome3_16.nix deleted file mode 100644 index 23a66aba50c5..000000000000 --- a/nixos/tests/gnome3_16.nix +++ /dev/null @@ -1,34 +0,0 @@ -import ./make-test.nix { - name = "gnome3"; - - machine = - { config, pkgs, ... }: - - { imports = [ ./common/user-account.nix ]; - - services.xserver.enable = true; - - services.xserver.displayManager.auto.enable = true; - services.xserver.displayManager.auto.user = "alice"; - services.xserver.desktopManager.gnome3.enable = true; - - environment.gnome3.packageSet = pkgs.gnome3_16; - - virtualisation.memorySize = 512; - }; - - testScript = - '' - $machine->waitForX; - $machine->sleep(15); - - # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); - - $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); - $machine->waitForWindow(qr/Terminal/); - $machine->sleep(20); - $machine->screenshot("screen"); - ''; - -} diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 69b0ffbe1314..79b9ab92ad9a 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, which, gnome3_12, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }: +{ stdenv, fetchgit, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }: stdenv.mkDerivation rec { version = "0.2.3.alpha"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./autogen.sh --prefix=$out ''; - buildInputs = [ which gnome3_12.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; + buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; meta = with stdenv.lib; { description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser"; diff --git a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix deleted file mode 100644 index c4f6741c070a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib -, hicolor_icon_theme, makeWrapper, itstool, desktop_file_utils -, clutter_gtk, libuuid, webkitgtk, zeitgeist -, gnome3, librsvg, gdk_pixbuf, libxml2 }: - -stdenv.mkDerivation rec { - name = "bijiben-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/bijiben/3.12/${name}.tar.xz"; - sha256 = "f319ef2a5b69ff9368e7488a28453da0f10eaa39a0f8e5d74623d0c07c824708"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig glib intltool itstool libxml2 - clutter_gtk libuuid webkitgtk gnome3.tracker - gnome3.gnome_online_accounts zeitgeist desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/bijiben" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Bijiben; - description = "Note editor designed to remain simple to use"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix deleted file mode 100644 index f0356352098e..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight, sqlite -, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3 -, makeWrapper, itstool, shared_mime_info, libical, db, gcr -, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool -, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }: - -stdenv.mkDerivation rec { - name = "evolution-3.12.5"; - - src = fetchurl { - url = "mirror://gnome/sources/evolution/3.12/${name}.tar.xz"; - sha256 = "08y1qiydbbk4fq8rrql9sgbwsny8bwz6f7m5kbbj5zjqvf1baksj"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - gdk_pixbuf gnome3.gnome_icon_theme librsvg db icu - gnome3.evolution_data_server libsecret libical gcr - webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 - libcanberra_gtk3 gnome3.gtkhtml bogofilter gnome3.libgdata - gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings_desktop_schemas makeWrapper sqlite ]; - - configureFlags = [ "--disable-spamassassin" "--disable-pst-import" ]; - - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Evolution; - description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix deleted file mode 100644 index deff8494866b..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive -, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }: - -stdenv.mkDerivation rec { - name = "file-roller-${version}"; - - majVersion = "3.12"; - version = "${majVersion}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz"; - sha256 = "0677be6618dba609eae2d76420e8a5a8d9a414bcec654e7b71e65b941764eacf"; - }; - - # TODO: support nautilus - # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so - - buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive - hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - attr bzip2 acl gdk_pixbuf librsvg makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/file-roller" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/FileRoller; - description = "Archive manager for the GNOME desktop environment"; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix deleted file mode 100644 index c65a28c34467..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, intltool, fetchurl, enchant, isocodes -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libsoup, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "gedit-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gedit/3.12/${name}.tar.xz"; - sha256 = "0lxnswqa0ysr57cqh062wp41sd76p6q7y3mnkl7rligd5c8hnikm"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes - gdk_pixbuf gnome3.gnome_icon_theme librsvg libsoup - gnome3.libpeas gnome3.gtksourceview libxml2 - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper file ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/gedit" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gedit; - description = "Official text editor of the GNOME desktop environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix deleted file mode 100644 index 4783804f200a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, python -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, libxml2, docbook_xsl -, gnome3, librsvg, gdk_pixbuf, libxslt }: - -stdenv.mkDerivation rec { - name = "glade-3.16.1"; - - src = fetchurl { - url = "mirror://gnome/sources/glade/3.16/${name}.tar.xz"; - sha256 = "994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python - gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl - gdk_pixbuf gnome3.gnome_icon_theme librsvg libxslt - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/glade" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Glade; - description = "User interface designer for GTK+ applications"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix deleted file mode 100644 index 7d33933656a3..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib -, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk -, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala -, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg -, hicolor_icon_theme, desktop_file_utils, mtools, cdrkit, libcdio -}: - -# TODO: ovirt (optional) - -stdenv.mkDerivation rec { - name = "gnome-boxes-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-boxes/3.12/${name}.tar.xz"; - sha256 = "0kzdh8kk9isaskbfyj7r7nybgdyhj7i4idkgahdsl9xs9sj2pmc8"; - }; - - enableParallelBuilding = true; - - doCheck = true; - - buildInputs = [ - makeWrapper pkgconfig intltool itstool libvirt-glib glib - gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol - libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp - gdbm cyrus_sasl gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - librsvg hicolor_icon_theme desktop_file_utils - ]; - - 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 : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin" - done - ''; - - meta = with stdenv.lib; { - description = "Simple GNOME 3 application to access remote or virtual systems"; - homepage = https://wiki.gnome.org/action/show/Apps/Boxes; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix deleted file mode 100644 index 47bcbf692ad6..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, intltool, fetchurl, libgweather, libnotify -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, libcanberra_gtk3, libtool -, gnome3, librsvg, gdk_pixbuf, geoclue2 }: - -stdenv.mkDerivation rec { - name = "gnome-clocks-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/3.12/${name}.tar.xz"; - sha256 = "3fc0ce2b7b2540d6c2d791ff63ab1670f189a339c804fcf24c9010a478314604"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.gnome_icon_theme librsvg - gnome3.gnome_desktop gnome3.geocode_glib geoclue2 - libgweather libnotify libtool - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/gnome-clocks" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Clocks; - description = "Clock application designed for GNOME 3"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix deleted file mode 100644 index 642e0044a757..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, intltool, fetchurl, evince, gjs -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, libxslt, webkitgtk -, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl -, gobjectIntrospection, json_glib -, gmp, desktop_file_utils }: - -stdenv.mkDerivation rec { - name = "gnome-documents-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-documents/3.12/${name}.tar.xz"; - sha256 = "6d0df1d90781d56992ed5d5c2591833e89e3aa756ccab63f82dd935185ce5a53"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt - docbook_xsl desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper gmp - gdk_pixbuf gnome3.gnome_icon_theme librsvg evince - libsoup webkitgtk gjs gobjectIntrospection gnome3.rest - gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts - gnome3.gnome_desktop gnome3.libzapojit json_glib - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - enableParallelBuilding = true; - - preFixup = - let - libPath = stdenv.lib.makeLibraryPath - [ evince gtk3 gnome3.tracker gnome3.gnome_online_accounts ]; - in - '' - substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication" - - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${libPath}" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --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" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Documents; - description = "Document manager application designed to work with GNOME 3"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix deleted file mode 100644 index ebcd4c0d01ed..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker -, python3, libxml2, python3Packages, libnotify -, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo -, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: - -stdenv.mkDerivation rec { - name = "gnome-music-3.12.2.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-music/3.12/${name}.tar.xz"; - sha256 = "1vwzjv5001pg37qc0sh4ph3srqwg3vgibbdlqpim9w2k70l9j34z"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart - gdk_pixbuf gnome3.gnome_icon_theme librsvg python3 cairo - gnome3.grilo libxml2 python3Packages.pygobject3 libnotify - python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper tracker ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/gnome-music" \ - --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 GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ - --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Music; - description = "Music player and management application for the GNOME desktop environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix deleted file mode 100644 index 4d080039a880..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, intltool, fetchurl, exempi, libxml2 -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, gegl, babl, lcms2 -, desktop_file_utils, gmp -, gnome3, librsvg, gdk_pixbuf, libexif }: - -stdenv.mkDerivation rec { - name = "gnome-photos-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-photos/3.12/${name}.tar.xz"; - sha256 = "077cc6c2ae28680457fba435a22184e25f3a60a6fbe1901a75e42f6f6136538f"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl - gnome3.gsettings_desktop_schemas makeWrapper gmp - gdk_pixbuf gnome3.gnome_icon_theme librsvg exempi - gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo - gnome3.gnome_online_accounts gnome3.gnome_desktop - lcms2 libexif gnome3.tracker libxml2 desktop_file_utils - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - substituteInPlace $out/bin/gnome-photos --replace gapplication "${glib}/bin/gapplication" - - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - 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"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix deleted file mode 100644 index 5a85e00e4e45..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool -, gobjectIntrospection, makeWrapper }: - -stdenv.mkDerivation rec { - name = "nautilus-sendto-${version}"; - - version = "3.8.1"; - - src = fetchurl { - url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz"; - sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab"; - }; - - buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ]; - - meta = with stdenv.lib; { - description = "Integrates Evolution and Pidgin into the Nautilus file manager"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix deleted file mode 100644 index 6289fd4a6db5..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{stdenv, fetchurl, makeWrapper, intltool, pkgconfig, gobjectIntrospection, glib -, gtk3, telepathy_glib, gnome3, telepathy_idle, telepathy_logger, libsoup -, gdk_pixbuf, librsvg }: - -stdenv.mkDerivation rec { - name = "polari-3.12.2"; - - src = fetchurl { - url = "https://download.gnome.org/sources/polari/3.12/${name}.tar.xz"; - sha256 = "8b10f369fac9e5e48a7bed51320754262d00c1bb14899a321b02843e20c0a995"; - }; - - buildInputs = [ makeWrapper intltool pkgconfig gobjectIntrospection glib gtk3 - telepathy_glib gnome3.gjs telepathy_logger libsoup - gdk_pixbuf librsvg - gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - propagatedUserEnvPkgs = [ telepathy_idle ]; - - preFixup = '' - wrapProgram "$out/bin/polari" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Internet Relay Chat (IRC) client designed for GNOME 3"; - homepage = https://wiki.gnome.org/Apps/Polari; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix deleted file mode 100644 index 152acb26b1bc..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, - dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3_12, gtk3, gst_plugins_base, - glib, gobjectIntrospection, hicolor_icon_theme -}: - -stdenv.mkDerivation rec { - rev = "0.10.3"; - name = "gnome-shell-pomodoro-${rev}-61df3fa"; - - src = fetchFromGitHub { - owner = "codito"; - repo = "gnome-shell-pomodoro"; - rev = "${rev}"; - sha256 = "0i0glmijalppb5hdb1xd6xnmv824l2w831rpkqmhxi0iqbvaship"; - }; - - configureScript = ''./autogen.sh''; - - buildInputs = [ - which automake113x intltool glib gobjectIntrospection pkgconfig libtool - makeWrapper dbus_glib libcanberra upower vala gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gnome3_12.gsettings_desktop_schemas gnome3_12.gnome_desktop - gnome3_12.gnome_common gnome3_12.gnome_shell hicolor_icon_theme gtk3 - ]; - - preBuild = '' - sed -i \ - -e 's|/usr\(/share/gir-1.0/UPowerGlib\)|${upower}\1|' \ - -e 's|/usr\(/share/gir-1.0/GnomeDesktop\)|${gnome3_12.gnome_desktop}\1|' \ - vapi/Makefile - ''; - - preFixup = '' - wrapProgram $out/bin/gnome-pomodoro \ - --prefix XDG_DATA_DIRS : \ - "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS" - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/codito/gnome-shell-pomodoro; - description = - "Personal information management application that provides integrated " + - "mail, calendaring and address book functionality"; - maintainers = with maintainers; [ DamienCassou ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix deleted file mode 100644 index 02365d6b3d5a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, intltool, fetchurl, vala -, pkgconfig, gtk3, glib, hicolor_icon_theme -, makeWrapper, itstool, gnupg, libsoup -, gnome3, librsvg, gdk_pixbuf, gpgme -, libsecret, avahi, p11_kit }: - -stdenv.mkDerivation rec { - name = "seahorse-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/seahorse/3.12/${name}.tar.xz"; - sha256 = "5e6fb25373fd4490e181e2fa0f5cacf99b78b2f6caa5d91c9c605900fb5f3839"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings_desktop_schemas makeWrapper gnupg - gdk_pixbuf gnome3.gnome_icon_theme librsvg gpgme - libsecret avahi libsoup p11_kit vala gnome3.gcr - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - wrapProgram "$out/bin/seahorse" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Seahorse; - description = "Application for managing encryption keys and passwords in the GnomeKeyring"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix deleted file mode 100644 index 4d6c91787a37..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, intltool, fetchurl, vala, libgtop -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "baobab-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/baobab/3.12/${name}.tar.xz"; - sha256 = "494808d8a5b1776377749a1dcd5b251eb399208a4c90380dc8b8c789811e514c"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - wrapProgram "$out/bin/baobab" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Baobab; - description = "Graphical application to analyse disk usage in any Gnome environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix deleted file mode 100644 index 3a6c3f0dd357..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2 -, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core }: - - -stdenv.mkDerivation rec { - name = "caribou-0.4.13"; - - src = fetchurl { - url = "mirror://gnome/sources/caribou/0.4/${name}.tar.xz"; - sha256 = "953ba618621fda8a828d0d797fc916dbe35990dc01d7aa99d15e5e2241ee2782"; - }; - - buildInputs = with gnome3; - [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python pythonPackages.pygobject3 - libxml2 libXtst gtk2 intltool libxslt ]; - - propagatedBuildInputs = [ gnome3.libgee libxklavier ]; - - preBuild = '' - patchShebangs . - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix deleted file mode 100644 index a1d98449bee9..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 -, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: - -stdenv.mkDerivation rec { - name = "dconf-${version}"; - version = "0.20.0"; - - src = fetchurl { - url = "mirror://gnome/sources/dconf/0.20/${name}.tar.xz"; - sha256 = "22c046a247d05ea65ad181e3aef4009c898a5531f76c0181f8ec0dfef83447d9"; - }; - - buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 - intltool docbook_xsl docbook_xsl_ns makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/dconf-editor" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - - rm $out/lib/gio/modules/giomodule.cache - rm $out/share/icons/hicolor/icon-theme.cache - rm $out/share/icons/HighContrast/icon-theme.cache - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix deleted file mode 100644 index a10450d93328..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf -, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream -, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts -, gcr, libsecret, folks, pulseaudio, telepathy_mission_control -, telepathy_logger, libnotify, clutter, libsoup, gnutls -, evolution_data_server -, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info -, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }: - -# TODO: enable more features - -stdenv.mkDerivation rec { - name = "empathy-3.12.5"; - - src = fetchurl { - url = "mirror://gnome/sources/empathy/3.12/${name}.tar.xz"; - sha256 = "0rhgpiv75aafmdh6r7d4ci59lnxqmmwg9hvsa5b3mk7j2d2pma86"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard - gnome_online_accounts shared_mime_info ]; - propagatedBuildInputs = [ folks telepathy_logger evolution_data_server - telepathy_mission_control ]; - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool - libxml2 libxslt icu file makeWrapper - telepathy_glib clutter_gtk clutter-gst cogl - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf - libnotify clutter libsoup gnutls libgee p11_kit - libcanberra_gtk3 telepathy_farstream farstream - gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas file libtool librsvg ]; - - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" - "-I${dbus_libs}/include/dbus-1.0" - "-I${dbus_libs}/lib/dbus-1.0/include" ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Empathy; - description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; - maintainers = with maintainers; [ lethalman ]; - # TODO: license = [ licenses.gpl2 licenses.lgpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix deleted file mode 100644 index de30f0dbbe14..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3 -, shared_mime_info, makeWrapper, librsvg, libexif }: - - -stdenv.mkDerivation rec { - name = "eog-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/eog/3.12/${name}.tar.xz"; - sha256 = "0ca8be7f20c98e9b104b2c1fa53df293e5403e6d517de845ae0f3b72777453fd"; - }; - - buildInputs = with gnome3; - [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg - gsettings_desktop_schemas shared_mime_info gnome_icon_theme gnome_desktop libexif ]; - - preFixup = '' - wrapProgram "$out/bin/eog" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/EyeOfGnome; - platforms = platforms.linux; - description = "GNOME image viewer"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix deleted file mode 100644 index d159965c5443..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu -, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool -, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit -, sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, hicolor_icon_theme, gdk_pixbuf, librsvg, gnome_common }: - -stdenv.mkDerivation rec { - name = "epiphany-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/epiphany/3.12/${name}.tar.xz"; - sha256 = "16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93"; - }; - - # Tests need an X display - configureFlags = [ "--disable-static --disable-tests" ]; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - nativeBuildInputs = [ pkgconfig file ]; - - configureScript = "./autogen.sh"; - - buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file - webkitgtk libsoup libsecret gnome_desktop libnotify libtool - sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools - gdk_pixbuf gnome3.gnome_icon_theme librsvg which gnome_common - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; - - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - patches = [ ./libxml_missing_dep.patch ]; - patchFlags = "-p0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Epiphany; - description = "WebKit based web browser for GNOME"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch b/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch deleted file mode 100644 index c4dc85cd97e6..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2014-05-19 13:28:28.493988695 +0200 -+++ configure.ac 2014-05-19 13:28:54.837159748 +0200 -@@ -115,6 +115,7 @@ - - PKG_CHECK_MODULES(WEB_EXTENSION, [ - $WEBKIT_GTK_PC_NAME >= $WEBKIT_GTK_REQUIRED -+ libxml-2.0 >= $LIBXML_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - ]) - AC_SUBST(WEB_EXTENSION_CFLAGS) diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix deleted file mode 100644 index d1ad071d426a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 -, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 -, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper -, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number -, gobjectIntrospection -}: - -stdenv.mkDerivation rec { - name = "evince-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/evince/3.12/${name}.tar.xz"; - sha256 = "30c243bbfde56338c25a39003b4848143be42157177e2163a368f14139909f7d"; - }; - - buildInputs = [ - pkgconfig intltool perl perlXMLParser libxml2 - glib gtk3 pango atk gdk_pixbuf gobjectIntrospection - itstool gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas - poppler ghostscriptX djvulibre libspectre - makeWrapper libsecret librsvg - ]; - - configureFlags = [ - "--disable-nautilus" # Do not use nautilus - "--enable-introspection" - ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - preConfigure = with stdenv.lib; - optionalString doCheck '' - for file in test/*.py; do - echo "patching $file" - sed '1s,/usr,${python},' -i "$file" - done - '' + optionalString (recentListSize != null) '' - sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c - sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c - ''; - - preFixup = '' - # Tell Glib/GIO about the MIME info directory, which is used - # by `g_file_info_get_content_type ()'. - wrapProgram "$out/bin/evince" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - doCheck = false; # would need pythonPackages.dogTail, which is missing - - meta = with stdenv.lib; { - homepage = http://www.gnome.org/projects/evince/; - description = "GNOME's document viewer"; - - longDescription = '' - Evince is a document viewer for multiple document formats. It - currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal - of Evince is to replace the multiple document viewers that exist - on the GNOME Desktop with a single simple application. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix deleted file mode 100644 index a92cf684a761..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python, sqlite -, intltool, libsoup, libxml2, libsecret, icu -, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }: - - -stdenv.mkDerivation rec { - name = "evolution-data-server-3.12.5"; - - src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/3.12/${name}.tar.xz"; - sha256 = "d3a2f832f823cb2a41467926dcaec984a15b2cb51ef89cf41267e337ca750811"; - }; - - buildInputs = with gnome3; - [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret - gcr p11_kit db nspr nss libgweather libical libgdata gperf makeWrapper icu sqlite ] - ++ stdenv.lib.optional valaSupport vala; - - # uoa irrelevant for now - configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"] - ++ stdenv.lib.optional valaSupport "--enable-vala-bindings"; - - preFixup = '' - for f in "$out/libexec/"*; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix deleted file mode 100644 index 7e3af8405a4b..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs -, telepathy_glib, evolution_data_server, libsecret, db }: - -# TODO: enable more folks backends - -stdenv.mkDerivation rec { - name = "folks-0.9.8"; - - src = fetchurl { - url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz"; - sha256 = "09cbs3ihcswpi1wg8xbjmkqjbhnxa1idy1fbzmz0gah7l5mxmlfj"; - }; - - propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; - # dbus_daemon needed for tests - buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs - vala libsecret libxml2 libsoup nspr nss intltool db ]; - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = "--disable-fatal-warnings"; - - NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" - "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; - - enableParallelBuilding = true; - - postBuild = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "Folks"; - - homepage = https://wiki.gnome.org/Projects/Folks; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix deleted file mode 100644 index a4cb3e8c1464..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2 -, intltool, polkit, orbit, withGtk ? false }: - -assert withGtk -> (gnome3 != null); - -stdenv.mkDerivation rec { - - versionMajor = "3.2"; - versionMinor = "6"; - moduleName = "GConf"; - - origName = "${moduleName}-${versionMajor}.${versionMinor}"; - - name = "gconf-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz"; - sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; - }; - - buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk; - propagatedBuildInputs = [ glib dbus_glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - # ToDo: ldap reported as not found but afterwards reported as supported - - meta = with stdenv.lib; { - homepage = http://projects.gnome.org/gconf/; - description = "A system for storing application preferences"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix deleted file mode 100644 index 6dd69a64fd71..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib -, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk -, gobjectIntrospection, makeWrapper, libxslt, vala }: - -stdenv.mkDerivation rec { - name = "gcr-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gcr/3.12/${name}.tar.xz"; - sha256 = "456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c"; - }; - - buildInputs = [ - pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libxslt - libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala - ]; - - #doCheck = true; - - preFixup = '' - wrapProgram "$out/bin/gcr-viewer" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix deleted file mode 100644 index a939a8d4fd9f..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus -, intltool, accountsservice, libX11, gnome3, systemd, gnome_session -, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "gdm-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gdm/3.12/${name}.tar.xz"; - sha256 = "cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4"; - }; - - # Only needed to make it build - preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" - ''; - - configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - - buildInputs = [ pkgconfig glib itstool libxml2 intltool - accountsservice gnome3.dconf systemd - gobjectIntrospection libX11 gtk - libcanberra_gtk3 pam libtool ]; - - #enableParallelBuilding = true; # problems compiling - - preBuild = '' - substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session' - substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch' - ''; - - patches = [ ./xserver_path.patch ./sessions_dir.patch ./propagate_env.patch ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GDM; - description = "A program that manages graphical display servers and handles graphical user logins"; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch deleted file mode 100644 index b3e356a65c3e..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/daemon/gdm-launch-environment.c 2014-11-24 15:43:55.532879804 +0100 -+++ a/daemon/gdm-launch-environment.c 2014-11-28 18:22:42.636313967 +0100 -@@ -220,8 +220,8 @@ - "LANG", "LANGUAGE", "LC_CTYPE", "LC_NUMERIC", "LC_TIME", - "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER", - "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT", -- "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", -- NULL -+ "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", "XCURSOR_PATH", -+ "XDG_CONFIG_DIRS", NULL - }; - char *system_data_dirs; - int i; diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch deleted file mode 100644 index b8fbad4d731d..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index f759d2d..d154716 100644 ---- a/daemon/gdm-session.c -+++ b/daemon/gdm-session.c -@@ -373,9 +373,12 @@ get_system_session_dirs (void) - #ifdef ENABLE_WAYLAND_SUPPORT - DATADIR "/wayland-sessions/", - #endif -+ NULL, - NULL - }; - -+ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL; -+ - return search_dirs; - } - diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch deleted file mode 100644 index 412daee9f270..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200 -+++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200 -@@ -322,7 +322,11 @@ - fallback: - #endif - -- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); -+ if (g_getenv("GDM_X_SERVER") != NULL) { -+ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER")); -+ } else { -+ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); -+ } - } - - static gboolean diff --git a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix deleted file mode 100644 index 6a461e3bde6e..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: - - -stdenv.mkDerivation rec { - name = "geocode-glib-3.12.2"; - - - src = fetchurl { - url = "mirror://gnome/sources/geocode-glib/3.12/${name}.tar.xz"; - sha256 = "5ca581a927cac3025adc2afadfdaf9a493ca887537a548aa47296bc77bcfa49e"; - }; - - buildInputs = with gnome3; - [ intltool pkgconfig glib libsoup json_glib ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix deleted file mode 100644 index c1e5486d3a71..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_24, pango }: - - -stdenv.mkDerivation rec { - name = "gjs-1.40.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gjs/1.40/${name}.tar.xz"; - sha256 = "2f0d80ec96c6284785143abe51377d8a284977ea6c3cf0cef1020d92eae41793"; - }; - - buildInputs = with gnome3; - [ gobjectIntrospection pkgconfig glib pango ]; - - propagatedBuildInputs = [ spidermonkey_24 ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix deleted file mode 100644 index 46db008787f6..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool }: - -stdenv.mkDerivation rec { - name = "gnome-backgrounds-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/3.12/${name}.tar.xz"; - sha256 = "ac4d3e0fffc5991865ca748e728a1ab87f167400105250ce2195b03502427180"; - }; - - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix deleted file mode 100644 index fae47476898d..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib -, udev, itstool, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-bluetooth-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.version}/${name}.tar.xz"; - sha256 = "0rsw27yj6887axk7s2vwpsr0pmic0wdskl7sx8rk4kns7b0ifs88"; - }; - - buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 - gsettings_desktop_schemas itstool ]; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; - description = "Application that let you manage Bluetooth in the GNOME destkop"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix deleted file mode 100644 index 19d0c9c10e89..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libxml2 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-calculator-3.12.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/3.12/${name}.tar.xz"; - sha256 = "0bn3agh3g22iradfpzkc19a2b33b1mbf0ciy1hf2sijrczi24410"; - }; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - libxml2 gnome3.gtksourceview - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-calculator" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Calculator; - description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix deleted file mode 100644 index b534d6922b76..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, which, autoconf, automake }: - -stdenv.mkDerivation rec { - name = "gnome-common-3.12.0"; - - src = fetchurl { - url = "https://download.gnome.org/sources/gnome-common/3.12/${name}.tar.xz"; - sha256 = "18712bc2df6b2dd88a11b9f7f874096d1c0c6e7ebc9cfc0686ef963bd590e1d8"; - }; - - patches = [(fetchurl { - url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935"; - sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; - })]; - - propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch deleted file mode 100644 index 926762defbde..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2014-04-08 10:25:49.497620879 +0200 -+++ configure.ac 2014-04-08 10:26:36.639440950 +0200 -@@ -43,6 +43,7 @@ - folks-telepathy - folks-eds - libnotify -+ dbus-glib-1 - telepathy-glib >= 0.17.5 - libebook-1.2 >= 3.5.3 - libedataserver-1.2 >= 3.5.3 diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix deleted file mode 100644 index 5b4ca5c34182..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, intltool, fetchurl, evolution_data_server, db -, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret -, bash, makeWrapper, itstool, folks, libnotify, libxml2 -, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala, dbus_glib, automake114x, autoconf }: - -stdenv.mkDerivation rec { - name = "gnome-contacts-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/3.12/${name}.tar.xz"; - sha256 = "fb3f25d409032b24fb67241e67d4da10cf6f77a48c088709455cea5f6f33e87d"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ]; - - # force build from vala - preBuild = '' - touch src/*.vala - ''; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server - gnome3.gsettings_desktop_schemas makeWrapper file libnotify - folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib - libxml2 libsoup gnome3.gnome_online_accounts nspr nss - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - vala automake114x autoconf db ]; - - preFixup = '' - for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - patches = [ ./configure_dbus_glib.patch ]; - - patchFlags = "-p0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Contacts; - description = "Contacts is GNOME's integrated address book"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix deleted file mode 100644 index 4a394b3b8975..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig -, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify -, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, python, krb5, networkmanagerapplet, networkmanager -, libwacom, samba, shared_mime_info, tzdata, icu, libtool -, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }: - -# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules -# TODO: bluetooth, wacom, smbclient, printers - -stdenv.mkDerivation rec { - name = "gnome-control-center-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-control-center/3.12/${name}.tar.xz"; - sha256 = "5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; - - enableParallelBuilding = true; - - buildInputs = with gnome3; - [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas - libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus - gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality - accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile - shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo - gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.vino - networkmanager modemmanager makeWrapper ]; - - preBuild = '' - substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" - substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" - - # hack to make test-endianess happy - mkdir -p $out/share/locale - substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/" - ''; - - preFixup = with gnome3; '' - wrapProgram $out/bin/gnome-control-center \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - for i in $out/share/applications/*; do - substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" - done - ''; - - patches = [ ./search_providers_dir.patch ./vpn_plugins_path.patch ]; - - meta = with stdenv.lib; { - description = "Single sign-on framework for GNOME"; - maintainers = with maintainers; [ lethalman ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch deleted file mode 100644 index 7f5ad970f34e..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/panels/search/cc-search-panel.c b/panels/search/cc-search-panel.c -index d08e230..3bff4ad 100644 ---- a/panels/search/cc-search-panel.c -+++ b/panels/search/cc-search-panel.c -@@ -574,7 +574,11 @@ populate_search_providers (CcSearchPanel *self) - { - GFile *providers_location; - -- providers_location = g_file_new_for_path (DATADIR "/gnome-shell/search-providers"); -+ const gchar* search_providers_dir = g_getenv ("GNOME_SEARCH_PROVIDERS_DIR"); -+ if (search_providers_dir == NULL) { -+ search_providers_dir = DATADIR "/gnome-shell/search-providers"; -+ } -+ providers_location = g_file_new_for_path (search_providers_dir); - g_file_enumerate_children_async (providers_location, - "standard::type,standard::name,standard::content-type", - G_FILE_QUERY_INFO_NONE, diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch deleted file mode 100644 index e25105a303f4..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c -index 7dc23c2..fcb1384 100644 ---- a/panels/network/connection-editor/vpn-helpers.c -+++ b/panels/network/connection-editor/vpn-helpers.c -@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error) - if (!so_path) - goto next; - -- /* Remove any path and extension components, then reconstruct path -- * to the SO in LIBDIR -- */ -- so_name = g_path_get_basename (so_path); -- g_free (so_path); -- so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL); -- g_free (so_name); -- - module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - if (!module) { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the " diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix deleted file mode 100644 index e8d4efc1c806..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib -, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland -, gobjectIntrospection }: - -stdenv.mkDerivation rec { - - majorVersion = "3.12"; - minorVersion = "2"; - name = "gnome-desktop-${majorVersion}.${minorVersion}"; - - # this should probably be setuphook for glib - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz"; - sha256 = "b7d691363ccc90182caff1980efa7d99e4569bea968d39654102a0c4e824a44d"; - }; - - buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland - gtk3 glib intltool gnome_doc_utils libxkbfile gnome3.gsettings_desktop_schemas gobjectIntrospection ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix deleted file mode 100644 index 6f68916b781e..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "gnome-dictionary-3.10.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/3.10/${name}.tar.xz"; - sha256 = "258b60fe50f7d0580a7dc3bb83f7fe2f6f0597d4013d97ac083c3f062c350ed7"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-dictionary" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Dictionary; - description = "Dictionary is the GNOME application to look up definitions"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix deleted file mode 100644 index a68624ba0e10..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python -, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: - -stdenv.mkDerivation rec { - name = "gnome-disk-utility-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/3.12/${name}.tar.xz"; - sha256 = "5994bfae57063d74be45736050cf166cda5b1600a599703240b641b39375718e"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - libxslt libtool libsecret libpwquality cracklib - libnotify libdvdread libcanberra_gtk3 docbook_xsl - gdk_pixbuf gnome3.gnome_icon_theme - librsvg udisks2 gnome3.gnome_settings_daemon - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-disks" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Disks; - description = "A udisks graphical front-end"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix deleted file mode 100644 index a74c5722ba2a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool -, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-font-viewer-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/3.12/${name}.tar.xz"; - sha256 = "fca50711b7bd4edd1213dd4f05a309911cd1e832974142944c06d52ae07cbe45"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-font-viewer" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Program that can preview fonts and create thumbnails for fonts"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix deleted file mode 100644 index 066951c63a68..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, iconnamingutils, gtk }: - -stdenv.mkDerivation rec { - name = "gnome-icon-theme-symbolic-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.12/${name}.tar.xz"; - sha256 = "851a4c9d8e8cb0000c9e5e78259ab8b8e67c5334e4250ebcc8dfdaa33520068b"; - }; - - configureFlags = "--enable-icon-mapping"; - - # Avoid postinstall make hooks - installPhase = '' - make install-exec-am install-data-local install-pkgconfigDATA - make -C src install - ''; - - buildInputs = [ pkgconfig iconnamingutils gtk ]; - - propagatedBuildInputs = [ gnome3.gnome_icon_theme ]; - - propagatedUserEnvPkgs = [ gnome3.gnome_icon_theme ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix deleted file mode 100644 index 34a3b67af7e4..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk, hicolor_icon_theme }: - -stdenv.mkDerivation rec { - name = "gnome-icon-theme-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-icon-theme/3.12/${name}.tar.xz"; - sha256 = "359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a"; - }; - - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; - - propagatedBuildInputs = [ hicolor_icon_theme ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix deleted file mode 100644 index 59667fe3323d..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper -, docbook_xsl_ns, docbook_xsl, gnome3 }: - -stdenv.mkDerivation rec { - name = "gnome-keyring-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/3.12/${name}.tar.xz"; - sha256 = "3bc39a42d445b82d24247a8c39eeb0eef7ecb1c8ebb8e6ec62671868be93fd4c"; - }; - - buildInputs = with gnome3; [ - dbus libgcrypt pam python gtk3 gconf libgnome_keyring - pango gcr gdk_pixbuf atk p11_kit makeWrapper - ]; - - propagatedBuildInputs = [ glib libtasn1 libxslt ]; - - nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; - - configureFlags = [ - "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path - "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories - "--with-pkcs11-modules=$$out/lib/pkcs11/" - ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-keyring" \ - --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - wrapProgram "$out/bin/gnome-keyring-daemon" \ - --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix deleted file mode 100644 index 37d2ea1c0863..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "gnome-menus-${version}"; - version = "3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz"; - sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; - }; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - preBuild = "patchShebangs ./scripts"; - - buildInputs = [ intltool pkgconfig glib gobjectIntrospection ]; - - meta = { - homepage = "http://www.gnome.org"; - description = "Gnome menu specification"; - - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix deleted file mode 100644 index e113a854a8b9..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, webkitgtk, json_glib, rest, libsecret, dbus_glib -, telepathy_glib, intltool, dbus_libs, icu, libsoup, docbook_xsl_ns, docbook_xsl -}: - -stdenv.mkDerivation rec { - name = "gnome-online-accounts-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-online-accounts/3.12/${name}.tar.xz"; - sha256 = "cac7758e09d32eb54af50ab6b23d65da0c8d48c555c8db011a0cf5b977d542ec"; - }; - - NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib intltool icu libsoup docbook_xsl_ns docbook_xsl]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix deleted file mode 100644 index 394a3ee447cd..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json_glib, gmp, openssl, makeWrapper }: - -stdenv.mkDerivation rec { - name = "gnome-online-miners-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-online-miners/3.12/${name}.tar.xz"; - sha256 = "734db67bb158a046bc8bbbe418f0fdaf6d8652ac86406907a8d17d069fa48f23"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl - gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart - gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ]; - - enableParallelBuilding = true; - - preFixup = '' - for f in $out/libexec/*; do - wrapProgram "$f" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; - description = "A set of crawlers that go through your online content and index them locally in Tracker"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix deleted file mode 100644 index 349df0b103c9..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-screenshot-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-screenshot/3.12/${name}.tar.xz"; - sha256 = "ae4bf706652ae9b28c7930d22c2c37469a78d7f6656d312960b3c75ee5c36eb1"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-screenshot" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot; - description = "Utility used in the GNOME desktop environment for taking screenshots"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix deleted file mode 100644 index bebd0b4b77c4..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower -, libxslt, intltool, makeWrapper, systemd, xorg }: - - -stdenv.mkDerivation rec { - name = "gnome-session-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-session/3.12/${name}.tar.xz"; - sha256 = "fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3"; - }; - - configureFlags = "--enable-systemd"; - - buildInputs = with gnome3; - [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon xorg.xtrans - gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-session" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix deleted file mode 100644 index 81b49e6bc643..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst -, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit -, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool -, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }: - -stdenv.mkDerivation rec { - name = "gnome-settings-daemon-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/3.12/${name}.tar.xz"; - sha256 = "e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f"; - }; - - # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; - - buildInputs = with gnome3; - [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas - libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio - libcanberra_gtk3 upower colord libgweather xkeyboard_config - polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt - libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; - - preFixup = '' - wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PATH : "${glib}/bin" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix deleted file mode 100644 index 8503af44613c..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, intltool, fetchurl, libgtop -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool -, gnome3, file }: - -stdenv.mkDerivation rec { - name = "gnome-shell-extensions-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/3.12/${name}.tar.xz"; - sha256 = "30ba6e4792062e5a5cdd18e4a12230e68bfed1ded7de433ad241dd75e7ae2fc6"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool - makeWrapper file ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions; - description = "Modify and extend GNOME Shell functionality and behavior"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix deleted file mode 100644 index 578081ccf89d..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret -, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core -, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip -, hicolor_icon_theme, sqlite -, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper -, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: - -# 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 - -stdenv.mkDerivation rec { - name = "gnome-shell-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/3.12/${name}.tar.xz"; - sha256 = "3ae230e8cb7a31e7b782c16ca178af5957858810788e26a6d630b69b3f85ce71"; - }; - - buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice - libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg - clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns - libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server - libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center - hicolor_icon_theme gnome_icon_theme gnome_icon_theme_symbolic sqlite - at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ]; - - installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; - - preBuild = '' - patchShebangs src/data-to-c.pl - substituteInPlace data/Makefile --replace " install-keysDATA" "" - ''; - - preFixup = with gnome3; '' - wrapProgram "$out/bin/gnome-shell" \ - --prefix PATH : "${unzip}/bin" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - wrapProgram "$out/libexec/gnome-shell-calendar-server" \ - --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path - ''; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix deleted file mode 100644 index 9abeda537447..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-system-log-3.9.90"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz"; - sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-system-log" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-log/3.9/; - description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix deleted file mode 100644 index 622df1c5db21..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 -, bash, gtk3, glib, hicolor_icon_theme, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: - -stdenv.mkDerivation rec { - name = "gnome-system-monitor-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/3.12/${name}.tar.xz"; - sha256 = "ba074e2157302d91d73b68e13207bf85452b84234e429b1ec9b9a7b1c70736d8"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 - gtkmm3 libgtop makeWrapper - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-system-monitor" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/; - description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix deleted file mode 100644 index 057ef191a6f4..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, libuuid -, desktop_file_utils, itstool, makeWrapper, appdata-tools }: - -stdenv.mkDerivation rec { - - versionMajor = "3.12"; - versionMinor = "2"; - - name = "gnome-terminal-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz"; - sha256 = "ea19ce610af2873d26e1e75491415e17af6a5080366db966f9220fdeea5ebecd"; - }; - - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools - gnome3.dconf itstool makeWrapper gnome3.nautilus ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; - - # FIXME: enable for gnome3 - configureFlags = [ "--disable-search-provider" "--disable-migration" ]; - - preFixup = '' - for f in "$out/libexec/gnome-terminal-server"; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix deleted file mode 100644 index 5128a1951411..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-themes-standard-3.12.0"; - src = fetchurl { - url = "mirror://gnome/sources/gnome-themes-standard/3.12/${name}.tar.xz"; - sha256 = "a05d1b7ca872b944a69d0c0cc2369408ece32ff4355e37f8594a1b70d13c3217"; - }; - - buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix deleted file mode 100644 index 2a237b15c21c..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: - -stdenv.mkDerivation rec { - name = "gnome-user-docs-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/3.12/${name}.tar.xz"; - sha256 = "1cj45lpa74vkbxyila3d6pn5m1gh51nljp9fjirxmzwi1h6wg7jd"; - }; - - buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-help/3.12; - description = "User and system administration help for the Gnome desktop"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.cc-by-30; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix deleted file mode 100644 index fde47a66340b..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus -, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused -, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd -, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: - -stdenv.mkDerivation rec { - name = "gnome-user-share-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-share/3.10/${name}.tar.xz"; - sha256 = "1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - preConfigure = '' - sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf - ''; - - configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd" - "--with-modules-path=${apacheHttpd_2_2}/modules" - "--disable-bluetooth" - "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - makeWrapper file gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - nautilus libnotify libcanberra_gtk3 ]; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/$name - mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name - ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas - ''; - - preFixup = '' - wrapProgram "$out/libexec/gnome-user-share" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-user-share/3.8; - description = "Service that exports the contents of the Public folder in your home directory on the local network"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix deleted file mode 100644 index 9076d5c58390..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av -, gmime, json_glib, avahi, tracker, itstool }: - -stdenv.mkDerivation rec { - name = "grilo-plugins-0.2.13"; - - src = fetchurl { - url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz"; - sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55"; - }; - - installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ]; - - buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata - lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts - gnome3.totem-pl-parser gnome3.rest gmime json_glib - avahi gnome3.libmediaart tracker intltool itstool ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; - description = "A collection of plugins for the Grilo framework"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix deleted file mode 100644 index 9c0e3f9a0bc9..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib -, libxml2, gnome3, gobjectIntrospection, libsoup }: - -stdenv.mkDerivation rec { - name = "grilo-0.2.11"; - - src = fetchurl { - url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz"; - sha256 = "8a52c37521de80d6caf08a519a708489b9e2b097c2758a0acaab6fbd26d30ea6"; - }; - - configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ]; - - preConfigure = '' - for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do - substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/" - substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0" - done - ''; - - buildInputs = [ pkgconfig file intltool glib libxml2 libsoup - gnome3.totem-pl-parser gobjectIntrospection ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; - description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix deleted file mode 100644 index 917bcd99c95f..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection - # just for passthru -, gtk3, gsettings_desktop_schemas }: - -stdenv.mkDerivation rec { - - versionMajor = "3.12"; - versionMinor = "2"; - moduleName = "gsettings-desktop-schemas"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "da75021e9c45a60d0a97ea3486f93444275d0ace86dbd1b97e5d09000d8c4ad1"; - }; - - buildInputs = [ glib gobjectIntrospection ]; - - nativeBuildInputs = [ pkgconfig intltool ]; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix deleted file mode 100644 index 5779b6d04802..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2Python, perl, intltool, gettext }: - -stdenv.mkDerivation rec { - name = "gtksourceview-${version}"; - version = "3.12.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/3.12/gtksourceview-${version}.tar.xz"; - sha256 = "1xzmw9n9zbkaasl8xi7s5h49wiv5dq4qf8hr2pzjkack3ai5j6gk"; - }; - - propagatedBuildInputs = [ gtk3 ]; - - buildInputs = [ pkgconfig atk cairo glib pango - libxml2Python perl intltool gettext ]; - - preBuild = '' - substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" - ''; - - patches = [ ./nix_share_path.patch ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch deleted file mode 100644 index c87350167c25..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gtksourceview/gtksourceview-utils.c 2014-07-13 16:13:57.418687726 +0200 -+++ b/gtksourceview/gtksourceview-utils.c 2014-07-13 16:14:20.550847767 +0200 -@@ -68,6 +68,8 @@ - basename, - NULL)); - -+ g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL)); -+ - g_ptr_array_add (dirs, NULL); - - return (gchar**) g_ptr_array_free (dirs, FALSE); diff --git a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix deleted file mode 100644 index 590f8706fff5..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3 -, glib, desktop_file_utils, bash -, makeWrapper, gnome3, file, itstool, libxml2 }: - -# TODO: icons and theme still does not work -# use packaged gnome3.gnome_icon_theme_symbolic - -stdenv.mkDerivation rec { - name = "gucharmap-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gucharmap/3.12/${name}.tar.xz"; - sha256 = "5e260767da43f6dc31a8be33ca363da56781349b367464fa9c478bca66aa18d9"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ pkgconfig gtk3 intltool itstool glib - gnome3.yelp_tools libxml2 file desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gucharmap" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gucharmap; - description = "GNOME Character Map, based on the Unicode Character Database"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix deleted file mode 100644 index 1875c1491f96..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib }: - -stdenv.mkDerivation rec { - name = "libcroco-0.6.8"; - - src = fetchurl { - url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; - sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa"; - }; - - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; - - buildInputs = [ pkgconfig libxml2 glib ]; - - meta = with stdenv.lib; { - platforms = platforms.unix; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix deleted file mode 100644 index 9a1a45e0d1ac..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib -, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }: - -stdenv.mkDerivation rec { - name = "libgdata-0.14.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgdata/0.14/${name}.tar.xz"; - sha256 = "1scjs944kjazbsh86kdj6w2vprib6yd3wzxzabcs59acmr0m4hax"; - }; - - NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; - - buildInputs = with gnome3; - [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection - liboauth gcr gnome_online_accounts p11_kit openssl ]; - - meta = with stdenv.lib; { - description = "GData API library"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix deleted file mode 100644 index b21c274ce516..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }: -let - ver_maj = "0.14"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "08e466d3f214c9466860b5a82629de0de9eb89b1de7bd918fe154e569b5834cd"; - }; - - doCheck = true; - - patches = [ ./fix_introspection_paths.patch ]; - - buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ]; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch deleted file mode 100644 index 67003f451645..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000 -+++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000 -@@ -12085,8 +12085,8 @@ - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - 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_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_GIRDIR="${datadir}/gir-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/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix deleted file mode 100644 index c6c9323c010a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "libgnome-keyring-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz"; - sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; - }; - - propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = { - description = "Framework for managing passwords and other secrets"; - homepage = http://live.gnome.org/GnomeKeyring; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; - inherit (glib.meta) platforms maintainers; - - longDescription = '' - gnome-keyring is a program that keeps password and other secrets for - users. The library libgnome-keyring is used by applications to integrate - with the gnome-keyring system. - ''; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix deleted file mode 100644 index 1156474e5a7c..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper }: - -stdenv.mkDerivation rec { - name = "libgnomekbd-3.6.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz"; - sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09"; - }; - - buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ]; - - preFixup = '' - wrapProgram $out/bin/gkbd-keyboard-display \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Keyboard management library"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix deleted file mode 100644 index 8246a2183b7a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf -, pango, gdk_pixbuf, atk, tzdata }: - -stdenv.mkDerivation rec { - name = "libgweather-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/libgweather/3.12/${name}.tar.xz"; - sha256 = "54ef096350d7774ab1b3f23ed768246301cdcedfaa762a2c46920bf87fcc1c37"; - }; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ]; - propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix deleted file mode 100644 index 72d307f4f1a7..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff -, openssl, bzip2, acl, attr -}: - -stdenv.mkDerivation rec { - name = "libgxps-0.2.2"; - - src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; - sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; - }; - - buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr]; - - configureFlags = "--without-liblcms2"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix deleted file mode 100644 index 547a52ccf9ab..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool -, glib, gtk3, gobjectIntrospection, python, pygobject3 -}: - -stdenv.mkDerivation rec { - name = "libpeas-${version}"; - version = "1.10.0"; - - buildInputs = [ - intltool pkgconfig - glib gtk3 gobjectIntrospection python pygobject3 - ]; - - src = fetchurl { - url = "mirror://gnome/sources/libpeas/1.10/${name}.tar.xz"; - sha256 = "4695bc40e4885a903dbc5ce6a3704392feae63af51fd4da7a3888bb88ca78c47"; - }; - - preFixup = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; - - meta = { - description = "A GObject-based plugins engine"; - homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix deleted file mode 100644 index 5a8117528b68..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }: - -stdenv.mkDerivation rec { - name = "libzapojit-0.0.3"; - - src = fetchurl { - url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz"; - sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; - }; - - buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix deleted file mode 100644 index aa1af1ebd556..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3 -, libtool, makeWrapper }: - - -stdenv.mkDerivation rec { - name = "mutter-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/mutter/3.12/${name}.tar.xz"; - sha256 = "e653cf3e8c29af8d8c086bebcaa06781c48695be949417b72278fee37fe9e173"; - }; - - # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; - - buildInputs = with gnome3; - [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower - gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra - libcanberra_gtk3 zenity libtool makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/mutter" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix deleted file mode 100644 index dceb7c817bda..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif -, gtk, gnome3, libunique, intltool, gobjectIntrospection -, libnotify, makeWrapper, exempi, librsvg, tracker }: - -stdenv.mkDerivation rec { - name = "nautilus-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/nautilus/3.12/${name}.tar.xz"; - sha256 = "969c2bedc324eab7b9399bdb3a7db61f819a2995c733349ded081b059a1cafb1"; - }; - - buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg - gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ]; - - preFixup = '' - wrapProgram "$out/bin/nautilus" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - patches = [ ./extension_dir.patch ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch deleted file mode 100644 index 317b82579924..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c -index 6273a76..4adcc8a 100644 ---- a/libnautilus-private/nautilus-module.c -+++ b/libnautilus-private/nautilus-module.c -@@ -242,11 +242,17 @@ void - nautilus_module_setup (void) - { - static gboolean initialized = FALSE; -+ const gchar* extensiondir = NULL; - - if (!initialized) { - initialized = TRUE; -- -- load_module_dir (NAUTILUS_EXTENSIONDIR); -+ -+ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR"); -+ if (extensiondir == NULL) { -+ extensiondir = NAUTILUS_EXTENSIONDIR; -+ } -+ -+ load_module_dir (extensiondir); - - eel_debug_call_at_shutdown (free_module_objects); - } diff --git a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix b/pkgs/desktops/gnome-3/3.12/core/rest/default.nix deleted file mode 100644 index 9e19d4f90058..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "rest-0.7.91"; - - src = fetchurl { - url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz"; - sha256 = "838814d935143f2dc99eb79f1ac69c615e7b547339f6cd226dd0ed4d7c16b67a"; - }; - - buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; - - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix deleted file mode 100644 index 2830d5bac27e..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib -, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz -, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 -, gdk_pixbuf, librsvg, hicolor_icon_theme }: - -stdenv.mkDerivation rec { - name = "sushi-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/sushi/3.12/${name}.tar.xz"; - sha256 = "78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff"; - }; - - propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - - buildInputs = [ pkgconfig file intltool gobjectIntrospection glib - clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg - gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram $out/libexec/sushi-start \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = "http://en.wikipedia.org/wiki/Sushi_(software)"; - description = "A quick previewer for Nautilus"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix deleted file mode 100644 index f1b3bfe53c13..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup }: - -stdenv.mkDerivation rec { - name = "totem-pl-parser-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz"; - sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; - }; - - buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; - description = "Simple GObject-based library to parse and save a host of playlist formats"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix deleted file mode 100644 index 9c2db40f89d3..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, intltool, fetchurl, gst_all_1 -, clutter_gtk, clutter-gst, pygobject3, shared_mime_info -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, libxml2, dbus_glib -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "totem-3.12.2"; - - src = fetchurl { - url = "mirror://gnome/sources/totem/3.12/${name}.tar.xz"; - sha256 = "1law033wxbs8v3l2fk0p1v8lf9m45dm997yhq0cmqgw10jxxiybn"; - }; - - doCheck = true; - - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo - clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gnome3.libpeas pygobject3 shared_mime_info dbus_glib - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas makeWrapper file ]; - - preFixup = '' - wrapProgram "$out/bin/totem" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; - description = "Movie player for the GNOME desktop based on GStreamer"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix deleted file mode 100644 index d14b088f5304..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, intltool, fetchurl, libxml2, upower -, pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection -, bash, makeWrapper, itstool, vala, sqlite, automake114x, autoconf -, gnome3, librsvg, gdk_pixbuf, file, libnotify -, evolution_data_server, gst_all_1, poppler, libtool -, icu, taglib, libjpeg, libtiff, giflib, libcue -, libvorbis, flac, exempi, networkmanager -, libpng, libexif, libgsf, libuuid, bzip2 }: - -stdenv.mkDerivation rec { - name = "tracker-1.0.3"; - - src = fetchurl { - url = "mirror://gnome/sources/tracker/1.0/${name}.tar.xz"; - sha256 = "11pqcldgh07mjn38dlbj6ry5qkfbpf79ln5sqx7q86hhqzh3712h"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - preConfigure = '' - substituteInPlace src/libtracker-sparql/Makefile.am --replace "shared-library=" "shared-library=$out/lib/" - sed -i -e 's,glib/poppler.h,poppler.h,' src/tracker-extract/tracker-extract-pdf.c - ''; - - buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 - bzip2 gnome3.totem-pl-parser gobjectIntrospection - automake114x autoconf libtool - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite - upower libnotify evolution_data_server gnome3.libgee - gst_all_1.gstreamer gst_all_1.gst-plugins-base flac - poppler icu taglib libjpeg libtiff giflib libvorbis - exempi networkmanager libpng libexif libgsf libuuid - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tracker; - description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix deleted file mode 100644 index 1692b2c9c96f..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper -, hicolor_icon_theme, gnome3 -, libnotify, file, telepathy_glib, dbus_glib }: - -stdenv.mkDerivation rec { - name = "vino-${versionMajor}.${versionMinor}"; - versionMajor = "3.12"; - versionMinor = "0"; - - src = fetchurl { - url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz"; - sha256 = "86c9d8b60d79982e4488815db0d441c398e011ad8262659789afecc97a01ca5b"; - }; - - doCheck = true; - - buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify - hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - dbus_glib telepathy_glib file makeWrapper ]; - - preFixup = '' - wrapProgram "$out/libexec/vino-server" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Vino; - description = "GNOME desktop sharing server"; - maintainers = with maintainers; [ lethalman iElectric ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix deleted file mode 100644 index d3245e232edd..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection -, selectTextPatch ? false }: - -stdenv.mkDerivation rec { - versionMajor = "0.36"; - versionMinor = "3"; - moduleName = "vte"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; - }; - - patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.patch; - - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; - - configureFlags = [ "--enable-introspection" ]; - - enableParallelBuilding = true; - - postInstall = '' - substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses" - ''; - - meta = with stdenv.lib; { - homepage = http://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK+"; - longDescription = '' - VTE is a library (libvte) implementing a terminal emulator widget for - GTK+, and a minimal sample application (vte) using that. Vte is - mainly used in gnome-terminal, but can also be used to embed a - console/terminal in games, editors, IDEs, etc. VTE supports Unicode and - character set conversion, as well as emulating any terminal known to - the system's terminfo database. - ''; - license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch b/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch deleted file mode 100644 index 0a9b82a85982..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch +++ /dev/null @@ -1,227 +0,0 @@ -Only in vte-0.38.0.new: expose_select_text.patch -diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c ---- vte-0.38.0/src/vteaccess.c 2014-08-13 08:00:38.000000000 -0400 -+++ vte-0.38.0.new/src/vteaccess.c 2014-09-21 17:05:23.934641193 -0400 -@@ -1427,7 +1427,7 @@ - *start_offset = offset_from_xy (priv, start_x, start_y); - _vte_terminal_get_end_selection (terminal, &end_x, &end_y); - *end_offset = offset_from_xy (priv, end_x, end_y); -- return _vte_terminal_get_selection (terminal); -+ return vte_terminal_get_selection (terminal); - } - - static gboolean -diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c ---- vte-0.38.0/src/vte.c 2014-09-13 03:23:47.000000000 -0400 -+++ vte-0.38.0.new/src/vte.c 2014-09-21 17:03:04.671656749 -0400 -@@ -122,7 +122,6 @@ - gpointer data, - GArray *attributes, - gboolean include_trailing_spaces); --static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal); - static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal); - static void vte_terminal_stop_processing (VteTerminal *terminal); - -@@ -3267,9 +3266,10 @@ - _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n"); - terminal->pvt->pty_input_source = 0; - } --static void --_vte_terminal_connect_pty_read(VteTerminal *terminal) -+void -+vte_terminal_connect_pty_read(VteTerminal *terminal) - { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); - if (terminal->pvt->pty_channel == NULL) { - return; - } -@@ -3321,9 +3321,10 @@ - } - } - --static void --_vte_terminal_disconnect_pty_read(VteTerminal *terminal) -+void -+vte_terminal_disconnect_pty_read(VteTerminal *terminal) - { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); - if (terminal->pvt->pty_input_source != 0) { - _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n"); - g_source_remove(terminal->pvt->pty_input_source); -@@ -6154,6 +6155,28 @@ - } - } - -+/** -+ * vte_terminal_set_cursor_position: -+ * @terminal: a #VteTerminal -+ * @column: the new cursor column -+ * @row: the new cursor row -+ * -+ * Set the location of the cursor. -+ */ -+void -+vte_terminal_set_cursor_position(VteTerminal *terminal, -+ long column, long row) -+{ -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); -+ -+ _vte_invalidate_cursor_once(terminal, FALSE); -+ terminal->pvt->screen->cursor_current.col = column; -+ terminal->pvt->screen->cursor_current.row = row; -+ _vte_invalidate_cursor_once(terminal, FALSE); -+ _vte_check_cursor_blink(terminal); -+ vte_terminal_queue_cursor_moved(terminal); -+} -+ - static GtkClipboard * - vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board) - { -@@ -6319,7 +6342,7 @@ - vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE); - - /* Temporarily stop caring about input from the child. */ -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - } - - static gboolean -@@ -6336,7 +6359,7 @@ - terminal->pvt->selecting = FALSE; - - /* Reconnect to input from the child if we paused it. */ -- _vte_terminal_connect_pty_read(terminal); -+ vte_terminal_connect_pty_read(terminal); - - return TRUE; - } -@@ -6834,6 +6857,50 @@ - vte_terminal_deselect_all (terminal); - } - -+/** -+ * vte_terminal_get_selection_block_mode: -+ * @terminal: a #VteTerminal -+ * -+ * Checks whether or not block selection is enabled. -+ * -+ * Returns: %TRUE if block selection is enabled, %FALSE if not -+ */ -+gboolean -+vte_terminal_get_selection_block_mode(VteTerminal *terminal) { -+ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE); -+ return terminal->pvt->selection_block_mode; -+} -+ -+/** -+ * vte_terminal_set_selection_block_mode: -+ * @terminal: a #VteTerminal -+ * @block_mode: whether block selection is enabled -+ * -+ * Sets whether or not block selection is enabled. -+ */ -+void -+vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) { -+ g_return_if_fail(VTE_IS_TERMINAL(terminal)); -+ terminal->pvt->selection_block_mode = block_mode; -+} -+ -+/** -+ * vte_terminal_select_text: -+ * @terminal: a #VteTerminal -+ * @start_col: the starting column for the selection -+ * @start_row: the starting row for the selection -+ * @end_col: the end column for the selection -+ * @end_row: the end row for the selection -+ * -+ * Sets the current selection region. -+ */ -+void -+vte_terminal_select_text(VteTerminal *terminal, -+ long start_col, long start_row, -+ long end_col, long end_row) { -+ _vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0); -+} -+ - /* Autoscroll a bit. */ - static gboolean - vte_terminal_autoscroll(VteTerminal *terminal) -@@ -8476,7 +8543,7 @@ - #endif - kill(terminal->pvt->pty_pid, SIGHUP); - } -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - _vte_terminal_disconnect_pty_write(terminal); - if (terminal->pvt->pty_channel != NULL) { - g_io_channel_unref (terminal->pvt->pty_channel); -@@ -12533,7 +12600,7 @@ - g_object_freeze_notify(object); - - if (pvt->pty != NULL) { -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - _vte_terminal_disconnect_pty_write(terminal); - - if (terminal->pvt->pty_channel != NULL) { -@@ -12588,7 +12655,7 @@ - _vte_terminal_setup_utf8 (terminal); - - /* Open channels to listen for input on. */ -- _vte_terminal_connect_pty_read (terminal); -+ vte_terminal_connect_pty_read (terminal); - - g_object_notify(object, "pty"); - -@@ -12623,7 +12690,7 @@ - } - - char * --_vte_terminal_get_selection(VteTerminal *terminal) -+vte_terminal_get_selection(VteTerminal *terminal) - { - g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); - -Only in vte-0.38.0.new/src: .vte.c.swp -diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h ---- vte-0.38.0/src/vteint.h 2014-05-16 13:51:26.000000000 -0400 -+++ vte-0.38.0.new/src/vteint.h 2014-09-21 17:05:44.934589281 -0400 -@@ -25,7 +25,6 @@ - G_BEGIN_DECLS - - void _vte_terminal_accessible_ref(VteTerminal *terminal); --char* _vte_terminal_get_selection(VteTerminal *terminal); - void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y); - void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y); - void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset); -diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h ---- vte-0.38.0/src/vteterminal.h 2014-09-13 03:23:47.000000000 -0400 -+++ vte-0.38.0.new/src/vteterminal.h 2014-09-21 17:03:39.094903032 -0400 -@@ -170,6 +170,18 @@ - - void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); - void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+void vte_terminal_set_selection_block_mode(VteTerminal *terminal, -+ gboolean block_mode) _VTE_GNUC_NONNULL(1); -+void vte_terminal_select_text(VteTerminal *terminal, -+ long start_col, long start_row, -+ long end_col, long end_row) _VTE_GNUC_NONNULL(1); -+char * -+vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); -+ -+/* pause and unpause output */ -+void vte_terminal_disconnect_pty_read(VteTerminal *vte); -+void vte_terminal_connect_pty_read(VteTerminal *vte); - - /* Set the terminal's size. */ - void vte_terminal_set_size(VteTerminal *terminal, -@@ -276,6 +288,8 @@ - void vte_terminal_get_cursor_position(VteTerminal *terminal, - glong *column, - glong *row) _VTE_GNUC_NONNULL(1); -+void vte_terminal_set_cursor_position(VteTerminal *terminal, -+ long column, long row) _VTE_GNUC_NONNULL(1); - - /* Add a matching expression, returning the tag the widget assigns to that - * expression. */ diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix deleted file mode 100644 index ba83380f86d5..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: - -stdenv.mkDerivation rec { - name = "yelp-tools-3.12.1"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/3.12/${name}.tar.xz"; - sha256 = "7a5370d7adbec3b6e6b7b5e7e5ed966cb99c797907a186b94b93c184e97f0172"; - }; - - buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ]; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp/Tools; - description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; - maintainers = with maintainers; [ iElectric ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix deleted file mode 100644 index e99118230738..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, bash -, itstool, libxml2, libxslt }: - -stdenv.mkDerivation rec { - name = "yelp-xsl-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp-xsl/3.12/${name}.tar.xz"; - sha256 = "dd0b8af338b1cdae50444273d7c761e3f511224421487311103edc95a4493656"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; - description = "Yelp's universal stylesheets for Mallard and DocBook"; - maintainers = with maintainers; [ lethalman ]; - license = [licenses.gpl2 licenses.lgpl2]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix deleted file mode 100644 index 2e7715d1efc0..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite -, bash, makeWrapper, itstool, libxml2, libxslt, icu }: - -stdenv.mkDerivation rec { - name = "yelp-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp/3.12/${name}.tar.xz"; - sha256 = "0k2a1fggidmh98x2fv8zki2lbx7wx7p4b25iq11p6q8j9fwr2ff8"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool - libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl - librsvg gdk_pixbuf gnome3.gnome_icon_theme - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - gnome3.gsettings_desktop_schemas sqlite ]; - - preFixup = '' - wrapProgram "$out/bin/yelp" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; - description = "The help viewer in Gnome"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix deleted file mode 100644 index ca20bbc785de..000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, itstool }: - -stdenv.mkDerivation rec { - - versionMajor = "3.12"; - versionMinor = "1"; - - name = "zenity-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz"; - sha256 = "a59705cdd1ea5318fdae3075c1cedcbead479230e9bead204391566d973dae11"; - }; - - buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix deleted file mode 100644 index 670ceb105af3..000000000000 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ /dev/null @@ -1,299 +0,0 @@ -{ callPackage, pkgs }: - -rec { - corePackages = with gnome3; [ - pkgs.desktop_file_utils pkgs.ibus - pkgs.shared_mime_info # for update-mime-database - gtk3 # 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 - ]; - - optionalPackages = with gnome3; [ baobab empathy eog epiphany evince - gucharmap nautilus totem vino yelp gnome-bluetooth - gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot - gnome-shell-extensions gnome-system-log gnome-system-monitor - gnome_terminal gnome-user-docs bijiben evolution file-roller gedit - gnome-clocks gnome-music gnome-tweak-tool gnome-photos - nautilus-sendto - ]; - - inherit (pkgs) glib gtk2 gtk3 gnome2; - gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; }; - - # DO NOT UPGRADE CLUTTER, IT BREAKS GNOME 3.12 - clutter = pkgs.clutter_1_18; - clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; }; - clutter-gst = pkgs.clutter-gst.override { inherit clutter; }; - cogl = pkgs.cogl_1_18; - - gtk = gtk3; # just to be sure - libcanberra = pkgs.libcanberra_gtk3; # just to be sure - inherit (pkgs.gnome2) ORBit2; - orbit = ORBit2; - inherit (pkgs) libsoup; - - version = "3.12"; - -# Simplify the nixos module and gnome packages - defaultIconTheme = gnome_icon_theme_symbolic; - -#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - - baobab = callPackage ./core/baobab { }; - - caribou = callPackage ./core/caribou { }; - - dconf = callPackage ./core/dconf { }; - - empathy = callPackage ./core/empathy { - webkitgtk = pkgs.webkitgtk24x; - }; - - epiphany = callPackage ./core/epiphany { - webkitgtk = pkgs.webkitgtk24x; - }; - - evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests - - evolution_data_server = callPackage ./core/evolution-data-server { }; - - gconf = callPackage ./core/gconf { }; - - geocode_glib = callPackage ./core/geocode-glib { }; - - gcr = callPackage ./core/gcr { }; # ToDo: tests fail - - gdm = callPackage ./core/gdm { }; - - gjs = callPackage ./core/gjs { }; - - glib_networking = pkgs.glib_networking.override { - inherit gsettings_desktop_schemas; - }; - - gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; - - gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; - - gnome-contacts = callPackage ./core/gnome-contacts { }; - - gnome_control_center = callPackage ./core/gnome-control-center { }; - - gnome-calculator = callPackage ./core/gnome-calculator { }; - - gnome_common = callPackage ./core/gnome-common { }; - - gnome_desktop = callPackage ./core/gnome-desktop { }; - - gnome-dictionary = callPackage ./core/gnome-dictionary { }; - - gnome-disk-utility = callPackage ./core/gnome-disk-utility { }; - - gnome-font-viewer = callPackage ./core/gnome-font-viewer { }; - - gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; - - gnome_icon_theme_symbolic = callPackage ./core/gnome-icon-theme-symbolic { }; - - gnome-menus = callPackage ./core/gnome-menus { }; - - gnome_keyring = callPackage ./core/gnome-keyring { }; - - libgnome_keyring = callPackage ./core/libgnome-keyring { }; - - libgnomekbd = callPackage ./core/libgnomekbd { }; - - folks = callPackage ./core/folks { }; - - gnome_online_accounts = callPackage ./core/gnome-online-accounts { - webkitgtk = pkgs.webkitgtk24x; - }; - - gnome-online-miners = callPackage ./core/gnome-online-miners { }; - - gnome_session = callPackage ./core/gnome-session { }; - - gnome_shell = callPackage ./core/gnome-shell { }; - - gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; - - gnome-screenshot = callPackage ./core/gnome-screenshot { }; - - gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; - - gnome-system-log = callPackage ./core/gnome-system-log { }; - - gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; - - gnome_terminal = callPackage ./core/gnome-terminal { }; - - gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; - - gnome-user-docs = callPackage ./core/gnome-user-docs { }; - - gnome-user-share = callPackage ./core/gnome-user-share { }; - - grilo = callPackage ./core/grilo { }; - - grilo-plugins = callPackage ./core/grilo-plugins { }; - - gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; - - gtksourceview = callPackage ./core/gtksourceview { }; - - gucharmap = callPackage ./core/gucharmap { }; - - gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; - - eog = callPackage ./core/eog { }; - - libcroco = callPackage ./core/libcroco {}; - - libgee = callPackage ./core/libgee { }; - - libgdata = callPackage ./core/libgdata { }; - - libgxps = callPackage ./core/libgxps { }; - - libpeas = callPackage ./core/libpeas {}; - - libgweather = callPackage ./core/libgweather { }; - - libzapojit = callPackage ./core/libzapojit { }; - - mutter = callPackage ./core/mutter { }; - - nautilus = callPackage ./core/nautilus { }; - - networkmanager_openvpn = pkgs.networkmanager_openvpn.override { - inherit gnome3; - }; - - networkmanager_pptp = pkgs.networkmanager_pptp.override { - inherit gnome3; - }; - - networkmanager_vpnc = pkgs.networkmanager_vpnc.override { - inherit gnome3; - }; - - networkmanager_openconnect = pkgs.networkmanager_openconnect.override { - inherit gnome3; - }; - - networkmanager_l2tp = pkgs.networkmanager_l2tp.override { - inherit gnome3; - }; - - networkmanagerapplet = pkgs.networkmanagerapplet.override { - inherit gnome3 gsettings_desktop_schemas glib_networking; - }; - - rest = callPackage ./core/rest { }; - - sushi = callPackage ./core/sushi { - webkitgtk = pkgs.webkitgtk24x; - }; - - totem = callPackage ./core/totem { }; - - totem-pl-parser = callPackage ./core/totem-pl-parser { }; - - tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; }; - - vte = callPackage ./core/vte { }; - - vino = callPackage ./core/vino { }; - - yelp = callPackage ./core/yelp { - webkitgtk = pkgs.webkitgtk24x; - }; - - yelp_xsl = callPackage ./core/yelp-xsl { }; - - yelp_tools = callPackage ./core/yelp-tools { }; - - zenity = callPackage ./core/zenity { }; - - -#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - - bijiben = callPackage ./apps/bijiben { - webkitgtk = pkgs.webkitgtk24x; - }; - - evolution = callPackage ./apps/evolution { - webkitgtk = pkgs.webkitgtk24x; - }; - - file-roller = callPackage ./apps/file-roller { }; - - gedit = callPackage ./apps/gedit { }; - - glade = callPackage ./apps/glade { }; - - gnome-boxes = callPackage ./apps/gnome-boxes { - gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; }; - spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; }; - }; - - gnome-clocks = callPackage ./apps/gnome-clocks { }; - - gnome-documents = callPackage ./apps/gnome-documents { - webkitgtk = pkgs.webkitgtk24x; - }; - - gnome-music = callPackage ./apps/gnome-music { }; - - gnome-photos = callPackage ./apps/gnome-photos { }; - - nautilus-sendto = callPackage ./apps/nautilus-sendto { }; - - # scrollkeeper replacement - rarian = callPackage ./desktop/rarian { }; - - seahorse = callPackage ./apps/seahorse { }; - - polari = callPackage ./apps/polari { }; - - pomodoro = callPackage ./apps/pomodoro { }; - -#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ - - anjuta = callPackage ./devtools/anjuta { }; - - gdl = callPackage ./devtools/gdl { }; - -#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ - - geary = callPackage ./misc/geary { - webkitgtk = pkgs.webkitgtk24x; - }; - - gfbgraph = callPackage ./misc/gfbgraph { }; - - goffice = callPackage ./misc/goffice { }; - - gitg = callPackage ./misc/gitg { - webkitgtk = pkgs.webkitgtk24x; - }; - - libgda = callPackage ./misc/libgda { }; - - libgit2-glib = callPackage ./misc/libgit2-glib { - libgit2 = pkgs.libgit2.override { libssh2 = null; }; - }; - - libmediaart = callPackage ./misc/libmediaart { }; - - gexiv2 = callPackage ./misc/gexiv2 { }; - - gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { }; - - gpaste = callPackage ./misc/gpaste { }; - - gtkhtml = callPackage ./misc/gtkhtml { }; - -} diff --git a/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix deleted file mode 100644 index a1b38b21869a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: - -stdenv.mkDerivation rec { - name = "rarian-0.8.1"; - src = fetchurl { - url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; - sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; - }; - - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix deleted file mode 100644 index 79bfd8952578..000000000000 --- a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, - itstool, python }: - -let - major = "3.13"; - minor = "1"; - -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "anjuta-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz"; - sha256 = "71bdad9a0e427d9481858eec40b9c1facef4b551d732023cc18a50019df4b78b"; - }; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview intltool itstool python ]; - - meta = with stdenv.lib; { - description = "Software development studio"; - homepage = http://anjuta.org/; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix deleted file mode 100644 index 1dae33cd4e91..000000000000 --- a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, intltool }: - -let - major = "3.12"; - minor = "0"; - -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "gdl-${version}"; - - src = fetchurl { - url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz"; - sha256 = "4770f959f31ed5e616fe623c284e8dd6136e49902d19b6e37938d34be4f6b88d"; - }; - - buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; - - meta = with stdenv.lib; { - description = "Gnome docking library"; - homepage = https://developer.gnome.org/gdl/; - license = [ licenses.gpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix deleted file mode 100644 index 4df287c7b8b5..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala -, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils -, libnotify, libcanberra, libsecret, gmime -, libpthreadstubs, hicolor_icon_theme, sqlite -, gnome3, librsvg, gnome_doc_utils, webkitgtk }: - -stdenv.mkDerivation rec { - name = "geary-0.6.2"; - - src = fetchurl { - url = "mirror://gnome/sources/geary/0.6/${name}.tar.xz"; - sha256 = "0ap40mpj89sx82kcxlhl9gipq34ks2b70yhiv9s8zc5wg0nm7rpg"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils - vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme - gdk_pixbuf librsvg gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ]; - - preConfigure = '' - substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' - ''; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/${name}/ - mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name} - ''; - - preFixup = '' - wrapProgram "$out/bin/geary" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - enableParallelBuilding = true; - - patches = [ ./disable_valadoc.patch ]; - patchFlags = "-p0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Geary; - description = "Mail client for GNOME 3"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch deleted file mode 100644 index e65c0dea7472..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/CMakeLists.txt.orig 2014-05-23 14:41:20.809160364 +0200 -+++ src/CMakeLists.txt 2014-05-23 14:41:29.240261581 +0200 -@@ -696,21 +696,6 @@ - ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/ - ) - --# Valadoc --################################################# --foreach(pkg ${ENGINE_PACKAGES}) -- list(APPEND valadoc_pkg_opts "--pkg=${pkg}") --endforeach(pkg ${ENGINE_PACKAGES}) -- --include(FindValadoc) --add_custom_target( -- valadoc -- WORKING_DIRECTORY -- ${CMAKE_SOURCE_DIR}/src -- COMMAND -- ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --) -- - ## Make clean: remove copied files - ################################################## - set_property( diff --git a/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix deleted file mode 100644 index 86942c13f34f..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4 }: - - -stdenv.mkDerivation rec { - name = "gexiv2-${version}"; - version = "0.7.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gexiv2/0.7/${name}.tar.xz"; - sha256 = "12pfc5a57dhlf0c3yg5x3jissxi7jy2b6ir6y99cn510801gwcdn"; - }; - - preConfigure = '' - patchShebangs . - ''; - - buildInputs = [ pkgconfig glib libtool m4 ]; - propagatedBuildInputs = [ exiv2 ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/gexiv2; - description = "GObject wrapper around the Exiv2 photo metadata library"; - platforms = platforms.linux; - }; -} \ No newline at end of file diff --git a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix deleted file mode 100644 index d36534f0d32f..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib -, gnome3, libsoup, json_glib }: - -stdenv.mkDerivation rec { - name = "gfbgraph-0.2.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz"; - sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4"; - }; - - buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ]; - propagatedBuildInputs = [ libsoup json_glib gnome3.rest ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "GLib/GObject wrapper for the Facebook Graph API"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix deleted file mode 100644 index 37e1975fd57b..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib -, json_glib, webkitgtk, makeWrapper, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }: - -# TODO: icons and theme still does not work -# use packaged gnome3.gnome_icon_theme_symbolic - -stdenv.mkDerivation rec { - name = "gitg-3.13.91"; - - src = fetchurl { - url = "mirror://gnome/sources/gitg/3.13/${name}.tar.xz"; - sha256 = "1c2016grvgg5f3l5xkracz85rblsc1a4brzr6vgn6kh2h494rv37"; - }; - - preCheck = '' - substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" - ''; - doCheck = true; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - propagatedUserEnvPkgs = [ shared_mime_info - gnome3.gnome_themes_standard ]; - - buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas - libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg - gobjectIntrospection makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ]; - - preFixup = '' - wrapProgram "$out/bin/gitg" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - rm $out/share/gitg/icons/hicolor/icon-theme.cache - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Gitg; - description = "GNOME GUI client to view git repositories"; - maintainers = with maintainers; [ iElectric ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix deleted file mode 100644 index 26e9144349f2..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, intltool, fetchurl, python, pygobject3, atk -, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup -, bash, makeWrapper, itstool, libxml2, python3Packages -, gnome3, librsvg, gdk_pixbuf, file, libnotify }: - -stdenv.mkDerivation rec { - name = "gnome-tweak-tool-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-tweak-tool/3.12/${name}.tar.xz"; - sha256 = "f8811d638797ef62500770a8dccc5bc689a427c8396a0dff8cbeddffdebf0e29"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - makeFlags = [ "DESTDIR=/" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic - python pygobject3 libnotify gnome3.gnome_shell - libsoup gnome3.gnome_settings_daemon gnome3.nautilus - gnome3.gnome_desktop ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-tweak-tool" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" - ''; - - patches = [ ./find_gsettings.patch ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; - description = "A tool to customize advanced GNOME 3 options"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch deleted file mode 100644 index 3e68c04cb3ab..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py -index a00fe19..dce74b2 100644 ---- a/gtweak/gsettings.py -+++ b/gtweak/gsettings.py -@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception): - - class _GSettingsSchema: - def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options): -- if not schema_dir: -- schema_dir = gtweak.GSETTINGS_SCHEMA_DIR - if not schema_filename: - schema_filename = schema_name + ".gschema.xml" -+ if not schema_dir: -+ schema_dir = gtweak.GSETTINGS_SCHEMA_DIR -+ for xdg_dir in GLib.get_system_data_dirs(): -+ dir = os.path.join(xdg_dir, "glib-2.0", "schemas") -+ if os.path.exists(os.path.join(dir, schema_filename)): -+ schema_dir = dir -+ break - - schema_path = os.path.join(schema_dir, schema_filename) - if not os.path.exists(schema_path): diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix deleted file mode 100644 index 02520a9f121a..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 -, pango, libgsf, libxml2, libart, intltool, gettext -, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }: - -stdenv.mkDerivation rec { - name = "goffice-0.8.17"; - - src = fetchurl { - url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz"; - sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15"; - }; - - # fix linking error: undefined reference to pcre_info - patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986 - - buildInputs = [ - pkgconfig libglade bzip2 libart intltool gettext - gconf libgnomeui pcre - ]; - - propagatedBuildInputs = [ - # All these are in the "Requires:" field of `libgoffice-0.6.pc'. - glib libgsf libxml2 gtk libglade libart cairo pango - ]; - - postInstall = - '' - # Get GnuCash to build. Might be unnecessary if we upgrade pkgconfig. - substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires - ''; - - doCheck = true; - - meta = gnome3.goffice.meta // { - maintainers = [ ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix deleted file mode 100644 index f116f5b53cd8..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3 -, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: - -stdenv.mkDerivation rec { - name = "goffice-0.10.18"; - - src = fetchurl { - url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "4743a148d4452743f3484ed28285a6889adb4af2a61b72448e0ddfe7d5142c64"; - }; - - nativeBuildInputs = [ pkgconfig intltool ]; - - propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection? - glib gtk3 libxml2 cairo pango libgsf - ]; - - buildInputs = [ libxslt librsvg ]; - - enableParallelBuilding = true; - doCheck = true; - - meta = { - description = "A Glib/GTK+ set of document centric objects and utilities"; - - longDescription = '' - There are common operations for document centric applications that are - conceptually simple, but complex to implement fully: plugins, load/save - documents, undo/redo. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - platforms = stdenv.lib.platforms.gnu; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch deleted file mode 100644 index cd4ef3c9fed7..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c -index bc4aae4..3adb696 100644 ---- a/goffice/utils/regutf8.c -+++ b/goffice/utils/regutf8.c -@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags) - default: return GO_REG_BADPAT; - } - } else { -- gor->re_nsub = pcre_info (r, NULL, NULL); -+ gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL); - gor->nosub = (cflags & GO_REG_NOSUB) != 0; - return 0; - } diff --git a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix deleted file mode 100644 index f87431653c93..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib -, pango, gtk3, gnome3, dbus, clutter, appdata-tools, makeWrapper }: - -stdenv.mkDerivation rec { - version = "3.12.3.1"; - name = "gpaste-${version}"; - - src = fetchurl { - url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "05afbhn3gw015cf2z3045lvlnj4cz06p6libkglb2wqsfb7azbl0"; - }; - - buildInputs = [ intltool autoreconfHook pkgconfig vala glib - gtk3 gnome3.gnome_control_center dbus.libs - clutter pango appdata-tools makeWrapper ]; - - preConfigure = "intltoolize -f"; - - configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings" - "--with-dbusservicesdir=$(out)/share/dbus-1/services" ]; - - enableParallelBuilding = true; - - preFixup = - let - libPath = stdenv.lib.makeLibraryPath - [ glib gtk3 clutter pango ]; - in - '' - for i in $out/libexec/gpaste/*; do - wrapProgram $i \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/Keruspe/GPaste; - description = "Clipboard management system with GNOME3 integration"; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix deleted file mode 100644 index 5e27b474cbd7..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool -, gnome3, enchant, isocodes }: - -stdenv.mkDerivation rec { - name = "gtkhtml-4.6.6"; - - src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/4.6/${name}.tar.xz"; - sha256 = "145d23bbe729ff4ee7e7027bb5ff405b34822271327fdd81fe913134831374cd"; - }; - - buildInputs = [ pkgconfig gtk3 intltool gnome3.gnome_icon_theme - gnome3.gsettings_desktop_schemas ]; - - propagatedBuildInputs = [ enchant isocodes ]; - -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix deleted file mode 100644 index 3944644a4536..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3 }: - -let - major = "5.2"; - minor = "2"; - -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "libgda-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz"; - sha256 = "c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4"; - }; - - configureFlags = [ - "--enable-gi-system-install=no" - ]; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 ]; - - meta = with stdenv.lib; { - description = "Database access library"; - homepage = http://www.gnome-db.org/; - license = [ licenses.lgpl2 licenses.gpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix deleted file mode 100644 index 94776c90cf99..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala -, gtk_doc, gobjectIntrospection, libgit2, glib }: - -stdenv.mkDerivation rec { - name = "libgit2-glib-${version}"; - version = "0.0.20"; - - src = fetchurl { - url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz"; - sha256 = "1s2hj0ji73ishniqvr6mx90l1ji5jjwwrwhp91i87fxk0d3sry5x"; - }; - - configureScript = "sh ./autogen.sh"; - - buildInputs = [ gnome3.gnome_common libtool pkgconfig vala - gtk_doc gobjectIntrospection libgit2 glib ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix deleted file mode 100644 index 4985bfa902c3..000000000000 --- a/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "libmediaart-0.4.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libmediaart/0.4/${name}.tar.xz"; - sha256 = "e8ec92a642f4df7f988364f6451adf89e1611d7379a636d8c7eff4ca21a0fd1c"; - }; - - buildInputs = [ pkgconfig glib gdk_pixbuf ]; - - meta = with stdenv.lib; { - description = "Library tasked with managing, extracting and handling media art caches"; - maintainers = with maintainers; [ lethalman ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix index f442bd889736..c425f41e8e1f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig +, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, pulseaudio, fontconfig , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, python, krb5, networkmanagerapplet, networkmanager @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo - gdk_pixbuf gnome3.adwaita-icon-theme librsvg clutter clutter_gtk - hicolor_icon_theme gnome3.adwaita-icon-theme gnome3.vino udev + gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk + gnome3.vino udev libcanberra_gtk3 networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ]; preBuild = '' diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix index f7e3efd1dd90..f99c0c2b5a46 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret , python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip -, hicolor_icon_theme, sqlite, libgweather +, sqlite, libgweather, libcanberra_gtk3 , pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server - libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center - hicolor_icon_theme adwaita-icon-theme sqlite gnome3.gnome-bluetooth + libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm + libcanberra_gtk3 gnome_control_center + 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_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ]; diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index 933e89dcd647..6ec1ee011f53 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -19,10 +19,8 @@ rec { nautilus-sendto dconf-editor ]; - inherit (pkgs) libsoup glib gtk2; + inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra; inherit (pkgs.gnome2) ORBit2; - gtk3 = pkgs.gtk3_16; - gtkmm3 = pkgs.gtkmm3_16; orbit = ORBit2; gnome3 = self // { recurseForDerivations = false; }; clutter = pkgs.clutter_1_22; @@ -34,20 +32,6 @@ rec { vala = pkgs.vala_0_26; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; - # Due to gtk 3.12 -> 3.16 transition - libcanberra_gtk3 = pkgs.libcanberra_gtk3.override { inherit gtk; }; - libcanberra = libcanberra_gtk3; - ibus = pkgs.ibus.override { inherit gnome3; }; - colord-gtk = pkgs.colord-gtk.override { inherit gtk3; }; - webkitgtk24x = pkgs.webkitgtk24x.override { inherit gtk3; }; - webkitgtk = pkgs.webkitgtk.override { inherit gtk3; }; - libwnck3 = pkgs.libwnck3.override { inherit gtk3; }; - gtkspell3 = pkgs.gtkspell3.override { inherit gtk3; }; - librsvg = pkgs.librsvg.override { inherit gtk3; }; - iconnamingutils = pkgs.iconnamingutils.override { inherit librsvg; }; - libchamplain = pkgs.libchamplain.override { inherit gtk3 clutter_gtk; }; - djvulibre = pkgs.djvulibre.override { inherit librsvg; }; - version = "3.16"; # Simplify the nixos module and gnome packages diff --git a/pkgs/development/libraries/clutter/1.18.nix b/pkgs/development/libraries/clutter/1.18.nix deleted file mode 100644 index 7a9d114ce8e3..000000000000 --- a/pkgs/development/libraries/clutter/1.18.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, -gobjectIntrospection -}: - -let - ver_maj = "1.18"; - ver_min = "2"; -in -stdenv.mkDerivation rec { - name = "clutter-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63"; - }; - - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = - [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection - ]; - - configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK - - #doCheck = true; # no tests possible without a display - - meta = { - description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; - - longDescription = - '' Clutter is free software library for creating fast, compelling, - portable, and dynamic graphical user interfaces. It is a core part - of MeeGo, and is supported by the open source community. Its - development is sponsored by Intel. - - Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use - on mobile and embedded platforms), but wraps an easy to use, - efficient, flexible API around GL's complexity. - - Clutter enforces no particular user interface style, but provides a - rich, generic foundation for higher-level toolkits tailored to - specific needs. - ''; - - license = stdenv.lib.licenses.lgpl2Plus; - homepage = http://www.clutter-project.org/; - - maintainers = with stdenv.lib.maintainers; [ urkud ]; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/cogl/1.18.nix b/pkgs/development/libraries/cogl/1.18.nix deleted file mode 100644 index f6927770d860..000000000000 --- a/pkgs/development/libraries/cogl/1.18.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection -, gstreamerSupport ? true, gst_all_1 }: - -let - ver_maj = "1.18"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "cogl-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; - sha256 = "0phg76jpkn0j948axavzr15gyrqipzmzzr66nlp3dfksgszixnd4"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = [ - "--enable-introspection" - "--enable-gles1" - "--enable-gles2" - "--enable-kms-egl-platform" - ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; - - propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobjectIntrospection - mesa_noglu libXrandr libXfixes libXcomposite libXdamage - ] - ++ libintlOrEmpty - ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer - gst_all_1.gst-plugins-base ]; - - buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; - - COGL_PANGO_DEP_CFLAGS - = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) - "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo"; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - - #doCheck = true; # all tests fail (no idea why) - - meta = with stdenv.lib; { - description = "A small open source library for using 3D graphics hardware for rendering"; - maintainers = with maintainers; [ lovek323 ]; - - longDescription = '' - Cogl is a small open source library for using 3D graphics hardware for - rendering. The API departs from the flat state machine style of OpenGL - and is designed to make it easy to write orthogonal components that can - render without stepping on each other's toes. - ''; - - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/gtk+/3.16.nix b/pkgs/development/libraries/gtk+/3.16.nix deleted file mode 100644 index 84bea07602fd..000000000000 --- a/pkgs/development/libraries/gtk+/3.16.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl -, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, x11, wayland, libxkbcommon, epoxy -, xineramaSupport ? stdenv.isLinux -, cupsSupport ? stdenv.isLinux, cups ? null -}: - -assert xineramaSupport -> xlibs.libXinerama != null; -assert cupsSupport -> cups != null; - -let - ver_maj = "3.16"; - ver_min = "2"; - version = "${ver_maj}.${ver_min}"; -in -stdenv.mkDerivation rec { - name = "gtk+3-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "1yhwg2l72l3khfkprydcjlpxjrg11ccqfc80sjl56llz3jk66fd0"; - }; - - nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; - - buildInputs = [ libxkbcommon epoxy ]; - propagatedBuildInputs = with xlibs; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ] - ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ] - ++ optional stdenv.isDarwin x11 - ++ optional xineramaSupport libXinerama - ++ optional cupsSupport cups; - - # demos fail to install, no idea where's the problem - preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; - - enableParallelBuilding = true; - - postInstall = "rm -rf $out/share/gtk-doc"; - - passthru = { - gtkExeEnvPostBuild = '' - rm $out/lib/gtk-3.0/3.0.0/immodules.cache - $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache - ''; # workaround for bug of nix-mode for Emacs */ ''; - }; - - meta = { - description = "A multi-platform toolkit for creating graphical user interfaces"; - - longDescription = '' - GTK+ is a highly usable, feature rich toolkit for creating - graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK+ it is written in C, - but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK+ is licensed - under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK+ without any license fees or - royalties. - ''; - - homepage = http://www.gtk.org/; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 35b40a507a83..84bea07602fd 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gettext, perl , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xlibs, x11, wayland, libxkbcommon +, xlibs, x11, wayland, libxkbcommon, epoxy , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null }: @@ -9,7 +9,7 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; let - ver_maj = "3.12"; + ver_maj = "3.16"; ver_min = "2"; version = "${ver_maj}.${ver_min}"; in @@ -18,17 +18,15 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "1l45nd7ln2pnrf99vdki3l7an5wrzkbak11hnnj1w6r3fkm4xmv1"; + sha256 = "1yhwg2l72l3khfkprydcjlpxjrg11ccqfc80sjl56llz3jk66fd0"; }; - NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; - buildInputs = [ libxkbcommon ]; + buildInputs = [ libxkbcommon epoxy ]; propagatedBuildInputs = with xlibs; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] - ++ optionals stdenv.isLinux [ wayland ] + [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ] + ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ] ++ optional stdenv.isDarwin x11 ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; @@ -65,7 +63,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat]; + maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/gtkmm/3.16.nix b/pkgs/development/libraries/gtkmm/3.16.nix deleted file mode 100644 index bc3274688555..000000000000 --- a/pkgs/development/libraries/gtkmm/3.16.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: - -let - ver_maj = "3.16"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "gtkmm-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; - - enableParallelBuilding = true; - doCheck = true; - - meta = { - description = "C++ interface to the GTK+ graphical user interface library"; - - longDescription = '' - gtkmm is the official C++ interface for the popular GUI library - GTK+. Highlights include typesafe callbacks, and a - comprehensive set of widgets that are easily extensible via - inheritance. You can create user interfaces either in code or - with the Glade User Interface designer, using libglademm. - There's extensive documentation, including API reference and a - tutorial. - ''; - - homepage = http://gtkmm.org/; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index e158c64f73a4..bc3274688555 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: let - ver_maj = "3.12"; + ver_maj = "3.16"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "86c526ceec15d889996822128d566748bb36f70cf5a2c270530dfc546a2574e1"; + sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c052849fb36..5b38bef1fc24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5691,10 +5691,6 @@ let clutter = callPackage ../development/libraries/clutter { }; - clutter_1_18 = callPackage ../development/libraries/clutter/1.18.nix { - cogl = cogl_1_18; - }; - clutter_1_22 = callPackage ../development/libraries/clutter/1.22.nix { cogl = cogl_1_20; }; @@ -5713,8 +5709,6 @@ let cogl = callPackage ../development/libraries/cogl { }; - cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { }; - cogl_1_20 = callPackage ../development/libraries/cogl/1.20.nix { }; coin3d = callPackage ../development/libraries/coin3d { }; @@ -6185,9 +6179,7 @@ let cupsSupport = config.gtk2.cups or stdenv.isLinux; }; - gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { }; - - gtk3_16 = callPackage ../development/libraries/gtk+/3.16.nix { + gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { gettext = gettextWithExpat gettext_0_19; }; @@ -6195,9 +6187,6 @@ let gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; - gtkmm3_16 = callPackage ../development/libraries/gtkmm/3.16.nix { - gtk3 = gtk3_16; - }; gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { gtksharp = gtk-sharp; @@ -12329,7 +12318,7 @@ let termite = callPackage ../applications/misc/termite { gtk = gtk3; - vte = gnome3_16.vte-select-text; + vte = gnome3.vte-select-text; }; tesseract = callPackage ../applications/graphics/tesseract { }; @@ -13362,16 +13351,12 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; - gnome3_12 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.12 { - callPackage = pkgs.newScope pkgs.gnome3_12; - }); - gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 { callPackage = pkgs.newScope pkgs.gnome3_16; self = pkgs.gnome3_16; }); - gnome3 = gnome3_12; + gnome3 = gnome3_16; gnome = recurseIntoAttrs gnome2; -- cgit 1.4.1 From 9d07c54fa11bc577f8fc946aef9be9d059d4f40a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 16 May 2015 23:22:35 +0200 Subject: nixos: add bird module patch bird to look in /var/run for birc.ctl --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/bird.nix | 76 ++++++++++++++++++++++++++ pkgs/servers/bird/default.nix | 8 +++ pkgs/servers/bird/dont-create-sysconfdir.patch | 13 +++++ 5 files changed, 100 insertions(+) create mode 100644 nixos/modules/services/networking/bird.nix create mode 100644 pkgs/servers/bird/dont-create-sysconfdir.patch (limited to 'nixos') diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0039ca74ba85..3f45f78a9d89 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -217,6 +217,7 @@ lambdabot = 191; asterisk = 192; plex = 193; + bird = 195; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -412,6 +413,7 @@ #asterisk = 192; # unused plex = 193; sabnzbd = 194; + bird = 195; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 043b0470edf2..bef3f7f2fe73 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -252,6 +252,7 @@ ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix ./services/networking/bind.nix + ./services/networking/bird.nix ./services/networking/bitlbee.nix ./services/networking/btsync.nix ./services/networking/charybdis.nix diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix new file mode 100644 index 000000000000..2fa1d6af7d2f --- /dev/null +++ b/nixos/modules/services/networking/bird.nix @@ -0,0 +1,76 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkEnableOption mkIf mkOption singleton types; + inherit (pkgs) bird; + cfg = config.services.bird; + + configFile = pkgs.writeText "bird.conf" '' + ${cfg.config} + ''; +in + +{ + + ###### interface + + options = { + + services.bird = { + + enable = mkEnableOption "BIRD Internet Routing Daemon"; + + config = mkOption { + type = types.string; + description = '' + BIRD Internet Routing Daemon configuration file. + http://bird.network.cz/?get_doc&f=bird-3.html + ''; + }; + + user = mkOption { + type = types.string; + default = "ircd"; + description = '' + BIRD Internet Routing Daemon user. + ''; + }; + + group = mkOption { + type = types.string; + default = "ircd"; + description = '' + BIRD Internet Routing Daemon group. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + users.extraUsers = singleton { + name = cfg.user; + description = "BIRD Internet Routing Daemon user"; + uid = config.ids.uids.bird; + group = cfg.group; + }; + + users.extraGroups = singleton { + name = cfg.group; + gid = config.ids.gids.bird; + }; + + systemd.services.bird = { + description = "BIRD Internet Routing Daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${bird}/bin/bird -d -c ${configFile} -s /var/run/bird.ctl -u ${cfg.user} -g ${cfg.group}"; + }; + }; + }; +} diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 9b17551a8cbb..c13ad64fca3f 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -10,6 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison readline ]; + patches = [ + ./dont-create-sysconfdir.patch + ]; + + configureFlags = [ + "--localstatedir /var" + ]; + meta = { description = "BIRD Internet Routing Daemon"; homepage = http://bird.network.cz; diff --git a/pkgs/servers/bird/dont-create-sysconfdir.patch b/pkgs/servers/bird/dont-create-sysconfdir.patch new file mode 100644 index 000000000000..0a11c8a2a8d8 --- /dev/null +++ b/pkgs/servers/bird/dont-create-sysconfdir.patch @@ -0,0 +1,13 @@ +diff --git a/tools/Makefile.in b/tools/Makefile.in +index 062ba91..4fd7453 100644 +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -68,7 +68,7 @@ tags: + cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]` + + install: all +- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@ ++ $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) + $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@ + $(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@ + if test -n "@CLIENT@" ; then \ -- cgit 1.4.1 From 3e35ea305f69fab6e139772340b71f8e5f8ddc1d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 13 May 2015 16:10:07 +0300 Subject: postgresql-backup: cleanup --- nixos/modules/services/backup/postgresql-backup.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index c4127543f10d..4a5ebebc682e 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -3,9 +3,9 @@ with lib; let - inherit (pkgs) postgresql gzip; + inherit (pkgs) gzip; - location = config.services.postgresqlBackup.location ; + location = config.services.postgresqlBackup.location; postgresqlBackupCron = db: '' -- cgit 1.4.1 From 3d2d78cb396a5a3fe144b15207069bb11775ff9c Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Wed, 20 May 2015 09:51:42 +0200 Subject: nixos/libvirtd: add 'extraOptions' option And move the '--verbose' flag to extraOptions, so that users can easily disable it. --- nixos/modules/virtualisation/libvirtd.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 7410609e0642..14c4e992d3b6 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -57,6 +57,17 @@ in ''; }; + virtualisation.libvirtd.extraOptions = + mkOption { + type = types.listOf types.str; + default = [ "--verbose" ]; # for historical reasons, should be empty + example = [ "--verbose" ]; + description = + '' + Extra command line arguments passed to libvirtd on startup. + ''; + }; + virtualisation.libvirtd.onShutdown = mkOption { type = types.enum ["shutdown" "suspend" ]; @@ -140,7 +151,7 @@ in done ''; # */ - serviceConfig.ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" --daemon --verbose''; + serviceConfig.ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" --daemon ${concatStringsSep " " cfg.extraOptions}''; serviceConfig.Type = "forking"; serviceConfig.KillMode = "process"; # when stopping, leave the VMs alone -- cgit 1.4.1 From db991a40245ffd55cb49ccfe300c9851e0851924 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Wed, 20 May 2015 10:06:21 +0200 Subject: nixos/libvirtd: remove --verbose flag Because it spams the log: .libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200 .libvirtd-wrapp[1950]: EVENT_POLL_UPDATE_HANDLE: watch=874 events=13 .libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200 .libvirtd-wrapp[1950]: EVENT_POLL_RUN: nhandles=24 timeout=-1 .libvirtd-wrapp[1950]: EVENT_POLL_DISPATCH_HANDLE: watch=874 events=1 .libvirtd-wrapp[1950]: OBJECT_REF: obj=0x7f5d900b4200 .libvirtd-wrapp[1950]: [137B blob data] --- nixos/modules/virtualisation/libvirtd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 14c4e992d3b6..16aedbbb185d 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -60,7 +60,7 @@ in virtualisation.libvirtd.extraOptions = mkOption { type = types.listOf types.str; - default = [ "--verbose" ]; # for historical reasons, should be empty + default = [ ]; example = [ "--verbose" ]; description = '' -- cgit 1.4.1 From 2fe90843977bb7809c964047822d33b4f520e93d Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 3 May 2015 20:18:18 +0300 Subject: azure-image: fix, split into bootstrap and regular configurations Conflicts: nixos/modules/virtualisation/azure-image.nix --- nixos/modules/virtualisation/azure-common.nix | 60 +++++++++++++++++++++++++++ nixos/modules/virtualisation/azure-image.nix | 32 +------------- 2 files changed, 61 insertions(+), 31 deletions(-) create mode 100644 nixos/modules/virtualisation/azure-common.nix (limited to 'nixos') diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix new file mode 100644 index 000000000000..4fc7a085f868 --- /dev/null +++ b/nixos/modules/virtualisation/azure-common.nix @@ -0,0 +1,60 @@ +{ config, lib, pkgs, ... }: + +with lib; +{ + imports = [ ../profiles/headless.nix ]; + + boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ]; + boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ]; + + # Generate a GRUB menu. + boot.loader.grub.device = "/dev/sda"; + boot.loader.grub.version = 2; + boot.loader.grub.timeout = 0; + + # Don't put old configurations in the GRUB menu. The user has no + # way to select them anyway. + boot.loader.grub.configurationLimit = 0; + + fileSystems."/".device = "/dev/disk/by-label/nixos"; + + # Allow root logins only using the SSH key that the user specified + # at instance creation time, ping client connections to avoid timeouts + services.openssh.enable = true; + services.openssh.permitRootLogin = "without-password"; + services.openssh.extraConfig = '' + ClientAliveInterval 180 + ''; + + # Force getting the hostname from Azure + networking.hostName = mkDefault ""; + + # Always include cryptsetup so that NixOps can use it. + environment.systemPackages = [ pkgs.cryptsetup ]; + + networking.usePredictableInterfaceNames = false; + + services.udev.extraRules = '' + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:0", ATTR{removable}=="0", SYMLINK+="disk/by-lun/0", + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:1", ATTR{removable}=="0", SYMLINK+="disk/by-lun/1", + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:2", ATTR{removable}=="0", SYMLINK+="disk/by-lun/2" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:3", ATTR{removable}=="0", SYMLINK+="disk/by-lun/3" + + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:4", ATTR{removable}=="0", SYMLINK+="disk/by-lun/4" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:5", ATTR{removable}=="0", SYMLINK+="disk/by-lun/5" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:6", ATTR{removable}=="0", SYMLINK+="disk/by-lun/6" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:7", ATTR{removable}=="0", SYMLINK+="disk/by-lun/7" + + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:8", ATTR{removable}=="0", SYMLINK+="disk/by-lun/8" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:9", ATTR{removable}=="0", SYMLINK+="disk/by-lun/9" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:10", ATTR{removable}=="0", SYMLINK+="disk/by-lun/10" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:11", ATTR{removable}=="0", SYMLINK+="disk/by-lun/11" + + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:12", ATTR{removable}=="0", SYMLINK+="disk/by-lun/12" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:13", ATTR{removable}=="0", SYMLINK+="disk/by-lun/13" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:14", ATTR{removable}=="0", SYMLINK+="disk/by-lun/14" + ENV{DEVTYPE}=="disk", KERNEL!="sda" SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNELS=="?:0:0:15", ATTR{removable}=="0", SYMLINK+="disk/by-lun/15" + + ''; + +} diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index ab5a9c51fa5b..3f554d127c35 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -5,8 +5,6 @@ let diskSize = "4096"; in { - imports = [ ../profiles/headless.nix ]; - system.build.azureImage = pkgs.vmTools.runInLinuxVM ( pkgs.runCommand "azure-image" @@ -24,7 +22,6 @@ in postVM = '' - echo Converting mkdir -p $out ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd rm $diskImage @@ -93,34 +90,11 @@ in '' ); - fileSystems."/".device = "/dev/disk/by-label/nixos"; + imports = [ ./azure-common.nix ]; # Azure metadata is available as a CD-ROM drive. fileSystems."/metadata".device = "/dev/sr0"; - boot.kernelParams = [ "console=ttyS0" "earlyprintk=ttyS0" "rootdelay=300" "panic=1" "boot.panic_on_fail" ]; - boot.initrd.kernelModules = [ "hv_vmbus" "hv_netvsc" "hv_utils" "hv_storvsc" ]; - - # Generate a GRUB menu. - boot.loader.grub.device = "/dev/sda"; - boot.loader.grub.version = 2; - boot.loader.grub.timeout = 0; - - # Don't put old configurations in the GRUB menu. The user has no - # way to select them anyway. - boot.loader.grub.configurationLimit = 0; - - # Allow root logins only using the SSH key that the user specified - # at instance creation time. - services.openssh.enable = true; - services.openssh.permitRootLogin = "without-password"; - - # Force getting the hostname from Azure - networking.hostName = mkDefault ""; - - # Always include cryptsetup so that NixOps can use it. - environment.systemPackages = [ pkgs.cryptsetup ]; - systemd.services.fetch-ssh-keys = { description = "Fetch host keys and authorized_keys for root user"; @@ -157,8 +131,4 @@ in serviceConfig.StandardOutput = "journal+console"; }; - networking.usePredictableInterfaceNames = false; - - #users.extraUsers.root.openssh.authorizedKeys.keys = [ (builtins.readFile ) ]; - } -- cgit 1.4.1 From 8ed3ab50eab1ebfe7f1f295d03b395098ea09de6 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 20 May 2015 13:22:20 +0300 Subject: azure-image: common: add sg3_utils --- nixos/modules/virtualisation/azure-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index 4fc7a085f868..47022c6887c3 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -30,7 +30,8 @@ with lib; networking.hostName = mkDefault ""; # Always include cryptsetup so that NixOps can use it. - environment.systemPackages = [ pkgs.cryptsetup ]; + # sg_scan is needed to finalize disk removal on older kernels + environment.systemPackages = [ pkgs.cryptsetup pkgs.sg3_utils ]; networking.usePredictableInterfaceNames = false; -- cgit 1.4.1 From e98da673e4d2f7e45dff25c280ea7c29915fb0eb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 20 May 2015 13:51:57 +0200 Subject: nixos-checkout: Add nixpkgs-channels as a remote This way, you can do things like git checkout channels/nixos-14.12 to get the latest tested and built version of NixOS. --- nixos/modules/installer/tools/nixos-checkout.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/installer/tools/nixos-checkout.nix b/nixos/modules/installer/tools/nixos-checkout.nix index 3338e5119acb..9cdd8a74a188 100644 --- a/nixos/modules/installer/tools/nixos-checkout.nix +++ b/nixos/modules/installer/tools/nixos-checkout.nix @@ -1,5 +1,5 @@ -# This module generates the nixos-checkout script, which replaces the -# Nixpkgs source trees in /etc/nixos/nixpkgs with a Git checkout. +# This module generates the nixos-checkout script, which performs a +# checkout of the Nixpkgs Git repository. { config, lib, pkgs, ... }: @@ -37,8 +37,19 @@ let mv nixpkgs nixpkgs-$backupTimestamp fi - # Check out the NixOS and Nixpkgs sources. - git clone git://github.com/NixOS/nixpkgs.git nixpkgs + # Check out the Nixpkgs sources. + if ! [ -e nixpkgs/.git ]; then + echo "Creating repository in $prefix/nixpkgs..." + git init --quiet nixpkgs + else + echo "Updating repository in $prefix/nixpkgs..." + fi + cd nixpkgs + git remote add origin git://github.com/NixOS/nixpkgs.git || true + git remote add channels git://github.com/NixOS/nixpkgs-channels.git || true + git remote set-url origin --push git@github.com:NixOS/nixpkgs.git + git remote update + git checkout master ''; }; -- cgit 1.4.1 From 10ce7ae76938da13aba228b4d79f32479a4ea085 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 20 May 2015 14:16:00 +0200 Subject: Document the nixpkgs-channels repo This replaces update-channel-branches.sh with standard Git invocations. --- nixos/doc/manual/development/sources.xml | 44 ++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 16 deletions(-) (limited to 'nixos') diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index 3ac07da19f12..879a31e32c59 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -24,6 +24,9 @@ $ mkdir -p /my/sources $ cd /my/sources $ nix-env -i git $ git clone git://github.com/NixOS/nixpkgs.git +$ cd nixpkgs +$ git remote add channels git://github.com/NixOS/nixpkgs-channels.git +$ git remote update channels This will check out the latest NixOS sources to @@ -31,7 +34,12 @@ This will check out the latest NixOS sources to and the Nixpkgs sources to /my/sources/nixpkgs. (The NixOS source tree lives in a subdirectory of the Nixpkgs -repository.) +repository.) The remote channels refers to a +read-only repository that tracks the Nixpkgs/NixOS channels (see for more information about channels). Thus, +the Git branch channels/nixos-14.12 will contain +the latest built and tested version available in the +nixos-14.12 channel. It’s often inconvenient to develop directly on the master branch, since if somebody has just committed (say) a change to GCC, @@ -40,28 +48,32 @@ rebuild everything from source. So you may want to create a local branch based on your current NixOS version: -$ /my/sources/nixpkgs/maintainers/scripts/update-channel-branches.sh -Fetching channels from https://nixos.org/channels: - * [new branch] cbe467e -> channels/remotes/nixos-unstable -Fetching channels from nixos-version: - * [new branch] 9ff4738 -> channels/current-system -Fetching channels from ~/.nix-defexpr: - * [new branch] 0d4acad -> channels/root/nixos -$ git checkout -b local channels/current-system +$ nixos-version +14.04.273.ea1952b (Baboon) + +$ git checkout -b local ea1952b -Or, to base your local branch on the latest version available in the +Or, to base your local branch on the latest version available in a NixOS channel: -$ /my/sources/nixpkgs/maintainers/scripts/update-channel-branches.sh -$ git checkout -b local channels/remotes/nixos-unstable +$ git remote update channels +$ git checkout -b local channels/nixos-14.12 + + +(Replace nixos-14.12 with the name of the channel +you want to use.) You can use git merge or +git rebase to keep your local branch in sync with +the channel, e.g. + + +$ git remote update channels +$ git merge channels/nixos-14.12 -You can then use git rebase to sync your local -branch with the upstream branch, and use git -cherry-pick to copy commits from your local branch to the -upstream branch. +You can use git cherry-pick to copy commits from +your local branch to the upstream branch. If you want to rebuild your system using your (modified) sources, you need to tell nixos-rebuild about them -- cgit 1.4.1 From acdc3e6c9abea475cc66b886c4189650a495ce98 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 May 2015 15:12:55 -0700 Subject: nixos/lightdm: Some fixups --- nixos/modules/services/x11/display-managers/lightdm.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 4aeaed8cd324..dedd0e63b5f1 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -65,7 +65,7 @@ let greeters-directory = ${cfg.greeter.package} sessions-directory = ${dmcfg.session.desktops} - [SeatDefaults] + [Seat:*] xserver-command = ${xserverWrapper} session-wrapper = ${dmcfg.session.script} greeter-session = ${cfg.greeter.name} @@ -124,6 +124,11 @@ in config = mkIf cfg.enable { + assertions = [ { + assertion = !config.services.accounts-daemon.enable; + message = "Lightdm does not properly support gnome accountservice"; + } ]; + services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.job = { -- cgit 1.4.1 From 4ed8cdc3d46abfb441d36282d1fc1ada0e96d859 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 20 May 2015 18:53:54 -0700 Subject: nixos/bird: Fix doc compilation --- nixos/modules/services/networking/bird.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index 2fa1d6af7d2f..e7e1db191529 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -24,7 +24,7 @@ in type = types.string; description = '' BIRD Internet Routing Daemon configuration file. - http://bird.network.cz/?get_doc&f=bird-3.html + ''; }; -- cgit 1.4.1 From 5d2c6f0353a2c85a755299c28d78cd2de493856f Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 May 2015 12:37:14 +0200 Subject: nixos/tests/installer: Allow to pass extra config. We're going to need it for installer tests where nixos-generate-config isn't yet able to fully detect the filesystems/hardware. for example for device mapper configurations other than LVM. Signed-off-by: aszlig --- nixos/tests/installer.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'nixos') diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index af87705b9279..db029a5cc845 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -45,7 +45,8 @@ let # The configuration to install. makeConfig = { testChannel, grubVersion, grubDevice, grubIdentifier - , readOnly ? true, forceGrubReinstallCount ? 0 }: + , extraConfig, readOnly ? true, forceGrubReinstallCount ? 0 + }: pkgs.writeText "configuration.nix" '' { config, lib, pkgs, modulesPath, ... }: @@ -70,6 +71,7 @@ let environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; nix.binaryCaches = [ http://cache.nixos.org/ ]; + ${replaceChars ["\n"] ["\n "] extraConfig} } ''; @@ -106,7 +108,9 @@ let # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create # partitions and filesystems. - testScriptFun = { createPartitions, testChannel, grubVersion, grubDevice, grubIdentifier }: + testScriptFun = { createPartitions, testChannel, grubVersion, grubDevice + , grubIdentifier, extraConfig + }: let # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html iface = if grubVersion == 1 then "scsi" else "virtio"; @@ -172,7 +176,7 @@ let $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2"); $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier; } }", + "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; } }", "/mnt/etc/nixos/configuration.nix"); # Perform the installation. @@ -210,7 +214,7 @@ let # We need to a writable nix-store on next boot $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier; readOnly = false; forceGrubReinstallCount = 1; } }", + "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 1; } }", "/etc/nixos/configuration.nix"); # Check whether nixos-rebuild works. @@ -227,7 +231,7 @@ let $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); $machine->waitForUnit("multi-user.target"); $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier; readOnly = false; forceGrubReinstallCount = 2; } }", + "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 2; } }", "/etc/nixos/configuration.nix"); $machine->succeed("nixos-rebuild boot >&2"); $machine->shutdown; @@ -241,13 +245,16 @@ let makeInstallerTest = name: - { createPartitions, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid" }: + { createPartitions, testChannel ? false, grubVersion ? 2 + , grubDevice ? "/dev/vda", grubIdentifier ? "uuid", extraConfig ? "" + }: makeTest { inherit iso; name = "installer-" + name; nodes = if testChannel then { inherit webserver; } else { }; testScript = testScriptFun { - inherit createPartitions testChannel grubVersion grubDevice grubIdentifier; + inherit createPartitions testChannel grubVersion grubDevice + grubIdentifier extraConfig; }; }; -- cgit 1.4.1 From 3b396701fdc054795656562295d1092b72c192db Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 May 2015 12:40:07 +0200 Subject: nixos/tests/installer: Allow pre-boot commands. These commands will be executed directly after the machine is created, so it gives us the chance to for example type in passphrases using the virtual keyboard. Signed-off-by: aszlig --- nixos/tests/installer.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'nixos') diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index db029a5cc845..8ef247d6c4df 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -109,7 +109,7 @@ let # a test script fragment `createPartitions', which must create # partitions and filesystems. testScriptFun = { createPartitions, testChannel, grubVersion, grubDevice - , grubIdentifier, extraConfig + , grubIdentifier, preBootCommands, extraConfig }: let # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html @@ -194,6 +194,9 @@ let # Now see if we can boot the installation. $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + # For example to enter LUKS passphrase + ${preBootCommands} + # Did /boot get mounted? $machine->waitForUnit("local-fs.target"); @@ -229,6 +232,7 @@ let # Check whether a writable store build works $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + ${preBootCommands} $machine->waitForUnit("multi-user.target"); $machine->copyFileFromHost( "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 2; } }", @@ -239,22 +243,24 @@ let # And just to be sure, check that the machine still boots after # "nixos-rebuild switch". $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); + ${preBootCommands} $machine->waitForUnit("network.target"); $machine->shutdown; ''; makeInstallerTest = name: - { createPartitions, testChannel ? false, grubVersion ? 2 - , grubDevice ? "/dev/vda", grubIdentifier ? "uuid", extraConfig ? "" + { createPartitions, preBootCommands ? "", extraConfig ? "" + , testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" + , grubIdentifier ? "uuid" }: makeTest { inherit iso; name = "installer-" + name; nodes = if testChannel then { inherit webserver; } else { }; testScript = testScriptFun { - inherit createPartitions testChannel grubVersion grubDevice - grubIdentifier extraConfig; + inherit createPartitions preBootCommands testChannel grubVersion + grubDevice grubIdentifier extraConfig; }; }; -- cgit 1.4.1 From 1f34503010bee487b36ed5256fa27e3d2d29c968 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 May 2015 12:42:00 +0200 Subject: nixos/tests/installer: Add test for LUKS rootfs. This serves as a regression test for #7859. It's pretty straightforward, except from the fact that nixos-generate- config doesn't detect LUKS devices and the "sleep 60". As for the former, I have tried to add support for LUKS devices for nixos-generate-config, but it's not so easy as it sounds, because we need to create a device tree across all possible mappers and/or LVM up to the "real" device and then decide whether it is relevant to what is currently mounted. So I guess this is something for the nixpart branch (see #2079). And the latter isn't very trivial as well, because the LUKS passphrase prompt is issued on /dev/console, which is the last "console=..." kernel parameter (thus the `mkAfter`). So we can't simply grep the log, because the prompt ends up being on one terminal only (tty0) and using select() on $machine->{socket} doesn't work very well, because the FD is always "ready for read". If we would read the FD, we would conflict with $machine->connect and end up having an inconsistent state. Another idea would be to use multithreading to do $machine->connect while feeding the passphrase prompt in a loop and stop the thread once $machine->connect is done. Turns out that this is not so easy as well, because the threads need to share the $machine object and of course need to do properly locking. In the end I decided to use the "blindly hope that 60 seconds is enough" approach for now and come up with a better solution later. Other VM tests surely use sleep as well, but it's $machine->sleep, which is bound to the clock of the VM, so if the build machine is on high load, a $machine->sleep gets properly delayed but the timer outside the VM won't get that delay, so the test is not deterministic. Tested against the following revisions: 5e3fe39: Before the libgcrypt cleanup (a71f78a) that broke cryptsetup. 69a6848: While cryptsetup was broken (obviously the test failed). 15faa43: After cryptsetup has been switched to OpenSSL (fd588f9). Signed-off-by: aszlig --- nixos/tests/installer.nix | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'nixos') diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 8ef247d6c4df..a67068dc30a5 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -334,6 +334,43 @@ in { ''; }; + # Boot off an encrypted root partition + luksroot = makeInstallerTest "luksroot" + { createPartitions = '' + $machine->succeed( + "parted /dev/vda mklabel msdos", + "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot + "parted /dev/vda -- mkpart primary linux-swap 50M 1024M", + "parted /dev/vda -- mkpart primary 1024M -1s", # LUKS + "udevadm settle", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "modprobe dm_mod dm_crypt", + "echo -n supersecret | cryptsetup luksFormat -q /dev/vda3 -", + "echo -n supersecret | cryptsetup luksOpen --key-file - /dev/vda3 cryptroot", + "mkfs.ext3 -L nixos /dev/mapper/cryptroot", + "mount LABEL=nixos /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir -p /mnt/boot", + "mount LABEL=boot /mnt/boot", + ); + ''; + # XXX: Currently, generate-config doesn't detect LUKS yet. + extraConfig = '' + boot.kernelParams = lib.mkAfter [ "console=tty0" ]; + boot.initrd.luks.devices = lib.singleton { + name = "cryptroot"; + device = "/dev/vda3"; + preLVM = true; + }; + ''; + preBootCommands = '' + $machine->start; + sleep 60; # XXX: Hopefully this is long enough :-/ + $machine->sendChars("supersecret\n"); + ''; + }; + swraid = makeInstallerTest "swraid" { createPartitions = '' -- cgit 1.4.1 From 7808efe5b7c9abd89d3977825f7115f0a39a5771 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 May 2015 13:17:25 +0200 Subject: nixos/release: Add luksroot test to "tested" job. We want to avoid getting broken LUKS systems into the latest channel, so let's ensure that the channel update won't happen if LUKS support is broken again. Signed-off-by: aszlig --- nixos/release-combined.nix | 1 + nixos/release.nix | 1 + 2 files changed, 2 insertions(+) (limited to 'nixos') diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index cb1c200ab475..a79f72823fdf 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -53,6 +53,7 @@ in rec { (all nixos.tests.firewall) (all nixos.tests.gnome3) (all nixos.tests.installer.lvm) + (all nixos.tests.installer.luksroot) (all nixos.tests.installer.separateBoot) (all nixos.tests.installer.simple) (all nixos.tests.installer.simpleLabels) diff --git a/nixos/release.nix b/nixos/release.nix index 375b65d040e6..dfc28173f1a3 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -255,6 +255,7 @@ in rec { tests.i3wm = callTest tests/i3wm.nix {}; tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test); tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test); + tests.installer.luksroot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).luksroot.test); tests.installer.rebuildCD = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).rebuildCD.test); tests.installer.separateBoot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBoot.test); tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test); -- cgit 1.4.1 From b5820a5ebd034126d5d7d8c8cc60aa2d7a7c1b87 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Sat, 16 May 2015 20:48:13 +0200 Subject: Update Marathon module The new module makes it possible to pass extra commandline arguments to Marathon as well as environment variables. --- nixos/doc/manual/release-notes/rl-unstable.xml | 1 + nixos/modules/misc/ids.nix | 2 -- nixos/modules/services/scheduling/marathon.nix | 49 +++++++++++++++++++++----- 3 files changed, 41 insertions(+), 11 deletions(-) (limited to 'nixos') diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index c4691aa663f4..581c530866f0 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -17,6 +17,7 @@ brltty +marathon diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0039ca74ba85..c47f20ad3111 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -196,7 +196,6 @@ nylon = 168; apache-kafka = 169; panamax = 170; - marathon = 171; exim = 172; #fleet = 173; # unused #input = 174; # unused @@ -390,7 +389,6 @@ gitlab = 165; nylon = 168; panamax = 170; - #marathon = 171; # unused exim = 172; fleet = 173; input = 174; diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix index 8513d1174c38..ab93334f5fc9 100644 --- a/nixos/modules/services/scheduling/marathon.nix +++ b/nixos/modules/services/scheduling/marathon.nix @@ -12,27 +12,56 @@ in { options.services.marathon = { enable = mkOption { - description = "Whether to enable the marathon mesos framework."; - default = false; type = types.uniq types.bool; + default = false; + description = '' + Whether to enable the marathon mesos framework. + ''; }; httpPort = mkOption { - description = "Marathon listening port"; - default = 8080; type = types.int; + default = 8080; + description = '' + Marathon listening port for HTTP connections. + ''; }; master = mkOption { - description = "Marathon mesos master zookeeper address"; - default = "zk://${head cfg.zookeeperHosts}/mesos"; type = types.str; + default = "zk://${concatStringsSep "," cfg.zookeeperHosts}/mesos"; + example = "zk://1.2.3.4:2181,2.3.4.5:2181,3.4.5.6:2181/mesos"; + description = '' + Mesos master address. See for details. + ''; }; zookeeperHosts = mkOption { - description = "Marathon mesos zookepper addresses"; + type = types.listOf types.str; default = [ "localhost:2181" ]; + example = [ "1.2.3.4:2181" "2.3.4.5:2181" "3.4.5.6:2181" ]; + description = '' + ZooKeeper hosts' addresses. + ''; + }; + + extraCmdLineOptions = mkOption { type = types.listOf types.str; + default = [ ]; + example = [ "--https_port=8443" "--zk_timeout=10000" "--marathon_store_timeout=2000" ]; + description = '' + Extra command line options to pass to Marathon. + See for all possible flags. + ''; + }; + + environment = mkOption { + default = { }; + type = types.attrs; + example = { JAVA_OPTS = "-Xmx512m"; MESOSPHERE_HTTP_CREDENTIALS = "username:password"; }; + description = '' + Environment variables passed to Marathon. + ''; }; }; @@ -41,17 +70,19 @@ in { config = mkIf cfg.enable { systemd.services.marathon = { description = "Marathon Service"; + environment = cfg.environment; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" "zookeeper.service" "mesos-master.service" "mesos-slave.service" ]; serviceConfig = { - ExecStart = "${pkgs.marathon}/bin/marathon --master ${cfg.master} --zk zk://${head cfg.zookeeperHosts}/marathon"; + ExecStart = "${pkgs.marathon}/bin/marathon --master ${cfg.master} --zk zk://${concatStringsSep "," cfg.zookeeperHosts}/marathon --http_port ${toString cfg.httpPort} ${concatStringsSep " " cfg.extraCmdLineOptions}"; User = "marathon"; + Restart = "always"; + RestartSec = "2"; }; }; users.extraUsers.marathon = { - uid = config.ids.uids.marathon; description = "Marathon mesos framework user"; }; }; -- cgit 1.4.1 From 235c2228ca9f608f898bc455c9b5bb1e3c4cb3f0 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 May 2015 19:06:09 +0200 Subject: nixos/test-driver: Add new getScreenText function. Basically, this creates a screenshot and throws tesseract at it to recognize the characters from the screenshot. In order to produce a result that is well enough, we're using lanczos scaling and scale the image up to 400% of its original size. This provides the base functionality for a new Machine method which will be called waitForText. I originally had that idea long ago when writing the VM tests for VirtualBox and Chromium, but thought it would be disproportionate to the case. The downside however is that VM tests now depend on tesseract, but given the average runtime of our tests it really shouldn't have a too big impact and it's only a runtime dependency after all. Another issue is that the OCR process takes quite some time to finish, but IMHO it's better (as in more deterministic) than to rely on sleep(). Signed-off-by: aszlig --- .../doc/manual/development/writing-nixos-tests.xml | 7 ++++++ nixos/lib/test-driver/Machine.pm | 25 ++++++++++++++++++++++ nixos/lib/testing.nix | 4 ++-- 3 files changed, 34 insertions(+), 2 deletions(-) (limited to 'nixos') diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index bbb655eed2a6..6224be0ca1a5 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -154,6 +154,13 @@ startAll; log. + + getScreenText + Return a textual representation of what is currently + visible on the machine's screen using optical character + recognition. + + sendMonitorCommand Send a command to the QEMU monitor. This is rarely diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index e0791692d3ef..0dddc1dc14b1 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -9,6 +9,7 @@ use FileHandle; use Cwd; use File::Basename; use File::Path qw(make_path); +use File::Slurp; my $showGraphics = defined $ENV{'DISPLAY'}; @@ -493,6 +494,30 @@ sub screenshot { } +# Take a screenshot and return the result as text using optical character +# recognition. +sub getScreenText { + my ($self) = @_; + + my $text; + $self->nest("performing optical character recognition", sub { + my $tmpbase = Cwd::abs_path(".")."/ocr"; + my $tmpin = $tmpbase."in.ppm"; + my $tmpout = "$tmpbase.ppm"; + + $self->sendMonitorCommand("screendump $tmpin"); + system("ppmtopgm $tmpin | pamscale 4 -filter=lanczos > $tmpout") == 0 + or die "cannot scale screenshot"; + unlink $tmpin; + system("tesseract $tmpout $tmpbase") == 0 or die "OCR failed"; + unlink $tmpout; + $text = read_file("$tmpbase.txt"); + unlink "$tmpbase.txt"; + }); + return $text; +} + + # Wait until it is possible to connect to the X server. Note that # testing the existence of /tmp/.X11-unix/X0 is insufficient. sub waitForX { diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index c14f15a1ad5d..431e3de6a8ce 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -27,8 +27,8 @@ rec { cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin" \ - --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter perlPackages.IOTty ]}:$out/lib/perl5/site_perl" + --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin:${tesseract}/bin" \ + --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" ''; }; -- cgit 1.4.1 From 8bd025a75e295609647af0510544efb857678ec8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 May 2015 19:49:08 +0200 Subject: nixos/test-driver: Add new waitForText function. As promised in the previous commit, this can be used similarly to $machine->waitForWindow, where you supply a regular expression and it's retrying OCR until the regexp matches. Signed-off-by: aszlig --- nixos/doc/manual/development/writing-nixos-tests.xml | 7 +++++++ nixos/lib/test-driver/Machine.pm | 11 +++++++++++ 2 files changed, 18 insertions(+) (limited to 'nixos') diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 6224be0ca1a5..322778d1c209 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -244,6 +244,13 @@ startAll; connections. + + waitForText + Wait until the supplied regular expressions matches + the textual contents of the screen by using optical character recognition + (see getScreenText). + + waitForWindow Wait until an X11 window has appeared whose name diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 0dddc1dc14b1..d149634e9e62 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -518,6 +518,17 @@ sub getScreenText { } +# Wait until a specific regexp matches the textual contents of the screen. +sub waitForText { + my ($self, $regexp) = @_; + $self->nest("waiting for $regexp to appear on the screen", sub { + retry sub { + return 1 if $self->getScreenText =~ /$regexp/; + } + }); +} + + # Wait until it is possible to connect to the X server. Note that # testing the existence of /tmp/.X11-unix/X0 is insufficient. sub waitForX { -- cgit 1.4.1 From 77d7aa6742a25f11cad469805ec948c39a194707 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 May 2015 19:51:47 +0200 Subject: nixos/tests/luksroot: Switch to use waitForText. Fixes the "blindly hope that 60 seconds is enough" issue from 1f34503, so that we now have a (hopefully) reliable way to wait for the passphrase prompt. Signed-off-by: aszlig --- nixos/tests/installer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index a67068dc30a5..f491b0460330 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -366,7 +366,7 @@ in { ''; preBootCommands = '' $machine->start; - sleep 60; # XXX: Hopefully this is long enough :-/ + $machine->waitForText(qr/Enter passphrase/); $machine->sendChars("supersecret\n"); ''; }; -- cgit 1.4.1 From 4f943ef23720157d80084aff9646c25f4bf05a0f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 21 May 2015 19:06:03 -0700 Subject: nixos/lightdm: More changes --- .../services/x11/display-managers/lightdm.nix | 27 ++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index dedd0e63b5f1..f6de8c02b186 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -124,11 +124,6 @@ in config = mkIf cfg.enable { - assertions = [ { - assertion = !config.services.accounts-daemon.enable; - message = "Lightdm does not properly support gnome accountservice"; - } ]; - services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.job = { @@ -148,8 +143,26 @@ in services.dbus.enable = true; services.dbus.packages = [ lightdm ]; - security.pam.services.lightdm = { allowNullPassword = true; startSession = true; }; - security.pam.services.lightdm-greeter = { allowNullPassword = true; startSession = true; }; + security.pam.services.lightdm = { + allowNullPassword = true; + startSession = true; + }; + security.pam.services.lightdm-greeter = { + allowNullPassword = true; + startSession = true; + text = '' + auth required pam_env.so + auth required pam_permit.so + + account required pam_permit.so + + password required pam_deny.so + + session required pam_env.so envfile=${config.system.build.pamEnvironment} + session required pam_unix.so + session optional ${pkgs.systemd}/lib/security/pam_systemd.so + ''; + }; users.extraUsers.lightdm = { createHome = true; -- cgit 1.4.1 From 31a273cb14cccdc3735db74597cb07db1e862704 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 21 May 2015 20:11:13 -0700 Subject: nixos/tinc: users are system users --- nixos/modules/services/networking/tinc.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'nixos') diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index f9ca796ea652..2d43c3d962dd 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -154,6 +154,7 @@ in users.extraUsers = flip mapAttrs' cfg.networks (network: _: nameValuePair ("tinc.${network}") ({ description = "Tinc daemon user for ${network}"; + isSystemUser = true; }) ); -- cgit 1.4.1 From 8be00dc71dbe409447feddc42d26bdfaf38703a4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 May 2015 07:14:00 +0200 Subject: nixos/test-driver: Make tesseract OCR optional. By default this is now enabled, and it has to be explicitely enabled using "enableOCR = true". If it is set to false, any usage of getScreenText or waitForText will fail with an error suggesting to pass enableOCR. This should get rid of the rather large dependency on tesseract which we don't need for most tests. Note, that I'm using system("type -P") here to check whether tesseract is in PATH. I know it's a bashism but we already have other bashisms within the test scripts and we also run it with bash, so IMHO it's not a problem here. Signed-off-by: aszlig --- nixos/doc/manual/development/writing-nixos-tests.xml | 8 ++++++-- nixos/lib/test-driver/Machine.pm | 3 +++ nixos/lib/testing.nix | 11 +++++++++-- nixos/tests/installer.nix | 4 +++- 4 files changed, 21 insertions(+), 5 deletions(-) (limited to 'nixos') diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 322778d1c209..b9da712b86f0 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -158,7 +158,9 @@ startAll; getScreenText Return a textual representation of what is currently visible on the machine's screen using optical character - recognition. + recognition. + This requires passing to the test + attribute set. @@ -248,7 +250,9 @@ startAll; waitForText Wait until the supplied regular expressions matches the textual contents of the screen by using optical character recognition - (see getScreenText). + (see getScreenText). + This requires passing to the test + attribute set. diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index d149634e9e62..824f23bcc4bb 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -499,6 +499,9 @@ sub screenshot { sub getScreenText { my ($self) = @_; + system("type -P tesseract &> /dev/null") == 0 + or die "getScreenText used but enableOCR is false"; + my $text; $self->nest("performing optical character recognition", sub { my $tmpbase = Cwd::abs_path(".")."/ocr"; diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 431e3de6a8ce..2039740a4578 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -27,7 +27,7 @@ rec { cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin:${tesseract}/bin" \ + --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin" \ --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" ''; }; @@ -68,7 +68,12 @@ rec { makeTest = - { testScript, makeCoverageReport ? false, name ? "unnamed", ... } @ t: + { testScript + , makeCoverageReport ? false + , enableOCR ? false + , name ? "unnamed" + , ... + } @ t: let testDriverName = "nixos-test-driver-${name}"; @@ -102,12 +107,14 @@ rec { vms="$(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)" wrapProgram $out/bin/nixos-test-driver \ --add-flags "$vms" \ + ${lib.optionalString enableOCR "--prefix PATH : '${tesseract}/bin'"} \ --run "testScript=\"\$(cat $out/test-script)\"" \ --set testScript '"$testScript"' \ --set VLANS '"${toString vlans}"' ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms wrapProgram $out/bin/nixos-run-vms \ --add-flags "$vms" \ + ${lib.optionalString enableOCR "--prefix PATH : '${tesseract}/bin'"} \ --set tests '"startAll; joinAll;"' \ --set VLANS '"${toString vlans}"' \ ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index f491b0460330..64f98141cc0e 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -252,12 +252,13 @@ let makeInstallerTest = name: { createPartitions, preBootCommands ? "", extraConfig ? "" , testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" - , grubIdentifier ? "uuid" + , grubIdentifier ? "uuid", enableOCR ? false }: makeTest { inherit iso; name = "installer-" + name; nodes = if testChannel then { inherit webserver; } else { }; + inherit enableOCR; testScript = testScriptFun { inherit createPartitions preBootCommands testChannel grubVersion grubDevice grubIdentifier extraConfig; @@ -364,6 +365,7 @@ in { preLVM = true; }; ''; + enableOCR = true; preBootCommands = '' $machine->start; $machine->waitForText(qr/Enter passphrase/); -- cgit 1.4.1 From f12208c5a4833b2b38fdd01cb7cfe23a7cfb79b7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 May 2015 08:01:17 +0200 Subject: nixos/testing: Use stripped down tesseract only. Only include the English language for the VM tests, because we most likely won't need other languages. At least for now. Signed-off-by: aszlig --- nixos/lib/testing.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'nixos') diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 2039740a4578..ee254ae187fd 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -91,6 +91,8 @@ rec { vms = map (m: m.config.system.build.vm) (lib.attrValues nodes); + ocrProg = tesseract.override { enableLanguages = [ "eng" ]; }; + # Generate onvenience wrappers for running the test driver # interactively with the specified network, and for starting the # VMs from the command line. @@ -107,14 +109,14 @@ rec { vms="$(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)" wrapProgram $out/bin/nixos-test-driver \ --add-flags "$vms" \ - ${lib.optionalString enableOCR "--prefix PATH : '${tesseract}/bin'"} \ + ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --run "testScript=\"\$(cat $out/test-script)\"" \ --set testScript '"$testScript"' \ --set VLANS '"${toString vlans}"' ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms wrapProgram $out/bin/nixos-run-vms \ --add-flags "$vms" \ - ${lib.optionalString enableOCR "--prefix PATH : '${tesseract}/bin'"} \ + ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ --set tests '"startAll; joinAll;"' \ --set VLANS '"${toString vlans}"' \ ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} -- cgit 1.4.1 From 2475a6a2393c2b3fd0d53a351ebc41a86c04639e Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 May 2015 08:10:17 +0200 Subject: nixos/test-driver: Fix bashism in Machine.pm. Thanks to @bjornfor for the note. Signed-off-by: aszlig --- nixos/lib/test-driver/Machine.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 824f23bcc4bb..db2c1a68692a 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -499,7 +499,7 @@ sub screenshot { sub getScreenText { my ($self) = @_; - system("type -P tesseract &> /dev/null") == 0 + system("command -v tesseract &> /dev/null") == 0 or die "getScreenText used but enableOCR is false"; my $text; -- cgit 1.4.1 From 5f50f23013a62af86b211bb89e1ce60421ba9fe8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 May 2015 11:23:09 +0200 Subject: nixos/tests/chromium: Detect popup using OCR. This will make the test a lot more reliable, because we no longer need to press ESC multiple times hoping that it will close the popup. Unfortunately in order to run this test I needed to locally revert the gyp update from a305e6855dd8723683c77635f45ae28411c8f36c. With the old gyp version however the test runs fine and it's able to properly detect the popup. Signed-off-by: aszlig --- nixos/tests/chromium.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'nixos') diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 026433fc7ee9..2241bc9c3bca 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -9,6 +9,8 @@ import ./make-test.nix ( }: rec { name = "chromium"; + enableOCR = true; + machine.imports = [ ./common/x11.nix ]; machine.virtualisation.memorySize = 1024; @@ -106,15 +108,11 @@ import ./make-test.nix ( "ulimit -c unlimited; ". "$pkg/bin/chromium $args \"$url\" & disown" ); + $machine->waitForText(qr/Type to search or enter a URL to navigate/); $machine->waitUntilSucceeds("${xdo "check-startup" '' search --sync --onlyvisible --name "startup done" # close first start help popup key -delay 1000 Escape - # XXX: This is to make sure the popup is closed, but we better do - # screenshots to detect visual changes. - key -delay 2000 Escape - key -delay 3000 Escape - key -delay 4000 Escape windowfocus --sync windowactivate --sync ''}"); -- cgit 1.4.1