From 224a6b85fa0ef0b8496a3a6d1b3bf0a6903099ac Mon Sep 17 00:00:00 2001 From: Ryan Artecona Date: Sun, 9 Oct 2016 15:23:32 -0400 Subject: vagrant: add darwin support Vagrant on macOS is distributed as a .dmg installer. Luckily, the internal contents of that archive resemble that of the .deb we use for linux. In fact, the similarity is enough that if we move its `embedded` directory to `opt/vagrant/embedded` and its `bin` to `usr/bin` (and back again after installation), the derivation's installPhase (which replaces embedded libs & binaries with those from the package's inputs) can remain exactly the same between macOS and linux. --- pkgs/development/tools/vagrant/default.nix | 52 ++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index cf4f34cbdfee..062873f0ccd4 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv -, libxml2, libxslt, makeWrapper }: - -assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; +, libxml2, libxslt, makeWrapper, p7zip, xar, gzip, cpio }: let version = "1.8.6"; @@ -12,9 +10,16 @@ let sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8"; }; + url = if stdenv.isLinux + then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.deb" + else if stdenv.isDarwin + then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}.dmg" + else "system ${stdenv.system} not supported"; + sha256 = { - "x86_64-linux" = "1nkhf160hcl02yvafj6hq53j204qqxyvxjngnmf4f5md8dmkpn76"; - "i686-linux" = "0mr4pn7nggjdsqyxh1z2mflvvmpzhbxh5gax501d2hi8xr0y68df"; + "x86_64-linux" = "1nkhf160hcl02yvafj6hq53j204qqxyvxjngnmf4f5md8dmkpn76"; + "i686-linux" = "0mr4pn7nggjdsqyxh1z2mflvvmpzhbxh5gax501d2hi8xr0y68df"; + "x86_64-darwin" = "1nd2adxwhs2vwmi5vw2z720ny4q9rpj8i4dlcdxzbyli7h8cs5mr"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = builtins.replaceStrings ["-linux"] [""] stdenv.system; @@ -24,8 +29,7 @@ in stdenv.mkDerivation rec { inherit version; src = fetchurl { - url = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.deb"; - inherit sha256; + inherit url sha256; }; meta = with stdenv.lib; { @@ -33,14 +37,29 @@ in stdenv.mkDerivation rec { homepage = http://vagrantup.com; license = licenses.mit; maintainers = with maintainers; [ lovek323 globin jgeerds kamilchm ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; }; - buildInputs = [ makeWrapper ]; - - unpackPhase = '' - ${dpkg}/bin/dpkg-deb -x "$src" . - ''; + buildInputs = [ makeWrapper ] + ++ stdenv.lib.optional stdenv.isDarwin [ p7zip xar gzip cpio ]; + + unpackPhase = if stdenv.isLinux + then '' + ${dpkg}/bin/dpkg-deb -x "$src" . + '' + else '' + 7z x $src + cd Vagrant/ + xar -xf Vagrant.pkg + cd core.pkg/ + cat Payload | gzip -d - | cpio -id + + # move unpacked directories to match unpacked .deb from linux, + # so installPhase can be shared + mkdir -p opt/vagrant/ usr/ + mv embedded opt/vagrant/embedded + mv bin usr/bin + ''; buildPhase = ""; @@ -110,5 +129,10 @@ in stdenv.mkDerivation rec { postFixup = '' chmod +x "$out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable" chmod +x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh" - ''; + '' + + (stdenv.lib.optionalString stdenv.isDarwin '' + # undo the directory movement done in unpackPhase + mv $out/opt/vagrant/embedded $out/ + rm -r $out/opt + ''); } -- cgit 1.4.1 From 1b0163ea16130b34948c3f2d0102e5d2de5dccfd Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Wed, 12 Oct 2016 14:13:24 +0300 Subject: a2ps: fix build --- pkgs/tools/text/a2ps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix index e38de5e6bd89..2535354aa229 100644 --- a/pkgs/tools/text/a2ps/default.nix +++ b/pkgs/tools/text/a2ps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, libpaper, gperf, file, perl }: +{ stdenv, fetchurl, fetchpatch, autoconf, bison, libpaper, gperf, file, perl }: stdenv.mkDerivation rec { name = "a2ps-4.14"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { substituteInPlace tests/defs.in --replace "/bin/rm" "rm" ''; - nativeBuildInputs = [ file perl ]; + nativeBuildInputs = [ autoconf file bison perl ]; buildInputs = [ libpaper gperf ]; meta = with stdenv.lib; { -- cgit 1.4.1 From eb182f421777665fa306f4c720c36f7a1bcc4888 Mon Sep 17 00:00:00 2001 From: regnat Date: Sun, 9 Oct 2016 11:11:37 +0200 Subject: selfoss : 2.15 -> 2016-07-31 --- pkgs/servers/web-apps/selfoss/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix index 9b11e1261372..1606cc9e76bf 100644 --- a/pkgs/servers/web-apps/selfoss/default.nix +++ b/pkgs/servers/web-apps/selfoss/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "selfoss-${version}"; - version = "2.15"; + name = "selfoss-unstable-${version}"; + version = "2016-07-31"; src = fetchFromGitHub { owner = "SSilence"; repo = "selfoss"; - rev = version; - sha256 = "0ljpyd354yalpnqwj6xk9b9mq4h6p8jbqznapj7nvfybas8faq15"; + rev = "ceb431ad9208e2c5e31dafe593c75e5eb8b65cf7"; + sha256 = "00vrpw7sb95x6lwpaxrlzxyj98k98xblqcrjr236ykv0ha97xv30"; }; buildPhases = ["unpackPhase" "installPhase"]; -- cgit 1.4.1 From 79f6e39b932e3bece1e50079e6ba3f545b8a8b08 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 14 Oct 2016 00:31:24 +0200 Subject: cereal: fix build on ghcjs --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 5c7e42a59a7a..c97296cd5bad 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -129,4 +129,5 @@ self: super: # triggers an internal pattern match failure in haddock # https://github.com/haskell/haddock/issues/553 wai = dontHaddock super.wai; + cereal = addBuildDepend super.cereal [ self.fail ]; } -- cgit 1.4.1 From 725544fd9e56bd4fdda58ea71ed2904869d441d9 Mon Sep 17 00:00:00 2001 From: Matthias Herrmann Date: Fri, 14 Oct 2016 07:45:33 +0200 Subject: zk-shell: init at 1.0.0 --- pkgs/applications/misc/zk-shell/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/misc/zk-shell/default.nix diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/applications/misc/zk-shell/default.nix new file mode 100644 index 000000000000..b03208f9f2b3 --- /dev/null +++ b/pkgs/applications/misc/zk-shell/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }: + +buildPythonApplication rec { + version = "1.0.0"; + name = "zk-shell-" + version; + + src = fetchFromGitHub { + owner = "rgs1"; + repo = "zk_shell"; + rev = "v${version}"; + sha256 = "0zisvvlclsf4sdh7dpqcl1149xbxw6pi1aqcwjbqblgf8m4nm0c7"; + }; + + propagatedBuildInputs = (with pythonPackages; [ + ansi kazoo nose six tabulate twitter readline + ]); + + #requires a running zookeeper, don't know how to fix that for the moment + doCheck = false; + + meta = { + description = "A powerful & scriptable shell for Apache ZooKeeper"; + homepage = https://github.com/rgs1/zk_shell; + license = stdenv.lib.licenses.apache2; + maintainers = [ stdenv.lib.maintainers.mahe ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9450ef9915e3..adc56c5543a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17335,6 +17335,10 @@ in zimg = callPackage ../development/libraries/zimg { }; + zk-shell = callPackage ../applications/misc/zk-shell { + inherit (pythonPackages) buildPythonApplication; + }; + zuki-themes = callPackage ../misc/themes/zuki { }; zoom-us = qt55.callPackage ../applications/networking/instant-messengers/zoom-us {}; -- cgit 1.4.1 From 7caca81cf7e3d1dcd6fa5865b6b34fae27775d5d Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 14 Oct 2016 05:51:40 -0300 Subject: enlightenment: 0.21.2 -> 0.21.3 --- pkgs/desktops/enlightenment/enlightenment.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index f4ff94ad088e..e3d676fd4f6e 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -4,18 +4,20 @@ mesa_glu , xkeyboard_config }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.21.2"; + version = "0.21.3"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "0fi5dxrprnvhnn2y51gnfpsjj44snriqi20k20a73vhaqxfn8xx8"; + sha256 = "1ljzcq775njhbcaj8vdnypf2rgc6yqqdwfkf7c22603qvv9if1dr"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ efl libXdmcp libxcb - xcbutilkeysyms libXrandr libffi pam alsaLib luajit bzip2 - libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + buildInputs = [ + efl libXdmcp libxcb xcbutilkeysyms libXrandr libffi pam alsaLib + luajit bzip2 libpthreadstubs gdbm + ] ++ + stdenv.lib.optionals stdenv.isLinux [ libcap ]; NIX_CFLAGS_COMPILE = [ "-I${efl}/include/ecore-imf-1" @@ -49,11 +51,11 @@ stdenv.mkDerivation rec { ln -sv /var/setuid-wrappers/e_freqset $CPUFREQ_DIRPATH/freqset ''; - meta = { + meta = with stdenv.lib; { description = "The Compositing Window Manager and Desktop Shell"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; }; } -- cgit 1.4.1 From 6ed72b2c1ac898f8bab10761ae14945813db28a2 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 14 Oct 2016 06:34:34 -0300 Subject: vertex-theme: 20160329 -> 20161009 --- pkgs/misc/themes/vertex/default.nix | 31 ++++++++++++++++++------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix index 7c6778a40d54..bbacfa2f5e5a 100644 --- a/pkgs/misc/themes/vertex/default.nix +++ b/pkgs/misc/themes/vertex/default.nix @@ -1,33 +1,38 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "theme-vertex-${version}"; - version = "20160329"; + name = "${pname}-${version}"; + pname = "vertex-theme"; + version = "20161009"; src = fetchFromGitHub { owner = "horst3180"; - repo = "Vertex-theme"; - rev = version; - sha256 = "1zafnbxn9hgi4lmi254iw9jyhifcqijxa7cymwjpyy0jfa6sm1qj"; + repo = pname; + rev = "c861918a7fccf6d0768d45d790a19a13bb23485e"; + sha256 = "13abgl18m04sj44gqipxbagpan4jqral65w59rgnhb6ldxgnhg33"; }; - buildInputs = [ autoreconfHook gtk3 pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - configureFlags = "--disable-unity"; + buildInputs = [ gtk-engine-murrine ]; + + configureFlags = [ "--disable-unity" "--with-gnome=${gnome3.version}" ]; postInstall = '' - mkdir -p $out/share/doc/theme-vertex - cp AUTHORS COPYING README.md $out/share/doc/theme-vertex/ + mkdir -p $out/share/plank/themes + cp -r extra/*-Plank $out/share/plank/themes - mkdir -p $out/share/doc/theme-vertex/extra - cp -r extra/{Chrome,Firefox} $out/share/doc/theme-vertex/extra + mkdir -p $out/share/doc/$pname/Chrome + cp -r extra/Chrome/*.crx $out/share/doc/$pname/Chrome + cp -r extra/Firefox $out/share/doc/$pname + cp AUTHORS README.md $out/share/doc/$pname/ ''; meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon"; license = licenses.gpl3; - maintainers = [ maintainers.rycee ]; platforms = platforms.unix; + maintainers = with maintainers; [ rycee romildo ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc4370e9eedc..ac73c1779488 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16174,7 +16174,7 @@ in in recurseIntoAttrs (lib.makeScope qt5.newScope merged); - theme-vertex = callPackage ../misc/themes/vertex { }; + vertex-theme = callPackage ../misc/themes/vertex { }; xfce = xfce4-12; xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { }); -- cgit 1.4.1 From 6eef45e58e05ff726ae9e916b9b1a6afe76c0b6f Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 14 Oct 2016 06:58:59 -0300 Subject: arc-theme: 2016-06-06 -> 2016-10-13 --- pkgs/misc/themes/arc/default.nix | 25 +++++++++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index b7ff36c0917c..09599604a472 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }: stdenv.mkDerivation rec { - version = "2016-06-06"; - name = "arc-gtk-theme-${version}"; + name = "${pname}-${version}"; + pname = "arc-theme"; + version = "2016-10-13"; src = fetchFromGitHub { owner = "horst3180"; - repo = "arc-theme"; - rev = "d24a7b5b4eb25e1a094bdf4e125332cfb8e2c8c1"; - sha256 = "07rf21xhyz3if4n5ccmzmjf9rz9w7wkvci7ccivhh6lkillfbxgi"; + repo = pname; + rev = "a9ce9d56ae61f23592fa4a8c200085dde7b43e07"; + sha256 = "02w8nckd4q548shdgml9ndnbnq1g7nq6v8df89mx4l3lc9r6354y"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -17,13 +18,21 @@ stdenv.mkDerivation rec { preferLocalBuild = true; - configureFlags = "--with-gnome=${gnome3.version} "; + configureFlags = [ "--disable-unity" "--with-gnome=${gnome3.version}" ]; + + postInstall = '' + mkdir -p $out/share/plank/themes + cp -r extra/*-Plank $out/share/plank/themes + mkdir -p $out/share/doc/$pname/Chrome + cp -r extra/Chrome/*.crx $out/share/doc/$pname/Chrome + cp AUTHORS README.md $out/share/doc/$pname/ + ''; meta = with stdenv.lib; { description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell"; - homepage = "https://github.com/horst3180/Arc-theme"; + homepage = "https://github.com/horst3180/arc-theme"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ simonvandel romildo ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc4370e9eedc..a20e6084020a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -535,7 +535,7 @@ in androidsdk_extras = self.androidenv.androidsdk_6_0_extras; - arc-gtk-theme = callPackage ../misc/themes/arc { }; + arc-theme = callPackage ../misc/themes/arc { }; adapta-gtk-theme = callPackage ../misc/themes/adapta { }; -- cgit 1.4.1 From ab7538a27706200fcf1b8d9806e4c1bc565f76fc Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Fri, 14 Oct 2016 12:00:31 +0200 Subject: clipit: hicolor_icon_theme dependency --- pkgs/applications/misc/clipit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index e62236e7ae2f..06ebaa7c12dd 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool }: +{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool, hicolor_icon_theme }: stdenv.mkDerivation rec { name = "clipit-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva"; }; - buildInputs = [ intltool pkgconfig gtk2 xdotool ]; + buildInputs = [ intltool pkgconfig gtk2 xdotool hicolor_icon_theme ]; meta = with stdenv.lib; { description = "Lightweight GTK+ Clipboard Manager"; -- cgit 1.4.1 From 0acd3b3b42974144309534c3c2545214a76544ad Mon Sep 17 00:00:00 2001 From: derchris Date: Fri, 14 Oct 2016 12:05:42 +0200 Subject: netdata: 1.0.0 -> 1.4.0 --- pkgs/tools/system/netdata/default.nix | 15 ++++++++++----- pkgs/tools/system/netdata/web_access.patch | 19 ------------------- 2 files changed, 10 insertions(+), 24 deletions(-) delete mode 100644 pkgs/tools/system/netdata/web_access.patch diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 28ec7f1be427..13c50fe3ec9e 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }: stdenv.mkDerivation rec{ - version = "1.0.0"; + version = "1.4.0"; name = "netdata-${version}"; src = fetchFromGitHub { rev = "v${version}"; owner = "firehol"; repo = "netdata"; - sha256 = "03107ny98zks05p44jzypkk4lw8lbvmqja5b537ln6cnrgp20yvq"; + sha256 = "1wknxci2baj6f7rl8z8j7haaz122jmbb74aw7i3xbj2y61cs58n8"; }; - buildInputs = [ autoreconfHook zlib pkgconfig ]; + buildInputs = [ autoreconfHook zlib pkgconfig libuuid ]; - patches = [ ./web_access.patch ]; + preConfigure = '' + export ZLIB_CFLAGS=" " + export ZLIB_LIBS="-lz" + export UUID_CFLAGS=" " + export UUID_LIBS="-luuid" + ''; meta = with stdenv.lib; { description = "Real-time performance monitoring tool"; diff --git a/pkgs/tools/system/netdata/web_access.patch b/pkgs/tools/system/netdata/web_access.patch deleted file mode 100644 index 3c0fbf7507d7..000000000000 --- a/pkgs/tools/system/netdata/web_access.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/web_client.c.orig 2016-04-17 11:34:20.044455323 +0200 -+++ b/src/web_client.c 2016-04-17 11:34:47.432897957 +0200 -@@ -291,14 +291,14 @@ - buffer_sprintf(w->response.data, "File '%s' does not exist, or is not accessible.", filename); - return 404; - } -- -+#if 0 - // check if the file is owned by us - if(stat.st_uid != web_files_uid()) { - error("%llu: File '%s' is owned by user %d (I run as user %d). Access Denied.", w->id, webfilename, stat.st_uid, getuid()); - buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", filename); - return 403; - } -- -+#endif - if((stat.st_mode & S_IFMT) == S_IFDIR) { - snprintf(webfilename, FILENAME_MAX+1, "%s/index.html", filename); - return mysendfile(w, webfilename); -- cgit 1.4.1 From ebcd7f2a63961da0e988e5dab95353d75a4345a9 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 14 Oct 2016 07:10:52 -0300 Subject: faba-icon-theme: 2016-06-02 -> 2016-09-13 --- pkgs/data/icons/faba-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index b83abbe7e80c..37f46060ae31 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "faba-icon-theme"; - version = "2016-06-02"; + version = "2016-09-13"; src = fetchFromGitHub { owner = "moka-project"; repo = package-name; - rev = "e50649d0171fd8cce42404c7c5002d77710ffcfc"; - sha256 = "1fn969a6l58asnl9181c2z1fsj4dybl2mgbcpwig20bri6q7yz20"; + rev = "00431894bce5fb1b8caccaee064788996be228a7"; + sha256 = "0hif030pd4w3s851k0s65w0mf2pik10ha25ycpsv91gpbgarqcns"; }; nativeBuildInputs = [ autoreconfHook ]; -- cgit 1.4.1 From 33acea23b4f4dbc309d61f6a00e5d1096c63e54d Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 14 Oct 2016 07:33:23 -0300 Subject: moka-icon-theme: 2016-06-07 -> 2016-10-06 --- pkgs/data/icons/moka-icon-theme/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index 4d98a50c0c4b..0ffe2411c4fa 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "moka-icon-theme"; - version = "2016-06-07"; + version = "2016-10-06"; src = fetchFromGitHub { - owner = "moka-project"; + owner = "snwh"; repo = package-name; - rev = "a03d14e30dbdf05e8ea904994b8081ad0824e155"; - sha256 = "1j1cnrrg0gfr4vfzxlabrv8090fg4yni99g61s82vnyszkiy1rcm"; + rev = "50894ee9411721649019cd168b8ae2c85f4b5cf0"; + sha256 = "1dlpsgqsn731ra5drkx72wljcgv1zydgldy4nn5bbia9s5w8mfgs"; }; nativeBuildInputs = [ autoreconfHook ]; -- cgit 1.4.1 From 2f5150be7a712137e5c73f739f50e5651ae9d0c3 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 14 Oct 2016 07:40:42 -0300 Subject: faba-mono-icons: fix repository owner --- pkgs/data/icons/faba-mono-icons/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix index 16fa63c5424c..3a871e86d9d1 100644 --- a/pkgs/data/icons/faba-mono-icons/default.nix +++ b/pkgs/data/icons/faba-mono-icons/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "2016-04-30"; src = fetchFromGitHub { - owner = "moka-project"; + owner = "snwh"; repo = package-name; rev = "2006c5281eb988c799068734f289a85443800cda"; sha256 = "0nisfl92y6hrbakp9qxi0ygayl6avkzrhwirg6854bwqjy2dvjv9"; -- cgit 1.4.1 From 2817e73568757b81c0d9b206c9df4fb2d66babca Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 14 Oct 2016 07:57:29 -0300 Subject: arc-icon-theme: 2016-06-06 -> 2016-07-07 --- pkgs/data/icons/arc-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index 07900eebeefa..760329a94bfa 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "arc-icon-theme"; - version = "2016-06-06"; + version = "2016-07-07"; src = fetchFromGitHub { owner = "horst3180"; repo = package-name; - rev = "69da5eed0761237fd287ea2fc95c708353ccc332"; - sha256 = "04ym3ix2cpjh1q7lwvhl578pv41mn9zsadlsygl0nck8yd22widq"; + rev = "664c05e723ac2971feb123d7baca3d298248e7f9"; + sha256 = "10vicnrv2v7y4capvllaz9x3nzjkjj9fs1dspjjjg6if3gcif7m4"; }; nativeBuildInputs = [ autoreconfHook ]; -- cgit 1.4.1 From 811b876fab58ba8795727b35897f9d35f7aa9407 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 14 Oct 2016 16:01:31 +0200 Subject: Revert "openssl, curl, git: Respect $NIX_SSL_CERT_FILE" This reverts commit 942dbf89c6120cb5b52fb2ab456855d1fbf2994e. Sorry, this was supposed to go to staging instead of master... --- .../git-and-tools/git/ssl-cert-file.patch | 7 ++----- pkgs/development/libraries/openssl/default.nix | 1 - .../development/libraries/openssl/nix-ssl-cert-file.patch | 15 --------------- pkgs/tools/networking/curl/default.nix | 2 -- pkgs/tools/networking/curl/nix-ssl-cert-file.patch | 14 -------------- 5 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 pkgs/development/libraries/openssl/nix-ssl-cert-file.patch delete mode 100644 pkgs/tools/networking/curl/nix-ssl-cert-file.patch diff --git a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch index 0e0697dfb211..bafd65e8c93e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch +++ b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch @@ -1,14 +1,11 @@ diff -ru git-2.7.4-orig/http.c git-2.7.4/http.c --- git-2.7.4-orig/http.c 2016-03-17 21:47:59.000000000 +0100 +++ git-2.7.4/http.c 2016-04-12 11:38:33.187070848 +0200 -@@ -544,6 +544,10 @@ +@@ -544,6 +544,7 @@ #if LIBCURL_VERSION_NUM >= 0x070908 set_from_env(&ssl_capath, "GIT_SSL_CAPATH"); #endif -+ if (getenv("NIX_SSL_CERT_FILE")) -+ set_from_env(&ssl_cainfo, "NIX_SSL_CERT_FILE"); -+ else -+ set_from_env(&ssl_cainfo, "SSL_CERT_FILE"); ++ set_from_env(&ssl_cainfo, "SSL_CERT_FILE"); set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO"); set_from_env(&user_agent, "GIT_HTTP_USER_AGENT"); diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 6aefc8b79723..ea89bb859e5f 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -19,7 +19,6 @@ let patches = (args.patches or []) - ++ [ ./nix-ssl-cert-file.patch ] ++ optional (versionOlder version "1.1.0") ./use-etc-ssl-certs.patch ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch ++ optional diff --git a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch deleted file mode 100644 index 4b3c6f458b4c..000000000000 --- a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c ---- openssl-1.0.2j-orig/crypto/x509/by_file.c 2016-09-26 11:49:07.000000000 +0200 -+++ openssl-1.0.2j/crypto/x509/by_file.c 2016-10-13 16:54:31.400288302 +0200 -@@ -97,7 +97,10 @@ - switch (cmd) { - case X509_L_FILE_LOAD: - if (argl == X509_FILETYPE_DEFAULT) { -- file = (char *)getenv(X509_get_default_cert_file_env()); -+ file = (char *)getenv("NIX_SSL_CERT_FILE"); -+ if (!file) -+ file = (char *)getenv(X509_get_default_cert_file_env()); -+ fprintf(stderr, "OPEN %s", file); - if (file) - ok = (X509_load_cert_crl_file(ctx, file, - X509_FILETYPE_PEM) != 0); diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index d1936cb11ad3..958bea34e7d3 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { sha256 = "1v6q83qsrf7dgp3y5fa5vkppgqyy82pnsk8z9b4047b6fvclfwvv"; }; - patches = [ ./nix-ssl-cert-file.patch ]; - outputs = [ "bin" "dev" "out" "man" "devdoc" ]; nativeBuildInputs = [ pkgconfig perl ]; diff --git a/pkgs/tools/networking/curl/nix-ssl-cert-file.patch b/pkgs/tools/networking/curl/nix-ssl-cert-file.patch deleted file mode 100644 index 20c408bfae23..000000000000 --- a/pkgs/tools/networking/curl/nix-ssl-cert-file.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' curl-7.50.3-orig/src/tool_operate.c curl-7.50.3/src/tool_operate.c ---- curl-7.50.3-orig/src/tool_operate.c 2016-09-06 23:25:06.000000000 +0200 -+++ curl-7.50.3/src/tool_operate.c 2016-10-14 11:51:48.999943142 +0200 -@@ -269,7 +269,9 @@ - capath_from_env = true; - } - else { -- env = curlx_getenv("SSL_CERT_FILE"); -+ env = curlx_getenv("NIX_SSL_CERT_FILE"); -+ if(!env) -+ env = curlx_getenv("SSL_CERT_FILE"); - if(env) { - config->cacert = strdup(env); - if(!config->cacert) { -- cgit 1.4.1 From 47e61969b852a23d9059108b9356dad9ae515616 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 4 Oct 2016 19:22:55 +0200 Subject: ocaml-react: fix hash The package had been updated from 1.1.0 -> 1.2.0 but the hash hadn't. --- pkgs/development/ocaml-modules/react/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index 66c2533853e6..2dffbcf440f9 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://erratique.ch/software/react/releases/react-1.2.0.tbz; - sha256 = "1gymn8hy7ga0l9qymmb1jcnnkqvy7l2zr87xavzqz0dfi9ci8dm7"; + sha256 = "0knhgbngphv5sp1yskfd97crf169qhpc0igr6w7vqw0q36lswyl8"; }; unpackCmd = "tar xjf $src"; -- cgit 1.4.1 From ffb0d1158f73de28c9771dcdec1930c9bb24e877 Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Wed, 12 Oct 2016 22:07:43 -0700 Subject: clerk: init at 2016-10-14 fixes #19505 --- pkgs/applications/audio/clerk/default.nix | 32 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/audio/clerk/default.nix diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix new file mode 100644 index 000000000000..3599991551ce --- /dev/null +++ b/pkgs/applications/audio/clerk/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl, +utillinux, pythonPackages, libnotify }: + +stdenv.mkDerivation { + name = "clerk-unstable-2016-10-14"; + + src = fetchFromGitHub { + owner = "carnager"; + repo = "clerk"; + rev = "875963bcae095ac1db174627183c76ebe165f787"; + sha256 = "0y045my65hr3hjyx13jrnyg6g3wb41phqb1m7azc4l6vx6r4124b"; + }; + + buildInputs = [ makeWrapper pythonPackages.mpd2 ]; + + buildPhase = '' + echo skipping build phase... + ''; + + installPhase = '' + DESTDIR=$out PREFIX=/ make install + wrapProgram $out/bin/clerk $out/bin/clerk \ + --prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl utillinux libnotify ]}" + ''; + + meta = with stdenv.lib; { + description = "An MPD client built on top of rofi"; + homepage = https://github.com/carnager/clerk; + license = licenses.mit; + maintainers = with maintainers; [ anderspapitto ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d916cc90de30..00b05fce30f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13676,6 +13676,8 @@ in mpc_cli = callPackage ../applications/audio/mpc { }; + clerk = callPackage ../applications/audio/clerk { }; + ncmpc = callPackage ../applications/audio/ncmpc { }; ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; -- cgit 1.4.1 From a7a34745b630ed90d6b95f95e6d72ecdb16483db Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 14 Oct 2016 15:29:30 +0200 Subject: postfix: 3.1.2 -> 3.1.3 --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 6303946de3a2..9c72aa018989 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -22,11 +22,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "0sqgsfq3dqilfcr2z9wi7g12mcma690j8qvs8v93gszrdgpb9f8s"; + sha256 = "0ya9h7ynhq8h7zgq0qkvfwx5rsam7i3vkbyh6rx63qlpcxz15y2j"; }; buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu pcre ] -- cgit 1.4.1 From 9df6c89a6efdb15a6649beab813df0d793a112e8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 14 Oct 2016 15:29:51 +0200 Subject: gitlab: 8.12.1 -> 8.12.6 --- pkgs/applications/version-management/gitlab-shell/default.nix | 4 ++-- pkgs/applications/version-management/gitlab/Gemfile | 4 ++-- pkgs/applications/version-management/gitlab/Gemfile.lock | 10 +++++----- pkgs/applications/version-management/gitlab/default.nix | 4 ++-- pkgs/applications/version-management/gitlab/gemset.nix | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index 863faa16eaf4..2293d11331df 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "3.6.1"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1cc8lnz06d1q2hdrgnsqk50wj0x950w81jsalfjxmx5lais4qgg9"; + sha256 = "0j4kwsfzb7l871fma1b1q9h33vyng2nnghn5zz192sv4yp0w2pvq"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index eb19a29ef0ca..eb3054dfd5b5 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -234,7 +234,7 @@ gem 'net-ssh', '~> 3.0.1' gem 'base32', '~> 0.3.0' # Sentry integration -gem 'sentry-raven', '~> 1.1.0' +gem 'sentry-raven', '~> 2.0.0' gem 'premailer-rails', '~> 1.9.0' @@ -331,7 +331,7 @@ gem 'newrelic_rpm', '~> 3.16' gem 'octokit', '~> 4.3.0' -gem 'mail_room', '~> 0.8' +gem 'mail_room', '~> 0.8.1' gem 'email_reply_parser', '~> 0.5.8' diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 468000e4d874..69f2af4f6f03 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -401,7 +401,7 @@ GEM systemu (~> 2.6.2) mail (2.6.4) mime-types (>= 1.16, < 4) - mail_room (0.8.0) + mail_room (0.8.1) method_source (0.8.2) mime-types (2.99.3) mimemagic (0.3.0) @@ -667,8 +667,8 @@ GEM activesupport (>= 3.1) select2-rails (3.5.9.3) thor (~> 0.14) - sentry-raven (1.1.0) - faraday (>= 0.7.6) + sentry-raven (2.0.2) + faraday (>= 0.7.6, < 0.10.x) settingslogic (2.0.9) sexp_processor (4.7.0) sham_rack (1.3.6) @@ -897,7 +897,7 @@ DEPENDENCIES license_finder (~> 2.1.0) licensee (~> 8.0.0) loofah (~> 2.0.3) - mail_room (~> 0.8) + mail_room (~> 0.8.1) method_source (~> 0.8) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) @@ -959,7 +959,7 @@ DEPENDENCIES sdoc (~> 0.3.20) seed-fu (~> 2.3.5) select2-rails (~> 3.5.9) - sentry-raven (~> 1.1.0) + sentry-raven (~> 2.0.0) settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 2.8.0) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index c5b151174e0c..7d6a85a81aa6 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.12.1"; + version = "8.12.6"; buildInputs = [ env ruby bundler tzdata git nodejs procps ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "1aq91q89g3xb28v833748y9ywy9d6551zn3hb22cqphjijkn3wgl"; + sha256 = "14dbr8a1il75xz83hkdjm3yq49168mkn62l86bi36n5pfw44kcvh"; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 2525e924be41..bf552b5d4eff 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -1314,10 +1314,10 @@ mail_room = { source = { remotes = ["https://rubygems.org"]; - sha256 = "00jaj42z6rhgpxprs7wb0a9gq33zsfalah3ddpynxldij5iz8mg0"; + sha256 = "15zjqscdzm4rv8qpz8y8334nc5kvlqp0xk4wiics98hbjs8cd59i"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.1"; }; method_source = { source = { @@ -2299,10 +2299,10 @@ sentry-raven = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0fjfq3hkfv3a415mk6cjwknnxg9d71x0b8x7szgbwhyqa8ahj3j3"; + sha256 = "18k3n1yv077h28wszamhlifja7z2kxjdlm48aslc7zf7rm14fq90"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.2"; }; settingslogic = { source = { -- cgit 1.4.1 From 8f794cd6b8b741a0e86eb86cee0e4ed07b545b72 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 14 Oct 2016 02:02:03 +0200 Subject: zfstools: 0.3.3 -> 0.3.6 --- pkgs/tools/filesystems/zfstools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix index 7a056f503e23..518e92814a41 100644 --- a/pkgs/tools/filesystems/zfstools/default.nix +++ b/pkgs/tools/filesystems/zfstools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, ruby, zfs }: -let version = "0.3.3"; in +let version = "0.3.6"; in stdenv.mkDerivation rec { name = "zfstools-${version}"; src = fetchFromGitHub { - sha256 = "1gj6jksc9crmjvhsx8yp3l06b5vcm415l0bmdjcil7jjbfhwwp2k"; + sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg"; rev = "v${version}"; repo = "zfstools"; owner = "bdrewery"; -- cgit 1.4.1 From cdbb020a1f576d50c11075ac814142e353bc97d7 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 14 Oct 2016 16:56:42 +0100 Subject: fixes bundlerEnv calls --- pkgs/development/tools/misc/travis/default.nix | 2 +- pkgs/servers/monitoring/riemann-dash/default.nix | 2 +- pkgs/tools/system/foreman/default.nix | 2 +- pkgs/tools/system/hiera-eyaml/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/travis/default.nix b/pkgs/development/tools/misc/travis/default.nix index 9e7d6e3c6064..a520c4deb342 100644 --- a/pkgs/development/tools/misc/travis/default.nix +++ b/pkgs/development/tools/misc/travis/default.nix @@ -2,7 +2,7 @@ bundlerEnv { inherit ruby; - pName = "travis"; + pname = "travis"; gemdir = ./.; meta = with lib; { diff --git a/pkgs/servers/monitoring/riemann-dash/default.nix b/pkgs/servers/monitoring/riemann-dash/default.nix index c2d197e6b45a..2218edabe06b 100644 --- a/pkgs/servers/monitoring/riemann-dash/default.nix +++ b/pkgs/servers/monitoring/riemann-dash/default.nix @@ -2,7 +2,7 @@ bundlerEnv { inherit ruby; - pName = "riemann-dash"; + pname = "riemann-dash"; gemdir = ./.; meta = with lib; { diff --git a/pkgs/tools/system/foreman/default.nix b/pkgs/tools/system/foreman/default.nix index 1c74724793d4..e97d71f5c84a 100644 --- a/pkgs/tools/system/foreman/default.nix +++ b/pkgs/tools/system/foreman/default.nix @@ -2,7 +2,7 @@ bundlerEnv { inherit ruby; - pName = "foreman"; + pname = "foreman"; gemdir = ./.; meta = with lib; { diff --git a/pkgs/tools/system/hiera-eyaml/default.nix b/pkgs/tools/system/hiera-eyaml/default.nix index 029a975dc913..e0ff7d5ca8b4 100644 --- a/pkgs/tools/system/hiera-eyaml/default.nix +++ b/pkgs/tools/system/hiera-eyaml/default.nix @@ -2,7 +2,7 @@ bundlerEnv { inherit ruby; - pName = "hiera-eyaml"; + pname = "hiera-eyaml"; gemdir = ./.; meta = with lib; { -- cgit 1.4.1 From 5e2a9a0a54ca71917ca69c0e8e61498547fc817b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 14 Oct 2016 18:11:48 +0200 Subject: zk-shell: Fix broken meta.license --- pkgs/applications/misc/zk-shell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/applications/misc/zk-shell/default.nix index b03208f9f2b3..9f090e608236 100644 --- a/pkgs/applications/misc/zk-shell/default.nix +++ b/pkgs/applications/misc/zk-shell/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { meta = { description = "A powerful & scriptable shell for Apache ZooKeeper"; homepage = https://github.com/rgs1/zk_shell; - license = stdenv.lib.licenses.apache2; + license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.mahe ]; platforms = stdenv.lib.platforms.all; }; -- cgit 1.4.1 From 79f4bb32591eeeb90b3e138af11b4d78c1403c85 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 14 Oct 2016 18:26:42 +0200 Subject: atlassian-confluence: 5.10.4 -> 5.10.7 --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 302ff47bc20c..bcba8ef21c61 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "5.10.4"; + version = "5.10.7"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "07v31lr2jyh90ynjv6f61jh8wkry6lx02nm3yra02920k4y0w22a"; + sha256 = "1zzkaps78nqjgriz6i6m7bdnm5srvslq27lr3vk6cizn2xz9nc1b"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; -- cgit 1.4.1 From 0a9fa3004acec0502244c70dc43a0d8b7375b923 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 14 Oct 2016 18:27:02 +0200 Subject: atlassian-jira: 7.2.2 -> 7.2.3 --- pkgs/servers/atlassian/jira.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 7921e78a47f7..d37463f81a55 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.2.2"; + version = "7.2.3"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0qrxiyljcz3lv3jp29mhrfkj77r7ahfm68hvwwjl4z7424mwg9zn"; + sha256 = "0237f1x2ir3g6ll0w7fpm6vnccqlx1xr015q37qh693hykyi1hy9"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; -- cgit 1.4.1 From b59b353d4da8061f41e0ddc2515147da88135aa0 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 14 Oct 2016 14:27:50 -0300 Subject: theme-vertex: revert package renaming --- pkgs/misc/themes/vertex/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix index bbacfa2f5e5a..fe48bb14d40c 100644 --- a/pkgs/misc/themes/vertex/default.nix +++ b/pkgs/misc/themes/vertex/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; - pname = "vertex-theme"; + pname = "theme-vertex"; version = "20161009"; src = fetchFromGitHub { owner = "horst3180"; - repo = pname; + repo = "vertex-theme"; rev = "c861918a7fccf6d0768d45d790a19a13bb23485e"; sha256 = "13abgl18m04sj44gqipxbagpan4jqral65w59rgnhb6ldxgnhg33"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00b05fce30f8..a49f4a1a1822 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16181,7 +16181,7 @@ in in recurseIntoAttrs (lib.makeScope qt5.newScope merged); - vertex-theme = callPackage ../misc/themes/vertex { }; + theme-vertex = callPackage ../misc/themes/vertex { }; xfce = xfce4-12; xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { }); -- cgit 1.4.1 From 8df9632a25bdde321ab087dfb01f55a466290937 Mon Sep 17 00:00:00 2001 From: Svintsov Dmitry Date: Fri, 14 Oct 2016 22:27:46 +0500 Subject: vscode: 1.5.1 -> 1.6.1 --- pkgs/applications/editors/vscode/default.nix | 42 ++++++++++++++++++---------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index f69c9706e370..f7983f713850 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,20 +1,21 @@ -{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem }: +{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem, + makeWrapper, libXScrnSaver }: let - version = "1.5.1"; - rev = "07d663dc1bd848161edf4cd4ce30cce410d3d877"; + version = "1.6.1"; + rev = "9e4e44c19e393803e2b05fe2323cf4ed7e36880e"; - sha256 = if stdenv.system == "i686-linux" then "1a2854snjdmfhzx6qwib4iw3qjhlmlf09dlsbbvh24zbrjphnd85" - else if stdenv.system == "x86_64-linux" then "0gg2ad7sp02ffv7la61hh9h4vfw8qkfladbhwlh5y4axbbrx17r7" - else if stdenv.system == "x86_64-darwin" then "18q4ldnmm619vv8yx6rznpznpcc19zjczmcidr34552i5qfg5xsz" + sha256 = if stdenv.system == "i686-linux" then "1aks84siflpjbd2s9y1f0vvvf3nas4f50cimjf25lijxzjxrlivy" + else if stdenv.system == "x86_64-linux" then "05kbi081ih64fadj4k74grkk9ca3wga6ybwgs5ld0bal4ilw1q6i" + else if stdenv.system == "x86_64-darwin" then "00p2m8b0l3pkf5k74szw6kcql3j1fjnv3rwnhy24wfkg4b4ah2x9" else throw "Unsupported system: ${stdenv.system}"; urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/"; urlStr = if stdenv.system == "i686-linux" then - urlBase + "code-stable-code_${version}-1473369468_i386.tar.gz" + urlBase + "code-stable-code_${version}-1476372351_i386.tar.gz" else if stdenv.system == "x86_64-linux" then - urlBase + "code-stable-code_${version}-1473370243_amd64.tar.gz" + urlBase + "code-stable-code_${version}-1476373175_amd64.tar.gz" else if stdenv.system == "x86_64-darwin" then urlBase + "VSCode-darwin-stable.zip" else throw "Unsupported system: ${stdenv.system}"; @@ -32,15 +33,18 @@ in name = "code"; exec = "code"; icon = "code"; - comment = "Visual Studio Code is a code editor redefined and optimized for building and debugging modern web and cloud applications"; + comment = '' + Code editor redefined and optimized for building and debugging modern + web and cloud applications + ''; desktopName = "Visual Studio Code"; genericName = "Text Editor"; categories = "GNOME;GTK;Utility;TextEditor;Development;"; }; buildInputs = if stdenv.system == "x86_64-darwin" - then [ unzip ] - else [ ]; + then [ unzip makeWrapper libXScrnSaver ] + else [ makeWrapper libXScrnSaver ]; installPhase = '' mkdir -p $out/lib/vscode $out/bin @@ -59,14 +63,22 @@ in --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}:$out/lib/vscode" \ $out/lib/vscode/code + + wrapProgram $out/bin/code \ + --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 ''; meta = with stdenv.lib; { - description = "Visual Studio Code is an open source source code editor developed by Microsoft for Windows, Linux and OS X."; + description = '' + Open source source code editor developed by Microsoft for Windows, + Linux and OS X + ''; longDescription = '' - Visual Studio Code is an open source source code editor developed by Microsoft for Windows, Linux and OS X. - It includes support for debugging, embedded Git control, syntax highlighting, intelligent code completion, snippets, and code refactoring. - It is also customizable, so users can change the editor's theme, keyboard shortcuts, and preferences. + Open source source code editor developed by Microsoft for Windows, + Linux and OS X. It includes support for debugging, embedded Git + control, syntax highlighting, intelligent code completion, snippets, + and code refactoring. It is also customizable, so users can change the + editor's theme, keyboard shortcuts, and preferences ''; homepage = http://code.visualstudio.com/; downloadPage = https://code.visualstudio.com/Updates; -- cgit 1.4.1 From 4e4205469b71cdf165da10a707063f314dac21e5 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 14 Oct 2016 14:48:50 -0300 Subject: elementary-icon-theme: 3.2.2 -> 4.0.1 --- pkgs/data/icons/elementary-icon-theme/default.nix | 25 +++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix index 19b2230eaa8d..b15e8dea5bc8 100644 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-icon-theme/default.nix @@ -1,29 +1,32 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.2.2"; + version = "4.0.1"; package-name = "elementary-icon-theme"; name = "${package-name}-${version}"; - src = fetchzip { - url = "https://launchpad.net/elementaryicons/3.x/${version}/+download/elementary-icon-theme-${version}.tar.xz"; - sha256 = "0b6sgvkzc5h9zm3la6f0ngs9pfjrsj318qcynxd3yydb50cd3hnf"; + src = fetchurl { + url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz"; + sha256 = "0cbgbd9fqxk6rbsrj0gbh1rcapkkdlaig79kilq798v94jfdskrl"; }; dontBuild = true; installPhase = '' - install -dm 755 $out/share/icons + install -dm 755 $out/share/{icons,doc/$name} cp -dr --no-preserve='ownership' . $out/share/icons/Elementary/ + mv $out/share/icons/Elementary/{AUTHORS,CONTRIBUTORS,README.md} \ + $out/share/doc/$name/ + rm $out/share/icons/Elementary/{COPYING,pre-commit} ''; meta = with stdenv.lib; { - description = "Elementary icon theme"; - homepage = "https://launchpad.net/elementaryicons"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ simonvandel ]; + description = "Elementary icon theme"; + homepage = "https://launchpad.net/elementaryicons"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ simonvandel ]; }; } -- cgit 1.4.1 From 0fd97bc102fde278ffe11ae29f205c402265d0a5 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 14 Oct 2016 15:21:28 +0200 Subject: mypy-lang: 0.4.3 -> 0.4.5 --- pkgs/development/tools/mypy-lang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/mypy-lang/default.nix b/pkgs/development/tools/mypy-lang/default.nix index ebce2b86c1f7..6831c7f2b56c 100644 --- a/pkgs/development/tools/mypy-lang/default.nix +++ b/pkgs/development/tools/mypy-lang/default.nix @@ -2,14 +2,14 @@ python35Packages.buildPythonApplication rec { name = "mypy-lang-${version}"; - version = "0.4.3"; + version = "0.4.5"; # Tests not included in pip package. doCheck = false; src = fetchurl { url = "mirror://pypi/m/mypy-lang/${name}.tar.gz"; - sha256 = "11d8195xg8hksyh2qapbv66jvjgfpjwkc61nwljcfq9si144f2nb"; + sha256 = "0x1n6r5in57zv4s75r22smpqxrz7xxp84fnrhkwzbpjnafa3y81f"; }; propagatedBuildInputs = with python35Packages; [ lxml ]; -- cgit 1.4.1 From 07fba2591d0322ad805c9cb1be8deb80df3ccb05 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Fri, 14 Oct 2016 21:01:42 +0200 Subject: gthumb: hicolor_icon_theme dependency --- pkgs/applications/graphics/gthumb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index ac3840a12a7d..adcba908a8fa 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool, exiv2, libjpeg, libtiff, gstreamer, libraw, libsoup, libsecret, libchamplain, librsvg, libwebp, json_glib, webkit, lcms2, bison, - flex, wrapGAppsHook }: + flex, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ itstool libxml2 intltool glib gtk gsettings_desktop_schemas dconf exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain - librsvg libwebp json_glib webkit lcms2 bison flex ]; + librsvg libwebp json_glib webkit lcms2 bison flex hicolor_icon_theme ]; enableParallelBuilding = true; -- cgit 1.4.1 From 1cb4676dfabedc35922b9bb330068d9a324da87b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 14 Oct 2016 20:27:58 +0100 Subject: terraform: 0.7.5 -> 0.7.6 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index d6ae08444bc9..f22cc57b6273 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.5"; + version = "0.7.6"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "1s338zhynn8wmhsqhq58njgxv6mwic7d8yxb7zcj2x4b78i7hqa0"; + sha256 = "02k3g38jk2dm70dkfl4w6is563m4abqvip5srv8bhv7xcgj0nfkq"; }; postInstall = '' -- cgit 1.4.1 From 2398a66859c6cbfc26ed57f5bda68c0e2da00a7d Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 14 Oct 2016 23:07:04 +0200 Subject: overpass: init at 2.1 --- pkgs/data/fonts/overpass/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/data/fonts/overpass/default.nix diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix new file mode 100644 index 000000000000..d441ac514d37 --- /dev/null +++ b/pkgs/data/fonts/overpass/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "overpass-${version}"; + version = "2.1"; + + src = fetchurl { + url = "https://github.com/RedHatBrand/overpass/releases/download/2.1/overpass-fonts-ttf-2.1.zip"; + sha256 = "1kd7vbqffp5988j3p4zxkxajdmfviyv4y6rzk7jazg81xcsxicwf"; + }; + + nativeBuildInputs = [ unzip ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/doc/${name} + mkdir -p $out/share/fonts/truetype + cp -v *.ttf $out/share/fonts/truetype + cp -v LICENSE.md README.md $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + homepage = http://overpassfont.org/; + description = "Font heavily inspired by Highway Gothic"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a49f4a1a1822..fde0552e00c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11750,6 +11750,8 @@ in orbitron = callPackage ../data/fonts/orbitron { }; + overpass = callPackage ../data/fonts/overpass { }; + oxygenfonts = callPackage ../data/fonts/oxygenfonts { }; paper-icon-theme = callPackage ../data/icons/paper-icon-theme { }; -- cgit 1.4.1 From 4e89b237bc5fa834d11fd68d12cb007fd1b8660c Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 14 Oct 2016 08:15:57 -0400 Subject: xen: 4.5.2 -> 4.5.5, drop old versions --- pkgs/applications/virtualization/xen/4.5.0.nix | 79 -------------------------- pkgs/applications/virtualization/xen/4.5.2.nix | 66 --------------------- pkgs/applications/virtualization/xen/4.5.nix | 60 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 +-- 4 files changed, 63 insertions(+), 149 deletions(-) delete mode 100644 pkgs/applications/virtualization/xen/4.5.0.nix delete mode 100644 pkgs/applications/virtualization/xen/4.5.2.nix create mode 100644 pkgs/applications/virtualization/xen/4.5.nix diff --git a/pkgs/applications/virtualization/xen/4.5.0.nix b/pkgs/applications/virtualization/xen/4.5.0.nix deleted file mode 100644 index 887734ac6b99..000000000000 --- a/pkgs/applications/virtualization/xen/4.5.0.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ callPackage, fetchurl, fetchgit, ... } @ args: - -let - # Xen 4.5.0 - xenConfig = rec { - version = "4.5.0"; - name = "xen-${version}"; - - src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/${version}/${name}.tar.gz"; - sha256 = "0fvg00d596gh6cfm51xr8kj2mghcyivrf6np3dafnbldnbi41nsv"; - }; - - # Sources needed to build the xen tools and tools/firmware. - firmwareGits = - [ # tag 1.7.5 - { git = { name = "seabios"; - url = https://xenbits.xen.org/git-http/seabios.git; - rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2"; - sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb"; - }; - patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; - } - { git = { name = "ovmf"; - url = https://xenbits.xen.org/git-http/ovmf.git; - rev = "447d264115c476142f884af0be287622cd244423"; - sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b"; - }; - } - ]; - - toolsGits = - [ # tag qemu-xen-4.5.0 - { git = { name = "qemu-xen"; - url = https://xenbits.xen.org/git-http/qemu-xen.git; - rev = "1ebb75b1fee779621b63e84fefa7b07354c43a99"; - sha256 = "0yp9vmna3yl28vm5fkirghzhndaihmsm34fjzgr9sl6s46wx5yzg"; - }; - } - # tag xen-4.5.0 - { git = { name = "qemu-xen-traditional"; - url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; - rev = "b0d42741f8e9a00854c3b3faca1da84bfc69bf22"; - sha256 = "1lxlf1s81y5j0rhzzm1f4sbyrnbvd32vxiczs1qjcg6ls866vlki"; - }; - } - { git = { name = "xen-libhvm"; - url = https://github.com/ts468/xen-libhvm; - rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63"; - sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8"; - }; - description = '' - Helper library for reading ACPI and SMBIOS firmware values - from the host system for use with the HVM guest firmware - pass-through feature in Xen. - ''; - #license = licenses.bsd2; - } - ]; - - xenserverPatches = - let - patches = { - url = https://github.com/ts468/xen-4.5.pg.git; - rev = "3442b65b490f43c817cbc53369220d0b1ab9b785"; - sha256 = "31436c15def0a300b3ea1a63b2208c4a3bcbb143db5c6488d4db370b3ceeb845"; - }; - in '' - cp -r ${fetchgit patches}/master patches - quilt push -a - substituteInPlace tools/xenguest/Makefile --replace "_BSD_SOURCE" "_DEFAULT_SOURCE" - ''; - - xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch - ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch - ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch ]; - }; - -in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) diff --git a/pkgs/applications/virtualization/xen/4.5.2.nix b/pkgs/applications/virtualization/xen/4.5.2.nix deleted file mode 100644 index e0b13edb1f23..000000000000 --- a/pkgs/applications/virtualization/xen/4.5.2.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ callPackage, fetchurl, fetchgit, ... } @ args: - -let - # Xen 4.5.2 - xenConfig = rec { - version = "4.5.2"; - name = "xen-${version}"; - - src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/${version}/${name}.tar.gz"; - sha256 = "1s7702zrxpsmx4vqvll4x2s762cfdiss4vgpx5s4jj7a9sn5v7jc"; - }; - - # Sources needed to build the xen tools and tools/firmware. - firmwareGits = - [ # tag 1.7.5 - { git = { name = "seabios"; - url = https://xenbits.xen.org/git-http/seabios.git; - rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2"; - sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb"; - }; - patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; - } - { git = { name = "ovmf"; - url = https://xenbits.xen.org/git-http/ovmf.git; - rev = "cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"; - sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcq"; - }; - } - ]; - - toolsGits = - [ # tag qemu-xen-4.5.2 - { git = { name = "qemu-xen"; - url = https://xenbits.xen.org/git-http/qemu-xen.git; - rev = "e5a1bb22cfb307db909dbd3404c48e5bbeb9e66d"; - sha256 = "00h6hc1y19y9wafxk01hvwm2j8lysz26wi2dnv8md76zxavg4maa"; - }; - } - # tag xen-4.5.2 - { git = { name = "qemu-xen-traditional"; - url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; - rev = "dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0"; - sha256 = "07jwpxgk9ls5hma6vv1frnx1aczlvpddlgiyii9qmmlxxwjs21yj"; - }; - } - { git = { name = "xen-libhvm"; - url = https://github.com/ts468/xen-libhvm; - rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63"; - sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8"; - }; - description = '' - Helper library for reading ACPI and SMBIOS firmware values - from the host system for use with the HVM guest firmware - pass-through feature in Xen. - ''; - #license = licenses.bsd2; - } - ]; - - xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch - ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch - ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch ]; - }; - -in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix new file mode 100644 index 000000000000..271ab7e7fe96 --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -0,0 +1,60 @@ +{ callPackage, fetchurl, fetchgit, ... } @ args: + +let + # Xen 4.5.5 + xenConfig = rec { + version = "4.5.5"; + name = "xen-${version}"; + + src = fetchurl { + url = "http://bits.xensource.com/oss-xen/release/${version}/${name}.tar.gz"; + sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2"; + }; + + # Sources needed to build the xen tools and tools/firmware. + firmwareGits = + [ + { git = { name = "seabios"; + url = https://xenbits.xen.org/git-http/seabios.git; + rev = "rel-1.7.5"; + sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb"; + }; + patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; + } + ]; + + toolsGits = + [ + { git = { name = "qemu-xen"; + url = https://xenbits.xen.org/git-http/qemu-xen.git; + rev = "refs/tags/qemu-xen-${version}"; + sha256 = "014s755slmsc7xzy7qhk9i3kbjr2grxb5yznjp71dl6xxfvnday2"; + }; + } + { git = { name = "qemu-xen-traditional"; + url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; + # rev = "28c21388c2a32259cff37fc578684f994dca8c9f"; + rev = "refs/tags/xen-${version}"; + sha256 = "0n0ycxlf1wgdjkdl8l2w1i0zzssk55dfv67x8i6b2ima01r0k93r"; + }; + } + { git = { name = "xen-libhvm"; + url = https://github.com/ts468/xen-libhvm; + rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63"; + sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8"; + }; + description = '' + Helper library for reading ACPI and SMBIOS firmware values + from the host system for use with the HVM guest firmware + pass-through feature in Xen. + ''; + #license = licenses.bsd2; + } + ]; + + xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch + ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch + ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch ]; + }; + +in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9450ef9915e3..6282ce12939d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15101,10 +15101,9 @@ in xdotool = callPackage ../tools/X11/xdotool { }; - xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { stdenv = overrideCC stdenv gcc49; }; - xen_4_5_2 = callPackage ../applications/virtualization/xen/4.5.2.nix { stdenv = overrideCC stdenv gcc49; }; - xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; stdenv = overrideCC stdenv gcc49; }; - xen = xen_4_5_2; + xen_4_5 = callPackage ../applications/virtualization/xen/4.5.nix { stdenv = overrideCC stdenv gcc49; }; + xen_xenServer = callPackage ../applications/virtualization/xen/4.5.nix { xenserverPatched = true; stdenv = overrideCC stdenv gcc49; }; + xen = xen_4_5; win-spice = callPackage ../applications/virtualization/driver/win-spice { }; win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; -- cgit 1.4.1 From 6717213ca41fc8639fb3b744bfd69e37b594cd9c Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 14 Oct 2016 23:30:38 +0200 Subject: weechat: generate manpages --- pkgs/applications/networking/irc/weechat/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 71358c806d8c..17f754f6acca 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, ncurses, openssl, aspell, gnutls , zlib, curl , pkgconfig, libgcrypt , cmake, makeWrapper, libobjc, libiconv +, asciidoctor # manpages , guileSupport ? true, guile , luaSupport ? true, lua5 , perlSupport ? true, perl @@ -28,7 +29,13 @@ stdenv.mkDerivation rec { sha256 = "0d1wcpsxx13clcf1ygcn5hsa1pjkck4xznbjbxphbdxd5whsbv3k"; }; - cmakeFlags = with stdenv.lib; [] + outputs = [ "out" "doc" ]; + + enableParallelBuilding = true; + cmakeFlags = with stdenv.lib; [ + "-DENABLE_MAN=ON" + "-DENABLE_DOC=ON" + ] ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"] ++ optional (!guileSupport) "-DENABLE_GUILE=OFF" ++ optional (!luaSupport) "-DENABLE_LUA=OFF" @@ -41,7 +48,8 @@ stdenv.mkDerivation rec { ncurses python openssl aspell gnutls zlib curl pkgconfig libgcrypt pycrypto makeWrapper cmake - ] + asciidoctor + ] ++ optionals stdenv.isDarwin [ pync libobjc ] ++ optional guileSupport guile ++ optional luaSupport lua5 -- cgit 1.4.1 From d2238cc9f0d44361f63b6d99fadb794623bb963b Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 15 Oct 2016 00:50:19 +0200 Subject: electrum: 2.6.4 -> 2.7.8 --- pkgs/applications/misc/electrum/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 9e4afc0ae90e..e8336eac45ff 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.6.4"; + version = "2.7.8"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0rpqpspmrmgm0bhsnlnhlwhag6zg8hnv5bcw5vkqmv86891kpd9a"; + sha256 = "0p4dx5fks68avzxkknawv094xxf7322hgm068js4v56qirvxm563"; }; propagatedBuildInputs = with pythonPackages; [ @@ -33,14 +33,13 @@ pythonPackages.buildPythonApplication rec { # amodem ]; - preInstall = '' - mkdir -p $out/share - sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py + preBuild = '' + sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py pyrcc4 icons.qrc -o gui/qt/icons_rc.py ''; - doCheck = true; - checkPhase = '' + doInstallCheck = true; + installCheckPhase = '' $out/bin/electrum help >/dev/null ''; -- cgit 1.4.1 From e622d5a73dfb678f2fc0da94652ff6dd82fadd78 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 14 Oct 2016 21:28:18 -0400 Subject: lightdm: 1.19.4 -> 1.19.5 --- pkgs/applications/display-managers/lightdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index e788585a0a96..291439db5beb 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -6,14 +6,14 @@ let ver_branch = "1.19"; - version = "1.19.4"; + version = "1.19.5"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "1l105y07wkl9dj0cjhbs8qh6flpkyfj97wkw0rdd3n624lknvbqf"; + sha256 = "0gbz8jk1ljh8rwgvldkiqma1k61sd27yh008228ahdqd5i2v1r1z"; }; patches = [ ./fix-paths.patch ]; -- cgit 1.4.1 From 1a988b155b2e5636e788ac02b07ec43d60fb90ee Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 14 Oct 2016 21:37:28 -0400 Subject: atom: 1.10.1 -> 1.11.1 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 6cbd3dea825f..455400aad840 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.10.1"; + version = "1.11.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0v03a93qa57ajji4sfz7hyr06n20jnlq87103nr7wqycv1v4dm85"; + sha256 = "1wpfpj9dv4l710758gcx05s2aj8mn21fr7wah2xv5qildx2qy31q"; name = "${name}.deb"; }; -- cgit 1.4.1 From 405f241e6e9a2a8a3e0d4059f41b7b9c9a3d392a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 14 Oct 2016 21:56:26 -0400 Subject: netbeans: 8.1 -> 8.2 --- pkgs/applications/editors/netbeans/default.nix | 17 +++++++---------- pkgs/applications/editors/netbeans/path.patch | 11 ----------- 2 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 pkgs/applications/editors/netbeans/path.patch diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 289de0ad91ac..a23c5242a24b 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem -, gawk, jdk, perl, python, unzip, which +, jdk, perl, python, unzip, which }: let @@ -13,18 +13,15 @@ let }; in stdenv.mkDerivation { - name = "netbeans-8.1"; + name = "netbeans-8.2"; src = fetchurl { - url = http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201.zip; - sha256 = "1aaf132mndpgfbd5v8izqzp37hjs5gwqwd6zrb519fx0viz9aq5r"; + url = http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101.zip; + sha256 = "0j092qw7aqfc9vpnvr3ix1ii94p4ik6frcnw708iyv4s9crqi65d"; }; buildCommand = '' # Unpack and perform some path patching. unzip $src - patch -p1 <${./path.patch} - substituteInPlace netbeans/platform/lib/nbexec \ - --subst-var-by AWK ${gawk}/bin/awk patchShebangs . # Copy to installation directory and create a wrapper capable of starting @@ -35,14 +32,14 @@ stdenv.mkDerivation { --prefix PATH : ${stdenv.lib.makeBinPath [ jdk which ]} \ --prefix JAVA_HOME : ${jdk.home} \ --add-flags "--jdkhome ${jdk.home}" - + # Create desktop item, so we can pick it from the KDE/GNOME menu mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; - + buildInputs = [ makeWrapper perl python unzip ]; - + meta = { description = "An integrated development environment for Java, C, C++ and PHP"; maintainers = [ stdenv.lib.maintainers.sander ]; diff --git a/pkgs/applications/editors/netbeans/path.patch b/pkgs/applications/editors/netbeans/path.patch deleted file mode 100644 index 57b5730e137c..000000000000 --- a/pkgs/applications/editors/netbeans/path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/netbeans/platform/lib/nbexec 2015-09-29 21:26:39.282600903 -0700 -+++ b/netbeans/platform/lib/nbexec 2015-09-29 21:26:58.977697858 -0700 -@@ -198,7 +198,7 @@ - SunOS*) awk=nawk ;; - *) awk=awk ;; - esac -- jdk_version=$("${jdkhome}/bin/java" -version 2>&1 | "/usr/bin/${awk}" -F '"' '/version/ {print substr($2, 1, 3)}') -+ jdk_version=$("${jdkhome}/bin/java" -version 2>&1 | "@AWK@" -F '"' '/version/ {print substr($2, 1, 3)}') - if [ "$jdk_version" = "1.7" ] ; then - jargs="$jargs $launcher_args" - fi -- cgit 1.4.1 From 71732441fb692f6330b2de0f2545055f97f24473 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 14 Oct 2016 22:14:38 -0400 Subject: vivaldi: 1.4.589.29-1 -> 1.4.589.38-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 8509140552ea..df08fadfbdf9 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -11,15 +11,15 @@ let version = "1.4"; - build = "589.29-1"; + build = "589.38-1"; fullVersion = "stable_${version}.${build}"; info = if stdenv.is64bit then { arch = "amd64"; - sha256 = "14sb58qrqnqcpkzacwnwfln558p018zargppxq21p5ic8s92v1g6"; + sha256 = "08qdpl5dkb2snpqlk3rsqlyl9rfas9v6bbcw2p4kzazhinak5hv3"; } else { arch = "i386"; - sha256 = "0c4l9ji5xlxwzcjsrvxjkx53j76y777fj6hh7plfkkanlrfkryac"; + sha256 = "0wpaglc1aaam5bqxgvf5zwcbr0xll8yj63l19q792l51j1vkv56q"; }; in stdenv.mkDerivation rec { -- cgit 1.4.1 From a70dfe6ffb5e1d1987cd6fe899a6d5056c5f0afb Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Sat, 15 Oct 2016 05:24:42 +0300 Subject: pakcs: add kkallio as maintainer --- pkgs/development/compilers/pakcs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index ca790d027e03..084a0941d24e 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -136,10 +136,10 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${tk}/bin" \ ''; - meta = { + meta = with stdenv.lib; { homepage = "http://www.informatik.uni-kiel.de/~pakcs/"; description = "An implementation of the multi-paradigm declarative language Curry"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; longDescription = '' PAKCS is an implementation of the multi-paradigm declarative language @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { with dynamic web pages, prototyping embedded systems). ''; - maintainers = [ stdenv.lib.maintainers.gnidorah ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ kkallio gnidorah ]; + platforms = platforms.unix; }; } -- cgit 1.4.1 From 1a23e336a5bab8e648d28c3d29cc4b38eb681d68 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 14 Oct 2016 22:47:18 -0400 Subject: docker: 1.12.1 -> 1.12.2 --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 801b93a02de1..90d57601e803 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -11,13 +11,13 @@ with lib; stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "079786dyydjfc8vb6djxh140pc7v16fjl5x2h2q420qc3mrfz5zd"; + sha256 = "01smz3j55p12z5gkpl945sw49g7aqkxacrlzrlm5px9158z1j74p"; }; buildInputs = [ -- cgit 1.4.1 From fc4c0d4ba173f7ef9021f31c360da525b0b91e0e Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Fri, 14 Oct 2016 22:51:15 -0400 Subject: talloc: fix on darwin --- pkgs/development/libraries/talloc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 024531a3027a..125e6b389e33 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; - postInstall = '' - ar qf $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o + postInstall = '' + ar q $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o ''; meta = with stdenv.lib; { -- cgit 1.4.1 From bb02cf71ef4388824f78ab95c964844797f66e3f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 14 Oct 2016 23:00:54 -0400 Subject: rkt: 1.15.0 -> 1.17.0 --- pkgs/applications/virtualization/rkt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 6a53ad32b39f..483a71fecdc1 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -2,7 +2,7 @@ cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }: let - # Always get the information from + # Always get the information from # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk coreosImageRelease = "1151.0.0"; coreosImageSystemdVersion = "231"; @@ -12,7 +12,7 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.15.0"; + version = "1.17.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "0ppi6r3wr69s6ka1j9xljvq3rw2chp8syyvqcx6ijnzjbwgbwar3"; + sha256 = "1jbdnbd2h58zd5irllim6cfa9bf0fdk5nr8qxpjnsgd1fsyhkpld"; }; stage1BaseImage = fetchurl { -- cgit 1.4.1 From b43c0dab8ed9210752ed8442e045e3373de33258 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 14 Oct 2016 23:16:45 -0400 Subject: conky: 1.10.3 -> 1.10.5 --- pkgs/os-specific/linux/conky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 66069f7c9824..674f3caa7653 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -62,13 +62,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "conky-${version}"; - version = "1.10.3"; + version = "1.10.5"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "0sa2jl159jk5p2hr37adwq84m0ynva7v87qrwj1xv0kw8l4qzhjs"; + sha256 = "1x1b7h4s8f8qbiyas7sw5v2nq5h2wy3q7hsp1ah4l7191jjidqix"; }; postPatch = '' -- cgit 1.4.1 From a1d3af2082a9bf4b9e373f00deb63517afa65dcd Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 15 Oct 2016 04:51:16 +0200 Subject: raleway: init at 2016-08-30 --- pkgs/data/fonts/raleway/default.nix | 43 +++++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/data/fonts/raleway/default.nix diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix new file mode 100644 index 000000000000..2bc90e83d144 --- /dev/null +++ b/pkgs/data/fonts/raleway/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "raleway-${version}"; + version = "2016-08-30"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Raleway"; + rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a"; + sha256 = "1i6a14ynm29gqjr7kfk118v69vjpd3g4ylwfvhwa66xax09jkhlr"; + }; + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp "$src/fonts/OTF v3.000 Fontlab"/*.otf $out/share/fonts/truetype + find -type f -maxdepth 1 -exec cp "{}" $out/ \; + ''; + + meta = { + description = "Raleway is an elegant sans-serif typeface family"; + + longDescription = '' + Initially designed by Matt McInerney as a single thin weight, it was + expanded into a 9 weight family by Pablo Impallari and Rodrigo Fuenzalida + in 2012 and iKerned by Igino Marini. In 2013 the Italics where added. + + It is a display face and the download features both old style and lining + numerals, standard and discretionary ligatures, a pretty complete set of + diacritics, as well as a stylistic alternate inspired by more geometric + sans-serif typefaces than its neo-grotesque inspired default character + set. + + It also has a sister display family, Raleway Dots. + ''; + + homepage = src.homepage; + license = stdenv.lib.licenses.ofl; + + maintainers = with stdenv.lib.maintainers; [ profpatsch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fde0552e00c4..fc02fade64b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11803,6 +11803,8 @@ in r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { }; + raleway = callPackage ../data/fonts/raleway { }; + roboto = callPackage ../data/fonts/roboto { }; roboto-mono = callPackage ../data/fonts/roboto-mono { }; -- cgit 1.4.1 From fc199022602aaca4ed54c86db5f4ba0e10ac1c60 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 15 Oct 2016 04:53:58 +0200 Subject: league-of-movable-type: 2014-12 -> 2016-10-15 Restructured, so that updates can be done by executing a shell script. Also uses the extended Raleway fonts, the league itself has only thin variants. --- .../data/fonts/league-of-moveable-type/default.nix | 65 ++++------------- pkgs/data/fonts/league-of-moveable-type/fonts.nix | 82 ++++++++++++++++++++++ pkgs/data/fonts/league-of-moveable-type/update.sh | 25 +++++++ 3 files changed, 122 insertions(+), 50 deletions(-) create mode 100644 pkgs/data/fonts/league-of-moveable-type/fonts.nix create mode 100644 pkgs/data/fonts/league-of-moveable-type/update.sh diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index c592ac2d38b8..d93d2016971a 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -1,57 +1,23 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, raleway}: -stdenv.mkDerivation rec { - baseName = "league-of-moveable-type"; - version = "2014-12"; - name="${baseName}-${version}"; - - srcs = [(fetchurl { - url = "https://www.theleagueofmoveabletype.com/league-gothic/download"; - sha256 = "0nbwsbwhs375kbis3lpk98dw05mnh455vghjg1cq0j2fsj1zb99b"; - name = "league-gothic.zip"; - }) - - (fetchurl { - url = "https://www.theleagueofmoveabletype.com/fanwood/download"; - sha256 = "1023da7hik8ci8s7rcy6lh4h9p6igx1kz9y1a2cv6sizbp819w8g"; - name = "fanwood.zip"; - }) - - (fetchurl { - url = "https://www.theleagueofmoveabletype.com/linden-hill/download"; - sha256 = "0rm92rz9kki91l5wcn149mdpwq1mfql4dv6d159hv534qmg3z3ks"; - name = "linden-hill.zip"; - }) - - (fetchurl { - url = "https://www.theleagueofmoveabletype.com/raleway/download"; - sha256 = "0f6anym0adq0ankqbdqx4lyzbysx824zqdj1x60gafyisjx48y87"; - name = "raleway.zip"; - }) +let - (fetchurl { - url = "https://www.theleagueofmoveabletype.com/prociono/download"; - sha256 = "11hamjry5lx3cykzpjq7kwlp6h9cjqy470fmn9f2pi954b46xkdy"; - name = "prociono.zip"; - }) - - (fetchurl { - url = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911/download"; - sha256 = "01qganq5n7rgqw546lf45kj8j7ymfjr00i2bwp3qw7ibifg9pn4n"; - name = "goudy-bookletter-1911.zip"; - }) - - (fetchurl { - url = "https://www.theleagueofmoveabletype.com/sorts-mill-goudy/download"; - sha256 = "11aywj5lzapk04k2yzi1g96acbbm48x902ka0v9cfwwqpn6js9ra"; - name = "sorts-mill-goudy.zip"; - }) + # TO UPDATE: + # ./update.sh > ./fonts.nix + # we use the extended version of raleway (same license). + fonts = [raleway] + ++ map fetchurl (builtins.filter (f: f.name != "raleway.zip") (import ./fonts.nix)); +in +stdenv.mkDerivation rec { -]; + baseName = "league-of-moveable-type"; + version = "2016-10-15"; + name="${baseName}-${version}"; - buildInputs = [unzip]; + srcs = fonts; + buildInputs = [ unzip ]; sourceRoot = "."; installPhase = '' @@ -59,7 +25,6 @@ stdenv.mkDerivation rec { cp */*.otf $out/share/fonts/truetype ''; - meta = { description = "Font Collection by The League of Moveable Type"; @@ -74,6 +39,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.ofl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ bergey ]; + maintainers = with stdenv.lib.maintainers; [ bergey profpatsch ]; }; } diff --git a/pkgs/data/fonts/league-of-moveable-type/fonts.nix b/pkgs/data/fonts/league-of-moveable-type/fonts.nix new file mode 100644 index 000000000000..efbe6a4c41cb --- /dev/null +++ b/pkgs/data/fonts/league-of-moveable-type/fonts.nix @@ -0,0 +1,82 @@ +[ + { + url = "https://www.theleagueofmoveabletype.com/league-spartan/download"; + sha256 = "1z9pff8xm58njs7whaxb3sq4vbdkxv7llwgm9nqhwshmgr52jrm1"; + name = "league-spartan.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/junction/download"; + sha256 = "1qbhfha012ma26n43lm1fh06i7z47wk50r8qsp09bpxc5yr4ypi7"; + name = "junction.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/ostrich-sans/download"; + sha256 = "11ydhbgcfhmydcnim64vb035cha14krxxrbf62426dm6bvxkphp3"; + name = "ostrich-sans.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/league-gothic/download"; + sha256 = "0nbwsbwhs375kbis3lpk98dw05mnh455vghjg1cq0j2fsj1zb99b"; + name = "league-gothic.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/blackout/download"; + sha256 = "1r7dihnjvy4fgvaj5m4llc9dm4cpdl1l79mhg3as16qvjgazms3p"; + name = "blackout.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/knewave/download"; + sha256 = "065yiakhm6h6jkmigj4pqm2qi6saph0pwb7g8s9gwkskhkk5iy57"; + name = "knewave.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/fanwood/download"; + sha256 = "1023da7hik8ci8s7rcy6lh4h9p6igx1kz9y1a2cv6sizbp819w8g"; + name = "fanwood.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/linden-hill/download"; + sha256 = "0rm92rz9kki91l5wcn149mdpwq1mfql4dv6d159hv534qmg3z3ks"; + name = "linden-hill.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/league-script-number-one/download"; + sha256 = "056hb02a5vydrq5q0gwzanp2zkrrv1spm8sfc5wzhyfzgwd1vc76"; + name = "league-script-number-one.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/raleway/download"; + sha256 = "0f6anym0adq0ankqbdqx4lyzbysx824zqdj1x60gafyisjx48y87"; + name = "raleway.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/prociono/download"; + sha256 = "11hamjry5lx3cykzpjq7kwlp6h9cjqy470fmn9f2pi954b46xkdy"; + name = "prociono.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/orbitron/download"; + sha256 = "156w4j324d350pvjmzdg2w8inhhdfzrvb86rhlavgd9sxx2fykk4"; + name = "orbitron.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911/download"; + sha256 = "01qganq5n7rgqw546lf45kj8j7ymfjr00i2bwp3qw7ibifg9pn4n"; + name = "goudy-bookletter-1911.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/sorts-mill-goudy/download"; + sha256 = "11aywj5lzapk04k2yzi1g96acbbm48x902ka0v9cfwwqpn6js9ra"; + name = "sorts-mill-goudy.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/chunk/download"; + sha256 = "15mbqwz90y1n4vlj2xkc8vd56va6la5qnxhiipvcmkrng5y3931j"; + name = "chunk.zip"; + } + { + url = "https://www.theleagueofmoveabletype.com/sniglet/download"; + sha256 = "1lhpnjm52gyhy9s2kwbsg1rd9iyrqli5q9ngp141igx4p1bgbqkc"; + name = "sniglet.zip"; + } +] diff --git a/pkgs/data/fonts/league-of-moveable-type/update.sh b/pkgs/data/fonts/league-of-moveable-type/update.sh new file mode 100644 index 000000000000..4d41df4fdb85 --- /dev/null +++ b/pkgs/data/fonts/league-of-moveable-type/update.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +SITE=https://www.theleagueofmoveabletype.com + +# since there is no nice way to get all the fonts, +# this fetches the homepage and extracts their names from the html … +fonts=$(curl "$SITE" 2>/dev/null | \ + sed -ne 's//dev/null) + cat < Date: Sat, 15 Oct 2016 11:46:57 +0200 Subject: bareos: 15.2.1 -> 15.2.4 --- pkgs/tools/backup/bareos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 79da3f8cf9bb..ffa119b3c53b 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -12,14 +12,14 @@ let in stdenv.mkDerivation rec { name = "bareos-${version}"; - version = "15.2.1"; + version = "15.2.4"; src = fetchFromGitHub { owner = "bareos"; repo = "bareos"; rev = "Release/${version}"; name = "${name}-src"; - sha256 = "01vnqahzjj598jjk4y7qzfnq415jh227v40sgkrdl4qcpn76spxi"; + sha256 = "02k6wmr2n12dc6vwda8xczmbqidg6fs8nfg9n2cwwpm3k1a21qnd"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From 0f78fcec7a606b5abdf3df6a8857fe361303cceb Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 14 Oct 2016 19:48:32 -0300 Subject: screengrab: init at 2016-02-24 fixes #19561 --- .../modules/services/x11/desktop-managers/lxqt.nix | 1 + pkgs/desktops/lxqt/default.nix | 3 +- pkgs/desktops/lxqt/optional/screengrab/default.nix | 35 ++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/lxqt/optional/screengrab/default.nix diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 4241ec890dd7..6ddcf4cd8310 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -64,6 +64,7 @@ in pkgs.lxqt.qps pkgs.lxqt.qterminal pkgs.lxqt.qtermwidget + pkgs.lxqt.screengrab pkgs.menu-cache pkgs.openbox # default window manager pkgs.qt5.qtsvg # provides QT5 plugins for svg icons diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 981503cab95a..1de0ecf448a8 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -60,7 +60,8 @@ let obconf-qt = callPackage ./optional/obconf-qt { }; lximage-qt = callPackage ./optional/lximage-qt { }; qps = callPackage ./optional/qps { }; - + screengrab = callPackage ./optional/screengrab { }; + }; in self diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix new file mode 100644 index 000000000000..99a372553a13 --- /dev/null +++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg }: + +stdenv.mkDerivation rec { + name = "screengrab-unstable-2016-09-12"; + + srcs = fetchFromGitHub { + owner = "QtDesktop"; + repo = "screengrab"; + rev = "3dbacb9d6f52825689846c798a6c4c95e3815bf6"; + sha256 = "0rflb1q5b1mik8sm1wm63hwpyaah8liizxq1f5q33zapl1qafzi5"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtsvg + kde5.kwindowsystem + lxqt.libqtxdg + xorg.libpthreadstubs + xorg.libXdmcp + ]; + + cmakeFlags = [ "-DSG_USE_SYSTEM_QXT=ON" "-DCMAKE_INSTALL_LIBDIR=lib" ]; + + meta = with stdenv.lib; { + description = "Crossplatform tool for fast making screenshots"; + homepage = https://github.com/lxde/screengrab; + license = licenses.gpl2; + platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; + }; +} -- cgit 1.4.1 From 0efba3b99c28ef77f082b3378f03d264ebb0ab63 Mon Sep 17 00:00:00 2001 From: romildo Date: Sat, 15 Oct 2016 07:46:12 -0300 Subject: qlipper: init at 2016-09-26 --- .../modules/services/x11/desktop-managers/lxqt.nix | 1 + pkgs/desktops/lxqt/default.nix | 1 + pkgs/desktops/lxqt/optional/qlipper/default.nix | 26 ++++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 pkgs/desktops/lxqt/optional/qlipper/default.nix diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 6ddcf4cd8310..d13b7352c95e 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -61,6 +61,7 @@ in pkgs.lxqt.obconf-qt pkgs.lxqt.pavucontrol-qt pkgs.lxqt.pcmanfm-qt + pkgs.lxqt.qlipper pkgs.lxqt.qps pkgs.lxqt.qterminal pkgs.lxqt.qtermwidget diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 1de0ecf448a8..76cde64494a3 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -61,6 +61,7 @@ let lximage-qt = callPackage ./optional/lximage-qt { }; qps = callPackage ./optional/qps { }; screengrab = callPackage ./optional/screengrab { }; + qlipper = callPackage ./optional/qlipper { }; }; diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix new file mode 100644 index 000000000000..551259ac3a05 --- /dev/null +++ b/pkgs/desktops/lxqt/optional/qlipper/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, qt5 }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "qlipper"; + version = "2016-09-26"; + + srcs = fetchFromGitHub { + owner = "pvanek"; + repo = pname; + rev = "48754f28fe1050df58f2d9f7cd2becc019e2f486"; + sha256 = "0s35c08rlfnhp6j1hx5f19034q84ac56cs90wcb3p4spavdnzy2k"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt5.qtbase qt5.qttools ]; + + meta = with stdenv.lib; { + description = "Cross-platform clipboard history applet"; + homepage = https://github.com/pvanek/qlipper; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} -- cgit 1.4.1 From 540e3e8935b6c13ee17cb38173de6d302305750f Mon Sep 17 00:00:00 2001 From: obadz Date: Sun, 2 Oct 2016 16:43:06 +0100 Subject: coreclr: 8c70800 -> 1.0.4 --- pkgs/development/compilers/coreclr/default.nix | 74 +++++++++++++++++++------- 1 file changed, 55 insertions(+), 19 deletions(-) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index cf2833c5c6cb..7799cab76a64 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -7,18 +7,24 @@ , libunwind , gettext , openssl +, python2 +, icu +, lttng-ust +, liburcu +, libuuid +, ed +, debug ? false }: stdenv.mkDerivation rec { name = "coreclr-${version}"; - version = "git-" + (builtins.substring 0 10 rev); - rev = "8c70800b5e8dc5535c379dec4a6fb32f7ab5e878"; + version = "1.0.4"; src = fetchFromGitHub { - owner = "dotnet"; - repo = "coreclr"; - inherit rev; - sha256 = "1galskbnr9kdjjxpx5qywh49400swchhq5f54i16kxyr9k4mvq1f"; + owner = "dotnet"; + repo = "coreclr"; + rev = "v${version}"; + sha256 = "1wpig71q0kh2yrq162d32x00zlwrrs1wymkgijh49cqkn4cwkh91"; }; buildInputs = [ @@ -30,33 +36,63 @@ stdenv.mkDerivation rec { libunwind gettext openssl + python2 + icu + lttng-ust + liburcu + libuuid + ed ]; configurePhase = '' # Prevent clang-3.5 (rather than just clang) from being selected as the compiler as that's # not wrapped - substituteInPlace src/pal/tools/gen-buildsys-clang.sh --replace "which \"clang-" "which \"clang-DoNotFindThisOne" - - # Prevent the -nostdinc++ flag to be passed to clang, which causes a compilation error - substituteInPlace src/CMakeLists.txt --replace "if(NOT CLR_CMAKE_PLATFORM_DARWIN)" "if(FALSE)" + substituteInPlace src/pal/tools/gen-buildsys-clang.sh --replace "which \"clang-\$" "which \"clang-DoNotFindThisOne\$" patchShebangs build.sh patchShebangs src/pal/tools/gen-buildsys-clang.sh + + # See https://github.com/dotnet/coreclr/issues/7573#issuecomment-253081323 + ed -v ./src/pal/src/include/pal/palinternal.h << EOF + /^#undef memcpy + -1 + d + +1 + d + w + EOF ''; - buildPhase = "./build.sh"; + BuildArch = if stdenv.is64bit then "x64" else "x86"; + BuildType = if debug then "Debug" else "Release"; - installPhase = '' - pushd bin/Product/Linux.x64.Debug/ - mkdir -v -p $out/bin - cp -v coreconsole corerun crossgen $out/bin - cp -rv lib $out - cp -v *.so $out/lib - cp -rv inc $out/include - cp -rv gcinfo $out/include + hardeningDisable = [ "strictoverflow" "format" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" ]; + + buildPhase = '' + ./build.sh $BuildArch $BuildType + + # Try to make some sensible hierarchy out of the output + pushd bin/Product/Linux.$BuildArch.$BuildType + mkdir lib2 + mv *.so *.so.dbg lib2 + mv bin lib3 + mkdir lib4 + mv Loader lib4 + mv inc include + mv gcinfo include + mkdir bin + mkdir -p share/doc + mv sosdocsunix.txt share/doc + for f in * ; do test -f $f && mv -v $f bin; done popd ''; + installPhase = '' + mkdir -p $out + cp -rv bin/Product/Linux.$BuildArch.$BuildType/* $out + ''; + meta = { homepage = http://dotnet.github.io/core/; description = ".NET is a general purpose development platform"; -- cgit 1.4.1 From 5e1c84e475ea4f5763885b2eb5be821441a6837e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 14 Oct 2016 23:17:35 -0400 Subject: i3lock-fancy: 2016-05-05 -> 2016-10-13 --- pkgs/applications/window-managers/i3/lock-fancy.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index 378001528b1f..6c53c51551ac 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - rev = "b7196aaff72b90bb6ea0464a9f7b37d140db3230"; - name = "i3lock-fancy-2016-05-05_rev${builtins.substring 0 7 rev}"; + rev = "546ce2e71bd2339f2134904c7d22062e86105b46"; + name = "i3lock-fancy-unstable-2016-10-13_rev${builtins.substring 0 7 rev}"; src = fetchFromGitHub { owner = "meskarune"; repo = "i3lock-fancy"; inherit rev; - sha256 = "0az43nqhmbniih3yw9kz5lnky0n7mxylvklsib76s4l2alf6i3ps"; + sha256 = "1pbxydwdfd7jlw3b8cnlwlrkqlyh5jyanfhjybndqmacd3y8vplb"; }; patchPhase = '' sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock @@ -19,15 +19,16 @@ stdenv.mkDerivation rec { sed -i -e "s|awk -F|${gawk}/bin/awk -F|" lock sed -i -e "s| awk | ${gawk}/bin/awk |" lock sed -i -e "s|i3lock -n |${i3lock-color}/bin/i3lock-color -n |" lock - sed -i -e 's|ICON="$SCRIPTPATH/lockdark.png"|ICON="'$out'/share/i3lock-fancy/lockdark.png"|' lock - sed -i -e 's|ICON="$SCRIPTPATH/lock.png"|ICON="'$out'/share/i3lock-fancy/lock.png"|' lock + sed -i -e 's|ICON="$SCRIPTPATH/icons/lockdark.png"|ICON="'$out'/share/i3lock-fancy/icons/lockdark.png"|' lock + sed -i -e 's|ICON="$SCRIPTPATH/icons/lock.png"|ICON="'$out'/share/i3lock-fancy/icons/lock.png"|' lock sed -i -e "s|getopt |${getopt}/bin/getopt |" lock sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" lock + sed -i -e "s|SHOT=(import -window root)|SHOT=(${scrot}/bin/scrot -z)|" lock ''; installPhase = '' - mkdir -p $out/bin $out/share/i3lock-fancy + mkdir -p $out/bin $out/share/i3lock-fancy/icons cp lock $out/bin/i3lock-fancy - cp lock*.png $out/share/i3lock-fancy + cp icons/lock*.png $out/share/i3lock-fancy/icons ''; meta = with stdenv.lib; { description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text."; -- cgit 1.4.1 From 8ab8f49827583a6a35f744d71bc1c32b5deeb6fd Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Thu, 13 Oct 2016 13:36:36 +0000 Subject: flow: 0.32.0 -> 0.33.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 723c6eb26bb2..7e2426bc8f91 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.32.0"; + version = "0.33.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "17v2qb9xsjv4lj62x553knnhb7z43y2frzvs0q1hvamw8wyp086h"; + sha256 = "1m0a4w50x1xx6iii5mdciksmzwlmyd8wjbyaqbf6gr1z7vhzmqwh"; }; installPhase = '' -- cgit 1.4.1 From d91365d71407ada863fa0f6d1b2406800b42df43 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 15 Oct 2016 16:03:41 +0200 Subject: audit module: only enable service if kernel has audit (#19569) --- nixos/modules/security/audit.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/audit.nix b/nixos/modules/security/audit.nix index ebfe594d0c71..7ac21fd96507 100644 --- a/nixos/modules/security/audit.nix +++ b/nixos/modules/security/audit.nix @@ -104,7 +104,11 @@ in { description = "Kernel Auditing"; wantedBy = [ "basic.target" ]; - unitConfig.ConditionVirtualization = "!container"; + unitConfig = { + ConditionVirtualization = "!container"; + ConditionSecurity = [ "audit" ]; + }; + path = [ pkgs.audit ]; -- cgit 1.4.1 From 10447c69004b5417a5220ee2f32d0bf9e5478249 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 15 Oct 2016 18:44:54 +0300 Subject: buildNodePackage: fix strippedName usage --- pkgs/development/node-packages/node-env.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index c5c69c7d05d7..fd3e710b16e2 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -121,7 +121,7 @@ let if [ -f "${src}" ] then # Figure out what directory has been unpacked - packageDir=$(find . -type d -maxdepth 1 | tail -1) + packageDir="$(find . -type d -maxdepth 1 | tail -1)" # Restore write permissions to make building work find "$packageDir" -type d -print0 | xargs -0 chmod u+x @@ -131,6 +131,8 @@ let mv "$packageDir" "$DIR/${packageName}" elif [ -d "${src}" ] then + strippedName="$(stripHash ${src})" + # Restore write permissions to make building work chmod -R u+w $strippedName @@ -138,9 +140,6 @@ let mv $strippedName "$DIR/${packageName}" fi - # Unset the stripped name to not confuse the next unpack step - unset strippedName - # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store. # The following JavaScript replaces these by * to prevent that cd "$DIR/${packageName}" -- cgit 1.4.1 From aad01d583154dc2986ac69d59609e27d7bae515b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 15 Oct 2016 18:45:30 +0300 Subject: buildNodePackage: remove trailing spaces --- pkgs/development/node-packages/node-env.nix | 86 ++++++++++++++--------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index fd3e710b16e2..2a04b3dfba8f 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -6,19 +6,19 @@ let # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise tarWrapper = runCommand "tarWrapper" {} '' mkdir -p $out/bin - + cat > $out/bin/tar < package.json < Date: Wed, 12 Oct 2016 10:52:49 +0300 Subject: mfcj6510dw: init at 3.0.0-1 --- .../cups/drivers/mfcj6510dwcupswrapper/default.nix | 65 ++++++++++++++++ pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix | 89 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 3 files changed, 157 insertions(+) create mode 100644 pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix create mode 100644 pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix new file mode 100644 index 000000000000..fbb523409187 --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix @@ -0,0 +1,65 @@ +{ stdenv, fetchurl, mfcj6510dwlpr, makeWrapper}: + +stdenv.mkDerivation rec { + name = "mfcj6510dw-cupswrapper-${version}"; + version = "3.0.0-1"; + + src = fetchurl { + url = "http://download.brother.com/welcome/dlf006814/mfcj6510dw_cupswrapper_GPL_source_${version}.tar.gz"; + sha256 = "0y5iffybxjin8injrdmc9n9hl4s6b8n6ck76m1z78bzi88vwmhai"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ mfcj6510dwlpr ]; + + buildPhase = '' + cd brcupsconfig + make all + cd .. + ''; + + installPhase = '' + TARGETFOLDER=$out/opt/brother/Printers/mfcj6510dw/cupswrapper + mkdir -p $TARGETFOLDER + cp PPD/brother_mfcj6510dw_printer_en.ppd $TARGETFOLDER + cp brcupsconfig/brcupsconfpt1 $TARGETFOLDER + cp scripts/cupswrappermfcj6510dw $TARGETFOLDER + sed -i -e '26,304d' $TARGETFOLDER/cupswrappermfcj6510dw + substituteInPlace $TARGETFOLDER/cupswrappermfcj6510dw \ + --replace "\$ppd_file_name" "$TARGETFOLDER/brother_mfcj6510dw_printer_en.ppd" + + CPUSFILTERFOLDER=$out/lib/cups/filter + mkdir -p $TARGETFOLDER $CPUSFILTERFOLDER + ln -s ${mfcj6510dwlpr}/lib/cups/filter/brother_lpdwrapper_mfcj6510dw $out/lib/cups/filter/brother_lpdwrapper_mfcj6510dw + ##TODO: Use the cups filter instead of the LPR one. + #cp scripts/cupswrappermfcj6510dw $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw + #sed -i -e '110,258!d' $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw + #sed -i -e '33,40d' $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw + #sed -i -e '34,35d' $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw + #substituteInPlace $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw \ + # --replace "/opt/brother/$``{device_model``}/$``{printer_model``}/lpd/filter$``{printer_model``}" \ + # "${mfcj6510dwlpr}/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw" \ + # --replace "/opt/brother/Printers/$``{printer_model``}/inf/br$``{printer_model``}rc" \ + # "${mfcj6510dwlpr}/opt/brother/Printers/mfcj6510dw/inf/brmfcj6510dwrc" \ + # --replace "/opt/brother/$``{device_model``}/$``{printer_model``}/cupswrapper/brcupsconfpt1" \ + # "$out/opt/brother/Printers/mfcj6510dw/cupswrapper/brcupsconfpt1" \ + # --replace "/usr/share/cups/model/Brother/brother_" "$out/opt/brother/Printers/mfcj6510dw/cupswrapper/brother_" + #substituteInPlace $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw \ + # --replace "$``{printer_model``}" "mfcj6510dw" \ + # --replace "$``{printer_name``}" "MFCJ6510DW" + ''; + + cleanPhase = '' + cd brcupsconfpt1 + make clean + ''; + + meta = with stdenv.lib; { + homepage = http://www.brother.com/; + description = "Brother MFC-J6510DW CUPS wrapper driver"; + license = with licenses; gpl2; + platforms = with platforms; linux; + downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128; + maintainers = with maintainers; [ ramkromberg ]; + }; +} diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix new file mode 100644 index 000000000000..ee14e4a52db9 --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -0,0 +1,89 @@ +{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, patchelf, utillinux, vimNox +, ghostscript, a2ps }: + +# Why: +# The executable "brprintconf_mfcj6510dw" binary is looking for "/opt/brother/Printers/%s/inf/br%sfunc" and "/opt/brother/Printers/%s/inf/br%src". +# Whereby, %s is printf(3) string substitution for stdin's arg0 (the command's own filename) from the 10th char forwards, as a runtime dependency. +# e.g. Say the filename is "0123456789ABCDE", the runtime will be looking for /opt/brother/Printers/ABCDE/inf/brABCDEfunc. +# Presumably, the binary was designed to be deployed under the filename "printconf_mfcj6510dw", whereby it will search for "/opt/brother/Printers/mfcj6510dw/inf/brmfcj6510dwfunc". +# For NixOS, we want to change the string to the store path of brmfcj6510dwfunc and brmfcj6510dwrc but we're faced with two complications: +# 1. Too little room to specify the nix store path. We can't even take advantage of %s by renaming the file to the store path hash since the variable is too short and can't contain the whole hash. +# 2. The binary needs the directory it's running from to be r/w. +# What: +# As such, we strip the path and substitution altogether, leaving only "brmfcj6510dwfunc" and "brmfcj6510dwrc", while filling the leftovers with nulls. +# Fully null terminating the cstrings is necessary to keep the array the same size and preventing overflows. +# We then use a shell script to link and execute the binary, func and rc files in a temporary directory. +# How: +# In the package, we dump the raw binary as a string of search-able hex values using hexdump. We execute the substitution with sed. We then convert the hex values back to binary form using xxd. +# We also write a shell script that invoked "mktemp -d" to produce a r/w temporary directory and link what we need in the temporary directory. +# Result: +# The user can run brprintconf_mfcj6510dw in the shell. + +stdenv.mkDerivation rec { + name = "mfcj6510dwlpr-${version}"; + version = "3.0.0-1"; + + src = fetchurl { + url = "http://download.brother.com/welcome/dlf006614/mfcj6510dwlpr-${version}.i386.deb"; + sha256 = "1ccvx393pqavsgzd8igrzlin5jrsf01d3acyvwqd1d0yz5jgqy6d"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + + unpackPhase = "true"; + + brprintconf_mfcj6510dw_script = '' + #!/bin/sh + cd $(mktemp -d) + ln -s @out@/usr/bin/brprintconf_mfcj6510dw_patched brprintconf_mfcj6510dw_patched + ln -s @out@/opt/brother/Printers/mfcj6510dw/inf/brmfcj6510dwfunc brmfcj6510dwfunc + ln -s @out@/opt/brother/Printers/mfcj6510dw/inf/brmfcj6510dwrc brmfcj6510dwrc + ./brprintconf_mfcj6510dw_patched "$@" + ''; + + installPhase = '' + dpkg-deb -x $src $out + substituteInPlace $out/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw \ + --replace /opt "$out/opt" + substituteInPlace $out/opt/brother/Printers/mfcj6510dw/lpd/psconvertij2 \ + --replace "GHOST_SCRIPT=`which gs`" "GHOST_SCRIPT=${ghostscript}/bin/gs" + substituteInPlace $out/opt/brother/Printers/mfcj6510dw/inf/setupPrintcapij \ + --replace "/opt/brother/Printers" "$out/opt/brother/Printers" \ + --replace "printcap.local" "printcap" + + patchelf --set-interpreter ${pkgsi686Linux.stdenv.cc.libc.out}/lib/ld-linux.so.2 \ + --set-rpath $out/opt/brother/Printers/mfcj6510dw/inf:$out/opt/brother/Printers/mfcj6510dw/lpd \ + $out/opt/brother/Printers/mfcj6510dw/lpd/brmfcj6510dwfilter + patchelf --set-interpreter ${pkgsi686Linux.stdenv.cc.libc.out}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_mfcj6510dw + + #stripping the hardcoded path. + ${utillinux}/bin/hexdump -ve '1/1 "%.2X"' $out/usr/bin/brprintconf_mfcj6510dw | \ + sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F6272257366756E63.62726d66636a36353130647766756e63000000000000000000000000000000000000000000.' | \ + sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F627225737263.62726D66636A3635313064777263000000000000000000000000000000000000000000.' | \ + ${vimNox}/bin/xxd -r -p > $out/usr/bin/brprintconf_mfcj6510dw_patched + chmod +x $out/usr/bin/brprintconf_mfcj6510dw_patched + #executing from current dir. segfaults if it's not r\w. + mkdir -p $out/bin + echo -n "$brprintconf_mfcj6510dw_script" > $out/bin/brprintconf_mfcj6510dw + chmod +x $out/bin/brprintconf_mfcj6510dw + substituteInPlace $out/bin/brprintconf_mfcj6510dw --replace @out@ $out + + mkdir -p $out/lib/cups/filter/ + ln -s $out/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw $out/lib/cups/filter/brother_lpdwrapper_mfcj6510dw + + wrapProgram $out/opt/brother/Printers/mfcj6510dw/lpd/psconvertij2 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ coreutils gnused gawk ] } + wrapProgram $out/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ coreutils gnused file ghostscript a2ps ] } + ''; + + meta = with stdenv.lib; { + homepage = http://www.brother.com/; + description = "Brother MFC-J6510DW LPR driver"; + license = with licenses; unfree; + platforms = with platforms; linux; + downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128; + maintainers = with maintainers; [ ramkromberg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbe19174a213..16357fbd24e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17042,6 +17042,9 @@ in mfcj470dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj470dwcupswrapper { }; mfcj470dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj470dwlpr { }; + mfcj6510dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj6510dwcupswrapper { }; + mfcj6510dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj6510dwlpr { }; + samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { }; samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; -- cgit 1.4.1 From 5fc012ecabe8273d188675164066f3539eaa99db Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 15 Oct 2016 16:10:41 +0200 Subject: ocamlPackages.safepass: 1.3 -> 2.0 --- pkgs/development/ocaml-modules/safepass/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/pkgs/development/ocaml-modules/safepass/default.nix index 44a74b3fa2f0..214789e52b4e 100644 --- a/pkgs/development/ocaml-modules/safepass/default.nix +++ b/pkgs/development/ocaml-modules/safepass/default.nix @@ -1,11 +1,23 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild }: -stdenv.mkDerivation { - name = "ocaml-safepass-1.3"; - src = fetchurl { +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" + then { + version = "2.0"; + url = http://forge.ocamlcore.org/frs/download.php/1615/ocaml-safepass-2.0.tgz; + sha256 = "1zxx3wcyzhxxvm5w9c21y7hpa11h67paaaz9mfsyiqk6fs6hcvmw"; + } else { + version = "1.3"; url = http://forge.ocamlcore.org/frs/download.php/1432/ocaml-safepass-1.3.tgz; sha256 = "0lb8xbpyc5d1zml7s7mmcr6y2ipwdp7qz73lkv9asy7dyi6cj15g"; }; +in + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-safepass-${param.version}"; + src = fetchurl { + inherit (param) url sha256; + }; buildInputs = [ ocaml findlib ocamlbuild ]; -- cgit 1.4.1 From 5a5d051ed0e8fc9247c8d9e0530c46cbf10c1847 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 15 Oct 2016 16:32:17 +0200 Subject: ocamlPackages.js_of_ocaml: link to ppx_deriving --- pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 3f5bd770dcf0..b19f078d9a27 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4, +{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, cmdliner, tyxml, reactivedata, cppo, which, base64}: stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj"; }; - buildInputs = [ocaml findlib menhir ocsigen_deriving + buildInputs = [ ocaml findlib menhir ocsigen_deriving ppx_deriving cmdliner tyxml reactivedata cppo which base64]; propagatedBuildInputs = [ ocaml_lwt camlp4 ]; -- cgit 1.4.1 From 14384f02e86800b70527265b611d6f6788b3ba99 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 12 Oct 2016 18:00:04 -0400 Subject: hound: init at 20160919 --- pkgs/development/tools/misc/hound/default.nix | 27 +++++++++++++++++++++++++++ pkgs/development/tools/misc/hound/deps.nix | 1 + pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/misc/hound/default.nix create mode 100644 pkgs/development/tools/misc/hound/deps.nix diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix new file mode 100644 index 000000000000..f9e682d177fb --- /dev/null +++ b/pkgs/development/tools/misc/hound/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "hound-unstable-${version}"; + version = "20160919-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "f95e9a9224b8878b9cd8fac0afb6d31f83a65ca7"; + + goPackagePath = "github.com/etsy/hound"; + + src = fetchFromGitHub { + inherit rev; + owner = "etsy"; + repo = "hound"; + sha256 = "0d4mhka7f8x8xfjrjhl5l0v06ng8kc868jrajpv5bjkxsj71nwbg"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + inherit (src) homepage; + + description = "Lightning fast code searching made easy"; + license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ grahamc ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/tools/misc/hound/deps.nix b/pkgs/development/tools/misc/hound/deps.nix new file mode 100644 index 000000000000..fe51488c7066 --- /dev/null +++ b/pkgs/development/tools/misc/hound/deps.nix @@ -0,0 +1 @@ +[] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbe19174a213..64c13390915f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7267,6 +7267,8 @@ in inherit (perlPackages) IOStringy; }; + hound = callPackage ../development/tools/misc/hound { }; + hspell = callPackage ../development/libraries/hspell { }; hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { }; -- cgit 1.4.1 From 6c7a605714b8971f889887e68f44e0ec1461012a Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 12 Oct 2016 18:58:56 -0400 Subject: hound: init module --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/search/hound.nix | 119 ++++++++++++++++++++++++++++++++ nixos/release.nix | 1 + nixos/tests/hound.nix | 58 ++++++++++++++++ 5 files changed, 181 insertions(+) create mode 100644 nixos/modules/services/search/hound.nix create mode 100644 nixos/tests/hound.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 2881d843760d..8c0f0c2624b1 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -276,6 +276,7 @@ telegraf = 256; gitlab-runner = 257; postgrey = 258; + hound = 259; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -522,6 +523,7 @@ #telegraf = 256; # unused gitlab-runner = 257; postgrey = 258; + hound = 259; # 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 403f326df3de..bf7d6408df88 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -455,6 +455,7 @@ ./services/scheduling/fcron.nix ./services/scheduling/marathon.nix ./services/search/elasticsearch.nix + ./services/search/hound.nix ./services/search/kibana.nix ./services/search/solr.nix ./services/security/clamav.nix diff --git a/nixos/modules/services/search/hound.nix b/nixos/modules/services/search/hound.nix new file mode 100644 index 000000000000..4389f17668b4 --- /dev/null +++ b/nixos/modules/services/search/hound.nix @@ -0,0 +1,119 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.hound; +in { + options = { + services.hound = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the hound code search daemon. + ''; + }; + + user = mkOption { + default = "hound"; + type = types.str; + description = '' + User the hound daemon should execute under. + ''; + }; + + group = mkOption { + default = "hound"; + type = types.str; + description = '' + Group the hound daemon should execute under. + ''; + }; + + extraGroups = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "dialout" ]; + description = '' + List of extra groups that the "hound" user should be a part of. + ''; + }; + + home = mkOption { + default = "/var/lib/hound"; + type = types.path; + description = '' + The path to use as hound's $HOME. If the default user + "hound" is configured then this is the home of the "hound" + user. + ''; + }; + + package = mkOption { + default = pkgs.hound; + description = '' + Package for running hound. + ''; + }; + + config = mkOption { + type = types.str; + example = '' + { + "max-concurrent-indexers" : 2, + "dbpath" : "''${services.hound.home}/data", + "repos" : { + "nixpkgs": { + "url" : "https://www.github.com/NixOS/nixpkgs.git" + } + } + } + ''; + }; + + listen = mkOption { + type = types.str; + default = "0.0.0.0:6080"; + example = "127.0.0.1:6080 or just :6080"; + description = '' + Listen on this IP:port / :port + ''; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraGroups = optional (cfg.group == "hound") { + name = "hound"; + gid = config.ids.gids.hound; + }; + + users.extraUsers = optional (cfg.user == "hound") { + name = "hound"; + description = "hound code search"; + createHome = true; + home = cfg.home; + group = cfg.group; + extraGroups = cfg.extraGroups; + uid = config.ids.uids.hound; + }; + + systemd.services.hound = { + description = "Hound Code Search"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.home; + ExecStartPre = "${pkgs.git}/bin/git config --global --replace-all http.sslCAinfo /etc/ssl/certs/ca-certificates.crt"; + ExecStart = "${cfg.package}/bin/houndd" + + " -addr ${cfg.listen}" + + " -conf ${pkgs.writeText "hound.json" cfg.config}"; + + }; + path = [ pkgs.git ]; + }; + }; + +} diff --git a/nixos/release.nix b/nixos/release.nix index 10c624afebc7..fbd3efd16ff0 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -245,6 +245,7 @@ in rec { tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {}; tests.grsecurity = callTest tests/grsecurity.nix {}; tests.hibernate = callTest tests/hibernate.nix {}; + tests.hound = callTest tests/hound.nix {}; tests.i3wm = callTest tests/i3wm.nix {}; tests.installer = callSubTests tests/installer.nix {}; tests.influxdb = callTest tests/influxdb.nix {}; diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix new file mode 100644 index 000000000000..82fd44e8e36f --- /dev/null +++ b/nixos/tests/hound.nix @@ -0,0 +1,58 @@ +# Test whether `houndd` indexes nixpkgs +import ./make-test.nix ({ pkgs, ... } : { + name = "hound"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ grahamc ]; + }; + machine = { config, pkgs, ... }: { + services.hound = { + enable = true; + config = '' + { + "max-concurrent-indexers": 1, + "dbpath": "/var/lib/hound/data", + "repos": { + "nix": { + "url": "file:///var/lib/hound/my-git" + } + } + } + ''; + }; + + systemd.services.houndseed = { + description = "seed hound with a git repo"; + requiredBy = [ "hound.service" ]; + before = [ "hound.service" ]; + + serviceConfig = { + User = "hound"; + Group = "hound"; + WorkingDirectory = "/var/lib/hound"; + }; + path = [ pkgs.git ]; + script = '' + git config --global user.email "you@example.com" + git config --global user.name "Your Name" + git init my-git --bare + git init my-git-clone + cd my-git-clone + echo 'hi nix!' > hello + git add hello + git commit -m "hello there :)" + git remote add origin /var/lib/hound/my-git + git push origin master + ''; + }; + }; + + testScript = + '' startAll; + + $machine->waitForUnit("network.target"); + $machine->waitForUnit("hound.service"); + $machine->waitForOpenPort(6080); + $machine->succeed('curl http://127.0.0.1:6080/api/v1/search\?stats\=fosho\&repos\=\*\&rng=%3A20\&q\=hi\&files\=\&i=nope | grep "Filename" | grep "hello"'); + + ''; +}) -- cgit 1.4.1 From 224cd5106c2568176ff5ceb5ceb8ea817a877ded Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sun, 18 Sep 2016 21:21:39 +0200 Subject: at-spi2-{core,atk}: 2.20.1 -> 2.22.0 --- pkgs/development/libraries/at-spi2-atk/default.nix | 6 +++--- pkgs/development/libraries/at-spi2-core/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index b8f86f1fa22c..a6f2b1371e56 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -2,14 +2,14 @@ , intltool, dbus_glib, at_spi2_core, libSM }: stdenv.mkDerivation rec { - versionMajor = "2.20"; - versionMinor = "1"; + versionMajor = "2.22"; + versionMinor = "0"; moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "2358a794e918e8f47ce0c7370eee8fc8a6207ff1afe976ec9ff547a03277bf8e"; + sha256 = "e8bdedbeb873eb229eb08c88e11d07713ec25ae175251648ad1a9da6c21113c1"; }; buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 52459f853747..3562969f6c95 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -2,14 +2,14 @@ , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation rec { - versionMajor = "2.20"; - versionMinor = "2"; + versionMajor = "2.22"; + versionMinor = "0"; moduleName = "at-spi2-core"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "88a4de9d43139f13cca531b47b901bc1b56e0ab06ba899126644abd4ac16a143"; + sha256 = "415ea3af21318308798e098be8b3a17b2f0cf2fe16cecde5ad840cf4e0f2c80a"; }; outputs = [ "out" "dev" ]; -- cgit 1.4.1 From 1a1605cc32816522d5e28b1069972dfc1049630b Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sun, 18 Sep 2016 21:27:08 +0200 Subject: libsoup: libgnome_keyring -> libgnome_keyring3 --- pkgs/development/libraries/libsoup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 1489ab627742..030d800f4a5b 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, libxml2, pkgconfig -, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection +, gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection , valaSupport ? true, vala_0_32 , libintlOrEmpty , intltool, python }: @@ -28,7 +28,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optionals valaSupport [ vala_0_32 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] - ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ]; + ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring3 ]; passthru.propagatedUserEnvPackages = [ glib_networking.out ]; # glib_networking is a runtime dependency, not a compile-time dependency -- cgit 1.4.1 From 9513304f61750481684445c635bf857bf9aa121b Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sun, 18 Sep 2016 21:29:15 +0200 Subject: cogl: 1.22.0 -> 1.22.2, enable wayland support --- pkgs/development/libraries/cogl/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 88bb67077490..1ac34f7608bc 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection +, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland , gstreamerSupport ? true, gst_all_1 }: let ver_maj = "1.22"; - ver_min = "0"; + ver_min = "2"; in stdenv.mkDerivation rec { name = "cogl-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; - sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91"; + sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"; }; nativeBuildInputs = [ pkgconfig ]; @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-introspection" "--enable-kms-egl-platform" + "--enable-wayland-egl-platform" + "--enable-wayland-egl-server" ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst" ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobjectIntrospection + glib gdk_pixbuf gobjectIntrospection wayland mesa_noglu libXrandr libXfixes libXcomposite libXdamage ] ++ libintlOrEmpty -- cgit 1.4.1 From ed889ba8aeb36c94f870b364558873d2f12e1b1c Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 19 Sep 2016 01:38:48 +0200 Subject: gcab: 0.6 -> 0.7 --- pkgs/development/libraries/gcab/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 5a8b1f2fcbc5..11308a93337e 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, intltool, gobjectIntrospection, pkgconfig }: stdenv.mkDerivation rec { - name = "gcab-0.6"; + name = "gcab-${version}"; + version = "0.7"; src = fetchurl { - url = "mirror://gnome/sources/gcab/0.6/${name}.tar.xz"; - sha256 = "a0443b904bfa7227b5155bfcdf9ea9256b6e26930b8febe1c41f972f6f1334bb"; + url = "mirror://gnome/sources/gcab/${version}/${name}.tar.xz"; + sha256 = "1vxdsiky3492zlyrym02sdwf09y19rl2z5h5iin7qm0wizw5wvm1"; }; buildInputs = [ intltool gobjectIntrospection pkgconfig ]; -- cgit 1.4.1 From 8afdb9b0f58c8aaf65cc2b5a8272586ba2507a33 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 22 Sep 2016 15:59:39 +0200 Subject: libgtop: 2.32.0 -> 2.34.1 --- pkgs/development/libraries/libgtop/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index ac5b4dec07ba..ee4f9401bbb7 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,10 +1,12 @@ { stdenv, fetchurl, glib, pkgconfig, perl, intltool, gobjectIntrospection }: -stdenv.mkDerivation { - name = "libgtop-2.32.0"; +stdenv.mkDerivation rec { + name = "libgtop-${version}"; + major = "2.34"; + version = "${major}.1"; src = fetchurl { - url = mirror://gnome/sources/libgtop/2.32/libgtop-2.32.0.tar.xz; - sha256 = "13hpml2vfm23816qggr5fvxj75ndb1dq4rgmi7ik6azj69ij8hw4"; + url = "mirror://gnome/sources/libgtop/${major}/${name}.tar.xz"; + sha256 = "c89978a76662b18d392edbe0d1b794f5a9a399a5ccf22a02d5b9e28b5ed609e2"; }; propagatedBuildInputs = [ glib ]; -- cgit 1.4.1 From 3f598453874ed82396433937ccab3a60c8c4c31e Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 22 Sep 2016 16:00:53 +0200 Subject: gvfs: use gnome3 as default --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c125886392d..b6b8c5ec3e30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7229,7 +7229,7 @@ in gts = callPackage ../development/libraries/gts { }; gvfs = callPackage ../development/libraries/gvfs { - gnome = self.gnome2; + gnome = self.gnome3; }; gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; -- cgit 1.4.1 From 574ee15905c7c019dafa3055f24f014bc31fa096 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 29 Sep 2016 02:14:44 +0200 Subject: gtkmm_3: 3.20.0 -> 3.22.0 --- pkgs/development/libraries/gtkmm/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 37b1f816923e..8b2383f33cce 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, epoxy }: let - ver_maj = "3.20"; + ver_maj = "3.22"; 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 = "12h2kd22iayvjfhmgjccm33igrbvqdj7hym31fsa1y0dhwzmf8gh"; + sha256 = "05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From b03d1996cd46aba7b809da6d78562d3125cd130b Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 29 Sep 2016 14:17:46 +0200 Subject: pygobject: 3.20.0 -> 3.22.0 --- pkgs/development/python-modules/pygobject/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 797d89fd4822..dfddd7dddbdb 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, mkPythonDerivation, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: mkPythonDerivation rec { - major = "3.20"; + major = "3.22"; minor = "0"; name = "pygobject-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz"; - sha256 = "0ikzh3l7g1gjh8jj8vg6mdvrb25svp63gxcam4m0i404yh0lgari"; + sha256 = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7"; }; buildInputs = [ pkgconfig glib gobjectIntrospection ] -- cgit 1.4.1 From 68eaeab4bcac7d2c5d42858b39eb8e5a70fdef6d Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sun, 18 Sep 2016 21:35:23 +0200 Subject: gnome3_22: init at 3.22 copied from 3.20 removed whitespaces at the end of lines updated to 3.22 versions removed webkitgtk24 where possible gnome3_22.evolution: nspr include dir broken / not needed anymore gnome3_22.gfbgraph: 0.2.2 -> 0.2.3 gnome3_22.gjs: 1.44.0 -> 1.46.0 gnome3_22.gnome-autoar: init at 0.1.1 gnome3_22.gnome-core.folks: 0.11.0 -> 0.11.2 gnome3_22.gnome-user-share 3.18.1 -> 3.18.3 gnome3_22.gnome-weather: 3.20.1 -> 3.20.2 gnome3_22.grilo: 0.3.1 -> 0.3.2 gnome3_22.grilo-plugins: 0.3.2 -> 0.3.3 gnome3_22.libgepub: init at 0.4 gnome3_22.libgweather: 3.20.1 -> 3.20.3 gnome3_22.rest: 0.7.93 -> 0.8.0 gnome3_22.totem: x86 patch is upstream gnome3_22.tracker: 1.9.0 -> 1.10.0 --- .../gnome-3/3.22/apps/accerciser/default.nix | 23 ++ pkgs/desktops/gnome-3/3.22/apps/accerciser/src.nix | 10 + .../desktops/gnome-3/3.22/apps/bijiben/default.nix | 36 ++ pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix | 10 + pkgs/desktops/gnome-3/3.22/apps/cheese/default.nix | 26 ++ pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix | 10 + .../gnome-3/3.22/apps/evolution/default.nix | 46 +++ pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix | 10 + .../gnome-3/3.22/apps/file-roller/default.nix | 21 ++ .../desktops/gnome-3/3.22/apps/file-roller/src.nix | 10 + pkgs/desktops/gnome-3/3.22/apps/gedit/default.nix | 31 ++ pkgs/desktops/gnome-3/3.22/apps/gedit/src.nix | 10 + pkgs/desktops/gnome-3/3.22/apps/glade/default.nix | 30 ++ pkgs/desktops/gnome-3/3.22/apps/glade/src.nix | 10 + .../gnome-3/3.22/apps/gnome-boxes/default.nix | 42 +++ .../desktops/gnome-3/3.22/apps/gnome-boxes/src.nix | 10 + .../gnome-3/3.22/apps/gnome-calendar/default.nix | 23 ++ .../gnome-3/3.22/apps/gnome-calendar/src.nix | 10 + .../gnome-3/3.22/apps/gnome-characters/default.nix | 19 + .../gnome-3/3.22/apps/gnome-characters/src.nix | 10 + .../gnome-3/3.22/apps/gnome-clocks/default.nix | 27 ++ .../gnome-3/3.22/apps/gnome-clocks/src.nix | 10 + .../gnome-3/3.22/apps/gnome-documents/default.nix | 40 ++ .../gnome-3/3.22/apps/gnome-documents/src.nix | 10 + .../apps/gnome-getting-started-docs/default.nix | 15 + .../3.22/apps/gnome-getting-started-docs/src.nix | 10 + .../gnome-3/3.22/apps/gnome-logs/default.nix | 21 ++ pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix | 10 + .../gnome-3/3.22/apps/gnome-maps/default.nix | 28 ++ .../gnome-3/3.22/apps/gnome-maps/soup.patch | 12 + pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix | 10 + .../gnome-3/3.22/apps/gnome-music/default.nix | 30 ++ .../desktops/gnome-3/3.22/apps/gnome-music/src.nix | 10 + .../gnome-3/3.22/apps/gnome-nettool/default.nix | 26 ++ .../gnome-3/3.22/apps/gnome-photos/default.nix | 31 ++ .../gnome-3/3.22/apps/gnome-photos/src.nix | 10 + .../gnome-3/3.22/apps/gnome-weather/default.nix | 19 + .../gnome-3/3.22/apps/gnome-weather/src.nix | 10 + .../gnome-3/3.22/apps/nautilus-sendto/default.nix | 22 ++ pkgs/desktops/gnome-3/3.22/apps/polari/default.nix | 22 ++ pkgs/desktops/gnome-3/3.22/apps/polari/src.nix | 10 + .../gnome-3/3.22/apps/seahorse/default.nix | 35 ++ pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix | 10 + .../desktops/gnome-3/3.22/apps/vinagre/default.nix | 21 ++ pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix | 10 + .../3.22/core/adwaita-icon-theme/default.nix | 21 ++ .../gnome-3/3.22/core/adwaita-icon-theme/src.nix | 10 + pkgs/desktops/gnome-3/3.22/core/baobab/default.nix | 32 ++ pkgs/desktops/gnome-3/3.22/core/baobab/src.nix | 10 + .../desktops/gnome-3/3.22/core/caribou/default.nix | 31 ++ .../gnome-3/3.22/core/dconf-editor/default.nix | 16 + .../gnome-3/3.22/core/dconf-editor/src.nix | 10 + pkgs/desktops/gnome-3/3.22/core/dconf/default.nix | 23 ++ .../desktops/gnome-3/3.22/core/empathy/default.nix | 57 +++ pkgs/desktops/gnome-3/3.22/core/eog/default.nix | 20 + pkgs/desktops/gnome-3/3.22/core/eog/src.nix | 10 + .../gnome-3/3.22/core/epiphany/default.nix | 34 ++ pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix | 10 + pkgs/desktops/gnome-3/3.22/core/evince/default.nix | 63 ++++ pkgs/desktops/gnome-3/3.22/core/evince/src.nix | 10 + .../3.22/core/evolution-data-server/default.nix | 30 ++ .../3.22/core/evolution-data-server/src.nix | 10 + pkgs/desktops/gnome-3/3.22/core/folks/default.nix | 43 +++ pkgs/desktops/gnome-3/3.22/core/gconf/default.nix | 32 ++ pkgs/desktops/gnome-3/3.22/core/gcr/default.nix | 28 ++ pkgs/desktops/gnome-3/3.22/core/gcr/src.nix | 10 + .../gnome-3/3.22/core/gdm/3.16-wip/default.nix | 41 +++ .../gdm/3.16-wip/disable_x_access_control.patch | 15 + .../3.22/core/gdm/3.16-wip/sessions_dir.patch | 17 + .../3.22/core/gdm/3.16-wip/xserver_path.patch | 83 +++++ pkgs/desktops/gnome-3/3.22/core/gdm/default.nix | 47 +++ .../3.22/core/gdm/disable_x_access_control.patch | 13 + .../core/gdm/gdm-session-worker_xserver-path.patch | 17 + .../3.22/core/gdm/gdm-x-session_extra_args.patch | 38 ++ .../gnome-3/3.22/core/gdm/gdm-x-session_path.patch | 19 + .../gnome-3/3.22/core/gdm/libsystemd.patch | 21 ++ .../gnome-3/3.22/core/gdm/no-dbus-launch.patch | 20 + .../gnome-3/3.22/core/gdm/sessions_dir.patch | 21 ++ pkgs/desktops/gnome-3/3.22/core/gdm/src.nix | 10 + .../gnome-3/3.22/core/gdm/xserver_path.patch | 17 + .../gnome-3/3.22/core/geocode-glib/default.nix | 14 + .../gnome-3/3.22/core/geocode-glib/src.nix | 10 + pkgs/desktops/gnome-3/3.22/core/gjs/default.nix | 20 + pkgs/desktops/gnome-3/3.22/core/gjs/src.nix | 11 + .../3.22/core/gnome-backgrounds/default.nix | 12 + .../gnome-3/3.22/core/gnome-backgrounds/src.nix | 10 + .../gnome-3/3.22/core/gnome-bluetooth/default.nix | 23 ++ .../gnome-3/3.22/core/gnome-bluetooth/src.nix | 10 + .../gnome-3/3.22/core/gnome-calculator/default.nix | 26 ++ .../gnome-3/3.22/core/gnome-calculator/src.nix | 10 + .../gnome-3/3.22/core/gnome-common/default.nix | 17 + .../gnome-3/3.22/core/gnome-common/src.nix | 10 + .../gnome-3/3.22/core/gnome-contacts/default.nix | 47 +++ .../3.22/core/gnome-contacts/gio_unix.patch | 10 + .../gnome-3/3.22/core/gnome-contacts/src.nix | 10 + .../3.22/core/gnome-control-center/default.nix | 56 +++ .../gnome-3/3.22/core/gnome-control-center/src.nix | 10 + .../gnome-3/3.22/core/gnome-desktop/default.nix | 24 ++ .../gnome-3/3.22/core/gnome-desktop/src.nix | 10 + .../gnome-3/3.22/core/gnome-dictionary/default.nix | 32 ++ .../gnome-3/3.22/core/gnome-dictionary/src.nix | 10 + .../3.22/core/gnome-disk-utility/default.nix | 35 ++ .../gnome-3/3.22/core/gnome-disk-utility/src.nix | 10 + .../3.22/core/gnome-font-viewer/default.nix | 31 ++ .../gnome-3/3.22/core/gnome-font-viewer/src.nix | 10 + .../gnome-3/3.22/core/gnome-keyring/default.nix | 33 ++ .../gnome-3/3.22/core/gnome-keyring/src.nix | 10 + .../gnome-3/3.22/core/gnome-menus/default.nix | 22 ++ .../3.22/core/gnome-online-accounts/default.nix | 28 ++ .../3.22/core/gnome-online-accounts/src.nix | 10 + .../3.22/core/gnome-online-miners/default.nix | 28 ++ .../gnome-3/3.22/core/gnome-online-miners/src.nix | 10 + .../gnome-3/3.22/core/gnome-screenshot/default.nix | 31 ++ .../gnome-3/3.22/core/gnome-screenshot/src.nix | 10 + .../gnome-3/3.22/core/gnome-session/default.nix | 27 ++ .../gnome-3/3.22/core/gnome-session/src.nix | 10 + .../3.22/core/gnome-settings-daemon/default.nix | 34 ++ .../3.22/core/gnome-settings-daemon/src.nix | 10 + .../3.22/core/gnome-shell-extensions/default.nix | 19 + .../3.22/core/gnome-shell-extensions/src.nix | 10 + .../gnome-3/3.22/core/gnome-shell/default.nix | 63 ++++ .../desktops/gnome-3/3.22/core/gnome-shell/src.nix | 10 + .../gnome-3/3.22/core/gnome-software/default.nix | 27 ++ .../gnome-3/3.22/core/gnome-software/src.nix | 10 + .../gnome-3/3.22/core/gnome-system-log/default.nix | 36 ++ .../3.22/core/gnome-system-monitor/default.nix | 32 ++ .../gnome-3/3.22/core/gnome-system-monitor/src.nix | 10 + .../gnome-3/3.22/core/gnome-terminal/default.nix | 30 ++ .../gnome-3/3.22/core/gnome-terminal/src.nix | 10 + .../3.22/core/gnome-themes-standard/default.nix | 14 + .../3.22/core/gnome-themes-standard/src.nix | 10 + .../gnome-3/3.22/core/gnome-user-docs/default.nix | 15 + .../gnome-3/3.22/core/gnome-user-docs/src.nix | 10 + .../gnome-3/3.22/core/gnome-user-share/default.nix | 46 +++ .../gnome-3/3.22/core/gnome-user-share/src.nix | 12 + .../gnome-3/3.22/core/grilo-plugins/default.nix | 29 ++ pkgs/desktops/gnome-3/3.22/core/grilo/default.nix | 37 ++ .../desktops/gnome-3/3.22/core/grilo/setup-hook.sh | 7 + .../core/gsettings-desktop-schemas/default.nix | 22 ++ .../3.22/core/gsettings-desktop-schemas/src.nix | 10 + pkgs/desktops/gnome-3/3.22/core/gsound/default.nix | 22 ++ .../gnome-3/3.22/core/gtksourceview/default.nix | 22 ++ .../3.22/core/gtksourceview/nix_share_path.patch | 11 + .../gnome-3/3.22/core/gtksourceview/src.nix | 10 + .../gnome-3/3.22/core/gtksourceviewmm/default.nix | 16 + .../gnome-3/3.22/core/gtksourceviewmm/src.nix | 10 + .../gnome-3/3.22/core/gucharmap/default.nix | 33 ++ pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix | 10 + .../gnome-3/3.22/core/libcroco/default.nix | 21 ++ .../gnome-3/3.22/core/libgdata/default.nix | 30 ++ pkgs/desktops/gnome-3/3.22/core/libgee/default.nix | 26 ++ .../3.22/core/libgee/fix_introspection_paths.patch | 13 + .../gnome-3/3.22/core/libgepub/default.nix | 23 ++ .../gnome-3/3.22/core/libgnome-keyring/default.nix | 26 ++ .../gnome-3/3.22/core/libgnomekbd/default.nix | 19 + .../desktops/gnome-3/3.22/core/libgnomekbd/src.nix | 10 + .../gnome-3/3.22/core/libgweather/default.nix | 17 + .../desktops/gnome-3/3.22/core/libgweather/src.nix | 10 + .../desktops/gnome-3/3.22/core/libgxps/default.nix | 21 ++ .../desktops/gnome-3/3.22/core/libpeas/default.nix | 19 + pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix | 13 + .../gnome-3/3.22/core/libzapojit/default.nix | 16 + pkgs/desktops/gnome-3/3.22/core/mutter/default.nix | 34 ++ pkgs/desktops/gnome-3/3.22/core/mutter/math.patch | 10 + pkgs/desktops/gnome-3/3.22/core/mutter/src.nix | 10 + pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch | 33 ++ .../gnome-3/3.22/core/nautilus/default.nix | 28 ++ .../gnome-3/3.22/core/nautilus/extension_dir.patch | 24 ++ pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix | 10 + pkgs/desktops/gnome-3/3.22/core/rest/default.nix | 21 ++ pkgs/desktops/gnome-3/3.22/core/sushi/default.nix | 40 ++ pkgs/desktops/gnome-3/3.22/core/sushi/src.nix | 10 + .../gnome-3/3.22/core/totem-pl-parser/default.nix | 20 + pkgs/desktops/gnome-3/3.22/core/totem/default.nix | 41 +++ pkgs/desktops/gnome-3/3.22/core/totem/src.nix | 10 + .../desktops/gnome-3/3.22/core/tracker/default.nix | 48 +++ pkgs/desktops/gnome-3/3.22/core/tracker/src.nix | 11 + pkgs/desktops/gnome-3/3.22/core/vino/default.nix | 39 ++ pkgs/desktops/gnome-3/3.22/core/vino/src.nix | 10 + pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix | 40 ++ pkgs/desktops/gnome-3/3.22/core/vte/default.nix | 55 +++ pkgs/desktops/gnome-3/3.22/core/vte/src.nix | 11 + .../gnome-3/3.22/core/yelp-tools/default.nix | 17 + pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix | 10 + .../gnome-3/3.22/core/yelp-xsl/default.nix | 18 + pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix | 10 + pkgs/desktops/gnome-3/3.22/core/yelp/default.nix | 26 ++ pkgs/desktops/gnome-3/3.22/core/yelp/src.nix | 10 + pkgs/desktops/gnome-3/3.22/core/zenity/default.nix | 19 + pkgs/desktops/gnome-3/3.22/core/zenity/src.nix | 10 + pkgs/desktops/gnome-3/3.22/default.nix | 402 +++++++++++++++++++++ .../gnome-3/3.22/desktop/rarian/default.nix | 16 + .../gnome-3/3.22/devtools/anjuta/default.nix | 24 ++ pkgs/desktops/gnome-3/3.22/devtools/anjuta/src.nix | 10 + .../gnome-3/3.22/devtools/devhelp/default.nix | 18 + .../desktops/gnome-3/3.22/devtools/devhelp/src.nix | 10 + .../desktops/gnome-3/3.22/devtools/gdl/default.nix | 15 + pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix | 10 + .../3.22/devtools/gnome-devel-docs/default.nix | 15 + .../gnome-3/3.22/devtools/gnome-devel-docs/src.nix | 10 + .../gnome-3/3.22/devtools/nemiver/bool_slot.patch | 13 + .../gnome-3/3.22/devtools/nemiver/default.nix | 23 ++ .../gnome-3/3.22/devtools/nemiver/safe_ptr.patch | 10 + .../desktops/gnome-3/3.22/devtools/nemiver/src.nix | 11 + .../gnome-3/3.22/games/aisleriot/default.nix | 20 + pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix | 10 + .../gnome-3/3.22/games/five-or-more/default.nix | 19 + .../gnome-3/3.22/games/five-or-more/src.nix | 10 + .../gnome-3/3.22/games/four-in-a-row/default.nix | 19 + .../gnome-3/3.22/games/four-in-a-row/src.nix | 10 + .../gnome-3/3.22/games/gnome-chess/default.nix | 19 + .../gnome-3/3.22/games/gnome-chess/src.nix | 10 + .../gnome-3/3.22/games/gnome-klotski/default.nix | 19 + .../gnome-3/3.22/games/gnome-klotski/src.nix | 10 + .../gnome-3/3.22/games/gnome-mahjongg/default.nix | 19 + .../gnome-3/3.22/games/gnome-mahjongg/src.nix | 10 + .../gnome-3/3.22/games/gnome-mines/default.nix | 19 + .../gnome-3/3.22/games/gnome-mines/src.nix | 10 + .../gnome-3/3.22/games/gnome-nibbles/default.nix | 21 ++ .../gnome-3/3.22/games/gnome-nibbles/src.nix | 10 + .../gnome-3/3.22/games/gnome-robots/default.nix | 20 + .../gnome-3/3.22/games/gnome-robots/src.nix | 10 + .../gnome-3/3.22/games/gnome-sudoku/default.nix | 17 + .../gnome-3/3.22/games/gnome-sudoku/src.nix | 10 + .../gnome-3/3.22/games/gnome-taquin/default.nix | 19 + .../gnome-3/3.22/games/gnome-taquin/src.nix | 10 + .../gnome-3/3.22/games/gnome-tetravex/default.nix | 18 + .../gnome-3/3.22/games/gnome-tetravex/src.nix | 10 + .../desktops/gnome-3/3.22/games/hitori/default.nix | 24 ++ pkgs/desktops/gnome-3/3.22/games/hitori/src.nix | 10 + pkgs/desktops/gnome-3/3.22/games/iagno/default.nix | 19 + pkgs/desktops/gnome-3/3.22/games/iagno/src.nix | 10 + .../gnome-3/3.22/games/lightsoff/default.nix | 19 + pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix | 10 + .../gnome-3/3.22/games/quadrapassel/default.nix | 21 ++ .../gnome-3/3.22/games/quadrapassel/src.nix | 10 + .../gnome-3/3.22/games/swell-foop/default.nix | 19 + .../desktops/gnome-3/3.22/games/swell-foop/src.nix | 10 + pkgs/desktops/gnome-3/3.22/games/tali/default.nix | 19 + pkgs/desktops/gnome-3/3.22/games/tali/src.nix | 10 + pkgs/desktops/gnome-3/3.22/installer.nix | 15 + ...-Build-with-evolution-data-server-3.13.90.patch | 39 ++ .../gnome-3/3.22/misc/california/default.nix | 39 ++ pkgs/desktops/gnome-3/3.22/misc/geary/default.nix | 49 +++ pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix | 28 ++ .../gnome-3/3.22/misc/gfbgraph/default.nix | 23 ++ pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix | 40 ++ pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix | 10 + .../gnome-3/3.22/misc/gnome-autoar/default.nix | 18 + .../gnome-3/3.22/misc/gnome-autoar/src.nix | 12 + .../gnome-3/3.22/misc/gnome-packagekit/default.nix | 20 + .../gnome-3/3.22/misc/gnome-packagekit/src.nix | 10 + ...-for-themes-and-icons-in-system-data-dirs.patch | 120 ++++++ ...-show-multiple-entries-for-a-single-theme.patch | 100 +++++ ...003-Create-config-dir-if-it-doesn-t-exist.patch | 29 ++ .../gnome-3/3.22/misc/gnome-tweak-tool/default.nix | 44 +++ .../misc/gnome-tweak-tool/find_gsettings.patch | 22 ++ .../gnome-3/3.22/misc/gnome-tweak-tool/src.nix | 10 + .../3.22/misc/gnome-video-effects/default.nix | 20 + pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix | 45 +++ pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix | 11 + pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix | 10 + .../desktops/gnome-3/3.22/misc/gtkhtml/default.nix | 16 + pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix | 10 + .../gnome-3/3.22/misc/libgames-support/default.nix | 22 ++ pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix | 22 ++ pkgs/desktops/gnome-3/3.22/misc/libgda/src.nix | 10 + .../gnome-3/3.22/misc/libgit2-glib/default.nix | 13 + .../gnome-3/3.22/misc/libgit2-glib/src.nix | 12 + .../gnome-3/3.22/misc/libmediaart/default.nix | 22 ++ pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix | 42 +++ .../gnome-3/3.22/misc/pomodoro/default.nix | 50 +++ pkgs/top-level/all-packages.nix | 2 + 273 files changed, 6020 insertions(+) create mode 100644 pkgs/desktops/gnome-3/3.22/apps/accerciser/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/accerciser/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/bijiben/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/cheese/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/file-roller/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gedit/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gedit/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/glade/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/glade/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-characters/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-documents/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-logs/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-maps/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-nettool/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/nautilus-sendto/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/polari/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/polari/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/vinagre/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/baobab/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/baobab/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/caribou/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/dconf-editor/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/dconf-editor/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/dconf/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/empathy/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/eog/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/eog/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/evince/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/evince/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/folks/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gconf/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gcr/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gcr/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/disable_x_access_control.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/sessions_dir.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/xserver_path.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/gdm-session-worker_xserver-path.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_extra_args.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_path.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/geocode-glib/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gjs/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gjs/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-common/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-common/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-contacts/gio_unix.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-contacts/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-desktop/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-keyring/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-user-share/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/grilo-plugins/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/grilo/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/grilo/setup-hook.sh create mode 100644 pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gsound/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gtksourceview/nix_share_path.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gucharmap/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/libgee/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/libgee/fix_introspection_paths.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/libgepub/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/libgnomekbd/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/libgnomekbd/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/libgxps/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/libzapojit/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/mutter/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/mutter/math.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/mutter/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/nautilus/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/nautilus/extension_dir.patch create mode 100644 pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/rest/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/sushi/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/sushi/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/totem-pl-parser/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/totem/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/totem/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/tracker/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/tracker/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/vino/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/vino/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/vte/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/vte/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/yelp-tools/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/yelp-xsl/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/yelp/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/yelp/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/zenity/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/core/zenity/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/desktop/rarian/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/devtools/anjuta/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/devtools/gdl/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/devtools/nemiver/bool_slot.patch create mode 100644 pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/devtools/nemiver/safe_ptr.patch create mode 100644 pkgs/desktops/gnome-3/3.22/devtools/nemiver/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/five-or-more/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/five-or-more/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/four-in-a-row/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/four-in-a-row/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-chess/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-klotski/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-klotski/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-robots/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-robots/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-taquin/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-taquin/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/hitori/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/hitori/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/iagno/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/iagno/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/lightsoff/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/quadrapassel/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/quadrapassel/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/tali/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/games/tali/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/installer.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch create mode 100644 pkgs/desktops/gnome-3/3.22/misc/california/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/geary/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gfbgraph/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/find_gsettings.patch create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-video-effects/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gtkhtml/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/libgda/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix create mode 100644 pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix diff --git a/pkgs/desktops/gnome-3/3.22/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.22/apps/accerciser/default.nix new file mode 100644 index 000000000000..7a5ab769cc96 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/accerciser/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, itstool, libxml2, python3Packages, at_spi2_core +, dbus, intltool, libwnck3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) src name; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3Packages.python python3Packages.pyatspi + python3Packages.pygobject3 python3Packages.ipython + at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme + ]; + + wrapPrefixVariables = [ "PYTHONPATH" ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Accerciser; + description = "Interactive Python accessibility explorer"; + maintainers = gnome3.maintainers; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/accerciser/src.nix b/pkgs/desktops/gnome-3/3.22/apps/accerciser/src.nix new file mode 100644 index 000000000000..20bd00839649 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/accerciser/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "accerciser-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/accerciser/3.22/accerciser-3.22.0.tar.xz; + sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.22/apps/bijiben/default.nix new file mode 100644 index 000000000000..00895f9a2bb2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/bijiben/default.nix @@ -0,0 +1,36 @@ +{ stdenv, intltool, fetchurl, pkgconfig, glib +, evolution_data_server, evolution, sqlite +, makeWrapper, itstool, desktop_file_utils +, clutter_gtk, libuuid, webkitgtk, zeitgeist +, gnome3, librsvg, gdk_pixbuf, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + 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.defaultIconTheme librsvg + evolution_data_server evolution sqlite ]; + + 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 = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix new file mode 100644 index 000000000000..b2c36c3d7aed --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "bijiben-3.21.2"; + + src = fetchurl { + url = mirror://gnome/sources/bijiben/3.21/bijiben-3.21.2.tar.xz; + sha256 = "d7f05abd82da837d8d48d9f7acc6035a289d934c722fc89870d17007ba158e0d"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.22/apps/cheese/default.nix new file mode 100644 index 000000000000..b5f70d84e520 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/cheese/default.nix @@ -0,0 +1,26 @@ +{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3 +, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst, udev, gst_all_1, itstool +, libgudev +, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool + gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2 + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop + gst_all_1.gst-plugins-bad clutter_gtk clutter-gst + libcanberra_gtk3 libgudev ]; + + enableParallelBuilding = true; + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Cheese; + description = "Take photos and videos with your webcam, with fun graphical effects"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix b/pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix new file mode 100644 index 000000000000..4a25b0153932 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "cheese-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/cheese/3.22/cheese-3.22.0.tar.xz; + sha256 = "0b52e4b0021cfb86a5abbd17356b72693f724892165d91b3ff7f5031a1ce53ea"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix new file mode 100644 index 000000000000..0b72bf5965e0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix @@ -0,0 +1,46 @@ +{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight +, pkgconfig, gtk3, glib, libnotify, gtkspell3 +, wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite +, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool +, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf }: + +let + majVer = gnome3.version; +in stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard + gnome3.evolution_data_server ]; + + propagatedBuildInputs = [ gnome3.gtkhtml ]; + + buildInputs = [ gtk3 glib intltool itstool libxml2 libtool + gdk_pixbuf gnome3.defaultIconTheme librsvg db icu + gnome3.evolution_data_server libsecret libical gcr + webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 + libcanberra_gtk3 bogofilter gnome3.libgdata sqlite + gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit + nss nspr libnotify procps highlight gnome3.libgweather + gnome3.gsettings_desktop_schemas dconf + gnome3.libgnome_keyring gnome3.glib_networking ]; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar" + "--disable-libcryptui" ]; + + NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + + 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 = gnome3.maintainers; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + requiredSystemFeatures = [ "big-parallel" ]; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix new file mode 100644 index 000000000000..a3e0121f6f1d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "evolution-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/evolution/3.22/evolution-3.22.0.tar.xz; + sha256 = "3e4742032b450cd8752097ba7e56302134e3653d510d4c53196654fb353ebbeb"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.22/apps/file-roller/default.nix new file mode 100644 index 000000000000..181888293777 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/file-roller/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive +, attr, bzip2, acl, wrapGAppsHook, librsvg, gdk_pixbuf, libnotify, nautilus }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive + gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg + gnome3.dconf libnotify nautilus ]; + + installFlags = [ "nautilus_extensiondir=$(out)/lib/nautilus/extensions-3.0" ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/FileRoller; + description = "Archive manager for the GNOME desktop environment"; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix new file mode 100644 index 000000000000..029cdc2064d6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "file-roller-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/file-roller/3.22/file-roller-3.22.0.tar.xz; + sha256 = "5065b71d43deb3dc3c7af6efa3f3b1188a63bfafb213be86af1d262b1dc11d42"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gedit/default.nix new file mode 100644 index 000000000000..69056e28c260 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gedit/default.nix @@ -0,0 +1,31 @@ +{ stdenv, intltool, fetchurl, enchant, isocodes +, pkgconfig, gtk3, glib +, bash, wrapGAppsHook, itstool, libsoup, libxml2 +, gnome3, librsvg, gdk_pixbuf, file, gspell }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ gtk3 glib intltool itstool enchant isocodes + gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup + gnome3.libpeas gnome3.gtksourceview libxml2 + gnome3.gsettings_desktop_schemas gnome3.dconf file gspell ]; + + enableParallelBuilding = true; + + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gnome3.libpeas gnome3.gtksourceview ]}") + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Gedit; + description = "Official text editor of the GNOME desktop environment"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gedit/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gedit/src.nix new file mode 100644 index 000000000000..3fdc6cfaa685 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gedit/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gedit-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gedit/3.22/gedit-3.22.0.tar.xz; + sha256 = "063b5a0b5dcc8f540f6e8c3ea1c22cf8a3a19edffc25315a1b6bc51d462b3f45"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.22/apps/glade/default.nix new file mode 100644 index 000000000000..a0f8d9669556 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/glade/default.nix @@ -0,0 +1,30 @@ +{ stdenv, intltool, fetchurl, python +, pkgconfig, gtk3, glib +, makeWrapper, itstool, libxml2, docbook_xsl +, gnome3, librsvg, gdk_pixbuf, libxslt }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python + gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl + gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ]; + + 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 = gnome3.maintainers; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/glade/src.nix b/pkgs/desktops/gnome-3/3.22/apps/glade/src.nix new file mode 100644 index 000000000000..d32dbd94d059 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/glade/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "glade-3.20.0"; + + src = fetchurl { + url = mirror://gnome/sources/glade/3.20/glade-3.20.0.tar.xz; + sha256 = "82d96dca5dec40ee34e2f41d49c13b4ea50da8f32a3a49ca2da802ff14dc18fe"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix new file mode 100644 index 000000000000..edb0075fdae5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib +, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk +, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32 +, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg +, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen +, libusb, libarchive, acl, libgudev, qemu +}: + +# TODO: ovirt (optional) + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + 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_0_32 libcap_ng libcap yajl gmp + gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive + librsvg desktop_file_utils acl libgudev numactl xen + ]; + + preFixup = '' + for prog in "$out/bin/"*; do + wrapProgram "$prog" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio qemu ]}" + done + ''; + + 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.22/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix new file mode 100644 index 000000000000..7fa6fbf9da6b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-boxes-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.0.tar.xz; + sha256 = "9f02e3032f8b6aaa77d9eab6aabe7fc09902be429e266ad9fd4185b94ac867ee"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/default.nix new file mode 100644 index 000000000000..fbd5d748f5eb --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, intltool, evolution_data_server, sqlite, libxml2, libsoup +, glib, gnome_online_accounts, gsettings_desktop_schemas }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server + sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts + gsettings_desktop_schemas + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Calendar; + description = "Simple and beautiful calendar application for GNOME"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix new file mode 100644 index 000000000000..b1ff598acaf6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-calendar-3.22.1"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-calendar/3.22/gnome-calendar-3.22.1.tar.xz; + sha256 = "e6a3670c63122c4b37fbe243a54486e019c1bfd9a27c709234fb81b9e0c13360"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/default.nix new file mode 100644 index 000000000000..4571a5d50e8b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, intltool, gjs, gdk_pixbuf, librsvg }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf + librsvg gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Design/Apps/CharacterMap; + description = "Simple utility application to find and insert unusual characters"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix new file mode 100644 index 000000000000..d4b90eb47682 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-characters-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-characters/3.22/gnome-characters-3.22.0.tar.xz; + sha256 = "0778b625646d6d934cf252d58a2e16403889da6bfc237bdca1d3cb3258f63d4e"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/default.nix new file mode 100644 index 000000000000..e39614e765d6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/default.nix @@ -0,0 +1,27 @@ +{ stdenv, intltool, fetchurl, libgweather, libnotify +, pkgconfig, gtk3, glib, gsound +, makeWrapper, itstool, libcanberra_gtk3, libtool +, gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 + gnome3.gsettings_desktop_schemas makeWrapper + gdk_pixbuf gnome3.defaultIconTheme librsvg + gnome3.gnome_desktop gnome3.geocode_glib geoclue2 + libgweather libnotify libtool gsound + wrapGAppsHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Clocks; + description = "Clock application designed for GNOME 3"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix new file mode 100644 index 000000000000..81a857cf1c03 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-clocks-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-clocks/3.22/gnome-clocks-3.22.0.tar.xz; + sha256 = "cdcd4ccd9716e7f12487a80d1b173aa28d9bde536d6274fbbc31acd6606c0511"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/default.nix new file mode 100644 index 000000000000..4840d200cf99 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/default.nix @@ -0,0 +1,40 @@ +{ stdenv, intltool, fetchurl, evince, gjs +, pkgconfig, gtk3, glib +, makeWrapper, itstool, libxslt, webkitgtk +, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl +, gobjectIntrospection, json_glib, inkscape, poppler_utils +, gmp, desktop_file_utils, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + configureFlags = [ "--enable-getting-started" ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt + docbook_xsl desktop_file_utils inkscape poppler_utils + gnome3.gsettings_desktop_schemas makeWrapper gmp + gdk_pixbuf gnome3.defaultIconTheme librsvg evince + libsoup webkitgtk gjs gobjectIntrospection gnome3.rest + gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts + gnome3.gnome_desktop gnome3.libzapojit json_glib + wrapGAppsHook ] + ++ (with gnome3; [ libgepub ]); + + enableParallelBuilding = true; + + preFixup = '' + substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication" + + gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi') + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Documents; + description = "Document manager application designed to work with GNOME 3"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix new file mode 100644 index 000000000000..ca9dca1ff4ca --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-documents-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-documents/3.22/gnome-documents-3.22.0.tar.xz; + sha256 = "edf5cd6b7b7f5847217b60885358030598e551010087d2a9d1765ae6777041ad"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/default.nix new file mode 100644 index 000000000000..0c75ebd7c783 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ intltool itstool libxml2 ]; + + meta = with stdenv.lib; { + homepage = https://live.gnome.org/DocumentationProject; + description = "Help a new user get started in GNOME"; + maintainers = gnome3.maintainers; + license = licenses.cc-by-sa-30; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix new file mode 100644 index 000000000000..4cb82624254a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-getting-started-docs-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-getting-started-docs/3.22/gnome-getting-started-docs-3.22.0.tar.xz; + sha256 = "22b11fb4f6fd9f6d595dc01d5989fb1652c9a63732a4d1c997f3f5f82da75722"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/default.nix new file mode 100644 index 000000000000..d4135fdb1bae --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, intltool, itstool, libxml2, systemd }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + configureFlags = [ "--disable-tests" ]; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 + systemd gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Logs; + description = "A log viewer for the systemd journal"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix new file mode 100644 index 000000000000..995120855d53 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-logs-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-logs/3.22/gnome-logs-3.22.0.tar.xz; + sha256 = "114da79579d69840904970b2b3a72dc8f6be76a5673174b6628b42fd6781eb4f"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/default.nix new file mode 100644 index 000000000000..8625f21f3db7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3 +, gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook +, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup +, webkitgtk }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook + gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph + gnome3.geocode_glib libchamplain file libsoup + gdk_pixbuf librsvg autoreconfHook + gnome3.gsettings_desktop_schemas gnome3.evolution_data_server + gnome3.gnome_online_accounts gnome3.defaultIconTheme + webkitgtk ]; + + patches = [ ./soup.patch ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Maps; + description = "A map application for GNOME 3"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch b/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch new file mode 100644 index 000000000000..ef8c7a1287db --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch @@ -0,0 +1,12 @@ +--- gnome-maps-3.18.0/configure.ac.orig 2015-09-24 18:38:31.912498368 +0200 ++++ gnome-maps-3.18.0/configure.ac 2015-09-24 18:38:40.783320413 +0200 +@@ -50,8 +50,9 @@ + folks >= $FOLKS_MIN_VERSION + geocode-glib-1.0 >= $GEOCODE_MIN_VERSION + champlain-0.12 >= $CHAMPLAIN_MIN_VERSION + libxml-2.0 + rest-0.7 ++ libsoup-2.4 + ]) + AC_SUBST(GNOME_MAPS_LIB_CFLAGS) + AC_SUBST(GNOME_MAPS_LIB_LIBS) diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix new file mode 100644 index 000000000000..ef668faef533 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-maps-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-maps/3.22/gnome-maps-3.22.0.tar.xz; + sha256 = "7ce98a683f1c38d3ba1b5d68c7d05add9f9366774678fd50fdeeda6987163c39"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix new file mode 100644 index 000000000000..ea8f15fd4e59 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix @@ -0,0 +1,30 @@ +{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker +, libxml2, python3Packages, libnotify, wrapGAppsHook +, pkgconfig, gtk3, glib, cairo +, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart + gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python + gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify + python3Packages.pycairo python3Packages.dbus-python python3Packages.requests2 + python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook + gnome3.gsettings_desktop_schemas makeWrapper tracker ]; + + wrapPrefixVariables = [ "PYTHONPATH" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Music; + description = "Music player and management application for the GNOME desktop environment"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix new file mode 100644 index 000000000000..5b3a79a111a3 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-music-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-music/3.22/gnome-music-3.22.0.tar.xz; + sha256 = "170685ffa89556951b9fb0b9225b2bca863e54348d4079a56b8e5c4eeafa9b03"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-nettool/default.nix new file mode 100644 index 000000000000..4c152777f2cb --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-nettool/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, libgtop, intltool, itstool, libxml2, nmap, inetutils }: + +stdenv.mkDerivation rec { + name = "gnome-nettool-3.8.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz"; + sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h"; + }; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2 + gnome3.defaultIconTheme + ]; + + propagatedUserEnvPkgs = [ nmap inetutils ]; + + meta = with stdenv.lib; { + homepage = http://projects.gnome.org/gnome-network; + description = "A collection of networking tools"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix new file mode 100644 index 000000000000..df7e23ef9d4f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix @@ -0,0 +1,31 @@ +{ stdenv, intltool, fetchurl, exempi, libxml2 +, pkgconfig, gtk3, glib +, makeWrapper, itstool, gegl, babl, lcms2 +, desktop_file_utils, gmp, libmediaart, wrapGAppsHook +, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata + gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart + gdk_pixbuf gnome3.defaultIconTheme librsvg exempi + gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo + gnome3.gnome_online_accounts gnome3.gnome_desktop + lcms2 libexif gnome3.tracker libxml2 desktop_file_utils + wrapGAppsHook gexiv2 ]; + + enableParallelBuilding = true; + + 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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix new file mode 100644 index 000000000000..f28d626ff940 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-photos-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-photos/3.22/gnome-photos-3.22.0.tar.xz; + sha256 = "568329142855901a85f325ee014176e24f735b15a496842bcd31f5cb2615ba53"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix new file mode 100644 index 000000000000..dbd5377d5bf5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs +, libgweather, intltool, itstool, geoclue2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook gjs intltool itstool + libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Weather; + description = "Access current weather conditions and forecasts"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix new file mode 100644 index 000000000000..8cfab25381ee --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-weather-3.20.2"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-weather/3.20/gnome-weather-3.20.2.tar.xz; + sha256 = "7823ca7c08fa852232b98c2517830e3bd9b0ab80c9ac83f182c18ec140a5c18b"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.22/apps/nautilus-sendto/default.nix new file mode 100644 index 000000000000..093900dcb7ab --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/nautilus-sendto/default.nix @@ -0,0 +1,22 @@ +{ 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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix new file mode 100644 index 000000000000..1927585fd321 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix @@ -0,0 +1,22 @@ +{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme +, telepathy_glib, gjs, itstool, telepathy_idle, libxml2 +, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ telepathy_idle ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook + telepathy_glib gjs gdk_pixbuf librsvg libxml2 ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Polari; + description = "IRC chat client designed to integrate with the GNOME desktop"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix b/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix new file mode 100644 index 000000000000..a8c4b303c383 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "polari-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/polari/3.22/polari-3.22.0.tar.xz; + sha256 = "90ea3db7ed0a03d46d9376e3201b4332f56d6149bc284379c367159094b73818"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix new file mode 100644 index 000000000000..e59df06f8a05 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix @@ -0,0 +1,35 @@ +{ stdenv, intltool, fetchurl, vala_0_32 +, pkgconfig, gtk3, glib +, makeWrapper, itstool, gnupg, libsoup +, gnome3, librsvg, gdk_pixbuf, gpgme +, libsecret, avahi, p11_kit, openssh }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr + gnome3.gsettings_desktop_schemas makeWrapper gnupg + gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme + libsecret avahi libsoup p11_kit vala_0_32 gnome3.gcr + openssh ]; + + 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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix new file mode 100644 index 000000000000..0ae195a0a7ba --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "seahorse-3.20.0"; + + src = fetchurl { + url = mirror://gnome/sources/seahorse/3.20/seahorse-3.20.0.tar.xz; + sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.22/apps/vinagre/default.nix new file mode 100644 index 000000000000..8b8b6248642c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/vinagre/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool +, libsecret, itstool, makeWrapper, librsvg }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret + itstool makeWrapper gnome3.defaultIconTheme librsvg ]; + + preFixup = '' + wrapProgram "$out/bin/vinagre" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Vinagre; + description = "Remote desktop viewer for GNOME"; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix new file mode 100644 index 000000000000..3d1357c49898 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "vinagre-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/vinagre/3.22/vinagre-3.22.0.tar.xz; + sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix new file mode 100644 index 000000000000..3c3a05dc3af8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnome3 +, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # For convenience, we can specify adwaita-icon-theme only in packages + propagatedBuildInputs = [ hicolor_icon_theme ]; + + buildInputs = [ gdk_pixbuf librsvg ]; + + nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; + + # remove a tree of dirs with no files within + postInstall = '' rm -rf "$out/locale" ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix new file mode 100644 index 000000000000..a48b404ceb69 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "adwaita-icon-theme-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.tar.xz; + sha256 = "c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix new file mode 100644 index 000000000000..f7a0ff473cc1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix @@ -0,0 +1,32 @@ +{ stdenv, intltool, fetchurl, vala_0_32, libgtop +, pkgconfig, gtk3, glib +, bash, makeWrapper, itstool, libxml2 +, gnome3, librsvg, gdk_pixbuf, file }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ vala_0_32 pkgconfig gtk3 glib libgtop intltool itstool libxml2 + gnome3.gsettings_desktop_schemas makeWrapper file + gdk_pixbuf gnome3.defaultIconTheme librsvg ]; + + 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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix b/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix new file mode 100644 index 000000000000..df4cefc48168 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "baobab-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/baobab/3.22/baobab-3.22.0.tar.xz; + sha256 = "796e784886d5bdf2e9d8ac94d74d5f94e055f4285ef54dc16552fb9c9b9c3e99"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix new file mode 100644 index 000000000000..d63b6e86af3b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix @@ -0,0 +1,31 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf +, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake }: + +let + majorVersion = "0.4"; +in +stdenv.mkDerivation rec { + name = "caribou-${majorVersion}.21"; + + src = fetchurl { + url = "mirror://gnome/sources/caribou/${majorVersion}/${name}.tar.xz"; + sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; + }; + + buildInputs = with gnome3; + [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake + pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ]; + + propagatedBuildInputs = [ gnome3.libgee libxklavier ]; + + preBuild = '' + patchShebangs . + substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.22/core/dconf-editor/default.nix new file mode 100644 index 000000000000..6e0184e134e2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/dconf-editor/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3 +, libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme + intltool docbook_xsl docbook_xsl_ns gnome3.dconf ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/3.22/core/dconf-editor/src.nix new file mode 100644 index 000000000000..64e19864536f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/dconf-editor/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "dconf-editor-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/dconf-editor/3.22/dconf-editor-3.22.0.tar.xz; + sha256 = "4ca3c2c3836f4c944f161540d1521507dab8e7bee0cac7d543560808efb9246f"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix new file mode 100644 index 000000000000..02c60256e15b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3 +, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: + +let + majorVersion = "0.26"; +in +stdenv.mkDerivation rec { + name = "dconf-${version}"; + version = "${majorVersion}.0"; + + src = fetchurl { + url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz"; + sha256 = "1jaqsr1r0grpd25rbsc2v3vb0sc51lia9w31wlqswgqsncp2k0w6"; + }; + + buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 + intltool docbook_xsl docbook_xsl_ns makeWrapper ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.22/core/empathy/default.nix new file mode 100644 index 000000000000..9a29d11f1aea --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/empathy/default.nix @@ -0,0 +1,57 @@ +{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib +, file, librsvg, 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, libpulseaudio, 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 + +let + majorVersion = "3.12"; +in +stdenv.mkDerivation rec { + name = "empathy-${majorVersion}.11"; + + src = fetchurl { + url = "mirror://gnome/sources/empathy/${majorVersion}/${name}.tar.xz"; + sha256 = "11yl8msyf017197fm6h15yw159yjp9i08566l967yashbx7gzr6i"; + }; + + 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 libpulseaudio gnome3.yelp_xsl gdk_pixbuf + libnotify clutter libsoup gnutls libgee p11_kit + libcanberra_gtk3 telepathy_farstream farstream + gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas + file libtool librsvg ]; + + NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" + "-I${dbus_libs.dev}/include/dbus-1.0" + "-I${dbus_libs.dev}/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 = gnome3.maintainers; + # TODO: license = [ licenses.gpl2 licenses.lgpl2 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/eog/default.nix b/pkgs/desktops/gnome-3/3.22/core/eog/default.nix new file mode 100644 index 000000000000..23759e3bf90e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/eog/default.nix @@ -0,0 +1,20 @@ +{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3 +, shared_mime_info, wrapGAppsHook, librsvg, libexif }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = with gnome3; + [ intltool itstool libxml2 libjpeg gtk glib libpeas librsvg + gsettings_desktop_schemas shared_mime_info adwaita-icon-theme + gnome_desktop libexif dconf ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/EyeOfGnome; + platforms = platforms.linux; + description = "GNOME image viewer"; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/eog/src.nix b/pkgs/desktops/gnome-3/3.22/core/eog/src.nix new file mode 100644 index 000000000000..f3995e6bc2c6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/eog/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "eog-3.20.4"; + + src = fetchurl { + url = mirror://gnome/sources/eog/3.20/eog-3.20.3.tar.xz; + sha256 = "09ic1ndvl31jnlsmigd5dgdv262ybq61ik0xh35kmvgcklw8qc0n"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix new file mode 100644 index 000000000000..f29ee583db6a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix @@ -0,0 +1,34 @@ +{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu +, bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool +, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit +, sqlite, gcr, avahi, nss, isocodes, itstool, file, which +, gdk_pixbuf, librsvg, gnome_common }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # Tests need an X display + configureFlags = [ "--disable-static --disable-tests" ]; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + nativeBuildInputs = [ pkgconfig file wrapGAppsHook ]; + + 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.defaultIconTheme librsvg which gnome_common + gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ]; + + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Epiphany; + description = "WebKit based web browser for GNOME"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix new file mode 100644 index 000000000000..09ea2baf197d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "epiphany-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.0.tar.xz; + sha256 = "a645d17c10a1c266d4647306ea3e5496d3ca575d2ed8152947ed77e9eb623a27"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix new file mode 100644 index 000000000000..7629e5b56550 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix @@ -0,0 +1,63 @@ +{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 +, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 +, poppler, ghostscriptX, djvulibre, libspectre, libsecret , wrapGAppsHook +, librsvg, gobjectIntrospection +, recentListSize ? null # 5 is not enough, allow passing a different number +, supportXPS ? false # Open XML Paper Specification via libgxps +}: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ + intltool perl perlXMLParser libxml2 + glib gtk3 pango atk gdk_pixbuf gobjectIntrospection + itstool gnome3.adwaita-icon-theme + gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas + poppler ghostscriptX djvulibre libspectre + libsecret librsvg gnome3.adwaita-icon-theme gnome3.dconf + ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; + + configureFlags = [ + "--disable-nautilus" # Do not use nautilus + "--enable-introspection" + (if supportXPS then "--enable-xps" else "--disable-xps") + ]; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/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 = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + ''; + + 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.22/core/evince/src.nix b/pkgs/desktops/gnome-3/3.22/core/evince/src.nix new file mode 100644 index 000000000000..36572a58e17e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/evince/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "evince-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/evince/3.22/evince-3.22.0.tar.xz; + sha256 = "22ebabf890057e8b43020ffdebdbb57d6a586beba031838f0f0c8a596c479d46"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix new file mode 100644 index 000000000000..6b13b726296e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, python +, intltool, libsoup, libxml2, libsecret, icu, sqlite +, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala_0_32 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = with gnome3; + [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts + gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ] + ++ stdenv.lib.optional valaSupport vala_0_32; + + propagatedBuildInputs = [ libsecret nss nspr libical db ]; + + # uoa irrelevant for now + configureFlags = [ "--disable-uoa" "--disable-google-auth" ] + ++ 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 = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix new file mode 100644 index 000000000000..84817846f726 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "evolution-data-server-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/evolution-data-server/3.22/evolution-data-server-3.22.0.tar.xz; + sha256 = "8653a9a28980e661e8b91ba335dae04a0553e12611ad155bc48fb3fb3c98653d"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/folks/default.nix b/pkgs/desktops/gnome-3/3.22/core/folks/default.nix new file mode 100644 index 000000000000..790cf7959ce5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/folks/default.nix @@ -0,0 +1,43 @@ +{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool +, vala_0_32, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs +, telepathy_glib, evolution_data_server, libsecret, db }: + +# TODO: enable more folks backends + +let + majorVersion = "0.11"; +in +stdenv.mkDerivation rec { + name = "folks-${majorVersion}.2"; + + src = fetchurl { + url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz"; + sha256 = "0q9hny6a38zn0gamv0ji0pn3jw6bpn2i0fr6vbzkhm9h9ws0cqvz"; + }; + + propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; + # dbus_daemon needed for tests + buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs + vala_0_32 libsecret libxml2 libsoup nspr nss intltool db ]; + nativeBuildInputs = [ pkgconfig ]; + + configureFlags = "--disable-fatal-warnings"; + + NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss" + "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/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 = gnome3.maintainers; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix new file mode 100644 index 000000000000..a4cb3e8c1464 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix @@ -0,0 +1,32 @@ +{ 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.22/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.22/core/gcr/default.nix new file mode 100644 index 000000000000..55eebf77be59 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gcr/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib +, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk +, gobjectIntrospection, makeWrapper, libxslt, vala_0_32, gnome3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig intltool gnupg glib gobjectIntrospection libxslt + libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala_0_32 + ]; + + propagatedBuildInputs = [ p11_kit ]; + + #doCheck = true; + + #enableParallelBuilding = true; issues on hydra + + preFixup = '' + wrapProgram "$out/bin/gcr-viewer" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gcr/src.nix b/pkgs/desktops/gnome-3/3.22/core/gcr/src.nix new file mode 100644 index 000000000000..d166f033266c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gcr/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gcr-3.20.0"; + + src = fetchurl { + url = mirror://gnome/sources/gcr/3.20/gcr-3.20.0.tar.xz; + sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix new file mode 100644 index 000000000000..51b67afb01fd --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix @@ -0,0 +1,41 @@ +{ 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-${gnome3.version}.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz"; + sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3"; + }; + + preConfigure = '' + substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" + 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' + substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false' + sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in + ''; + + configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-initial-vt=10" ]; + + buildInputs = [ pkgconfig glib itstool libxml2 intltool + accountsservice gnome3.dconf systemd + gobjectIntrospection libX11 gtk + libcanberra_gtk3 pam libtool ]; + + #enableParallelBuilding = true; # problems compiling + + # Disable Access Control because our X does not support FamilyServerInterpreted yet + patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.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 = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/disable_x_access_control.patch new file mode 100644 index 000000000000..7691a9e86f0f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/disable_x_access_control.patch @@ -0,0 +1,15 @@ +--- gdm-3.16.0/daemon/gdm-display.c.orig 2015-04-08 13:53:14.370274369 +0200 ++++ gdm-3.16.0/daemon/gdm-display.c 2015-04-08 13:53:36.287520435 +0200 +@@ -1706,9 +1706,10 @@ + + gdm_error_trap_push (); + +- for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { ++ /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { + XAddHost (self->priv->x11_display, &host_entries[i]); +- } ++ }*/ ++ XDisableAccessControl(self->priv->x11_display); + + XSync (self->priv->x11_display, False); + if (gdm_error_trap_pop ()) { diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/sessions_dir.patch new file mode 100644 index 000000000000..b8fbad4d731d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/sessions_dir.patch @@ -0,0 +1,17 @@ +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.22/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/xserver_path.patch new file mode 100644 index 000000000000..b451d129391a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/xserver_path.patch @@ -0,0 +1,83 @@ +--- 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 +--- gdm-3.16.0/daemon/gdm-x-session.c.orig 2015-04-15 18:44:16.875743928 +0200 ++++ gdm-3.16.0/daemon/gdm-x-session.c 2015-04-16 13:34:02.335708638 +0200 +@@ -207,6 +207,8 @@ + char *display_fd_string = NULL; + char *vt_string = NULL; + char *display_number; ++ int nixos_argc = 0; ++ char **nixos_argv = NULL; + gsize display_number_size; + + auth_file = prepare_auth_file (); +@@ -236,7 +238,15 @@ + + display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO); + +- g_ptr_array_add (arguments, X_SERVER); ++ if (g_getenv("GDM_X_SERVER") != NULL) { ++ int i = 0; ++ g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL); ++ for (i = 0; i < nixos_argc; i++) { ++ g_ptr_array_add (arguments, nixos_argv[i]); ++ } ++ } else { ++ g_ptr_array_add (arguments, X_SERVER); ++ } + + if (vt_string != NULL) { + g_ptr_array_add (arguments, vt_string); +@@ -259,12 +269,12 @@ + g_ptr_array_add (arguments, "-noreset"); + g_ptr_array_add (arguments, "-keeptty"); + +- g_ptr_array_add (arguments, "-verbose"); ++ /*g_ptr_array_add (arguments, "-verbose"); + if (state->debug_enabled) { + g_ptr_array_add (arguments, "7"); + } else { + g_ptr_array_add (arguments, "3"); +- } ++ }*/ + + if (state->debug_enabled) { + g_ptr_array_add (arguments, "-core"); +@@ -275,6 +285,9 @@ + (const char * const *) arguments->pdata, + &error); + g_free (display_fd_string); ++ if (nixos_argv) { ++ g_strfreev (nixos_argv); ++ } + g_clear_object (&launcher); + g_ptr_array_free (arguments, TRUE); + +--- gdm-3.16.0/daemon/gdm-session.c.orig 2015-04-16 14:19:01.392802683 +0200 ++++ gdm-3.16.0/daemon/gdm-session.c 2015-04-16 14:20:36.012296764 +0200 +@@ -2359,6 +2359,12 @@ + gchar *desktop_names; + const char *locale; + ++ if (g_getenv ("GDM_X_SERVER") != NULL) { ++ gdm_session_set_environment_variable (self, ++ "GDM_X_SERVER", ++ g_getenv ("GDM_X_SERVER")); ++ } ++ + gdm_session_set_environment_variable (self, + "GDMSESSION", + get_session_name (self)); diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix new file mode 100644 index 000000000000..3a440232a48f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus +, intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook +, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # Only needed to make it build + preConfigure = '' + substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" + ''; + + configureFlags = [ "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-systemd=yes" + "--with-plymouth=yes" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + + buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook + accountsservice gnome3.dconf systemd + gobjectIntrospection libX11 gtk + libcanberra_gtk3 pam libtool plymouth ]; + + #enableParallelBuilding = true; # problems compiling + + # Disable Access Control because our X does not support FamilyServerInterpreted yet + patches = [ #./xserver_path.patch # gdm now uses wayland + ./sessions_dir.patch + ./gdm-x-session_extra_args.patch + ./gdm-session-worker_xserver-path.patch + # ./disable_x_access_control.patch ./no-dbus-launch.patch + # ./libsystemd.patch + ]; + + installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ]; + + postInstall = '' + mv $out/share/gdm/greeter/applications/gnome-shell.desktop $out/share/gdm/greeter/applications/org.gnome.Shell.desktop + ''; + + 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 = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch new file mode 100644 index 000000000000..e100e013b786 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch @@ -0,0 +1,13 @@ +--- gdm-3.14.2/daemon/gdm-slave.c.orig 2015-04-16 15:05:27.844353079 +0200 ++++ gdm-3.14.2/daemon/gdm-slave.c 2015-04-16 15:05:40.240417915 +0200 +@@ -369,8 +369,9 @@ + gdm_error_trap_push (); + + for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { +- XAddHost (slave->priv->server_display, &host_entries[i]); ++ //XAddHost (slave->priv->server_display, &host_entries[i]); + } ++ XDisableAccessControl(slave->priv->server_display); + + XSync (slave->priv->server_display, False); + if (gdm_error_trap_pop ()) { diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-session-worker_xserver-path.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-session-worker_xserver-path.patch new file mode 100644 index 000000000000..d020752fef3a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-session-worker_xserver-path.patch @@ -0,0 +1,17 @@ +diff --git a/daemon/gdm-session-worker.c.orig b/daemon/gdm-session-worker.c +index 7bbda49..592691d 100644 +--- a/daemon/gdm-session-worker.c.orig ++++ b/daemon/gdm-session-worker.c +@@ -1557,6 +1557,12 @@ gdm_session_worker_accredit_user (GdmSessionWorker *worker, + goto out; + } + ++ if (g_getenv ("GDM_X_SERVER_EXTRA_ARGS") != NULL) { ++ g_debug ("forwarding GDM_X_SERVER_EXTRA_ARGS= %s", g_getenv("GDM_X_SERVER_EXTRA_ARGS")); ++ gdm_session_worker_set_environment_variable (worker, "GDM_X_SERVER_EXTRA_ARGS", ++ g_getenv("GDM_X_SERVER_EXTRA_ARGS")); ++ } ++ + gdm_session_worker_update_environment_from_passwd_info (worker, + uid, + gid, diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_extra_args.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_extra_args.patch new file mode 100644 index 000000000000..66071aa4af80 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_extra_args.patch @@ -0,0 +1,38 @@ +diff --git a/daemon/gdm-x-session.c.orig b/daemon/gdm-x-session.c +index d835b34..1f4b7f1 100644 +--- a/daemon/gdm-x-session.c.orig ++++ b/daemon/gdm-x-session.c +@@ -211,6 +211,7 @@ spawn_x_server (State *state, + char *vt_string = NULL; + char *display_number; + gsize display_number_size; ++ gchar **xserver_extra_args = NULL; + + auth_file = prepare_auth_file (); + +@@ -285,6 +286,17 @@ spawn_x_server (State *state, + if (state->debug_enabled) { + g_ptr_array_add (arguments, "-core"); + } ++ ++ if (g_getenv ("GDM_X_SERVER_EXTRA_ARGS") != NULL) { ++ g_debug ("using GDM_X_SERVER_EXTRA_ARGS: %s", g_getenv("GDM_X_SERVER_EXTRA_ARGS")); ++ xserver_extra_args = g_strsplit(g_getenv("GDM_X_SERVER_EXTRA_ARGS"), " ", -1); ++ for (gchar **extra_arg = xserver_extra_args; *extra_arg; extra_arg++) { ++ if (strlen(*extra_arg) < 1) continue; ++ g_debug ("adding: %s", *extra_arg); ++ g_ptr_array_add (arguments, *extra_arg); ++ } ++ } ++ + g_ptr_array_add (arguments, NULL); + + subprocess = g_subprocess_launcher_spawnv (launcher, +@@ -332,6 +344,7 @@ spawn_x_server (State *state, + + is_running = TRUE; + out: ++ g_strfreev(xserver_extra_args); + g_clear_pointer (&auth_file, g_free); + g_clear_object (&data_stream); + g_clear_object (&subprocess); diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_path.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_path.patch new file mode 100644 index 000000000000..84081f4786c1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_path.patch @@ -0,0 +1,19 @@ +diff --git a/daemon/gdm-x-session.c.orig b/daemon/gdm-x-session.c +index d835b34..86f0d47 100644 +--- a/daemon/gdm-x-session.c.orig ++++ b/daemon/gdm-x-session.c +@@ -240,7 +240,13 @@ spawn_x_server (State *state, + + display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO); + +- g_ptr_array_add (arguments, X_SERVER); ++ if (g_getenv ("GDM_X_SERVER") != NULL) { ++ g_debug ("using GDM_X_SERVER: %s", g_getenv("GDM_X_SERVER")); ++ g_ptr_array_add (arguments, g_getenv("GDM_X_SERVER")); ++ } else { ++ g_debug ("GDM_X_SERVER not set, using default: %s", X_SERVER); ++ g_ptr_array_add (arguments, X_SERVER); ++ } + + if (vt_string != NULL) { + g_ptr_array_add (arguments, vt_string); diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch new file mode 100644 index 000000000000..4556f418cc81 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch @@ -0,0 +1,21 @@ +https://github.com/GNOME/gdm/commit/eee5bf72c9bb1c1d62eb0e7102088ae3b9a188cd +--- a/configure.ac 2016-05-27 11:10:44.589740789 +0200 ++++ b/configure.ac 2016-05-27 11:11:00.146427723 +0200 +@@ -888,7 +888,7 @@ + dnl --------------------------------------------------------------------------- + + PKG_CHECK_MODULES(SYSTEMD, +- [libsystemd-login >= 186 libsystemd-daemon], ++ [libsystemd], + [have_systemd=yes], [have_systemd=no]) + + if test "x$with_systemd" = "xauto" ; then +@@ -912,7 +912,7 @@ + AC_SUBST(SYSTEMD_LIBS) + + PKG_CHECK_MODULES(JOURNALD, +- [libsystemd-journal], ++ [libsystemd], + [have_journald=yes], [have_journald=no]) + + if test "x$enable_systemd_journal" = "xauto" ; then diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch new file mode 100644 index 000000000000..c87554078c7c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch @@ -0,0 +1,20 @@ +--- a/daemon/gdm-launch-environment.c 2015-06-22 15:11:07.277474398 +0000 ++++ b/daemon/gdm-launch-environment.c 2015-06-22 15:12:31.301157665 +0000 +@@ -48,8 +48,6 @@ + #include "gdm-session-enum-types.h" + #include "gdm-launch-environment.h" + +-#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session" +- + extern char **environ; + + #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate)) +@@ -512,7 +510,7 @@ + gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command); + } else { + /* wrap it in dbus-launch */ +- char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command); ++ char *command = g_strdup (launch_environment->priv->command); + + gdm_session_select_program (launch_environment->priv->session, command); + g_free (command); diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch new file mode 100644 index 000000000000..9714a68600af --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch @@ -0,0 +1,21 @@ +diff --git a/daemon/gdm-session.c.orig b/daemon/gdm-session.c +index b839fea..053d4ac 100644 +--- a/daemon/gdm-session.c.orig ++++ b/daemon/gdm-session.c +@@ -344,12 +344,16 @@ get_system_session_dirs (GdmSession *self) + #ifdef ENABLE_WAYLAND_SUPPORT + DATADIR "/wayland-sessions/", + #endif ++ "/var/empty", + "/etc/X11/sessions/", + DMCONFDIR "/Sessions/", + DATADIR "/gdm/BuiltInSessions/", + DATADIR "/xsessions/", + NULL + }; ++ if (getenv("GDM_SESSIONS_DIR") != NULL) { ++ search_dirs[1] = getenv("GDM_SESSIONS_DIR"); ++ }; + + #ifdef ENABLE_WAYLAND_SUPPORT + if (self->priv->ignore_wayland) { diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix new file mode 100644 index 000000000000..795be7f4cfe0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gdm-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gdm/3.22/gdm-3.22.0.tar.xz; + sha256 = "b9180d07c6a4a3fb0e8df6bcb4f333008cb3071f0ef81e02f081ff8a144f62d4"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch new file mode 100644 index 000000000000..3f2ec808cd65 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch @@ -0,0 +1,17 @@ +diff --git a/daemon/gdm-server.c.orig b/daemon/gdm-server.c +index 6357d34..5bef5c8 100644 +--- a/daemon/gdm-server.c.orig ++++ b/daemon/gdm-server.c +@@ -264,7 +264,11 @@ gdm_server_init_command (GdmServer *server) + return; + + fallback: +- 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); ++ } + + } + diff --git a/pkgs/desktops/gnome-3/3.22/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.22/core/geocode-glib/default.nix new file mode 100644 index 000000000000..4d75bdc49963 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/geocode-glib/default.nix @@ -0,0 +1,14 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = with gnome3; + [ intltool pkgconfig glib libsoup json_glib ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix new file mode 100644 index 000000000000..135e05e90e99 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "geocode-glib-3.20.1"; + + src = fetchurl { + url = mirror://gnome/sources/geocode-glib/3.20/geocode-glib-3.20.1.tar.xz; + sha256 = "669fc832cabf8cc2f0fc4194a8fa464cdb9c03ebf9aca5353d7cf935ba8637a2"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix new file mode 100644 index 000000000000..ac5572decb8c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix @@ -0,0 +1,20 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection +, spidermonkey_24, pango, readline, glib, libxml2, dbus }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ]; + + propagatedBuildInputs = [ spidermonkey_24 ]; + + postInstall = '' + sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la + ''; + + meta = with stdenv.lib; { + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix new file mode 100644 index 000000000000..1f4ef08f9b12 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix @@ -0,0 +1,11 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: rec { + name = "gjs-${major}.0"; + major = "1.46"; + + src = fetchurl { + url = "mirror://gnome/sources/gjs/${major}/${name}.tar.xz"; + sha256 = "2283591fa70785443793e1d7db66071b36052d707075f229baeb468d8dd25ad4"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix new file mode 100644 index 000000000000..32d6d6e7535a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, intltool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + nativeBuildInputs = [ pkgconfig intltool ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix new file mode 100644 index 000000000000..2b20cae9cdaf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-backgrounds-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-backgrounds/3.22/gnome-backgrounds-3.22.0.tar.xz; + sha256 = "6c83e01647375d5c409312d7215d038d705a3f214179227ed37d3158afdd001f"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/default.nix new file mode 100644 index 000000000000..7fae0b5c67f4 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, gnome3, pkgconfig, gtk3, intltool, glib +, udev, itstool, libxml2, makeWrapper, libnotify, libcanberra_gtk3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme + makeWrapper gnome3.gsettings_desktop_schemas itstool + libnotify libcanberra_gtk3 ]; + + preFixup = '' + wrapProgram "$out/bin/bluetooth-sendto" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + 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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix new file mode 100644 index 000000000000..474d4722b4ab --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-bluetooth-3.20.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.0.tar.xz; + sha256 = "93b3ca16b348a168d044b3f777049b7dba2a9292c4adb2751a771e3bc5e4eb53"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix new file mode 100644 index 000000000000..e1b81339e91e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix @@ -0,0 +1,26 @@ +{ stdenv, intltool, fetchurl, pkgconfig, libxml2 +, bash, gtk3, glib, wrapGAppsHook +, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ bash gtk3 glib intltool itstool + libxml2 gnome3.gtksourceview mpfr gmp + gdk_pixbuf gnome3.defaultIconTheme librsvg + gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ]; + + 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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix new file mode 100644 index 000000000000..891ce5c58f6e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-calculator-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-calculator/3.22/gnome-calculator-3.22.0.tar.xz; + sha256 = "fa0f192fc0cad43a8520d4015780ce008d9fc6201bd2dd6dc06365ba45458728"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-common/default.nix new file mode 100644 index 000000000000..f9261e183ef1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-common/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, which, gnome3, autoconf, automake }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + patches = [(fetchurl { + name = "gnome-common-patch"; + 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 + + meta = with stdenv.lib; { + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-common/src.nix new file mode 100644 index 000000000000..8ffe7e20e1a9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-common/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-common-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz; + sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix new file mode 100644 index 000000000000..8097cf32ba6e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix @@ -0,0 +1,47 @@ +{ stdenv, intltool, fetchurl, evolution_data_server, db +, pkgconfig, gtk3, glib, libsecret +, libchamplain, clutter_gtk, geocode_glib +, bash, makeWrapper, itstool, folks, libnotify, libxml2 +, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss +, libsoup, vala_0_32, dbus_glib, automake115x, autoconf }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + 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.defaultIconTheme librsvg + libchamplain clutter_gtk geocode_glib + vala_0_32 automake115x 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 = [ ./gio_unix.patch ]; + + patchFlags = "-p0"; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Contacts; + description = "Contacts is GNOME's integrated address book"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/gio_unix.patch new file mode 100644 index 000000000000..f1b3d3c94ac2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/gio_unix.patch @@ -0,0 +1,10 @@ +--- configure.ac.orig 2015-04-09 18:45:50.581232289 +0200 ++++ configure.ac 2015-04-09 18:45:59.744280137 +0200 +@@ -54,6 +54,7 @@ + champlain-0.12 + clutter-gtk-1.0 + geocode-glib-1.0 >= 3.15.3 ++ gio-unix-2.0 + " + PKG_CHECK_MODULES(CONTACTS, [$pkg_modules]) + diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/src.nix new file mode 100644 index 000000000000..4409747169ba --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-contacts-3.22.1"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-contacts/3.22/gnome-contacts-3.22.1.tar.xz; + sha256 = "e45297fb6f379a978605f7e183201be70dff2912f55072a363bdb1f67d9fe87b"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix new file mode 100644 index 000000000000..78fc82ebaed0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix @@ -0,0 +1,56 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper +, libcanberra_gtk2, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio +, gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev +, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk +, cracklib, python, libkrb5, networkmanagerapplet, networkmanager +, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev +, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk +, fontconfig, sound-theme-freedesktop, grilo }: + +# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules +# TODO: bluetooth, wacom, printers + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = + [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; + + # https://bugzilla.gnome.org/show_bug.cgi?id=752596 + enableParallelBuilding = false; + + buildInputs = with gnome3; + [ pkgconfig intltool ibus gtk glib upower libcanberra_gtk2 gsettings_desktop_schemas + libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus + gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality + accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile + shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo + gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk + gnome3.vino udev libcanberra_gtk3 libgudev + networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo ]; + + preBuild = '' + 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:${sound-theme-freedesktop}/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 + ''; + + meta = with stdenv.lib; { + description = "Utilities to configure the GNOME desktop"; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix new file mode 100644 index 000000000000..bbe7f5a009d2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-control-center-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-control-center/3.22/gnome-control-center-3.22.0.tar.xz; + sha256 = "d264ae919aeeb27987dcdd5af5577fad0590e1f184f506b563c89f356aab5052"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/default.nix new file mode 100644 index 000000000000..7265f09731fd --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/default.nix @@ -0,0 +1,24 @@ +{ 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 { + inherit (import ./src.nix fetchurl) name src; + + # this should probably be setuphook for glib + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 + xkeyboard_config isocodes itstool wayland + gtk3 glib intltool gnome_doc_utils libxkbfile + gobjectIntrospection ]; + + propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix new file mode 100644 index 000000000000..8efa20f01dc4 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-desktop-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-desktop/3.22/gnome-desktop-3.22.0.tar.xz; + sha256 = "cff36ccd8d0a62177a4c1513ec70d13ead3b84fdc208ba54199cf7616f05644d"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/default.nix new file mode 100644 index 000000000000..c94c178558da --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/default.nix @@ -0,0 +1,32 @@ +{ stdenv, intltool, fetchurl +, pkgconfig, gtk3, glib +, bash, makeWrapper, itstool, libxml2 +, gnome3, librsvg, gdk_pixbuf, file }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; + + 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.out}/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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix new file mode 100644 index 000000000000..249cb314c2aa --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-dictionary-3.20.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-dictionary/3.20/gnome-dictionary-3.20.0.tar.xz; + sha256 = "efb36377d46eff9291d3b8fec37baab2355f9dc8bc7edb791b6a625574716121"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix new file mode 100644 index 000000000000..c329d68674a4 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix @@ -0,0 +1,35 @@ +{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread +, bash, gtk3, glib, makeWrapper, cracklib, libnotify +, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python +, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/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.defaultIconTheme + librsvg udisks2 gnome3.gnome_settings_daemon + 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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix new file mode 100644 index 000000000000..c0a0798cd27e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-disk-utility-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-disk-utility/3.22/gnome-disk-utility-3.22.0.tar.xz; + sha256 = "757d4ff438e63ac337a8681c9ef184a36143b39494381b609cdf889128d7fb22"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix new file mode 100644 index 000000000000..d0ec2307a852 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix @@ -0,0 +1,31 @@ +{ stdenv, intltool, fetchurl +, pkgconfig, gtk3, glib +, bash, makeWrapper, itstool +, gnome3, librsvg, gdk_pixbuf }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop + gdk_pixbuf gnome3.defaultIconTheme librsvg + 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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix new file mode 100644 index 000000000000..ee87655bba7d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-font-viewer-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-font-viewer/3.22/gnome-font-viewer-3.22.0.tar.xz; + sha256 = "bd27cbc523016711508d7913878f32e262893cfcc7e10795171dbf8e35af9be0"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix new file mode 100644 index 000000000000..3ea108808f50 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix @@ -0,0 +1,33 @@ +{ 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 { + inherit (import ./src.nix fetchurl) name src; + + 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-pkcs11-config=$$out/etc/pkcs11/" # installation directories + "--with-pkcs11-modules=$$out/lib/pkcs11/" + ]; + + preFixup = '' + wrapProgram "$out/bin/gnome-keyring" \ + --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + wrapProgram "$out/bin/gnome-keyring-daemon" \ + --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/src.nix new file mode 100644 index 000000000000..88179fff3c7e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-keyring-3.20.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.0.tar.xz; + sha256 = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix new file mode 100644 index 000000000000..90209634fbf1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix @@ -0,0 +1,22 @@ +{ 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"; + + 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.22/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix new file mode 100644 index 000000000000..85c15042614b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper +, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common +, telepathy_glib, intltool, dbus_libs, icu +, libsoup, docbook_xsl_ns, docbook_xsl, gnome3 +}: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper + libsecret dbus_glib telepathy_glib intltool icu libsoup + docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; + + 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 = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix new file mode 100644 index 000000000000..3c1c426d2641 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-online-accounts-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-online-accounts/3.22/gnome-online-accounts-3.22.0.tar.xz; + sha256 = "aacce93a71bf5e687a45ae0d00f31ea0625ddd8143235d6d8c64c4ec21bbfa33"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/default.nix new file mode 100644 index 000000000000..90fc3a8737ae --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 +, libsoup, json_glib, gmp, openssl, makeWrapper }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + 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-${gnome3.grilo-plugins.major}" + 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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix new file mode 100644 index 000000000000..2bafae9967e2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-online-miners-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-online-miners/3.22/gnome-online-miners-3.22.0.tar.xz; + sha256 = "bf51666866527b236d980fa3a0d036581a85987c59d604566ccb3ad685dd8bb8"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix new file mode 100644 index 000000000000..29ebe8b0ca64 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix @@ -0,0 +1,31 @@ +{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 +, bash, gtk3, glib, makeWrapper +, itstool, gnome3, librsvg, gdk_pixbuf }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; + + 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.out}/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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/src.nix new file mode 100644 index 000000000000..3668417d280b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-screenshot-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-screenshot/3.22/gnome-screenshot-3.22.0.tar.xz; + sha256 = "8a05f14b3c7c6cb42f9848ad0332034c7fe5c34a69742910203588fd60b00230"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix new file mode 100644 index 000000000000..d25bf6b54bab --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower +, libxslt, intltool, makeWrapper, systemd, xorg }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + configureFlags = "--enable-systemd"; + + buildInputs = with gnome3; + [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt + gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme + gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; + + # FIXME: glib binaries shouldn't be in .dev! + preFixup = '' + wrapProgram "$out/bin/gnome-session" \ + --prefix PATH : "${glib.dev}/bin" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix new file mode 100644 index 000000000000..29f1ad93abb0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-session-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-session/3.22/gnome-session-3.22.0.tar.xz; + sha256 = "ec5c5e133c8ff1c044802eb887f4911183c45ca2d9de4ce29c6f10768ddc8e42"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix new file mode 100644 index 000000000000..2f51773049d5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix @@ -0,0 +1,34 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst +, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit +, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager +, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # fatal error: gio/gunixfdlist.h: No such file or directory + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + buildInputs = with gnome3; + [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager + libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio + libcanberra_gtk3 upower colord libgweather xkeyboard_config + polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt + libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; + + # FIXME: glib binaries shouldn't be in .dev! + preFixup = '' + wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix PATH : "${glib.dev}/bin" \ + --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" + mkdir -p "$out/share/gnome/autostart" + cp "$out/etc/xdg/autostart/gnome-settings-daemon.desktop" "$out/share/gnome/autostart" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix new file mode 100644 index 000000000000..1457aab1d013 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-settings-daemon-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-settings-daemon/3.22/gnome-settings-daemon-3.22.0.tar.xz; + sha256 = "430e42c4f2cc4cb72b669a44c744343f1592ec00d26d2168745a878afe73f82b"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/default.nix new file mode 100644 index 000000000000..e9eae87f14e3 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/default.nix @@ -0,0 +1,19 @@ +{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib +, bash, makeWrapper, itstool, gnome3, file }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + 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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix new file mode 100644 index 000000000000..e17d02a011f0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-shell-extensions-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-shell-extensions/3.22/gnome-shell-extensions-3.22.0.tar.xz; + sha256 = "317b35f6f1299d5162e693d39b21031f5fe875083c4020217db3ec056e245fc5"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix new file mode 100644 index 000000000000..3a19ee41f4cd --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix @@ -0,0 +1,63 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret +, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core +, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip +, sqlite, libgweather, libcanberra_gtk3 +, libpulseaudio, 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 { + inherit (import ./src.nix fetchurl) name src; + + # Needed to find /etc/NetworkManager/VPN + configureFlags = [ "--sysconfdir=/etc" ]; + + buildInputs = with gnome3; + [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice + libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf librsvg + clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns + libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server + libical libtool nss 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_desktop telepathy_logger gnome3.gnome_settings_daemon ]; + + propagatedBuildInputs = [ python3Packages.pygobject3 python3Packages.python gobjectIntrospection ]; + + 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" \ + --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + + wrapProgram "$out/bin/gnome-shell-extension-tool" \ + --prefix PYTHONPATH : "${python3Packages.pygobject3}/${python3Packages.python.sitePackages}:$PYTHONPATH" + + 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; + maintainers = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix new file mode 100644 index 000000000000..b835eea019cf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-shell-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-shell/3.22/gnome-shell-3.22.0.tar.xz; + sha256 = "d8d22cc19e28641f2eac47e812065c209e4866b6e5f9d636647a0a8c96e5dca9"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix new file mode 100644 index 000000000000..a6a196625b45 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit +, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3 +, json_glib, libsecret }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup + gnome3.gsettings_desktop_schemas gnome3.gnome_desktop + gtkspell3 json_glib libsecret + polkit attr acl libyaml ]; + propagatedBuildInputs = [ isocodes ]; + + postInstall = '' + mkdir -p $out/share/xml/ + ln -s ${isocodes}/share/xml/iso-codes $out/share/xml/iso-codes + ''; + + meta = with stdenv.lib; { + homepage = https://www.freedesktop.org/software/PackageKit/; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + description = "GNOME Software lets you install and update applications and system extensions."; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix new file mode 100644 index 000000000000..a05e6bd09e57 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-software-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-software/3.22/gnome-software-3.22.0.tar.xz; + sha256 = "22e30c84851b0768bd46dbb90de6d3308acdc2973d3ca4ee52a19cdb5a0182ba"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix new file mode 100644 index 000000000000..50ee229cfa49 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix @@ -0,0 +1,36 @@ +{ stdenv, intltool, fetchurl, pkgconfig +, bash, gtk3, glib, 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.dev}/include/gio-unix-2.0"; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; + + 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.out}/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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix new file mode 100644 index 000000000000..bdbdefecf229 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix @@ -0,0 +1,32 @@ +{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 +, bash, gtk3, glib, makeWrapper +, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 + gtkmm3 libgtop makeWrapper + gdk_pixbuf gnome3.defaultIconTheme librsvg + 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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix new file mode 100644 index 000000000000..e8e9ba375010 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-system-monitor-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-system-monitor/3.22/gnome-system-monitor-3.22.0.tar.xz; + sha256 = "4339d36c2f7b702652ee03424a241f855992c583bb437d7083c61d8dcfe3fff8"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix new file mode 100644 index 000000000000..beb019947ce2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango +, gnome_doc_utils, intltool, libX11, which, libuuid, vala_0_32 +, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools + gnome3.dconf itstool gnome3.nautilus vala_0_32 ]; + + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 + desktop_file_utils wrapGAppsHook ]; + + # Silly ./configure, it looks for dbus file from gnome-shell in the + # installation tree of the package it is configuring. + preConfigure = '' + mkdir -p "$out/share/dbus-1/interfaces" + cp "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" "$out/share/dbus-1/interfaces" + ''; + + # FIXME: enable for gnome3 + configureFlags = [ "--disable-migration" ]; + + meta = with stdenv.lib; { + description = "The GNOME Terminal Emulator"; + homepage = https://wiki.gnome.org/Apps/Terminal/; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix new file mode 100644 index 000000000000..5d8088d78d34 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-terminal-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-terminal/3.22/gnome-terminal-3.22.0.tar.xz; + sha256 = "97e6b1b4128ac133d8917b3940c71ddf9b89d189c5ac8402b1060126733993ed"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/default.nix new file mode 100644 index 000000000000..5cc3385ad841 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 +, gdk_pixbuf }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf + gnome3.defaultIconTheme ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix new file mode 100644 index 000000000000..8388bd612213 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-themes-standard-3.20.2"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-themes-standard/3.20/gnome-themes-standard-3.20.2.tar.xz; + sha256 = "9d0d9c4b2c9f9008301c3c1878ebb95859a735b7fd4a6a518802b9637e4a7915"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/default.nix new file mode 100644 index 000000000000..4f02673e036f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; + + meta = with stdenv.lib; { + homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}"; + description = "User and system administration help for the GNOME desktop"; + maintainers = gnome3.maintainers; + license = licenses.cc-by-30; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix new file mode 100644 index 000000000000..e7e67e0b4fb3 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-user-docs-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-user-docs/3.22/gnome-user-docs-3.22.0.tar.xz; + sha256 = "7467825a1c56ae2522fe9e36622a84b8887c731bb5f24cecfbf49acc66f6e3fc"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix new file mode 100644 index 000000000000..f8b40e42d025 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix @@ -0,0 +1,46 @@ +{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus +, pkgconfig, gtk3, glib, libxml2, gnused, systemd +, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd +, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/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.out}/bin/httpd" + "--with-modules-path=${apacheHttpd_2_2.dev}/modules" + "--with-systemduserunitdir=$(out)/etc/systemd/user" + "--disable-bluetooth" + "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; + + buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool + makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg + nautilus libnotify libcanberra_gtk3 systemd ]; + + postInstall = '' + mkdir -p $out/share/gsettings-schemas/$name + mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name + ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas + ''; + + preFixup = '' + wrapProgram "$out/libexec/gnome-user-share-webdav" \ + --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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/src.nix new file mode 100644 index 000000000000..2d06f9e7a7cf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/src.nix @@ -0,0 +1,12 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: rec { + major = "3.18"; + minor = "3"; + name = "gnome-user-share-${major}.${minor}"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-user-share/${major}/${name}.tar.xz"; + sha256 = "3092fa7ad137531e35484195dde4ecbbc75a8a3d9b8209aef4c852717cf4bbf1"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.22/core/grilo-plugins/default.nix new file mode 100644 index 000000000000..4b8fc90adad8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/grilo-plugins/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite +, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av +, gmime, json_glib, avahi, tracker, itstool }: + +stdenv.mkDerivation rec { + major = "0.3"; + minor = "3"; + name = "grilo-plugins-${major}.${minor}"; + + src = fetchurl { + url = "mirror://gnome/sources/grilo-plugins/${major}/${name}.tar.xz"; + sha256 = "fe66e887847fef9c361bcb7226047c43b2bc22b172aaf22afd5534947cc85b9c"; + }; + + installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-${major}" ]; + + 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 = gnome3.maintainers; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.22/core/grilo/default.nix new file mode 100644 index 000000000000..0deac26c2597 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/grilo/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, glib +, libxml2, gnome3, gobjectIntrospection, libsoup, python3Packages }: + +stdenv.mkDerivation rec { + major = "0.3"; # if you change this, also change ./setup-hook.sh + minor = "2"; + name = "grilo-${major}.${minor}"; + + src = fetchurl { + url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz"; + sha256 = "f26f684a5d76aea8dbce136750bc67d2170b36575f109292fbb78ae99ec87f5b"; + }; + + setupHook = ./setup-hook.sh; + + 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 ]; + + propagatedBuildInputs = [ python3Packages.pygobject3 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 = gnome3.maintainers; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/3.22/core/grilo/setup-hook.sh new file mode 100644 index 000000000000..3291e38addb8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/grilo/setup-hook.sh @@ -0,0 +1,7 @@ +make_grilo_find_plugins() { + if [ -d "$1"/lib/grilo-0.3 ]; then + addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.3" + fi +} + +envHooks+=(make_grilo_find_plugins) diff --git a/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/default.nix new file mode 100644 index 000000000000..5123cadbdafd --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection + # just for passthru +, gnome3, gtk3, gsettings_desktop_schemas }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + postPatch = '' + for file in "background" "screensaver"; do + substituteInPlace "schemas/org.gnome.desktop.$file.gschema.xml.in" \ + --replace "@datadir@" "${gnome3.gnome-backgrounds}/share/" + done + ''; + + buildInputs = [ glib gobjectIntrospection ]; + + nativeBuildInputs = [ pkgconfig intltool ]; + + meta = with stdenv.lib; { + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix new file mode 100644 index 000000000000..50a54eab7eb5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gsettings-desktop-schemas-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gsettings-desktop-schemas/3.22/gsettings-desktop-schemas-3.22.0.tar.xz; + sha256 = "0f06c7ba34c3a99e4d58b10889496133c9aaad6698ea2d8405d481c7f1a7eae1"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.22/core/gsound/default.nix new file mode 100644 index 000000000000..95785d9ed4d2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gsound/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, glib, libcanberra_gtk2, gobjectIntrospection, libtool, gnome3 }: + +let + majVer = "1.0"; +in stdenv.mkDerivation rec { + name = "gsound-${majVer}.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz"; + sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29"; + }; + + buildInputs = [ pkgconfig glib libcanberra_gtk2 gobjectIntrospection libtool ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GSound; + description = "Small library for playing system sounds"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix new file mode 100644 index 000000000000..aac1739a6e99 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango +, libxml2Python, perl, intltool, gettext, gnome3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + 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 = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/nix_share_path.patch new file mode 100644 index 000000000000..c87350167c25 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/nix_share_path.patch @@ -0,0 +1,11 @@ +--- 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.22/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix new file mode 100644 index 000000000000..6e010227fc3b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gtksourceview-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gtksourceview/3.22/gtksourceview-3.22.0.tar.xz; + sha256 = "70657f48732427984dce6cc812bdd3f2b701c0a49e0a0a08889705b3dadcf8e5"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix new file mode 100644 index 000000000000..d0453ba8ebbf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig glibmm gtkmm gtksourceview ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + homepage = "https://developer.gnome.org/gtksourceviewmm/"; + description = "C++ wrapper for gtksourceview"; + license = licenses.lgpl2; + maintainers = [ maintainers.juliendehos ]; + }; +} + diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/src.nix new file mode 100644 index 000000000000..21618c45e051 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gtksourceviewmm-3.21.2"; + + src = fetchurl { + url = mirror://gnome/sources/gtksourceviewmm/3.21/gtksourceviewmm-3.21.2.tar.xz; + sha256 = "d21296d8624a1046841bfec082021b7b966df0b62e19ee300828519bc54dd9c6"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.22/core/gucharmap/default.nix new file mode 100644 index 000000000000..05aff866606f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gucharmap/default.nix @@ -0,0 +1,33 @@ +{ stdenv, intltool, fetchurl, pkgconfig, gtk3 +, glib, desktop_file_utils, bash, appdata-tools +, makeWrapper, gnome3, file, itstool, libxml2 }: + +# TODO: icons and theme still does not work +# use packaged gnome3.adwaita-icon-theme + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + + buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools + 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 = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix new file mode 100644 index 000000000000..69c0dd600251 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gucharmap-3.18.2"; + + src = fetchurl { + url = mirror://gnome/sources/gucharmap/3.18/gucharmap-3.18.2.tar.xz; + sha256 = "80141d3e892c3c4812c1a8fad8f89978559ef19e933843267e6e9a5524c09ec9"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix new file mode 100644 index 000000000000..a4c46ef85d4c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, glib }: + +stdenv.mkDerivation rec { + name = "libcroco-0.6.11"; + + src = fetchurl { + url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; + sha256 = "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk"; + }; + + outputs = [ "out" "dev" ]; + outputBin = "dev"; + + 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.22/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix new file mode 100644 index 000000000000..e455be07bdf9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib +, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl, uhttpmock }: + +let + majorVersion = "0.17"; +in +stdenv.mkDerivation rec { + name = "libgdata-${majorVersion}.4"; + + src = fetchurl { + url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz"; + sha256 = "1xniw4y90hbk9fa548pa9pfclibw7amr2f458lfh16jdzq7gw5cz"; + }; + + NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/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 uhttpmock ]; + + propagatedBuildInputs = [ json_glib ]; + + meta = with stdenv.lib; { + description = "GData API library"; + maintainers = with maintainers; [ raskin lethalman ]; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix new file mode 100644 index 000000000000..7b49af3c50ff --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }: +let + ver_maj = "0.18"; + 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 = "16a34js81w9m2bw4qd8csm4pcgr3zq5z87867j4b8wfh6zwrxnaa"; + }; + + doCheck = true; + + patches = [ ./fix_introspection_paths.patch ]; + + buildInputs = [ autoconf vala_0_32 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; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.22/core/libgee/fix_introspection_paths.patch new file mode 100644 index 000000000000..67003f451645 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/libgee/fix_introspection_paths.patch @@ -0,0 +1,13 @@ +--- 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.22/core/libgepub/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgepub/default.nix new file mode 100644 index 000000000000..47cb96de6c34 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/libgepub/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, autoconf, pkgconfig, glib, gobjectIntrospection, gnome3 +, webkitgtk, libsoup, libxml2, libarchive }: +stdenv.mkDerivation rec { + name = "libgepub-${version}"; + version = "0.4"; + + src = fetchurl { + url = "mirror://gnome/sources/libgepub/${version}/${name}.tar.xz"; + sha256 = "5666a1c4d186d205bd2d91b71d4c1cd5426025569114a765dd913a564f149ff4"; + }; + + doCheck = true; + + buildInputs = [ autoconf pkgconfig glib gobjectIntrospection webkitgtk libsoup + libxml2 libarchive ]; + + meta = with stdenv.lib; { + description = "GObject based library for handling and rendering epub documents"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix new file mode 100644 index 000000000000..c6c9323c010a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix @@ -0,0 +1,26 @@ +{ 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.22/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/default.nix new file mode 100644 index 000000000000..2bcbefc8dbf9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + 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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/src.nix b/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/src.nix new file mode 100644 index 000000000000..02fa27169871 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "libgnomekbd-3.22.0.1"; + + src = fetchurl { + url = mirror://gnome/sources/libgnomekbd/3.22/libgnomekbd-3.22.0.1.tar.xz; + sha256 = "4efdb6b8ec92f04caced710b5edb285fb27715059ed6ca5e100b6933999a93de"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix new file mode 100644 index 000000000000..79ede15df8f0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf +, pango, gdk_pixbuf, atk, tzdata, gnome3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + 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 gnome3.geocode_glib ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix b/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix new file mode 100644 index 000000000000..946573519465 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "libgweather-3.20.3"; + + src = fetchurl { + url = mirror://gnome/sources/libgweather/3.20/libgweather-3.20.3.tar.xz; + sha256 = "fb6bc5b64ef5db3dc40a9798f072b83ebcafe7ff5af472aaee70600619b56c0b"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgxps/default.nix new file mode 100644 index 000000000000..b39e1f6fa56c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/libgxps/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff +, openssl, bzip2, acl, attr, libxml2 +}: + +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 freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ]; + propagatedBuildInputs = [ libarchive ]; + + configureFlags = "--without-liblcms2"; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix new file mode 100644 index 000000000000..1ba143539d40 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnome3 +, glib, gtk3, gobjectIntrospection, python3Packages, ncurses +}: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + configureFlags = [ "--enable-python3" ]; + + buildInputs = [ intltool pkgconfig glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 gobjectIntrospection ]; + + meta = with stdenv.lib; { + description = "A GObject-based plugins engine"; + homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix b/pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix new file mode 100644 index 000000000000..cd440858946e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix @@ -0,0 +1,13 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: rec { + major = "1.18"; + minor = "0"; + version = "${major}.${minor}"; + name = "libpeas-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz"; + sha256 = "09jy2rwwgp0xx7cnypxl56m7zzxnj3j4v58xqjxjasf3chn88jdz"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.22/core/libzapojit/default.nix new file mode 100644 index 000000000000..5a8117528b68 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/libzapojit/default.nix @@ -0,0 +1,16 @@ +{ 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.22/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix new file mode 100644 index 000000000000..546c140c4edb --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix @@ -0,0 +1,34 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo +, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 +, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libudev, libinput +, libgudev }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + # fatal error: gio/gunixfdlist.h: No such file or directory + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/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_gtk2 + gnome3.geocode_glib libudev libinput libgudev + libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ]; + + preFixup = '' + wrapProgram "$out/bin/mutter" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + patches = [ + #./x86.patch ./math.patch + ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/math.patch b/pkgs/desktops/gnome-3/3.22/core/mutter/math.patch new file mode 100644 index 000000000000..dbdfd93f5e1d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/mutter/math.patch @@ -0,0 +1,10 @@ +--- mutter-3.18.0/src/backends/meta-cursor-renderer.c.orig 2015-09-23 13:54:31.297523343 +0200 ++++ mutter-3.18.0/src/backends/meta-cursor-renderer.c 2015-09-23 13:54:43.728271766 +0200 +@@ -31,6 +31,7 @@ + + #include + #include ++#include + + #include "meta-stage.h" + diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix b/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix new file mode 100644 index 000000000000..02e9b6e0d84c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "mutter-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/mutter/3.22/mutter-3.22.0.tar.xz; + sha256 = "a5acdde788f5d137ec6dfe218a214c1f6cfb7e2e851fbcebe0b2d67b4c96e5f3"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch new file mode 100644 index 000000000000..a997b27540ee --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch @@ -0,0 +1,33 @@ +--- a/src/core/window.c 2015-05-26 10:52:41.382834963 +0200 ++++ b/src/core/window.c 2015-05-26 10:53:03.039948034 +0200 +@@ -3499,7 +3499,7 @@ + + static MetaMonitorInfo * + find_monitor_by_winsys_id (MetaWindow *window, +- guint winsys_id) ++ gint winsys_id) + { + int i; + +@@ -3618,7 +3618,7 @@ + */ + + gboolean did_placement; +- guint old_output_winsys_id; ++ gint old_output_winsys_id; + MetaRectangle unconstrained_rect; + MetaRectangle constrained_rect; + MetaMoveResizeResultFlags result = 0; +--- a/src/core/startup-notification.c 2016-06-06 12:13:27.100251933 +0200 ++++ b/src/core/startup-notification.c 2016-06-06 12:13:42.554956773 +0200 +@@ -418,7 +418,7 @@ + elapsed = ctod->now - timestamp; + + meta_topic (META_DEBUG_STARTUP, +- "Sequence used %ld ms vs. %d max: %s\n", ++ "Sequence used %" G_GINT64_FORMAT " ms vs. %d max: %s\n", + elapsed, STARTUP_TIMEOUT, + meta_startup_notification_sequence_get_id (sequence)); + +[?25l[?25h[?1049h[?1h=[?25h[?25l~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ [?25h[?25lType :quit to exit Vim[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h +[?1l>[?1049l diff --git a/pkgs/desktops/gnome-3/3.22/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.22/core/nautilus/default.nix new file mode 100644 index 000000000000..d508f1483598 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/nautilus/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif +, gtk, gnome3, libunique, intltool, gobjectIntrospection, gnome-autoar, glib +, libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg + gnome3.gnome_desktop gnome3.adwaita-icon-theme + gnome3.gsettings_desktop_schemas gnome3.dconf libnotify tracker libselinux ]; + + propagatedBuildInputs = [ gnome-autoar ]; + + # fatal error: gio/gunixinputstream.h: No such file or directory + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + +# hardeningDisable = [ "format" ]; + enableParallelBuilding = true; + + patches = [ ./extension_dir.patch ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.22/core/nautilus/extension_dir.patch new file mode 100644 index 000000000000..e1313999675d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/nautilus/extension_dir.patch @@ -0,0 +1,24 @@ +diff --git a/src/nautilus-module.c b/src/nautilus-module.c +index 6273a76..4adcc8a 100644 +--- a/src/nautilus-module.c ++++ b/src/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.22/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix new file mode 100644 index 000000000000..e0c7f3034f97 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "nautilus-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/nautilus/3.22/nautilus-3.22.0.tar.xz; + sha256 = "7671d9cf9df0321f5ad03abce03ab35ab6d643e1b3392a84f3c1d7c23ce29816"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/rest/default.nix b/pkgs/desktops/gnome-3/3.22/core/rest/default.nix new file mode 100644 index 000000000000..d467cad93b4e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/rest/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }: + +stdenv.mkDerivation rec { + name = "rest-${version}"; + major = "0.8"; + version = "${major}.0"; + + src = fetchurl { + url = "mirror://gnome/sources/rest/${major}/${name}.tar.xz"; + sha256 = "e7b89b200c1417073aef739e8a27ff2ab578056c27796ec74f5886a5e0dff647"; + }; + + buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; + + configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.22/core/sushi/default.nix new file mode 100644 index 000000000000..fb010756f290 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/sushi/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib +, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz +, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 +, gdk_pixbuf, librsvg, gtk3, harfbuzz }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; + + buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3 + clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf + librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk + gnome3.evince icu makeWrapper harfbuzz ]; + + enableParallelBuilding = true; + + postConfigure = '' + substituteInPlace src/libsushi/sushi-font-widget.h \ + --replace "" "" + substituteInPlace src/libsushi/sushi-font-widget.c \ + --replace "" "" + ''; + + 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 = gnome3.maintainers; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix b/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix new file mode 100644 index 000000000000..e1fc1011b569 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "sushi-3.21.91"; + + src = fetchurl { + url = mirror://gnome/sources/sushi/3.21/sushi-3.21.91.tar.xz; + sha256 = "db71c9ec3dd2dde6aed03b469253ce7d9f30c60ff50c2a8dc9f7776b70d15d55"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.22/core/totem-pl-parser/default.nix new file mode 100644 index 000000000000..63f36004bcd6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/totem-pl-parser/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }: + +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 = gnome3.maintainers; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/totem/default.nix b/pkgs/desktops/gnome-3/3.22/core/totem/default.nix new file mode 100644 index 000000000000..6e62a2d522f6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/totem/default.nix @@ -0,0 +1,41 @@ +{ stdenv, intltool, fetchurl, gst_all_1 +, clutter_gtk, clutter-gst, python3Packages, shared_mime_info +, pkgconfig, gtk3, glib, gobjectIntrospection +, bash, wrapGAppsHook, itstool, libxml2, dbus_glib +, gnome3, librsvg, gdk_pixbuf, file, tracker, nautilus }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + enableParallelBuilding = true; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/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 gst_all_1.gst-plugins-ugly gst_all_1.gst-libav + gnome3.libpeas shared_mime_info dbus_glib + gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop + gnome3.gsettings_desktop_schemas wrapGAppsHook file tracker nautilus ]; + + propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; + + configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; + + GI_TYPELIB_PATH = "$out/lib/girepository-1.0"; + + wrapPrefixVariables = [ "PYTHONPATH" ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Videos; + description = "Movie player for the GNOME desktop based on GStreamer"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/totem/src.nix b/pkgs/desktops/gnome-3/3.22/core/totem/src.nix new file mode 100644 index 000000000000..11e20f665b7e --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/totem/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "totem-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/totem/3.22/totem-3.22.0.tar.xz; + sha256 = "026a5b5b1674bdb941bc28e1ee95ecc168627e0fc323b6ec8d73407d21964fea"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix new file mode 100644 index 000000000000..72ebd543e902 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix @@ -0,0 +1,48 @@ +{ stdenv, intltool, fetchurl, libxml2, upower +, pkgconfig, gtk3, glib +, bash, makeWrapper, itstool, vala_0_32, sqlite, libxslt +, gnome3, librsvg, gdk_pixbuf, file, libnotify +, evolution_data_server, gst_all_1, poppler +, icu, taglib, libjpeg, libtiff, giflib, libcue +, libvorbis, flac, exempi, networkmanager +, libpng, libexif, libgsf, libuuid, bzip2 }: + +stdenv.mkDerivation rec { + + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -I${poppler.dev}/include/poppler"; + + enableParallelBuilding = true; + + buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2 + bzip2 gnome3.totem-pl-parser libxslt + gnome3.gsettings_desktop_schemas makeWrapper file + gdk_pixbuf gnome3.defaultIconTheme 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 ]; + + preConfigure = '' + substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql" + ''; + + 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 = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix b/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix new file mode 100644 index 000000000000..6889f6ee09ea --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix @@ -0,0 +1,11 @@ +fetchurl: rec { + major = "1.10"; + minor = "0"; + name = "tracker-${major}.${minor}"; + + src = fetchurl { + url = "mirror://gnome/sources/tracker/${major}/${name}.tar.xz"; + sha256 = "df95b4a1e7de442f66d1097b725dd3cdd739862f491453fc7d7b1f88181a12fb"; + }; + +} diff --git a/pkgs/desktops/gnome-3/3.22/core/vino/default.nix b/pkgs/desktops/gnome-3/3.22/core/vino/default.nix new file mode 100644 index 000000000000..524813957563 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/vino/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, lib, makeWrapper +, pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup +, telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null +, libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null +, zlib ? null, libjpeg ? null +, libXdamage ? null, libXfixes ? null, libXext ? null +, gnomeKeyringSupport ? false, libgnome_keyring3 ? null +, networkmanager ? null }: + +with lib; + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + doCheck = true; + + buildInputs = [ + makeWrapper + pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup + ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ] + ++ optional gnomeKeyringSupport libgnome_keyring3 + ++ filter (p: p != null) [ + libsecret gnutls libgcrypt avahi zlib libjpeg + libXdamage libXfixes libXext networkmanager + ]; + + 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 domenkozar ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/vino/src.nix b/pkgs/desktops/gnome-3/3.22/core/vino/src.nix new file mode 100644 index 000000000000..8cf55272da97 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/vino/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "vino-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/vino/3.22/vino-3.22.0.tar.xz; + sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix new file mode 100644 index 000000000000..cbb52c9aaa12 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }: + +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"; + }; + + 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.out}/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.22/core/vte/default.nix b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix new file mode 100644 index 000000000000..80699e212890 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, intltool, pkgconfig +, gnome3, ncurses, gobjectIntrospection, vala_0_32, libxml2, gnutls + +, selectTextPatch ? false +, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf +}: + +let baseAttrs = rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib + gnome3.gtk3 ncurses vala_0_32 libxml2 ]; + + propagatedBuildInputs = [ gnutls ]; + + preConfigure = "patchShebangs ."; + + configureFlags = [ "--enable-introspection" ]; + + enableParallelBuilding = true; + + 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; + }; +}; + +in stdenv.mkDerivation ( baseAttrs + // stdenv.lib.optionalAttrs selectTextPatch rec { + name = "vte-ng-${version}"; + version = "0.42.4.a"; + src = fetchFromGitHub { + owner = "thestinger"; + repo = "vte-ng"; + rev = version; + sha256 = "1w91lz30j5lrskp9ds5j3nn27m5mpdpn7nlcvf5y1w63mpmjg8k1"; + }; + # slightly hacky; I couldn't make it work with autoreconfHook + configureScript = "./autogen.sh"; + nativeBuildInputs = (baseAttrs.nativeBuildInputs or []) + ++ [ gtk_doc autoconf automake libtool gperf ]; + } +) + diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/src.nix b/pkgs/desktops/gnome-3/3.22/core/vte/src.nix new file mode 100644 index 000000000000..99b7b621bf7d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/vte/src.nix @@ -0,0 +1,11 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: rec { + name = "vte-${major}.2"; + major = "0.44"; + + src = fetchurl { + url = "mirror://gnome/sources/vte/${major}/${name}.tar.xz"; + sha256 = "a1ea594814bb136a3a9a6c7656b46240571f6a198825c1111007fe99194b0949"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.22/core/yelp-tools/default.nix new file mode 100644 index 000000000000..9111802eb6a8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/yelp-tools/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + 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; [ domenkozar ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix new file mode 100644 index 000000000000..f03c6d1bc311 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "yelp-tools-3.18.0"; + + src = fetchurl { + url = mirror://gnome/sources/yelp-tools/3.18/yelp-tools-3.18.0.tar.xz; + sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/default.nix new file mode 100644 index 000000000000..0a3976f35a15 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/default.nix @@ -0,0 +1,18 @@ +{ stdenv, intltool, fetchurl, pkgconfig, bash +, itstool, libxml2, libxslt, gnome3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + 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 = gnome3.maintainers; + license = [licenses.gpl2 licenses.lgpl2]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix new file mode 100644 index 000000000000..de5d68d1fab1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "yelp-xsl-3.20.1"; + + src = fetchurl { + url = mirror://gnome/sources/yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz; + sha256 = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.22/core/yelp/default.nix new file mode 100644 index 000000000000..4ee79bbc3dc5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/yelp/default.nix @@ -0,0 +1,26 @@ +{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib +, file, librsvg, gnome3, gdk_pixbuf, sqlite, groff +, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1 +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + + buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite + libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl + librsvg gdk_pixbuf gnome3.defaultIconTheme groff + gnome3.gsettings_desktop_schemas wrapGAppsHook + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Yelp; + description = "The help viewer in Gnome"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp/src.nix b/pkgs/desktops/gnome-3/3.22/core/yelp/src.nix new file mode 100644 index 000000000000..7f38bab736fd --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/yelp/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "yelp-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/yelp/3.22/yelp-3.22.0.tar.xz; + sha256 = "8616b77c239aaa731312609f192c9b2c71d54b2cae42ff23efa23b5b3188778e"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix new file mode 100644 index 000000000000..8f525945a6af --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango +, gnome_doc_utils, intltool, libX11, which, itstool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + preBuild = '' + mkdir -p $out/include + ''; + + buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; + + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix b/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix new file mode 100644 index 000000000000..75476b43b958 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "zenity-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/zenity/3.22/zenity-3.22.0.tar.xz; + sha256 = "1ecdfa1071d383b373b8135954b3ec38d402d671dcd528e69d144aff36a0e466"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix new file mode 100644 index 000000000000..d24ad136fff8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -0,0 +1,402 @@ +{ pkgs }: + +let + + pkgsFun = overrides: + let + self = self_ // overrides; + self_ = with self; { + + overridePackages = f: + let newself = pkgsFun (f newself self); + in newself; + + callPackage = pkgs.newScope self; + + version = "3.22"; + maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds DamienCassou ]; + + corePackages = with gnome3; [ + pkgs.desktop_file_utils pkgs.ibus + pkgs.shared_mime_info # for update-mime-database + glib # for gsettings + 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 gnome-shell-extensions + pkgs.hicolor_icon_theme + ]; + + optionalPackages = with gnome3; [ baobab eog epiphany evince + gucharmap nautilus totem vino yelp gnome-bluetooth + gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot + 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 dconf-editor vinagre gnome-weather gnome-logs + gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool + gnome-getting-started-docs gnome-packagekit gnome-software + ]; + + gamesPackages = with gnome3; [ swell-foop lightsoff iagno + tali quadrapassel gnome-sudoku aisleriot five-or-more + four-in-a-row gnome-chess gnome-klotski gnome-mahjongg + gnome-mines gnome-nibbles gnome-robots gnome-tetravex + hitori gnome-taquin + ]; + + inherit (pkgs) glib gtk2 webkitgtk214x gtk3 gtkmm3 libcanberra_gtk2 + clutter clutter-gst clutter_gtk cogl gtkvnc; + inherit (pkgs.gnome2) ORBit2; + libsoup = pkgs.libsoup.override { gnomeSupport = true; }; + libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; + orbit = ORBit2; + gnome3 = self // { recurseForDerivations = false; }; + gtk = gtk3; + gtkmm = gtkmm3; + vala = pkgs.vala_0_32; + gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; + webkitgtk = webkitgtk214x; + +# Simplify the nixos module and gnome packages + defaultIconTheme = adwaita-icon-theme; + +# ISO installer +# installerIso = callPackage ./installer.nix {}; + +#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) + + adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { }; + + baobab = callPackage ./core/baobab { }; + + caribou = callPackage ./core/caribou { }; + + dconf = callPackage ./core/dconf { }; + dconf-editor = callPackage ./core/dconf-editor { }; + + # empathy = callPackage ./core/empathy { + # webkitgtk = webkitgtk24x; + # clutter-gst = pkgs.clutter-gst; + # }; + + epiphany = callPackage ./core/epiphany { }; + + 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-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 { }; + + 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-software = callPackage ./core/gnome-software { }; + + 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 { }; + + gsound = callPackage ./core/gsound { }; + + gtksourceview = callPackage ./core/gtksourceview { }; + + gtksourceviewmm = callPackage ./core/gtksourceviewmm { }; + + gucharmap = callPackage ./core/gucharmap { }; + + gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; + + eog = callPackage ./core/eog { }; + + libcroco = callPackage ./core/libcroco {}; + + libgee = callPackage ./core/libgee { }; + + libgepub = callPackage ./core/libgepub { }; + + 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 { }; + + 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 { }; + + vte_290 = callPackage ./core/vte/2.90.nix { }; + + vte-select-text = vte.override { selectTextPatch = true; }; + + vino = callPackage ./core/vino { }; + + yelp = callPackage ./core/yelp { }; + + 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/) + + accerciser = callPackage ./apps/accerciser { }; + + bijiben = callPackage ./apps/bijiben { + # https://bugzilla.gnome.org/show_bug.cgi?id=728293 + webkitgtk = pkgs.webkitgtk24x; + }; + + cheese = callPackage ./apps/cheese { }; + + evolution = callPackage ./apps/evolution { }; + + file-roller = callPackage ./apps/file-roller { }; + + gedit = callPackage ./apps/gedit { }; + + glade = callPackage ./apps/glade { }; + + gnome-boxes = callPackage ./apps/gnome-boxes { + spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; }; + }; + + gnome-calendar = callPackage ./apps/gnome-calendar { }; + + gnome-characters = callPackage ./apps/gnome-characters { }; + + gnome-clocks = callPackage ./apps/gnome-clocks { }; + + gnome-documents = callPackage ./apps/gnome-documents { }; + + gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { }; + + gnome-logs = callPackage ./apps/gnome-logs { }; + + gnome-maps = callPackage ./apps/gnome-maps { }; + + gnome-music = callPackage ./apps/gnome-music { }; + + gnome-nettool = callPackage ./apps/gnome-nettool { }; + + gnome-photos = callPackage ./apps/gnome-photos { + gegl = gegl_0_3; + }; + + gnome-weather = callPackage ./apps/gnome-weather { }; + + nautilus-sendto = callPackage ./apps/nautilus-sendto { }; + + polari = callPackage ./apps/polari { }; + + # scrollkeeper replacement + rarian = callPackage ./desktop/rarian { }; + + seahorse = callPackage ./apps/seahorse { }; + + vinagre = callPackage ./apps/vinagre { }; + +#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ + + anjuta = callPackage ./devtools/anjuta { }; + + devhelp = callPackage ./devtools/devhelp { }; + + gdl = callPackage ./devtools/gdl { }; + + gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { }; + + nemiver = callPackage ./devtools/nemiver { }; + +#### Games + + aisleriot = callPackage ./games/aisleriot { }; + + five-or-more = callPackage ./games/five-or-more { }; + + four-in-a-row = callPackage ./games/four-in-a-row { }; + + gnome-chess = callPackage ./games/gnome-chess { }; + + gnome-klotski = callPackage ./games/gnome-klotski { }; + + gnome-mahjongg = callPackage ./games/gnome-mahjongg { }; + + gnome-mines = callPackage ./games/gnome-mines { }; + + gnome-nibbles = callPackage ./games/gnome-nibbles { }; + + gnome-robots = callPackage ./games/gnome-robots { }; + + gnome-sudoku = callPackage ./games/gnome-sudoku { }; + + gnome-taquin = callPackage ./games/gnome-taquin { }; + + gnome-tetravex = callPackage ./games/gnome-tetravex { }; + + hitori = callPackage ./games/hitori { }; + + iagno = callPackage ./games/iagno { }; + + lightsoff = callPackage ./games/lightsoff { }; + + swell-foop = callPackage ./games/swell-foop { }; + + tali = callPackage ./games/tali { }; + + quadrapassel = callPackage ./games/quadrapassel { }; + +#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ + + california = callPackage ./misc/california { }; + + geary = callPackage ./misc/geary { + # https://bugzilla.gnome.org/show_bug.cgi?id=728002 + webkitgtk = pkgs.webkitgtk24x; + }; + + gfbgraph = callPackage ./misc/gfbgraph { }; + + gitg = callPackage ./misc/gitg { }; + + gspell = callPackage ./misc/gspell { }; + + libgames-support = callPackage ./misc/libgames-support { }; + + libgda = callPackage ./misc/libgda { }; + + libgit2-glib = callPackage ./misc/libgit2-glib { }; + + libmediaart = callPackage ./misc/libmediaart { }; + + gexiv2 = callPackage ./misc/gexiv2 { }; + + gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { }; + + gpaste = callPackage ./misc/gpaste { }; + + pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { }; + + gtkhtml = callPackage ./misc/gtkhtml { }; + + pomodoro = callPackage ./misc/pomodoro { }; + + gnome-autoar = callPackage ./misc/gnome-autoar { }; + + gnome-video-effects = callPackage ./misc/gnome-video-effects { }; + + gnome-packagekit = callPackage ./misc/gnome-packagekit { }; + + }; + in self; # pkgsFun + +in pkgsFun {} diff --git a/pkgs/desktops/gnome-3/3.22/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.22/desktop/rarian/default.nix new file mode 100644 index 000000000000..a1b38b21869a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/desktop/rarian/default.nix @@ -0,0 +1,16 @@ +{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.22/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix new file mode 100644 index 000000000000..af74df4ad13b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, + itstool, python, makeWrapper }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl + gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper ]; + + preFixup = '' + wrapProgram $out/bin/anjuta \ + --prefix XDG_DATA_DIRS : \ + "$GSETTINGS_SCHEMAS_PATH" + ''; + + 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.22/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/src.nix new file mode 100644 index 000000000000..bbb7696d91c9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/devtools/anjuta/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "anjuta-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/anjuta/3.22/anjuta-3.22.0.tar.xz; + sha256 = "4face1c063a5a6687a6cfc6f1f700ba15f13664633c05caa2fbf50317608dd03"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix new file mode 100644 index 000000000000..1cfae754cfec --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, webkitgtk, intltool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://live.gnome.org/devhelp; + description = "API documentation browser for GNOME"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix new file mode 100644 index 000000000000..02747b9153cb --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "devhelp-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/devhelp/3.22/devhelp-3.22.0.tar.xz; + sha256 = "59cae02e12d238cc5fc3f049d779895ba89701426d9173f5b534d4ab90c5ffb0"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/gdl/default.nix new file mode 100644 index 000000000000..156d91b3eae7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/devtools/gdl/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; + + meta = with stdenv.lib; { + description = "Gnome docking library"; + homepage = https://developer.gnome.org/gdl/; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix new file mode 100644 index 000000000000..c8b65884e082 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gdl-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gdl/3.22/gdl-3.22.0.tar.xz; + sha256 = "cc5b360e1392292186924f0f9a8efc0f4db7e6e56dc7042037466b5cc839660c"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/default.nix new file mode 100644 index 000000000000..50960f41a312 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ intltool itstool libxml2 ]; + + meta = with stdenv.lib; { + homepage = https://github.com/GNOME/gnome-devel-docs; + description = "Developer documentation for GNOME"; + maintainers = gnome3.maintainers; + license = licenses.fdl12; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/src.nix new file mode 100644 index 000000000000..7f39aabda022 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-devel-docs-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-devel-docs/3.22/gnome-devel-docs-3.22.0.tar.xz; + sha256 = "e0778c62670b1c19d45191ac5503568cbd09500e9e30015b48c19e95959e6d85"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/bool_slot.patch b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/bool_slot.patch new file mode 100644 index 000000000000..83423122110c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/bool_slot.patch @@ -0,0 +1,13 @@ +--- a/src/dbgengine/nmv-dbg-common.h 2014-07-09 10:36:05.000000000 +0200 ++++ b/src/dbgengine/nmv-dbg-common.h 2016-08-04 22:40:28.447842746 +0200 +@@ -171,7 +171,9 @@ + + bool has_slot () const + { +- return m_slot; ++ //return m_slot; ++ // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822502 ++ return static_cast (m_slot); + } + + template diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix new file mode 100644 index 000000000000..e61643fd9db8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb, + boost, sqlite, gconf, libgtop, glibmm, gtkmm, vte, gtksourceview, + gtksourceviewmm, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ gtk3 libxml2 intltool itstool gdb boost sqlite gconf libgtop + glibmm gtkmm vte gtksourceview gtksourceviewmm ]; + + patches = [ ./bool_slot.patch ./safe_ptr.patch ]; + + meta = with stdenv.lib; { + homepage = "https://wiki.gnome.org/Apps/Nemiver"; + description = "Easy to use standalone C/C++ debugger"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.juliendehos ]; + }; +} + diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/safe_ptr.patch b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/safe_ptr.patch new file mode 100644 index 000000000000..e3413b224977 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/safe_ptr.patch @@ -0,0 +1,10 @@ +--- a/src/confmgr/nmv-gconf-mgr.cc 2014-07-08 10:24:06.000000000 +0200 ++++ b/src/confmgr/nmv-gconf-mgr.cc 2016-08-04 23:50:08.143060464 +0200 +@@ -32,6 +32,7 @@ + NEMIVER_BEGIN_NAMESPACE (nemiver) + + using nemiver::common::GCharSafePtr; ++using nemiver::common::GErrorSafePtr; + + class GConfMgr : public IConfMgr { + GConfMgr (const GConfMgr &); diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/src.nix b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/src.nix new file mode 100644 index 000000000000..2fcf639fe1b4 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/devtools/nemiver/src.nix @@ -0,0 +1,11 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "nemiver-0.9.6"; + + src = fetchurl { + url = mirror://gnome/sources/nemiver/0.9/nemiver-0.9.6.tar.xz; + sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; + }; +} + diff --git a/pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix new file mode 100644 index 000000000000..e149a0b31264 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 +, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils +, guile, libcanberra_gtk3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + configureFlags = [ "--with-card-theme-formats=svg" ]; + + buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf + librsvg libxml2 desktop_file_utils guile libcanberra_gtk3 ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Aisleriot; + description = "A collection of patience games written in guile scheme"; + maintainers = gnome3.maintainers; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix new file mode 100644 index 000000000000..fbe6505b9a06 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "aisleriot-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/aisleriot/3.22/aisleriot-3.22.0.tar.xz; + sha256 = "e7b603df0a482bdd0ab8083efc096a24a46aea1b36cc8608846e568b7a353eb7"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.22/games/five-or-more/default.nix new file mode 100644 index 000000000000..50a7d2906a77 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/five-or-more/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, intltool, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 + gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Five_or_more; + description = "Remove colored balls from the board by forming lines"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/3.22/games/five-or-more/src.nix new file mode 100644 index 000000000000..597db69a5dcf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/five-or-more/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "five-or-more-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/five-or-more/3.22/five-or-more-3.22.0.tar.xz; + sha256 = "33c0ba7723144aea496112fa85a1d7e5a2a8ecaa32f4373471470d7c3078da94"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/default.nix new file mode 100644 index 000000000000..68228750cd87 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg + libxml2 gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Four-in-a-row; + description = "Make lines of the same color to win"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/src.nix new file mode 100644 index 000000000000..e0e11bc2124c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "four-in-a-row-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/four-in-a-row/3.22/four-in-a-row-3.22.0.tar.xz; + sha256 = "c2e26630f7b4e81cff087314edc0f39cd645dfbf4b31f826232bd8e9d57a7ff7"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-chess/default.nix new file mode 100644 index 000000000000..a96dae3c12cb --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-chess/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, intltool, itstool, librsvg, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 + gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Chess; + description = "Play the classic two-player boardgame of chess"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix new file mode 100644 index 000000000000..1cced81517d7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-chess-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-chess/3.22/gnome-chess-3.22.0.tar.xz; + sha256 = "838040c120af08aaa8ef1a6a284e2de296b998b37e49adb9436a12b6a428154a"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/default.nix new file mode 100644 index 000000000000..dc2289daff82 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, libxml2, intltool, itstool, libgee, libgames-support }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 libgee libgames-support + gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Klotski; + description = "Slide blocks to solve the puzzle"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/src.nix new file mode 100644 index 000000000000..447bc1eff130 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-klotski-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.0.tar.xz; + sha256 = "25e35369d1b5d2f9e6b92d44568d21df631b5b23dd7b12ca226a04f58cb54700"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/default.nix new file mode 100644 index 000000000000..43db32e88577 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, intltool, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 + gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Mahjongg; + description = "Disassemble a pile of tiles by removing matching pairs"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/src.nix new file mode 100644 index 000000000000..c021136ee304 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-mahjongg-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-mahjongg/3.22/gnome-mahjongg-3.22.0.tar.xz; + sha256 = "f5972a14fa4ad04153bd6e68475b85cd79c6b44f6cac1fe1edb64dbad4135218"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix new file mode 100644 index 000000000000..0b670ec9f65b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, intltool, itstool, libxml2, libgames-support, libgee }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 + gnome3.defaultIconTheme libgames-support libgee + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Mines; + description = "Clear hidden mines from a minefield"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix new file mode 100644 index 000000000000..67db003d99a0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-mines-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-mines/3.22/gnome-mines-3.22.0.tar.xz; + sha256 = "ee6df05b36fdff0376371887c1375e63d9e90655146a9a787db3c3aa2b74908a"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/default.nix new file mode 100644 index 000000000000..cf2282188782 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool +, libxml2, libgee, libgames-support }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 + librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme + libgee libgames-support + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Nibbles; + description = "Guide a worm around a maze"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix new file mode 100644 index 000000000000..e2948db9e4c1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-nibbles-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-nibbles/3.22/gnome-nibbles-3.22.0.tar.xz; + sha256 = "9cbc0aa458af0a4c00fd1bd528c4c3fecaea713390e2cbee796b0a6930e0cb49"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-robots/default.nix new file mode 100644 index 000000000000..9eafb166eee8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-robots/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, libcanberra_gtk3, intltool, itstool, libxml2, libgames-support +, libgee}: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 + libxml2 gnome3.defaultIconTheme libgames-support libgee + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Robots; + description = "Avoid the robots and make them crash into each other"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-robots/src.nix new file mode 100644 index 000000000000..17fabe2de26b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-robots/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-robots-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-robots/3.22/gnome-robots-3.22.0.tar.xz; + sha256 = "ddb02f9d04c970354d1836813f8c0d9ffc3ff509091d2580384e2275663e6f73"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/default.nix new file mode 100644 index 000000000000..c8ba82c7246d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook +, json_glib, qqwing, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee + json_glib qqwing itstool libxml2 ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Sudoku; + description = "Test your logic skills in this number grid puzzle"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix new file mode 100644 index 000000000000..085cf2ffb203 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-sudoku-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-sudoku/3.22/gnome-sudoku-3.22.0.tar.xz; + sha256 = "0f39a7afb864c6cffa1991cc5fda958e0eb03329eebe21ca2d965588cf5fa0d5"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/default.nix new file mode 100644 index 000000000000..78eaa23e63bd --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3 + intltool itstool libxml2 gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Taquin; + description = "Move tiles so that they reach their places"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/src.nix new file mode 100644 index 000000000000..6828e56a911f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-taquin-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-taquin/3.22/gnome-taquin-3.22.0.tar.xz; + sha256 = "780af247856b91095a9a2e1a6b425e4e3a78520659e2157eddb421377e8ce982"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/default.nix new file mode 100644 index 000000000000..d6feab93dba1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, libxml2, intltool, itstool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Tetravex; + description = "Complete the puzzle by matching numbered tiles"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/src.nix new file mode 100644 index 000000000000..e79b18263b99 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-tetravex-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-tetravex/3.22/gnome-tetravex-3.22.0.tar.xz; + sha256 = "0a6d7ff5ffcd6c05454a919d46a2e389d6b5f87bc80e82c52c2f20d9d914e18d"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.22/games/hitori/default.nix new file mode 100644 index 000000000000..bd6be7d43c58 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/hitori/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, libxml2, intltool, itstool }: + +stdenv.mkDerivation rec { + name = "hitori-${gnome3.version}.1"; + + src = fetchurl { + url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz"; + sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1"; + }; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 + gnome3.defaultIconTheme + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Hitori; + description = "GTK+ application to generate and let you play games of Hitori"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/hitori/src.nix b/pkgs/desktops/gnome-3/3.22/games/hitori/src.nix new file mode 100644 index 000000000000..47989cf2eae5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/hitori/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "hitori-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/hitori/3.22/hitori-3.22.0.tar.xz; + sha256 = "f70521c9a7a7c3e16b3951b64780eb0c5bce1bb1bb29de4482be06fb5e41adaa"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.22/games/iagno/default.nix new file mode 100644 index 000000000000..1b6f08d1fd65 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/iagno/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook +, intltool, itstool, libcanberra_gtk3, libxml2, dconf }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Iagno; + description = "Computer version of the game Reversi, more popularly called Othello"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/iagno/src.nix b/pkgs/desktops/gnome-3/3.22/games/iagno/src.nix new file mode 100644 index 000000000000..6c20a8f7844a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/iagno/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "iagno-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/iagno/3.22/iagno-3.22.0.tar.xz; + sha256 = "e7070c55f1f74cd9345388ee120f0e6cc47392868c2601664c26a0fa2672fe13"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.22/games/lightsoff/default.nix new file mode 100644 index 000000000000..8ec54b489721 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/lightsoff/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook +, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf + libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Lightsoff; + description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix new file mode 100644 index 000000000000..c79aa1582a1a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "lightsoff-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/lightsoff/3.22/lightsoff-3.22.0.tar.xz; + sha256 = "0458e0ff99a10a99573db4d3e1ea5abde186056d8e32cf1f0bd76e25ff2c4fca"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.22/games/quadrapassel/default.nix new file mode 100644 index 000000000000..f319608764d6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/quadrapassel/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf +, librsvg, libcanberra_gtk3 +, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + libcanberra_gtk3 itstool intltool clutter + libxml2 clutter_gtk wrapGAppsHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Quadrapassel; + description = "Classic falling-block game, Tetris"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/quadrapassel/src.nix b/pkgs/desktops/gnome-3/3.22/games/quadrapassel/src.nix new file mode 100644 index 000000000000..57bdb4771ddf --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/quadrapassel/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "quadrapassel-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/quadrapassel/3.22/quadrapassel-3.22.0.tar.xz; + sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix new file mode 100644 index 000000000000..3d3e424d0da8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf +, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; + description = "Puzzle game, previously known as Same GNOME"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix new file mode 100644 index 000000000000..e0644e539fb7 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "swell-foop-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/swell-foop/3.22/swell-foop-3.22.0.tar.xz; + sha256 = "e7bb6f4c7932a17c3f48e5b7df66f4e3953642e8126389531592a79fdf71e0a4"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/tali/default.nix b/pkgs/desktops/gnome-3/3.22/games/tali/default.nix new file mode 100644 index 000000000000..c2b1f5857124 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/tali/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf +, librsvg, intltool, itstool, libxml2, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + libxml2 itstool intltool wrapGAppsHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Tali; + description = "Sort of poker with dice and less money"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/games/tali/src.nix b/pkgs/desktops/gnome-3/3.22/games/tali/src.nix new file mode 100644 index 000000000000..108144cc3eef --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/games/tali/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "tali-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/tali/3.22/tali-3.22.0.tar.xz; + sha256 = "5ba17794d6fb06b794daaffa62a6aaa372b7de8886ce5ec596c37e62bb71728b"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/installer.nix b/pkgs/desktops/gnome-3/3.22/installer.nix new file mode 100644 index 000000000000..4999e1f3343c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/installer.nix @@ -0,0 +1,15 @@ +{ isoBaseName ? "nixos-graphical-gnome", system ? builtins.currentSystem +, extraModules ? [] }: + +let + + module = ../../../../nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix; + + config = (import ../../../../nixos/lib/eval-config.nix { + inherit system; + modules = [ module { isoImage.isoBaseName = isoBaseName; } ] ++ extraModules; + }).config; + +in + config.system.build.isoImage + diff --git a/pkgs/desktops/gnome-3/3.22/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/3.22/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch new file mode 100644 index 000000000000..c229cc96094f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch @@ -0,0 +1,39 @@ +diff --git a/configure.ac b/configure.ac +index 8a94642..1ca6426 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS) + GLIB_REQUIRED=2.38.0 + GTK_REQUIRED=3.12.2 + GEE_REQUIRED=0.10.5 +-ECAL_REQUIRED=3.8.5 ++ECAL_REQUIRED=3.13.90 + LIBSOUP_REQUIRED=2.44 + GDATA_REQUIRED=0.14.0 + GOA_REQUIRED=3.8.3 +diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala +index ee6a572..5009b5d 100644 +--- a/src/backing/eds/backing-eds-calendar-source.vala ++++ b/src/backing/eds/backing-eds-calendar-source.vala +@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource { + + // Invoked by EdsStore prior to making it available outside of unit + internal async void open_async(Cancellable? cancellable) throws Error { +- client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, ++ client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1, + cancellable); + + client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE); +diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi +index 6ead3ec..46fd711 100644 +--- a/vapi/libecal-1.2.vapi ++++ b/vapi/libecal-1.2.vapi +@@ -23,7 +23,7 @@ namespace E { + public bool check_save_schedules (); + public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error; + [CCode (finish_name = "e_cal_client_connect_finish")] +- public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; ++ public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error; + public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; + [CCode (finish_name = "e_cal_client_create_object_finish")] + public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error; diff --git a/pkgs/desktops/gnome-3/3.22/misc/california/default.nix b/pkgs/desktops/gnome-3/3.22/misc/california/default.nix new file mode 100644 index 000000000000..ca0450dc7f94 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/california/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, makeWrapper +, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }: + +let + majorVersion = "0.4"; +in +stdenv.mkDerivation rec { + name = "california-${majorVersion}.0"; + + src = fetchurl { + url = "mirror://gnome/sources/california/${majorVersion}/${name}.tar.xz"; + sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ makeWrapper intltool pkgconfig vala_0_32 glib gtk3 gnome3.libgee + libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server + sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ]; + + preFixup = '' + wrapProgram "$out/bin/california" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share" + ''; + + enableParallelBuilding = true; + + # Apply fedoras patch to build with evolution-data-server >3.13 + patches = [ ./0002-Build-with-evolution-data-server-3.13.90.patch ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/California; + description = "Calendar application for GNOME 3"; + maintainers = with maintainers; [ pSub ]; + license = licenses.lgpl21; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix new file mode 100644 index 000000000000..9eb7e78d8d45 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32 +, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils +, libnotify, libcanberra_gtk3, libsecret, gmime +, libpthreadstubs, sqlite +, gnome3, librsvg, gnome_doc_utils, webkitgtk }: + +let + majorVersion = "0.11"; +in +stdenv.mkDerivation rec { + name = "geary-${majorVersion}.2"; + + src = fetchurl { + url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; + sha256 = "0ca6kdprhm8w990n6wgpvn0vzsdrnv9vjdm448pa8winspn217jw"; + }; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils + vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite + libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr + gdk_pixbuf librsvg gnome3.defaultIconTheme ]; + + 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; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Geary; + description = "Mail client for GNOME 3"; + maintainers = gnome3.maintainers; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix new file mode 100644 index 000000000000..7cea9cd8d150 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }: + +let + majorVersion = "0.10"; +in +stdenv.mkDerivation rec { + name = "gexiv2-${version}"; + version = "${majorVersion}.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz"; + sha256 = "390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988"; + }; + + 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; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gfbgraph/default.nix new file mode 100644 index 000000000000..46fa9bc39e5a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gfbgraph/default.nix @@ -0,0 +1,23 @@ +{ stdenv, intltool, fetchurl, pkgconfig, glib +, gnome3, libsoup, json_glib }: + +stdenv.mkDerivation rec { + name = "gfbgraph-0.2.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz"; + sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs"; + }; + + 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 = gnome3.maintainers; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix new file mode 100644 index 000000000000..8d9ee143ac2b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib +, json_glib, webkitgtk, wrapGAppsHook, libpeas, bash, gobjectIntrospection +, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret +, dconf}: + + +# TODO: icons and theme still does not work +# use packaged gnome3.adwaita-icon-theme + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + 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_0_32 intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas + libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview + librsvg libsecret dconf + gobjectIntrospection gnome3.adwaita-icon-theme ]; + + nativeBuildInputs = [ wrapGAppsHook ]; + + # https://bugzilla.gnome.org/show_bug.cgi?id=758240 + preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Apps/Gitg; + description = "GNOME GUI client to view git repositories"; + maintainers = with maintainers; [ domenkozar ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix new file mode 100644 index 000000000000..bc9e517aceb8 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gitg-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gitg/3.22/gitg-3.22.0.tar.xz; + sha256 = "ba6895f85c18748294075980a5e03e0936ad4e84534dbb0d8f9e29aa874ddeaf"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/default.nix new file mode 100644 index 000000000000..3a35a87ceafc --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, gnome3 +, gtk3, glib, gobjectIntrospection, libarchive +}: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk3 glib ]; + propagatedBuildInputs = [ libarchive gobjectIntrospection ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + license = licenses.lgpl21; + description = "Library to integrate compressed files management with GNOME"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix new file mode 100644 index 000000000000..c9f10fa8cd7f --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix @@ -0,0 +1,12 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: rec { + pname = "gnome-autoar"; + version = "0.1"; + name = "${pname}-${version}.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz"; + sha256 = "f65cb810b562dc038ced739fbf59739fd5df1a8e848636e21f363ded9f349ac9"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/default.nix new file mode 100644 index 000000000000..ee3dd60e59ad --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnome3, libxslt, packagekit +, fontconfig, libcanberra_gtk3, libnotify, wrapGAppsHook, dbus_glib, dbus_libs }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; + + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + buildInputs = [ libxslt gnome3.gtk packagekit fontconfig + libcanberra_gtk3 libnotify dbus_glib dbus_libs ]; + + meta = with stdenv.lib; { + homepage = https://www.freedesktop.org/software/PackageKit/; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + description = "Tools for installing software on the GNOME desktop using PackageKit"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix new file mode 100644 index 000000000000..8937b7dd1a79 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-packagekit-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-packagekit/3.22/gnome-packagekit-3.22.0.tar.xz; + sha256 = "0b28d4928f9767a512723b49656266aaa2a7909d880e5e4238c0e3436ac4908c"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch new file mode 100644 index 000000000000..7a16d2c24e56 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch @@ -0,0 +1,120 @@ +From bdbbe312e6520ce70e91319162e85367a69ce044 Mon Sep 17 00:00:00 2001 +From: Jascha Geerds +Date: Sat, 1 Aug 2015 21:01:11 +0200 +Subject: [PATCH 1/3] Search for themes and icons in system data dirs + +--- + gtweak/tweaks/tweak_group_interface.py | 17 ++++------------- + gtweak/tweaks/tweak_group_keymouse.py | 7 ++----- + gtweak/utils.py | 17 +++++++++++++++++ + 3 files changed, 23 insertions(+), 18 deletions(-) + +Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py +=================================================================== +--- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py ++++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py +@@ -26,7 +26,7 @@ from gi.repository import Gtk + from gi.repository import GLib + + import gtweak +-from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file ++from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs + from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE + from gtweak.gshellwrapper import GnomeShellFactory + from gtweak.gsettings import GSettingsSetting +@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTwe + if gtk_ver % 2: # Want even number + gtk_ver += 1 + +- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), +- os.path.join(GLib.get_user_data_dir(), "themes"), +- os.path.join(os.path.expanduser("~"), ".themes")) +- valid = walk_directories(dirs, lambda d: ++ valid = walk_directories(get_resource_dirs("themes"), lambda d: + os.path.exists(os.path.join(d, "gtk-2.0")) and \ + (os.path.exists(os.path.join(d, "gtk-3.0")) or \ + os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver))))) +@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTw + **options) + + def _get_valid_icon_themes(self): +- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), +- os.path.join(GLib.get_user_data_dir(), "icons"), +- os.path.join(os.path.expanduser("~"), ".icons")) +- valid = walk_directories(dirs, lambda d: ++ valid = walk_directories(get_resource_dirs("icons"), lambda d: + os.path.isdir(d) and \ + os.path.exists(os.path.join(d, "index.theme"))) + return valid +@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsCombo + **options) + + def _get_valid_cursor_themes(self): +- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), +- os.path.join(GLib.get_user_data_dir(), "icons"), +- os.path.join(os.path.expanduser("~"), ".icons")) +- valid = walk_directories(dirs, lambda d: ++ valid = walk_directories(get_resource_dirs("icons"), lambda d: + os.path.isdir(d) and \ + os.path.exists(os.path.join(d, "cursors"))) + return valid +Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py +=================================================================== +--- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py ++++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py +@@ -20,7 +20,7 @@ import os.path + from gi.repository import GLib + + import gtweak +-from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default ++from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs + from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak + + class PrimaryPasteTweak(GetterSetterSwitchTweak): +@@ -48,10 +48,7 @@ class KeyThemeSwitcher(GSettingsComboTwe + **options) + + def _get_valid_key_themes(self): +- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), +- os.path.join(GLib.get_user_data_dir(), "themes"), +- os.path.join(os.path.expanduser("~"), ".themes")) +- valid = walk_directories(dirs, lambda d: ++ valid = walk_directories(get_resource_dirs("themes"), lambda d: + os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ + os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) + return valid +Index: gnome-tweak-tool-3.20.1/gtweak/utils.py +=================================================================== +--- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py ++++ gnome-tweak-tool-3.20.1/gtweak/utils.py +@@ -21,6 +21,7 @@ import tempfile + import shutil + import subprocess + import glob ++import itertools + + import gtweak + from gtweak.gsettings import GSettingsSetting +@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, bl + stdout, stderr = p.communicate() + return stdout, stderr, p.returncode + ++def get_resource_dirs(resource): ++ """Returns a list of all known resource dirs for a given resource. ++ ++ :param str resource: ++ Name of the resource (e.g. "themes") ++ :return: ++ A list of resource dirs ++ """ ++ dirs = [os.path.join(dir, resource) ++ for dir in itertools.chain(GLib.get_system_data_dirs(), ++ (gtweak.DATA_DIR, ++ GLib.get_user_data_dir()))] ++ dirs += [os.path.join(os.path.expanduser("~"), ".{}".format(resource))] ++ ++ return [dir for dir in dirs if os.path.isdir(dir)] ++ + @singleton + class AutostartManager: + diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch new file mode 100644 index 000000000000..5ddc13949cba --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch @@ -0,0 +1,100 @@ +From 22b948c39b32fb45066c4f5a9f99082094fea3d1 Mon Sep 17 00:00:00 2001 +From: Jascha Geerds +Date: Sat, 1 Aug 2015 21:26:57 +0200 +Subject: [PATCH 2/3] Don't show multiple entries for a single theme + +--- + gtweak/tweaks/tweak_group_interface.py | 8 ++++---- + gtweak/tweaks/tweak_group_keymouse.py | 4 ++-- + gtweak/utils.py | 16 ++++++++++++++++ + 3 files changed, 22 insertions(+), 6 deletions(-) + +Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py +=================================================================== +--- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py ++++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py +@@ -26,7 +26,7 @@ from gi.repository import Gtk + from gi.repository import GLib + + import gtweak +-from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs ++from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources + from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE + from gtweak.gshellwrapper import GnomeShellFactory + from gtweak.gsettings import GSettingsSetting +@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTwe + os.path.exists(os.path.join(d, "gtk-2.0")) and \ + (os.path.exists(os.path.join(d, "gtk-3.0")) or \ + os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver))))) +- return valid ++ return get_unique_resources(valid) + + class IconThemeSwitcher(GSettingsComboTweak): + def __init__(self, **options): +@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTw + valid = walk_directories(get_resource_dirs("icons"), lambda d: + os.path.isdir(d) and \ + os.path.exists(os.path.join(d, "index.theme"))) +- return valid ++ return get_unique_resources(valid) + + class CursorThemeSwitcher(GSettingsComboTweak): + def __init__(self, **options): +@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsCombo + valid = walk_directories(get_resource_dirs("icons"), lambda d: + os.path.isdir(d) and \ + os.path.exists(os.path.join(d, "cursors"))) +- return valid ++ return get_unique_resources(valid) + + class ShellThemeTweak(Gtk.Box, Tweak): + +Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py +=================================================================== +--- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py ++++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py +@@ -20,7 +20,7 @@ import os.path + from gi.repository import GLib + + import gtweak +-from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs ++from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources + from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak + + class PrimaryPasteTweak(GetterSetterSwitchTweak): +@@ -51,7 +51,7 @@ class KeyThemeSwitcher(GSettingsComboTwe + valid = walk_directories(get_resource_dirs("themes"), lambda d: + os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ + os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) +- return valid ++ return get_unique_resources(valid) + + TWEAK_GROUPS = [ + ListBoxTweakGroup(_("Keyboard and Mouse"), +Index: gnome-tweak-tool-3.20.1/gtweak/utils.py +=================================================================== +--- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py ++++ gnome-tweak-tool-3.20.1/gtweak/utils.py +@@ -133,6 +133,22 @@ def get_resource_dirs(resource): + + return [dir for dir in dirs if os.path.isdir(dir)] + ++def get_unique_resources(dirs): ++ """Filter out duplicated resources. ++ ++ :param list dirs: ++ List of resource dirs (e.g. /usr/share/themes/Adwaita) ++ :return: ++ List of dirs without duplicated resources ++ """ ++ unique_dirs = {} ++ for dir in dirs: ++ basename = os.path.basename(dir) ++ if basename not in unique_dirs: ++ unique_dirs[basename] = dir ++ ++ return unique_dirs ++ + @singleton + class AutostartManager: + diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch new file mode 100644 index 000000000000..b25b2d6dc4aa --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch @@ -0,0 +1,29 @@ +From cdafa01dc90da486d0114b423e3e467f7b083d1b Mon Sep 17 00:00:00 2001 +From: Jascha Geerds +Date: Sun, 2 Aug 2015 12:01:20 +0200 +Subject: [PATCH 3/3] Create config dir if it doesn't exist + +Otherwise gnome-tweak-tool can't enable the dark theme and fails +without a clear error message. +--- + gtweak/gtksettings.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py +index bcec9f1..f39991b 100644 +--- a/gtweak/gtksettings.py ++++ b/gtweak/gtksettings.py +@@ -35,6 +35,10 @@ class GtkSettingsManager: + def _get_keyfile(self): + keyfile = None + try: ++ config_dir = os.path.dirname(self._path) ++ if not os.path.isdir(config_dir): ++ os.makedirs(config_dir) ++ + keyfile = GLib.KeyFile() + keyfile.load_from_file(self._path, 0) + except MemoryError: +-- +2.7.0 + diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix new file mode 100644 index 000000000000..e6c4b8c82027 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix @@ -0,0 +1,44 @@ +{ stdenv, intltool, fetchurl, atk +, pkgconfig, gtk3, glib, libsoup +, bash, makeWrapper, itstool, libxml2, python2Packages +, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: + +let + python = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); +in stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + 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.defaultIconTheme librsvg + libnotify gnome3.gnome_shell + libsoup gnome3.gnome_settings_daemon gnome3.nautilus + gnome3.gnome_desktop wrapGAppsHook ]; + + propagatedBuildInputs = [ python gobjectIntrospection ]; + + PYTHONPATH = "$out/${python.python.sitePackages}"; + + wrapPrefixVariables = [ "PYTHONPATH" ]; + + patches = [ + ./find_gsettings.patch + ./0001-Search-for-themes-and-icons-in-system-data-dirs.patch + ./0002-Don-t-show-multiple-entries-for-a-single-theme.patch + ./0003-Create-config-dir-if-it-doesn-t-exist.patch + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; + description = "A tool to customize advanced GNOME 3 options"; + maintainers = gnome3.maintainers; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/find_gsettings.patch new file mode 100644 index 000000000000..3e68c04cb3ab --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/find_gsettings.patch @@ -0,0 +1,22 @@ +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.22/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix new file mode 100644 index 000000000000..88f3b3069f19 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-tweak-tool-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-tweak-tool/3.22/gnome-tweak-tool-3.22.0.tar.xz; + sha256 = "3d6ae11e13f6169ee543e573135e1e5697cf92ab8d86570c6f952021ae093abb"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-video-effects/default.nix new file mode 100644 index 000000000000..c0bd2fed3f2d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-video-effects/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }: + +stdenv.mkDerivation rec { + name = "gnome-video-effects-${version}"; + version = "0.4.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz"; + sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil"; + }; + + buildInputs = [ pkgconfig intltool ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix new file mode 100644 index 000000000000..99766ad898e1 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala_0_32, glib +, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper, systemd, gobjectIntrospection }: + +stdenv.mkDerivation rec { + version = "3.20.4"; + name = "gpaste-${version}"; + + src = fetchurl { + url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; + sha256 = "08h1igdgapz7px12r7mrfcxmz68g9ijg73w69j75spg0yc6f4xax"; + }; + + buildInputs = [ intltool autoreconfHook pkgconfig vala_0_32 glib + gtk3 gnome3.gnome_control_center dbus + clutter pango appstream-glib makeWrapper systemd gobjectIntrospection ]; + + preConfigure = "intltoolize -f"; + + configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings" + "--with-dbusservicesdir=$(out)/share/dbus-1/services" + "--with-systemduserunitdir=$(out)/etc/systemd/user" ]; + + 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; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix new file mode 100644 index 000000000000..fbb95efb27ac --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix @@ -0,0 +1,11 @@ +{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig glib gtk3 enchant isocodes ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix new file mode 100644 index 000000000000..248e39151524 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix @@ -0,0 +1,10 @@ +fetchurl: rec { + major = "1.0"; + minor = "3"; + name = "gspell-${major}.${minor}"; + + src = fetchurl { + url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz"; + sha256 = "1m8v4rqaxjsblccc3nnirkbkzgqm90vfpzp3x08lkqriqvk0anfr"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/default.nix new file mode 100644 index 000000000000..89703b61932b --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, intltool +, gnome3, enchant, isocodes }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme + gnome3.gsettings_desktop_schemas ]; + + propagatedBuildInputs = [ enchant isocodes ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix new file mode 100644 index 000000000000..21876ec9c399 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gtkhtml-4.10.0"; + + src = fetchurl { + url = mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz; + sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix new file mode 100644 index 000000000000..06937c74c65a --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool }: + +let + major = "1"; + minor = "0"; +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "libgames-support-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/libgames-support/${version}/${name}.tar.xz"; + sha256 = "02qn009m1i07nh8wnyrrjf7kbbapk814ap5pvin5ka5sj996cyqq"; + }; + + buildInputs = [ pkgconfig glib gtk3 libgee intltool ]; + + meta = with stdenv.lib; { + description = "Small library intended for internal use by GNOME Games, but it may be used by others"; + homepage = https://github.com/GNOME/libgames-support; + license = licenses.gpl3; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix new file mode 100644 index 000000000000..2e5b0a4af840 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + configureFlags = [ + "--enable-gi-system-install=no" + ]; + + enableParallelBuilding = true; + + hardeningDisable = [ "format" ]; + + buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 openssl ]; + + 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.22/misc/libgda/src.nix b/pkgs/desktops/gnome-3/3.22/misc/libgda/src.nix new file mode 100644 index 000000000000..8812ccc8ccd9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/libgda/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "libgda-5.2.4"; + + src = fetchurl { + url = mirror://gnome/sources/libgda/5.2/libgda-5.2.4.tar.xz; + sha256 = "2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/default.nix new file mode 100644 index 000000000000..6915ede4ad51 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala_0_32, libssh2 +, gtk_doc, gobjectIntrospection, libgit2, glib }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ gnome3.gnome_common libtool pkgconfig vala_0_32 libssh2 + gtk_doc gobjectIntrospection libgit2 glib ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix new file mode 100644 index 000000000000..6922a7aee1bc --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix @@ -0,0 +1,12 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: rec { + major = "0.24"; + minor = "4"; + name = "libgit2-glib-${major}.${minor}"; + + src = fetchurl { + url = "mirror://gnome/sources/libgit2-glib/${major}/${name}.tar.xz"; + sha256 = "0802qskm64l5ic8rvfjxg27chj502irhw1xkabrl4015dxsiy89s"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix new file mode 100644 index 000000000000..b86480125730 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection, gnome3 }: + +let + majorVersion = "1.9"; +in +stdenv.mkDerivation rec { + name = "libmediaart-${majorVersion}.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz"; + sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll"; + }; + + buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ]; + + meta = with stdenv.lib; { + description = "Library tasked with managing, extracting and handling media art caches"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix new file mode 100644 index 000000000000..e3f6bca10a4d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, glib }: + +stdenv.mkDerivation rec { + version = "1.0.1"; + basename = "pidgin-im-gnome-shell-extension"; + name = "${basename}-${version}"; + + src = fetchFromGitHub { + owner = "muffinmad"; + repo = "${basename}"; + rev = "v${version}"; + sha256 = "1567s2sfqig4jw0nrn134f5vkx0yq31q044grv3xk4vpl1f3z2lr"; + }; + + buildInputs = [ glib ]; + + configurePhase = ""; + buildPhase = ""; + installPhase = '' + share_dir="$prefix/share" + extensions_dir="$share_dir/gnome-shell/extensions/pidgin@muffinmad" + mkdir -p "$extensions_dir" + mv *.js metadata.json dbus.xml gnome-shell-extension-pidgin.pot "$extensions_dir" + + schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas" + mkdir -p "$schemas_dir" + mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */ + ${glib.dev}/bin/glib-compile-schemas "$schemas_dir" + + locale_dir="$share_dir/locale" + mkdir -p "$locale_dir" + mv locale/* $locale_dir # fix Emacs syntax highlighting: */ + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/muffinmad/pidgin-im-gnome-shell-extension; + description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ DamienCassou ]; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix new file mode 100644 index 000000000000..1c7f712b12c5 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, + dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base, + glib, gobjectIntrospection, telepathy_glib +}: + +stdenv.mkDerivation rec { + version = "0.11.2"; + name = "gnome-shell-pomodoro-${version}"; + + src = fetchFromGitHub { + owner = "codito"; + repo = "gnome-pomodoro"; + rev = "${version}"; + sha256 = "0x656drq8vnvdj1x6ghnglgpa0z8yd2yj9dh5iqprwjv0z3qkw4l"; + }; + + configureScript = ''./autogen.sh''; + + buildInputs = [ + which automake113x intltool glib gobjectIntrospection pkgconfig libtool + makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gnome3.gsettings_desktop_schemas gnome3.gnome_desktop + gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib + gnome3.defaultIconTheme + ]; + + preBuild = '' + sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \ + 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 = "A time management utility for GNOME based on the pomodoro technique"; + longDescription = '' + This GNOME utility helps to manage time according to Pomodoro Technique. + It intends to improve productivity and focus by taking short breaks. + ''; + maintainers = with maintainers; [ DamienCassou jgeerds ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6b8c5ec3e30..90496d6088ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15924,6 +15924,8 @@ in gnome3_20 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.20 { }); + gnome3_22 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.22 { }); + gnome3 = gnome3_20; hsetroot = callPackage ../tools/X11/hsetroot { }; -- cgit 1.4.1 From f1df7f2cbf18c967cb911af8ec30120bf59c738f Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 29 Sep 2016 14:19:23 +0200 Subject: gnome3_22.vte-select-text: remove --- pkgs/desktops/gnome-3/3.22/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix index d24ad136fff8..3ebd964ab0ec 100644 --- a/pkgs/desktops/gnome-3/3.22/default.nix +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -234,8 +234,6 @@ let vte_290 = callPackage ./core/vte/2.90.nix { }; - vte-select-text = vte.override { selectTextPatch = true; }; - vino = callPackage ./core/vino { }; yelp = callPackage ./core/yelp { }; -- cgit 1.4.1 From e4f816602c7a60392a8d73dc218aca3238acb739 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 29 Sep 2016 14:20:14 +0200 Subject: gnome3_22.vte: remove selectTextPatch --- pkgs/desktops/gnome-3/3.22/core/vte/default.nix | 27 ++++--------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix index 80699e212890..50aef658713a 100644 --- a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/vte/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, intltool, pkgconfig , gnome3, ncurses, gobjectIntrospection, vala_0_32, libxml2, gnutls - -, selectTextPatch ? false -, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf +, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf, pcre2 }: -let baseAttrs = rec { +stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses vala_0_32 libxml2 ]; - propagatedBuildInputs = [ gnutls ]; + propagatedBuildInputs = [ gnutls pcre2 ]; preConfigure = "patchShebangs ."; @@ -34,22 +32,5 @@ let baseAttrs = rec { maintainers = with maintainers; [ astsmtl antono lethalman ]; platforms = platforms.linux; }; -}; - -in stdenv.mkDerivation ( baseAttrs - // stdenv.lib.optionalAttrs selectTextPatch rec { - name = "vte-ng-${version}"; - version = "0.42.4.a"; - src = fetchFromGitHub { - owner = "thestinger"; - repo = "vte-ng"; - rev = version; - sha256 = "1w91lz30j5lrskp9ds5j3nn27m5mpdpn7nlcvf5y1w63mpmjg8k1"; - }; - # slightly hacky; I couldn't make it work with autoreconfHook - configureScript = "./autogen.sh"; - nativeBuildInputs = (baseAttrs.nativeBuildInputs or []) - ++ [ gtk_doc autoconf automake libtool gperf ]; - } -) +} -- cgit 1.4.1 From b64845dde72b6c8b31d7d3124cb17efd8ef0f96f Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 29 Sep 2016 14:20:37 +0200 Subject: gnome3_22.vte: 0.44.2 -> 0.46.0 --- pkgs/desktops/gnome-3/3.22/core/vte/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/src.nix b/pkgs/desktops/gnome-3/3.22/core/vte/src.nix index 99b7b621bf7d..d80749a2566a 100644 --- a/pkgs/desktops/gnome-3/3.22/core/vte/src.nix +++ b/pkgs/desktops/gnome-3/3.22/core/vte/src.nix @@ -1,11 +1,11 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: rec { - name = "vte-${major}.2"; - major = "0.44"; + name = "vte-${major}.0"; + major = "0.46"; src = fetchurl { url = "mirror://gnome/sources/vte/${major}/${name}.tar.xz"; - sha256 = "a1ea594814bb136a3a9a6c7656b46240571f6a198825c1111007fe99194b0949"; + sha256 = "5f7122e7860eb2470d310fc63df91d3ee32bab233729c2dc181a0cbc9b3249d7"; }; } -- cgit 1.4.1 From 2fdecef1e2a716eca279875602e7c6c06033d341 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 29 Sep 2016 14:12:30 +0200 Subject: gnome3_22.vte_290: remove --- pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix | 40 ---------------------------- pkgs/desktops/gnome-3/3.22/default.nix | 2 -- 2 files changed, 42 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix deleted file mode 100644 index cbb52c9aaa12..000000000000 --- a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }: - -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"; - }; - - 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.out}/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.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix index 3ebd964ab0ec..926694f48d40 100644 --- a/pkgs/desktops/gnome-3/3.22/default.nix +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -232,8 +232,6 @@ let vte = callPackage ./core/vte { }; - vte_290 = callPackage ./core/vte/2.90.nix { }; - vino = callPackage ./core/vino { }; yelp = callPackage ./core/yelp { }; -- cgit 1.4.1 From 6457d1bbe3dbabef87202324c6a31ceb815a7080 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Fri, 30 Sep 2016 17:02:52 +0200 Subject: gnome3.gnome-terminal-server: init module since gnome3.22 gnome-terminal uses a systemd service for it's backend server. --- nixos/modules/module-list.nix | 1 + .../desktops/gnome3/gnome-terminal-server.nix | 44 ++++++++++++++++++++++ .../services/x11/desktop-managers/gnome3.nix | 1 + 3 files changed, 46 insertions(+) create mode 100644 nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bf7d6408df88..09b938a69feb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -166,6 +166,7 @@ ./services/desktops/gnome3/gnome-keyring.nix ./services/desktops/gnome3/gnome-online-accounts.nix ./services/desktops/gnome3/gnome-online-miners.nix + ./services/desktops/gnome3/gnome-terminal-server.nix ./services/desktops/gnome3/gnome-user-share.nix ./services/desktops/gnome3/gvfs.nix ./services/desktops/gnome3/seahorse.nix diff --git a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix new file mode 100644 index 000000000000..384cede679c6 --- /dev/null +++ b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix @@ -0,0 +1,44 @@ +# GNOME Documents daemon. + +{ config, pkgs, lib, ... }: + +with lib; + +let + gnome3 = config.environment.gnome3.packageSet; +in +{ + + ###### interface + + options = { + + services.gnome3.gnome-terminal-server = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable GNOME Terminal server service, + needed for gnome-terminal. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf config.services.gnome3.gnome-terminal-server.enable { + + environment.systemPackages = [ gnome3.gnome_terminal ]; + + services.dbus.packages = [ gnome3.gnome_terminal ]; + + systemd.packages = [ gnome3.gnome_terminal ]; + + }; + +} diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index dc71531759b8..57c76b491fa5 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -108,6 +108,7 @@ in { services.gnome3.gnome-documents.enable = mkDefault true; services.gnome3.gnome-keyring.enable = true; services.gnome3.gnome-online-accounts.enable = mkDefault true; + services.gnome3.gnome-terminal-server.enable = mkDefault true; services.gnome3.gnome-user-share.enable = mkDefault true; services.gnome3.gvfs.enable = true; services.gnome3.seahorse.enable = mkDefault true; -- cgit 1.4.1 From 47dc33ded2e9026bf4539dd9b4d427428217fd1c Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Fri, 30 Sep 2016 21:15:05 +0200 Subject: gnome3.evolution-data-server module: add self to systemd path --- nixos/modules/services/desktops/gnome3/evolution-data-server.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix index a8f8da0eed56..2db2e2fe1c34 100644 --- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix +++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix @@ -37,6 +37,8 @@ in services.dbus.packages = [ gnome3.evolution_data_server ]; + systemd.packages = [ gnome3.evolution_data_server ]; + }; } -- cgit 1.4.1 From 38212f6a0f2338861e45b22d50544546a6a45fe4 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 1 Oct 2016 00:11:43 +0200 Subject: gnome3.tracker module: add self to systemd path fixes GDBus.Error:org.freedesktop.systemd1.NoSuchUnit: Unit tracker-store.service not found. - indexing for (null) will not work --- nixos/modules/services/desktops/gnome3/tracker.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome3/tracker.nix index 8c5935a5ee3c..dcaa60103a3b 100644 --- a/nixos/modules/services/desktops/gnome3/tracker.nix +++ b/nixos/modules/services/desktops/gnome3/tracker.nix @@ -37,6 +37,8 @@ in services.dbus.packages = [ gnome3.tracker ]; + systemd.packages = [ gnome3.tracker ]; + }; } -- cgit 1.4.1 From e8ade4ff789d66245255c6951b8f2674c537d929 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 1 Oct 2016 00:59:12 +0200 Subject: gnome3.gvfs module: make systemd services available --- nixos/modules/services/desktops/gnome3/gvfs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/desktops/gnome3/gvfs.nix b/nixos/modules/services/desktops/gnome3/gvfs.nix index a07cdadbb12b..6bbabe8d3c56 100644 --- a/nixos/modules/services/desktops/gnome3/gvfs.nix +++ b/nixos/modules/services/desktops/gnome3/gvfs.nix @@ -37,6 +37,8 @@ in services.dbus.packages = [ gnome3.gvfs ]; + systemd.packages = [ gnome3.gvfs ]; + services.udev.packages = [ pkgs.libmtp.bin ]; }; -- cgit 1.4.1 From 76fa7d1c39ed7cb5b40ef498d4c07d89d4ccee0b Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 1 Oct 2016 11:19:20 +0200 Subject: gnome3_22.gnome-terminal: substitute gnome-shell dbus file path instead of copying the file. this avoids name conflicts after the build. Alternatively we could remove the file after building. --- pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix index beb019947ce2..6bf920b3e1c7 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { # Silly ./configure, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. - preConfigure = '' - mkdir -p "$out/share/dbus-1/interfaces" - cp "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" "$out/share/dbus-1/interfaces" + postPatch = '' + substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" ''; # FIXME: enable for gnome3 -- cgit 1.4.1 From 50adbbe65c735aaf3f09e4c7e1c0c48475b7dfdc Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 1 Oct 2016 23:47:56 +0200 Subject: displayManager.gdm: only gnome-session needs to be on path --- nixos/modules/services/x11/display-managers/gdm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 52847d2f8d2c..9d1a62df3496 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -108,7 +108,7 @@ in systemd.services.display-manager.wants = [ "systemd-machined.service" ]; systemd.services.display-manager.after = [ "systemd-machined.service" ]; - systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xorg.xhost pkgs.dbus_tools ]; + systemd.services.display-manager.path = [ gnome3.gnome_session ]; services.dbus.packages = [ gdm ]; -- cgit 1.4.1 From 709772b4b8f34a9b93e180a16db9350432cc1fb1 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 1 Oct 2016 23:48:15 +0200 Subject: gnome3_22.mutter: add path to xwayland --- pkgs/desktops/gnome-3/3.22/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix index 546c140c4edb..a1dade42e8d4 100644 --- a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo , pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libudev, libinput -, libgudev }: +, libgudev, xwayland }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { # fatal error: gio/gunixfdlist.h: No such file or directory NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; + configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland"; buildInputs = with gnome3; [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower -- cgit 1.4.1 From f5b13e58ac551c61fedca69e6b2a6e7b7cc63f33 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 1 Oct 2016 23:56:33 +0200 Subject: gnome3_22.mutter: enable parallel build --- pkgs/desktops/gnome-3/3.22/core/mutter/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix index a1dade42e8d4..9fad1873fbd6 100644 --- a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { #./x86.patch ./math.patch ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; -- cgit 1.4.1 From f88ea3c3dc8102c52689181e21215f99babb06a1 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sat, 1 Oct 2016 23:57:51 +0200 Subject: gnome3_22.gnome-shell: enable parallel build --- pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix index 3a19ee41f4cd..dccdb8a5a5f8 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path ''; + enableParallelBuilding = true; + passthru = { mozillaPlugin = "/lib/mozilla/plugins"; }; -- cgit 1.4.1 From 7ad7efb7ee22fbaaecb3973b57ee7d5eaef6a44a Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sun, 2 Oct 2016 00:04:58 +0200 Subject: gnome3_22.gnome-terminal: enable parallel build --- pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix index 6bf920b3e1c7..073a791ac3c8 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { # FIXME: enable for gnome3 configureFlags = [ "--disable-migration" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "The GNOME Terminal Emulator"; homepage = https://wiki.gnome.org/Apps/Terminal/; -- cgit 1.4.1 From ab7b779cc2d81b465f47619b5f596faee8f61faf Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sun, 2 Oct 2016 00:35:13 +0200 Subject: gnome3_22.gdm: enable parallel build --- pkgs/desktops/gnome-3/3.22/core/gdm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix index 3a440232a48f..34f8a4bc1cca 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool plymouth ]; - #enableParallelBuilding = true; # problems compiling + enableParallelBuilding = true; # Disable Access Control because our X does not support FamilyServerInterpreted yet patches = [ #./xserver_path.patch # gdm now uses wayland -- cgit 1.4.1 From 3acee13364ebb9bbfeff0478cc4a754955210790 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sun, 2 Oct 2016 18:38:12 +0200 Subject: gnome3_22.gnome-session: add path to org.gnome.Shell.desktop --- pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix index d25bf6b54bab..2e94f5d8581e 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/gnome-session" \ --prefix PATH : "${glib.dev}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" + --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : "${gnome3.gnome_shell}/share" ''; meta = with stdenv.lib; { -- cgit 1.4.1 From 5125161a77a56b8524c24f63d70788f06038cf71 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Sun, 2 Oct 2016 19:00:23 +0200 Subject: gnome3_22.gnome-session: lookup of gnome-settings-daemon.desktop --- nixos/modules/services/x11/display-managers/gdm.nix | 1 - pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix | 3 ++- pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 9d1a62df3496..77e0d9cb06de 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -97,7 +97,6 @@ in environment = { GDM_X_SERVER = "${cfg.xserverBin} ${cfg.xserverArgs}"; GDM_SESSIONS_DIR = "${cfg.session.desktops}"; - XDG_CONFIG_DIRS = "${gnome3.gnome_settings_daemon}/etc/xdg"; # Find the mouse XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons"; }; diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix index 2e94f5d8581e..135e833e9b46 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { --prefix PATH : "${glib.dev}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome3.gnome_shell}/share" + --suffix XDG_DATA_DIRS : "${gnome3.gnome_shell}/share" \ + --suffix XDG_CONFIG_DIRS : "${gnome3.gnome_settings_daemon}/etc/xdg" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix index 2f51773049d5..00999353c2fb 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix PATH : "${glib.dev}/bin" \ --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - mkdir -p "$out/share/gnome/autostart" - cp "$out/etc/xdg/autostart/gnome-settings-daemon.desktop" "$out/share/gnome/autostart" ''; meta = with stdenv.lib; { -- cgit 1.4.1 From a5aa9269027d638b80fe1f23bcf8887ca80d034b Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 3 Oct 2016 18:22:53 +0200 Subject: gdm module: only make xserver args overrideable --- nixos/modules/services/x11/display-managers/gdm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 77e0d9cb06de..8ae5a096bcbe 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -95,7 +95,7 @@ in services.xserver.displayManager.job = { environment = { - GDM_X_SERVER = "${cfg.xserverBin} ${cfg.xserverArgs}"; + GDM_X_SERVER_EXTRA_ARGS = "${cfg.xserverArgs}"; GDM_SESSIONS_DIR = "${cfg.session.desktops}"; # Find the mouse XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons"; -- cgit 1.4.1 From 56d24b8e1dbba112288308268a384c1e7f363027 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 3 Oct 2016 17:11:24 +0200 Subject: gdm module: enable user dbus session --- nixos/modules/services/x11/display-managers/gdm.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 8ae5a096bcbe..d3aa63fd4284 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -111,6 +111,8 @@ in services.dbus.packages = [ gdm ]; + systemd.user.services.dbus.wantedBy = [ "default.target" ]; + programs.dconf.profiles.gdm = "${gdm}/share/dconf/profile/gdm"; # Use AutomaticLogin if delay is zero, because it's immediate. -- cgit 1.4.1 From a1a364102a872325638ecc0c5ba570f9b5bde86c Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 3 Oct 2016 00:09:28 +0200 Subject: patch gnome-session path in desktop file --- pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix index 135e833e9b46..8dec630354ce 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { # FIXME: glib binaries shouldn't be in .dev! preFixup = '' + for desktopFile in $(grep -rl "Exec=gnome-session" $out/share) + do + echo "Patching gnome-session path in: $desktopFile" + sed -i "s,^Exec=gnome-session,Exec=$out/bin/gnome-session," $desktopFile + done wrapProgram "$out/bin/gnome-session" \ --prefix PATH : "${glib.dev}/bin" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ -- cgit 1.4.1 From 8ec776eb73ae772da60bd01b172789835dfb3cd5 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 3 Oct 2016 00:41:37 +0200 Subject: gnome-session: enable debug --- pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix index 8dec630354ce..2f4aefe69a8e 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { for desktopFile in $(grep -rl "Exec=gnome-session" $out/share) do echo "Patching gnome-session path in: $desktopFile" - sed -i "s,^Exec=gnome-session,Exec=$out/bin/gnome-session," $desktopFile + sed -i "s,^Exec=gnome-session,Exec=$out/bin/gnome-session --debug," $desktopFile done wrapProgram "$out/bin/gnome-session" \ --prefix PATH : "${glib.dev}/bin" \ -- cgit 1.4.1 From c2922a9157a8d8db62cee763e254113c3766461e Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 3 Oct 2016 17:04:29 +0200 Subject: xserverArgs fuckup gnome-x-session provides good defaults which we really should not override. We have to add assertions to gdm.nix if the user specified one of those. enableTCP must be configured through a gnome setting dunno why we have terminate but it probably breaks stuff We should expose configFile so we can use it from gdm module. --- nixos/modules/services/x11/xserver.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index e34f0c216639..298f30858cef 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -546,18 +546,19 @@ in }; }; - services.xserver.displayManager.xserverArgs = - [ "-terminate" + services.xserver.displayManager.xserverArgs = mkDefault ( + [ #"-terminate" "-config ${configFile}" "-xkbdir" "${cfg.xkbDir}" # Log at the default verbosity level to stderr rather than /var/log/X.*.log. - "-verbose" "3" "-logfile" "/dev/null" - ] ++ optional (cfg.display != null) ":${toString cfg.display}" - ++ optional (cfg.tty != null) "vt${toString cfg.tty}" + #"-verbose" "3" "-logfile" "/dev/null" + ] #++ optional (cfg.display != null) ":${toString cfg.display}" + #++ optional (cfg.tty != null) "vt${toString cfg.tty}" ++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}" - ++ optional (!cfg.enableTCP) "-nolisten tcp" + #++ optional (!cfg.enableTCP) "-nolisten tcp"); ++ optional (cfg.autoRepeatDelay != null) "-ardelay ${toString cfg.autoRepeatDelay}" - ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}"; + ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}" +); services.xserver.modules = concatLists (catAttrs "modules" cfg.drivers) ++ -- cgit 1.4.1 From 47f597b9b06b702504f9b05d6f28690ddbf38f8a Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 3 Oct 2016 19:08:07 +0200 Subject: gnome-themes-standard: -> 3.22.1 --- pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix index 8388bd612213..a5ccd23b9fc8 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gnome-themes-standard-3.20.2"; + name = "gnome-themes-standard-3.22.1"; src = fetchurl { - url = mirror://gnome/sources/gnome-themes-standard/3.20/gnome-themes-standard-3.20.2.tar.xz; - sha256 = "9d0d9c4b2c9f9008301c3c1878ebb95859a735b7fd4a6a518802b9637e4a7915"; + url = mirror://gnome/sources/gnome-themes-standard/3.22/gnome-themes-standard-3.22.1.tar.xz; + sha256 = "90f6f4e79eaa42e424fa35144cdbcb5db93db56e73200ac045742ba320febb54"; }; } -- cgit 1.4.1 From 878d5ea1526c2f7cae0a0d8713e4ac7759477329 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 3 Oct 2016 19:44:10 +0200 Subject: gdm: does not understand with-systemd --- pkgs/desktops/gnome-3/3.22/core/gdm/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix index 34f8a4bc1cca..9a11ca82bba6 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - "--with-systemd=yes" "--with-plymouth=yes" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; -- cgit 1.4.1 From 95fb1897480922e5cb9401ae9893dd595905ec60 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 3 Oct 2016 19:45:11 +0200 Subject: gdm: remove broken postinstall --- pkgs/desktops/gnome-3/3.22/core/gdm/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix index 9a11ca82bba6..7ba3c3734f84 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix @@ -33,10 +33,6 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ]; - postInstall = '' - mv $out/share/gdm/greeter/applications/gnome-shell.desktop $out/share/gdm/greeter/applications/org.gnome.Shell.desktop - ''; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GDM; description = "A program that manages graphical display servers and handles graphical user logins"; -- cgit 1.4.1 From e667a3ab748e645f337a1ab5c274de59ba07d88d Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 3 Oct 2016 22:04:02 +0200 Subject: evolutiondataserver parallel building --- pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix index 6b13b726296e..b67795ea59c1 100644 --- a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-uoa" "--disable-google-auth" ] ++ stdenv.lib.optional valaSupport "--enable-vala-bindings"; + enableParallelBuilding = true; + preFixup = '' for f in "$out/libexec/"*; do wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" -- cgit 1.4.1 From bccc55c61220acab54ed032d6dc0b28adb175aa9 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 3 Oct 2016 22:21:13 +0200 Subject: nspr fix --- pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix | 2 +- pkgs/desktops/gnome-3/3.22/core/folks/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix index f29ee583db6a..e38d075befcf 100644 --- a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ]; - NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.22/core/folks/default.nix b/pkgs/desktops/gnome-3/3.22/core/folks/default.nix index 790cf7959ce5..f5d67e4dae80 100644 --- a/pkgs/desktops/gnome-3/3.22/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/folks/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-fatal-warnings"; - NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss" + NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss" "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; enableParallelBuilding = true; -- cgit 1.4.1 From 11c259bf945db637ce1cde0431d29342ccbb97c8 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 3 Oct 2016 22:24:47 +0200 Subject: folks: -> 0.11.3 --- pkgs/desktops/gnome-3/3.22/core/folks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/folks/default.nix b/pkgs/desktops/gnome-3/3.22/core/folks/default.nix index f5d67e4dae80..171ad0774500 100644 --- a/pkgs/desktops/gnome-3/3.22/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/folks/default.nix @@ -8,11 +8,11 @@ let majorVersion = "0.11"; in stdenv.mkDerivation rec { - name = "folks-${majorVersion}.2"; + name = "folks-${majorVersion}.3"; src = fetchurl { url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz"; - sha256 = "0q9hny6a38zn0gamv0ji0pn3jw6bpn2i0fr6vbzkhm9h9ws0cqvz"; + sha256 = "2a2828a7c87fd39e5786f8f2cf0ebe47576a74974f1355c478a6dc747d7bcb64"; }; propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; -- cgit 1.4.1 From a40f20f8d47ee8f09914fc926d1ad7c45a3d6779 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 3 Oct 2016 22:26:30 +0200 Subject: libgdata: 0.17.4 -> 0.17.6 --- pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix index e455be07bdf9..08f05bcaedc1 100644 --- a/pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix @@ -5,11 +5,11 @@ let majorVersion = "0.17"; in stdenv.mkDerivation rec { - name = "libgdata-${majorVersion}.4"; + name = "libgdata-${majorVersion}.6"; src = fetchurl { url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz"; - sha256 = "1xniw4y90hbk9fa548pa9pfclibw7amr2f458lfh16jdzq7gw5cz"; + sha256 = "8b6a3ff1db23bd9e5ebbcc958b29b769a898f892eed4798222d562ba69df30b0"; }; NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; -- cgit 1.4.1 From 4094d63dea7fafb8529ceaaa195f8e81e5dbe8a3 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 25 Aug 2016 21:58:56 +0200 Subject: NetworkManager-strongswan: init at 1.4.0 --- .../modules/services/networking/networkmanager.nix | 3 ++ .../networking/network-manager/strongswan.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/tools/networking/network-manager/strongswan.nix diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 65ffaece4772..8f353979d3fc 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -198,6 +198,9 @@ in { { source = "${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; target = "NetworkManager/VPN/nm-l2tp-service.name"; } + { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name"; + target = "NetworkManager/VPN/nm-strongswan-service.name"; + } ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) { source = overrideNameserversScript; target = "NetworkManager/dispatcher.d/02overridedns"; diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix new file mode 100644 index 000000000000..9e0033cca90c --- /dev/null +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, procps +, gnome3, libgnome_keyring, libsecret }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "NetworkManager-strongswan"; + version = "1.4.0"; + + src = fetchurl { + url = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2"; + sha256 = "0qfnylg949lkyw1nmyggz2ipgmy154ic5q5ljjcwcgi14r90ys02"; + }; + + postPatch = '' + sed -i "s,nm_plugindir=.*,nm_plugindir=$out/lib/NetworkManager," "configure" + sed -i "s,nm_libexecdir=.*,nm_libexecdir=$out/libexec," "configure" + ''; + + buildInputs = [ networkmanager libsecret ] + ++ (with gnome3; [ gtk libgnome_keyring networkmanagerapplet ]); + + nativeBuildInputs = [ intltool pkgconfig ]; + + preConfigure = '' + substituteInPlace "configure" \ + --replace "/sbin/sysctl" "${procps}/bin/sysctl" + ''; + + meta = { + description = "NetworkManager's strongswan plugin"; + inherit (networkmanager.meta) platforms; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90496d6088ef..bb151fe41d83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2832,6 +2832,8 @@ in networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; + networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { }; + networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { }; newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; -- cgit 1.4.1