diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 44bee86880a7..2f9e40616d57 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -2,25 +2,23 @@ , lib , fetchFromGitLab , cairo -, dbus , desktop-file-utils , gettext , glib -, gtk3 -, libhandy_0 -, libsass +, gtk4 +, libadwaita , meson , ninja , pango , pkg-config , python3 , rustPlatform -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "contrast"; - version = "0.0.3"; + version = "0.0.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -28,13 +26,13 @@ stdenv.mkDerivation rec { owner = "design"; repo = "contrast"; rev = version; - sha256 = "0kk3mv7a6y258109xvgicmsi0lw0rcs00gfyivl5hdz7qh47iccy"; + sha256 = "cypSbqLwSmauOoWOuppWpF3hvrxiqmkLspxAWzvlUC0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-ePkPiWGn79PHrMsSEql5OXZW5uRMdTP+w0/DCcm2KG4="; + hash = "sha256-W4FyqwJpimf0isQRCq9TegpTQPQfsumx40AFQCFG5VQ="; }; nativeBuildInputs = [ @@ -47,29 +45,31 @@ stdenv.mkDerivation rec { rustPlatform.rust.cargo rustPlatform.cargoSetupHook rustPlatform.rust.rustc - wrapGAppsHook + wrapGAppsHook4 glib # for glib-compile-resources ]; buildInputs = [ cairo - dbus glib - gtk3 - libhandy_0 - libsass + gtk4 + libadwaita pango ]; postPatch = '' patchShebangs build-aux/meson_post_install.py + # https://gitlab.gnome.org/World/design/contrast/-/merge_requests/23 + substituteInPlace build-aux/meson_post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; meta = with lib; { description = "Checks whether the contrast between two colors meet the WCAG requirements"; homepage = "https://gitlab.gnome.org/World/design/contrast"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix index e4f8dfa03cd6..381a82e5bdf0 100644 --- a/pkgs/desktops/gnome/extensions/pop-shell/default.nix +++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix @@ -26,6 +26,16 @@ stdenv.mkDerivation rec { extensionPortalSlug = "pop-shell"; }; + postPatch = '' + for file in */main.js; do + substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs" + done + ''; + + preFixup = '' + chmod +x $out/share/gnome-shell/extensions/pop-shell@system76.com/*/main.js + ''; + meta = with lib; { description = "Keyboard-driven layer for GNOME Shell"; license = licenses.gpl3Only; diff --git a/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch index e1e6fb7a839a..2f2a0bcfd094 100644 --- a/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch +++ b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch @@ -1,20 +1,3 @@ -diff --git a/src/color_dialog/src/main.ts b/src/color_dialog/src/main.ts -index 9522499..9911530 100644 ---- a/src/color_dialog/src/main.ts -+++ b/src/color_dialog/src/main.ts -@@ -1,4 +1,4 @@ --#!/usr/bin/gjs -+#!/usr/bin/env gjs - - imports.gi.versions.Gtk = '3.0'; - -@@ -84,4 +84,4 @@ function launch_color_dialog() { - - Gtk.init(null); - --launch_color_dialog() -\ No newline at end of file -+launch_color_dialog() diff --git a/src/extension.ts b/src/extension.ts index 7417c46..00d5829 100644 --- a/src/extension.ts @@ -28,23 +11,6 @@ index 7417c46..00d5829 100644 if (ipc) { const generator = (stdout: any, res: any) => { -diff --git a/src/floating_exceptions/src/main.ts b/src/floating_exceptions/src/main.ts -index f298ec7..87a6bc4 100644 ---- a/src/floating_exceptions/src/main.ts -+++ b/src/floating_exceptions/src/main.ts -@@ -1,4 +1,4 @@ --#!/usr/bin/gjs -+#!/usr/bin/env gjs - - imports.gi.versions.Gtk = '3.0' - -@@ -329,4 +329,4 @@ function main() { - Gtk.main() - } - --main() -\ No newline at end of file -+main() diff --git a/src/panel_settings.ts b/src/panel_settings.ts index 83ff56c..1bc1e98 100644 --- a/src/panel_settings.ts diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix index 4bc0ec528a01..cc5487183db3 100644 --- a/pkgs/development/interpreters/quickjs/default.nix +++ b/pkgs/development/interpreters/quickjs/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ stesie AndersonTorres ]; platforms = platforms.linux; license = licenses.mit; + mainProgram = "qjs"; }; } diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix index d050a7563a74..697b9bba00fa 100644 --- a/pkgs/development/python-modules/amcrest/default.nix +++ b/pkgs/development/python-modules/amcrest/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "amcrest"; - version = "1.9.3"; + version = "1.9.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tchellomello"; repo = "python-amcrest"; rev = version; - sha256 = "0f9l8xbn40xwx2zzssx5qmkpmv82j6syj8ncnmm6z9dc5wpr6sw7"; + sha256 = "sha256-smwPKZLevolNvpkLxoFR3NGL9YFPlBk3WYQqJXBaS7s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 7722e50d4613..b244143ba305 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,13 +22,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.805"; + version = "2.0.812"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-vQ5BJUwjik9Wfh4eFGuefpMuTcEV83hYEJKa5/n+kRc="; + hash = "sha256-dCGcg0v83/KJGCvq2jQSemaHJb5wvluN6U73dRer6gY="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 287093354fc7..567ab267cfea 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.11"; + version = "0.9.12"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-p2FG4oWLTGflOoxsp8A+FpoVHfKiEw3DEnK8n3UiBtU="; + sha256 = "sha256-6voM6aQ22zW6NHm9x2TDsM4Kea6TLYZTdSLyc/6fz8A="; }; buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index d684e24db914..2a98aa82ebbd 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -49,13 +49,13 @@ in stdenv.mkDerivation rec { pname = "anbox"; - version = "unstable-2020-11-29"; + version = "unstable-2021-10-20"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "6c10125a7f13908d2cbe56d2d9ab09872755f265"; - sha256 = "00bqssh4zcs0jj6w07b91719xkrpdw75vpcplwrvlhwsvl55f901"; + rev = "84f0268012cbe322ad858d76613f4182074510ac"; + sha256 = "sha256-QXWhatewiUDQ93cH1UZsYgbjUxpgB1ajtGFYZnKmabc="; fetchSubmodules = true; }; diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix index 2e8eabfc1a36..47bb6a67cb42 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "realvnc-vnc-viewer"; - version = "6.21.920"; + version = "6.21.1109"; src = { "x86_64-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm"; - sha256 = "1qghc5380h4b2pczksmky3kcffz5wn9shw033w4f969wl96p31fz"; + sha256 = "12zxp9kvi070nzxbrnrfsyla38ryb69zlidw6cvypmsgqnylfxj7"; }; "i686-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm"; - sha256 = "034iwqxpqhnm6i292fakva7vkwrrzamwcvbm7xyccpd54adj0grn"; + sha256 = "03vhdmzyd16r0kdxpkq9azyy1h705lk4sbgnbw5fr8gkifwng60f"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index b217453b132f..e7e0e420810d 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -23,12 +23,6 @@ stdenv.mkDerivation rec { stripLen = 1; }); - postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) - # XXX: Awful hack to allow cross-compilation. - '' sed -i ./configure \ - -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g' - ''; # " - nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index c7223263d981..35ccbec9ea4a 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-02-05"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-1wdIvJ7AeCNNbApS16ZFmytsPL8Oal+ivem8cHOD1iA="; + sha256 = "sha256-+E8MmkXnynCudGfKnCa6usmyPVM+y6kRB8eAm4F9glY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index 8da87ecfa719..a564c946bcf4 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "thinkfan"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "vmatare"; repo = "thinkfan"; rev = version; - sha256 = "sha256-ZCZqi7A4qdWtDSkTw6ktHIZnPhdes2AX7+QBroaDDfI="; + sha256 = "sha256-aREZv+t4QhtfLKOMrneLiRxgnu0fzB8UV8dvr1dnhx4="; }; postPatch = ''