From 81b2e15c2cec67b87e9e52a3ab6e1760e260161c Mon Sep 17 00:00:00 2001 From: Victor Fuentes Date: Wed, 22 Mar 2023 23:57:51 -0400 Subject: [PATCH 1/4] flatpak: Fix flatpak path in launchers --- .../libraries/flatpak/binary-path.patch | 29 +++++++++++++++++++ .../development/libraries/flatpak/default.nix | 12 ++++---- 2 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/libraries/flatpak/binary-path.patch diff --git a/pkgs/development/libraries/flatpak/binary-path.patch b/pkgs/development/libraries/flatpak/binary-path.patch new file mode 100644 index 000000000000..9da437df91b7 --- /dev/null +++ b/pkgs/development/libraries/flatpak/binary-path.patch @@ -0,0 +1,29 @@ +diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c +index eba81fef..134024e2 100644 +--- a/common/flatpak-dir.c ++++ b/common/flatpak-dir.c +@@ -7532,8 +7532,13 @@ export_desktop_file (const char *app, + g_key_file_remove_key (keyfile, groups[i], "X-GNOME-Bugzilla-ExtraInfoScript", NULL); + + new_exec = g_string_new (""); +- if ((flatpak = g_getenv ("FLATPAK_BINARY")) == NULL) +- flatpak = FLATPAK_BINDIR "/flatpak"; ++ if (g_str_has_suffix (name, ".service")) ++ { ++ flatpak = "/run/current-system/sw/bin/flatpak"; ++ } else { ++ if ((flatpak = g_getenv ("FLATPAK_BINARY")) == NULL) ++ flatpak = "flatpak"; ++ } + + g_string_append_printf (new_exec, + "%s run --branch=%s --arch=%s", +@@ -8867,7 +8872,7 @@ flatpak_dir_deploy (FlatpakDir *self, + error)) + return FALSE; + if ((flatpak = g_getenv ("FLATPAK_BINARY")) == NULL) +- flatpak = FLATPAK_BINDIR "/flatpak"; ++ flatpak = "flatpak"; + + bin_data = g_strdup_printf ("#!/bin/sh\nexec %s run --branch=%s --arch=%s %s \"$@\"\n", + flatpak, escaped_branch, escaped_arch, escaped_app); diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 69dca4c50446..0c44b99db8d9 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -89,6 +89,11 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/53441 ./unset-env-vars.patch + # Use flatpak from PATH to avoid references to `/nix/store` in `/desktop` files. + # Applications containing `DBusActivatable` entries should be able to find the flatpak binary. + # https://github.com/NixOS/nixpkgs/issues/138956 + ./binary-path.patch + # The icon validator needs to access the gdk-pixbuf loaders in the Nix store # and cannot bind FHS paths since those are not available on NixOS. finalAttrs.passthru.icon-validator-patch @@ -176,13 +181,6 @@ stdenv.mkDerivation (finalAttrs: { PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build subprojects/variant-schema-compiler/variant-schema-compiler ''; - preFixup = '' - gappsWrapperArgs+=( - # Use flatpak from PATH in exported assets (e.g. desktop files). - --set FLATPAK_BINARY flatpak - ) - ''; - passthru = { icon-validator-patch = substituteAll { src = ./fix-icon-validation.patch; From cc63974f629702717fc11db4498c03bbc1a1aba0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 2 Oct 2023 13:38:43 -0400 Subject: [PATCH 2/4] ruff: 0.0.291 -> 0.0.292 Diff: https://github.com/astral-sh/ruff/compare/v0.0.291...v0.0.292 Changelog: https://github.com/astral-sh/ruff/releases/tag/v0.0.292 --- pkgs/development/tools/ruff/Cargo.lock | 108 ++++++++---------------- pkgs/development/tools/ruff/default.nix | 5 +- 2 files changed, 36 insertions(+), 77 deletions(-) diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index f111595ad2a5..c0c7795d90b2 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] @@ -313,9 +313,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.4" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" +checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" dependencies = [ "clap_builder", "clap_derive", @@ -323,9 +323,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.4" +version = "4.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" +checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" dependencies = [ "anstream", "anstyle", @@ -810,7 +810,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flake8-to-ruff" -version = "0.0.291" +version = "0.0.292" dependencies = [ "anyhow", "clap", @@ -1075,9 +1075,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e02c584f4595792d09509a94cdb92a3cef7592b1eb2d9877ee6f527062d0ea" +checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686" dependencies = [ "console", "globset", @@ -1260,8 +1260,7 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libcst" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7773d520d4292e200ab1838f2daabe2feed7549f93b0a3c7582160a09e79ffde" +source = "git+https://github.com/Instagram/LibCST.git?rev=03179b55ebe7e916f1722e18e8f0b87c01616d1f#03179b55ebe7e916f1722e18e8f0b87c01616d1f" dependencies = [ "chic", "libcst_derive", @@ -1275,8 +1274,7 @@ dependencies = [ [[package]] name = "libcst_derive" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520197c50ba477f258cd7005ec5ed3a7393693ae6bec664990c7c8d9306a7c0d" +source = "git+https://github.com/Instagram/LibCST.git?rev=03179b55ebe7e916f1722e18e8f0b87c01616d1f#03179b55ebe7e916f1722e18e8f0b87c01616d1f" dependencies = [ "quote", "syn 1.0.109", @@ -1337,9 +1335,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -1454,27 +1452,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.16" @@ -1605,9 +1582,9 @@ checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739" [[package]] name = "pep440_rs" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05bf2c44c4cd12f03b2c3ca095f3aa21f44e43c16021c332e511884719705be" +checksum = "887f66cc62717ea72caac4f1eb4e6f392224da3ffff3f40ec13ab427802746d6" dependencies = [ "lazy_static", "regex", @@ -2051,7 +2028,7 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.291" +version = "0.0.292" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2187,8 +2164,9 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.0.291" +version = "0.0.292" dependencies = [ + "aho-corasick", "annotate-snippets 0.9.1", "anyhow", "bitflags 2.4.0", @@ -2206,8 +2184,6 @@ dependencies = [ "log", "memchr", "natord", - "num-bigint", - "num-traits", "once_cell", "path-absolutize", "pathdiff", @@ -2290,8 +2266,6 @@ dependencies = [ "is-macro", "itertools 0.11.0", "memchr", - "num-bigint", - "num-traits", "once_cell", "ruff_python_parser", "ruff_python_trivia", @@ -2368,7 +2342,6 @@ dependencies = [ "is-macro", "itertools 0.11.0", "lexical-parse-float", - "num-traits", "rand", "unic-ucd-category", ] @@ -2378,13 +2351,12 @@ name = "ruff_python_parser" version = "0.0.0" dependencies = [ "anyhow", + "bitflags 2.4.0", "insta", "is-macro", "itertools 0.11.0", "lalrpop", "lalrpop-util", - "num-bigint", - "num-traits", "ruff_python_ast", "ruff_text_size", "rustc-hash", @@ -2410,7 +2382,6 @@ version = "0.0.0" dependencies = [ "bitflags 2.4.0", "is-macro", - "num-traits", "ruff_index", "ruff_python_ast", "ruff_python_parser", @@ -2573,20 +2544,10 @@ checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", - "rustls-webpki 0.101.4", + "rustls-webpki", "sct", ] -[[package]] -name = "rustls-webpki" -version = "0.100.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "rustls-webpki" version = "0.101.4" @@ -2672,9 +2633,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "semver" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" [[package]] name = "serde" @@ -2984,18 +2945,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", @@ -3272,16 +3233,16 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "ureq" -version = "2.7.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" dependencies = [ "base64", "flate2", "log", "once_cell", "rustls", - "rustls-webpki 0.100.2", + "rustls-webpki", "url", "webpki-roots", ] @@ -3499,12 +3460,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.23.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.2", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "which" @@ -3519,9 +3477,9 @@ dependencies = [ [[package]] name = "wild" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b116685a6be0c52f5a103334cbff26db643826c7b3735fc0a3ba9871310a74" +checksum = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" dependencies = [ "glob", ] diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index c08d9800f415..b7c5ab87a644 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -10,18 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.291"; + version = "0.0.292"; src = fetchFromGitHub { owner = "astral-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-fAukXL0inAPdDpf//4yHYIQIKj3IifX9ObAM7VskDFI="; + hash = "sha256-4D7p5ZMdyemDBaWcCO62bhuPPcIypegqP0YZeX+GJRQ="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { + "libcst-0.1.0" = "sha256-f4lR1vf0iL6WS7yXUzWUt/tax+xjU6rylG1EgeLex88="; "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg="; }; }; From f8d1b78e8a4c6d8b3f0287649fd2980fdf9e3337 Mon Sep 17 00:00:00 2001 From: ciferkey Date: Mon, 2 Oct 2023 15:04:48 -0400 Subject: [PATCH 3/4] adw-gtk3: 4.5 -> 4.9 --- pkgs/data/themes/adw-gtk3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/data/themes/adw-gtk3/default.nix index b7c144441104..27811203c86e 100644 --- a/pkgs/data/themes/adw-gtk3/default.nix +++ b/pkgs/data/themes/adw-gtk3/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "adw-gtk3"; - version = "4.5"; + version = "4.9"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x6ul5NZDWqEQfLzmpR7X5HgUmHNSbpuTnCquVEHFHL8="; + sha256 = "sha256-ni1u6696jrwjYZ4gppF9yD1RAum0+D7WxQgu09cxVGg="; }; nativeBuildInputs = [ From 8c106e21c991dbd82c3dc30adb3ecd451ddf8049 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 2 Oct 2023 17:07:44 -0400 Subject: [PATCH 4/4] ruff-lsp: 0.0.39 -> 0.0.40 Diff: https://github.com/astral-sh/ruff-lsp/compare/v0.0.39...v0.0.40 Changelog: https://github.com/astral-sh/ruff-lsp/releases/tag/v0.0.40 --- .../language-servers/ruff-lsp/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/pkgs/development/tools/language-servers/ruff-lsp/default.nix index 0ad76efa9b3e..0676305659d3 100644 --- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.39"; + version = "0.0.40"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,23 +24,9 @@ buildPythonPackage rec { owner = "astral-sh"; repo = "ruff-lsp"; rev = "v${version}"; - hash = "sha256-hbnSx59uSzXHeAhZPZnCzxl+mCZIdr29uUPfQCsm/Ww="; + hash = "sha256-CQ4SDIGhUTn7fdvoGag+XM7HcY+qJyp9McyzpoTQ0tM="; }; - patches = [ - # update tests to fix compatibility with ruff 0.0.291 - # https://github.com/astral-sh/ruff-lsp/pull/250 - (fetchpatch { - name = "bump-ruff-version.patch"; - url = "https://github.com/astral-sh/ruff-lsp/commit/35691407c4f489416a46fd2e88ef037b1204feb7.patch"; - hash = "sha256-D6k2BWDUqN4GBhjspRwg84Idr7fvKMbmAAkG3I1YOH4="; - excludes = [ - "requirements.txt" - "requirements-dev.txt" - ]; - }) - ]; - postPatch = '' # ruff binary added to PATH in wrapper so it's not needed sed -i '/"ruff>=/d' pyproject.toml