From f4cadcfcae5a81948ddb940233634b492b4b6219 Mon Sep 17 00:00:00 2001 From: afreakk Date: Sun, 6 Feb 2022 18:35:58 +0100 Subject: [PATCH 01/58] plex: extraPlugins example --- nixos/modules/services/misc/plex.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 2ae4e80d5c3f..4ca7b32cc401 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -63,6 +63,19 @@ in this behavior is undesired, set to false. ''; + example = literalExpression '' + [ + (builtins.path { + name = "Audnexus.bundle"; + path = pkgs.fetchFromGitHub { + owner = "djdembeck"; + repo = "Audnexus.bundle"; + rev = "v0.2.8"; + sha256 = "sha256-IWOSz3vYL7zhdHan468xNc6C/eQ2C2BukQlaJNLXh7E="; + }; + }) + ] + ''; }; extraScanners = mkOption { From 99eb7ace169f787895fe771b97d2529b20cb8acd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Feb 2022 19:38:51 +0000 Subject: [PATCH 02/58] openapi-generator-cli: 5.2.1 -> 5.4.0 --- pkgs/tools/networking/openapi-generator-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index e3491460e0ae..1ff0299a6bff 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "5.2.1"; + version = "5.4.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-stRtSZCvPUQuTiKOHmJ7k8o3Gtly9Up+gicrDOeWjIs="; + sha256 = "sha256-8+0xIxDjkDJLM7ov//KQzoEpNSB6FJPsXAmNCkQb5Rw="; }; dontUnpack = true; From b77e49c802358b5fa1b6b24b828e0c0a660755f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Feb 2022 07:23:15 +0000 Subject: [PATCH 03/58] portfolio: 0.56.2 -> 0.56.5 --- pkgs/applications/office/portfolio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index fc1b329c4322..b7ec18c98668 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.56.2"; + version = "0.56.5"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-4iMLn0KTrH7MOlNduSl7BMOZKPakHhhQdR3NQXV2ZZU="; + sha256 = "sha256-g/MjOrivqbZ93iSs5mLQT36gn72KCJEOgEssBZER+TA="; }; nativeBuildInputs = [ From 2a237cddf1fb4e738f86e7eb2d2e299b1fc9fef8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Feb 2022 08:46:34 +0000 Subject: [PATCH 04/58] svls: 0.1.27 -> 0.2.0 --- pkgs/development/tools/misc/svls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/misc/svls/default.nix index 13b529147995..2e3075c7b128 100644 --- a/pkgs/development/tools/misc/svls/default.nix +++ b/pkgs/development/tools/misc/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.1.27"; + version = "0.2.0"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-+/4D0pRZs1Gy6DJnsDZA8wWi1FKhr7gRS0oq1TyWpuE="; + sha256 = "sha256-WZuFYiPV6HbBH9QT4h9FbnmkbFBadUaV0HujiQ0hu7I="; }; - cargoSha256 = "sha256-xkRlUXlkXQwvzIuhExf+tSSBi+8BZv58btvln05UI+k="; + cargoSha256 = "sha256-tafxN3ots1UTSv950NlwCs6TItMnKz5tn5vw7PTcARU="; meta = with lib; { description = "SystemVerilog language server"; From 123005643f0b0a922ee127c6377d777bb6998922 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Feb 2022 09:27:28 +0000 Subject: [PATCH 05/58] tar2ext4: 0.8.22 -> 0.9.2 --- pkgs/tools/filesystems/tar2ext4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index 41a47566eec5..0c92c3e2bf39 100644 --- a/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.8.22"; + version = "0.9.2"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-z8w/xzNEebnQJTO4H5PlU5W+69MY1wQwmuz5inXBl1k="; + sha256 = "sha256-Qa93MpTAMCA7vn7LefILDdAKYyRDPPq0vBwmIfegyuU="; }; sourceRoot = "source/cmd/tar2ext4"; From e5f097625aedd8dda209f0623c3d034ad4ae9896 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Feb 2022 11:42:33 +0000 Subject: [PATCH 06/58] vkBasalt: 0.3.2.4 -> 0.3.2.5 --- pkgs/tools/graphics/vkBasalt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vkBasalt/default.nix b/pkgs/tools/graphics/vkBasalt/default.nix index 3695c7ec2c0d..b0b9c9b07b41 100644 --- a/pkgs/tools/graphics/vkBasalt/default.nix +++ b/pkgs/tools/graphics/vkBasalt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "vkBasalt"; - version = "0.3.2.4"; + version = "0.3.2.5"; src = fetchFromGitHub { owner = "DadSchoorse"; repo = pname; rev = "v${version}"; - sha256 = "01iplj6dlw2vl35hyci5m5yp8jmzcwng6c3jk3wn97jpv6m3hjqz"; + sha256 = "sha256-1UHxPtpmkDNOJwKXVlRN2lpvRm4XPHNwxOBpEikXxqA="; }; nativeBuildInputs = [ glslang meson ninja pkg-config ]; From f9c202edd99a70558e9c84c23bc1b2b8aa4de775 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Feb 2022 06:08:38 +0000 Subject: [PATCH 07/58] python310Packages.pymupdf: 1.19.4 -> 1.19.5 --- pkgs/development/python-modules/pymupdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 42c369dbf7e7..ad862feaf521 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.19.4"; + version = "1.19.5"; src = fetchPypi { pname = "PyMuPDF"; inherit version; - sha256 = "125783986da87fe1a5372d621e90fa49e454454af0b3d0f894858c146c712f81"; + sha256 = "sha256-OTybnLJmmoaRoBew/bmuDs86Smbypc6jfQqqGikKVaU="; }; postPatch = '' From e1f6e33d016f199f7510ddf12936b87ef6206d51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Feb 2022 09:43:01 +0000 Subject: [PATCH 08/58] workcraft: 3.3.5 -> 3.3.6 --- pkgs/applications/science/logic/workcraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 2829cb59340b..0c20faceb54e 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "sha256-KErKYK3mmjp5uNdGQnjzUUIEwXT5fqbAPUunH72Mtig="; + sha256 = "sha256-5J4HOTz92ALUcZZr15jJ6vplc3KDwbFCXqjEhlOV4kE="; }; nativeBuildInputs = [ makeWrapper ]; From 956fad60422fed00fe917a78b73a6c52778ed41e Mon Sep 17 00:00:00 2001 From: Anatolii Popov Date: Tue, 15 Feb 2022 11:38:54 +0200 Subject: [PATCH 09/58] perlPackages.DevelCamelcadedb: init at 2021.2 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 23a714597eec..4eb30f1013a8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6564,6 +6564,21 @@ let buildInputs = [ DBDSQLite TestFatal TestRoo ]; }; + DevelCamelcadedb = buildPerlPackage { + pname = "Devel-Camelcadedb"; + version = "2021.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HU/HURRICUP/Devel-Camelcadedb-v2021.2.tar.gz"; + sha256 = "88a1d9e95d398ffe4d4114861e21c36f7c22315b3d03e7f764ccbce018ab3e47"; + }; + propagatedBuildInputs = [ HashStoredIterator JSONXS PadWalker ]; + perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + meta = { + description = "Perl side of the Perl debugger for IntelliJ IDEA and other JetBrains IDEs"; + license = lib.licenses.mit; + }; + }; + DevelCycle = buildPerlPackage { pname = "Devel-Cycle"; version = "1.12"; From d7c433094b0b559f89b74c3f03482af9aefb091f Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Tue, 23 Feb 2021 22:03:53 +0000 Subject: [PATCH 10/58] python3Packages.fiblary3: init at 0.1.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Robert Schütz Co-authored-by: Sandro --- .../python-modules/fiblary3-fork/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/fiblary3-fork/default.nix diff --git a/pkgs/development/python-modules/fiblary3-fork/default.nix b/pkgs/development/python-modules/fiblary3-fork/default.nix new file mode 100644 index 000000000000..e2c53c3e417b --- /dev/null +++ b/pkgs/development/python-modules/fiblary3-fork/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi +, fixtures +, jsonpatch +, netaddr +, prettytable +, python-dateutil +, pytestCheckHook +, requests +, requests-mock +, six +, sphinx +, testtools +}: + +buildPythonPackage rec { + pname = "fiblary3-fork"; + version = "0.1.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "001wqh7gx2dv3sf7a5xsbppz9r88f5qwrp05jzjsjcm6cbcvmsz0"; + }; + + propagatedBuildInputs = [ + jsonpatch + netaddr + prettytable + python-dateutil + requests + six + ]; + + checkInputs = [ + fixtures + pytestCheckHook + requests-mock + testtools + ]; + + pythonImportsCheck = [ "fiblary3" ]; + + meta = with lib; { + homepage = "https://github.com/graham33/fiblary"; + description = "Fibaro Home Center API Python Library"; + license = licenses.asl20; + maintainers = with maintainers; [ graham33 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff8c2055e0fd..73c1b815489c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2833,6 +2833,8 @@ in { ffmpeg-progress-yield = callPackage ../development/python-modules/ffmpeg-progress-yield { }; + fiblary3-fork = callPackage ../development/python-modules/fiblary3-fork { }; + fido2 = callPackage ../development/python-modules/fido2 { }; fields = callPackage ../development/python-modules/fields { }; From 2e8071c4e294f12669a181a7db699277472fb204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 19 Feb 2022 19:42:32 +0000 Subject: [PATCH 11/58] home-assistant: revamp manual package choosing --- .../home-assistant/component-packages.nix | 2 +- .../home-assistant/parse-requirements.py | 44 +++++++------------ 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 714087eb2e60..cf002775bc31 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -216,7 +216,7 @@ "ecobee" = ps: with ps; [ python-ecobee-api ]; "econet" = ps: with ps; [ pyeconet ]; "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks - "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan] + "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools "edimax" = ps: with ps; [ pyedimax ]; "edl21" = ps: with ps; [ pysml ]; "efergy" = ps: with ps; [ pyefergy ]; diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index fbe46b237787..e7e94efefb04 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -34,16 +34,11 @@ from rich.table import Table COMPONENT_PREFIX = "homeassistant.components" PKG_SET = "home-assistant.python.pkgs" -# If some requirements are matched by multiple Python packages, -# the following can be used to choose one of them +# If some requirements are matched by multiple or no Python packages, the +# following can be used to choose the correct one PKG_PREFERENCES = { - # Use python3Packages.youtube-dl-light instead of python3Packages.youtube-dl - "youtube-dl": "youtube-dl-light", - "tensorflow-bin": "tensorflow", - "tensorflow-bin_2": "tensorflow", - "tensorflowWithoutCuda": "tensorflow", - "tensorflow-build_2": "tensorflow", - "whois": "python-whois", + "youtube_dl": "youtube-dl-light", + "tensorflow": "tensorflow", } @@ -120,39 +115,28 @@ def dump_packages() -> Dict[str, Dict[str, str]]: def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]: - attr_paths = set() + if req in PKG_PREFERENCES: + return f"{PKG_SET}.{PKG_PREFERENCES[req]}" + attr_paths = [] names = [req] # E.g. python-mpd2 is actually called python3.6-mpd2 # instead of python-3.6-python-mpd2 inside Nixpkgs if req.startswith("python-") or req.startswith("python_"): names.append(req[len("python-") :]) - # Add name variant without extra_require, e.g. samsungctl - # instead of samsungctl[websocket] - if req.endswith("]"): - names.append(req[:req.find("[")]) for name in names: # treat "-" and "_" equally name = re.sub("[-_]", "[-_]", name) # python(minor).(major)-(pname)-(version or unstable-date) # we need the version qualifier, or we'll have multiple matches # (e.g. pyserial and pyserial-asyncio when looking for pyserial) - pattern = re.compile("^python\\d\\.\\d-{}-(?:\\d|unstable-.*)".format(name), re.I) + pattern = re.compile(f"^python\\d\\.\\d-{name}-(?:\\d|unstable-.*)", re.I) for attr_path, package in packages.items(): if pattern.match(package["name"]): - attr_paths.add(attr_path) - if len(attr_paths) > 1: - for to_replace, replacement in PKG_PREFERENCES.items(): - try: - attr_paths.remove(PKG_SET + "." + to_replace) - attr_paths.add(PKG_SET + "." + replacement) - except KeyError: - pass + attr_paths.append(attr_path) # Let's hope there's only one derivation with a matching name - assert len(attr_paths) <= 1, "{} matches more than one derivation: {}".format( - req, attr_paths - ) - if len(attr_paths) == 1: - return attr_paths.pop() + assert len(attr_paths) <= 1, f"{req} matches more than one derivation: {attr_paths}" + if attr_paths: + return attr_paths[0] else: return None @@ -180,6 +164,10 @@ def main() -> None: # Therefore, if there's a "#" in the line, only take the part after it req = req[req.find("#") + 1 :] name, required_version = req.split("==", maxsplit=1) + # Remove extra_require from name, e.g. samsungctl instead of + # samsungctl[websocket] + if name.endswith("]"): + name = name[:name.find("[")] attr_path = name_to_attr_path(name, packages) if our_version := get_pkg_version(name, packages): if Version.parse(our_version) < Version.parse(required_version): From dfca3ba25b2bc45cecf2d1e4dabb4eafcb92d713 Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Tue, 23 Feb 2021 22:04:36 +0000 Subject: [PATCH 12/58] home-assistant: add fiblary3 dependency for fibaro This is now packaged (python3Packages.fiblary3-fork). --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/parse-requirements.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index cf002775bc31..e3ed1157de81 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -264,7 +264,7 @@ "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; - "fibaro" = ps: with ps; [ ]; # missing inputs: fiblary3 + "fibaro" = ps: with ps; [ fiblary3-fork ]; "fido" = ps: with ps; [ pyfido ]; "file" = ps: with ps; [ ]; "filesize" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index e7e94efefb04..0e3d5d5553e7 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -39,6 +39,7 @@ PKG_SET = "home-assistant.python.pkgs" PKG_PREFERENCES = { "youtube_dl": "youtube-dl-light", "tensorflow": "tensorflow", + "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 } From 00acde8e58a8636f840a33be6e0e857ba7f62d45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Feb 2022 02:34:28 +0000 Subject: [PATCH 13/58] shipyard: 0.3.44 -> 0.3.45 --- pkgs/tools/virtualization/shipyard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/tools/virtualization/shipyard/default.nix index 7407c3dc68ab..341d604ed042 100644 --- a/pkgs/tools/virtualization/shipyard/default.nix +++ b/pkgs/tools/virtualization/shipyard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shipyard"; - version = "0.3.44"; + version = "0.3.45"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-ShL/j0vyKfbNcq/cAgEUCln6T7UE/qmPZOMw129210o="; + sha256 = "sha256-gJwcf7X5FTHKNNQczD352yOUjSca45Zn0wc4bvD9Z30="; }; vendorSha256 = "sha256-mXYnmDppVqhjlkGVkvp1YaEwBEkHBUddxLof389huMQ="; From 65b33e4d9dd86578069b287c7c9b466fc554d889 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Feb 2022 08:30:53 +0000 Subject: [PATCH 14/58] python310Packages.pythonfinder: 1.2.9 -> 1.2.10 --- pkgs/development/python-modules/pythonfinder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index bf9cb69721c4..9500a42a916f 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pythonfinder"; - version = "1.2.9"; + version = "1.2.10"; format = "pyproject"; src = fetchFromGitHub { owner = "sarugaku"; repo = pname; rev = version; - sha256 = "sha256-tPMqVKbYwBRvb8/GyYNxO8lwJLcUUQyRoCoF5tg6rxs="; + sha256 = "sha256-4a648wOh+ASeocevFVh/4Fkq0CEhkFbt+2mWVmb9Bhw="; }; propagatedBuildInputs = [ From 8e666465186f058f0be8a01e496f421c157033b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Feb 2022 04:06:18 +0000 Subject: [PATCH 15/58] appflowy: 0.0.2 -> 0.0.3 --- pkgs/applications/office/appflowy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 05bb88bdfe74..6d3b9183f446 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.0.2"; + version = "0.0.3"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz"; - sha256 = "1fvv4mlgf0vqcq5zh0zl2xr44saz0sm47r8whcywwrmcm0l66iv6"; + sha256 = "sha256-m9vfgytSKnWLf6hwKjIGcU/7OCmIBiF4hJ/yIRBdSpQ="; }; nativeBuildInputs = [ From 665344f14839ea286a7aeb329fbf4f44da268ce4 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Aug 2021 21:42:45 +0200 Subject: [PATCH 16/58] lib/types: Introduce types.raw for unprocessed values --- lib/tests/modules.sh | 6 ++++ lib/tests/modules/raw.nix | 30 +++++++++++++++++++ lib/types.nix | 7 +++++ .../development/option-types.section.md | 11 +++++++ .../development/option-types.section.xml | 19 ++++++++++++ 5 files changed, 73 insertions(+) create mode 100644 lib/tests/modules/raw.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 88d152d39352..a1c592cf4ef0 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -293,6 +293,12 @@ checkConfigOutput "{ }" config.submodule.a ./emptyValues.nix checkConfigError 'The option .int.a. is used but not defined' config.int.a ./emptyValues.nix checkConfigError 'The option .nonEmptyList.a. is used but not defined' config.nonEmptyList.a ./emptyValues.nix +## types.raw +checkConfigOutput "{ foo = ; }" config.unprocessedNesting ./raw.nix +checkConfigOutput "10" config.processedToplevel ./raw.nix +checkConfigError "The option .multiple. is defined multiple times" config.multiple ./raw.nix +checkConfigOutput "bar" config.priorities ./raw.nix + cat < + + + types.raw + + + + A type which doesn’t do any checking, merging or nested + evaluation. It accepts a single arbitrary value that is not + recursed into, making it useful for values coming from + outside the module system, such as package sets or arbitrary + data. Options of this type are still evaluated according to + priorities and conditionals, so mkForce, + mkIf and co. still work on the option + value itself, but not for any value nested within it. This + type should only be used when checking, merging and nested + evaluation are not desirable. + + + types.attrs From ff13cd5d3e39fb6dbe456e92e28beb7e8f637f3c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Aug 2021 21:47:34 +0200 Subject: [PATCH 17/58] lib/modules: Use types.raw for _module.args Fixes https://github.com/NixOS/nixpkgs/issues/53458, as types.raw doesn't allow setting multiple values --- lib/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/modules.nix b/lib/modules.nix index f1125aca0a35..e9fc1007fc20 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -138,7 +138,7 @@ rec { # support for that, in turn it's lazy in its values. This means e.g. # a `_module.args.pkgs = import (fetchTarball { ... }) {}` won't # start a download when `pkgs` wasn't evaluated. - type = types.lazyAttrsOf types.unspecified; + type = types.lazyAttrsOf types.raw; internal = true; description = "Arguments passed to each module."; }; From 1769d0eb4b515f946dcc65ae04fb5df39ef6a60f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 16:38:57 +0000 Subject: [PATCH 18/58] symfony-cli: 5.3.4 -> 5.4.0 --- pkgs/development/tools/symfony-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 1e182b888cee..8864b3cad68c 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.3.4"; - vendorSha256 = "sha256-i4p9kEe0eT2L4U/DjkWlLVqgGT5ZJaoGyFAoYyxmoyI="; + version = "5.4.0"; + vendorSha256 = "sha256-SIGx9u/BFobN1cYShEMleeDs3IPnBN0OOwsRdCQ69Ts="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-6k1yMGW/UYCFB1APGlcU8bjNcCD7/IXhG+RJR6ii56I="; + sha256 = "sha256-WUtwhWIFxOlmNZvvad3SiFwbvAPnjli5A4qtHnKEAT0="; }; # Tests requires network access From f9d835ba152834e28df3dca5436052d3a5aeb1ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Feb 2022 18:43:23 +0000 Subject: [PATCH 19/58] werf: 1.2.69 -> 1.2.70 --- pkgs/applications/networking/cluster/werf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 2769ec44ea2b..f4457b3689e7 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.69"; + version = "1.2.70"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-rmDP8qPOPhUrygt5gAF2MOVNCHqh+1Gc50mnVFXpev4="; + sha256 = "sha256-Qla1pTqzBUgazzCo4A51YtoEj2UoVBgs4p/GrTfxQFM="; }; vendorSha256 = "sha256-PNg4QEi9+LvYWWhj2B6OrP+SBanuINlSGZYCMNjOQv0="; proxyVendor = true; From 49c6568a8f4de3782b7cb9c5a0af3f758eded1bc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 Feb 2022 10:30:40 +0100 Subject: [PATCH 20/58] =?UTF-8?q?flatpak:=201.12.4=20=E2=86=92=201.12.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/flatpak/flatpak/releases/tag/1.12.5 https://github.com/flatpak/flatpak/releases/tag/1.12.6 --- pkgs/development/libraries/flatpak/default.nix | 4 ++-- .../development/libraries/flatpak/unset-env-vars.patch | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index c97f1effd67c..88188f8d0ca4 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -53,14 +53,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.12.4"; + version = "1.12.6"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "792e6265f7f6d71b2a087028472a048287bed2587e43d2eec2c31d360c16211c"; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "7wLLUFuRzOUXMJm1SFdo7vGJnrzznt+CfEJUFjqBFic="; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/development/libraries/flatpak/unset-env-vars.patch index 63ce0d12fe07..6b8017684d45 100644 --- a/pkgs/development/libraries/flatpak/unset-env-vars.patch +++ b/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -1,11 +1,11 @@ diff --git a/common/flatpak-run.c b/common/flatpak-run.c -index 8d52d3a5..81700183 100644 +index 146c4f87..bcdad2bc 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1232,6 +1232,7 @@ static const ExportData default_exports[] = { - {"PERLLIB", NULL}, - {"PERL5LIB", NULL}, - {"XCURSOR_PATH", NULL}, +@@ -1710,6 +1710,7 @@ static const ExportData default_exports[] = { + {"GST_PTP_HELPER", NULL}, + {"GST_PTP_HELPER_1_0", NULL}, + {"GST_INSTALL_PLUGINS_HELPER", NULL}, + {"GDK_PIXBUF_MODULE_FILE", NULL}, }; From 600edd5e3f78c7d22070951bef210aef1c0c7735 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 Feb 2022 10:34:31 +0100 Subject: [PATCH 21/58] =?UTF-8?q?xdg-desktop-portal:=201.10.0=20=E2=86=92?= =?UTF-8?q?=201.12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.12.0 https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.12.1 --- .../libraries/xdg-desktop-portal/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index bb8950ca1ec9..16ede7f511f2 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , nixosTests , substituteAll , autoreconfHook @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.10.1"; + version = "1.12.1"; outputs = [ "out" "installedTests" ]; @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "Q1ZP/ljdIxJHg+3JaTL/LIZV+3cK2+dognsTC95udVA="; + sha256 = "1fc3LXN6wp/zQw4HQ0Q99HUvBhynHrQi2p3s/08izuE="; }; patches = [ @@ -39,12 +38,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit flatpak; }) - # Fixes the issue in https://github.com/flatpak/xdg-desktop-portal/issues/636 - # Remove it when the next stable release arrives - (fetchpatch { - url = "https://github.com/flatpak/xdg-desktop-portal/commit/d7622e15ff8fef114a6759dde564826d04215a9f.patch"; - sha256 = "sha256-vmfxK4ddG6Xon//rpiz6OiBsDLtT0VG5XyBJG3E4PPs="; - }) ]; nativeBuildInputs = [ @@ -84,7 +77,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Desktop integration portals for sandboxed apps"; - license = licenses.lgpl21; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; From 08372f66b28b904199f37b2c388e2aadd2d0ba54 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 Feb 2022 10:41:25 +0100 Subject: [PATCH 22/58] =?UTF-8?q?xdg-desktop-portal-gtk:=201.10.0=20?= =?UTF-8?q?=E2=86=92=201.12.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/flatpak/xdg-desktop-portal-gtk/releases/tag/1.12.0 --- .../xdg-desktop-portal-gtk/default.nix | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 08d695c15e53..c54cdeca6c35 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , libxml2 @@ -16,28 +15,15 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "7w+evZLtmTmDHVVsw25bJz99xtlSCE8qTFSxez9tlZk="; + sha256 = "I1ZoDqZQPfPwPr4Ybk+syz+YEkrK2ReflZaJJWD4Nsk="; }; - patches = [ - # Fix broken translation. - # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/353 - (fetchpatch { - url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/e34f49ca8365801a7fcacccb46ab1e62aec17435.patch"; - sha256 = "umMsSP0fuSQgxlHLaZlg25ln1aAL1mssWzPMIWAOUt4="; - }) - (fetchpatch { - url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/19c5385b9f5fe0f8dac8ae7cc4493bb08f802de6.patch"; - sha256 = "nbmOb5er20zBOO4K2geYITafqBaNHbDpq1OOvIVD6hY="; - }) - ]; - nativeBuildInputs = [ autoreconfHook libxml2 @@ -54,13 +40,18 @@ stdenv.mkDerivation rec { gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) ]; - configureFlags = lib.optionals buildPortalsInGnome [ + configureFlags = if buildPortalsInGnome then [ "--enable-wallpaper" "--enable-screenshot" "--enable-screencast" "--enable-background" "--enable-settings" "--enable-appchooser" + ] else [ + # These are now enabled by default, even though we do not need them for GNOME. + # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/355 + "--disable-settings" + "--disable-appchooser" ]; meta = with lib; { From 87fddd120efc5ce1aa2d6e825610841a68e7aa54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 05:18:33 +0000 Subject: [PATCH 23/58] flyctl: 0.0.297 -> 0.0.298 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 5fac42ab7b24..953f9292a5bf 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.297"; + version = "0.0.298"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-Ug/dGHj3prgmiIr6tkEYveTwGPUI0ivy6UtuU5QoJ2U="; + sha256 = "sha256-kAwiksKksrOageiBSXKFJbWRWvH3anQ50gghS3Ov6R4="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-EwMPPZOZ0xE1DKvaU7+PrUH+Ty6ut3UYJZSY4EqXFWo="; + vendorSha256 = "sha256-iq2mT4O4E3JpKsS1sgQMFqAXp72OpUIZW54ySZi9Ydo="; doCheck = false; From 1986e432438ec82092dbf5c56e97ca340de511f7 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 20 Feb 2022 22:59:53 -0800 Subject: [PATCH 24/58] signify: allow cross-compilation --- pkgs/tools/security/signify/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix index fb3df51167b4..3ac6f58dce94 100644 --- a/pkgs/tools/security/signify/default.nix +++ b/pkgs/tools/security/signify/default.nix @@ -16,10 +16,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbsd ]; - preInstall = '' - export PREFIX=$out + postPatch = '' + substituteInPlace Makefile --replace "shell pkg-config" "shell $PKG_CONFIG" ''; + installFlags = [ "PREFIX=$(out)" ]; + meta = with lib; { description = "OpenBSD signing tool"; longDescription = '' From 91f3a4593ca072dd68c512a193a43886b252f1a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 08:05:12 +0000 Subject: [PATCH 25/58] cinnamon.xreader: 3.2.2 -> 3.3.0 --- pkgs/desktops/cinnamon/xreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index 147c36cbda40..9864e1c0e18b 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.2.2"; + version = "3.3.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-rAPc4RF2uXp1hI8/8PXDYy3DnL5vNR8rF/EEixO0FXI="; + sha256 = "sha256-wBrP5SHGPvH/Gz9QY253zQuf8WSjV19oNB5aIqXGLZ8="; }; nativeBuildInputs = [ From 0459cdeaed59a69d78308cd2ed0327d3b4ce13c6 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Wed, 23 Feb 2022 09:14:44 +0100 Subject: [PATCH 26/58] dbeaver: 21.3.4 -> 21.3.5 --- pkgs/applications/misc/dbeaver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 43bcef4c8df6..e87e9ba4092b 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.3.4"; # When updating also update fetchedMavenDeps.sha256 + version = "21.3.5"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-n8QaOYFLQYxJcq/+7bBIKuYtqeIJIwa8b1pniH+FMXk="; + sha256 = "sha256-xJYC+p8HeY4XOzArZMKRvOafW82npMMfwlqlxsH6Ycg="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-fJs/XM8PZqm/CrhShtcy4R/4s8dCc1WdXIvYSCYZ4dw="; + outputHash = "sha256-WAB15d4UvUOkBXT7K/hvAZWOE3V1Lpl/tr+AFNBM4FI="; }; nativeBuildInputs = [ From 15f46a561ddb2b4d3b685f8488e506a11c9aafed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 09:51:31 +0000 Subject: [PATCH 27/58] amdvlk: 2022.Q1.1 -> 2022.Q1.3 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 16fb32cf011f..1001dc62673a 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2022.Q1.1"; + version = "2022.Q1.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "jdAFIC2JYPqCADx/73KM6E3rLFWF4SlEdY9lCK1NOhU="; + sha256 = "UBvHWgC/s00XPn87DAmQ65NszFMoZSXwbrVG064HFng="; }; buildInputs = [ From 18bcf6138827a16fdc09c3599fb516781c41e464 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 10:31:30 +0000 Subject: [PATCH 28/58] python310Packages.pontos: 22.2.2 -> 22.2.4 --- pkgs/development/python-modules/pontos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 6acd81854681..d36c5d7e7ae3 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "22.2.2"; + version = "22.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - hash = "sha256-9QnimA9y5mVgJA9LkDVC+eNyp6Ltvw+fErtoSVL/1iw="; + hash = "sha256-RmMlwnAJlCTDnTyim0MdAeW3NA8r2IiqrE0YeWgxUk4="; }; nativeBuildInputs = [ From 4ce30abaf613c4ff11886fd3d1f6327697b508f1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 23 Feb 2022 09:42:33 +0100 Subject: [PATCH 29/58] =?UTF-8?q?ostree:=202021.6=20=E2=86=92=202022.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/ostreedev/ostree/releases/tag/v2022.1 Also fix `libostree/test-basic-user.sh.test` and `libostree/test-basic-user-only.sh.test` installed tests (another instance of https://github.com/ostreedev/ostree/issues/1592). There is one new broken test `libostree/test-cli-extensions.sh.test` due to https://github.com/ostreedev/ostree/issues/2553 --- ...ial-httpd-CLI-move-to-tests-director.patch | 46 +++++++++-------- pkgs/tools/misc/ostree/default.nix | 8 +-- pkgs/tools/misc/ostree/fix-1592.patch | 49 ++++++++++++------- 3 files changed, 56 insertions(+), 47 deletions(-) diff --git a/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch b/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch index a6b7af5f1c79..c255a2762017 100644 --- a/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch +++ b/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch @@ -1,4 +1,4 @@ -From 977fdfad2ceba7232b4f78144b20640d7fd0aedb Mon Sep 17 00:00:00 2001 +From 196c2e1036ed990bca57c199f271c0359509e9f9 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 19 Jun 2018 09:34:18 -0400 Subject: [PATCH] Drop "ostree trivial-httpd" CLI, move to tests directory @@ -14,19 +14,19 @@ Also at this point nothing should depend on `ostree trivial-httpd`. Makefile-ostree.am | 7 --- Makefile-tests.am | 7 +++ configure.ac | 9 --- - man/ostree-trivial-httpd.xml | 118 ----------------------------------- + man/ostree-trivial-httpd.xml | 116 ----------------------------------- src/ostree/main.c | 5 -- tests/libtest.sh | 13 ++-- - 7 files changed, 12 insertions(+), 153 deletions(-) + 7 files changed, 12 insertions(+), 151 deletions(-) delete mode 100644 man/ostree-trivial-httpd.xml diff --git a/Makefile-man.am b/Makefile-man.am -index bc58103b..bcfde285 100644 +index 78025fff..4aa668f6 100644 --- a/Makefile-man.am +++ b/Makefile-man.am -@@ -34,12 +34,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \ +@@ -32,12 +32,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \ ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \ - ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \ + ostree-rev-parse.1 ostree-show.1 ostree-sign.1 ostree-summary.1 \ ostree-static-delta.1 -if USE_LIBSOUP -man1_files += ostree-trivial-httpd.1 @@ -38,10 +38,10 @@ index bc58103b..bcfde285 100644 if BUILDOPT_FUSE man1_files += rofiles-fuse.1 diff --git a/Makefile-ostree.am b/Makefile-ostree.am -index f861afe4..497d99b0 100644 +index 82af1681..dabc7004 100644 --- a/Makefile-ostree.am +++ b/Makefile-ostree.am -@@ -144,13 +144,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c +@@ -138,13 +138,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c endif if USE_LIBSOUP @@ -56,10 +56,10 @@ index f861afe4..497d99b0 100644 # This is necessary for the cookie jar bits ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS) diff --git a/Makefile-tests.am b/Makefile-tests.am -index fc2f2d91..7343b63f 100644 +index 6bae65cf..47b3ab20 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am -@@ -263,6 +263,13 @@ _installed_or_uninstalled_test_programs += \ +@@ -275,6 +275,13 @@ _installed_or_uninstalled_test_programs += \ $(NULL) endif @@ -74,10 +74,10 @@ index fc2f2d91..7343b63f 100644 test_programs += tests/test-repo-finder-avahi endif diff --git a/configure.ac b/configure.ac -index 46a900f5..2f91cdec 100644 +index 93b98cb9..a588eea6 100644 --- a/configure.ac +++ b/configure.ac -@@ -190,14 +190,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi +@@ -186,14 +186,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno) AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes) @@ -92,20 +92,20 @@ index 46a900f5..2f91cdec 100644 AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [ AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)]) ]) -@@ -617,7 +609,6 @@ echo " - Rust (internal oxidation): $rust_debug_release +@@ -606,7 +598,6 @@ echo " + introspection: $found_introspection rofiles-fuse: $enable_rofiles_fuse HTTP backend: $fetcher_backend - \"ostree trivial-httpd\": $enable_trivial_httpd_cmdline SELinux: $with_selinux + fs-verity: $ac_cv_header_linux_fsverity_h cryptographic checksums: $with_crypto - systemd: $have_libsystemd diff --git a/man/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml deleted file mode 100644 -index d03c12be..00000000 +index 7ba1dae8..00000000 --- a/man/ostree-trivial-httpd.xml +++ /dev/null -@@ -1,118 +0,0 @@ +@@ -1,116 +0,0 @@ - - @@ -126,9 +126,7 @@ index d03c12be..00000000 -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public --License along with this library; if not, write to the --Free Software Foundation, Inc., 59 Temple Place - Suite 330, --Boston, MA 02111-1307, USA. +-License along with this library. If not, see . ---> - - @@ -225,7 +223,7 @@ index d03c12be..00000000 - - diff --git a/src/ostree/main.c b/src/ostree/main.c -index a523ff9a..61ea742d 100644 +index 7d17080c..19d9b8b0 100644 --- a/src/ostree/main.c +++ b/src/ostree/main.c @@ -118,11 +118,6 @@ static OstreeCommand commands[] = { @@ -241,10 +239,10 @@ index a523ff9a..61ea742d 100644 }; diff --git a/tests/libtest.sh b/tests/libtest.sh -index 3f5fd931..eacd96de 100755 +index 686f08dc..79f8bd1f 100755 --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -160,15 +160,12 @@ fi +@@ -174,15 +174,12 @@ fi if test -n "${OSTREE_UNINSTALLED:-}"; then OSTREE_HTTPD=${OSTREE_UNINSTALLED}/ostree-trivial-httpd else @@ -266,5 +264,5 @@ index 3f5fd931..eacd96de 100755 files_are_hardlinked() { -- -2.25.0 +2.35.1 diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index b5b23ee6a2ad..a4ecb4c527aa 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -20,7 +20,7 @@ , autoconf , automake , libtool -, fuse +, fuse3 , util-linuxMinimal , libselinux , libsodium @@ -41,13 +41,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2021.6"; + version = "2022.1"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-6AYxyxNj1HNP6dDJH2mmi+OEgWbW4EgdsZzkSpy09TE="; + sha256 = "sha256-Q6AOeFaEK4o09mFvws4c4jjvQyEMykH3DmtLDSqfytU="; }; patches = [ @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { libsoup glib-networking gpgme - fuse + fuse3 libselinux libsodium libcap diff --git a/pkgs/tools/misc/ostree/fix-1592.patch b/pkgs/tools/misc/ostree/fix-1592.patch index 1eccd74bfa7d..6b154d3def18 100644 --- a/pkgs/tools/misc/ostree/fix-1592.patch +++ b/pkgs/tools/misc/ostree/fix-1592.patch @@ -1,8 +1,19 @@ +--- a/tests/basic-test.sh ++++ b/tests/basic-test.sh +@@ -226,7 +226,7 @@ cd ${test_tmpdir} + if $OSTREE commit ${COMMIT_ARGS} -b test-bootable --bootable $test_tmpdir/checkout-test2-4 2>err.txt; then + fatal "committed non-bootable tree" + fi +-assert_file_has_content err.txt "error: .*No such file or directory" ++assert_file_has_content err.txt "error:.*No such file or directory" + echo "ok commit fails bootable if no kernel" + + cd ${test_tmpdir} diff --git a/tests/pull-test.sh b/tests/pull-test.sh -index a8bc49a9..4a08ebb5 100644 +index f4084290..4af5ec6f 100644 --- a/tests/pull-test.sh +++ b/tests/pull-test.sh -@@ -275,7 +275,7 @@ +@@ -297,7 +297,7 @@ ostree_repo_init mirrorrepo-local --mode=archive if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then fatal "pull with mixed refs succeeded?" fi @@ -11,7 +22,7 @@ index a8bc49a9..4a08ebb5 100644 ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo localbranch ${CMD_PREFIX} ostree --repo=mirrorrepo-local rev-parse localbranch ${CMD_PREFIX} ostree --repo=mirrorrepo-local fsck -@@ -286,7 +286,7 @@ +@@ -308,7 +308,7 @@ if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo nosuchbranc fatal "pulled nonexistent branch" fi # So true @@ -20,7 +31,7 @@ index a8bc49a9..4a08ebb5 100644 echo "ok pull-local nonexistent branch" cd ${test_tmpdir} -@@ -593,5 +593,5 @@ +@@ -687,5 +687,5 @@ rm ostree-srv/gnomerepo/summary if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then fatal "pull of invalid ref succeeded" fi @@ -28,10 +39,10 @@ index a8bc49a9..4a08ebb5 100644 +assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' echo "ok pull got HTML for a ref" diff --git a/tests/test-config.sh b/tests/test-config.sh -index 7e913d32..69d1675d 100755 +index 2d9aaf53..f1e28614 100755 --- a/tests/test-config.sh +++ b/tests/test-config.sh -@@ -46,7 +46,7 @@ +@@ -44,7 +44,7 @@ assert_file_has_content list.txt "http://example\.com/ostree/repo/" if ${CMD_PREFIX} ostree config --repo=repo get --group=core lock-timeout-secs extra 2>err.txt; then assert_not_reached "ostree config get should error out if too many arguments are given" fi @@ -40,7 +51,7 @@ index 7e913d32..69d1675d 100755 echo "ok config get" ${CMD_PREFIX} ostree config --repo=repo set core.mode bare-user-only -@@ -63,7 +63,7 @@ +@@ -61,7 +61,7 @@ assert_file_has_content repo/config "http://example\.com/ostree/" if ${CMD_PREFIX} ostree config --repo=repo set --group=core lock-timeout-secs 120 extra 2>err.txt; then assert_not_reached "ostree config set should error out if too many arguments are given" fi @@ -48,8 +59,8 @@ index 7e913d32..69d1675d 100755 +assert_file_has_content err.txt "Too many arguments given" echo "ok config set" - # Check that "ostree config unset" works -@@ -78,7 +78,7 @@ + # Check that using `--` works and that "ostree config unset" works +@@ -78,7 +78,7 @@ if ${CMD_PREFIX} ostree config --repo=repo get core.lock-timeout-secs 2>err.txt; fi # Check for any character where quotation marks would be as they appear differently in the Fedora and Debian # test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839 @@ -58,7 +69,7 @@ index 7e913d32..69d1675d 100755 # Check that it's idempotent ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs -@@ -95,5 +95,5 @@ +@@ -95,5 +95,5 @@ ${CMD_PREFIX} ostree config --repo=repo unset --group='remote "aoeuhtns"' 'xa.ti if ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs extra 2>err.txt; then assert_not_reached "ostree config unset should error out if too many arguments are given" fi @@ -66,10 +77,10 @@ index 7e913d32..69d1675d 100755 +assert_file_has_content err.txt "Too many arguments given" echo "ok config unset" diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh -index dc6bcfeb..4a5eef55 100755 +index 3dbcdd23..d6359979 100755 --- a/tests/test-fsck-collections.sh +++ b/tests/test-fsck-collections.sh -@@ -100,7 +100,7 @@ +@@ -98,7 +98,7 @@ ${CMD_PREFIX} ostree fsck --repo=repo if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi @@ -78,7 +89,7 @@ index dc6bcfeb..4a5eef55 100755 assert_file_has_content fsck "^Validating refs\.\.\.$" echo "ok 3 fsck detects missing ref bindings" -@@ -113,7 +113,7 @@ +@@ -111,7 +111,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.Collect if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi @@ -87,7 +98,7 @@ index dc6bcfeb..4a5eef55 100755 assert_file_has_content fsck "^Validating refs\.\.\.$" assert_file_has_content fsck "^Validating refs in collections\.\.\.$" -@@ -127,7 +127,7 @@ +@@ -125,7 +125,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.Collect if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi @@ -96,7 +107,7 @@ index dc6bcfeb..4a5eef55 100755 assert_file_has_content fsck "^Validating refs\.\.\.$" assert_file_has_content fsck "^Validating refs in collections\.\.\.$" -@@ -147,7 +147,7 @@ +@@ -145,7 +145,7 @@ echo "ok 6 fsck ignores unreferenced ref bindings" if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi @@ -105,7 +116,7 @@ index dc6bcfeb..4a5eef55 100755 assert_file_has_content fsck "^Validating refs\.\.\.$" assert_file_has_content fsck "^Validating refs in collections\.\.\.$" -@@ -186,7 +186,7 @@ +@@ -184,7 +184,7 @@ ${CMD_PREFIX} ostree --repo=repo refs --create=new-ref $(cat ref3-checksum) if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi @@ -114,7 +125,7 @@ index dc6bcfeb..4a5eef55 100755 assert_file_has_content fsck "^Validating refs\.\.\.$" echo "ok 9 fsck detects missing ref bindings" -@@ -205,7 +205,7 @@ +@@ -203,7 +203,7 @@ echo "ok 10 fsck ignores unreferenced ref bindings" if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi @@ -124,10 +135,10 @@ index dc6bcfeb..4a5eef55 100755 echo "ok 11 fsck ignores unreferenced ref bindings" diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh -index bb7eae89..62a3bcd7 100755 +index 2f5ea634..0f63853c 100755 --- a/tests/test-remote-add.sh +++ b/tests/test-remote-add.sh -@@ -83,7 +83,7 @@ +@@ -81,7 +81,7 @@ echo "ok remote delete" if $OSTREE remote delete nosuchremote 2>err.txt; then assert_not_reached "Deleting remote unexpectedly succeeded" fi From 2d9b86e991b98b018f6f31818af46909642ebb0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 10:50:23 +0000 Subject: [PATCH 30/58] mdzk: 0.5.1 -> 0.5.2 --- pkgs/applications/misc/mdzk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index 5e98aca96a72..3144f59476b5 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdzk"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "mdzk-rs"; repo = "mdzk"; rev = version; - sha256 = "sha256-UiJ28VI4qXo04WojNaExTVQ3aTIXCQrdMbNM0DDy8A4="; + sha256 = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs="; }; - cargoSha256 = "sha256-CiA8Z1+S6+Lwms70IiRvIN83gValHuy6kHOukR2O7/Q="; + cargoSha256 = "sha256-2lPckUhnyfHaVWXzZXKliolDZiPtNl9UBZIKs6tUaNQ="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 8dcd75a367cbb2ad18f4a2e2def7ad7fa60f554d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 11:03:38 +0000 Subject: [PATCH 31/58] minio-client: 2022-02-13T23-26-13Z -> 2022-02-16T05-54-01Z --- pkgs/tools/networking/minio-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index be67bca63cf3..34f05b251b01 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-02-13T23-26-13Z"; + version = "2022-02-16T05-54-01Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-1Led0OTJO/nN8NisLD/of5IybwYOygsL4xwQmXYCxfs="; + sha256 = "sha256-Rwo4krUlBVvMw8OaKBEvOR2rRYtXNawH+s5abMm9hU0="; }; - vendorSha256 = "sha256-DDtpRKBetVyeUYk0OGddKkAEe3mqL7d+cbSdIbXeZ2s="; + vendorSha256 = "sha256-5ZgTAdj1X3Eb+Y8ATAc3RnurBoW/16qiLSLXxZZjBqQ="; subPackages = [ "." ]; From be6d29f0744910e5d47818456cb984e6133ec452 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 23 Feb 2022 20:01:05 +0800 Subject: [PATCH 32/58] python3Packages.dasbus: init at 1.6 --- .../python-modules/dasbus/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/dasbus/default.nix diff --git a/pkgs/development/python-modules/dasbus/default.nix b/pkgs/development/python-modules/dasbus/default.nix new file mode 100644 index 000000000000..96a4eccbc582 --- /dev/null +++ b/pkgs/development/python-modules/dasbus/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, pygobject3, dbus }: + +buildPythonPackage rec { + pname = "dasbus"; + version = "1.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FJrY/Iw9KYMhq1AVm1R6soNImaieR+IcbULyyS5W6U0="; + }; + + propagatedBuildInputs = [ pygobject3 ]; + checkInputs = [ dbus ]; + + meta = with lib; { + homepage = "https://github.com/rhinstaller/dasbus"; + description = "DBus library in Python3"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e7810fbf7ae..fc2bb9bf5b5a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1988,6 +1988,8 @@ in { daphne = callPackage ../development/python-modules/daphne { }; + dasbus = callPackage ../development/python-modules/dasbus { }; + dash = callPackage ../development/python-modules/dash { }; dash-core-components = callPackage ../development/python-modules/dash-core-components { }; From 36c1ca8260c2db27083066457331ff395f871371 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 23 Feb 2022 04:27:32 -0800 Subject: [PATCH 33/58] libsForQt5.krohnkite: 0.7 -> 0.8.2 * libsForQt5.krohnkite: 0.7 -> 0.8.1 (#160024) * libsForQt5.krohnkite: 0.8.1 -> 0.8.2 v0.8.1 will only work with KWin >= v5.24.0 Co-authored-by: Renaud --- pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix index 95480bc5b968..23802bef97bd 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "krohnkite"; - version = "0.7"; + version = "0.8.2"; src = fetchFromGitHub { owner = "esjeon"; repo = "krohnkite"; rev = "v${version}"; - sha256 = "0j3rm1w6d545qlmx02xs72b5zsigm48hp7lp7yh30z3cjqm00aap"; + hash = "sha256-HZCD5884pHuHey+d+HRx/F/Sp1b6ZUy7MdqqZ08H0lU="; }; buildInputs = [ From ce422e76a5aabf5f247c064b7b44409bf2d80f0e Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Wed, 23 Feb 2022 14:30:04 +0200 Subject: [PATCH 34/58] mpd-discord-rpc: 1.3.0 -> 1.4.0 --- pkgs/tools/audio/mpd-discord-rpc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/tools/audio/mpd-discord-rpc/default.nix index 052488dc795b..a00506c94b39 100644 --- a/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "mpd-discord-rpc"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "JakeStanger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b6V9puPFufQcTI5o88MbHf5+j+agJAr+DPYieVy+T6M="; + sha256 = "sha256-Vo/7vWTpriet0hsxfx9Uj8UWfJZbuwgVSSpxA1vVjXI="; }; - cargoSha256 = "sha256-U4wbKfRUC0sL9SistPNZjAGuXZB+XD1llAru33EAOHE="; + cargoSha256 = "sha256-sj6qsYnFc86Fz2xPhkdh7I59muAPeYFA9qVGw9FtLFE="; meta = with lib; { description = "Rust application which displays your currently playing song / album / artist from MPD in Discord using Rich Presence"; From 70f8a206e64c4d55fba4b0302795450559b3d6a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Feb 2022 13:48:44 +0100 Subject: [PATCH 35/58] python3Packages.pywizlight: 0.5.12 -> 0.5.13 --- pkgs/development/python-modules/pywizlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index cff482c1f6c5..707a82054cba 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pywizlight"; - version = "0.5.12"; + version = "0.5.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sbidy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1clvZyuRFS9URftjz0YDDAqR3FlBLTpTQJg4LjBME/8="; + sha256 = "sha256-UePrG49Q2tJq3f2QaW4BjbWHHif6cTFGdiO/DZfpMFA="; }; propagatedBuildInputs = [ From 3c4fb6d5c1d85c20d68871eed1ddff0de508395c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 23 Feb 2022 05:00:05 -0800 Subject: [PATCH 36/58] gromit-mpx: 1.4.1 -> 1.4.2 * gromit-mpx: 1.4.1 -> 1.4.2 (#159898) * gromit-mpx: use SPDX3 license identifier Co-authored-by: Renaud --- pkgs/tools/graphics/gromit-mpx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 74a0943afe33..122dfe8a8bf1 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "gromit-mpx"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; rev = version; - sha256 = "sha256-K+NJagRdxnFw410pHDP+OY6yyFu/7mhLvZ8DIz08dsA="; + sha256 = "sha256-2inmcKSdvHs7WaU095liH12Og9ezsNSs2qygltWOclw="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bk138/gromit-mpx"; maintainers = with maintainers; [ pjones ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } From b041085bb11f050c08cfcccdef7c61508dac52a9 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 23 Feb 2022 13:10:55 +0000 Subject: [PATCH 37/58] trivy: 0.23.0 -> 0.24.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 47320eff7798..f32a11b73a37 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6eOoFZ2ms1upnbO4brKYKBSPw/9cnQT1Cz/0A4dwoxc="; + sha256 = "sha256-kpM/9bRUpcqF7dXlCS01Fn8TBfeW9Rr92pBd6w6HA30="; }; - vendorSha256 = "sha256-ZHVcLmjz7cfL5CjUwCEoWr5fgWZmNsCzHL83Mr+p7kA="; + vendorSha256 = "sha256-lLIlPzmXdz7kY7EEb+l4hUvM7y+1pDNK06/0lB0g2SM="; excludedPackages = "misc"; From 94bebb637cd33f0a312d4bdd39998c25cde40e4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 13:18:55 +0000 Subject: [PATCH 38/58] python310Packages.simple-di: 0.1.4 -> 0.1.5 --- pkgs/development/python-modules/simple-di/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simple-di/default.nix b/pkgs/development/python-modules/simple-di/default.nix index 612d913b7b6f..d49d57656b18 100644 --- a/pkgs/development/python-modules/simple-di/default.nix +++ b/pkgs/development/python-modules/simple-di/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "simple_di"; - version = "0.1.4"; + version = "0.1.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "2667f2b9095e86c7726b3853c30b37f527f7d247282c7dd0b3428a7fb5d1a8a9"; + sha256 = "sha256-GSuZne5M1PsRpdhhFlyq0C2PBhfA+Ab8Wwn5BfGgPKA="; }; propagatedBuildInputs = [ From 469ae42107cadab393a5fda7de8fb49618a92e39 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 23 Feb 2022 14:47:26 +0100 Subject: [PATCH 39/58] gromacs: 2021.5 -> 2022 --- .../science/molecular-dynamics/gromacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index dd4bb6ef1425..69810f95b846 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2021.5"; + version = "2022"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "1dh9l2gcv61h1r6qsg8vr3k1xp8jgd27czzg24kzf4k823k3z9pb"; + sha256 = "0s1bv8nvmdpiyk2yhcmzq8q936hm5jgnqb393101drh2dih0vmps"; }; nativeBuildInputs = [ cmake ]; From f32c9135963082f19d07a81d0d4acd6d460d1b9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Feb 2022 14:01:35 +0000 Subject: [PATCH 40/58] python310Packages.karton-config-extractor: 2.0.1 -> 2.0.2 --- .../python-modules/karton-config-extractor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix index 71170ac5342e..80a930e1a08d 100644 --- a/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "karton-config-extractor"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "1kq0gbfz9y0n0bcblyrmwv4la3lcf86lf80794sdvyvn49g0brny"; + sha256 = "sha256-r0WMtfau5zeVDSjxy2h96INQl8bm4EP0IAcgnGPhTtk="; }; propagatedBuildInputs = [ From 82646d94992d5abaa9b01d45e8b108364d354799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 19 Feb 2022 16:30:25 +0100 Subject: [PATCH 41/58] firmware-updater: fix license --- pkgs/os-specific/linux/firmware/firmware-updater/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix index 69cd829049ca..f6aafaa831bb 100644 --- a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -20,7 +20,7 @@ flutter.mkFlutterApp { meta = with lib; { description = "Firmware Updater for Linux"; homepage = "https://github.com/canonical/firmware-updater"; - license = licenses.free; + license = licenses.gpl3Only; maintainers = with maintainers; [ mkg20001 ]; platforms = platforms.linux; }; From 847b557ef35ad873acc4ddc53036b80b5d996a81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 19 Feb 2022 17:22:42 +0100 Subject: [PATCH 42/58] flutter.mkFlutterApp: disable fetch buildPhase Otherwise it tries to run some other commands, this prevents that Co-authored-by: Sandro --- pkgs/build-support/flutter/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 5208dbc7d05d..a3ddf99dcca6 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -63,6 +63,9 @@ let nukeReferences ]; + # avoid pub phase + dontBuild = true; + installPhase = '' . ${../fetchgit/deterministic-git} @@ -207,6 +210,7 @@ let # ensure we're using a lockfile for the right package version if [ -e pubspec.lock ]; then + # FIXME: currently this is broken. in theory this should not break, but flutter has it's own way of doing things. # diff -u pubspec.lock $depsFolder/pubspec.lock true else From 1495ce56ba94da18c6a8b7ea07c869c17899c5cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 20 Feb 2022 10:53:57 +0100 Subject: [PATCH 43/58] flutter.mkFlutterApp: allow extra fetch commands Co-authored-by: Sandro --- pkgs/build-support/flutter/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index a3ddf99dcca6..8d84b403518a 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -79,6 +79,7 @@ let flutter config --enable-linux-desktop flutter packages get flutter build linux || true # so it downloads tools + ${lib.optionalString (args ? flutterExtraFetchCommands) args.flutterExtraFetchCommands} RES="$TMP" @@ -130,6 +131,7 @@ let ''; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" "NIX_GIT_SSL_CAINFO" "SOCKS_SERVER" From b39b297b207abd478f55e3a980f164f24f24e8eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 19 Feb 2022 20:26:30 +0100 Subject: [PATCH 44/58] duckscript: init at 0.8.10 --- .../tools/rust/duckscript/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/tools/rust/duckscript/default.nix diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix new file mode 100644 index 000000000000..aabb8b94c810 --- /dev/null +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +, runCommand +, fetchCrate +, rustPlatform +, Security +, openssl +, pkg-config +, SystemConfiguration +, libiconv +}: + +rustPlatform.buildRustPackage rec { + pname = "duckscript_cli"; + version = "0.8.10"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-cMvcCX8ViCcUFMuxAPo3/wxXvg5swAcBrLx1x7lSwvM="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; + + cargoSha256 = "sha256-8ywMLXFmdq119K/hl1hpsVhzG+nrdO4eux3lAqUjB+A="; + + meta = with lib; { + description = "Simple, extendable and embeddable scripting language."; + homepage = "https://github.com/sagiegurari/duckscript"; + license = licenses.asl20; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b69adcd4c524..e30157ec9781 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13606,6 +13606,10 @@ with pkgs; duktape = callPackage ../development/interpreters/duktape { }; + duckscript = callPackage ../development/tools/rust/duckscript { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; + evcxr = callPackage ../development/interpreters/evcxr { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; From 2c686d250e03c0d951dd9190df803fb25b639123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 19 Feb 2022 22:00:05 +0100 Subject: [PATCH 45/58] flutter: 2.10.0 -> 2.10.1 --- pkgs/development/compilers/flutter/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 6f6130c36785..9eba67734485 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -4,20 +4,20 @@ let getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - version = "2.10.0"; + version = "2.10.1"; channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; # Decouples flutter derivation from dart derivation, # use specific dart version to not need to bump dart derivation when bumping flutter. - dartVersion = "2.16.0"; + dartVersion = "2.16.1"; dartSourceBase = "https://storage.googleapis.com/dart-archive/channels"; dartForFlutter = dart.override { version = dartVersion; sources = { "${dartVersion}-x86_64-linux" = fetchurl { url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "sha256-n+hr3iMt5S0iEeR/X9zBQ86TbjCajaG0RyE+Ij1/aNM="; + sha256 = "sha256-PMY6DCFQC8XrlnFzOEPcwgBAs5/cAvNd78969Z+I1Fk="; }; }; }; @@ -29,7 +29,7 @@ in { pname = "flutter"; src = fetchurl { url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}"; - sha256 = "sha256-4ZEpZPGVnisnK9QT1o4G2G6CiflYElh+e3+X8odnx1U="; + sha256 = "sha256-rSfwcglDV2rvJl10j7FByAWmghd2FYxrlkgYnvRO54Y="; }; patches = getPatches ./patches; }; From 5ecd24b0432f705a6d1fcf0845a5a411ce84893e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 19 Feb 2022 22:01:02 +0100 Subject: [PATCH 46/58] firmware-updater: update vendor hash --- pkgs/os-specific/linux/firmware/firmware-updater/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix index f6aafaa831bb..02b549dd9ea1 100644 --- a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -7,7 +7,7 @@ flutter.mkFlutterApp { pname = "firmware-updater"; version = "unstable"; - vendorHash = "sha256-QgeRCFbd3AcFekJunFTwu2nDOQpAOMJUxZhgY4stJJc="; + vendorHash = "sha256-L8am4vTx4KlMHUdIhrUsCxGc27vkolawS/9DyFCPOJQ="; src = fetchFromGitHub { owner = "canonical"; From 141644ff03365689664e9905528d7730b8b44130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 19 Feb 2022 22:06:12 +0100 Subject: [PATCH 47/58] fluffychat: fix olm Co-authored-by: Sandro --- .../instant-messengers/fluffychat/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index e567f18fe7b1..2e0f9a86e3d4 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -8,7 +8,7 @@ flutter.mkFlutterApp rec { pname = "fluffychat"; version = "1.2.0"; - vendorHash = "sha256-Qg0IlajbIl8e3BkKgn4O+mbZGvhfqr7XwllBLJQAA/I="; + vendorHash = "sha256-slQeCECItZirEVf3agB8mqhTg6/JLsErFV2yDj4M3k0="; src = fetchFromGitLab { owner = "famedly"; @@ -21,6 +21,17 @@ flutter.mkFlutterApp rec { olm ]; + flutterExtraFetchCommands = '' + M=$(echo $TMP/.pub-cache/hosted/pub.dartlang.org/matrix-*) + sed -i $M/scripts/prepare.sh \ + -e "s|/usr/lib/x86_64-linux-gnu/libolm.so.3|${olm}/lib/libolm.so.3|g" \ + -e "s|if which flutter >/dev/null; then|exit; if which flutter >/dev/null; then|g" + + pushd $M + bash scripts/prepare.sh + popd + ''; + meta = with lib; { description = "Chat with your friends (matrix client)"; homepage = "https://fluffychat.im/"; From 0bd82b7767fcadf1bcc6d3a7c5b2b05c70340a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 20 Feb 2022 18:44:18 +0100 Subject: [PATCH 48/58] flutter.mkFlutterApp: fix installing .desktop Previously this was pulling from $built, which got moved to $out/app, so the glob didn't do anything. Now uses find on $out/app --- pkgs/build-support/flutter/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 8d84b403518a..691b2c5c6e60 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -254,9 +254,10 @@ let mkdir -p $out/bin mv $built $out/app - for f in $built/data/flutter_assets/assets/*.desktop; do + for f in $(find $out/app -iname "*.desktop" -type f); do install -D $f $out/share/applications/$(basename $f) done + for f in $(find $out/app -maxdepth 1 -type f); do ln -s $f $out/bin/$(basename $f) done From c625e715f857ff2401658f0aa5b1e7c7681d0a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 20 Feb 2022 19:05:42 +0100 Subject: [PATCH 49/58] fluffychat: add .desktop --- .../instant-messengers/fluffychat/default.nix | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 2e0f9a86e3d4..fdb822934383 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -2,6 +2,8 @@ , fetchFromGitLab , flutter , olm +, imagemagick +, makeDesktopItem }: flutter.mkFlutterApp rec { @@ -17,10 +19,23 @@ flutter.mkFlutterApp rec { hash = "sha256-PJH3jMQc6u9R6Snn+9rNN8t+8kt6l3Xt7zKPbpqj13E="; }; + desktopItem = makeDesktopItem { + name = "Fluffychat"; + exec = "@out@/bin/fluffychat"; + icon = "fluffychat"; + desktopName = "Fluffychat"; + genericName = "Chat with your friends (matrix client)"; + categories = "Chat;Network;InstantMessaging;"; + }; + buildInputs = [ olm ]; + nativeBuildInputs = [ + imagemagick + ]; + flutterExtraFetchCommands = '' M=$(echo $TMP/.pub-cache/hosted/pub.dartlang.org/matrix-*) sed -i $M/scripts/prepare.sh \ @@ -32,6 +47,24 @@ flutter.mkFlutterApp rec { popd ''; + postInstall = '' + FAV=$out/app/data/flutter_assets/assets/favicon.png + ICO=$out/share/icons + + install -D $FAV $ICO/fluffychat.png + mkdir $out/share/applications + cp $desktopItem/share/applications/*.desktop $out/share/applications + + for s in 24 32 42 64 128 256 512; do + D=$ICO/hicolor/''${s}x''${s}/apps + mkdir -p $D + convert $FAV -resize ''${s}x''${s} $D/fluffychat.png + done + + substituteInPlace $out/share/applications/*.desktop \ + --subst-var out + ''; + meta = with lib; { description = "Chat with your friends (matrix client)"; homepage = "https://fluffychat.im/"; From 147a51467ade5d65f5cc2927d62f29a50deec040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 23 Feb 2022 15:09:47 +0100 Subject: [PATCH 50/58] fluffychat: fix olm FOD --- .../instant-messengers/fluffychat/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index fdb822934383..99aef1526d54 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -10,7 +10,7 @@ flutter.mkFlutterApp rec { pname = "fluffychat"; version = "1.2.0"; - vendorHash = "sha256-slQeCECItZirEVf3agB8mqhTg6/JLsErFV2yDj4M3k0="; + vendorHash = "sha256-j5opwEFifa+DMG7Uziv4SWEPVokD6OSq8mSIr0AdDL0="; src = fetchFromGitLab { owner = "famedly"; @@ -39,7 +39,7 @@ flutter.mkFlutterApp rec { flutterExtraFetchCommands = '' M=$(echo $TMP/.pub-cache/hosted/pub.dartlang.org/matrix-*) sed -i $M/scripts/prepare.sh \ - -e "s|/usr/lib/x86_64-linux-gnu/libolm.so.3|${olm}/lib/libolm.so.3|g" \ + -e "s|/usr/lib/x86_64-linux-gnu/libolm.so.3|/bin/sh|g" \ -e "s|if which flutter >/dev/null; then|exit; if which flutter >/dev/null; then|g" pushd $M @@ -47,6 +47,12 @@ flutter.mkFlutterApp rec { popd ''; + # replace olm dummy path + postConfigure = '' + M=$(echo $TMP/.pub-cache/hosted/pub.dartlang.org/matrix-*) + ln -sf ${olm}/lib/libolm.so.3 $M/ffi/olm/libolm.so + ''; + postInstall = '' FAV=$out/app/data/flutter_assets/assets/favicon.png ICO=$out/share/icons From 72ddd738f4ca72f2bbe1d61f6706e644d9ff5aa2 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 23 Feb 2022 15:23:03 +0100 Subject: [PATCH 51/58] cassandra: Remove javadoc which is not shipped in new versions --- pkgs/servers/nosql/cassandra/generic.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 6e2a55b4e948..ca11b838e325 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { $out/LICENSE.txt \ $out/NEWS.txt \ $out/NOTICE.txt \ - $out/javadoc \ $out/share/doc/${pname}-${version} if [[ -d $out/doc ]]; then From 313acb6cc2cbe704f41d408ce5ae1f155e2ede28 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 23 Feb 2022 15:18:58 +0100 Subject: [PATCH 52/58] cassandra_3_0: 3.0.24 -> 3.0.26 --- pkgs/servers/nosql/cassandra/3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix index 7788e3ff381a..d9f5978f2649 100644 --- a/pkgs/servers/nosql/cassandra/3.0.nix +++ b/pkgs/servers/nosql/cassandra/3.0.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.0.24"; - sha256 = "1yxw4jg9n49dbi1mjdfpxczsznl9m6sxlzkmzjancmjzvj5s6bvz"; + version = "3.0.26"; + sha256 = "09wim1w2yizcqpja62jk64fhaw3jgnrgrjlrm4kgmcc3g3bsmw6i"; generation = "3_0"; }) From d806547debfbaa5a74ddf7533e45a83a455290ee Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 23 Feb 2022 15:19:34 +0100 Subject: [PATCH 53/58] cassandra_3_11: 3.11.10 -> 3.11.12 --- pkgs/servers/nosql/cassandra/3.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix index bcdfc8793db5..fc839fa8c356 100644 --- a/pkgs/servers/nosql/cassandra/3.11.nix +++ b/pkgs/servers/nosql/cassandra/3.11.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.11.10"; - sha256 = "1wcv0drhb765fda6kkpsxsyfdv4cqf7nqfwc4bimh4c4djap5rxv"; + version = "3.11.12"; + sha256 = "16j58l7r47qrfh8q7fm92y935ykgvnbj3qn984c42qda15x92hkw"; generation = "3_11"; }) From 621ec997e44810426bbb952a3242614512d0cca8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Feb 2022 16:17:50 +0100 Subject: [PATCH 54/58] python3Packages.karton-config-extractor: disable on older Python releses --- .../python-modules/karton-config-extractor/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix index 80a930e1a08d..ab092fc25605 100644 --- a/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -3,11 +3,15 @@ , fetchFromGitHub , karton-core , malduck +, pythonOlder }: buildPythonPackage rec { pname = "karton-config-extractor"; version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; @@ -28,7 +32,10 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "karton.config_extractor" ]; + + pythonImportsCheck = [ + "karton.config_extractor" + ]; meta = with lib; { description = "Static configuration extractor for the Karton framework"; From 9c7955d6ed06fe6c599241d3b78b67fc6f76d778 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Feb 2022 16:21:16 +0100 Subject: [PATCH 55/58] python3Packages.simple-di: add format --- .../python-modules/simple-di/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/simple-di/default.nix b/pkgs/development/python-modules/simple-di/default.nix index d49d57656b18..c79b58f8a629 100644 --- a/pkgs/development/python-modules/simple-di/default.nix +++ b/pkgs/development/python-modules/simple-di/default.nix @@ -8,13 +8,16 @@ }: buildPythonPackage rec { - pname = "simple_di"; + pname = "simple-di"; version = "0.1.5"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-GSuZne5M1PsRpdhhFlyq0C2PBhfA+Ab8Wwn5BfGgPKA="; + pname = "simple_di"; + inherit version; + hash = "sha256-GSuZne5M1PsRpdhhFlyq0C2PBhfA+Ab8Wwn5BfGgPKA="; }; propagatedBuildInputs = [ @@ -31,10 +34,10 @@ buildPythonPackage rec { # pypi distribution contains no tests doCheck = false; - meta = { + meta = with lib; { description = "Simple dependency injection library"; homepage = "https://github.com/bentoml/simple_di"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ sauyon ]; + license = licenses.asl20; + maintainers = with maintainers; [ sauyon ]; }; } From 5d2606d1f0ee0b723b073c8f7ea83cca1fdc9757 Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Mon, 21 Feb 2022 13:45:49 +0100 Subject: [PATCH 56/58] gitlab-runner: 14.7.0 -> 14.8.0 --- .../gitlab-runner/default.nix | 37 +++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 57e9d15dce66..9c57c500592f 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,31 +1,54 @@ -{ lib, buildGoPackage, fetchFromGitLab, fetchurl }: +{ lib, buildGoModule, fetchFromGitLab, fetchurl }: let - version = "14.7.0"; + version = "14.8.0"; in -buildGoPackage rec { +buildGoModule rec { inherit version; pname = "gitlab-runner"; - goPackagePath = "gitlab.com/gitlab-org/gitlab-runner"; - subPackages = [ "." ]; - commonPackagePath = "${goPackagePath}/common"; + + commonPackagePath = "gitlab.com/gitlab-org/gitlab-runner/common"; ldflags = [ "-X ${commonPackagePath}.NAME=gitlab-runner" "-X ${commonPackagePath}.VERSION=${version}" "-X ${commonPackagePath}.REVISION=v${version}" ]; + vendorSha256 = "sha256-MdGLl77DFXPudt26qICSH+1UuQAR8Rb/nl0Ykb0hjgE="; + src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0l7bbmhvgz12nq52nmvgs1qmcknikw8f2dn9l93ijb1sr495fygl"; + sha256 = "sha256-+DwOKlFu9m2kt4DwaSp/Jq3eZ/+FFxV1Q7bKOy5DfoE="; }; patches = [ ./fix-shell-path.patch ]; + prePatch = '' + # Remove some tests that can't work during a nix build + + # Requires to run in a git repo + sed -i "s/func TestCacheArchiverAddingUntrackedFiles/func OFF_TestCacheArchiverAddingUntrackedFiles/" commands/helpers/file_archiver_test.go + sed -i "s/func TestCacheArchiverAddingUntrackedUnicodeFiles/func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles/" commands/helpers/file_archiver_test.go + + # No writable developer environment + rm common/build_test.go + rm executors/custom/custom_test.go + + # No docker during build + rm executors/docker/terminal_test.go + rm executors/docker/docker_test.go + rm helpers/docker/auth/auth_test.go + ''; + + preCheck = '' + # Make the tests pass outside of GitLab CI + export CI=0 + ''; + meta = with lib; { description = "GitLab Runner the continuous integration executor of GitLab"; license = licenses.mit; From 059b8a6e28198b4a6b6581b62332ac7621dda6a5 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 23 Feb 2022 13:41:02 -0300 Subject: [PATCH 57/58] fluxcd: 0.27.0 -> 0.27.2 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index eb73fd90e5b0..be22e1f534dd 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.27.0"; - sha256 = "12d5azl30071s31dqbvbi1c5a5746cb9y45g889hgcyl50yzm2dx"; - manifestsSha256 = "0mhx9xgir9ych9p0j5yc4swf371njfbwyk3cqa1nmipgpxbfczc6"; + version = "0.27.2"; + sha256 = "0rdsc9i8mjiwyb6l9sbhxirl4i3b50m6505wwvhxz4y5arzdi1k6"; + manifestsSha256 = "0h966xqjkvrblxd62iph9vwr2h7w1ig943hi5vg0swy4674v3ybf"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-iyyGLHtJVXc7rdu2VkuGo+Y1tTS0krW7F/lD5TmjTQs="; + vendorSha256 = "sha256-xkhbGID+oI7+kLml8CveEet7gtPSty8LGv1gkqpqg6w="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests From f48ff2a079b10a25c063a9002b079dfe1987538b Mon Sep 17 00:00:00 2001 From: Shahar Dawn Or Date: Mon, 29 Nov 2021 15:37:44 +0700 Subject: [PATCH 58/58] add `/usr` neededForBoot entry to 21.11 release notes --- .../manual/from_md/release-notes/rl-2111.section.xml | 11 +++++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 3 +++ 2 files changed, 14 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 59da373f38e1..58b7c1e802d1 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1429,6 +1429,17 @@ Superuser created successfully. knob. + + + /usr will always be included in the initial + ramdisk. See the + fileSystems.<name>.neededForBoot + option. If any files exist under /usr + (which is not typical for NixOS), they will be included in the + initial ramdisk, increasing its size to a possibly problematic + extent. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 1b59842e020b..6fe838d1e7a5 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -419,6 +419,9 @@ In addition to numerous new and upgraded packages, this release has the followin - The Linux kernel for security reasons now restricts access to BPF syscalls via `BPF_UNPRIV_DEFAULT_OFF=y`. Unprivileged access can be reenabled via the `kernel.unprivileged_bpf_disabled` sysctl knob. +- `/usr` will always be included in the initial ramdisk. See the `fileSystems..neededForBoot` option. + If any files exist under `/usr` (which is not typical for NixOS), they will be included in the initial ramdisk, increasing its size to a possibly problematic extent. + ## Other Notable Changes {#sec-release-21.11-notable-changes}