diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions')
12 files changed, 154 insertions, 73 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix new file mode 100644 index 000000000000..523dbc622f08 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, substituteAll, glib, gnome3, gettext }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-EasyScreenCast"; + version = "unstable-2020-11-25"; + + src = fetchFromGitHub { + # To make it work with gnome 3.38, using effectively: https://github.com/EasyScreenCast/EasyScreenCast/pull/276 + owner = "Ian2020"; + repo = "EasyScreenCast"; + rev = "b1ab4a999bc7110ecbf68b5fe42c37fa67d7cb0d"; + sha256 = "s9b0ITKUzgG6XOd1bK7i3mGxfc+T+UHrTZhBp0Ff8zQ="; + }; + + patches = [ + (substituteAll { + src = ./fix-gi-path.patch; + gnomeShell = gnome3.gnome-shell; + }) + ]; + + nativeBuildInputs = [ + glib gettext + ]; + + makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + + uuid = "EasyScreenCast@iacopodeenosee.gmail.com"; + + meta = with stdenv.lib; { + description = "Simplifies the use of the video recording function integrated in gnome shell"; + homepage = "https://github.com/EasyScreenCast/EasyScreenCast"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.linux; + }; +} + diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch new file mode 100644 index 000000000000..2d32021b6c66 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch @@ -0,0 +1,16 @@ +diff --git i/utilaudio.js w/utilaudio.js +index 983b29c..7a94de8 100644 +--- i/utilaudio.js ++++ w/utilaudio.js +@@ -11,10 +11,7 @@ + */ + + const GIRepository = imports.gi.GIRepository; +-GIRepository.Repository.prepend_search_path("/usr/lib/gnome-shell"); +-GIRepository.Repository.prepend_library_path("/usr/lib/gnome-shell"); +-GIRepository.Repository.prepend_search_path("/usr/lib64/gnome-shell"); +-GIRepository.Repository.prepend_library_path("/usr/lib64/gnome-shell"); ++GIRepository.Repository.prepend_search_path("@gnomeShell@/lib/gnome-shell"); + const Gvc = imports.gi.Gvc; + const Lang = imports.lang; + diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix deleted file mode 100644 index c6518201da01..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-battery-status"; - version = "6"; - - src = fetchFromGitHub { - owner = "milliburn"; - repo = "gnome-shell-extension-battery_status"; - rev = "v${version}"; - sha256 = "1w83h863mzffjnmk322xq90qf3y9dzay1w9yw5r0qnbsq1ljl8p4"; - }; - - uuid = "battery_status@milliburn.github.com"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions/ - runHook postInstall - ''; - - meta = with stdenv.lib; { - description = "Configurable lightweight battery charge indicator and autohider"; - license = licenses.gpl2; - broken = true; # not compatable with latest GNOME - maintainers = with maintainers; [ jonafato ]; - homepage = "https://github.com/milliburn/gnome-shell-extension-battery_status"; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix index 3e6903c56423..dbeb08af224e 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-clipboard-indicator"; - version = "34"; + version = "37"; src = fetchFromGitHub { owner = "Tudmotu"; repo = "gnome-shell-extension-clipboard-indicator"; rev = "v${version}"; - sha256 = "0i00psc1ky70zljd14jzr627y7nd8xwnwrh4xpajl1f6djabh12s"; + sha256 = "0npxhaam2ra2b9zh2gk2q0n5snlhx6glz86m3jf8hz037w920k41"; }; uuid = "clipboard-indicator@tudmotu.com"; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 8a0314cd8b4e..923faa00a149 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-dash-to-panel"; - version = "39"; + version = "40"; src = fetchFromGitHub { owner = "home-sweet-gnome"; repo = "dash-to-panel"; rev = "v${version}"; - sha256 = "0r7kbmrizl9ilqy7gzzvjwxcv8xpp13n5n0a8s84blg97cih0hw2"; + sha256 = "07jq8d16nn62ikis896nyfn3q02f5srj754fmiblhz472q4ljc3p"; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 98827fd3f6a2..d85efd0a4da4 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -1,16 +1,34 @@ -{ stdenv, fetchFromGitHub, substituteAll, python3, openssl, gsound -, meson, ninja, libxml2, pkgconfig, gobject-introspection, wrapGAppsHook -, glib, gtk3, at-spi2-core, upower, openssh, gnome3, gjs }: +{ stdenv +, fetchFromGitHub +, substituteAll +, openssl +, gsound +, meson +, ninja +, pkg-config +, gobject-introspection +, wrapGAppsHook +, glib +, glib-networking +, gtk3 +, openssh +, gnome3 +, gjs +, nixosTests +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "gnome-shell-gsconnect"; - version = "41"; + version = "44"; + + outputs = [ "out" "installedTests" ]; src = fetchFromGitHub { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "0lcj7k16jki54bsyh01j4ss4hhfddnahcw02zlmlkl637qdv1b5j"; + sha256 = "C+8mhK4UOs2iZplDyY45bCX0mMGgwVV/ZfaPpYUlWxA="; }; patches = [ @@ -19,24 +37,24 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; gapplication = "${glib.bin}/bin/gapplication"; }) + + # Allow installing installed tests to a separate output + ./installed-tests-path.patch ]; nativeBuildInputs = [ - meson ninja pkgconfig + meson + ninja + pkg-config gobject-introspection # for locating typelibs wrapGAppsHook # for wrapping daemons - libxml2 # xmllint ]; buildInputs = [ glib # libgobject + glib-networking gtk3 - at-spi2-core # atspi - gnome3.nautilus # TODO: this contaminates the package with nautilus and gnome-autoar typelibs but it is only needed for the extension - gnome3.nautilus-python gsound - upower - gnome3.caribou gjs # for running daemon gnome3.evolution-data-server # for libebook-contacts typelib ]; @@ -51,11 +69,13 @@ stdenv.mkDerivation rec { "-Dsshkeygen_path=${openssh}/bin/ssh-keygen" "-Dsession_bus_services_dir=${placeholder "out"}/share/dbus-1/services" "-Dpost_install=true" + "-Dinstalled_test_prefix=${placeholder ''installedTests''}" ]; postPatch = '' patchShebangs meson/nmh.sh patchShebangs meson/post-install.sh + patchShebangs installed-tests/prepare-tests.sh # TODO: do not include every typelib everywhere # for example, we definitely do not need nautilus @@ -71,14 +91,26 @@ stdenv.mkDerivation rec { echo "Wrapping program $file" wrapGApp "$file" done + + # Wrap jasmine runner for tests + for file in $installedTests/libexec/installed-tests/gsconnect/minijasmine; do + echo "Wrapping program $file" + wrapGApp "$file" + done ''; uuid = "gsconnect@andyholmes.github.io"; + passthru = { + tests = { + installedTests = nixosTests.installed-tests.gsconnect; + }; + }; + meta = with stdenv.lib; { description = "KDE Connect implementation for Gnome Shell"; homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ etu ]; platforms = platforms.linux; }; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch new file mode 100644 index 000000000000..78e1ad96d74c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch @@ -0,0 +1,30 @@ +diff --git a/installed-tests/meson.build b/installed-tests/meson.build +index c7eff2fb..ef4f6052 100644 +--- a/installed-tests/meson.build ++++ b/installed-tests/meson.build +@@ -1,5 +1,5 @@ +-installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name()) +-installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name()) ++installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name()) ++installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name()) + + installed_tests_srcdir = meson.current_source_dir() + installed_tests_builddir = meson.current_build_dir() +diff --git a/meson_options.txt b/meson_options.txt +index 8912e052..ca6ee5eb 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -116,6 +116,13 @@ option( + description: 'Native Messaging Host directory for Mozilla' + ) + ++option( ++ 'installed_test_prefix', ++ type: 'string', ++ value: '', ++ description: 'Prefix for installed tests' ++) ++ + option( + 'installed_tests', + type: 'boolean', diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix index 36de0e0a66a0..1b8341a281f8 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix @@ -1,25 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, gnome3, fetchpatch }: +{ stdenv, lib, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-material-shell"; - version = "7"; + version = "10"; src = fetchFromGitHub { owner = "material-shell"; repo = "material-shell"; rev = version; - sha256 = "076cv1l5qr5x71przjwvbzx0m91n4z0byc2gc3r48l8vsr2d0hwf"; + sha256 = "18d813n8s7ns8xp75zmlna7a8mi23rn9yqps51xvdd0sdgn72a1c"; }; - patches = [ - # Fix for https://github.com/material-shell/material-shell/issues/284 - # (Remove this patch when updating to version >= 8) - (fetchpatch { - url = "https://github.com/material-shell/material-shell/commit/fc27489a1ec503a4a5c7cb2f4e1eefa84a7ea2f1.patch"; - sha256 = "0x2skg955c4jqgwbkfhk7plm8bh1qnk66cdds796bzkp3hb5syw8"; - }) - ]; - # This package has a Makefile, but it's used for building a zip for # publication to extensions.gnome.org. Disable the build phase so # installing doesn't build an unnecessary release. diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/paperwm/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/paperwm/default.nix index f5ffac9b2f34..c2d5136e45eb 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/paperwm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/paperwm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-paperwm"; - version = "36.0"; + version = "38.1"; src = fetchFromGitHub { owner = "paperwm"; repo = "PaperWM"; rev = version; - sha256 = "1ssnabwxrns36c61ppspjkr9i3qifv08pf2jpwl7cjv3pvyn4kly"; + sha256 = "1jq15qrq3khqpjsjbcc17amdr1k53jkvambdacdf56xbqkycvlgs"; }; uuid = "paperwm@hedning:matrix.org"; diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix index 870ac448bb4e..9f80fbe28cd7 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-sound-output-device-chooser"; - version = "28"; + version = "32"; src = fetchFromGitHub { owner = "kgshank"; repo = "gse-sound-output-device-chooser"; rev = version; - sha256 = "1vmf8mgb52x7my3sidaw8kh26d5niadn18bgrl6bjcakmj5x8q16"; + sha256 = "1s83scr80qv5xmlfsy6dnsj96lwg2rr4pbsw9inld3ylblgvi35l"; }; patches = [ diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch index a0a6551fcf81..5957cb956f7a 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch @@ -1,14 +1,18 @@ +diff --git a/sound-output-device-chooser@kgshank.net/convenience.js b/sound-output-device-chooser@kgshank.net/convenience.js +index 54ad06f..0860531 100644 --- a/sound-output-device-chooser@kgshank.net/convenience.js +++ b/sound-output-device-chooser@kgshank.net/convenience.js -@@ -111,7 +111,7 @@ function refreshCards() { - log("New logic"); +@@ -129,7 +129,7 @@ function refreshCards() { + if(_settings.get_boolean(Prefs.NEW_PROFILE_ID)) { + _log("New logic"); let pyLocation = Me.dir.get_child('utils/pa_helper.py').get_path(); - try { -- let [result, out, err, exit_code] = GLib.spawn_command_line_sync('python ' + pyLocation); -+ let [result, out, err, exit_code] = GLib.spawn_command_line_sync('@python@ ' + pyLocation); - // log("result" + result +" out"+out + " exit_code" + exit_code + " - // err" +err); - if(result && !exit_code) { +- let pythonExec = 'python'; ++ let pythonExec = '@python@'; + let pyVer = 3; + while(!isCmdFound(pythonExec) && pyVer >=2){ + _log(pythonExec + " is not found. Try next"); +diff --git a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py +index c4d2484..262608d 100644 --- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py +++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py @@ -86,7 +86,7 @@ else: diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix index 4dcb4a8941cd..6c466a8eca4b 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-workspace-matrix"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "mzur"; repo = "gnome-shell-wsmatrix"; rev = "v${version}"; - sha256 = "1xx2h8k981657lws614f7x4mqjk900xq9907j2h5jdhbbic5ppy6"; + sha256 = "0dbn6b3fdd7yblk0mhsmaiqs3mwgcf3khkx1dsnlqn5hcs0a3myd"; }; uuid = "wsmatrix@martin.zurowietz.de"; |