From 41e97e2b78a0aec99e9c1af2dd1ff317ceab7885 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Sun, 26 Feb 2023 13:18:28 +0900 Subject: [PATCH 001/175] cyanrip: 0.8.1 -> 0.9.0 --- pkgs/applications/audio/cyanrip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cyanrip/default.nix b/pkgs/applications/audio/cyanrip/default.nix index 358c769ea07c..1828858b3cdb 100644 --- a/pkgs/applications/audio/cyanrip/default.nix +++ b/pkgs/applications/audio/cyanrip/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation rec { pname = "cyanrip"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "cyanreg"; repo = pname; rev = "v${version}"; - sha256 = "17bi2xhjv3f3i870whkyqckvjlg32wqkspash87zi0jw7m7jm229"; + sha256 = "sha256-gH/rWTRYX10Q2Y9oSaMu0bOy3SMbcSNmH3dkXHFAw90"; }; nativeBuildInputs = [ meson ninja pkg-config ]; From 8fd7b69da1b32bce2a60557154792f2fd72b0522 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sun, 26 Mar 2023 15:49:49 +0100 Subject: [PATCH 002/175] copy-tarballs: use all the urls of each file If a file specifies multiple urls, try fetching all of them until nix-prefetch-url is successful. --- maintainers/scripts/copy-tarballs.pl | 109 +++++++++++++------------- maintainers/scripts/find-tarballs.nix | 8 +- 2 files changed, 60 insertions(+), 57 deletions(-) diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index c81b49bfb599..c2e9326d8f63 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -159,13 +159,18 @@ elsif (defined $expr) { # Check every fetchurl call discovered by find-tarballs.nix. my $mirrored = 0; my $have = 0; - foreach my $fetch (sort { $a->{url} cmp $b->{url} } @{$fetches}) { - my $url = $fetch->{url}; + foreach my $fetch (sort { $a->{urls}->[0] cmp $b->{urls}->[0] } @{$fetches}) { + my $urls = $fetch->{urls}; my $algo = $fetch->{type}; my $hash = $fetch->{hash}; my $name = $fetch->{name}; my $isPatch = $fetch->{isPatch}; + if ($isPatch) { + print STDERR "skipping $urls->[0] (support for patches is missing)\n"; + next; + } + if ($hash =~ /^([a-z0-9]+)-([A-Za-z0-9+\/=]+)$/) { $algo = $1; $hash = `nix hash to-base16 $hash` or die; @@ -180,62 +185,60 @@ elsif (defined $expr) { chomp $hash; } - if (defined $ENV{DEBUG}) { - print "$url $algo $hash\n"; - next; - } - - if ($url !~ /^http:/ && $url !~ /^https:/ && $url !~ /^ftp:/ && $url !~ /^mirror:/) { - print STDERR "skipping $url (unsupported scheme)\n"; - next; - } - - if ($isPatch) { - print STDERR "skipping $url (support for patches is missing)\n"; - next; - } - - next if defined $exclude && $url =~ /$exclude/; - - if (alreadyMirrored($algo, $hash)) { - $have++; - next; - } - my $storePath = makeFixedOutputPath(0, $algo, $hash, $name); - print STDERR "mirroring $url ($storePath, $algo, $hash)...\n"; + for my $url (@$urls) { + if (defined $ENV{DEBUG}) { + print "$url $algo $hash\n"; + next; + } - if ($dryRun) { + if ($url !~ /^http:/ && $url !~ /^https:/ && $url !~ /^ftp:/ && $url !~ /^mirror:/) { + print STDERR "skipping $url (unsupported scheme)\n"; + next; + } + + next if defined $exclude && $url =~ /$exclude/; + + if (alreadyMirrored($algo, $hash)) { + $have++; + last; + } + + print STDERR "mirroring $url ($storePath, $algo, $hash)...\n"; + + if ($dryRun) { + $mirrored++; + last; + } + + # Substitute the output. + if (!isValidPath($storePath)) { + system("nix-store", "-r", $storePath); + } + + # Otherwise download the file using nix-prefetch-url. + if (!isValidPath($storePath)) { + $ENV{QUIET} = 1; + $ENV{PRINT_PATH} = 1; + my $fh; + my $pid = open($fh, "-|", "nix-prefetch-url", "--type", $algo, $url, $hash) or die; + waitpid($pid, 0) or die; + if ($? != 0) { + print STDERR "failed to fetch $url: $?\n"; + next; + } + <$fh>; my $storePath2 = <$fh>; chomp $storePath2; + if ($storePath ne $storePath2) { + warn "strange: $storePath != $storePath2\n"; + next; + } + } + + uploadFile($storePath, $url); $mirrored++; - next; + last; } - - # Substitute the output. - if (!isValidPath($storePath)) { - system("nix-store", "-r", $storePath); - } - - # Otherwise download the file using nix-prefetch-url. - if (!isValidPath($storePath)) { - $ENV{QUIET} = 1; - $ENV{PRINT_PATH} = 1; - my $fh; - my $pid = open($fh, "-|", "nix-prefetch-url", "--type", $algo, $url, $hash) or die; - waitpid($pid, 0) or die; - if ($? != 0) { - print STDERR "failed to fetch $url: $?\n"; - next; - } - <$fh>; my $storePath2 = <$fh>; chomp $storePath2; - if ($storePath ne $storePath2) { - warn "strange: $storePath != $storePath2\n"; - next; - } - } - - uploadFile($storePath, $url); - $mirrored++; } print STDERR "mirrored $mirrored files, already have $have files\n"; diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index 685a33d137ce..c47b5168abd9 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -9,12 +9,12 @@ let root = expr; - uniqueUrls = map (x: x.file) (genericClosure { - startSet = map (file: { key = file.url; inherit file; }) urls; + uniqueFiles = map (x: x.file) (genericClosure { + startSet = map (file: { key = with file; (if type == null then "" else type + "+") + hash; inherit file; }) files; operator = const [ ]; }); - urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; isPatch = (drv?postFetch && drv.postFetch != ""); type = drv.outputHashAlgo; name = drv.name; }) fetchurlDependencies; + files = map (drv: { urls = drv.urls or [ drv.url ]; hash = drv.outputHash; isPatch = (drv?postFetch && drv.postFetch != ""); type = drv.outputHashAlgo; name = drv.name; }) fetchurlDependencies; fetchurlDependencies = filter @@ -47,4 +47,4 @@ let canEval = val: (builtins.tryEval val).success; -in uniqueUrls +in uniqueFiles From c7f579c80e60d86618b77078ea45f0c57e041a58 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 15 Apr 2023 11:49:59 +0200 Subject: [PATCH 003/175] wch-isp: init at 0.2.4 https://github.com/jmaselbas/wch-isp NixOS users can load the udev rule with `services.udev.packages = [ wch-isp ];` --- pkgs/development/embedded/wch-isp/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/embedded/wch-isp/default.nix diff --git a/pkgs/development/embedded/wch-isp/default.nix b/pkgs/development/embedded/wch-isp/default.nix new file mode 100644 index 000000000000..b83b64292f4a --- /dev/null +++ b/pkgs/development/embedded/wch-isp/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, libusb1 }: + +stdenv.mkDerivation rec { + pname = "wch-isp"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "jmaselbas"; + repo = pname; + rev = "v${version}"; + hash = "sha256-YjxzfDSZRMa7B+hNqtj87nRlRuQyr51VidZqHLddgwI="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libusb1 ]; + + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + installTargets = [ "install" "install-rules" ]; + + meta = { + description = "Firmware programmer for WCH microcontrollers over USB"; + license = lib.licenses.gpl2Only; + homepage = "https://github.com/jmaselbas/wch-isp"; + maintainers = with lib.maintainers; [ lesuisse ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 261872100c73..ab1782f18330 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19086,6 +19086,8 @@ with pkgs; uisp = callPackage ../development/embedded/uisp { }; + wch-isp = callPackage ../development/embedded/wch-isp { }; + uncrustify = callPackage ../development/tools/misc/uncrustify { }; universal-ctags = callPackage ../development/tools/misc/universal-ctags { }; From 47f761bd92d2a32d1700245fd4e2ceedbf6249b8 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 27 Apr 2023 12:30:46 +0200 Subject: [PATCH 004/175] osv-scanner: 1.3.1 -> 1.3.2 https://github.com/google/osv-scanner/releases/tag/v1.3.2 --- pkgs/tools/security/osv-scanner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix index 4df86e487a6c..127a0631b4cf 100644 --- a/pkgs/tools/security/osv-scanner/default.nix +++ b/pkgs/tools/security/osv-scanner/default.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "osv-scanner"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - hash = "sha256-0P7mcrswWvyqv7a/jyONt/3BSim0IvQUgzjO7swTWn0="; + hash = "sha256-xgSRaGS09a1d1qepzvkTuMtaUHh8QsKxF7RWD+0Sepg="; }; - vendorHash = "sha256-MMEkgGyetwMEiD242CPYh619o4bo4zj87jnl7HvS0OE="; + vendorHash = "sha256-9tNEPgJJ4mp4DPNgIzezS9Axed3XoJV9cyTYCOGMvgA="; subPackages = [ "cmd/osv-scanner" From 4d1f2a74912bfe8daeddfdec331ec1502daa3f19 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 3 May 2023 11:29:43 -0400 Subject: [PATCH 005/175] python310Packages.xnatpy: init at 0.5.1 --- .../python-modules/xnatpy/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/xnatpy/default.nix diff --git a/pkgs/development/python-modules/xnatpy/default.nix b/pkgs/development/python-modules/xnatpy/default.nix new file mode 100644 index 000000000000..4738f137d427 --- /dev/null +++ b/pkgs/development/python-modules/xnatpy/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, click +, isodate +, progressbar2 +, pydicom +, requests +}: + +buildPythonPackage rec { + pname = "xnatpy"; + version = "0.5.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "xnat"; + inherit version; + hash = "sha256-iOw9cVWP5Am4S9JQ0NTmtew38KZiKmau+19K2KG2aKQ="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + click + isodate + progressbar2 + pydicom + requests + ]; + + # tests missing in PyPI dist and require network access and Docker container + doCheck = false; + + pythonImportsCheck = [ "xnat" ]; + + meta = with lib; { + homepage = "https://xnat.readthedocs.io"; + description = + "A new XNAT client (distinct from pyxnat) that exposes XNAT objects/functions as Python objects/functions"; + changelog = "https://gitlab.com/radiology/infrastructure/xnatpy/-/blob/${version}/CHANGELOG?ref_type=tags"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + mainProgram = "xnat"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6cf8e29018bc..0c1180c6c801 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12932,6 +12932,8 @@ self: super: with self; { xmodem = callPackage ../development/python-modules/xmodem { }; + xnatpy = callPackage ../development/python-modules/xnatpy { }; + xnd = callPackage ../development/python-modules/xnd { }; xpath-expressions = callPackage ../development/python-modules/xpath-expressions { }; From 5ef89e7f1233eca21b389cee6bff736626084ab1 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Wed, 3 May 2023 16:05:37 +0200 Subject: [PATCH 006/175] itch: 25.5.1 -> 25.6.2 --- pkgs/games/itch/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/games/itch/default.nix b/pkgs/games/itch/default.nix index ca0a04a8492d..a075a789f9d2 100644 --- a/pkgs/games/itch/default.nix +++ b/pkgs/games/itch/default.nix @@ -1,6 +1,5 @@ { lib , stdenvNoCC -, fetchpatch , fetchzip , fetchFromGitHub , butler @@ -12,23 +11,14 @@ }: stdenvNoCC.mkDerivation rec { pname = "itch"; - version = "25.5.1"; + version = "25.6.2"; src = fetchzip { url = "https://broth.itch.ovh/${pname}/linux-amd64/${version}/itch.zip"; stripRoot = false; - sha256 = "sha256-ejfS+sqhacW2h8u96W4fout3V8xrBs0SrW5w/7X83m4="; + sha256 = "sha256-F/vaYBHCygseiKNMJ+jBy31YDIFqYToAETGUl/pkHII="; }; - patches = [ - # Fixes crash while browsing the store. - (fetchpatch { - name = "itch.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/itch.patch?h=itch-bin&id=0b181454567029141749f870880b10093216e133"; - sha256 = "sha256-gmLL/BMondSflERm0z+DuGDP56JhDXiyxEwLUavTD8Q="; - }) - ]; - itch-setup = fetchzip { url = "https://broth.itch.ovh/itch-setup/linux-amd64/1.26.0/itch-setup.zip"; stripRoot = false; @@ -39,8 +29,8 @@ stdenvNoCC.mkDerivation rec { fetchFromGitHub { owner = "itchio"; repo = pname; - rev = "v${version}"; - hash = "sha256-DZBmf8fe0zw5uiQjNKXw8g/vU2hjNDa87z/7XuhyXog="; + rev = "v25.6.1-canary"; # Use ${version} if possible + hash = "sha256-iBp7K7AW97SOlRa8N8TW2LcVtmUi9JU00fYUuPwKORc="; sparseCheckout = [ sparseCheckout ]; } + sparseCheckout; From ccfcf66751a82fd02133de1d16cdcfdd87bae63b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 4 May 2023 16:31:06 +0200 Subject: [PATCH 007/175] chromiumBeta: 113.0.5672.63 -> 114.0.5735.16 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 5a79d8908c08..2e0a3d263fba 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,15 +19,15 @@ } }, "beta": { - "version": "113.0.5672.63", - "sha256": "07pf28yy5c4xw1xkycgzq53zbj14zvhh00sv601nggisq4fw3kkn", - "sha256bin64": "1n1bcim5wfafa3bl9grp3ckmnbi1mzhdxz8pim408wz892da34zl", + "version": "114.0.5735.16", + "sha256": "1pynbzbc8wwc6g8ikx0hr95ylncpdx97y27c6wmfygwgvp91a6wa", + "sha256bin64": "098aclrhifz6cpxcjdaqvi76j3g8r84p3b6cs4fbsj4cmczj4frw", "deps": { "gn": { - "version": "2023-03-18", + "version": "2023-04-19", "url": "https://gn.googlesource.com/gn", - "rev": "41fef642de70ecdcaaa26be96d56a0398f95abd4", - "sha256": "12w4g2dl58283allclpi1c4i6ih9v2xvdb9hpbmfda12v8lizmlq" + "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa", + "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk" } } }, From 782c8b44ddda7b5c51ad22d388d93bb39f05586e Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Thu, 4 May 2023 20:20:03 -0300 Subject: [PATCH 008/175] buildDartApplication: init This adds a function for easily packaging non-flutter dart apps. --- doc/languages-frameworks/dart.section.md | 36 ++++++++++ doc/languages-frameworks/index.xml | 1 + .../dart/build-dart-application/default.nix | 66 +++++++++++++++++++ .../hooks/dart-build-hook.sh | 34 ++++++++++ .../hooks/dart-config-hook.sh | 12 ++++ .../hooks/dart-install-hook.sh | 29 ++++++++ .../build-dart-application/hooks/default.nix | 15 +++++ pkgs/top-level/all-packages.nix | 6 ++ 8 files changed, 199 insertions(+) create mode 100644 doc/languages-frameworks/dart.section.md create mode 100644 pkgs/build-support/dart/build-dart-application/default.nix create mode 100644 pkgs/build-support/dart/build-dart-application/hooks/dart-build-hook.sh create mode 100644 pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh create mode 100644 pkgs/build-support/dart/build-dart-application/hooks/dart-install-hook.sh create mode 100644 pkgs/build-support/dart/build-dart-application/hooks/default.nix diff --git a/doc/languages-frameworks/dart.section.md b/doc/languages-frameworks/dart.section.md new file mode 100644 index 000000000000..eb7c82748ad6 --- /dev/null +++ b/doc/languages-frameworks/dart.section.md @@ -0,0 +1,36 @@ +# Dart {#sec-language-dart} + +## Dart applications {#ssec-dart-applications} + +The function `buildDartApplication` builds Dart applications managed with pub. + +It fetches its Dart dependencies automatically through `fetchDartDeps`, and (through a series of hooks) builds and installs the executables specified in the pubspec file. The hooks can be used in other derivations, if needed. The phases can also be overridden to do something different from installing binaries. + +If you are packaging a Flutter desktop application, use the `buildFlutterApplication` function instead. + +`vendorHash`: is the hash of the output of the dependency fetcher derivation. To obtain it, simply set it to `lib.fakeHash` (or omit it) and run the build ([more details here](#sec-source-hashes)). + +If the upstream source is missing a `pubspec.lock` file, you'll have to vendor one and specify it using `pubspecLockFile`. If it is needed, one will be generated for you and printed when attempting to build the derivation. + +The `dart` commands run can be overridden through `pubGetScript` and `dartCompileCommand`, you can also add flags using `dartCompileFlags` or `dartJitFlags`. + +Dart supports multiple [outputs types](https://dart.dev/tools/dart-compile#types-of-output), you can choose between them using `dartOutputType` (defaults to `exe`). If you want to override the binaries path or the source path they come from, you can use `dartEntryPoints`. Outputs that require a runtime will automatically be wrapped with the relevant runtime (`dartaotruntime` for `aot-snapshot`, `dart run` for `jit-snapshot` and `kernel`, `node` for `js`), this can be overridden through `dartRuntimeCommand`. + +```nix +{ buildDartApplication, fetchFromGitHub }: + +buildDartApplication rec { + pname = "dart-sass"; + version = "1.62.1"; + + src = fetchFromGitHub { + owner = "sass"; + repo = pname; + rev = version; + hash = "sha256-U6enz8yJcc4Wf8m54eYIAnVg/jsGi247Wy8lp1r1wg4="; + }; + + pubspecLockFile = ./pubspec.lock; + vendorHash = "sha256-Atm7zfnDambN/BmmUf4BG0yUz/y6xWzf0reDw3Ad41s="; +} +``` diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index e1e35564e321..94c4e303027f 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -14,6 +14,7 @@ + diff --git a/pkgs/build-support/dart/build-dart-application/default.nix b/pkgs/build-support/dart/build-dart-application/default.nix new file mode 100644 index 000000000000..780aefa90ef9 --- /dev/null +++ b/pkgs/build-support/dart/build-dart-application/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchDartDeps, writeText, dartHooks, makeWrapper, dart, nodejs }: + +{ pubGetScript ? "dart pub get" + + # Output type to produce. Can be any kind supported by dart + # https://dart.dev/tools/dart-compile#types-of-output + # If using jit, you might want to pass some arguments to `dartJitFlags` +, dartOutputType ? "exe" +, dartCompileCommand ? "dart compile" +, dartCompileFlags ? [ ] + # These come at the end of the command, useful to pass flags to the jit run +, dartJitFlags ? [ ] + + # Attrset of entry point files to build and install. + # Where key is the final binary path and value is the source file path + # e.g. { "bin/foo" = "bin/main.dart"; } + # Set to null to read executables from pubspec.yaml +, dartEntryPoints ? null + # Used when wrapping aot, jit, kernel, and js builds. + # Set to null to disable wrapping. +, dartRuntimeCommand ? + if dartOutputType == "aot-snapshot" then "${dart}/bin/dartaotruntime" + else if (dartOutputType == "jit-snapshot" || dartOutputType == "kernel") then "${dart}/bin/dart" + else if dartOutputType == "js" then "${nodejs}/bin/node" + else null + +, pubspecLockFile ? null +, vendorHash ? "" +, ... +}@args: + +let + dartDeps = fetchDartDeps { + buildDrvArgs = args; + inherit pubGetScript vendorHash pubspecLockFile; + }; + inherit (dartHooks.override { inherit dart; }) dartConfigHook dartBuildHook dartInstallHook; +in +assert !(builtins.isString dartOutputType && dartOutputType != "") -> + throw "dartOutputType must be a non-empty string"; +stdenv.mkDerivation (args // { + inherit pubGetScript dartCompileCommand dartOutputType dartRuntimeCommand + dartCompileFlags dartJitFlags; + + dartEntryPoints = + if (dartEntryPoints != null) + then writeText "entrypoints.json" (builtins.toJSON dartEntryPoints) + else null; + + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ + dart + dartDeps + dartConfigHook + dartBuildHook + dartInstallHook + makeWrapper + ]; + + # When stripping, it seems some ELF information is lost and the dart VM cli + # runs instead of the expected program. Don't strip if it's an exe output. + dontStrip = args.dontStrip or (dartOutputType == "exe"); + + passthru = { inherit dartDeps; } // (args.passthru or { }); + + meta = (args.meta or { }) // { platforms = args.meta.platforms or dart.meta.platforms; }; +}) diff --git a/pkgs/build-support/dart/build-dart-application/hooks/dart-build-hook.sh b/pkgs/build-support/dart/build-dart-application/hooks/dart-build-hook.sh new file mode 100644 index 000000000000..23ebfbd6e66e --- /dev/null +++ b/pkgs/build-support/dart/build-dart-application/hooks/dart-build-hook.sh @@ -0,0 +1,34 @@ +# shellcheck shell=bash + +# Outputs line-separated "${dest}\t${source}" +_getDartEntryPoints() { + if [ -n "$dartEntryPoints" ]; then + @jq@ -r '(to_entries | map(.key + "\t" + .value) | join("\n"))' "$dartEntryPoints" + else + # The pubspec executables section follows the pattern: + # : [source-file-name] + # Where source-file-name defaults to output-bin-name if omited + @yq@ -r '(.executables | to_entries | map("bin/" + .key + "\t" + "bin/" + (.value // .key) + ".dart") | join("\n"))' pubspec.yaml + fi +} + +dartBuildHook() { + echo "Executing dartBuildHook" + + runHook preBuild + + while IFS=$'\t' read -ra target; do + dest="${target[0]}" + src="${target[1]}" + eval "$dartCompileCommand" "$dartOutputType" \ + -o "$dest" "${dartCompileFlags[@]}" "$src" "${dartJitFlags[@]}" + done < <(_getDartEntryPoints) + + runHook postBuild + + echo "Finished dartBuildHook" +} + +if [ -z "${dontDartBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=dartBuildHook +fi diff --git a/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh b/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh new file mode 100644 index 000000000000..ee610f673d2b --- /dev/null +++ b/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh @@ -0,0 +1,12 @@ +# shellcheck shell=bash + +dartConfigHook() { + echo "Executing dartConfigHook" + + echo "Installing dependencies" + eval "$pubGetScript" --offline + + echo "Finished dartConfigHook" +} + +postConfigureHooks+=(dartConfigHook) diff --git a/pkgs/build-support/dart/build-dart-application/hooks/dart-install-hook.sh b/pkgs/build-support/dart/build-dart-application/hooks/dart-install-hook.sh new file mode 100644 index 000000000000..1906bcfbca4c --- /dev/null +++ b/pkgs/build-support/dart/build-dart-application/hooks/dart-install-hook.sh @@ -0,0 +1,29 @@ +# shellcheck shell=bash + +dartInstallHook() { + echo "Executing dartInstallHook" + + runHook preInstall + + mkdir -p "$out" + + while IFS=$'\t' read -ra target; do + dest="${target[0]}" + # Wrap with runtime command, if it's defined + if [ -n "$dartRuntimeCommand" ]; then + install -D "$dest" "$out/share/$dest" + makeWrapper "$dartRuntimeCommand" "$out/$dest" \ + --add-flags "$out/share/$dest" + else + install -Dm755 "$dest" "$out/$dest" + fi + done < <(_getDartEntryPoints) + + runHook postInstall + + echo "Finished dartInstallHook" +} + +if [ -z "${dontDartInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=dartInstallHook +fi diff --git a/pkgs/build-support/dart/build-dart-application/hooks/default.nix b/pkgs/build-support/dart/build-dart-application/hooks/default.nix new file mode 100644 index 000000000000..463061c54a8d --- /dev/null +++ b/pkgs/build-support/dart/build-dart-application/hooks/default.nix @@ -0,0 +1,15 @@ +{ lib, makeSetupHook, dart, yq, jq }: + +{ + dartConfigHook = makeSetupHook { + name = "dart-config-hook"; + } ./dart-config-hook.sh; + dartBuildHook = makeSetupHook { + name = "dart-build-hook"; + substitutions.yq = "${yq}/bin/yq"; + substitutions.jq = "${jq}/bin/jq"; + } ./dart-build-hook.sh; + dartInstallHook = makeSetupHook { + name = "dart-install-hook"; + } ./dart-install-hook.sh; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34ab73e97b24..770a1b8574e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39795,6 +39795,12 @@ with pkgs; dart-sass = callPackage ../development/tools/misc/dart-sass { }; + fetchDartDeps = callPackage ../build-support/dart/fetch-dart-deps { }; + + buildDartApplication = callPackage ../build-support/dart/build-dart-application { }; + + dartHooks = callPackage ../build-support/dart/build-dart-application/hooks { }; + httrack = callPackage ../tools/backup/httrack { }; httraqt = libsForQt5.callPackage ../tools/backup/httrack/qt.nix { }; From d161ef5631ae8826255e6c517b4fa59c369bf0f2 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Thu, 4 May 2023 20:22:04 -0300 Subject: [PATCH 009/175] buildFlutterApplication: add docs --- doc/languages-frameworks/dart.section.md | 31 +++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/dart.section.md b/doc/languages-frameworks/dart.section.md index eb7c82748ad6..b00327b78eb2 100644 --- a/doc/languages-frameworks/dart.section.md +++ b/doc/languages-frameworks/dart.section.md @@ -6,7 +6,7 @@ The function `buildDartApplication` builds Dart applications managed with pub. It fetches its Dart dependencies automatically through `fetchDartDeps`, and (through a series of hooks) builds and installs the executables specified in the pubspec file. The hooks can be used in other derivations, if needed. The phases can also be overridden to do something different from installing binaries. -If you are packaging a Flutter desktop application, use the `buildFlutterApplication` function instead. +If you are packaging a Flutter desktop application, use [`buildFlutterApplication`](#ssec-dart-flutter) instead. `vendorHash`: is the hash of the output of the dependency fetcher derivation. To obtain it, simply set it to `lib.fakeHash` (or omit it) and run the build ([more details here](#sec-source-hashes)). @@ -34,3 +34,32 @@ buildDartApplication rec { vendorHash = "sha256-Atm7zfnDambN/BmmUf4BG0yUz/y6xWzf0reDw3Ad41s="; } ``` + +## Flutter applications {#ssec-dart-flutter} + +The function `buildFlutterApplication` builds Flutter applications. + +The deps.json file must always be provided when packaging in Nixpkgs. It will be generated and printed if the derivation is attempted to be built without one. Alternatively, `autoDepsList` may be set to `true` when outside of Nixpkgs, as it relies on import-from-derivation. + +A `pubspec.lock` file must be available. See the [Dart documentation](#ssec-dart-applications) for more details. + +```nix +{ flutter, fetchFromGitHub }: + +flutter.buildFlutterApplication { + pname = "firmware-updater"; + version = "unstable-2023-04-30"; + + src = fetchFromGitHub { + owner = "canonical"; + repo = "firmware-updater"; + rev = "6e7dbdb64e344633ea62874b54ff3990bd3b8440"; + sha256 = "sha256-s5mwtr5MSPqLMN+k851+pFIFFPa0N1hqz97ys050tFA="; + fetchSubmodules = true; + }; + + pubspecLockFile = ./pubspec.lock; + depsListFile = ./deps.json; + vendorHash = "sha256-cdMO+tr6kYiN5xKXa+uTMAcFf2C75F3wVPrn21G4QPQ="; +} +``` From 211d7f629255cfa14ed63b363271afd35ab53d63 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Thu, 4 May 2023 20:22:22 -0300 Subject: [PATCH 010/175] dart-sass: use buildDartApplication --- .../tools/misc/dart-sass/default.nix | 39 ++++--------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix index 1035d29d4ce7..b8cc7265fb08 100644 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ b/pkgs/development/tools/misc/dart-sass/default.nix @@ -1,54 +1,29 @@ { lib -, stdenvNoCC , fetchFromGitHub -, dart -, callPackage +, buildDartApplication }: -stdenvNoCC.mkDerivation (finalAttrs: rec { +buildDartApplication rec { pname = "dart-sass"; version = "1.62.1"; src = fetchFromGitHub { owner = "sass"; repo = pname; - rev = finalAttrs.version; + rev = version; hash = "sha256-U6enz8yJcc4Wf8m54eYIAnVg/jsGi247Wy8lp1r1wg4="; }; - nativeBuildInputs = [ - dart - (callPackage ../../../../build-support/dart/fetch-dart-deps { } { - buildDrvArgs = finalAttrs; - pubspecLockFile = ./pubspec.lock; - vendorHash = "sha256-Atm7zfnDambN/BmmUf4BG0yUz/y6xWzf0reDw3Ad41s="; - }) - ]; + pubspecLockFile = ./pubspec.lock; + vendorHash = "sha256-Atm7zfnDambN/BmmUf4BG0yUz/y6xWzf0reDw3Ad41s="; - configurePhase = '' - runHook preConfigure - dart pub get --offline - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - dart compile exe --define=version=${finalAttrs.version} ./bin/sass.dart - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -D ./bin/sass.exe $out/bin/sass - runHook postInstall - ''; + dartCompileFlags = "--define=version=${version}"; meta = with lib; { - inherit (dart.meta) platforms; homepage = "https://github.com/sass/dart-sass"; description = "The reference implementation of Sass, written in Dart"; mainProgram = "sass"; license = licenses.mit; maintainers = with maintainers; [ lelgenio ]; }; -}) +} From 70d3f5c0b4814d63ff364eec75b3b82d3e09a39c Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Thu, 4 May 2023 20:26:13 -0300 Subject: [PATCH 011/175] buildFlutterApplication: default vendorHash to "" This makes it more ergonomical to use, and is consistent with buildDartApplication. --- pkgs/build-support/flutter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index abb1c8ac359f..79d23d7535a2 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -16,7 +16,7 @@ , customPackageOverrides ? { } , autoDepsList ? false , depsListFile ? null -, vendorHash +, vendorHash ? "" , pubspecLockFile ? null , nativeBuildInputs ? [ ] , preUnpack ? "" From c01b90c8824a9ddcd645c20467ae2452f709b945 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 May 2023 16:53:26 +0200 Subject: [PATCH 012/175] python311Packages.pysensibo: 1.0.25 -> 1.0.27 Changelog: https://github.com/andrey-git/pysensibo/releases/tag/1.0.27 --- pkgs/development/python-modules/pysensibo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index 54ada321371a..db19bf859584 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.25"; + version = "1.0.27"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AZpqV/CQ8TLKjaee9b0Zbu6WfnGNenKIvot+TTTSikg="; + hash = "sha256-O0Dttr+2lLR+llJIb/uxFLfRjZmnpVWrRon4rOfsnTY="; }; propagatedBuildInputs = [ From c55f97b61669e98de56493d18d968944a2af8d0b Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sun, 16 Apr 2023 21:47:04 +0200 Subject: [PATCH 013/175] publii: init at 0.42.1 --- pkgs/development/web/publii/default.nix | 102 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 104 insertions(+) create mode 100644 pkgs/development/web/publii/default.nix diff --git a/pkgs/development/web/publii/default.nix b/pkgs/development/web/publii/default.nix new file mode 100644 index 000000000000..58713b35a353 --- /dev/null +++ b/pkgs/development/web/publii/default.nix @@ -0,0 +1,102 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, makeShellWrapper +, wrapGAppsHook +, alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, cairo +, cups +, dbus +, expat +, glib +, gtk3 +, libsecret +, mesa +, nss +, pango +, udev +, xdg-utils +, xorg +}: + +stdenv.mkDerivation rec { + pname = "publii"; + version = "0.42.1"; + + src = fetchurl { + url = "https://getpublii.com/download/Publii-${version}.deb"; + hash = "sha256-GHGXu/z2L4aJG1O1THPIxnRBdPJOIVuQsZP0zhjTZlo="; + }; + + dontConfigure = true; + dontBuild = true; + dontWrapGApps = true; + + nativeBuildInputs = [ + autoPatchelfHook + makeShellWrapper + wrapGAppsHook + ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + glib + gtk3 + libsecret + mesa + nss + pango + xorg.libX11 + xorg.libxcb + ]; + + unpackPhase = '' + ar p $src data.tar.xz | tar xJ + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + mv usr/share $out + substituteInPlace $out/share/applications/Publii.desktop \ + --replace 'Exec=/opt/Publii/Publii' 'Exec=Publii' + + mv opt $out + + runHook postInstall + ''; + + preFixup = '' + makeWrapper $out/opt/Publii/Publii $out/bin/Publii \ + "''${gappsWrapperArgs[@]}" \ + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} + ''; + + meta = with lib; { + description = "Static Site CMS with GUI to build privacy-focused SEO-friendly website."; + longDescription = '' + Creating a website doesn't have to be complicated or expensive. With Publii, the most + intuitive static site CMS, you can create a beautiful, safe, and privacy-friendly website + quickly and easily; perfect for anyone who wants a fast, secure website in a flash. + ''; + homepage = "https://getpublii.com"; + changelog = "https://github.com/getpublii/publii/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ urandom sebtm ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac013888f76c..f2761707a492 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17330,6 +17330,8 @@ with pkgs; protege-distribution = callPackage ../development/web/protege-distribution { }; + publii = callPackage ../development/web/publii {}; + umr = callPackage ../development/misc/umr { llvmPackages = llvmPackages_latest; }; From 77a317d6565c9b005da89a96c3f4f908718b2423 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 May 2023 19:10:04 +0000 Subject: [PATCH 014/175] ocamlPackages.yojson: 2.0.2 -> 2.1.0 --- pkgs/development/ocaml-modules/yojson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 38960dceb5e3..ca7b893ebc8e 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "yojson"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; - sha256 = "sha256-h2u284r3OoSilDij2jXkhXxgoUVWpgZSWxSMb9vlRhs="; + sha256 = "sha256-n8sf8ttYqyWfkih5awraR5Tq6XF3sYMzcTgMTk+QsV0="; }; nativeBuildInputs = [ cppo ]; From f326911cb926d264d784186219f4608bf557170f Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 6 Feb 2023 11:52:59 +0000 Subject: [PATCH 015/175] temporal-cli: combine temporal-cli and tctl --- .../cluster/temporal-cli/default.nix | 98 ++++++++++++++----- 1 file changed, 74 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index a78aaf4b56da..fb3268ab55a9 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -1,35 +1,85 @@ -{ lib, fetchFromGitHub, buildGoModule, testers, temporal-cli }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles, symlinkJoin }: -buildGoModule rec { +let + tctl-next = buildGoModule rec { + pname = "tctl-next"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "temporalio"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-yQnFw3uYGKrTevGFVZNgkWwKCCWiGy0qwJJOmnMpTJQ="; + }; + + vendorHash = "sha256-ld59ADHnlgsCA2mzVhdq6Vb2aa9rApvFxs3NpHiCKxo="; + + nativeBuildInputs = [ installShellFiles ]; + + excludedPackages = [ "./cmd/docgen" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/temporalio/cli/headers.Version=${version}" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + postInstall = '' + installShellCompletion --cmd temporal \ + --bash <($out/bin/temporal completion bash) \ + --zsh <($out/bin/temporal completion zsh) + ''; + }; + + tctl = buildGoModule rec { + pname = "tctl"; + version = "1.18.0"; + + src = fetchFromGitHub { + owner = "temporalio"; + repo = "tctl"; + rev = "v${version}"; + hash = "sha256-LcBKkx3mcDOrGT6yJx98CSgxbwskqGPWqOzHWOu6cig="; + }; + + vendorHash = "sha256-BUYEeC5zli++OxVFgECJGqJkbDwglLppSxgo+4AqOb0="; + + nativeBuildInputs = [ installShellFiles ]; + + excludedPackages = [ "./cmd/copyright" ]; + + ldflags = [ "-s" "-w" ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + postInstall = '' + installShellCompletion --cmd tctl \ + --bash <($out/bin/tctl completion bash) \ + --zsh <($out/bin/tctl completion zsh) + ''; + }; +in +symlinkJoin rec { pname = "temporal-cli"; - version = "1.18.0"; + inherit (tctl) version; + name = "${pname}-${version}"; - src = fetchFromGitHub { - owner = "temporalio"; - repo = "tctl"; - rev = "v${version}"; - hash = "sha256-LcBKkx3mcDOrGT6yJx98CSgxbwskqGPWqOzHWOu6cig="; - }; - - vendorHash = "sha256-BUYEeC5zli++OxVFgECJGqJkbDwglLppSxgo+4AqOb0="; - - ldflags = [ "-s" "-w" ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - passthru.tests.version = testers.testVersion { - package = temporal-cli; - # the app writes a default config file at startup - command = "HOME=$(mktemp -d) ${meta.mainProgram} --version"; - }; + paths = [ + tctl-next + tctl + ]; meta = with lib; { description = "Temporal CLI"; homepage = "https://temporal.io"; license = licenses.mit; maintainers = with maintainers; [ aaronjheng ]; - mainProgram = "tctl"; + mainProgram = "temporal"; }; } From 96b99eceae25d76ac48f8b8ff9935c479e2b652d Mon Sep 17 00:00:00 2001 From: huantian Date: Fri, 25 Nov 2022 13:19:47 -0700 Subject: [PATCH 016/175] python3Packages.persist-queue: init at 0.8.0 --- .../python-modules/persist-queue/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/persist-queue/default.nix diff --git a/pkgs/development/python-modules/persist-queue/default.nix b/pkgs/development/python-modules/persist-queue/default.nix new file mode 100644 index 000000000000..4a34e6e7eb72 --- /dev/null +++ b/pkgs/development/python-modules/persist-queue/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, msgpack +, nose2 +}: + +buildPythonPackage rec { + pname = "persist-queue"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-vapNz8SyCpzh9cttoxFrbLj+N1J9mR/SQoVu8szNIY4="; + }; + + disabled = pythonOlder "3.6"; + + nativeCheckInputs = [ + msgpack + nose2 + ]; + + checkPhase = '' + runHook preCheck + + # Don't run MySQL tests, as they require a MySQL server running + rm persistqueue/tests/test_mysqlqueue.py + + nose2 + + runHook postCheck + ''; + + pythonImportsCheck = [ "persistqueue" ]; + + meta = with lib; { + description = "Thread-safe disk based persistent queue in Python"; + homepage = "https://github.com/peter-wangxu/persist-queue"; + license = licenses.bsd3; + maintainers = with maintainers; [ huantian ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 548d2698591d..5c7d144cd4cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7221,6 +7221,8 @@ self: super: with self; { persim = callPackage ../development/python-modules/persim { }; + persist-queue = callPackage ../development/python-modules/persist-queue { }; + persistent = callPackage ../development/python-modules/persistent { }; persisting-theory = callPackage ../development/python-modules/persisting-theory { }; From dc1834765273a071d734e5c7f5b38cf118ec6a3a Mon Sep 17 00:00:00 2001 From: huantian Date: Fri, 25 Nov 2022 13:32:33 -0700 Subject: [PATCH 017/175] python3Packages.timeslot: init at 0.1.2 --- .../python-modules/timeslot/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/timeslot/default.nix diff --git a/pkgs/development/python-modules/timeslot/default.nix b/pkgs/development/python-modules/timeslot/default.nix new file mode 100644 index 000000000000..1a71651ca054 --- /dev/null +++ b/pkgs/development/python-modules/timeslot/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "timeslot"; + version = "0.1.2"; + + # pypi distribution doesn't include tests, so build from source instead + src = fetchFromGitHub { + owner = "ErikBjare"; + repo = pname; + rev = "af35445e96cbb2f3fb671a75aac6aa93e4e7e7a6"; + sha256 = "sha256-GEhg2iMsYMfalT7L9TCd1KHU6oa/wTl5m3mRC0zOH9Q="; + }; + + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + # The pyproject.toml specifies the flag `--cov=timeslot`, + # This causes an error when running without pytest-cov, + # so use this flag to override that option, as we don't need coverage. + "--override-ini addopts=''" + ]; + + pythonImportsCheck = [ "timeslot" ]; + + meta = with lib; { + description = "Data type for representing time slots with a start and end"; + homepage = "https://github.com/ErikBjare/timeslot"; + maintainers = with maintainers; [ huantian ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c7d144cd4cc..1510a4a0efaf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11816,6 +11816,8 @@ self: super: with self; { timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; + timeslot = callPackage ../development/python-modules/timeslot { }; + timetagger = callPackage ../development/python-modules/timetagger { }; timezonefinder = callPackage ../development/python-modules/timezonefinder { }; From d868a4026344809497f2f83dfaacafd67496f438 Mon Sep 17 00:00:00 2001 From: huantian Date: Fri, 25 Nov 2022 13:57:32 -0700 Subject: [PATCH 018/175] python3Packages.takethetime: init at 0.3.1 --- .../python-modules/takethetime/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/takethetime/default.nix diff --git a/pkgs/development/python-modules/takethetime/default.nix b/pkgs/development/python-modules/takethetime/default.nix new file mode 100644 index 000000000000..e6f5dd93b29f --- /dev/null +++ b/pkgs/development/python-modules/takethetime/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage { + pname = "takethetime"; + version = "0.3.1"; + + # pypi distribution doesn't include tests, so build from source instead + src = fetchFromGitHub { + owner = "ErikBjare"; + repo = "TakeTheTime"; + rev = "b0042ac5b1cc9d3b70ef59167b094469ceb660dd"; + sha256 = "sha256-DwsMnP6G3BzOnINttaSC6QKkIKK5qyhUz+lN1DSvkw0="; + }; + + disabled = pythonOlder "3.6"; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tests/tests.py" ]; + + pythonImportsCheck = [ "takethetime" ]; + + # Latest release is v0.3.1 on pypi, but this version was not bumped in + # the setup.py, causing packages that depend on v0.3.1 to fail to build. + postPatch = '' + substituteInPlace setup.py \ + --replace "version='0.3'" "version='0.3.1'" + ''; + + meta = with lib; { + description = "Simple time taking library using context managers"; + homepage = "https://github.com/ErikBjare/TakeTheTime"; + maintainers = with maintainers; [ huantian ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1510a4a0efaf..0af5df74e9f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11548,6 +11548,8 @@ self: super: with self; { tailscale = callPackage ../development/python-modules/tailscale { }; + takethetime = callPackage ../development/python-modules/takethetime { }; + tank-utility = callPackage ../development/python-modules/tank-utility { }; tappy = callPackage ../development/python-modules/tappy { }; From 91f97cae903fe739799183fc0cdb9b4287d5c61b Mon Sep 17 00:00:00 2001 From: huantian Date: Fri, 25 Nov 2022 15:41:16 -0700 Subject: [PATCH 019/175] python3Packages.aw-core: init at 0.5.12 --- .../python-modules/aw-core/default.nix | 69 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/development/python-modules/aw-core/default.nix diff --git a/pkgs/development/python-modules/aw-core/default.nix b/pkgs/development/python-modules/aw-core/default.nix new file mode 100644 index 000000000000..e0caf6b41c0e --- /dev/null +++ b/pkgs/development/python-modules/aw-core/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, jsonschema +, peewee +, appdirs +, iso8601 +, rfc3339-validator +, takethetime +, strict-rfc3339 +, tomlkit +, deprecation +, timeslot +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aw-core"; + version = "0.5.12"; + + format = "pyproject"; + + # pypi distribution doesn't include tests, so build from source instead + src = fetchFromGitHub { + owner = "ActivityWatch"; + repo = "aw-core"; + rev = "v${version}"; + sha256 = "sha256-DbugVMaQHlHpfbFEsM6kfpDL2VzRs0TDn9klWjAwz64="; + }; + + disabled = pythonOlder "3.8"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + jsonschema + peewee + appdirs + iso8601 + rfc3339-validator + takethetime + strict-rfc3339 + tomlkit + deprecation + timeslot + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + # Fake home folder for tests that write to $HOME + export HOME="$TMPDIR" + ''; + + pythonImportsCheck = [ "aw_core" ]; + + meta = with lib; { + description = "Core library for ActivityWatch"; + homepage = "https://github.com/ActivityWatch/aw-core"; + maintainers = with maintainers; [ huantian ]; + license = licenses.mpl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0af5df74e9f8..8d4a6187eba5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -847,6 +847,8 @@ self: super: with self; { avro-python3 = callPackage ../development/python-modules/avro-python3 { }; + aw-core = callPackage ../development/python-modules/aw-core { }; + awacs = callPackage ../development/python-modules/awacs { }; awesome-slugify = callPackage ../development/python-modules/awesome-slugify { }; From 58291dd04b7dfb4ce1d1f135651a5fa009b9e073 Mon Sep 17 00:00:00 2001 From: huantian Date: Fri, 25 Nov 2022 15:50:29 -0700 Subject: [PATCH 020/175] python3Packages.aw-client: init at 0.5.11 --- .../python-modules/aw-client/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/aw-client/default.nix diff --git a/pkgs/development/python-modules/aw-client/default.nix b/pkgs/development/python-modules/aw-client/default.nix new file mode 100644 index 000000000000..f71225155595 --- /dev/null +++ b/pkgs/development/python-modules/aw-client/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, aw-core +, requests +, persist-queue +, click +, tabulate +, typing-extensions +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aw-client"; + version = "0.5.11"; + + format = "pyproject"; + + # pypi distribution doesn't include tests, so build from source instead + src = fetchFromGitHub { + owner = "ActivityWatch"; + repo = "aw-client"; + rev = "v${version}"; + sha256 = "sha256-5WKGRoZGY+QnnB1Jzlju5OmCJreYMD8am2kW3Wcjhlw="; + }; + + disabled = pythonOlder "3.8"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aw-core + requests + persist-queue + click + tabulate + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # Only run this test, the others are integration tests that require + # an instance of aw-server running in order to function. + pytestFlagsArray = [ "tests/test_requestqueue.py" ]; + + preCheck = '' + # Fake home folder for tests that write to $HOME + export HOME="$TMPDIR" + ''; + + pythonImportsCheck = [ "aw_client" ]; + + meta = with lib; { + description = "Client library for ActivityWatch"; + homepage = "https://github.com/ActivityWatch/aw-client"; + maintainers = with maintainers; [ huantian ]; + license = licenses.mpl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d4a6187eba5..87d76f6830af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -847,6 +847,8 @@ self: super: with self; { avro-python3 = callPackage ../development/python-modules/avro-python3 { }; + aw-client = callPackage ../development/python-modules/aw-client { }; + aw-core = callPackage ../development/python-modules/aw-core { }; awacs = callPackage ../development/python-modules/awacs { }; From c175aa624b3239728956b09f904445b2f8142ced Mon Sep 17 00:00:00 2001 From: huantian Date: Fri, 25 Nov 2022 16:16:51 -0700 Subject: [PATCH 021/175] activitywatch: init at 0.12.2 --- .../office/activitywatch/Cargo.lock | 2957 +++++++++++++++++ .../office/activitywatch/commit-hash.patch | 16 + .../office/activitywatch/default.nix | 238 ++ .../activitywatch/override-version.patch | 17 + pkgs/top-level/all-packages.nix | 6 + 5 files changed, 3234 insertions(+) create mode 100644 pkgs/applications/office/activitywatch/Cargo.lock create mode 100644 pkgs/applications/office/activitywatch/commit-hash.patch create mode 100644 pkgs/applications/office/activitywatch/default.nix create mode 100644 pkgs/applications/office/activitywatch/override-version.patch diff --git a/pkgs/applications/office/activitywatch/Cargo.lock b/pkgs/applications/office/activitywatch/Cargo.lock new file mode 100644 index 000000000000..f7069e5455d2 --- /dev/null +++ b/pkgs/applications/office/activitywatch/Cargo.lock @@ -0,0 +1,2957 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aead" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" +dependencies = [ + "cfg-if 1.0.0", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "android_log-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" + +[[package]] +name = "android_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a" +dependencies = [ + "android_log-sys", + "env_logger", + "log", + "once_cell", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "appdirs" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d512b3e61196d27562dcc71446a58ba8a93d3bed2a03a87f96101b9a17f1d378" +dependencies = [ + "ole32-sys", + "shell32-sys", + "winapi 0.2.8", +] + +[[package]] +name = "async-stream" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +dependencies = [ + "async-stream-impl", + "futures-core", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "async-trait" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "atomic" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "aw-client-rust" +version = "0.1.0" +dependencies = [ + "aw-datastore", + "aw-models", + "aw-server", + "chrono", + "gethostname", + "reqwest", + "rocket", + "serde", + "serde_json", + "tokio-test", +] + +[[package]] +name = "aw-datastore" +version = "0.1.0" +dependencies = [ + "appdirs", + "aw-models", + "aw-transform", + "chrono", + "log", + "mpsc_requests", + "rusqlite", + "serde", + "serde_json", +] + +[[package]] +name = "aw-models" +version = "0.1.0" +dependencies = [ + "chrono", + "log", + "schemars", + "serde", + "serde_json", +] + +[[package]] +name = "aw-query" +version = "0.1.0" +dependencies = [ + "aw-datastore", + "aw-models", + "aw-transform", + "chrono", + "fancy-regex", + "log", + "plex", + "serde", + "serde_json", +] + +[[package]] +name = "aw-server" +version = "0.12.1" +dependencies = [ + "android_logger", + "appdirs", + "aw-datastore", + "aw-models", + "aw-query", + "aw-transform", + "chrono", + "clap", + "fern", + "gethostname", + "jemallocator", + "jni", + "lazy_static", + "libc", + "log", + "multipart", + "openssl-sys", + "rocket", + "rocket_cors", + "serde", + "serde_json", + "toml", + "uuid", +] + +[[package]] +name = "aw-sync" +version = "0.1.0" +dependencies = [ + "aw-client-rust", + "aw-datastore", + "aw-models", + "aw-server", + "chrono", + "clap", + "log", + "reqwest", + "serde", + "serde_json", +] + +[[package]] +name = "aw-transform" +version = "0.1.0" +dependencies = [ + "aw-models", + "chrono", + "fancy-regex", + "log", + "rocket", + "serde", + "serde_json", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + +[[package]] +name = "binascii" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72" + +[[package]] +name = "bit-set" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9bf6104718e80d7b26a68fdbacff3481cfc05df670821affc7e9cbc1884400c" +dependencies = [ + "bit-vec 0.4.4", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec 0.6.3", +] + +[[package]] +name = "bit-vec" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f" + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "buf_redux" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" +dependencies = [ + "memchr", + "safemem", +] + +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" + +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" + +[[package]] +name = "cc" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "serde", + "time 0.1.45", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "cipher" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clap" +version = "4.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + +[[package]] +name = "clap_derive" +version = "4.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "clap_lex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "colored" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" +dependencies = [ + "atty", + "lazy_static", + "winapi 0.3.9", +] + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "aes-gcm", + "base64 0.20.0", + "hkdf", + "hmac", + "percent-encoding", + "rand", + "sha2", + "subtle", + "time 0.3.17", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-channel" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +dependencies = [ + "crossbeam-utils", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-utils" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +dependencies = [ + "autocfg", + "cfg-if 0.1.10", + "lazy_static", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "cxx" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2 1.0.49", + "quote 1.0.23", + "scratch", + "syn 1.0.107", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "devise" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c7580b072f1c8476148f16e0a0d5dedddab787da98d86c5082c5e9ed8ab595" +dependencies = [ + "devise_codegen", + "devise_core", +] + +[[package]] +name = "devise_codegen" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "123c73e7a6e51b05c75fe1a1b2f4e241399ea5740ed810b0e3e6cacd9db5e7b2" +dependencies = [ + "devise_core", + "quote 1.0.23", +] + +[[package]] +name = "devise_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841ef46f4787d9097405cac4e70fb8644fc037b526e8c14054247c0263c400d0" +dependencies = [ + "bitflags", + "proc-macro2 1.0.49", + "proc-macro2-diagnostics", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dyn-clone" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fancy-regex" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0678ab2d46fa5195aaf59ad034c083d351377d4af57f3e073c074d0da3e3c766" +dependencies = [ + "bit-set 0.5.3", + "regex", +] + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "fern" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a" +dependencies = [ + "colored", + "log", +] + +[[package]] +name = "figment" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e56602b469b2201400dec66a66aec5a9b8761ee97cd1b8c96ab2483fcc16cc9" +dependencies = [ + "atomic", + "pear", + "serde", + "toml", + "uncased", + "version_check", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + +[[package]] +name = "futures" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-io" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" + +[[package]] +name = "futures-sink" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-util" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generator" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266041a359dfa931b370ef684cceb84b166beb14f7f0421f4a6a3d0c446d12e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.39.0", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a329e22866dd78b35d2c639a4a23d7b950aeae300dfd79f4fb19f74055c2404" +dependencies = [ + "libc", + "windows 0.43.0", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "ghash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "h2" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashlink" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "hyper" +version = "0.14.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", + "serde", +] + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "ipnet" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" + +[[package]] +name = "is-terminal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes", + "rustix", + "windows-sys", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "jemalloc-sys" +version = "0.5.2+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134163979b6eed9564c98637b710b40979939ba351f59952708234ea11b5f3f8" +dependencies = [ + "cc", + "fs_extra", + "libc", +] + +[[package]] +name = "jemallocator" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16c2514137880c52b0b4822b563fadd38257c1f380858addb74a400889696ea6" +dependencies = [ + "jemalloc-sys", + "libc", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lalr" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "106d7548f95adbe3019b4fc4954554d7b72535867aa9ce326d2f766b68958de7" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "libsqlite3-sys" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if 1.0.0", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "mio" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", +] + +[[package]] +name = "mpsc_requests" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d778b8a8b7b31d8d23c8bbde4e571b483f3962dc9f14f447c14188e8a7fe85c" +dependencies = [ + "crossbeam-channel", +] + +[[package]] +name = "multer" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http", + "httparse", + "log", + "memchr", + "mime", + "spin", + "tokio", + "tokio-util", + "version_check", +] + +[[package]] +name = "multipart" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182" +dependencies = [ + "buf_redux", + "httparse", + "log", + "mime", + "mime_guess", + "quick-error", + "rand", + "safemem", + "tempfile", + "twoway", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi 0.3.9", +] + +[[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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "ole32-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "openssl" +version = "0.10.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "111.24.0+1.1.1s" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3498f259dab01178c6228c6b00dcef0ed2a2d5e20d648c017861227773ea4abd" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +dependencies = [ + "autocfg", + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + +[[package]] +name = "pear" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e44241c5e4c868e3eaa78b7c1848cadd6344ed4f54d029832d32b415a58702" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0" +dependencies = [ + "proc-macro2 1.0.49", + "proc-macro2-diagnostics", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "plex" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa14234571e92edfd3ac883defc6fcf310ae395cccdb10d2319d3e2e60083fc" +dependencies = [ + "lalr", + "proc-macro2 0.4.30", + "quote 0.6.13", + "redfa", + "syn 0.15.44", +] + +[[package]] +name = "polyval" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +dependencies = [ + "unicode-xid 0.1.0", +] + +[[package]] +name = "proc-macro2" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", + "version_check", + "yansi", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +dependencies = [ + "proc-macro2 0.4.30", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2 1.0.49", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redfa" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29cc2771cc9f5fb0061cdedc05a37170254694dffec6b89920a6e767f08c4220" +dependencies = [ + "bit-set 0.4.0", + "vec_map", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "ref-cast" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "reqwest" +version = "0.11.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +dependencies = [ + "base64 0.13.1", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rocket" +version = "0.5.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ead083fce4a405feb349cf09abdf64471c6077f14e0ce59364aa90d4b99317" +dependencies = [ + "async-stream", + "async-trait", + "atomic", + "atty", + "binascii", + "bytes", + "either", + "figment", + "futures", + "indexmap", + "log", + "memchr", + "multer", + "num_cpus", + "parking_lot", + "pin-project-lite", + "rand", + "ref-cast", + "rocket_codegen", + "rocket_http", + "serde", + "serde_json", + "state", + "tempfile", + "time 0.3.17", + "tokio", + "tokio-stream", + "tokio-util", + "ubyte", + "version_check", + "yansi", +] + +[[package]] +name = "rocket_codegen" +version = "0.5.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6aeb6bb9c61e9cd2c00d70ea267bf36f76a4cc615e5908b349c2f9d93999b47" +dependencies = [ + "devise", + "glob", + "indexmap", + "proc-macro2 1.0.49", + "quote 1.0.23", + "rocket_http", + "syn 1.0.107", + "unicode-xid 0.2.4", +] + +[[package]] +name = "rocket_cors" +version = "0.6.0-alpha1" +source = "git+https://github.com/lawliet89/rocket_cors?rev=54fae07#54fae0701dffbe5df686465780218644ee3fae5f" +dependencies = [ + "http", + "log", + "regex", + "rocket", + "serde", + "serde_derive", + "unicase", + "unicase_serde", + "url", +] + +[[package]] +name = "rocket_http" +version = "0.5.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ded65d127954de3c12471630bf4b81a2792f065984461e65b91d0fdaafc17a2" +dependencies = [ + "cookie", + "either", + "futures", + "http", + "hyper", + "indexmap", + "log", + "memchr", + "pear", + "percent-encoding", + "pin-project-lite", + "ref-cast", + "serde", + "smallvec", + "stable-pattern", + "state", + "time 0.3.17", + "tokio", + "uncased", +] + +[[package]] +name = "rusqlite" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" +dependencies = [ + "bitflags", + "chrono", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "serde_json", + "smallvec", +] + +[[package]] +name = "rustix" +version = "0.36.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "rustversion" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "schemars" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307" +dependencies = [ + "chrono", + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "serde_derive_internals", + "syn 1.0.107", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "scratch" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" + +[[package]] +name = "security-framework" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "serde_derive_internals" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "serde_json" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shell32-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "spin" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" + +[[package]] +name = "stable-pattern" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4564168c00635f88eaed410d5efa8131afa8d8699a612c80c455a0ba05c21045" +dependencies = [ + "memchr", +] + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "0.15.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "unicode-xid 0.1.0", +] + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if 1.0.0", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi 0.3.9", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "thread_local" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +dependencies = [ + "once_cell", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", +] + +[[package]] +name = "time" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys", +] + +[[package]] +name = "tokio-macros" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-test" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" +dependencies = [ + "async-stream", + "bytes", + "futures-core", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-util" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +dependencies = [ + "serde", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if 1.0.0", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "twoway" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" +dependencies = [ + "memchr", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "ubyte" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c81f0dae7d286ad0d9366d7679a77934cfc3cf3a8d67e82669794412b2368fe6" +dependencies = [ + "serde", +] + +[[package]] +name = "uncased" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" +dependencies = [ + "serde", + "version_check", +] + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicase_serde" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef53697679d874d69f3160af80bc28de12730a985d57bdf2b47456ccb8b11f1" +dependencies = [ + "serde", + "unicase", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "universal-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "uuid" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cac5efe5cb0fa14ec2f84f83c701c562ee63f6dcc680861b21d65c682adfb05f" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi 0.3.9", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote 1.0.23", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +dependencies = [ + "windows_aarch64_msvc 0.39.0", + "windows_i686_gnu 0.39.0", + "windows_i686_msvc 0.39.0", + "windows_x86_64_gnu 0.39.0", + "windows_x86_64_msvc 0.39.0", +] + +[[package]] +name = "windows" +version = "0.43.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_i686_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/pkgs/applications/office/activitywatch/commit-hash.patch b/pkgs/applications/office/activitywatch/commit-hash.patch new file mode 100644 index 000000000000..7f0b32bec626 --- /dev/null +++ b/pkgs/applications/office/activitywatch/commit-hash.patch @@ -0,0 +1,16 @@ +diff --git a/vue.config.js b/vue.config.js +index 02c0699..0c4a014 100644 +--- a/vue.config.js ++++ b/vue.config.js +@@ -4,10 +4,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin'); + const { argv } = require('yargs'); + + // get git info from command line +-const _COMMIT_HASH = require('child_process') +- .execSync('git rev-parse --short HEAD') +- .toString() +- .trim(); ++const _COMMIT_HASH = "@commit_hash@"; + console.info('Commit hash:', _COMMIT_HASH); + + module.exports = { diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix new file mode 100644 index 000000000000..04d58e74dadd --- /dev/null +++ b/pkgs/applications/office/activitywatch/default.nix @@ -0,0 +1,238 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, makeWrapper +, pkg-config +, perl +, openssl +, python3 +, wrapQtAppsHook +, qtbase +, qtsvg +, xdg-utils +, substituteAll +, buildNpmPackage +}: + +let + version = "0.12.2"; + sources = fetchFromGitHub { + owner = "ActivityWatch"; + repo = "activitywatch"; + rev = "v${version}"; + sha256 = "sha256-IvRXfxTOSgBVlxy4SVij+POr7KgvXTEjGN3lSozhHkY="; + fetchSubmodules = true; + }; +in +rec { + aw-watcher-afk = python3.pkgs.buildPythonApplication { + pname = "aw-watcher-afk"; + inherit version; + + format = "pyproject"; + + src = "${sources}/aw-watcher-afk"; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + aw-client + xlib + pynput + ]; + + pythonImportsCheck = [ "aw_watcher_afk" ]; + + meta = with lib; { + description = "Watches keyboard and mouse activity to determine if you are AFK or not (for use with ActivityWatch)"; + homepage = "https://github.com/ActivityWatch/aw-watcher-afk"; + maintainers = with maintainers; [ huantian ]; + license = licenses.mpl20; + }; + }; + + aw-watcher-window = python3.pkgs.buildPythonApplication { + pname = "aw-watcher-window"; + inherit version; + + format = "pyproject"; + + src = "${sources}/aw-watcher-window"; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + aw-client + xlib + ]; + + pythonImportsCheck = [ "aw_watcher_window" ]; + + meta = with lib; { + description = "Cross-platform window watcher (for use with ActivityWatch)"; + homepage = "https://github.com/ActivityWatch/aw-watcher-window"; + maintainers = with maintainers; [ huantian ]; + license = licenses.mpl20; + }; + }; + + aw-qt = python3.pkgs.buildPythonApplication { + pname = "aw-qt"; + inherit version; + + format = "pyproject"; + + src = "${sources}/aw-qt"; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + wrapQtAppsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + aw-core + qtbase + qtsvg # Rendering icons in the trayicon menu + pyqt6 + click + ]; + + # Prevent double wrapping + dontWrapQtApps = true; + + makeWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}" + ]; + + postPatch = '' + sed -E 's#PyQt6 = "6.3.1"#PyQt6 = "^6.4.0"#g' -i pyproject.toml + ''; + + postInstall = '' + install -D resources/aw-qt.desktop $out/share/applications/aw-qt.desktop + + # For the actual tray icon, see + # https://github.com/ActivityWatch/aw-qt/blob/8ec5db941ede0923bfe26631acf241a4a5353108/aw_qt/trayicon.py#L211-L218 + install -D media/logo/logo.png $out/${python3.sitePackages}/media/logo/logo.png + + # For .desktop file and your desktop environment + install -D media/logo/logo.svg $out/share/icons/hicolor/scalable/apps/activitywatch.svg + install -D media/logo/logo.png $out/share/icons/hicolor/512x512/apps/activitywatch.png + install -D media/logo/logo-128.png $out/share/icons/hicolor/128x128/apps/activitywatch.png + ''; + + preFixup = '' + makeWrapperArgs+=( + "''${qtWrapperArgs[@]}" + ) + ''; + + pythonImportsCheck = [ "aw_qt" ]; + + meta = with lib; { + description = "Tray icon that manages ActivityWatch processes, built with Qt"; + homepage = "https://github.com/ActivityWatch/aw-qt"; + maintainers = with maintainers; [ huantian ]; + license = licenses.mpl20; + }; + }; + + aw-server-rust = rustPlatform.buildRustPackage { + pname = "aw-server-rust"; + inherit version; + + src = "${sources}/aw-server-rust"; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "rocket_cors-0.6.0-alpha1" = "sha256-GuMekgnsyuOg6lMiVvi4TwMba4sAFJ/zkgrdzSeBrv0="; + }; + }; + + # Bypass rust nightly features not being available on rust stable + RUSTC_BOOTSTRAP = 1; + + patches = [ + # Override version string with hardcoded value as it may be outdated upstream. + (substituteAll { + src = ./override-version.patch; + version = sources.rev; + }) + ]; + + nativeBuildInputs = [ + makeWrapper + pkg-config + perl + ]; + + buildInputs = [ + openssl + ]; + + postFixup = '' + wrapProgram "$out/bin/aw-server" \ + --prefix XDG_DATA_DIRS : "$out/share" + + mkdir -p "$out/share/aw-server" + ln -s "${aw-webui}" "$out/share/aw-server/static" + ''; + + preCheck = '' + # Fake home folder for tests that use ~/.cache and ~/.local/share + export HOME="$TMPDIR" + ''; + + meta = with lib; { + description = "High-performance implementation of the ActivityWatch server, written in Rust"; + homepage = "https://github.com/ActivityWatch/aw-server-rust"; + maintainers = with maintainers; [ huantian ]; + mainProgram = "aw-server"; + platforms = platforms.linux; + license = licenses.mpl20; + }; + }; + + aw-webui = buildNpmPackage { + pname = "aw-webui"; + inherit version; + + src = "${sources}/aw-server-rust/aw-webui"; + + npmDepsHash = "sha256-yds2P2PKfTB6yUGnc+P73InV5+MZP9kmz2ZS4CRqlmA="; + + patches = [ + # Hardcode version to avoid the need to have the Git repo available at build time. + (substituteAll { + src = ./commit-hash.patch; + commit_hash = sources.rev; + }) + ]; + + installPhase = '' + runHook preInstall + mv dist $out + cp media/logo/logo.{png,svg} $out/static/ + runHook postInstall + ''; + + doCheck = true; + checkPhase = '' + runHook preCheck + npm test + runHook postCheck + ''; + + meta = with lib; { + description = "A web-based UI for ActivityWatch, built with Vue.js"; + homepage = "https://github.com/ActivityWatch/aw-webui/"; + maintainers = with maintainers; [ huantian ]; + license = licenses.mpl20; + }; + }; +} diff --git a/pkgs/applications/office/activitywatch/override-version.patch b/pkgs/applications/office/activitywatch/override-version.patch new file mode 100644 index 000000000000..e668ee5720fc --- /dev/null +++ b/pkgs/applications/office/activitywatch/override-version.patch @@ -0,0 +1,17 @@ +diff --git a/aw-server/src/endpoints/mod.rs b/aw-server/src/endpoints/mod.rs +index a080d2a..0411d1e 100644 +--- a/aw-server/src/endpoints/mod.rs ++++ b/aw-server/src/endpoints/mod.rs +@@ -76,11 +76,10 @@ async fn root_favicon(state: &State) -> Option { + fn server_info(config: &State, state: &State) -> Json { + #[allow(clippy::or_fun_call)] + let hostname = gethostname().into_string().unwrap_or("unknown".to_string()); +- const VERSION: Option<&'static str> = option_env!("CARGO_PKG_VERSION"); + + Json(Info { + hostname, +- version: format!("v{} (rust)", VERSION.unwrap_or("(unknown)")), ++ version: String::from("@version@ (rust)"), + testing: config.testing, + device_id: state.device_id.clone(), + }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a33c283133cc..b89d2da50595 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28751,6 +28751,12 @@ with pkgs; acorn = callPackage ../applications/networking/cluster/acorn { }; + inherit (qt6Packages.callPackage ../applications/office/activitywatch { }) + aw-qt + aw-server-rust + aw-watcher-afk + aw-watcher-window; + adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; adl = callPackage ../applications/video/adl { }; From 0cb9e0c390607342158b89d8d2e723e73607e8ef Mon Sep 17 00:00:00 2001 From: huantian Date: Tue, 28 Mar 2023 18:24:12 -0700 Subject: [PATCH 022/175] activitywatch: simple symlinkJoin wrapper --- .../office/activitywatch/wrapper.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/office/activitywatch/wrapper.nix diff --git a/pkgs/applications/office/activitywatch/wrapper.nix b/pkgs/applications/office/activitywatch/wrapper.nix new file mode 100644 index 000000000000..56588e0b7400 --- /dev/null +++ b/pkgs/applications/office/activitywatch/wrapper.nix @@ -0,0 +1,18 @@ +{ lib +, symlinkJoin +, aw-server-rust +, aw-qt +, aw-watcher-afk +, aw-watcher-window +, extraWatchers ? [ ] +}: + +symlinkJoin { + name = "activitywatch-${aw-server-rust.version}"; + paths = [ + aw-server-rust.out + aw-qt.out + aw-watcher-afk.out + aw-watcher-window.out + ] ++ (lib.forEach extraWatchers (p: p.out)); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b89d2da50595..5391d82a2e90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28757,6 +28757,8 @@ with pkgs; aw-watcher-afk aw-watcher-window; + activitywatch = callPackage ../applications/office/activitywatch/wrapper.nix { }; + adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; adl = callPackage ../applications/video/adl { }; From c85f31a0714b9765c940e8304f66d7b8562d2de6 Mon Sep 17 00:00:00 2001 From: Victor Fuentes Date: Mon, 8 May 2023 10:27:53 -0400 Subject: [PATCH 023/175] calamares-nixos-extensions: 0.3.11 -> 0.3.12 --- pkgs/tools/misc/calamares-nixos-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares-nixos-extensions/default.nix b/pkgs/tools/misc/calamares-nixos-extensions/default.nix index ad21c398fe9f..455d1b223a7c 100644 --- a/pkgs/tools/misc/calamares-nixos-extensions/default.nix +++ b/pkgs/tools/misc/calamares-nixos-extensions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "calamares-nixos-extensions"; - version = "0.3.11"; + version = "0.3.12"; src = fetchFromGitHub { owner = "NixOS"; repo = "calamares-nixos-extensions"; rev = version; - sha256 = "NAHUU0tQLu8c2dke1V0aM3mHrNgM8ekHSB2Fo9dQUk8="; + sha256 = "qNRlUz4+xxNNzyswKHOjbkaLx0qi8fiAly94fMOlryE="; }; installPhase = '' From e47ac00467cca80fcd50e35ccc4b68b5fca0cee8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 9 May 2023 00:13:00 +0200 Subject: [PATCH 024/175] strace: 6.2 -> 6.3 ChangeLog: https://github.com/strace/strace/releases/tag/v6.3 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 100014a139b1..cac4cff4328c 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.2"; + version = "6.3"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-DH04pElBYmjTAEApoiChWnfCIGoDzIgSDzf0bpSRd+g="; + sha256 = "sha256-4Xh44wFQbBzDAWERGK0U7+5/i872Oyes5dKQrM57tzE="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From f2c5dfdc12f2555eadcd47e80edb462164ad9679 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 May 2023 01:20:25 +0000 Subject: [PATCH 025/175] yabridge: 5.0.4 -> 5.0.5 --- pkgs/tools/audio/yabridge/default.nix | 18 +++++++++--------- .../audio/yabridge/hardcode-dependencies.patch | 6 +++--- pkgs/tools/audio/yabridgectl/Cargo.lock | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 753934672f41..5c4762183970 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -18,7 +18,7 @@ let owner = "chriskohlhoff"; repo = "asio"; rev = "refs/tags/asio-1-22-1"; - sha256 = "sha256-UDLhx2yI6Txg0wP5H4oNIhgKIB2eMxUGCyT2x/7GgVg="; + hash = "sha256-UDLhx2yI6Txg0wP5H4oNIhgKIB2eMxUGCyT2x/7GgVg="; }; # Derived from subprojects/bitsery.wrap @@ -26,7 +26,7 @@ let owner = "fraillt"; repo = "bitsery"; rev = "refs/tags/v5.2.2"; - sha256 = "sha256-VwzVtxt+E/SVcxqIJw8BKPO2q7bu/hkhY+nB7FHrZpY="; + hash = "sha256-VwzVtxt+E/SVcxqIJw8BKPO2q7bu/hkhY+nB7FHrZpY="; }; # Derived from subprojects/clap.wrap @@ -34,7 +34,7 @@ let owner = "free-audio"; repo = "clap"; rev = "refs/tags/1.1.7"; - sha256 = "sha256-WcMTxE+QCzlp4lhFdghZI8UI/5mdVeRvrl24Xynd0qk="; + hash = "sha256-WcMTxE+QCzlp4lhFdghZI8UI/5mdVeRvrl24Xynd0qk="; }; # Derived from subprojects/function2.wrap @@ -42,7 +42,7 @@ let owner = "Naios"; repo = "function2"; rev = "refs/tags/4.2.0"; - sha256 = "sha256-wrt+fCcM6YD4ZRZYvqqB+fNakCNmltdPZKlNkPLtgMs="; + hash = "sha256-wrt+fCcM6YD4ZRZYvqqB+fNakCNmltdPZKlNkPLtgMs="; }; # Derived from subprojects/ghc_filesystem.wrap @@ -50,7 +50,7 @@ let owner = "gulrak"; repo = "filesystem"; rev = "refs/tags/v1.5.12"; - sha256 = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE="; + hash = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE="; }; # Derived from subprojects/tomlplusplus.wrap @@ -58,7 +58,7 @@ let owner = "marzer"; repo = "tomlplusplus"; rev = "refs/tags/v3.3.0"; - sha256 = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M="; + hash = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M="; }; # Derived from vst3.wrap @@ -67,19 +67,19 @@ let repo = "vst3sdk"; rev = "refs/tags/v3.7.7_build_19-patched"; fetchSubmodules = true; - sha256 = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU="; + hash = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU="; }; in multiStdenv.mkDerivation (finalAttrs: { pname = "yabridge"; - version = "5.0.4"; + version = "5.0.5"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = "yabridge"; rev = "refs/tags/${finalAttrs.version}"; - sha256 = "sha256-15WTCXMvghoU5TkE8yuQJrxj9cwVjczDKGKWjoUS6SI="; + hash = "sha256-SB2/zKxj9GDOOb3Zn4kWj7dXhDg/wbx6nPKYbQ041Cs="; }; # Unpack subproject sources diff --git a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch index 6dd23d7f370d..c657cd7d56b2 100644 --- a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch +++ b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index f76f5acf..045e9d40 100644 +index d8d9135b..717280d9 100644 --- a/meson.build +++ b/meson.build @@ -221,7 +221,7 @@ if is_64bit_system @@ -12,10 +12,10 @@ index f76f5acf..045e9d40 100644 # These are all headers-only libraries, and thus won't require separate 32-bit diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp -index 8d6236ad..ea5c1396 100644 +index 4a52b6c1..abbb1ec8 100644 --- a/src/plugin/utils.cpp +++ b/src/plugin/utils.cpp -@@ -93,7 +93,7 @@ std::string PluginInfo::wine_version() const { +@@ -101,7 +101,7 @@ std::string PluginInfo::wine_version() const { // The '*.exe' scripts generated by winegcc allow you to override the binary // used to run Wine, so will will handle this in the same way for our Wine // version detection. We'll be using `execvpe` diff --git a/pkgs/tools/audio/yabridgectl/Cargo.lock b/pkgs/tools/audio/yabridgectl/Cargo.lock index ecadbfde7fa9..e5eeca5a3db0 100644 --- a/pkgs/tools/audio/yabridgectl/Cargo.lock +++ b/pkgs/tools/audio/yabridgectl/Cargo.lock @@ -835,7 +835,7 @@ dependencies = [ [[package]] name = "yabridgectl" -version = "5.0.4" +version = "5.0.5" dependencies = [ "anyhow", "clap", From fd7b832320d5daa6d0d6c6b3329ecb32a6223303 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 9 May 2023 12:54:48 -0400 Subject: [PATCH 026/175] cargo-dist: 0.0.6 -> 0.0.7 Diff: https://github.com/axodotdev/cargo-dist/compare/v0.0.6...v0.0.7 Changelog: https://github.com/axodotdev/cargo-dist/blob/v0.0.7/CHANGELOG.md --- pkgs/development/tools/rust/cargo-dist/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 362907a4941c..50e9f240ba1d 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -3,22 +3,24 @@ , fetchFromGitHub , pkg-config , bzip2 +, xz +, zstd , stdenv , rustup }: rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-fpOBSMVBkuFJcog5g5qFO/0GI78GkkwWQC7zocrVJ2w="; + hash = "sha256-uXC+iaOcEIyGMVNtAduhT68GuE29aL/3S6uEMllAWNA="; }; - cargoHash = "sha256-BqbF21OotztNZsol6wlTDzfz0ViybPF5KK/v+F9N5Us="; + cargoHash = "sha256-/TLi+ESOZhJ4Xg3hdUEWhM0K4asI9+L1M1+hWuDOj9Q="; nativeBuildInputs = [ pkg-config @@ -26,8 +28,14 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 + xz + zstd ]; + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + nativeCheckInputs = lib.optionals stdenv.isDarwin [ rustup ]; From c05657e6086c47e7bbb6688eac2cff7394aaf565 Mon Sep 17 00:00:00 2001 From: Ryan Schlesinger Date: Tue, 9 May 2023 10:06:46 -0300 Subject: [PATCH 027/175] getoptions: Don't require busybox on macOS The busybox package is not available on macOS. getoptions runs checks on installation that (by default) require busybox. The busybox specific checks are now only run on other platforms. --- pkgs/tools/misc/getoptions/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/getoptions/default.nix b/pkgs/tools/misc/getoptions/default.nix index e3ee684d4dfa..46a671707259 100644 --- a/pkgs/tools/misc/getoptions/default.nix +++ b/pkgs/tools/misc/getoptions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchFromGitHub, shellcheck, shellspec, busybox-sandbox-shell, ksh, mksh, yash, zsh }: +{ lib, stdenvNoCC, fetchFromGitHub, shellspec, busybox-sandbox-shell, ksh, mksh, yash, zsh }: stdenvNoCC.mkDerivation rec { pname = "getoptions"; @@ -15,13 +15,16 @@ stdenvNoCC.mkDerivation rec { doCheck = true; - nativeCheckInputs = [ shellcheck shellspec busybox-sandbox-shell ksh mksh yash zsh ]; + nativeCheckInputs = [ shellspec ksh mksh yash zsh ] + ++ lib.lists.optional (!stdenvNoCC.isDarwin) busybox-sandbox-shell; preCheck = '' sed -i '/shellspec -s posh/d' Makefile + '' + lib.strings.optionalString stdenvNoCC.isDarwin '' + sed -i "/shellspec -s 'busybox ash'/d" Makefile ''; - checkTarget = "check testall"; + checkTarget = "testall"; meta = with lib; { description = "An elegant option/argument parser for shell scripts (full support for bash and all POSIX shells)"; From a24ae615ab9610f2f725e0e109ba063dad50ec39 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 9 May 2023 12:04:03 +0200 Subject: [PATCH 028/175] chromiumDev: 114.0.5735.6 -> 115.0.5750.0 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 51de6c2f35f1..5c65a19ae223 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "114.0.5735.6", - "sha256": "0wxlfqxrawk77yzm00hb1fbssrycl4mha53wm4y5mlb8warqs5jk", - "sha256bin64": "0vlb6zr50kn7i0rfvy3yvwzcffpg5ki7is8i3ck43b1gr1bsmgmb", + "version": "115.0.5750.0", + "sha256": "1y0yq7k5rcv4lfxdlr4psap4hxcnrwjps6vl42hwvpw6zxscw1lv", + "sha256bin64": "0h2d4csrznavalfnzvn59pc2jmj6ci1paslp7y2rlpv1jqjrpgq9", "deps": { "gn": { "version": "2023-04-19", From be5c851add9905183fc689072284071f5c850d7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 May 2023 08:08:16 +0000 Subject: [PATCH 029/175] python310Packages.pytorch-metric-learning: 2.1.0 -> 2.1.1 --- .../python-modules/pytorch-metric-learning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index ae21c5593589..e584461cd589 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "2.1.0"; + version = "2.1.1"; disabled = isPy27; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9MIwNsiuWobgBaD2kXHz5nwBy04dxmxpF+7qfZ2l77M="; + hash = "sha256-XQ7lHhtcsqANuNVmjNMRjVdvwVo5hIVqTeNrnMF80uE="; }; propagatedBuildInputs = [ From 5ba0f1ea90b0afa2abc23a43edb63af51d932e6d Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 10 May 2023 12:01:47 +1000 Subject: [PATCH 030/175] python3.pkgs.shiboken6: init at 6.5.0 --- .../python-modules/shiboken6/default.nix | 75 +++++++++++++++++ .../shiboken6/fix-include-qt-headers.patch | 80 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 + 3 files changed, 159 insertions(+) create mode 100644 pkgs/development/python-modules/shiboken6/default.nix create mode 100644 pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix new file mode 100644 index 000000000000..ef59ff5bf2c6 --- /dev/null +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -0,0 +1,75 @@ +{ lib +, fetchurl +, llvmPackages +, python +, qt6 +, cmake +, autoPatchelfHook +, stdenv +, libxcrypt +}: + +llvmPackages.stdenv.mkDerivation rec { + pname = "shiboken6"; + version = "6.5.0"; + + src = fetchurl { + # https://download.qt.io/official_releases/QtForPython/shiboken6/ + url = "https://download.qt.io/official_releases/QtForPython/shiboken6/PySide6-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz"; + sha256 = "sha256-bvU7KRJyZ+OBkX5vk5nOdg7cBkTNWDGYix3nLJ1YOrQ="; + }; + + sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; + + patches = [ + ./fix-include-qt-headers.patch + ]; + + # Due to Shiboken.abi3.so being linked to libshiboken6.abi3.so.6.5 in the build tree, + # we need to remove the build tree reference from the RPATH and then add the correct + # directory to the RPATH. On Linux, the second part is handled by autoPatchelfHook. + # https://bugreports.qt.io/browse/PYSIDE-2233 + postBuild = '' + echo "fixing RPATH of Shiboken.abi3.so" + '' + (if stdenv.isDarwin then '' + invalid_rpaths=$(otool -l Shiboken.abi3.so | awk ' + /^[^ ]/ {f = 0} + $2 == "LC_RPATH" && $1 == "cmd" {f = 1} + f && gsub(/^ *path | \(offset [0-9]+\)$/, "") == 2 + ' | grep --invert-match /nix/store) + install_name_tool $(echo $invalid_rpaths | sed 's/^/-delete_rpath /' | tr '\n' ' ' | sed 's/ $//') Shiboken.abi3.so + install_name_tool -add_rpath $out/lib Shiboken.abi3.so + '' else '' + patchelf Shiboken.abi3.so --shrink-rpath --allowed-rpath-prefixes /nix/store + ''); + + cmakeFlags = [ + "-DBUILD_TESTS=OFF" + ]; + + dontWrapQtApps = true; + + nativeBuildInputs = [ + cmake + python + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + ]; + + buildInputs = [ + llvmPackages.llvm + llvmPackages.libclang + qt6.qtbase + ] ++ (lib.optionals (python.pythonOlder "3.9") [ + # see similar issue: 202262 + # libxcrypt is required for crypt.h for building older python modules + libxcrypt + ]); + + meta = with lib; { + description = "Generator for the pyside6 Qt bindings"; + license = with licenses; [ lgpl3Only gpl2Only gpl3Only ]; + homepage = "https://wiki.qt.io/Qt_for_Python"; + maintainers = with maintainers; [ gebner Enzime ]; + }; +} diff --git a/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch b/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch new file mode 100644 index 000000000000..4c6d7bdad3fd --- /dev/null +++ b/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch @@ -0,0 +1,80 @@ +--- a/ApiExtractor/clangparser/compilersupport.cpp ++++ b/ApiExtractor/clangparser/compilersupport.cpp +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include + +@@ -341,6 +342,13 @@ QByteArrayList emulatedCompilerOptions() + { + QByteArrayList result; + HeaderPaths headerPaths; ++ ++ bool isNixDebug = qgetenv("NIX_DEBUG").toInt() > 0; ++ // examples: ++ // /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-qtsensors-6.4.2-dev/include ++ // /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-qtbase-6.4.2-dev/include ++ QRegularExpression qtHeaderRegex(uR"(/[0-9a-z]{32}-qt[a-z0-9]+-)"_s); ++ + switch (compiler()) { + case Compiler::Msvc: + result.append(QByteArrayLiteral("-fms-compatibility-version=19.26.28806")); +@@ -352,9 +360,30 @@ QByteArrayList emulatedCompilerOptions() + appendClangBuiltinIncludes(&headerPaths); + break; + case Compiler::Clang: +- headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s))); ++ // fix: error: cannot jump from switch statement to this case label: case Compiler::Gpp ++ // note: jump bypasses variable initialization: const HeaderPaths clangPaths = ++ { ++ //headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s))); ++ // fix: qt.shiboken: x is specified in typesystem, but not defined. This could potentially lead to compilation errors. ++ // PySide requires that Qt headers are not -isystem ++ // https://bugreports.qt.io/browse/PYSIDE-787 ++ const HeaderPaths clangPaths = gppInternalIncludePaths(compilerFromCMake(u"clang++"_qs)); ++ for (const HeaderPath &h : clangPaths) { ++ auto match = qtHeaderRegex.match(QString::fromUtf8(h.path)); ++ if (!match.hasMatch()) { ++ if (isNixDebug) ++ qDebug() << "shiboken compilersupport.cpp: found non-qt header: " << h.path; ++ // add using -isystem ++ headerPaths.append(h); ++ } else { ++ if (isNixDebug) ++ qDebug() << "shiboken compilersupport.cpp: found qt header: " << h.path; ++ headerPaths.append({h.path, HeaderType::Standard}); ++ } ++ } + result.append(noStandardIncludeOption()); + break; ++ } + case Compiler::Gpp: + if (needsClangBuiltinIncludes()) + appendClangBuiltinIncludes(&headerPaths); +@@ -363,8 +392,20 @@ QByteArrayList emulatedCompilerOptions() + // etc (g++ 11.3). + const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(u"g++"_qs)); + for (const HeaderPath &h : gppPaths) { +- if (h.path.contains("c++") || h.path.contains("sysroot")) ++ // fix: qt.shiboken: x is specified in typesystem, but not defined. This could potentially lead to compilation errors. ++ // PySide requires that Qt headers are not -isystem ++ // https://bugreports.qt.io/browse/PYSIDE-787 ++ auto match = qtHeaderRegex.match(QString::fromUtf8(h.path)); ++ if (!match.hasMatch()) { ++ if (isNixDebug) ++ qDebug() << "shiboken compilersupport.cpp: found non-qt header: " << h.path; ++ // add using -isystem + headerPaths.append(h); ++ } else { ++ if (isNixDebug) ++ qDebug() << "shiboken compilersupport.cpp: found qt header: " << h.path; ++ headerPaths.append({h.path, HeaderType::Standard}); ++ } + } + break; + } +-- +2.39.0 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5bddaeaf20fd..73b3645ba05b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10901,6 +10901,10 @@ self: super: with self; { inherit (pkgs) cmake llvmPackages qt5; }); + shiboken6 = toPythonModule (callPackage ../development/python-modules/shiboken6 { + inherit (pkgs) cmake llvmPackages qt6; + }); + shippai = callPackage ../development/python-modules/shippai { }; shiv = callPackage ../development/python-modules/shiv { }; From 32d6e945275ef5c67927f3448f0f0c16335a0bd5 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 10 May 2023 12:02:01 +1000 Subject: [PATCH 031/175] python3.pkgs.pyside6: init at 6.5.0 --- .../python-modules/pyside6/default.nix | 77 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 + 2 files changed, 81 insertions(+) create mode 100644 pkgs/development/python-modules/pyside6/default.nix diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix new file mode 100644 index 000000000000..174feb8b230d --- /dev/null +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, cmake +, ninja +, qt6 +, python +, shiboken6 +, libxcrypt +}: + +stdenv.mkDerivation rec { + pname = "pyside6"; + + inherit (shiboken6) version src; + + sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; + + postPatch = '' + # Don't ignore optional Qt modules + substituteInPlace cmake/PySideHelpers.cmake \ + --replace \ + 'string(FIND "''${_module_dir}" "''${_core_abs_dir}" found_basepath)' \ + 'set (found_basepath 0)' + ''; + + nativeBuildInputs = [ + cmake + ninja + python + ]; + + buildInputs = with qt6; [ + # required + qtbase + # optional + qt3d + qtcharts + qtconnectivity + qtdatavis3d + qtdeclarative + qthttpserver + qtmultimedia + qtnetworkauth + qtquick3d + qtremoteobjects + qtscxml + qtsensors + qtspeech + qtsvg + qttools + qtwebchannel + qtwebengine + qtwebsockets + ] ++ lib.optionals (python.pythonOlder "3.9") [ + # see similar issue: 202262 + # libxcrypt is required for crypt.h for building older python modules + libxcrypt + ]; + + propagatedBuildInputs = [ + shiboken6 + ]; + + cmakeFlags = [ + "-DBUILD_TESTS=OFF" + ]; + + dontWrapQtApps = true; + + meta = with lib; { + description = "Python bindings for Qt"; + license = with licenses; [ lgpl3Only gpl2Only gpl3Only ]; + homepage = "https://wiki.qt.io/Qt_for_Python"; + maintainers = with maintainers; [ gebner Enzime ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73b3645ba05b..27d3346d91e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9133,6 +9133,10 @@ self: super: with self; { inherit (pkgs) cmake ninja qt5; }); + pyside6 = toPythonModule (callPackage ../development/python-modules/pyside6 { + inherit (pkgs) cmake ninja qt6; + }); + pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; From 16d594a0e2017bfa8b24051f4697d8debc240bfb Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 7 May 2023 15:27:05 +0200 Subject: [PATCH 032/175] lib.types.pkgs: init A nominal type. --- lib/types.nix | 8 ++++++++ nixos/doc/manual/development/option-types.section.md | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/lib/types.nix b/lib/types.nix index e0da18a2febb..373d0ce7876f 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -476,6 +476,14 @@ rec { check = x: isDerivation x && hasAttr "shellPath" x; }; + pkgs = addCheck + (unique { message = "A Nixpkgs pkgs set can not be merged with another pkgs set."; } attrs // { + name = "pkgs"; + descriptionClass = "noun"; + description = "Nixpkgs package set"; + }) + (x: (x._type or null) == "pkgs"); + path = mkOptionType { name = "path"; descriptionClass = "noun"; diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md index 9e2ecb8e3562..9e156ebff9d3 100644 --- a/nixos/doc/manual/development/option-types.section.md +++ b/nixos/doc/manual/development/option-types.section.md @@ -99,6 +99,10 @@ merging is handled. problems. ::: +`types.pkgs` + +: A type for the top level Nixpkgs package set. + ### Numeric types {#sec-option-types-numeric} `types.int` From 6e594fedb353d8c75e0ee0527e2d821d30568c82 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 7 May 2023 15:32:10 +0200 Subject: [PATCH 033/175] nixos/nixpkgs: Use types.pkgs --- nixos/modules/misc/nixpkgs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 7f44c3f6f3f0..55ec08acf445 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -49,10 +49,10 @@ let merge = lib.mergeOneOption; }; - pkgsType = mkOptionType { - name = "nixpkgs"; + pkgsType = types.pkgs // { + # This type is only used by itself, so let's elaborate the description a bit + # for the purpose of documentation. description = "An evaluation of Nixpkgs; the top level attribute set of packages"; - check = builtins.isAttrs; }; # Whether `pkgs` was constructed by this module - not if nixpkgs.pkgs or From 693e2c32871dcea7fe2ef455ee77571d3a117499 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 7 May 2023 15:33:47 +0200 Subject: [PATCH 034/175] nixos/eval-config: Remove statically known mkIf mkIf is unnecessary when the condition is statically known - that is knowable before entering the module evaluation. By changing this to a precomputed module, we support changing the defined options to readOnly options. --- nixos/lib/eval-config.nix | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 1e086271e523..058ab7280ccc 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -38,6 +38,8 @@ let pkgs_ = pkgs; in let + inherit (lib) optional; + evalModulesMinimal = (import ./default.nix { inherit lib; # Implicit use of feature is noted in implementation. @@ -47,15 +49,19 @@ let pkgsModule = rec { _file = ./eval-config.nix; key = _file; - config = { - # Explicit `nixpkgs.system` or `nixpkgs.localSystem` should override - # this. Since the latter defaults to the former, the former should - # default to the argument. That way this new default could propagate all - # they way through, but has the last priority behind everything else. - nixpkgs.system = lib.mkIf (system != null) (lib.mkDefault system); - - _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_); - }; + config = lib.mkMerge ( + (optional (system != null) { + # Explicit `nixpkgs.system` or `nixpkgs.localSystem` should override + # this. Since the latter defaults to the former, the former should + # default to the argument. That way this new default could propagate all + # they way through, but has the last priority behind everything else. + nixpkgs.system = lib.mkDefault system; + }) + ++ + (optional (pkgs_ != null) { + _module.args.pkgs = lib.mkForce pkgs_; + }) + ); }; withWarnings = x: From e5db80ae487b59b4e9f950d68983ffb0575e26c6 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 7 May 2023 15:37:28 +0200 Subject: [PATCH 035/175] nixosModules.pkgsReadOnly: init --- flake.nix | 13 +++++ nixos/modules/misc/nixpkgs/read-only.nix | 74 ++++++++++++++++++++++++ nixos/modules/misc/nixpkgs/test.nix | 59 +++++++++++++++++++ 3 files changed, 146 insertions(+) create mode 100644 nixos/modules/misc/nixpkgs/read-only.nix diff --git a/flake.nix b/flake.nix index f9442d8ea2d2..fa00bffcdf92 100644 --- a/flake.nix +++ b/flake.nix @@ -57,6 +57,19 @@ nixosModules = { notDetected = ./nixos/modules/installer/scan/not-detected.nix; + + /* + Make the `nixpkgs.*` configuration read-only. Guarantees that `pkgs` + is the way you initialize it. + + Example: + + { + imports = [ nixpkgs.nixosModules.readOnlyPkgs ]; + nixpkgs.pkgs = nixpkgs.legacyPackages.x86_64-linux; + } + */ + readOnlyPkgs = ./nixos/modules/misc/nixpkgs/read-only.nix; }; }; } diff --git a/nixos/modules/misc/nixpkgs/read-only.nix b/nixos/modules/misc/nixpkgs/read-only.nix new file mode 100644 index 000000000000..2a783216a9d5 --- /dev/null +++ b/nixos/modules/misc/nixpkgs/read-only.nix @@ -0,0 +1,74 @@ +# A replacement for the traditional nixpkgs module, such that none of the modules +# can add their own configuration. This ensures that the Nixpkgs configuration is +# exactly as the user intends. +# This may also be used as a performance optimization when evaluating multiple +# configurations at once, with a shared `pkgs`. + +# This is a separate module, because merging this logic into the nixpkgs module +# is too burdensome, considering that it is already burdened with legacy. +# Moving this logic into a module does not lose any composition benefits, because +# its purpose is not something that composes anyway. + +{ lib, config, ... }: + +let + cfg = config.nixpkgs; + inherit (lib) mkOption types; + +in +{ + disabledModules = [ + ../nixpkgs.nix + ]; + options = { + nixpkgs = { + pkgs = mkOption { + type = lib.types.pkgs; + description = lib.mdDoc ''The pkgs module argument.''; + }; + config = mkOption { + internal = true; + type = types.unique { message = "nixpkgs.config is set to read-only"; } types.anything; + description = lib.mdDoc '' + The Nixpkgs `config` that `pkgs` was initialized with. + ''; + }; + overlays = mkOption { + internal = true; + type = types.unique { message = "nixpkgs.overlays is set to read-only"; } types.anything; + description = lib.mdDoc '' + The Nixpkgs overlays that `pkgs` was initialized with. + ''; + }; + hostPlatform = mkOption { + internal = true; + readOnly = true; + description = lib.mdDoc '' + The platform of the machine that is running the NixOS configuration. + ''; + }; + buildPlatform = mkOption { + internal = true; + readOnly = true; + description = lib.mdDoc '' + The platform of the machine that built the NixOS configuration. + ''; + }; + # NOTE: do not add the legacy options such as localSystem here. Let's keep + # this module simple and let module authors upgrade their code instead. + }; + }; + config = { + _module.args.pkgs = + # find mistaken definitions + builtins.seq cfg.config + builtins.seq cfg.overlays + builtins.seq cfg.hostPlatform + builtins.seq cfg.buildPlatform + cfg.pkgs; + nixpkgs.config = cfg.pkgs.config; + nixpkgs.overlays = cfg.pkgs.overlays; + nixpkgs.hostPlatform = cfg.pkgs.stdenv.hostPlatform; + nixpkgs.buildPlatform = cfg.pkgs.stdenv.buildPlatform; + }; +} diff --git a/nixos/modules/misc/nixpkgs/test.nix b/nixos/modules/misc/nixpkgs/test.nix index a6d8877ae070..0536cfc9624a 100644 --- a/nixos/modules/misc/nixpkgs/test.nix +++ b/nixos/modules/misc/nixpkgs/test.nix @@ -1,3 +1,5 @@ +# [nixpkgs]$ nix-build -A nixosTests.nixpkgs --show-trace + { evalMinimalConfig, pkgs, lib, stdenv }: let eval = mod: evalMinimalConfig { @@ -27,6 +29,47 @@ let let uncheckedEval = lib.evalModules { modules = [ ../nixpkgs.nix module ]; }; in map (ass: ass.message) (lib.filter (ass: !ass.assertion) uncheckedEval.config.assertions); + + readOnlyUndefined = evalMinimalConfig { + imports = [ ./read-only.nix ]; + }; + + readOnlyBad = evalMinimalConfig { + imports = [ ./read-only.nix ]; + nixpkgs.pkgs = { }; + }; + + readOnly = evalMinimalConfig { + imports = [ ./read-only.nix ]; + nixpkgs.pkgs = pkgs; + }; + + readOnlyBadConfig = evalMinimalConfig { + imports = [ ./read-only.nix ]; + nixpkgs.pkgs = pkgs; + nixpkgs.config.allowUnfree = true; # do in pkgs instead! + }; + + readOnlyBadOverlays = evalMinimalConfig { + imports = [ ./read-only.nix ]; + nixpkgs.pkgs = pkgs; + nixpkgs.overlays = [ (_: _: {}) ]; # do in pkgs instead! + }; + + readOnlyBadHostPlatform = evalMinimalConfig { + imports = [ ./read-only.nix ]; + nixpkgs.pkgs = pkgs; + nixpkgs.hostPlatform = "foo-linux"; # do in pkgs instead! + }; + + readOnlyBadBuildPlatform = evalMinimalConfig { + imports = [ ./read-only.nix ]; + nixpkgs.pkgs = pkgs; + nixpkgs.buildPlatform = "foo-linux"; # do in pkgs instead! + }; + + throws = x: ! (builtins.tryEval x).success; + in lib.recurseIntoAttrs { invokeNixpkgsSimple = @@ -65,5 +108,21 @@ lib.recurseIntoAttrs { nixpkgs.pkgs = pkgs; } == []; + + # Tests for the read-only.nix module + assert readOnly._module.args.pkgs.stdenv.hostPlatform.system == pkgs.stdenv.hostPlatform.system; + assert throws readOnlyBad._module.args.pkgs.stdenv; + assert throws readOnlyUndefined._module.args.pkgs.stdenv; + assert throws readOnlyBadConfig._module.args.pkgs.stdenv; + assert throws readOnlyBadOverlays._module.args.pkgs.stdenv; + assert throws readOnlyBadHostPlatform._module.args.pkgs.stdenv; + assert throws readOnlyBadBuildPlatform._module.args.pkgs.stdenv; + # read-only.nix does not provide legacy options, for the sake of simplicity + # If you're bothered by this, upgrade your configs to use the new *Platform + # options. + assert !readOnly.options.nixpkgs?system; + assert !readOnly.options.nixpkgs?localSystem; + assert !readOnly.options.nixpkgs?crossSystem; + pkgs.emptyFile; } From cd358fe24eb50358ef5a72c35c92adc62f984ff3 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 7 May 2023 15:38:58 +0200 Subject: [PATCH 036/175] nixos/all-tests.nix: Set nixpkgs.system --- nixos/lib/testing/nodes.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index c538ab468c52..e9649e724c35 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -3,11 +3,9 @@ testModuleArgs@{ config, lib, hostPkgs, nodes, ... }: let inherit (lib) mkOption mkForce optional types mapAttrs mkDefault mdDoc; - system = hostPkgs.stdenv.hostPlatform.system; - baseOS = import ../eval-config.nix { - inherit system; + system = null; # use modularly defined system inherit (config.node) specialArgs; modules = [ config.defaults ]; baseModules = (import ../../modules/module-list.nix) ++ @@ -17,11 +15,16 @@ let ({ config, ... }: { virtualisation.qemu.package = testModuleArgs.config.qemu.package; - + }) + ({ + config = { # Ensure we do not use aliases. Ideally this is only set # when the test framework is used by Nixpkgs NixOS tests. nixpkgs.config.allowAliases = false; - }) + # TODO: switch to nixpkgs.hostPlatform and make sure containers-imperative test still evaluates. + nixpkgs.system = hostPkgs.stdenv.hostPlatform.system; + }; + }) testModuleArgs.config.extraBaseModules ]; }; From e0d1e77c232ef58b95e01043fb44ad51544140ee Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Fri, 21 Apr 2023 13:49:30 +0200 Subject: [PATCH 037/175] bazel_5: 5.4.0->5.4.1 Also update the updater script. https://github.com/bazelbuild/bazel/releases/tag/5.4.1 - [X] recalculate fetchAttrs digest for packages built with bazel_5 --- .../build-bazel-package/default.nix | 7 +- .../python-modules/jaxlib/default.nix | 4 +- .../python-modules/tensorflow/default.nix | 10 +- .../tools/bazel-watcher/default.nix | 2 +- .../build-managers/bazel/bazel_5/default.nix | 16 +- .../build-managers/bazel/bazel_5/no-arc.patch | 6 +- .../bazel/bazel_5/src-deps.json | 222 ++++++++++++------ pkgs/servers/http/envoy/default.nix | 4 +- 8 files changed, 180 insertions(+), 91 deletions(-) diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index d06b11c8ee04..f9de0ad468b2 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -67,7 +67,6 @@ let --output_user_root="$bazelUserRoot" \ ${cmd} \ --curses=no \ - -j $NIX_BUILD_CORES \ "''${copts[@]}" \ "''${host_copts[@]}" \ "''${linkopts[@]}" \ @@ -131,7 +130,7 @@ stdenv.mkDerivation (fBuildAttrs // { # https://github.com/bazelbuild/bazel/issues/6502 "--loading_phase_threads=1" "$bazelFetchFlags" - ]; + ] ++ (if fetchConfigured then ["--jobs" "$NIX_BUILD_CORES"] else []); targets = fFetchAttrs.bazelTargets ++ fFetchAttrs.bazelTestTargets; } } @@ -252,14 +251,14 @@ stdenv.mkDerivation (fBuildAttrs // { bazelCmd { cmd = "test"; additionalFlags = - ["--test_output=errors"] ++ fBuildAttrs.bazelTestFlags; + ["--test_output=errors"] ++ fBuildAttrs.bazelTestFlags ++ ["--jobs" "$NIX_BUILD_CORES"]; targets = fBuildAttrs.bazelTestTargets; } } ${ bazelCmd { cmd = "build"; - additionalFlags = fBuildAttrs.bazelBuildFlags; + additionalFlags = fBuildAttrs.bazelBuildFlags ++ ["--jobs" "$NIX_BUILD_CORES"]; targets = fBuildAttrs.bazelTargets; } } diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 1e8a81799ae7..1f4c8a9693b2 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -243,9 +243,9 @@ let sha256 = if cudaSupport then - "sha256-cgsiloW77p4+TKRrYequZ/UwKwfO2jsHKtZ+aA30H7E=" + "sha256-O6bM7Lc8eaFyO4Xzl5/hvBrbPioI+Yeqx9yNC97fvKk=" else - "sha256-D7WYG3YUaWq+4APYx8WpA191VVtoHG0fth3uEHXOeos="; + "sha256-gLMJfJSQIdGGY2Ivx4IgDWg0hc+mxzlqY11CUkSWcjI="; }; buildAttrs = { diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 41945236aa5c..ba7c36c9503c 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -394,11 +394,11 @@ let fetchAttrs = { sha256 = { x86_64-linux = if cudaSupport - then "sha256-rcTPOMoBfmKFuuCanMlhmtFtOQzOICfEXTZey/rQEdM=" - else "sha256-JGLH64F81xwSUl9RCWJhBLNRBQandImsVafEF5s+ap0="; - aarch64-linux = "sha256-g6JUZQQalCTSjvAarkI7+gq13cPhFg/O9LPQDGNvrII="; - x86_64-darwin = "sha256-7O0zPs+damAjWXZn5C5SSWBp35C8QX3y4kCM7tYkM7s="; - aarch64-darwin = "sha256-US7uunEBDo2NKI9UHvgThbQ7rA05HjQlUthw0gIINaI="; + then "sha256-lURiR0Ra4kynDXyfuONG+A7CpxnAsfKzIdFTExKzp1o=" + else "sha256-lDvRgj+UlaneRGZOO9UVCb6uyxcbRJfUhABf/sgKPi0="; + aarch64-linux = "sha256-z2d45fqHz5HW+qkv3fR9hMg3sEwUzJfxF54vng85bHk="; + x86_64-darwin = "sha256-AAvuz8o6ZRkaSYMgaep74lDDQcxOupDCX4vRaK/jnCU="; + aarch64-darwin = "sha256-kexRSvfQqb92ZRuUqAO070RnUUBidAqghiA7Y8do9vc="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 906403dcd1d5..137e54b04c33 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -82,7 +82,7 @@ buildBazelPackage rec { rm -rf $bazelOut/external/com_google_protobuf ''; - sha256 = "sha256-le8IepS+IGVX45Gj1aicPjYOkuUA+VVUy/PEeKLNYss="; + sha256 = "sha256-lC9e5Z2cxLAeWXkiFGmcB6aOaurMvwrP/k5jl3gCfAc="; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 29874a82ad25..f0d2147fe7f6 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -24,16 +24,19 @@ }: let - version = "5.4.0"; + version = "5.4.1"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-ocYtm8tOAxBt3wt72WGWuiRuHJt6k12vjZvtqLvcuKE="; + hash = "sha256-3P9pNXVqp6yk/Fabsr0m4VN/Cx9tG9pfKyAPqDXMUH8="; }; - # Update with `eval $(nix-build -A bazel_5.updater)`, - # then add new dependencies from the dict in ./src-deps.json as required. + # Update with + # 1. export BAZEL_SELF=$(nix-build -A bazel_5) + # 2. update version and hash for sources above + # 3. `eval $(nix-build -A bazel_5.updater)` + # 4. add new dependencies from the dict in ./src-deps.json if required by failing build srcDeps = lib.attrsets.attrValues srcDepsSet; srcDepsSet = let @@ -324,8 +327,8 @@ stdenv.mkDerivation rec { #!${runtimeShell} (cd "${src_for_updater}" && BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ - "${bazel_self}"/bin/bazel \ - query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \ + "$BAZEL_SELF"/bin/bazel \ + query 'kind(http_archive, //external:*) + kind(http_file, //external:*) + kind(distdir_tar, //external:*) + kind(git_repository, //external:*)' \ --loading_phase_threads=1 \ --output build) \ | "${python3}"/bin/python3 "${./update-srcDeps.py}" \ @@ -619,6 +622,7 @@ stdenv.mkDerivation rec { } cd ./bazel_src + rm .bazelversion # this doesn't necessarily match the version we built # test whether $WORKSPACE_ROOT/tools/bazel works diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch b/pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch index 95d70a9db38e..e7a4498839dc 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/no-arc.patch @@ -6,9 +6,9 @@ index 990afe3e8c..cd5b7b1b7a 100644 ]) DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """ -- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \ +- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \ - -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \ -+ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \ ++ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -framework CoreServices \ + -framework Foundation -arch @multiBinPatch@ -Wl,-no_uuid -o $@ $< && \ env -i codesign --identifier $@ --force --sign - $@ """ @@ -20,7 +20,7 @@ index 2b819f07ec..a98ce37673 100644 @@ -127,7 +127,6 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label): "macosx", "clang", - "-mmacosx-version-min=10.9", + "-mmacosx-version-min=10.13", - "-fobjc-arc", "-framework", "CoreServices", diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json index fc6895e047ec..042c06ed74d7 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/src-deps.json @@ -1150,14 +1150,24 @@ "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip" ] }, + "remote_java_tools": { + "generator_function": "maybe", + "generator_name": "remote_java_tools", + "name": "remote_java_tools", + "sha256": "2eede49b2d80135e0ea22180f63df26db2ed4b795c1c041b25cc653d6019fbec", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools-v11.7.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools-v11.7.1.zip" + ] + }, "remote_java_tools_darwin": { "generator_function": "maybe", "generator_name": "remote_java_tools_darwin", "name": "remote_java_tools_darwin", - "sha256": "d15b05d2061382748f779dc566537ea567a46bcba6fa34b56d7cb6e6d668adab", + "sha256": "4d6d388b54ad3b9aa35b30dd67af8d71c4c240df8cfb5000bbec67bdd5c53a73", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_darwin-v10.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_darwin-v10.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_darwin-v11.7.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_darwin-v11.7.1.zip" ] }, "remote_java_tools_darwin_for_testing": { @@ -1200,10 +1210,10 @@ "generator_function": "maybe", "generator_name": "remote_java_tools_linux", "name": "remote_java_tools_linux", - "sha256": "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", + "sha256": "f78077f0c043d0d13c82de0ee4a99753e66bb18ec46e3601fa2a10e7f26798a8", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_linux-v10.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_linux-v11.7.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_linux-v11.7.1.zip" ] }, "remote_java_tools_linux_for_testing": { @@ -1300,10 +1310,10 @@ "generator_function": "maybe", "generator_name": "remote_java_tools_windows", "name": "remote_java_tools_windows", - "sha256": "873f1e53d1fa9c8e46b717673816cd822bb7acc474a194a18ff849fd8fa6ff00", + "sha256": "a7086734866505292ee4c206328c73c6af127e69bd51b98c9c186ae4b9b6d2db", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_windows-v10.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.6/java_tools_javac11_windows-v10.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.7.1/java_tools_windows-v11.7.1.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.7.1/java_tools_windows-v11.7.1.zip" ] }, "remote_java_tools_windows_for_testing": { @@ -1329,10 +1339,10 @@ "generator_function": "maybe", "generator_name": "remotejdk11_linux", "name": "remotejdk11_linux", - "sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64", + "sha256": "b8e8a63b79bc312aa90f3558edbea59e71495ef1a9c340e38900dd28a1c579f3", + "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-linux_x64", "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" + "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz" ] }, "remotejdk11_linux_aarch64": { @@ -1340,10 +1350,10 @@ "generator_function": "maybe", "generator_name": "remotejdk11_linux_aarch64", "name": "remotejdk11_linux_aarch64", - "sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4", - "strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64", + "sha256": "61254688067454d3ccf0ef25993b5dcab7b56c8129e53b73566c28a8dd4d48fb", + "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-linux_aarch64", "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz" + "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-linux_aarch64.tar.gz" ] }, "remotejdk11_linux_aarch64_for_testing": { @@ -1445,10 +1455,10 @@ "generator_function": "maybe", "generator_name": "remotejdk11_macos", "name": "remotejdk11_macos", - "sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64", + "sha256": "0b8c8b7cf89c7c55b7e2239b47201d704e8d2170884875b00f3103cf0662d6d7", + "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-macosx_x64", "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz" + "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_x64.tar.gz" ] }, "remotejdk11_macos_aarch64": { @@ -1456,11 +1466,11 @@ "generator_function": "maybe", "generator_name": "remotejdk11_macos_aarch64", "name": "remotejdk11_macos_aarch64", - "sha256": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a", - "strip_prefix": "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64", + "sha256": "e908a0b4c0da08d41c3e19230f819b364ff2e5f1dafd62d2cf991a85a34d3a17", + "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-macosx_aarch64", "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz", - "https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz" + "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu11.50.19-ca-jdk11.0.12-macosx_aarch64.tar.gz" ] }, "remotejdk11_macos_aarch64_for_testing": { @@ -1503,10 +1513,21 @@ "generator_function": "maybe", "generator_name": "remotejdk11_win", "name": "remotejdk11_win", - "sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18", - "strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64", + "sha256": "42ae65e75d615a3f06a674978e1fa85fdf078cad94e553fee3e779b2b42bb015", + "strip_prefix": "zulu11.50.19-ca-jdk11.0.12-win_x64", "urls": [ - "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip" + "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip" + ] + }, + "remotejdk11_win_arm64": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk11_win_arm64", + "name": "remotejdk11_win_arm64", + "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", + "strip_prefix": "jdk-11.0.13+8", + "urls": [ + "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip" ] }, "remotejdk11_win_arm64_for_testing": { @@ -1545,39 +1566,6 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip" ] }, - "remotejdk14_linux": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", - "generator_function": "maybe", - "generator_name": "remotejdk14_linux", - "name": "remotejdk14_linux", - "sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz" - ] - }, - "remotejdk14_macos": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", - "generator_function": "maybe", - "generator_name": "remotejdk14_macos", - "name": "remotejdk14_macos", - "sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz" - ] - }, - "remotejdk14_win": { - "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", - "generator_function": "maybe", - "generator_name": "remotejdk14_win", - "name": "remotejdk14_win", - "sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", - "strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64", - "urls": [ - "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip" - ] - }, "remotejdk15_linux": { "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", "generator_function": "maybe", @@ -1698,6 +1686,18 @@ "https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-win_x64.zip" ] }, + "remotejdk16_linux": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk16_linux", + "name": "remotejdk16_linux", + "sha256": "236b5ea97aff3cb312e743848d7efa77faf305170e41371a732ca93c1b797665", + "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz" + ] + }, "remotejdk16_linux_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk16_linux_for_testing", @@ -1716,6 +1716,30 @@ "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.gz" ] }, + "remotejdk16_macos": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk16_macos", + "name": "remotejdk16_macos", + "sha256": "6d47ef22dc56ce1f5a102ed39e21d9a97320f0bb786818e2c686393109d79bc5", + "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz" + ] + }, + "remotejdk16_macos_aarch64": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk16_macos_aarch64", + "name": "remotejdk16_macos_aarch64", + "sha256": "c92131e83bc71474850e667bc4e05fca33662b8feb009a0547aa14e76b40e890", + "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_aarch64.tar.gz" + ] + }, "remotejdk16_macos_aarch64_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk16_macos_aarch64_for_testing", @@ -1752,6 +1776,18 @@ "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-macosx_x64.tar.gz" ] }, + "remotejdk16_win": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk16_win", + "name": "remotejdk16_win", + "sha256": "6cbf98ada27476526a5f6dff79fd5f2c15e2f671818e503bdf741eb6c8fed3d4", + "strip_prefix": "zulu16.28.11-ca-jdk16.0.0-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip" + ] + }, "remotejdk16_win_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk16_win_for_testing", @@ -1770,6 +1806,18 @@ "https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-win_x64.zip" ] }, + "remotejdk17_linux": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk17_linux", + "name": "remotejdk17_linux", + "sha256": "37c4f8e48536cceae8c6c20250d6c385e176972532fd35759fa7d6015c965f56", + "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-linux_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz" + ] + }, "remotejdk17_linux_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk17_linux_for_testing", @@ -1788,6 +1836,30 @@ "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-linux_x64.tar.gz" ] }, + "remotejdk17_macos": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk17_macos", + "name": "remotejdk17_macos", + "sha256": "6029b1fe6853cecad22ab99ac0b3bb4fb8c903dd2edefa91c3abc89755bbd47d", + "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-macosx_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz" + ] + }, + "remotejdk17_macos_aarch64": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk17_macos_aarch64", + "name": "remotejdk17_macos_aarch64", + "sha256": "6b17f01f767ee7abf4704149ca4d86423aab9b16b68697b7d36e9b616846a8b0", + "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-macosx_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_aarch64.tar.gz" + ] + }, "remotejdk17_macos_aarch64_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk17_macos_aarch64_for_testing", @@ -1824,6 +1896,30 @@ "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz" ] }, + "remotejdk17_win": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk17_win", + "name": "remotejdk17_win", + "sha256": "f4437011239f3f0031c794bb91c02a6350bc941d4196bdd19c9f157b491815a3", + "strip_prefix": "zulu17.28.13-ca-jdk17.0.0-win_x64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip" + ] + }, + "remotejdk17_win_arm64": { + "build_file": "@bazel_tools//tools/jdk:jdk.BUILD", + "generator_function": "maybe", + "generator_name": "remotejdk17_win_arm64", + "name": "remotejdk17_win_arm64", + "sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877", + "strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip", + "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip" + ] + }, "remotejdk17_win_arm64_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "generator_function": "dist_http_archive", @@ -1863,17 +1959,7 @@ ] }, "rules_cc": { - "generator_function": "dist_http_archive", - "generator_name": "rules_cc", "name": "rules_cc", - "patch_cmds": [ - "test -f BUILD && chmod u+w BUILD || true", - "echo >> BUILD", - "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD" - ], - "patch_cmds_win": [ - "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" - ], "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d", "urls": [ diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index d9236d531139..e7739f2fdbc1 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -80,8 +80,8 @@ buildBazelPackage rec { fetchAttrs = { sha256 = { - x86_64-linux = "sha256-H2s8sTbmKF+yRfSzLsZAT2ckFuunFwh/FMSKj+GYyPM="; - aarch64-linux = "sha256-1/z7sZYMiuB4Re2itDZydsFVEel2NOYmi6vRmBGVO/4="; + x86_64-linux = "sha256-koz08NWUq5Fkca++1G7WEmg24G6FuMQOgRN3+HBtNIk="; + aarch64-linux = "sha256-oSybAw58yK0BUhS8MU2Y9hRo0mU/7xT7VKU3tDW4xN0="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; dontUseGnConfigure = true; From f5bdf68f1985a2543478a48363eed00f680c21c1 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 10 May 2023 10:30:56 -0400 Subject: [PATCH 038/175] python310Packages.monai-deploy: init at 0.5.0 --- .../python-modules/monai-deploy/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/monai-deploy/default.nix diff --git a/pkgs/development/python-modules/monai-deploy/default.nix b/pkgs/development/python-modules/monai-deploy/default.nix new file mode 100644 index 000000000000..a74fa36629df --- /dev/null +++ b/pkgs/development/python-modules/monai-deploy/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, pytest-lazy-fixture +, numpy +, networkx +, pydicom +, colorama +, typeguard +, versioneer +}: + +buildPythonPackage rec { + pname = "monai"; + version = "0.5.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Project-MONAI"; + repo = "monai-deploy-app-sdk"; + rev = "refs/tags/${version}"; + hash = "sha256-oaNZ0US0YR/PSwAZ5GfRpAW+HRYVhdCZI83fC00rgok="; + }; + + nativeBuildInputs = [ versioneer ]; + + propagatedBuildInputs = [ + numpy + networkx + colorama + typeguard + ]; + + nativeCheckInputs = [ pytestCheckHook pytest-lazy-fixture ]; + disabledTests = [ + # requires Docker daemon: + "test_packager" + ]; + pythonImportsCheck = [ + "monai.deploy" + "monai.deploy.core" + # "monai.deploy.operators" should be imported as well but + # requires some "optional" dependencies + # like highdicom (which is not packaged yet) and pydicom + ]; + + meta = with lib; { + description = "Framework and tools to design, develop and verify AI applications in healthcare imaging"; + homepage = "https://monai.io/deploy.html"; + license = licenses.asl20; + maintainers = [ maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 566be5f269c5..e9bc622c4822 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6275,6 +6275,8 @@ self: super: with self; { monai = callPackage ../development/python-modules/monai { }; + monai-deploy = callPackage ../development/python-modules/monai-deploy { }; + monero = callPackage ../development/python-modules/monero { }; mongomock = callPackage ../development/python-modules/mongomock { }; From 3edf3ba8f709c9c33d656ecea4099f0b8f398721 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:00:55 +0200 Subject: [PATCH 039/175] mariadb_108: remove --- pkgs/servers/sql/mariadb/default.nix | 7 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 60a6c88c4dd6..ceefe78997dd 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -262,13 +262,6 @@ in inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; - mariadb_108 = self.callPackage generic { - # Supported until 2023-05-20. TODO: remove ahead of 23.05 branchoff - version = "10.8.7"; - hash = "sha256-A6uqsKMvNTjqZZFbrUBBWf2mHEJE9HZJpC6xdUIGuAI="; - inherit (self.darwin) cctools; - inherit (self.darwin.apple_sdk.frameworks) CoreServices; - }; mariadb_109 = self.callPackage generic { # Supported until 2023-08-22. TODO: remove ahead of 23.05 branchoff? version = "10.9.5"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c22d2e9f65cd..25c01829a5fe 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1007,6 +1007,7 @@ mapAliases ({ manul = throw "manul has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-01 manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22 marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 + mariadb_108 = throw "mariadb_108 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35078261a178..a4d31c1bee4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25656,7 +25656,6 @@ with pkgs; mariadb_104 mariadb_105 mariadb_106 - mariadb_108 mariadb_109 mariadb_1010 mariadb_1011 From 0a298d1cf1da167cef4022695a43bf4216f8ccaf Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:02:12 +0200 Subject: [PATCH 040/175] mariadb_109: remove --- pkgs/servers/sql/mariadb/default.nix | 7 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ceefe78997dd..52be62a72a83 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -262,13 +262,6 @@ in inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; - mariadb_109 = self.callPackage generic { - # Supported until 2023-08-22. TODO: remove ahead of 23.05 branchoff? - version = "10.9.5"; - hash = "sha256-CXYrdcZEuUEukV0w4bJm3tc5ZRf8L9hrvmf+zDcGWtw="; - inherit (self.darwin) cctools; - inherit (self.darwin.apple_sdk.frameworks) CoreServices; - }; mariadb_1010 = self.callPackage generic { # Supported until 2023-11-17 version = "10.10.3"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 25c01829a5fe..41301d6f8a34 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1008,6 +1008,7 @@ mapAliases ({ manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22 marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mariadb_108 = throw "mariadb_108 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10 + mariadb_109 = throw "mariadb_109 has been removed from nixpkgs, please switch to another version like mariadb_1010"; # Added 2022-05-10 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04 matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4d31c1bee4a..fbf5052a0680 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25656,7 +25656,6 @@ with pkgs; mariadb_104 mariadb_105 mariadb_106 - mariadb_109 mariadb_1010 mariadb_1011 ; From c17a783c80896e691de97c0819f5a0c724cc65e8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:04:01 +0200 Subject: [PATCH 041/175] mariadb_104: 10.4.28 -> 10.4.29 https://mariadb.com/kb/en/mariadb-10-4-29-release-notes/ --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 52be62a72a83..af0af0140849 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -243,8 +243,8 @@ in # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_104 = self.callPackage generic { # Supported until 2024-06-18 - version = "10.4.28"; - hash = "sha256-AD/SPzxu5RYXbhtisLQ822zdPc1OMPhVwcWrK6r1qGw="; + version = "10.4.29"; + hash = "sha256-Wy0zh5LnnmjWpUXisVYDu792GMc55fgg9XsdayIJITA="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 3dc1bd1104ff47bb29865d4c7629251b0d292e81 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:05:39 +0200 Subject: [PATCH 042/175] mariadb_105: 10.5.19 -> 10.5.20 https://mariadb.com/kb/en/mariadb-10-5-20-release-notes/ --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index af0af0140849..37629926d286 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -250,8 +250,8 @@ in }; mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - version = "10.5.19"; - hash = "sha256-JExKJCSQZBBmI8uEqm3lFN3xeH3oZmQHUoK7qOxXV/Q="; + version = "10.5.20"; + hash = "sha256-sY+Q8NAR74e71VmtBDLN4Qfs21jqKCcQg7SJvf0e79s="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From b4213da2cf78691d3b5a9a49f43fd6b0a885d7ce Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:09:32 +0200 Subject: [PATCH 043/175] mariadb_106: 10.6.12 -> 10.6.13 https://mariadb.com/kb/en/mariadb-10-6-13-release-notes/ --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 37629926d286..fd98168de636 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -257,8 +257,8 @@ in }; mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 - version = "10.6.12"; - hash = "sha256-PtLrdCnC+uVCPKVcZhdC0QfjUkbxqwwQcJbwxLg5Rjo="; + version = "10.6.13"; + hash = "sha256-8IXzec9Z7S02VkT8XNhVj4gqiG7JZAcNZaKFMN27dbo="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From e59deb59d70026acb14265bb995f286d03112768 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:09:54 +0200 Subject: [PATCH 044/175] mariadb_1010: 10.10.3 -> 10.10.4 https://mariadb.com/kb/en/mariadb-10-10-4-changelog/ --- pkgs/servers/sql/mariadb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index fd98168de636..6020684ab97b 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -263,9 +263,9 @@ in inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_1010 = self.callPackage generic { - # Supported until 2023-11-17 - version = "10.10.3"; - hash = "sha256-DQxF/oUFnY0mxuIp8wQQqLj3KC7C1WVg/JqJMOFO130="; + # Supported until 2023-11-17. TODO: remove ahead of 23.11 branchoff + version = "10.10.4"; + hash = "sha256-IX2Z47Ami5MizyicGEMnqHiYs/aGvS6eS5JpXqYRixk="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From d46e3b6a84a5d6c0ed73c715a0cf97672aea5cb6 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:11:53 +0200 Subject: [PATCH 045/175] mariadb_1011: 10.11.2 -> 10.11.3 https://mariadb.com/kb/en/mariadb-10-11-3-release-notes/ --- pkgs/servers/sql/mariadb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 6020684ab97b..163b2672eaa1 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -270,9 +270,9 @@ in inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_1011 = self.callPackage generic { - # Supported until 2028-02-16 - version = "10.11.2"; - hash = "sha256-HIne4MrtD2i8Kh0gPrmKEjFQ5qF59u4PH8C6Pwjccdw="; + # Supported until 2028-02-16. TODO: make this the default, at some point + version = "10.11.3"; + hash = "sha256-sGWw8ypun9R55Wb9ZnFFA3mIbY3aLZp++TCvHlwmwMc="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; From 81244087ab9e8fb996e1b4599d1a64598e5624e3 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 10 May 2023 18:13:38 +0200 Subject: [PATCH 046/175] nixosTests.mysql-replication: fix deprecation warning --- nixos/tests/mysql/mysql-replication.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/mysql/mysql-replication.nix b/nixos/tests/mysql/mysql-replication.nix index f6014019bd53..8f1695eb97e2 100644 --- a/nixos/tests/mysql/mysql-replication.nix +++ b/nixos/tests/mysql/mysql-replication.nix @@ -42,7 +42,7 @@ let enable = true; replication.role = "slave"; replication.serverId = 2; - replication.masterHost = nodes.primary.config.networking.hostName; + replication.masterHost = nodes.primary.networking.hostName; replication.masterUser = replicateUser; replication.masterPassword = replicatePassword; }; @@ -54,7 +54,7 @@ let enable = true; replication.role = "slave"; replication.serverId = 3; - replication.masterHost = nodes.primary.config.networking.hostName; + replication.masterHost = nodes.primary.networking.hostName; replication.masterUser = replicateUser; replication.masterPassword = replicatePassword; }; From 35aded3ced0eb7a6d8982f63a9eeed54dacd9adb Mon Sep 17 00:00:00 2001 From: cameronfyfe Date: Sun, 7 May 2023 03:50:08 -0600 Subject: [PATCH 047/175] cargo-risczero: init at 0.14.0 --- .../tools/rust/cargo-risczero/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-risczero/default.nix diff --git a/pkgs/development/tools/rust/cargo-risczero/default.nix b/pkgs/development/tools/rust/cargo-risczero/default.nix new file mode 100644 index 000000000000..2f50f62aab90 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-risczero/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchCrate +, rustPlatform +, pkg-config +, openssl +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-risczero"; + version = "0.14.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-uZz0jJ3klaOrqzJ0BUVDHxl7lv6vt0GT6RgQuJeyeyk="; + }; + + cargoSha256 = "sha256-t++3+Ijn1ykjMcMsdoe/1xfaji+DQvhyiFe6M/Bpbt0="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + # The tests require network access which is not available in sandboxed Nix builds. + doCheck = false; + + meta = with lib; { + description = "Cargo extension to help create, manage, and test RISC Zero projects."; + homepage = "https://risczero.com"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ cameronfyfe ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b050faebb4cf..046fb1c8a7ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16127,6 +16127,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-readme = callPackage ../development/tools/rust/cargo-readme { }; + cargo-risczero = callPackage ../development/tools/rust/cargo-risczero { }; cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks { }; cargo-show-asm = callPackage ../development/tools/rust/cargo-show-asm { }; From 34e04da7c2eef71a65719b95cbd01b7ac97093c5 Mon Sep 17 00:00:00 2001 From: Janik H Date: Tue, 9 May 2023 23:31:23 +0200 Subject: [PATCH 048/175] wireworld: init at unstable-2023-05-09 --- pkgs/games/wireworld/default.nix | 57 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 60 insertions(+) create mode 100644 pkgs/games/wireworld/default.nix diff --git a/pkgs/games/wireworld/default.nix b/pkgs/games/wireworld/default.nix new file mode 100644 index 000000000000..5528b52a280a --- /dev/null +++ b/pkgs/games/wireworld/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitLab +, zip +, love +, makeWrapper +, makeDesktopItem +, copyDesktopItems +}: + +stdenv.mkDerivation rec { + pname = "wireworld"; + version = "unstable-2023-05-09"; + + src = fetchFromGitLab { + owner = "blinry"; + repo = pname; + rev = "03b82bf5d604d6d4ad3c07b224583de6c396fd17"; + hash = "sha256-8BshnGLuA8lmG9g7FU349DWKP/fZvlvjrQBau/LSJ4E="; + }; + + nativeBuildInputs = [ makeWrapper copyDesktopItems zip ]; + + desktopItems = [ + (makeDesktopItem { + name = "Wireworld"; + exec = pname; + comment = ""; + desktopName = "Wireworld"; + genericName = "Wireworld"; + categories = [ "Game" ]; + }) + ]; + + installPhase = '' + runHook preInstall + zip -9 -r Wireworld.love ./* + install -Dm444 -t $out/share/games/lovegames/ Wireworld.love + makeWrapper ${love}/bin/love $out/bin/Wireworld \ + --add-flags $out/share/games/lovegames/Wireworld.love + runHook postInstall + ''; + + meta = with lib; { + description = "Fascinating electronics logic puzzles, game where you'll learn how to build clocks, diodes, and logic gates"; + license = with licenses; [ + mit + ofl + blueOak100 + cc-by-sa-30 + cc-by-sa-40 + ]; + downloadPage = "https://ldjam.com/events/ludum-dare/53/wireworld"; + maintainers = with lib.maintainers; [ janik ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20b5e2329b05..a75fdb6f72b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39932,6 +39932,9 @@ with pkgs; wiremock = callPackage ../tools/networking/wiremock { }; + wireworld = callPackage ../games/wireworld { }; + + teseq = callPackage ../applications/misc/teseq { }; ape = callPackage ../applications/misc/ape { }; From 7f620f40e2aa240b73291b959ee53166f9010d05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 May 2023 20:10:55 +0200 Subject: [PATCH 049/175] python310Packages.bc-detect-secrets: 1.4.26 -> 1.4.27 --- pkgs/development/python-modules/bc-detect-secrets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index fc4ffde10534..941862b2a3d3 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.4.26"; + version = "1.4.27"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-rkyeG0xZZVO7SkfFyxq07c373YElblIUqJpwWc1nF58="; + hash = "sha256-iQNMU77nTv6KY9LJb1fiBUVs5LkpX732UpJAYdUWNyc="; }; propagatedBuildInputs = [ From f1bfafc9625d60d8dc09b114b5de224a7f8ab9c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 May 2023 20:12:14 +0200 Subject: [PATCH 050/175] python310Packages.mkdocstrings-python: 0.10.0 -> 0.10.1 Changelog: https://github.com/mkdocstrings/python/blob/0.10.1/CHANGELOG.md --- .../python-modules/mkdocstrings-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 7d0f5740b734..adb6e2424ff2 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "0.10.0"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = version; - hash = "sha256-UJfAlSgH3xFqSOjJFon87YWd08nFgi1yYbEsCyMDVlA="; + hash = "sha256-VGPlOHQNtXrfmcne93xDIxN20KDGlTQrjeAKhX/L6K0="; }; nativeBuildInputs = [ From 4c7a5f76de115e1d1b4e8ddadb557e1e119b42b7 Mon Sep 17 00:00:00 2001 From: xapkohheh Date: Wed, 10 May 2023 17:26:21 +0200 Subject: [PATCH 051/175] houdini: expanded lists one entry per line for targetPkgs, executables - for simpler diffs --- pkgs/applications/misc/houdini/default.nix | 39 +++++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 9c560b7f8313..62e4630dc04f 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -4,11 +4,36 @@ buildFHSEnv rec { name = "houdini-${unwrapped.version}"; targetPkgs = pkgs: with pkgs; [ - libGLU libGL alsa-lib fontconfig zlib libpng dbus nss nspr expat pciutils - libxkbcommon libudev0-shim tbb + libGLU + libGL + alsa-lib + fontconfig + zlib + libpng + dbus + nss + nspr + expat + pciutils + libxkbcommon + libudev0-shim + tbb ] ++ (with xorg; [ - libICE libSM libXmu libXi libXext libX11 libXrender libXcursor libXfixes - libXrender libXcomposite libXdamage libXtst libxcb libXScrnSaver + libICE + libSM + libXmu + libXi + libXext + libX11 + libXrender + libXcursor + libXfixes + libXrender + libXcomposite + libXdamage + libXtst + libxcb + libXScrnSaver ]); passthru = { @@ -16,7 +41,11 @@ buildFHSEnv rec { }; extraInstallCommands = let - executables = [ "bin/houdini" "bin/hkey" "houdini/sbin/sesinetd" ]; + executables = [ + "bin/houdini" + "bin/hkey" + "houdini/sbin/sesinetd" + ]; in '' WRAPPER=$out/bin/${name} EXECUTABLES="${lib.concatStringsSep " " executables}" From 59f1a3f64a99c7374f97a9873d99706d2ac8c294 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 May 2023 20:14:38 +0200 Subject: [PATCH 052/175] python310Packages.bluetooth-auto-recovery: 1.1.2 -> 1.2.0 Changelog: https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/blob/v1.2.0/CHANGELOG.md --- .../python-modules/bluetooth-auto-recovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 56fdc5ed8211..c0047b69dd41 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.1.2"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lOtdrNXY9IYMGFdqhX4rM228OAZ2bUEBZKP+gcDGfuM="; + hash = "sha256-uPa8iXG++doRMAK83NSnqiqnZSIjdL7zMTkjdRrSjtA="; }; nativeBuildInputs = [ From 23b7205f46eb29b4e6e6e8d210dd6270e056c9d8 Mon Sep 17 00:00:00 2001 From: xapkohheh Date: Wed, 10 May 2023 20:20:44 +0200 Subject: [PATCH 053/175] houdini: added missing libs to targetPkgs --- pkgs/applications/misc/houdini/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 62e4630dc04f..a1c78118e710 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -18,11 +18,19 @@ buildFHSEnv rec { libxkbcommon libudev0-shim tbb + xwayland + qt5.qtwayland + nettools # needed by licensing tools + bintools # needed for ld and other tools, so ctypes can find/load sos from python + ocl-icd # needed for opencl + numactl # needed by hfs ocl backend + ncurses5 # needed by hfs ocl backend ] ++ (with xorg; [ libICE libSM libXmu libXi + libXt libXext libX11 libXrender @@ -34,6 +42,14 @@ buildFHSEnv rec { libXtst libxcb libXScrnSaver + libXrandr + libxcb + xcbutil + xcbutilimage + xcbutilrenderutil + xcbutilcursor + xcbutilkeysyms + xcbutilwm ]); passthru = { From ca7cece9bf5b28b92f6ce5973db68d161e7ea526 Mon Sep 17 00:00:00 2001 From: xapkohheh Date: Wed, 10 May 2023 20:26:40 +0200 Subject: [PATCH 054/175] houdini: disabled dieWithParent, unsharePid Due to the nature of the software, it forks and expects children to outlive the parent, therefore dieWithParent needs to be disabled Also licensing mechanism seem to be checking processes for it's licensing helper process running. that process must be same for multiple instances of houdini itself, therefore Pid namespace has to be the same for all of them. --- pkgs/applications/misc/houdini/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index a1c78118e710..890a78b5d3ea 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -3,6 +3,12 @@ buildFHSEnv rec { name = "houdini-${unwrapped.version}"; + # houdini spawns hserver (and other license tools) that is supposed to live beyond the lifespan of houdini process + dieWithParent = false; + + # houdini needs to communicate with hserver process that it seem to be checking to be present in running processes + unsharePid = false; + targetPkgs = pkgs: with pkgs; [ libGLU libGL From a33d0329393471ab9ca79cae700cb9f5b750de76 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Wed, 10 May 2023 14:28:50 -0400 Subject: [PATCH 055/175] modules/rosetta: configure nix build sandbox to use rosetta With this we can do x86_64 builds on aarch64 --- nixos/modules/virtualisation/rosetta.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/rosetta.nix b/nixos/modules/virtualisation/rosetta.nix index 109b114d649c..ee811b571b8f 100644 --- a/nixos/modules/virtualisation/rosetta.nix +++ b/nixos/modules/virtualisation/rosetta.nix @@ -50,11 +50,19 @@ in } ]; - fileSystems."${cfg.mountPoint}" = { + fileSystems."${cfg.mountPoint}" = { device = cfg.mountTag; fsType = "virtiofs"; }; + + nix.settings = { + extra-platforms = [ "x86_64-linux" ]; + extra-sandbox-paths = [ + "/run/binfmt" + cfg.mountPoint + ]; + }; boot.binfmt.registrations.rosetta = { interpreter = "${cfg.mountPoint}/rosetta"; From f03311c6157211f881b5dde1650d1797ba084488 Mon Sep 17 00:00:00 2001 From: xapkohheh Date: Wed, 10 May 2023 20:31:54 +0200 Subject: [PATCH 056/175] houdini: exposed more executables houdini provides additional tools that might be useful --- pkgs/applications/misc/houdini/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 890a78b5d3ea..433e90572024 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -64,8 +64,13 @@ buildFHSEnv rec { extraInstallCommands = let executables = [ - "bin/houdini" - "bin/hkey" + "bin/houdini" # houdini flavours + "bin/houdinicore" + "bin/houdinifx" + "bin/hgpuinfo" # houdini ocl config tool + "bin/hotl" # hda/otl manipulation tool + "bin/hython" # hython + "bin/hkey" # license administration "houdini/sbin/sesinetd" ]; in '' From 8442568a5bc453a4916f86bc428af92dfa759652 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 10 May 2023 14:52:09 -0400 Subject: [PATCH 057/175] cargo-audit: 0.17.5 -> 0.17.6 Changelog: https://github.com/rustsec/rustsec/blob/cargo-audit/0.17.6/cargo-audit/CHANGELOG.md --- pkgs/development/tools/rust/cargo-audit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-audit/default.nix b/pkgs/development/tools/rust/cargo-audit/default.nix index 9845cca7925e..ed794a22896e 100644 --- a/pkgs/development/tools/rust/cargo-audit/default.nix +++ b/pkgs/development/tools/rust/cargo-audit/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.17.5"; + version = "0.17.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-qsHy4MKQHBzChcOJ9TrlUbEnEtVxlzxDgZlahhDsoxM="; + sha256 = "sha256-ICNcBqlkX1k3J5vc/bfoXw/+l2LdHOchv4PfY0G7Y94="; }; - cargoSha256 = "sha256-7uBRybAkexBl3SldV4qudwPZ8JcKCUaAlwbAcT9JXy8="; + cargoSha256 = "sha256-ViqaiSLVfDJhMuHjHGi+NVRLPcRhe2a+oKXl4UNM+K8="; nativeBuildInputs = [ pkg-config From 584578cb44dafaca4a087a5099b1ef1175b25924 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 10 May 2023 12:51:55 -0700 Subject: [PATCH 058/175] signalbackup-tools: 20230508-1 -> 20230510 Diff: https://github.com/bepaald/signalbackup-tools/compare/20230508-1...20230510 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 835ef8a70bc4..95a57a701924 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230508-1"; + version = "20230510"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-0kkbJGZEnB6bL+aNhHpSI2oHpsVmju3OEFG7mitKBsc="; + hash = "sha256-EsFF9fPpHfVmbLm2hRpcJBmwfovfK4CV3LukrG9nP3U="; }; postPatch = '' From 6197c3446fcde2269a2bd4d2dca4a6ca357db663 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 10 May 2023 16:43:49 -0400 Subject: [PATCH 059/175] pods: 1.1.1 -> 1.1.2 Diff: https://github.com/marhkb/pods/compare/v1.1.1...v1.1.2 Changelog: https://github.com/marhkb/pods/releases/tag/v1.1.2 --- .../virtualization/pods/Cargo.lock | 84 +++++++++---------- .../virtualization/pods/default.nix | 4 +- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/pkgs/applications/virtualization/pods/Cargo.lock b/pkgs/applications/virtualization/pods/Cargo.lock index 02fabce58d11..bd7e65b10144 100644 --- a/pkgs/applications/virtualization/pods/Cargo.lock +++ b/pkgs/applications/virtualization/pods/Cargo.lock @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.1" +version = "3.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" +checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "byteorder" @@ -1092,9 +1092,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" dependencies = [ "wasm-bindgen", ] @@ -1142,9 +1142,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.142" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libpanel" @@ -1188,9 +1188,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" +checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" [[package]] name = "locale_config" @@ -1477,9 +1477,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "podman-api" @@ -1518,7 +1518,7 @@ dependencies = [ [[package]] name = "pods" -version = "1.1.1" +version = "1.1.2" dependencies = [ "anyhow", "ashpd", @@ -1594,9 +1594,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -1677,9 +1677,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.18" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", "errno", @@ -1709,18 +1709,18 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" dependencies = [ "proc-macro2", "quote", @@ -1868,14 +1868,14 @@ dependencies = [ "hostname", "libc", "log", - "time 0.3.20", + "time 0.3.21", ] [[package]] name = "system-deps" -version = "6.0.5" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055" +checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" dependencies = [ "cfg-expr", "heck", @@ -1962,9 +1962,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ "itoa", "libc", @@ -1976,15 +1976,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -2006,9 +2006,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "bytes 1.4.0", @@ -2274,9 +2274,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2284,24 +2284,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2309,22 +2309,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" [[package]] name = "winapi" diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 966f67eb39c6..acbf557dd25c 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "pods"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GTRHysG1zPr6MorGoSKYq8TgAdTH/bU/AxVrP2Ghqec="; + sha256 = "sha256-5euSMmyumZbUFsZuP7fa3wCm4n0Hx+F8bPlv4Xw/Hvw="; }; cargoDeps = rustPlatform.importCargoLock { From af171a550170cca3d920b171244b91b83551a2f4 Mon Sep 17 00:00:00 2001 From: xapkohheh Date: Wed, 10 May 2023 20:34:46 +0200 Subject: [PATCH 060/175] houdini: added /etc/OpenCL/vendors binding additionally trying to bind /run/opengl-driver/etc/OpenCL/vendors -> /etc/OpenCL/vendors /etc/OpenCL/vendors -> /etc/OpenCL/vendors (for non NixOS) in wrapper to use opencl with houdini's own version of libOpenCL.so --- pkgs/applications/misc/houdini/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 433e90572024..131cd28764ec 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -87,6 +87,11 @@ buildFHSEnv rec { chmod +x $EXECUTABLES ''; + extraBwrapArgs = [ + "--ro-bind-try /run/opengl-driver/etc/OpenCL/vendors /etc/OpenCL/vendors" # this is the case of NixOS + "--ro-bind-try /etc/OpenCL/vendors /etc/OpenCL/vendors" # this is the case of not NixOS + ]; + runScript = writeScript "${name}-wrapper" '' exec $@ ''; From cc63d32a0d03fe845f8f8be1bf9302f51c26afe4 Mon Sep 17 00:00:00 2001 From: xapkohheh Date: Wed, 10 May 2023 20:41:03 +0200 Subject: [PATCH 061/175] houdini: 18.5.596 -> 19.5.569 --- pkgs/applications/misc/houdini/runtime.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 4fb2d91b99f4..2f218781abb6 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -4,11 +4,11 @@ let license_dir = "~/.config/houdini"; in stdenv.mkDerivation rec { - version = "18.5.596"; + version = "19.5.569"; pname = "houdini-runtime"; src = requireFile rec { - name = "houdini-py3-${version}-linux_x86_64_gcc6.3.tar.gz"; - sha256 = "1b1k7rkn7svmciijqdwvi9p00srsf81vkb55grjg6xa7fgyidjx1"; + name = "houdini-${version}-linux_x86_64_gcc9.3.tar.gz"; + sha256 = "0c2d6a31c24f5e7229498af6c3a7cdf81242501d7a0792e4c33b53a898d4999e"; url = meta.homepage; }; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { --no-install-bin-symlink \ --auto-install \ --no-root-check \ - --accept-EULA 2020-05-05 \ + --accept-EULA 2021-10-13 \ $out - echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt + echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt # does not seem to do anything any more. not sure, official docs do not say anything about it ''; dontFixup = true; From 5267a346192e88f46e60798330869e9f0f714f6d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 10 May 2023 23:52:26 +0200 Subject: [PATCH 062/175] chromiumBeta: Fix the configuration phase The configuration phase was failing with "No package 'libevdev' found". See [0] for the full output. The build phase is still failing and we probably need to use a patch to avoid requiring a newer, unreleased LLVM version. [0]: https://github.com/NixOS/nixpkgs/issues/213862#issuecomment-1540854965 --- pkgs/applications/networking/browsers/chromium/common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index da0172228fbf..774c61b55678 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -36,6 +36,7 @@ , curl , libffi , libepoxy +, libevdev # postPatch: , glibc # gconv + locale # postFixup: @@ -154,6 +155,8 @@ let curl libepoxy libffi + ] ++ lib.optionals (chromiumVersionAtLeast "114") [ + libevdev ] ++ lib.optional systemdSupport systemd ++ lib.optionals cupsSupport [ libgcrypt cups ] ++ lib.optional pulseSupport libpulseaudio; From e0feb6da4748fdc8e9136758ae2570c5f313cf11 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Wed, 10 May 2023 23:46:09 +0100 Subject: [PATCH 063/175] =?UTF-8?q?megacmd:=201.6.1=20=E2=86=92=201.6.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/megacmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 32358aee2b78..9875631466c3 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-X8ysTVr4oZS3VHuCyq96J6TL9nvtAT/HVnMyz5iXSXo="; + sha256 = "sha256-JnxfFbM+NyeUrEMok62zlsQIxjrUvLLg4tUTiKPDZFc="; fetchSubmodules = true; }; From a73e7383c0d20fcac4588c143ca2aa1efeaa7a79 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 10 May 2023 19:57:48 -0400 Subject: [PATCH 064/175] nixos/automysqlbackup: add some missing permissions --- nixos/modules/services/backup/automysqlbackup.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/backup/automysqlbackup.nix b/nixos/modules/services/backup/automysqlbackup.nix index d0237f196a80..0b75c75f3d15 100644 --- a/nixos/modules/services/backup/automysqlbackup.nix +++ b/nixos/modules/services/backup/automysqlbackup.nix @@ -112,7 +112,18 @@ in services.mysql.ensureUsers = optional (config.services.mysql.enable && cfg.config.mysql_dump_host == "localhost") { name = user; - ensurePermissions = { "*.*" = "SELECT, SHOW VIEW, TRIGGER, LOCK TABLES, EVENT"; }; + ensurePermissions = { + "*.*" = "SELECT, SHOW VIEW, TRIGGER, LOCK TABLES, EVENT"; + + # https://forums.mysql.com/read.php?10,668311,668315#msg-668315 + "function sys.extract_table_from_file_name" = "execute"; + "function sys.format_path" = "execute"; + "function sys.format_statement" = "execute"; + "function sys.extract_schema_from_file_name" = "execute"; + "function sys.ps_thread_account" = "execute"; + "function sys.format_time" = "execute"; + "function sys.format_bytes" = "execute"; + }; }; }; From 55b3b7029db47aef97b577e6833e080621a2b3f1 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 10 May 2023 19:59:39 -0400 Subject: [PATCH 065/175] nixos/automysqlbackup: rename config option to settings --- nixos/modules/services/backup/automysqlbackup.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/backup/automysqlbackup.nix b/nixos/modules/services/backup/automysqlbackup.nix index 0b75c75f3d15..27bbff813b10 100644 --- a/nixos/modules/services/backup/automysqlbackup.nix +++ b/nixos/modules/services/backup/automysqlbackup.nix @@ -3,7 +3,7 @@ let inherit (lib) concatMapStringsSep concatStringsSep isInt isList literalExpression; - inherit (lib) mapAttrs mapAttrsToList mkDefault mkEnableOption mkIf mkOption optional types; + inherit (lib) mapAttrs mapAttrsToList mkDefault mkEnableOption mkIf mkOption mkRenamedOptionModule optional types; cfg = config.services.automysqlbackup; pkg = pkgs.automysqlbackup; @@ -26,6 +26,10 @@ let in { + imports = [ + (mkRenamedOptionModule [ "services" "automysqlbackup" "config" ] [ "services" "automysqlbackup" "settings" ]) + ]; + # interface options = { services.automysqlbackup = { @@ -40,7 +44,7 @@ in ''; }; - config = mkOption { + settings = mkOption { type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); default = {}; description = lib.mdDoc '' From f75f4da2de7822621cb16aae157d4e7b8bc2bff7 Mon Sep 17 00:00:00 2001 From: Jack Leightcap Date: Wed, 10 May 2023 20:25:39 -0400 Subject: [PATCH 066/175] maintainers: add jleightcap. Signed-off-by: Jack Leightcap --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 75452d43570c..6841a37655ff 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7433,6 +7433,12 @@ fingerprint = "B768 6CD7 451A 650D 9C54 4204 6710 CF0C 1CBD 7762"; }]; }; + jleightcap = { + email = "jack@leightcap.com"; + github = "jleightcap"; + githubId = 30168080; + name = "Jack Leightcap"; + }; jlesquembre = { email = "jl@lafuente.me"; github = "jlesquembre"; From 34ba6c7e16b565d0189c571f1a7f6fbae96f6cef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 11 May 2023 02:28:16 +0200 Subject: [PATCH 067/175] couchdb3: 3.3.1 -> 3.3.2 https://docs.couchdb.org/en/latest/whatsnew/3.3.html#version-3-3-2 https://docs.couchdb.org/en/latest/cve/2023-26268.html Fixes: CVE-2023-26268 --- pkgs/servers/http/couchdb/3.nix | 46 +++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix index 17130c422bb9..3ce5272c1d93 100644 --- a/pkgs/servers/http/couchdb/3.nix +++ b/pkgs/servers/http/couchdb/3.nix @@ -1,31 +1,55 @@ -{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_91 -, coreutils, bash, python3, nixosTests }: +{ lib +, stdenv +, fetchurl +, erlang +, icu +, openssl +, spidermonkey_91 +, python3 +, nixosTests +}: stdenv.mkDerivation rec { pname = "couchdb"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; - sha256 = "sha256-m4nXtU9+9StCvVGmoKLTsbBszjld8smdjx9H+TVeK+4="; + hash = "sha256-PWgj1C0Qzw1PhsnE/lnJkyyJ1oV4/LbEtCeNx2kwjao="; }; + postPatch = '' + substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-91' "${spidermonkey_91.dev}/include/mozjs-91" + substituteInPlace configure --replace '/usr/include/''${SM_HEADERS}' "${spidermonkey_91.dev}/include/mozjs-91" + patchShebangs bin/rebar + ''; + nativeBuildInputs = [ erlang ]; - buildInputs = [ icu openssl spidermonkey_91 (python3.withPackages(ps: with ps; [ requests ]))]; - postPatch = '' - substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-91' "${spidermonkey_91.dev}/include/mozjs-91" - patchShebangs bin/rebar - ''; + + buildInputs = [ + icu + openssl + spidermonkey_91 + (python3.withPackages(ps: with ps; [ requests ])) + ]; dontAddPrefix= "True"; - configureFlags = ["--spidermonkey-version=91"]; - buildFlags = ["release"]; + + configureFlags = [ + "--spidermonkey-version=91" + ]; + + buildFlags = [ + "release" + ]; installPhase = '' + runHook preInstall mkdir -p $out cp -r rel/couchdb/* $out + runHook postInstall ''; passthru.tests = { From fd34bc39e49ddf896163914a844a4964517bdaab Mon Sep 17 00:00:00 2001 From: lucasew Date: Wed, 10 May 2023 17:40:54 -0300 Subject: [PATCH 068/175] blender-with-packages: refactor Signed-off-by: lucasew --- pkgs/applications/misc/blender/wrapper.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/blender/wrapper.nix b/pkgs/applications/misc/blender/wrapper.nix index 24ff72e14f6c..3828d61a8645 100644 --- a/pkgs/applications/misc/blender/wrapper.nix +++ b/pkgs/applications/misc/blender/wrapper.nix @@ -2,7 +2,7 @@ , lib , blender , makeWrapper -, python39Packages +, python3Packages }: { name ? "wrapped" , packages ? [] @@ -12,7 +12,7 @@ stdenv.mkDerivation { inherit (blender) version; src = blender; - nativeBuildInputs = [ python39Packages.wrapPython makeWrapper ]; + nativeBuildInputs = [ python3Packages.wrapPython makeWrapper ]; installPhase = '' mkdir $out/{share/applications,bin} -p sed 's/Exec=blender/Exec=blender-${name}/g' $src/share/applications/blender.desktop > $out/share/applications/blender-${name}.desktop @@ -22,15 +22,9 @@ stdenv.mkDerivation { buildPythonPath "$pythonPath" - echo '#!/usr/bin/env bash ' >> $out/bin/blender-${name} - for p in $program_PATH; do - echo "export PATH=\$PATH:$p " >> $out/bin/blender-${name} - done - for p in $program_PYTHONPATH; do - echo "export PYTHONPATH=\$PYTHONPATH:$p " >> $out/bin/blender-${name} - done - echo 'exec ${blender}/bin/blender "$@"' >> $out/bin/blender-${name} - chmod +x $out/bin/blender-${name} + makeWrapper ${blender}/bin/blender $out/bin/blender-${name} \ + --prefix PATH : $program_PATH \ + --prefix PYTHONPATH : $program_PYTHONPATH ''; pythonPath = packages; From 3acc4aff8712a56b68e71071777ddb3d27966a1b Mon Sep 17 00:00:00 2001 From: lucasew Date: Wed, 10 May 2023 17:42:32 -0300 Subject: [PATCH 069/175] python3Packages.bpycv: refactor + passthru.tests Signed-off-by: lucasew --- .../python-modules/bpycv/bpycv-test.py | 12 ++-- .../python-modules/bpycv/default.nix | 66 +++++++++++-------- 2 files changed, 46 insertions(+), 32 deletions(-) diff --git a/pkgs/development/python-modules/bpycv/bpycv-test.py b/pkgs/development/python-modules/bpycv/bpycv-test.py index 94e1bb122c77..1bf2b9f5a8d3 100644 --- a/pkgs/development/python-modules/bpycv/bpycv-test.py +++ b/pkgs/development/python-modules/bpycv/bpycv-test.py @@ -5,8 +5,11 @@ import bpycv import os import glob import random +from pathlib import Path example_data_dir = os.environ['BPY_EXAMPLE_DATA'] +out_dir = Path(os.environ['out']) +out_dir.mkdir(parents=True, exist_ok=True) models = sorted(glob.glob(os.path.join(example_data_dir, "model", "*", "*.obj"))) cat_id_to_model_path = dict(enumerate(sorted(models), 1)) @@ -19,6 +22,7 @@ bpy.context.scene.render.engine = "CYCLES" bpy.context.scene.cycles.samples = 32 bpy.context.scene.render.resolution_y = 1024 bpy.context.scene.render.resolution_x = 1024 +bpy.context.view_layer.cycles.denoising_store_passes = False # A transparency stage for holding rigid body stage = bpycv.add_stage(transparency=True) @@ -69,8 +73,8 @@ for i in range(20): # render image, instance annoatation and depth in one line code result = bpycv.render_data() -dataset_dir = "./dataset" -result.save(dataset_dir=dataset_dir, fname="0", save_blend=True) -print(f'Save to "{dataset_dir}"') -print(f'Open "{dataset_dir}/vis/" to see visualize result.') + +result.save(dataset_dir=str(out_dir.resolve()), fname="0", save_blend=True) +print(f'Save to "{out_dir}"') +print(f'Open "{out_dir}/vis/" to see visualize result.') diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix index 03aef9fd6dfe..09c3b4f8283d 100644 --- a/pkgs/development/python-modules/bpycv/default.nix +++ b/pkgs/development/python-modules/bpycv/default.nix @@ -1,16 +1,21 @@ -{ lib -, buildPythonPackage -, fetchPypi -, fetchFromGitHub -, fetchurl -, writeText -, blender -, minexr +{ stdenv +, lib , beautifulsoup4 -, zcs -, requests -, opencv3 +, blender +, blender-with-packages , boxx +, bpycv +, buildPythonPackage +, fetchFromGitHub +, fetchPypi +, fetchurl +, minexr +, opencv3 +, python3Packages +, requests +, runCommand +, writeText +, zcs }: buildPythonPackage rec { @@ -37,27 +42,32 @@ buildPythonPackage rec { ''; # pythonImportsCheck = [ "bpycv" ]; # this import depends on bpy that is only available inside blender - nativeCheckInputs = [ blender ]; - checkPhase = let - bpycv_example_data = fetchFromGitHub { - owner = "DIYer22"; - repo = "bpycv_example_data"; - hash = "sha256-dGb6KvbXTGTu5f4AqhA+i4AwTqBoR5SdXk0vsMEcD3Q="; - rev = "6ce0e65c107d572011394da16ffdf851e988dbb4"; - }; - in '' - TEMPDIR=$(mktemp -d) - pushd $TEMPDIR - cp -r ${bpycv_example_data} example_data - chmod +w -R example_data - BPY_EXAMPLE_DATA=${bpycv_example_data} blender -b -P ${./bpycv-test.py} - popd - ''; + doCheck = false; + + passthru.tests = { + render = runCommand "bpycv-render-test" { + BPY_EXAMPLE_DATA = fetchFromGitHub { + owner = "DIYer22"; + repo = "bpycv_example_data"; + hash = "sha256-dGb6KvbXTGTu5f4AqhA+i4AwTqBoR5SdXk0vsMEcD3Q="; + rev = "6ce0e65c107d572011394da16ffdf851e988dbb4"; + }; + nativeBuildInputs = [ + ((blender-with-packages.override {inherit blender python3Packages;}) { + packages = [ bpycv ]; + }) + ]; + } '' + blender-wrapped -b -P ${./bpycv-test.py} + ''; + }; meta = with lib; { description = "Computer vision utils for Blender"; homepage = "https://github.com/DIYer22/bpycv"; license = licenses.mit; - maintainers = with maintainers; [ lucasew ]; + maintainers = [ maintainers.lucasew ]; + broken = stdenv.isAarch64; + inherit (blender.meta) platforms; }; } From dd435a6c4eb3f3b1c2cce8fd9aa05737f958bc19 Mon Sep 17 00:00:00 2001 From: Jack Leightcap Date: Wed, 10 May 2023 16:16:53 -0400 Subject: [PATCH 070/175] pythonPackages.fx2: 0.9 -> 0.11 Signed-off-by: Jack Leightcap --- pkgs/development/python-modules/fx2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 30849134cb56..1df4625a6818 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "fx2"; - version = "0.9"; + version = "0.11"; src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; rev = "v${version}"; - hash = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk="; + hash = "sha256-uJpXsUMFqJY7mjj1rtfc0XWEfNDxO1xXobgBDGFHnp4="; }; nativeBuildInputs = [ sdcc ]; @@ -23,8 +23,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ libusb1 crcmod ]; preBuild = '' + make -C firmware cd software - ${python.pythonForBuild.interpreter} setup.py build_ext ''; preInstall = '' From 575171d619d01e2031efd581a11ce1a7c559b675 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Wed, 10 May 2023 15:46:59 +1000 Subject: [PATCH 071/175] minimal-bootstrap.gnupatch: init at 2.5.9 --- .../linux/minimal-bootstrap/default.nix | 3 + .../minimal-bootstrap/gnupatch/default.nix | 107 ++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 pkgs/os-specific/linux/minimal-bootstrap/gnupatch/default.nix diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix index 509b7fe20593..f7207d380beb 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -21,4 +21,7 @@ lib.makeScope tinycc-bootstrappable = callPackage ./tinycc/bootstrappable.nix { }; tinycc-mes = callPackage ./tinycc/mes.nix { }; + + gnupatch = callPackage ./gnupatch { tinycc = tinycc-mes; }; + }) diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/default.nix new file mode 100644 index 000000000000..2a44f3805d42 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnupatch/default.nix @@ -0,0 +1,107 @@ +{ lib +, runCommand +, fetchurl +, tinycc +}: +let + pname = "gnupatch"; + # 2.6.x and later use features not implemented in mes-libc (eg. quotearg.h) + version = "2.5.9"; + + src = fetchurl { + url = "mirror://gnu/patch/patch-${version}.tar.gz"; + sha256 = "12nv7jx3gxfp50y11nxzlnmqqrpicjggw6pcsq0wyavkkm3cddgc"; + }; + + # Thanks to the live-bootstrap project! + # https://github.com/fosslinux/live-bootstrap/blob/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/patch-2.5.9/mk/main.mk + CFLAGS = [ + "-I." + "-DHAVE_DECL_GETENV" + "-DHAVE_DECL_MALLOC" + "-DHAVE_DIRENT_H" + "-DHAVE_LIMITS_H" + "-DHAVE_GETEUID" + "-DHAVE_MKTEMP" + "-DPACKAGE_BUGREPORT=" + "-Ded_PROGRAM=\\\"/nullop\\\"" + "-Dmbstate_t=int" # When HAVE_MBRTOWC is not enabled uses of mbstate_t are always a no-op + "-DRETSIGTYPE=int" + "-DHAVE_MKDIR" + "-DHAVE_RMDIR" + "-DHAVE_FCNTL_H" + "-DPACKAGE_NAME=\\\"patch\\\"" + "-DPACKAGE_VERSION=\\\"${version}\\\"" + "-DHAVE_MALLOC" + "-DHAVE_REALLOC" + "-DSTDC_HEADERS" + "-DHAVE_STRING_H" + "-DHAVE_STDLIB_H" + ]; + + # Maintenance note: List of sources from Makefile.in + SRCS = [ + "addext.c" + "argmatch.c" + "backupfile.c" + "basename.c" + "dirname.c" + "getopt.c" + "getopt1.c" + "inp.c" + "maketime.c" + "partime.c" + "patch.c" + "pch.c" + "quote.c" + "quotearg.c" + "quotesys.c" + "util.c" + "version.c" + "xmalloc.c" + ]; + sources = SRCS ++ [ + # mes-libc doesn't implement `error()` + "error.c" + ]; + + objects = map (x: lib.replaceStrings [".c"] [".o"] (builtins.baseNameOf x)) sources; +in +runCommand "${pname}-${version}" { + inherit pname version; + + nativeBuildInputs = [ tinycc ]; + + meta = with lib; { + description = "GNU Patch, a program to apply differences to files"; + homepage = "https://www.gnu.org/software/patch"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ emilytrau ]; + mainProgram = "patch"; + platforms = platforms.unix; + }; +} '' + # Unpack + ungz --file ${src} --output patch.tar + untar --file patch.tar + rm patch.tar + cd patch-${version} + + # Configure + catm config.h + + # Build + alias CC="tcc ${lib.concatStringsSep " " CFLAGS}" + ${lib.concatMapStringsSep "\n" (f: "CC -c ${f}") sources} + + # Link + CC -static -o patch ${lib.concatStringsSep " " objects} + + # Check + ./patch --version + + # Install + mkdir -p ''${out}/bin + cp ./patch ''${out}/bin + chmod 555 ''${out}/bin/patch +'' From 56ce11246379585ba4413a0b4906ead11daf4c15 Mon Sep 17 00:00:00 2001 From: zendo Date: Thu, 11 May 2023 09:51:53 +0800 Subject: [PATCH 072/175] gittyup: 1.2.2 -> 1.3.0 --- .../version-management/gittyup/default.nix | 27 +++---------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/version-management/gittyup/default.nix b/pkgs/applications/version-management/gittyup/default.nix index 5bcfa1c8eac7..51cbacdcf37f 100644 --- a/pkgs/applications/version-management/gittyup/default.nix +++ b/pkgs/applications/version-management/gittyup/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "gittyup"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Murmele"; repo = "Gittyup"; rev = "gittyup_v${version}"; - hash = "sha256-JJ20vls/NGkm0xV+vDguvuW5yqhOQf83TMvnn5Kx4IE="; + hash = "sha256-/8Uipz2R/LuA3KUcFsROOmldIKnCVLfIpIQ9YLpPA+k="; fetchSubmodules = true; }; @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { "-DUSE_SYSTEM_LIBSSH2=ON" "-DUSE_SYSTEM_LUA=ON" "-DUSE_SYSTEM_OPENSSL=ON" + "-DENABLE_UPDATE_OVER_GUI=OFF" ]; nativeBuildInputs = [ @@ -62,28 +63,8 @@ stdenv.mkDerivation rec { ]); postInstall = '' - mkdir -p $out/bin - - # Move binaries to the proper place - # TODO: Tweak in the next release: https://github.com/Murmele/Gittyup/commit/5b93e7e514b887fafb00a8158be5986e6c12b2e3 - mv $out/Gittyup $out/bin/gittyup - mv $out/{indexer,relauncher} $out/bin - # Those are not program libs, just some Qt5 libs that the build system leaks for some reason - rm -f $out/*.so.* - rm -rf $out/{include,lib,Plugins,Resources} - '' + lib.optionalString stdenv.isLinux '' - # Install icons - install -Dm0644 ${src}/rsrc/Gittyup.iconset/gittyup_logo.svg $out/share/icons/hicolor/scalable/apps/gittyup.svg - for res in 16x16 32x32 64x64 128x128 256x256 512x512; do - install -Dm0644 ${src}/rsrc/Gittyup.iconset/icon_$res.png $out/share/icons/hicolor/$res/apps/gittyup.png - done - - # Install desktop file - install -Dm0644 ${src}/rsrc/linux/com.github.Murmele.Gittyup.desktop $out/share/applications/gittyup.desktop - # TODO: Remove in the next release: https://github.com/Murmele/Gittyup/commit/5b93e7e514b887fafb00a8158be5986e6c12b2e3 - substituteInPlace $out/share/applications/gittyup.desktop \ - --replace "Exec=Gittyup" "Exec=gittyup" + rm -rf $out/{include,lib} ''; meta = with lib; { From 459643f5d2315c0a789f2cef3844eb5bc2eb3179 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Wed, 10 May 2023 16:23:28 +1000 Subject: [PATCH 073/175] minimal-bootstrap.gnumake: init at 4.4.1 --- .../linux/minimal-bootstrap/default.nix | 2 + .../gnumake/0001-No-impure-bin-sh.patch | 35 ++++ .../gnumake/0002-remove-impure-dirs.patch | 40 ++++ .../gnumake/0003-tinycc-support.patch | 58 ++++++ .../minimal-bootstrap/gnumake/default.nix | 190 ++++++++++++++++++ 5 files changed, 325 insertions(+) create mode 100644 pkgs/os-specific/linux/minimal-bootstrap/gnumake/0001-No-impure-bin-sh.patch create mode 100644 pkgs/os-specific/linux/minimal-bootstrap/gnumake/0002-remove-impure-dirs.patch create mode 100644 pkgs/os-specific/linux/minimal-bootstrap/gnumake/0003-tinycc-support.patch create mode 100644 pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix index f7207d380beb..a0a9a7985d15 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -24,4 +24,6 @@ lib.makeScope gnupatch = callPackage ./gnupatch { tinycc = tinycc-mes; }; + gnumake = callPackage ./gnumake { tinycc = tinycc-mes; }; + }) diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/0001-No-impure-bin-sh.patch b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/0001-No-impure-bin-sh.patch new file mode 100644 index 000000000000..58ee2d6fe09b --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/0001-No-impure-bin-sh.patch @@ -0,0 +1,35 @@ +From e00a5257a6ca5fedbf68b09eee7df3502971a057 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Sat, 24 Apr 2021 10:11:40 +0200 +Subject: [PATCH 1/2] No impure bin sh + +default_shell is used to populuate default shell used to execute jobs. +Unless SHELL is set to a different value this would be /bin/sh. +Our stdenv provides sh in form of bash anyway. Having this value not +hard-coded has some advantages: + +- It would ensure that on all systems it uses sh from its PATH rather + than /bin/sh, which helps as different systems might have different + shells there (bash vs. dash) +- In the past I had issues with LD_PRELOAD with BEAR, where /bin/sh + used a different glibc than BEAR which came from my development shell. +--- + src/job.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/job.c b/src/job.c +index ae1f18b..6b4ddb3 100644 +--- a/src/job.c ++++ b/src/job.c +@@ -77,7 +77,7 @@ char * vms_strsignal (int status); + + #else + +-const char *default_shell = "/bin/sh"; ++const char *default_shell = "sh"; + int batch_mode_shell = 0; + + #endif +-- +2.31.1 + diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/0002-remove-impure-dirs.patch b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/0002-remove-impure-dirs.patch new file mode 100644 index 000000000000..e62aee7d9993 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/0002-remove-impure-dirs.patch @@ -0,0 +1,40 @@ +From 795d63d3c8b5c0dbb7e544954f75507b371b7228 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Sat, 24 Apr 2021 10:20:16 +0200 +Subject: [PATCH 2/2] remove impure dirs + +--- + src/read.c | 3 --- + src/remake.c | 2 -- + 2 files changed, 5 deletions(-) + +diff --git a/src/read.c b/src/read.c +index fa197fb..defacfb 100644 +--- a/src/read.c ++++ b/src/read.c +@@ -109,9 +109,6 @@ static const char *default_include_directories[] = + #endif + INCLUDEDIR, + #ifndef _AMIGA +- "/usr/gnu/include", +- "/usr/local/include", +- "/usr/include", + #endif + 0 + }; +diff --git a/src/remake.c b/src/remake.c +index fb237c5..94bff7d 100644 +--- a/src/remake.c ++++ b/src/remake.c +@@ -1601,8 +1601,6 @@ library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr) + static const char *dirs[] = + { + #ifndef _AMIGA +- "/lib", +- "/usr/lib", + #endif + #if defined(WINDOWS32) && !defined(LIBDIR) + /* +-- +2.31.1 + diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/0003-tinycc-support.patch b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/0003-tinycc-support.patch new file mode 100644 index 000000000000..e2e3f3395153 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/0003-tinycc-support.patch @@ -0,0 +1,58 @@ +diff --git a/src/dir.c b/src/dir.c +index 3e94b98..cfaa6a2 100644 +--- a/src/dir.c ++++ b/src/dir.c +@@ -1331,10 +1331,9 @@ local_stat (const char *path, struct stat *buf) + + /* Similarly for lstat. */ + #if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) +-# ifndef VMS +-# ifndef HAVE_SYS_STAT_H ++// mes-libc implements but does not declare lstat ++# if (!defined(VMS) && !defined(HAVE_SYS_STAT_H)) || defined(__TINYC__) + int lstat (const char *path, struct stat *sbuf); +-# endif + # else + /* We are done with the fake lstat. Go back to the real lstat */ + # ifdef lstat +diff --git a/src/job.c b/src/job.c +index ea88561..8388a82 100644 +--- a/src/job.c ++++ b/src/job.c +@@ -2052,7 +2052,8 @@ job_next_command (struct child *child) + static int + load_too_high (void) + { +-#if defined(__MSDOS__) || defined(VMS) || defined(_AMIGA) || defined(__riscos__) ++// mes-libc does not support getloadavg ++#if defined(__MSDOS__) || defined(VMS) || defined(_AMIGA) || defined(__riscos__) || defined (__TINYC__) + return 1; + #else + static double last_sec; +diff --git a/src/main.c b/src/main.c +index a9d3a64..664d40f 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -2770,7 +2770,7 @@ main (int argc, char **argv, char **envp) + char *b = alloca (40); + sprintf (b, "MAKE_RESTARTS=%s%u", + OUTPUT_IS_TRACED () ? "-" : "", restarts); +- putenv (b); ++ // mes-libc does not support putenv + } + + fflush (stdout); +diff --git a/src/misc.c b/src/misc.c +index eb14f40..bffca82 100644 +--- a/src/misc.c ++++ b/src/misc.c +@@ -653,7 +653,8 @@ get_tmppath () + + # ifdef HAVE_MKTEMP + path = get_tmptemplate (); +- if (*mktemp (path) == '\0') ++ // tinycc: "src/misc.c:656: error: pointer expected" ++ if (!strcmp(mktemp (path), "")) + { + OSS (error, NILF, + _("cannot generate temp path from %s: %s"), path, strerror (errno)); diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix new file mode 100644 index 000000000000..0db52e287425 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/gnumake/default.nix @@ -0,0 +1,190 @@ +{ lib +, runCommand +, fetchurl +, tinycc +, gnupatch +}: +let + pname = "gnumake"; + version = "4.4.1"; + + src = fetchurl { + url = "mirror://gnu/make/make-${version}.tar.gz"; + sha256 = "1cwgcmwdn7gqn5da2ia91gkyiqs9birr10sy5ykpkaxzcwfzn5nx"; + }; + + patches = [ + # Replaces /bin/sh with sh, see patch file for reasoning + ./0001-No-impure-bin-sh.patch + # Purity: don't look for library dependencies (of the form `-lfoo') in /lib + # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for + # included Makefiles, don't look in /usr/include and friends. + ./0002-remove-impure-dirs.patch + # Fixes for tinycc. See comments in patch file for reasoning + ./0003-tinycc-support.patch + ]; + + CFLAGS = [ + "-I./src" + "-I./lib" + "-DHAVE_CONFIG_H" + "-DMAKE_MAINTAINER_MODE" + "-DLIBDIR=\\\"${placeholder "out"}/lib\\\"" + "-DLOCALEDIR=\\\"/fake-locale\\\"" + "-DPOSIX=1" + # mes-libc doesn't implement osync_* methods + "-DNO_OUTPUT_SYNC=1" + # mes-libc doesn't define O_TMPFILE + "-DO_TMPFILE=020000000" + ] ++ config; + + /* + Maintenance notes: + + Generated by + ./configure \ + --build i686-pc-linux-gnu \ + --host i686-pc-linux-gnu \ + CC="${tinycc-mes}/bin/tcc -static" \ + ac_cv_func_dup=no + - `ac_cv_func_dup` disabled as mes-libc doesn't implement tmpfile() + + The output src/config.h was then manually filtered, removing definitions that + didn't have uses in the source code + */ + config = [ + "-DFILE_TIMESTAMP_HI_RES=0" + "-DHAVE_ALLOCA" + "-DHAVE_ALLOCA_H" + "-DHAVE_ATEXIT" + "-DHAVE_DECL_BSD_SIGNAL=0" + "-DHAVE_DECL_GETLOADAVG=0" + "-DHAVE_DECL_SYS_SIGLIST=0" + "-DHAVE_DECL__SYS_SIGLIST=0" + "-DHAVE_DECL___SYS_SIGLIST=0" + "-DHAVE_DIRENT_H" + "-DHAVE_DUP2" + "-DHAVE_FCNTL_H" + "-DHAVE_FDOPEN" + "-DHAVE_GETCWD" + "-DHAVE_GETTIMEOFDAY" + "-DHAVE_INTTYPES_H" + "-DHAVE_ISATTY" + "-DHAVE_LIMITS_H" + "-DHAVE_LOCALE_H" + "-DHAVE_MEMORY_H" + "-DHAVE_MKTEMP" + "-DHAVE_SA_RESTART" + "-DHAVE_SETVBUF" + "-DHAVE_SIGACTION" + "-DHAVE_SIGSETMASK" + "-DHAVE_STDINT_H" + "-DHAVE_STDLIB_H" + "-DHAVE_STRDUP" + "-DHAVE_STRERROR" + "-DHAVE_STRINGS_H" + "-DHAVE_STRING_H" + "-DHAVE_STRTOLL" + "-DHAVE_SYS_FILE_H" + "-DHAVE_SYS_PARAM_H" + "-DHAVE_SYS_RESOURCE_H" + "-DHAVE_SYS_SELECT_H" + "-DHAVE_SYS_STAT_H" + "-DHAVE_SYS_TIMEB_H" + "-DHAVE_SYS_TIME_H" + "-DHAVE_SYS_WAIT_H" + "-DHAVE_TTYNAME" + "-DHAVE_UMASK" + "-DHAVE_UNISTD_H" + "-DHAVE_WAITPID" + "-DMAKE_JOBSERVER" + "-DMAKE_SYMLINKS" + "-DPATH_SEPARATOR_CHAR=':'" + "-DSCCS_GET=\\\"get\\\"" + "-DSTDC_HEADERS" + "-Dsig_atomic_t=int" + "-Dvfork=fork" + ]; + + # Maintenance note: list of source files derived from Basic.mk + make_SOURCES = [ + "src/ar.c" + "src/arscan.c" + "src/commands.c" + "src/default.c" + "src/dir.c" + "src/expand.c" + "src/file.c" + "src/function.c" + "src/getopt.c" + "src/getopt1.c" + "src/guile.c" + "src/hash.c" + "src/implicit.c" + "src/job.c" + "src/load.c" + "src/loadapi.c" + "src/main.c" + "src/misc.c" + "src/output.c" + "src/read.c" + "src/remake.c" + "src/rule.c" + "src/shuffle.c" + "src/signame.c" + "src/strcache.c" + "src/variable.c" + "src/version.c" + "src/vpath.c" + ]; + glob_SOURCES = [ "lib/fnmatch.c" "lib/glob.c" ]; + remote_SOURCES = [ "src/remote-stub.c" ]; + sources = make_SOURCES ++ glob_SOURCES ++ remote_SOURCES ++ [ + "src/posixos.c" + ]; + + objects = map (x: lib.replaceStrings [".c"] [".o"] (builtins.baseNameOf x)) sources; +in +runCommand "${pname}-${version}" { + inherit pname version; + + nativeBuildInputs = [ tinycc gnupatch ]; + + meta = with lib; { + description = "A tool to control the generation of non-source files from sources"; + homepage = "https://www.gnu.org/software/make"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ emilytrau ]; + mainProgram = "make"; + platforms = platforms.unix; + }; +} '' + # Unpack + ungz --file ${src} --output make.tar + untar --file make.tar + rm make.tar + cd make-${version} + + # Patch + ${lib.concatMapStringsSep "\n" (f: "patch -Np1 -i ${f}") patches} + + # Configure + catm src/config.h src/mkconfig.h src/mkcustom.h + cp lib/glob.in.h lib/glob.h + cp lib/fnmatch.in.h lib/fnmatch.h + + # Compile + alias CC="tcc ${lib.concatStringsSep " " CFLAGS}" + ${lib.concatMapStringsSep "\n" (f: "CC -c ${f}") sources} + + # Link + CC -static -o make ${lib.concatStringsSep " " objects} + + # Check + ./make --version + + # Install + mkdir -p ''${out}/bin + cp ./make ''${out}/bin + chmod 555 ''${out}/bin/make +'' From 000a6a670f0b5edefb7206b095b62004095eeff5 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Wed, 10 May 2023 16:24:46 +1000 Subject: [PATCH 074/175] minimal-bootstrap: sort attrs --- .../linux/minimal-bootstrap/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix index a0a9a7985d15..97c9a26b53fb 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -10,20 +10,21 @@ lib.makeScope # declared here. (extra: lib.callPackageWith ({ inherit lib config buildPlatform hostPlatform; } // extra)) (self: with self; { - inherit (callPackage ./utils.nix { }) fetchurl derivationWithMeta writeTextFile writeText runCommand; - - inherit (callPackage ./stage0-posix { }) kaem m2libc mescc-tools mescc-tools-extra; - - mes = callPackage ./mes { }; - mes-libc = callPackage ./mes/libc.nix { }; - - ln-boot = callPackage ./ln-boot { }; - - tinycc-bootstrappable = callPackage ./tinycc/bootstrappable.nix { }; - tinycc-mes = callPackage ./tinycc/mes.nix { }; gnupatch = callPackage ./gnupatch { tinycc = tinycc-mes; }; gnumake = callPackage ./gnumake { tinycc = tinycc-mes; }; + ln-boot = callPackage ./ln-boot { }; + + mes = callPackage ./mes { }; + mes-libc = callPackage ./mes/libc.nix { }; + + inherit (callPackage ./stage0-posix { }) kaem m2libc mescc-tools mescc-tools-extra; + + tinycc-bootstrappable = callPackage ./tinycc/bootstrappable.nix { }; + tinycc-mes = callPackage ./tinycc/mes.nix { }; + + inherit (callPackage ./utils.nix { }) fetchurl derivationWithMeta writeTextFile writeText runCommand; + }) From e79358378408e9f9f4c1d9c9b53315b590fd5cb0 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 10 May 2023 22:06:33 -0400 Subject: [PATCH 075/175] python310Packages.paramz: unbreak Patch out deprecated Numpy API usage. --- pkgs/development/python-modules/paramz/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 5fe452d2047f..10e3cef7a69a 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }: +{ lib, buildPythonPackage, fetchpatch, fetchPypi, numpy, scipy, six, decorator, nose }: buildPythonPackage rec { pname = "paramz"; @@ -9,10 +9,19 @@ buildPythonPackage rec { sha256 = "0917211c0f083f344e7f1bc997e0d713dbc147b6380bc19f606119394f820b9a"; }; + patches = [ + (fetchpatch { + name = "remove-deprecated-numpy-uses"; + url = "https://github.com/sods/paramz/pull/38/commits/a5a0be15b12c5864b438d870b519ad17cc72cd12.patch"; + hash = "sha256-vj/amEXL9QJ7VdqJmyhv/lj8n+yuiZEARQBYWw6lgBA="; + }) + ]; + propagatedBuildInputs = [ numpy scipy six decorator ]; nativeCheckInputs = [ nose ]; - # Ran 113 tests in 3.082s + pythonImportsCheck = [ "paramz" ]; + checkPhase = '' nosetests -v paramz/tests ''; From 821260708e8d8ba560d8fd050befd3cba3a961c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 02:35:25 +0000 Subject: [PATCH 076/175] python311Packages.azure-mgmt-security: 3.0.0 -> 5.0.0 --- .../python-modules/azure-mgmt-security/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index f0c116a1bb68..b760acc8c8a6 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-security"; - version = "3.0.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q="; + hash = "sha256-OLA+/oLCNEzqID/alebQC3rCJ4L6HAtYXNDqLI/z5wI="; extension = "zip"; }; From 07978448b20865d53888a5e1d874c72a64d3a038 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 10 May 2023 22:37:54 -0400 Subject: [PATCH 077/175] python310Packages.nitransforms: unbreak --- pkgs/development/python-modules/nitransforms/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index 09c69f9efb30..5c570b9b2798 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -2,9 +2,11 @@ , buildPythonPackage , fetchPypi , pythonOlder +, pythonRelaxDepsHook , h5py , nibabel , numpy +, scipy , setuptools-scm , toml }: @@ -19,8 +21,11 @@ buildPythonPackage rec { hash = "sha256-iV9TEIGogIfbj+fmOGftoQqEdtZiewbHEw3hYlMEP4c="; }; + nativeBuildInputs = [ pythonRelaxDepsHook ]; buildInputs = [ setuptools-scm toml ]; - propagatedBuildInputs = [ h5py nibabel numpy ]; + propagatedBuildInputs = [ h5py nibabel numpy scipy ]; + + pythonRelaxDeps = [ "scipy" ]; doCheck = false; # relies on data repo (https://github.com/nipreps-data/nitransforms-tests); From 06e53523b024279ebfcdb4137d13b41262f0bc12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 02:46:17 +0000 Subject: [PATCH 078/175] python311Packages.beartype: 0.13.1 -> 0.14.0 --- pkgs/development/python-modules/beartype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index 65bc61ba1edb..021ca25c6bc4 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.13.1"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-KQOUeooetgMCZOMBCKpyyxqAXPyQUMD0AUxK7ToXoAs="; + hash = "sha256-VG5ujc3aHW2fkG6k6xUYqgHJxfWkQOSVkXstr1PL1Zg="; }; nativeCheckInputs = [ From 1cab349abfc22d8076d29445840f937b206dbf48 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 10 May 2023 22:55:00 -0400 Subject: [PATCH 079/175] python311Packages.pylibjpeg-libjpeg: 1.3.3 -> 1.3.4; unbreak --- .../python-modules/pylibjpeg-libjpeg/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix index 46dd18b109fd..a42ea95ee2b4 100644 --- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -10,14 +9,14 @@ buildPythonPackage rec { pname = "pylibjpeg-libjpeg"; - version = "1.3.3"; + version = "1.3.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pydicom"; repo = pname; - rev = "refs/tags/v.${version}"; - hash = "sha256-fv3zX+P2DWMdxPKsvSPhPCV8cDX3tAMO/h5coMHBHN8="; + rev = "refs/tags/v${version}"; + hash = "sha256-VmqeoMU8riLpWyC+yKqq56TkruxOie6pjbg+ozivpBk="; fetchSubmodules = true; }; From ed05f3409e633b001df6c3971ff97ca92252a28b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 04:58:04 +0200 Subject: [PATCH 080/175] python311Packages.onvif-zeep-async: 2.1.4 -> 3.1.3 --- pkgs/development/python-modules/onvif-zeep-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix index d66d77fc77e7..3697e6188ed2 100644 --- a/pkgs/development/python-modules/onvif-zeep-async/default.nix +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "onvif-zeep-async"; - version = "2.1.4"; + version = "3.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F8NqdEYz38mWSfOQ9oIjQccaGkON8skqm+ItQD71CPo="; + hash = "sha256-Lq8jYLEJKluRfsuRghkp7VPIcrHn3qaJTyid9O8lriA="; }; propagatedBuildInputs = [ From 1785a17fbd2b7fe9170f893f4b2ee0257e1e4b21 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 04:59:30 +0200 Subject: [PATCH 081/175] python311Packages.volvooncall: 0.10.2 -> 0.10.3 Diff: https://github.com/molobrakos/volvooncall/compare/refs/tags/v0.10.2...v0.10.3 --- pkgs/development/python-modules/volvooncall/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index 133c9401a293..dfa6023d71c9 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "volvooncall"; - version = "0.10.2"; + version = "0.10.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "molobrakos"; repo = "volvooncall"; rev = "refs/tags/v${version}"; - hash = "sha256-/BMwDuo4xE/XOLM8qzJwt0A0h0+ihbCVCxT3BBToiVU="; + hash = "sha256-FLrsU3u/0+T09cu2zU2fLjuAy9PWAikgbaW8xBALjwU="; }; patches = [ From a7b8b0e6757a3cfa89cc451521e179fcd47cf64b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 03:04:03 +0000 Subject: [PATCH 082/175] python310Packages.pyvisa-py: 0.6.3 -> 0.7.0 --- pkgs/development/python-modules/pyvisa-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index 46c99543a342..8d3ea92339bf 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.6.3"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pyvisa"; repo = "pyvisa-py"; rev = "refs/tags/${version}"; - hash = "sha256-bRO2xO3Q9ruu5KY9SHwdhDU3DoZfW98uYiEFv5P0Fqc="; + hash = "sha256-wMDO0CUCSSCB8cXvTmIEWD8OGMZRZNhmmRx+fZnK288="; }; nativeBuildInputs = [ From 441b0756fbd110d104e44d42f0417bc01c95c33e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 05:09:40 +0200 Subject: [PATCH 083/175] python311Packages.msgspec: 0.14.2 -> 0.15.0 Changelog: https://github.com/jcrist/msgspec/releases/tag/0.15.0 --- pkgs/development/python-modules/msgspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index 19139af43890..5f5fc791baa4 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.14.2"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8EdAnHrgff+Xf7r/FuyGYZxpzEXusRTyXbNTNgPcHO0="; + hash = "sha256-pyGmzG2oy+1Ip4w+pyjASvVyZDEjDylBZfbxLPFzSoU="; }; # Requires libasan to be accessible From 1045220007a18f6848a9055c1931cd4453215ece Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 05:10:39 +0200 Subject: [PATCH 084/175] python311Packages.python-otbr-api: 1.0.9 -> 1.1.0 Changelog: https://github.com/home-assistant-libs/python-otbr-api/releases/tag/1.1.0 --- pkgs/development/python-modules/python-otbr-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix index 9bc33c575572..f4840bba20d2 100644 --- a/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-otbr-api"; - version = "1.0.9"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Rg5+EOsxRse618WvP4+9ybiu0mJpizrzCmeIbRnFgaA="; + hash = "sha256-0JPniehl4cnoTWgqmq1fMZwU8FFl2Zx4CF81az6iaxQ="; }; nativeBuildInputs = [ From 18fa51317bd32fe7249d4ed08c89f93f3e88860c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 05:11:49 +0200 Subject: [PATCH 085/175] python311Packages.eternalegypt: 0.0.15 -> 0.0.16 --- pkgs/development/python-modules/eternalegypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eternalegypt/default.nix b/pkgs/development/python-modules/eternalegypt/default.nix index 6682ae36a6fe..829cfd04d9c9 100644 --- a/pkgs/development/python-modules/eternalegypt/default.nix +++ b/pkgs/development/python-modules/eternalegypt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "eternalegypt"; - version = "0.0.15"; + version = "0.0.16"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-CKiv5gVHaEyO9P5x2FKgpSIm2pUiFptaEQVPZHALASk="; + sha256 = "sha256-ubKepd3yBaoYrIUe5WCt1zd4CjvU7SeftOR+2cBaEf0="; }; propagatedBuildInputs = [ From 30efbd7fda0796a321d8e202f0f8feb6c5faf1f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 05:14:53 +0200 Subject: [PATCH 086/175] python311Packages.eternalegypt: add changelog to meta --- pkgs/development/python-modules/eternalegypt/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eternalegypt/default.nix b/pkgs/development/python-modules/eternalegypt/default.nix index 829cfd04d9c9..2065d603fae1 100644 --- a/pkgs/development/python-modules/eternalegypt/default.nix +++ b/pkgs/development/python-modules/eternalegypt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ubKepd3yBaoYrIUe5WCt1zd4CjvU7SeftOR+2cBaEf0="; + hash = "sha256-ubKepd3yBaoYrIUe5WCt1zd4CjvU7SeftOR+2cBaEf0="; }; propagatedBuildInputs = [ @@ -28,11 +28,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "eternalegypt" ]; + pythonImportsCheck = [ + "eternalegypt" + ]; meta = with lib; { description = "Python API for Netgear LTE modems"; homepage = "https://github.com/amelchio/eternalegypt"; + changelog = "https://github.com/amelchio/eternalegypt/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 5f1b5f38f2c5d3269e5cea035c909532d399f057 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 10 May 2023 23:19:11 -0400 Subject: [PATCH 087/175] python311Packages.transforms3d: unstable-2019-12-17 -> 0.4.1; unbreak --- .../python-modules/transforms3d/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/transforms3d/default.nix b/pkgs/development/python-modules/transforms3d/default.nix index 549ad85c78e9..6bab6a5148b5 100644 --- a/pkgs/development/python-modules/transforms3d/default.nix +++ b/pkgs/development/python-modules/transforms3d/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 -, pytest +, pythonOlder +, pytestCheckHook , numpy , scipy , sympy @@ -10,22 +10,22 @@ buildPythonPackage rec { pname = "transforms3d"; - version = "unstable-2019-12-17"; + version = "0.4.1"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; - # no Git tag or PyPI release in some time src = fetchFromGitHub { owner = "matthew-brett"; repo = pname; - rev = "6b20250c610249914ca5e3a3a2964c36ca35c19a"; - sha256 = "1z789hgk71a6rj6mqp9srpzamg06g58hs2p1l1p344cfnkj5a4kc"; + rev = "refs/tags/${version}"; + hash = "sha256-GgnjvwAfyxnDfBGvgMFIPPbR88BWFiNGrScVORygq94="; }; propagatedBuildInputs = [ numpy sympy ]; - nativeCheckInputs = [ pytest scipy ]; - checkPhase = "pytest transforms3d"; + nativeCheckInputs = [ pytestCheckHook scipy ]; + pythonImportsCheck = [ "transforms3d" ]; meta = with lib; { homepage = "https://matthew-brett.github.io/transforms3d"; From 36593330c7444621e94d5d96014c1416b10d1db1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 05:24:11 +0200 Subject: [PATCH 088/175] python311Packages.volvooncall: update disabled - add changelog to meta --- pkgs/development/python-modules/volvooncall/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index dfa6023d71c9..27356372fce0 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { version = "0.10.3"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "molobrakos"; @@ -30,7 +30,7 @@ buildPythonPackage rec { }; patches = [ - # Remove async, https://github.com/molobrakos/volvooncall/pull/92 + # Remove asynctest, https://github.com/molobrakos/volvooncall/pull/92 (fetchpatch { name = "remove-asnyc.patch"; url = "https://github.com/molobrakos/volvooncall/commit/ef0df403250288c00ed4c600e9dfa79dcba8941e.patch"; @@ -67,6 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Retrieve information from the Volvo On Call web service"; homepage = "https://github.com/molobrakos/volvooncall"; + changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${version}"; license = licenses.unlicense; maintainers = with maintainers; [ dotlambda ]; }; From 9ae4dbb58ba72ef43462f3fbb7cbdac3143579fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 05:32:49 +0200 Subject: [PATCH 089/175] python310Packages.nitransforms: add changelog to meta --- pkgs/development/python-modules/nitransforms/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index 5c570b9b2798..972b1a10b0b0 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://nitransforms.readthedocs.io"; description = "Geometric transformations for images and surfaces"; + changelog = "https://github.com/nipy/nitransforms/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; From e7498472a6fd40e887adc7233d3d06a102d3a50b Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 11 May 2023 12:36:26 +0900 Subject: [PATCH 090/175] python3Packages.flake8-future-import: fix tests --- .../python-modules/flake8-future-import/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 7a3f4dbd805a..e4549470d953 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { ./skip-test.patch ]; + postPatch = '' + substituteInPlace "test_flake8_future_import.py" \ + --replace "'flake8'" "'${lib.getExe flake8}'" + ''; + propagatedBuildInputs = [ flake8 ]; nativeCheckInputs = [ six ]; From 99b071ad0e1df99b19038772d3cd87cb196396d4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 05:46:17 +0200 Subject: [PATCH 091/175] python311Packages.beartype: update disabled - add changelog to meta --- pkgs/development/python-modules/beartype/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index 021ca25c6bc4..62dbfd059b11 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "0.14.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast runtime type checking for Python"; homepage = "https://github.com/beartype/beartype"; + changelog = "https://github.com/beartype/beartype/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; From 076d8bdd06845554e271d58f21a0a69349eb34bd Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 11 May 2023 12:46:28 +0900 Subject: [PATCH 092/175] python3Packages.flake8-future-import: add missing runHook --- .../python-modules/flake8-future-import/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index e4549470d953..017dd74fcede 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -43,7 +43,11 @@ buildPythonPackage rec { nativeCheckInputs = [ six ]; checkPhase = '' + runHook preCheck + ${python.interpreter} -m test_flake8_future_import + + runHook postCheck ''; meta = with lib; { From 2219f70982ec6eb1556bccad9f5c30c4ae4d81e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 05:54:22 +0200 Subject: [PATCH 093/175] python311Packages.pylibjpeg-libjpeg: add changelog to meta - add format - specify liccense --- .../python-modules/pylibjpeg-libjpeg/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix index a42ea95ee2b4..a9ffc663fcaf 100644 --- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -10,6 +10,8 @@ buildPythonPackage rec { pname = "pylibjpeg-libjpeg"; version = "1.3.4"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -20,13 +22,18 @@ buildPythonPackage rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cython]; + nativeBuildInputs = [ + cython + ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; nativeCheckInputs = [ pytestCheckHook ]; + doCheck = false; # tests try to import 'libjpeg.data', which errors pythonImportsCheck = [ @@ -36,7 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "A JPEG, JPEG-LS and JPEG XT plugin for pylibjpeg"; homepage = "https://github.com/pydicom/pylibjpeg-libjpeg"; - license = licenses.gpl3; + changelog = "https://github.com/pydicom/pylibjpeg-libjpeg/releases/tag/v${version}"; + license = licenses.gpl3Only; maintainers = with maintainers; [ bcdarwin ]; }; } From a8cfae856022219c71d3360a0e9edb700faf2c56 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 06:09:13 +0200 Subject: [PATCH 094/175] checkov: 2.3.234 -> 2.3.237 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.234...2.3.237 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.3.237 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 908c60872059..b48ca6fe9f61 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.234"; + version = "2.3.237"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PLeqYD9aIv/nmFvfW2QjDz1xDD2PIFUvr9lkQ2Rh6k8="; + hash = "sha256-7ugTfWv6CRj5vsrT1DvfaR39Ytct3tse+2210WBHP9g="; }; patches = [ From ddd7bd7efbdec3ec8a9dbdd063b10164775ea393 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 04:12:25 +0000 Subject: [PATCH 095/175] python310Packages.azure-mgmt-containerinstance: 10.0.0 -> 10.1.0 --- .../python-modules/azure-mgmt-containerinstance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index 13834d56d040..0d476e1b3dca 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; - version = "10.0.0"; + version = "10.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-TDGrC7YO05Ywa8uEINqqw4Wxag65aklIUwS+2aVMHwA="; + hash = "sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4="; }; propagatedBuildInputs = [ From d8dc9d45498253c12d97bd12bb0044b98491e920 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 04:12:26 +0000 Subject: [PATCH 096/175] python310Packages.cexprtk: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/cexprtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cexprtk/default.nix b/pkgs/development/python-modules/cexprtk/default.nix index 98c3b8416091..53c906c613ba 100644 --- a/pkgs/development/python-modules/cexprtk/default.nix +++ b/pkgs/development/python-modules/cexprtk/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cexprtk"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - hash = "sha256-c7QXB+oXzkRveiPpNrW/HY8pMtpZx/RtDpJMVE7fY/A="; + hash = "sha256-QhftIybufVPO/YbLFycR4qYEAtQMcRPP5jKS6o6dFZg="; }; nativeCheckInputs = [ pytestCheckHook ]; From 3ff89ba0460d465d6d190f41f3277470fa119907 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 04:31:51 +0000 Subject: [PATCH 097/175] python310Packages.sphinxcontrib-plantuml: 0.24.1 -> 0.25 --- .../python-modules/sphinxcontrib-plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index 793bf0771b1a..b5d58792477d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.24.1"; + version = "0.25"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OdLkvEDV4JMSYSmhRPVrbuFfWM+lBItZSOY6Ea/ztYY="; + hash = "sha256-j95THZLRz8KBf+Nkez8tB+dmgsSoSInASlPoMffFRDI="; }; propagatedBuildInputs = [ From aaf828279a666eb481abfa90e1e3988ee2e3565f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 04:39:05 +0000 Subject: [PATCH 098/175] python311Packages.panel: 0.14.3 -> 0.14.4 --- pkgs/development/python-modules/panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 881280a1fca8..e2cd47fa47a8 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "0.14.3"; + version = "0.14.4"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-XOu17oydXwfyowYUmCKF7/RC0RQ0Uf1Ixmn+VTa85Lo="; + hash = "sha256-3U/PL8cnbNPw3xEM56YZesQEDXTE79yMCSsjdxwfUU0="; }; nativeBuildInputs = [ From 8bb1c8fcdc91c85b457cc58bc6e1a4c28eac108c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 06:59:54 +0200 Subject: [PATCH 099/175] tang: 12 -> 13 Diff: https://github.com/latchset/tang/compare/refs/tags/v12...v13 Changelog: https://github.com/latchset/tang/releases/tag/v13 --- pkgs/servers/tang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix index fdcadc4bb28d..1a66d8f28de9 100644 --- a/pkgs/servers/tang/default.nix +++ b/pkgs/servers/tang/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "tang"; - version = "12"; + version = "13"; src = fetchFromGitHub { owner = "latchset"; repo = "tang"; rev = "refs/tags/v${version}"; - hash = "sha256-wfZFOJrVzjtysh0VKdw5O+DJybYkV9bYJNnaku6YctE="; + hash = "sha256-SOdgMUWavTaDUiVvpEyE9ac+9aDmZs74n7ObugksBcc="; }; nativeBuildInputs = [ From bb034f61a29552f0349536d2e2b8a11a4602cc4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 05:03:17 +0000 Subject: [PATCH 100/175] python310Packages.riscv-isac: 0.16.1 -> 0.17.0 --- pkgs/development/python-modules/riscv-isac/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/riscv-isac/default.nix b/pkgs/development/python-modules/riscv-isac/default.nix index 98fff40285b2..a577cb8a054f 100644 --- a/pkgs/development/python-modules/riscv-isac/default.nix +++ b/pkgs/development/python-modules/riscv-isac/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "riscv-isac"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "riscv-software-src"; repo = pname; - rev = version; - hash = "sha256-Krjr9bvpoOeNfMbYj/QbJ+Y+AVLjwrzj8KKMUXCfnMA="; + rev = "refs/tags/${version}"; + hash = "sha256-I0RsvSCrSlNGVj8z+WUQx6vbdNkKCRyMFvNx+0mTBAE="; }; postPatch = "substituteInPlace riscv_isac/requirements.txt --replace 'pyelftools==0.26' pyelftools"; From a8e340b21c2ac43ac4b07e9b1f31ec93c30f5b41 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 07:04:40 +0200 Subject: [PATCH 101/175] python310Packages.azure-mgmt-containerinstance: disable on unsupported Python releases --- .../azure-mgmt-containerinstance/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index 0d476e1b3dca..06a9c072f279 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -6,12 +6,15 @@ , azure-common , azure-mgmt-core , azure-mgmt-nspkg -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; version = "10.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -24,14 +27,14 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; # has no tests doCheck = false; - pythonImportsCheck = [ "azure.mgmt.containerinstance" ]; + pythonImportsCheck = [ + "azure.mgmt.containerinstance" + ]; meta = with lib; { description = "This is the Microsoft Azure Container Instance Client Library"; From 584b8e132fe964b6934cc653af39670b87047664 Mon Sep 17 00:00:00 2001 From: Jann Marc <31008330+jfvillablanca@users.noreply.github.com> Date: Thu, 11 May 2023 13:26:44 +0800 Subject: [PATCH 102/175] gnote: init at 44.0 --- pkgs/applications/office/gnote/default.nix | 61 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/applications/office/gnote/default.nix diff --git a/pkgs/applications/office/gnote/default.nix b/pkgs/applications/office/gnote/default.nix new file mode 100644 index 000000000000..43bb42ea202e --- /dev/null +++ b/pkgs/applications/office/gnote/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchurl +, desktop-file-utils +, gettext +, gspell +, gtkmm3 +, itstool +, libsecret +, libuuid +, libxml2 +, libxslt +, meson +, ninja +, pkg-config +, wrapGAppsHook +, gnome +}: + +stdenv.mkDerivation rec { + pname = "gnote"; + version = "44.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-3DvXkmj+mdTtVmeawHbMnZqq9ieWE403HPCIFffmSS0="; + }; + + buildInputs = [ + gspell + gtkmm3 + libsecret + libuuid + libxml2 + libxslt + ]; + + nativeBuildInputs = [ + desktop-file-utils + gettext + itstool + meson + ninja + pkg-config + wrapGAppsHook + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Gnote"; + description = "A note taking application"; + maintainers = with maintainers; [ jfvillablanca ]; + license = licenses.gpl3Only; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3fed8944d36..3ea994594278 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20748,6 +20748,8 @@ with pkgs; gnome-menus = callPackage ../development/libraries/gnome-menus { }; + gnote = callPackage ../applications/office/gnote { }; + elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; gtk2 = callPackage ../development/libraries/gtk/2.x.nix { From 6490ff5a8b1b972709fc1a9d4fd738b6ede6a56d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 05:43:50 +0000 Subject: [PATCH 103/175] php80Packages.phpstan: 1.9.4 -> 1.10.15 --- pkgs/development/php-packages/phpstan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 185df9f64150..df6e87d5a5e4 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -2,14 +2,14 @@ let pname = "phpstan"; - version = "1.9.4"; + version = "1.10.15"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-A+F/ZoL6dLYx4MWN0eWXtQnmWJPYBqEcSgY4A1oR3mo="; + sha256 = "sha256-zGrAgQttAvGdRpuOB3V/GprMzc2NMya4d3MY1SIfYOQ="; }; dontUnpack = true; From 7231efc0d5133dd7b3a5f536fb9a4528d06489ce Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 11 May 2023 09:24:48 +0300 Subject: [PATCH 104/175] libsForQt5.mauikit-imagetools: fix build --- pkgs/applications/maui/mauikit-imagetools.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/maui/mauikit-imagetools.nix b/pkgs/applications/maui/mauikit-imagetools.nix index 141d1953528a..1b6a994b9fac 100644 --- a/pkgs/applications/maui/mauikit-imagetools.nix +++ b/pkgs/applications/maui/mauikit-imagetools.nix @@ -1,5 +1,6 @@ { lib , mkDerivation +, fetchpatch , cmake , extra-cmake-modules , kconfig @@ -16,6 +17,14 @@ mkDerivation { pname = "mauikit-imagetools"; + patches = [ + (fetchpatch { + name = "remove-unused-method.patch"; + url = "https://invent.kde.org/maui/mauikit-imagetools/-/commit/344852044d407b144bca01c41a409ceaa548bec0.patch"; + hash = "sha256-Cpq/XzDgrKD8YVex2z9VxGTA+iDI5703+fHwkn0cIWA="; + }) + ]; + nativeBuildInputs = [ cmake extra-cmake-modules From 9c05958d2c9a50fca34d15b56c9a87122919e777 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 06:35:06 +0000 Subject: [PATCH 105/175] python310Packages.xhtml2pdf: 0.2.9 -> 0.2.11 --- pkgs/development/python-modules/xhtml2pdf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index c7f768ab2a8a..5e1661cd989e 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "xhtml2pdf"; - version = "0.2.9"; + version = "0.2.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { owner = pname; repo = pname; # Currently it is not possible to fetch from version as there is a branch with the same name - rev = "refs/tags/${version}"; - hash = "sha256-MrzAsa0AZX3+0LN/Can3QBoPBRxb0a/F2jLBd8rD5H4="; + rev = "refs/tags/v${version}"; + hash = "sha256-L/HCw+O8bidtE5nDdO+cLS54m64dlJL+9Gjcye5gM+w="; }; propagatedBuildInputs = [ From 4671162a42c6338962be2006e4206dbe2f6fa061 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 06:53:21 +0000 Subject: [PATCH 106/175] python310Packages.globus-sdk: 3.16.0 -> 3.19.0 --- pkgs/development/python-modules/globus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index c04bb6e7f873..7480bd51eaf5 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.16.0"; + version = "3.19.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-zl5+22r0KMqdBKIlBe+8xxgh6h9am34USc1dLy+VGyY="; + hash = "sha256-xdzDKzlqQRBrKT/j6PWSgDu33XlVHKsHfv5AgrT6SB8="; }; propagatedBuildInputs = [ From 15cba50540eb89dcf4ce671405150c875ba24d28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 08:58:20 +0200 Subject: [PATCH 107/175] python311Packages.pysensibo: 1.0.27 -> 1.0.28 Changelog: https://github.com/andrey-git/pysensibo/releases/tag/1.0.28 --- pkgs/development/python-modules/pysensibo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index db19bf859584..2ebfa8238f39 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.27"; + version = "1.0.28"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O0Dttr+2lLR+llJIb/uxFLfRjZmnpVWrRon4rOfsnTY="; + hash = "sha256-7mYYsJCiJZedbmO9fv/Zr+QZOaSE6d6ld94yWUhUmUQ="; }; propagatedBuildInputs = [ From cb1c6b5763f98e84db42c5844d2f58ac474bce71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 11 May 2023 08:43:05 +0200 Subject: [PATCH 108/175] evcc: 0.117.1 -> 0.117.2 https://github.com/evcc-io/evcc/releases/tag/0.117.2 --- pkgs/servers/home-automation/evcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 8ee5d70abc22..109fb6b17e97 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "evcc"; - version = "0.117.1"; + version = "0.117.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-y8hc/5z92mkIio8+UFan2PDLPyewty5GuFyIKO2IEo8="; + hash = "sha256-GRwh5sBp3GlR9cMqRAKI0wuAFV9hB+ek3VRijceh+AU="; }; vendorHash = "sha256-3EHdjRCzrty7BnaSG4TAf52jRl0AVS6baSl2XhYUH0A="; From e36456f0e29eaa287144e58e34c3b58897280880 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 03:06:07 +0000 Subject: [PATCH 109/175] terraform-providers.aiven: 4.2.1 -> 4.3.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 010c9d1ba4d5..ec4c3f46f8f9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -28,13 +28,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-I8w8hnts3bELUm2e0fRfRcfK9uoS0ZbymZZPEVcizEI=", + "hash": "sha256-WBjtrjhv3DBusE64Gu/XXOwaH4ByHoyS6tGcY6VE2iU=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.2.1", + "rev": "v4.3.0", "spdx": "MIT", - "vendorHash": "sha256-nF/efMhmrXfBlF9w9tC4npHxjX2/299OfqTpvPapfMo=" + "vendorHash": "sha256-NnWYUVziSWuedgXG1jXrdYF7il8KmA5MQVlK5AEhc+U=" }, "akamai": { "hash": "sha256-P/5tLtcPqhf48DqqMKKNCOrvT+I60N9rC1W/4RdFXqY=", From 70444a4b34ab58fe0a5bbf330e3ea9f3b1220403 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 03:10:07 +0000 Subject: [PATCH 110/175] terraform-providers.linode: 2.0.0 -> 2.1.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ec4c3f46f8f9..9fbc7a72f8b3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -665,13 +665,13 @@ "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { - "hash": "sha256-Z8mllx/TO0EUQNSOGcUhMRAsV7jiUhybzYDPg2ZtUec=", + "hash": "sha256-G6+xplMymxziIVof67ONtVMLAaQc33A0pLscchNi8kc=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.0.0", + "rev": "v2.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Xbnf8ejyojd3JD7h580hlM0PC4nD+sjpodV9hr0/F+c=" + "vendorHash": "sha256-om6Onp+Go74YfA8J2DALhJy1c+s5GbXYMpUM9a28bdI=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", From 11315ac5920ec42b87c50372c955b1cc115662b6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 03:13:35 +0000 Subject: [PATCH 111/175] terraform-providers.signalfx: 6.23.0 -> 6.24.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9fbc7a72f8b3..c2f0f1ca0c7e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1008,11 +1008,11 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-VvL5lGPNtcjrtpB/p//7UXuUQxjV/+Deb+R3p+V8GtM=", + "hash": "sha256-H3+2lyn17FwF/zskVAzz0mYnyPkL2/otqoCkgcVFWf4=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v6.23.0", + "rev": "v6.24.0", "spdx": "MPL-2.0", "vendorHash": "sha256-0fqIaIINBvTAHVHZP/AcS4hNyjXHM+wfHp/0I7xqRhg=" }, From 57921bccf4cc847dadffd1748fca03ca2b87dc6b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 03:16:23 +0000 Subject: [PATCH 112/175] terraform-providers.oci: 4.119.0 -> 4.120.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c2f0f1ca0c7e..ce912a004b52 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -810,11 +810,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-/p/NBw8dPzStLs9LTvvqDUSNJ9oMCG0e4bT+gIsPEGA=", + "hash": "sha256-XHHZpl936xZ4jjk71bmlxm1xilqFamdgL3AdkyRBT5Y=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.119.0", + "rev": "v4.120.0", "spdx": "MPL-2.0", "vendorHash": null }, From 4bee5f920e610bdfc3251f8bc22241824239f3d1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 03:16:26 +0000 Subject: [PATCH 113/175] terraform-providers.vultr: 2.15.0 -> 2.15.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ce912a004b52..0272ed69fb2b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1235,11 +1235,11 @@ "vendorHash": "sha256-wKKrBSJkbdqqnDLoS+jhvI26rOzvMWjjsN8wh67Le5U=" }, "vultr": { - "hash": "sha256-4Um4UyDjtamy2s15K3Idm5edZj5BOy13+kr39wl9e0Q=", + "hash": "sha256-h9MQv4BTv9y4A6HSDE3dIV7aKwaIWRYy5EyE2T0mpG4=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.15.0", + "rev": "v2.15.1", "spdx": "MPL-2.0", "vendorHash": null }, From 86794465b97af67399f672f7e26aeb43adffb74e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 07:11:17 +0000 Subject: [PATCH 114/175] k6: 0.44.0 -> 0.44.1 --- pkgs/development/tools/k6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index bfa42df8ab7a..37d00c721b9b 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.44.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U7/PJzjIKIKKC3Ao7HtiSDaRK1L7ZGUz/KP2SIoZXfo="; + sha256 = "sha256-BfzB6Qt0Hg9ryU4zeTi40jByOgqr9mveq5ZGkO8bA9U="; }; subPackages = [ "./" ]; From 8158cbc2b2a12b3297bc7f7e957680e9d84d292e Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 11 May 2023 03:37:38 +0000 Subject: [PATCH 115/175] nuttcp: Fix build on darwin --- pkgs/tools/networking/nuttcp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index 584ad029970e..9483c3ce756d 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { installShellFiles ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installPhase = '' mkdir -p $out/bin cp nuttcp-${version} $out/bin/nuttcp From 80ccb8322554571636dd2d595d8c1e532dace2ae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 11 May 2023 09:13:41 +0200 Subject: [PATCH 116/175] python310Packages.mobly: fix tests on darwin https://hydra.nixos.org/build/219230845 --- pkgs/development/python-modules/mobly/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/mobly/default.nix b/pkgs/development/python-modules/mobly/default.nix index ecc0191f742b..73d4d7d3df99 100644 --- a/pkgs/development/python-modules/mobly/default.nix +++ b/pkgs/development/python-modules/mobly/default.nix @@ -41,6 +41,8 @@ buildPythonPackage rec { pytz ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { changelog = "https://github.com/google/mobly/blob/${src.rev}/CHANGELOG.md"; description = "Automation framework for special end-to-end test cases"; From 0af2179cf6507dfd111e72a9185eac6285a19274 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 11 May 2023 09:24:48 +0200 Subject: [PATCH 117/175] openvino: fix build on aarch64-linux https://hydra.nixos.org/build/218868659 --- pkgs/development/libraries/openvino/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index 2f8ecd5fc81e..68e3de522769 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -140,6 +140,8 @@ stdenv.mkDerivation rec { "-DENABLE_SAMPLES:BOOL=OFF" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing"; + autoPatchelfIgnoreMissingDeps = [ "libngraph_backend.so" ]; From 439625d5d543e085619f5b24d9da16f6737ebcfc Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 11 May 2023 07:07:37 +0000 Subject: [PATCH 118/175] nixosTests.gitlab: Use module system based runner --- nixos/tests/all-tests.nix | 2 +- nixos/tests/gitlab.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5459dd161b81..95f8fd1c4e04 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -267,7 +267,7 @@ in { gitdaemon = handleTest ./gitdaemon.nix {}; gitea = handleTest ./gitea.nix { giteaPackage = pkgs.gitea; }; github-runner = handleTest ./github-runner.nix {}; - gitlab = handleTest ./gitlab.nix {}; + gitlab = runTest ./gitlab.nix; gitolite = handleTest ./gitolite.nix {}; gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {}; glusterfs = handleTest ./glusterfs.nix {}; diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index c2a11bada0a3..ff10d3de812a 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -6,7 +6,7 @@ # - Creating Merge Requests and merging them # - Opening and closing issues. # - Downloading repository archives as tar.gz and tar.bz2 -import ./make-test-python.nix ({ pkgs, lib, ... }: +{ pkgs, lib, ... }: with lib; @@ -174,7 +174,7 @@ in { gitlab.wait_for_unit("gitlab.service") gitlab.wait_for_unit("gitlab-pages.service") gitlab.wait_for_unit("gitlab-sidekiq.service") - gitlab.wait_for_file("${nodes.gitlab.config.services.gitlab.statePath}/tmp/sockets/gitlab.socket") + gitlab.wait_for_file("${nodes.gitlab.services.gitlab.statePath}/tmp/sockets/gitlab.socket") gitlab.wait_until_succeeds("curl -sSf http://gitlab/users/sign_in") ''; @@ -419,15 +419,15 @@ in { + '' gitlab.systemctl("start gitlab-backup.service") gitlab.wait_for_unit("gitlab-backup.service") - gitlab.wait_for_file("${nodes.gitlab.config.services.gitlab.statePath}/backup/dump_gitlab_backup.tar") + gitlab.wait_for_file("${nodes.gitlab.services.gitlab.statePath}/backup/dump_gitlab_backup.tar") gitlab.systemctl("stop postgresql.service gitlab.target") gitlab.succeed( - "find ${nodes.gitlab.config.services.gitlab.statePath} -mindepth 1 -maxdepth 1 -not -name backup -execdir rm -r {} +" + "find ${nodes.gitlab.services.gitlab.statePath} -mindepth 1 -maxdepth 1 -not -name backup -execdir rm -r {} +" ) gitlab.succeed("systemd-tmpfiles --create") - gitlab.succeed("rm -rf ${nodes.gitlab.config.services.postgresql.dataDir}") + gitlab.succeed("rm -rf ${nodes.gitlab.services.postgresql.dataDir}") gitlab.systemctl("start gitlab-config.service gitaly.service gitlab-postgresql.service") - gitlab.wait_for_file("${nodes.gitlab.config.services.gitlab.statePath}/tmp/sockets/gitaly.socket") + gitlab.wait_for_file("${nodes.gitlab.services.gitlab.statePath}/tmp/sockets/gitaly.socket") gitlab.succeed( "sudo -u gitlab -H gitlab-rake gitlab:backup:restore RAILS_ENV=production BACKUP=dump force=yes" ) @@ -435,4 +435,4 @@ in { '' + waitForServices + test false; -}) +} From 9b979714b6745a9ba1d24a2468806410396a2a1f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 09:41:22 +0200 Subject: [PATCH 119/175] python310Packages.riscv-isac: add changelog to meta - switch to pytestCheckHook - add pythonImportsCheck --- .../python-modules/riscv-isac/default.nix | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/riscv-isac/default.nix b/pkgs/development/python-modules/riscv-isac/default.nix index a577cb8a054f..13aca2c0d7b6 100644 --- a/pkgs/development/python-modules/riscv-isac/default.nix +++ b/pkgs/development/python-modules/riscv-isac/default.nix @@ -1,19 +1,24 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , click , colorlog , gitpython +, pluggy , pyelftools , pytablewriter -, pytest +, pytestCheckHook , pyyaml , ruamel-yaml +, pythonOlder }: buildPythonPackage rec { pname = "riscv-isac"; version = "0.17.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "riscv-software-src"; @@ -22,23 +27,36 @@ buildPythonPackage rec { hash = "sha256-I0RsvSCrSlNGVj8z+WUQx6vbdNkKCRyMFvNx+0mTBAE="; }; - postPatch = "substituteInPlace riscv_isac/requirements.txt --replace 'pyelftools==0.26' pyelftools"; + postPatch = '' + substituteInPlace riscv_isac/requirements.txt \ + --replace "pyelftools==0.26" "pyelftools" \ + --replace "pytest" "" + ''; propagatedBuildInputs = [ click colorlog gitpython + pluggy pyelftools pytablewriter - pytest pyyaml ruamel-yaml ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "riscv_isac" + ]; + meta = with lib; { - homepage = "https://github.com/riscv/riscv-isac"; description = "An ISA coverage extraction tool"; - maintainers = with maintainers; [ genericnerdyusername ]; + homepage = "https://github.com/riscv/riscv-isac"; + changelog = "https://github.com/riscv-software-src/riscv-isac/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; + maintainers = with maintainers; [ genericnerdyusername ]; }; } From ef9c36840a5f8aff250f16c0bf30f5e7617eee07 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Tue, 9 May 2023 14:02:43 +0200 Subject: [PATCH 120/175] python3Packages.lmfit: init at 1.2.1 Co-authored-by: Jonas Heinrich --- .../python-modules/lmfit/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/lmfit/default.nix diff --git a/pkgs/development/python-modules/lmfit/default.nix b/pkgs/development/python-modules/lmfit/default.nix new file mode 100644 index 000000000000..bed095186ec9 --- /dev/null +++ b/pkgs/development/python-modules/lmfit/default.nix @@ -0,0 +1,61 @@ +{ lib, + buildPythonPackage, + fetchPypi, + setuptools, + setuptools-scm, + asteval, + numpy, + scipy, + uncertainties, + pytestCheckHook, + pandas, + matplotlib, +}: + +buildPythonPackage rec { + pname = "lmfit"; + version = "1.2.1"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-AM71vRRb+BtzYwt4kmrySyTxgFQh5iEcpYVYiqfMQVs="; + }; + + postPatch = '' + substituteInPlace setup.cfg --replace "--cov=lmfit --cov-report html" "" + ''; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + asteval + numpy + scipy + uncertainties + ]; + + nativeCheckInputs = [ + pytestCheckHook + pandas + matplotlib + ]; + + disabledTests = [ + # https://github.com/lmfit/lmfit-py/issues/878 + "test_emcee_multiprocessing" + "test_explicit_independent_vars" + "test_result_eval_custom_x" + ]; + + meta = with lib; { + description = "Least-Squares Minimization with Bounds and Constraints"; + homepage = "https://lmfit-py.readthedocs.io/"; + license = licenses.bsd3; + maintainers = with maintainers; [ nomeata ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a6d936c7b4f..f4c2e710c5d6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5777,6 +5777,8 @@ self: super: with self; { inherit (pkgs) lmdb; }; + lmfit = callPackage ../development/python-modules/lmfit { }; + lml = callPackage ../development/python-modules/lml { }; lmnotify = callPackage ../development/python-modules/lmnotify { }; From dfa2d97218c02e4f0a256b732441535bf2f46d5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 09:57:20 +0200 Subject: [PATCH 121/175] python310Packages.xhtml2pdf: add changelog to meta --- pkgs/development/python-modules/xhtml2pdf/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index 5e1661cd989e..931d08e12c1c 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -20,11 +20,9 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - # Tests are only available on GitHub src = fetchFromGitHub { owner = pname; repo = pname; - # Currently it is not possible to fetch from version as there is a branch with the same name rev = "refs/tags/v${version}"; hash = "sha256-L/HCw+O8bidtE5nDdO+cLS54m64dlJL+9Gjcye5gM+w="; }; @@ -51,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "A PDF generator using HTML and CSS"; homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; + changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From 1cbbaf6485cb5c8e4e70e236f0bcc76f9cbd39ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 10:09:07 +0200 Subject: [PATCH 122/175] python311Packages.invocations: 3.0.2 -> 3.1.0 Diff: https://github.com/pyinvoke/invocations/compare/refs/tags/3.0.2...3.1.0 Changelog: https://github.com/pyinvoke/invocations/blob/3.1.0/docs/changelog.rst --- pkgs/development/python-modules/invocations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/invocations/default.nix b/pkgs/development/python-modules/invocations/default.nix index ee0c2f061731..649c0f5e220c 100644 --- a/pkgs/development/python-modules/invocations/default.nix +++ b/pkgs/development/python-modules/invocations/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "invocations"; - version = "3.0.2"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pyinvoke"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sXMxTOi0iCz7Zq0lXkpproUtkId5p/GCqP1TvgqYlME="; + hash = "sha256-NlYoikv43oD5+Iz2CeeCGG3Fm648UgA3YZQFOfWSy58="; }; postPatch = '' From 40865ec0db2e4a7f9d5b25c102299084efbb6d47 Mon Sep 17 00:00:00 2001 From: QJoly Date: Thu, 11 May 2023 10:09:43 +0200 Subject: [PATCH 123/175] tfautomv: init at 0.5.1 Delete DoCheck = True; --- .../networking/cluster/tfautomv/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/networking/cluster/tfautomv/default.nix diff --git a/pkgs/applications/networking/cluster/tfautomv/default.nix b/pkgs/applications/networking/cluster/tfautomv/default.nix new file mode 100644 index 000000000000..94dc0754ff70 --- /dev/null +++ b/pkgs/applications/networking/cluster/tfautomv/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "tfautomv"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "padok-team"; + repo = pname; + rev = "v${version}"; + hash = "sha256-shpoi/N/gfzisjj1tvZGSEuorqaoOJMhYOjx+Y8F/Ds="; + }; + + vendorHash = "sha256-BjmtUamecTSwT7gHM/6uz1r/P8O0TWzp9Dk43rdmxXU="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + homepage = "https://github.com/padok-team/tfautomv"; + description = "When refactoring a Terraform codebase, you often need to write moved blocks. This can be tedious. Let tfautomv do it for you"; + license = licenses.asl20; + maintainers = with maintainers; [ qjoly ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8b6ffab9979..bab635bae8fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39454,6 +39454,8 @@ with pkgs; terragrunt = callPackage ../applications/networking/cluster/terragrunt { }; + tfautomv = callPackage ../applications/networking/cluster/tfautomv { }; + terranix = callPackage ../applications/networking/cluster/terranix { }; terraspace = callPackage ../applications/networking/cluster/terraspace { }; From d9668c2ef2f9d115ef2bf573cd407afcc413ea4e Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 11 May 2023 09:42:18 +0100 Subject: [PATCH 124/175] tailscale: 1.40.0 -> 1.40.1 Diff: https://github.com/tailscale/tailscale/compare/v1.40.0...v1.40.1 --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index fce7a5ad3e73..77727c3ad341 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.40.0"; + version = "1.40.1"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-iPf3ams613VHPesbxoBaaw9eav5p781+wEmbJ+15yfY="; + hash = "sha256-OCKWr62peDrh6zQVAS2iPPzgB1uZb1Fev23szvNNPkE="; }; vendorHash = "sha256-lirn07XE3JOS6oiwZBMwxzywkbXHowOJUMWWLrZtccY="; From f9e45daad3a93115c4ef0706e1df3850aac399c7 Mon Sep 17 00:00:00 2001 From: hikari Date: Sun, 7 May 2023 17:59:00 +0530 Subject: [PATCH 125/175] lightly-boehs: init at 0.4.1 --- pkgs/data/themes/lightly-boehs/default.nix | 42 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/data/themes/lightly-boehs/default.nix diff --git a/pkgs/data/themes/lightly-boehs/default.nix b/pkgs/data/themes/lightly-boehs/default.nix new file mode 100644 index 000000000000..10c30a431e7c --- /dev/null +++ b/pkgs/data/themes/lightly-boehs/default.nix @@ -0,0 +1,42 @@ +{ mkDerivation +, lib +, kdecoration +, fetchFromGitHub +, cmake +, extra-cmake-modules +, plasma-workspace +, qtbase +, qt5 +}: + +mkDerivation rec { + pname = "lightly-boehs"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "boehs"; + repo = "Lightly"; + rev = "1a831f7ff19ce93c04489faec74e389a216fdf11"; + sha256 = "Icw+xVmuCB59ltyZJKyIeHI/yGfM2SbPrVzTVLqHWd4="; + }; + + buildInputs = [ + kdecoration + plasma-workspace + qtbase + qt5.qtx11extras + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + meta = with lib; { + description = "A fork of the Lightly breeze theme style that aims to be visually modern and minimalistic"; + homepage = "https://github.com/boehs/Lightly"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.hikari ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 264c955401e7..69b6884cc491 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28200,6 +28200,8 @@ with pkgs; lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { }; + lightly-boehs = libsForQt5.callPackage ../data/themes/lightly-boehs { }; + linden-hill = callPackage ../data/fonts/linden-hill { }; line-awesome = callPackage ../data/fonts/line-awesome { }; From c48aae965e046dc41d11fc58234ce48dece3b385 Mon Sep 17 00:00:00 2001 From: hikari Date: Sun, 7 May 2023 17:59:00 +0530 Subject: [PATCH 126/175] maintainers: add hikari --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 904390ef0b59..611fa0c9c56a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6274,6 +6274,14 @@ github = "higebu"; githubId = 733288; }; + + hikari = { + email = "HikariNee@protonmail.com"; + github = "HikariNee"; + githubId = 72349937; + name = "Hikari"; + }; + hiljusti = { name = "J.R. Hill"; email = "hiljusti@so.dang.cool"; @@ -6286,6 +6294,7 @@ githubId = 19825977; name = "Hiren Shah"; }; + hiro98 = { email = "hiro@protagon.space"; github = "vale981"; From 959376499c645c1c3463550a972fc8faddb84c2b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 10 May 2023 22:09:22 +0200 Subject: [PATCH 127/175] libcpr: init at 1.10.2 --- pkgs/development/libraries/libcpr/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/libraries/libcpr/default.nix diff --git a/pkgs/development/libraries/libcpr/default.nix b/pkgs/development/libraries/libcpr/default.nix new file mode 100644 index 000000000000..d68b4576cac9 --- /dev/null +++ b/pkgs/development/libraries/libcpr/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchFromGitHub, cmake, curl }: + +let version = "1.10.2"; in +stdenv.mkDerivation { + pname = "libcpr"; + inherit version; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "libcpr"; + repo = "cpr"; + rev = "1.10.2"; + hash = "sha256-F+ZIyFwWHn2AcVnKOaRlB7DjZzfmn8Iat/m3uknC8uA="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ curl ]; + + cmakeFlags = [ + "-DCPR_USE_SYSTEM_CURL=ON" + ]; + + postPatch = '' + # Linking with stdc++fs is no longer necessary. + sed -i '/stdc++fs/d' include/CMakeLists.txt + ''; + + postInstall = '' + substituteInPlace "$out/lib/cmake/cpr/cprTargets.cmake" \ + --replace "_IMPORT_PREFIX \"$out\"" \ + "_IMPORT_PREFIX \"$dev\"" + ''; + + meta = with lib; { + description = "C++ wrapper around libcurl"; + homepage = "https://docs.libcpr.org/"; + license = licenses.mit; + maintainers = with maintainers; [ rycee ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dd58a7bd285..50a676393c16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21405,6 +21405,8 @@ with pkgs; libcollectdclient = callPackage ../development/libraries/libcollectdclient { }; + libcpr = callPackage ../development/libraries/libcpr { }; + libcredis = callPackage ../development/libraries/libcredis { }; libctb = callPackage ../development/libraries/libctb { }; From 5ba394a5f0e9291765732c66dce6b5234f5ca429 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 11 May 2023 09:07:57 +0200 Subject: [PATCH 128/175] privacyidea: fix build For this round of ZHF: #230712 Failing Hydra build: https://hydra.nixos.org/build/218871719 The following things needed to change: * Drop `doc` stuff from `pyopenssl` to avoid transitive errors related to sphinx (and the dependency hackery in here). * Disable a bunch of flask-babel tests failing because of `\u202f` vs space. * Fix tests by using hashes supported by `libxcrypt` for tests using the passwd resolver[1]. [1] https://github.com/privacyidea/privacyidea/pull/3611 --- .../applications/misc/privacyidea/default.nix | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index f5e13987aff4..858eb6d2c21e 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -3,7 +3,7 @@ }: let - dropDevOutput = { outputs, ... }: { + dropDocOutput = { outputs, ... }: { outputs = lib.filter (x: x != "doc") outputs; }; @@ -119,7 +119,7 @@ let flask-babel = (super.flask-babel.override { sphinxHook = null; furo = null; - }).overridePythonAttrs (old: (dropDevOutput old) // rec { + }).overridePythonAttrs (old: (dropDocOutput old) // rec { pname = "Flask-Babel"; version = "2.0.0"; format = "setuptools"; @@ -128,21 +128,29 @@ let inherit version; hash = "sha256:f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; }; + disabledTests = [ + # AssertionError: assert 'Apr 12, 2010...46:00\u202fPM' == 'Apr 12, 2010, 1:46:00 PM' + # Note the `\u202f` (narrow, no-break space) vs space. + "test_basics" + "test_init_app" + "test_custom_locale_selector" + "test_refreshing" + ]; }); psycopg2 = (super.psycopg2.override { sphinxHook = null; sphinx-better-theme = null; - }).overridePythonAttrs dropDevOutput; + }).overridePythonAttrs dropDocOutput; hypothesis = super.hypothesis.override { enableDocumentation = false; }; pyjwt = (super.pyjwt.override { sphinxHook = null; sphinx-rtd-theme = null; - }).overridePythonAttrs (old: (dropDevOutput old) // { format = "setuptools"; }); + }).overridePythonAttrs (old: (dropDocOutput old) // { format = "setuptools"; }); beautifulsoup4 = (super.beautifulsoup4.override { sphinxHook = null; - }).overridePythonAttrs dropDevOutput; + }).overridePythonAttrs dropDocOutput; pydash = (super.pydash.override { sphinx-rtd-theme = null; }).overridePythonAttrs (old: rec { @@ -155,6 +163,10 @@ let format = "setuptools"; doCheck = false; }); + pyopenssl = (super.pyopenssl.override { + sphinxHook = null; + sphinx-rtd-theme = null; + }).overridePythonAttrs dropDocOutput; }; }; in @@ -170,6 +182,14 @@ python3'.pkgs.buildPythonPackage rec { fetchSubmodules = true; }; + patches = [ + # https://github.com/privacyidea/privacyidea/pull/3611 + (fetchpatch { + url = "https://github.com/privacyidea/privacyidea/commit/7db6509721726a34e8528437ddbd4210019b11ef.patch"; + sha256 = "sha256-ZvtauCs1vWyxzGbA0B2+gG8q5JyUO8DF8nm/3/vcYmE="; + }) + ]; + propagatedBuildInputs = with python3'.pkgs; [ cryptography pyrad pymysql python-dateutil flask-versioned flask_script defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow From 000000012c7b4b29573b6e5611285a62bd191f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Wed, 10 May 2023 17:00:50 +0100 Subject: [PATCH 129/175] python310Packages.py-sr25519-bindings: 0.2.0 -> unstable-2023-03-15 --- .../py-sr25519-bindings/Cargo.lock | 522 ------------------ .../py-sr25519-bindings/default.nix | 16 +- 2 files changed, 7 insertions(+), 531 deletions(-) delete mode 100644 pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock diff --git a/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock b/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock deleted file mode 100644 index 0a31c382b1d4..000000000000 --- a/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock +++ /dev/null @@ -1,522 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "curve25519-dalek-ng" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" -dependencies = [ - "byteorder", - "digest", - "rand_core", - "subtle-ng", - "zeroize", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "ghost" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "hex-literal" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" - -[[package]] -name = "indoc" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -dependencies = [ - "indoc-impl", - "proc-macro-hack", -] - -[[package]] -name = "indoc-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", - "unindent", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "inventory" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb5160c60ba1e809707918ee329adb99d222888155835c6feedba19f6c3fd4" -dependencies = [ - "ctor", - "ghost", - "inventory-impl", -] - -[[package]] -name = "inventory-impl" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e41b53715c6f0c4be49510bb82dee2c1e51c8586d885abe65396e82ed518548" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "keccak" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" -dependencies = [ - "cpufeatures", -] - -[[package]] -name = "libc" -version = "0.2.139" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "merlin" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" -dependencies = [ - "byteorder", - "keccak", - "rand_core", - "zeroize", -] - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "py-sr25519-bindings" -version = "0.2.0" -dependencies = [ - "hex-literal", - "pyo3", - "schnorrkel", -] - -[[package]] -name = "pyo3" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca8710ffa8211c9a62a8a3863c4267c710dc42a82a7fd29c97de465d7ea6b7d" -dependencies = [ - "ctor", - "indoc", - "inventory", - "libc", - "parking_lot", - "paste", - "pyo3cls", - "unindent", -] - -[[package]] -name = "pyo3-derive-backend" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad070bf6967b0d29ea74931ffcf9c6bbe8402a726e9afbeafadc0a287cc2b3" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pyo3cls" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fa17e1ea569d0bf3b7c00f2a9eea831ca05e55dd76f1794c541abba1c64baa" -dependencies = [ - "pyo3-derive-backend", - "quote", - "syn", -] - -[[package]] -name = "quote" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "schnorrkel" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d" -dependencies = [ - "arrayref", - "arrayvec", - "curve25519-dalek-ng", - "merlin", - "rand_core", - "serde_bytes", - "sha2", - "subtle-ng", - "zeroize", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "serde" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" - -[[package]] -name = "serde_bytes" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" -dependencies = [ - "serde", -] - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer", - "cfg-if", - "cpufeatures", - "digest", - "opaque-debug", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "subtle-ng" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" - -[[package]] -name = "syn" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "unicode-ident" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unindent" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "zeroize" -version = "1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] diff --git a/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/pkgs/development/python-modules/py-sr25519-bindings/default.nix index caa7708b8b41..c001344a293b 100644 --- a/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-sr25519-bindings"; - version = "0.2.0"; + version = "unstable-2023-03-15"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,18 +19,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "polkascan"; repo = "py-sr25519-bindings"; - rev = "refs/tags/v${version}"; - hash = "sha256-Lu3J0+YeQHHKItOZTT24DlQAUJuE9fd+py6Eb46/MSE="; + rev = "9127501235bf291d7f14f00ec373d0a5000a32cb"; + hash = "sha256-mxNmiFvMbV9WQhGNIQXxTkOcJHYs0vyOPM6Nd5367RE="; }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-7fDlEYWOiRVpG3q0n3ZSS1dfNCOh0/4pX/PbcDBvoMI="; }; - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook From c9afbdece3afd29b311a6efde45ed7fe23f7bc72 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 11 May 2023 10:48:22 +0200 Subject: [PATCH 130/175] ocamlPackages.zed: use Dune 3 --- pkgs/development/ocaml-modules/zed/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index db9efd22749f..2922a57244b9 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -7,14 +7,12 @@ let { version = "3.2.0"; sha256 = "sha256-6yKHE30nVFXo8hGdCx+GO4VYYGbi802aMdN2XuYMJ7w="; - duneVersion = "3"; propagatedBuildInputs = [ react result uchar uutf uucp uuseg ]; } else { version = "3.1.0"; sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"; - duneVersion = "2"; propagatedBuildInputs = [ charInfo_width react ]; }; in @@ -22,7 +20,9 @@ in buildDunePackage rec { pname = "zed"; - inherit (switch) version duneVersion propagatedBuildInputs; + inherit (switch) version propagatedBuildInputs; + + duneVersion = "3"; src = fetchFromGitHub { owner = "ocaml-community"; From ff82756d5368f84a90d6045a35ac31431745219c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 11 May 2023 10:48:28 +0200 Subject: [PATCH 131/175] ocamlPackages.charInfo_width: use Dune 3 --- pkgs/development/ocaml-modules/charInfo_width/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/charInfo_width/default.nix b/pkgs/development/ocaml-modules/charInfo_width/default.nix index 5b9814cea69a..aaf181104548 100644 --- a/pkgs/development/ocaml-modules/charInfo_width/default.nix +++ b/pkgs/development/ocaml-modules/charInfo_width/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "charInfo_width"; version = "1.1.0"; - useDune2 = true; + duneVersion = "3"; src = fetchzip { url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2"; sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w"; From a296146f8059963d918c39e4887f235efe30c5a5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 11 May 2023 12:30:10 +0300 Subject: [PATCH 132/175] framac: fix build --- pkgs/development/tools/analysis/frama-c/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 491da08310bf..6652ee134f92 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, writeText +{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, writeText , graphviz, doxygen , ocamlPackages, ltl2ba, coq, why3 , gdk-pixbuf, wrapGAppsHook @@ -53,6 +53,14 @@ stdenv.mkDerivation rec { hash = "sha256-UT7ajIyu8e5vzrz2oBKDDrtZqUacgUP/TRi0/kz9Qkg="; }; + patches = [ + (fetchpatch { + name = "fixes-yojson-2_1-support.patch"; + url = "https://git.frama-c.com/pub/frama-c/-/commit/647eace02ed8dac46e75452898c3470f82576818.patch"; + hash = "sha256-XfLi4kW1Y2MCLjHHQZAD8DvXvfZuDH3OKd9hlTV0XCw="; + }) + ]; + postConfigure = "patchShebangs src/plugins/eva/gen-api.sh"; strictDeps = true; From 1a90b006ca54c761bdf5e3855eda42b189a5d93d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 May 2023 11:49:15 +0200 Subject: [PATCH 133/175] element-{desktop,web}: 1.11.30 -> 1.11.31 --- .../networking/instant-messengers/element/pin.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index c8ffd9d130d0..0cb0dfb5993b 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.30"; + "version" = "1.11.31"; "hashes" = { - "desktopSrcHash" = "WICzS+KARX+Z4vfBqBd13wtNB7m18rsXJsFey/MnST0="; - "desktopYarnHash" = "0rm0rghd2piaxhf7jvxs6rd6yykgdm8d2a7rxqc9m9xjklxdf6nj"; - "webSrcHash" = "5o1DEVtkx4PYYRXYdyjVOlkvbQSc9/an5DshARTJTR4="; - "webYarnHash" = "0bg5vc7q8afqfpsaqqkczf9whbzici5d2bxj5cadhrlmlb27f8nx"; + "desktopSrcHash" = "urCMClvyJx6e0UXDAcZysZvw3Qb6cnPjiy/aR4Uqtzs="; + "desktopYarnHash" = "1yrdg7fn533qg6wzg99s2si68nlzgvp9wiyallq0s2b665bznqxj"; + "webSrcHash" = "eVZ3SaUqM2YQehQNIS5kVQ98HrNwovYsZwHCndCcFa4="; + "webYarnHash" = "0xzwvhpvxzslvcybyn3si91fyi6a7xnrgib5dj6v5lcha1xd32w7"; }; } From 5525a97401bc061ad5bed4548e87376e8e0b09e8 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 11 May 2023 12:14:08 +0200 Subject: [PATCH 134/175] swaynotificationcenter: set meta.mainProgram --- pkgs/applications/misc/swaynotificationcenter/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix index 41a065349c4e..e9d9a9ef3872 100644 --- a/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: rec { changelog = "https://github.com/ErikReider/SwayNotificationCenter/releases/tag/v${version}"; license = licenses.gpl3; platforms = platforms.linux; + mainProgram = "swaync"; maintainers = with maintainers; [ berbiche pedrohlc ]; }; }) From 7dbb6f304895153b373677b7e21841b94dc3e897 Mon Sep 17 00:00:00 2001 From: Emil Nikolov Date: Thu, 11 May 2023 12:19:02 +0200 Subject: [PATCH 135/175] popcorntime: fix desktop launcher item (#201657) * popcorntime: fix desktop launcher item --- pkgs/applications/video/popcorntime/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix index 33d42ca124aa..a12171772966 100644 --- a/pkgs/applications/video/popcorntime/default.nix +++ b/pkgs/applications/video/popcorntime/default.nix @@ -49,6 +49,17 @@ stdenv.mkDerivation rec { "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}" ]; + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + comment = meta.description; + genericName = meta.description; + type = "Application"; + desktopName = "Popcorn-Time"; + categories = [ "Video" "AudioVideo" ]; + }; + # Extract and copy executable in $out/bin installPhase = '' mkdir -p $out/share/applications $out/bin $out/opt/bin $out/share/icons/hicolor/scalable/apps/ @@ -60,6 +71,8 @@ stdenv.mkDerivation rec { ln -s $out/opt/popcorntime/Popcorn-Time $out/bin/popcorntime ln -s $out/opt/popcorntime/src/app/images/icon.png $out/share/icons/hicolor/scalable/apps/popcorntime.png + + ln -s ${desktopItem}/share/applications/popcorntime.desktop $out/share/applications/popcorntime.desktop ''; # GSETTINGS_SCHEMAS_PATH is not set in installPhase From a9611f3429dde60d2fbff641892b18f0c09968d6 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 24 Apr 2023 15:24:36 +0100 Subject: [PATCH 136/175] netassert: init at 2.0.1 --- pkgs/tools/networking/netassert/default.nix | 40 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/networking/netassert/default.nix diff --git a/pkgs/tools/networking/netassert/default.nix b/pkgs/tools/networking/netassert/default.nix new file mode 100644 index 000000000000..aaa060b28707 --- /dev/null +++ b/pkgs/tools/networking/netassert/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "netassert"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "controlplaneio"; + repo = "netassert"; + rev = "v${version}"; + hash = "sha256-bKfqSyG6YXrkHqja8f9R+49mdwOKM5NJuRrcKj7QDj8="; + }; + vendorHash = "sha256-nDnSJOfEn9KieDwdNeIGFcI4m8rVU+Yaxwa+dKyNSHM="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${src.rev}" + ]; + + postBuild = '' + mv $GOPATH/bin/{cli,netassert} + ''; + + meta = with lib; { + homepage = "https://github.com/controlplaneio/netassert"; + changelog = "https://github.com/controlplaneio/netassert/blob/${src.rev}/CHANGELOG.md"; + description = "A command line utility to test network connectivity between kubernetes objects"; + longDescription = '' + NetAssert is a command line utility to test network connectivity between kubernetes objects. + It currently supports Deployment, Pod, Statefulset and Daemonset. + You can check the traffic flow between these objects or from these objects to a remote host or an IP address. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c7ca50ec0db..f3a7db58c309 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10259,6 +10259,8 @@ with pkgs; ndisc6 = callPackage ../tools/networking/ndisc6 { }; + netassert = callPackage ../tools/networking/netassert { }; + netboot = callPackage ../tools/networking/netboot { }; netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { }; From 537d611a75e375716a5a0e75ad50190f082da743 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 May 2023 23:04:17 +0200 Subject: [PATCH 137/175] nixos/sshd: Remove algorithms that do MAC-then-encrypt Algorithms with the -etm suffix calculate the MAC after encryption, which is generally considered safer. --- nixos/modules/services/networking/ssh/sshd.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 89ddf8215299..fd9650a058c2 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -365,9 +365,6 @@ in "hmac-sha2-512-etm@openssh.com" "hmac-sha2-256-etm@openssh.com" "umac-128-etm@openssh.com" - "hmac-sha2-512" - "hmac-sha2-256" - "umac-128@openssh.com" ]; description = lib.mdDoc '' Allowed MACs From bd7c4e7b367253072b3e06d5dd8c7dbd805c8624 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 11 May 2023 14:17:40 +0300 Subject: [PATCH 138/175] clang16Stdenv: init --- pkgs/os-specific/darwin/apple-sdk-11.0/default.nix | 2 +- pkgs/top-level/aliases.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 1133cca002a8..e4cc740ba1e7 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -70,7 +70,7 @@ let stdenv = mkStdenv stdenv; } // builtins.listToAttrs (map (v: { name = "clang${v}Stdenv"; value = mkStdenv pkgs."llvmPackages_${v}".stdenv; }) - [ "12" "13" "14" "15" ] + [ "12" "13" "14" "15" "16" ] ); callPackage = newScope (packages // pkgs.darwin // { inherit MacOSX-SDK; }); diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c22d2e9f65cd..d0c6d2df6707 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -236,6 +236,7 @@ mapAliases ({ clang13Stdenv = lowPrio llvmPackages_13.stdenv; clang14Stdenv = lowPrio llvmPackages_14.stdenv; clang15Stdenv = lowPrio llvmPackages_15.stdenv; + clang16Stdenv = lowPrio llvmPackages_16.stdenv; clangAnalyzer = throw "'clangAnalyzer' has been renamed to/replaced by 'clang-analyzer'"; # Converted to throw 2022-02-22 clasp = clingo; # added 2022-12-22 From 2dace638c971ad6190c59bc824a56915679aeb90 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 11 May 2023 20:35:48 +1000 Subject: [PATCH 139/175] python3Packages.assay: mark broken on python >= 3.11 https://github.com/brandon-rhodes/assay/issues/15 --- pkgs/development/python-modules/assay/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/assay/default.nix b/pkgs/development/python-modules/assay/default.nix index 37c4ccc9392f..881c4bbf730e 100644 --- a/pkgs/development/python-modules/assay/default.nix +++ b/pkgs/development/python-modules/assay/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonAtLeast }: buildPythonPackage rec { pname = "assay"; @@ -18,5 +18,6 @@ buildPythonPackage rec { description = "Attempt to write a Python testing framework I can actually stand"; license = licenses.mit; maintainers = with maintainers; [ zane ]; + broken = pythonAtLeast "3.11"; }; } From 86d5f06a67cf51898107ef6f2d7c4415cd856ed1 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 11 May 2023 20:31:18 +1000 Subject: [PATCH 140/175] python3Packages.skyfield: disable tests on python >= 3.11 --- pkgs/development/python-modules/skyfield/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix index 73e6ea9ed041..f56a7c8aad56 100644 --- a/pkgs/development/python-modules/skyfield/default.nix +++ b/pkgs/development/python-modules/skyfield/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, certifi, numpy, sgp4, jplephem +{ lib, buildPythonPackage, pythonOlder, fetchFromGitHub, certifi, numpy, sgp4, jplephem , pandas, ipython, matplotlib, assay }: @@ -17,6 +17,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pandas ipython matplotlib assay ]; + # assay is broken on Python >= 3.11 + # https://github.com/brandon-rhodes/assay/issues/15 + doCheck = pythonOlder "3.11"; + checkPhase = '' runHook preCheck From 34ed5eaaecf3f87b48d121823942a50de97044ce Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 11 May 2023 21:03:40 +1000 Subject: [PATCH 141/175] python3Packages.skyfield: 1.42 -> 1.45 --- pkgs/development/python-modules/skyfield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix index f56a7c8aad56..514ef4c00d18 100644 --- a/pkgs/development/python-modules/skyfield/default.nix +++ b/pkgs/development/python-modules/skyfield/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "skyfield"; - version = "1.42"; + version = "1.45"; src = fetchFromGitHub { owner = "skyfielders"; repo = "python-skyfield"; rev = version; - hash = "sha256-aoSkuLhZcEy+13EJQOBHV2/rgmN6aZQHqfj4OOirOG0="; + hash = "sha256-kZrXNVE+JGPGiVsd6CTwOqfciYLsD2A4pTS3FpqO+Dk="; }; propagatedBuildInputs = [ certifi numpy sgp4 jplephem ]; From 75acbc190e872cd72e7f8e785ca1d39d2c0aa1f0 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 11 May 2023 21:07:05 +1000 Subject: [PATCH 142/175] python3Packages.skyfield: work-around broken tests on aarch64 --- pkgs/development/python-modules/skyfield/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix index 514ef4c00d18..9b6d92e217d6 100644 --- a/pkgs/development/python-modules/skyfield/default.nix +++ b/pkgs/development/python-modules/skyfield/default.nix @@ -13,6 +13,13 @@ buildPythonPackage rec { hash = "sha256-kZrXNVE+JGPGiVsd6CTwOqfciYLsD2A4pTS3FpqO+Dk="; }; + # Fix broken tests on "exotic" platforms. + # https://github.com/skyfielders/python-skyfield/issues/582#issuecomment-822033858 + postPatch = '' + substituteInPlace skyfield/tests/test_planetarylib.py \ + --replace "if IS_32_BIT" "if True" + ''; + propagatedBuildInputs = [ certifi numpy sgp4 jplephem ]; nativeCheckInputs = [ pandas ipython matplotlib assay ]; From ac203678995755284471f98ce5e884f44e7429d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 11:44:55 +0000 Subject: [PATCH 143/175] python310Packages.azure-mgmt-datafactory: 3.0.0 -> 3.1.0 --- .../python-modules/azure-mgmt-datafactory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 8104cfd34029..735bcba46c37 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-aVfH65fJnsTSr0MR0Fr5yamxIOv2+aST953uCr7QXOk="; + hash = "sha256-lsOUxDoXocf1fUIcY4q74/vd86LO7yumJg7rJ6i3zcg="; }; propagatedBuildInputs = [ From 403c30813f249a54a5013562e6e923349a7fc3db Mon Sep 17 00:00:00 2001 From: Tomas Kala Date: Wed, 10 May 2023 14:39:53 +0200 Subject: [PATCH 144/175] maintainers: add tomaskala --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c666365beca0..287e1418b336 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15901,6 +15901,12 @@ githubId = 8577941; name = "Kevin Rauscher"; }; + tomaskala = { + email = "public+nixpkgs@tomaskala.com"; + github = "tomaskala"; + githubId = 7727887; + name = "Tomas Kala"; + }; tomberek = { email = "tomberek@gmail.com"; matrix = "@tomberek:matrix.org"; From 8b2d1e455452186f2f7aa57d14d289bc9894a52b Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 11 May 2023 14:31:21 +0200 Subject: [PATCH 145/175] nixos/tests/gitlab.nix: Document running it `nix-build $file` is not possible anymore, so this helps both newcomers and old hands. It's documented in the manual, but that's far away. --- nixos/tests/gitlab.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index ff10d3de812a..672b497e7ec6 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -6,6 +6,9 @@ # - Creating Merge Requests and merging them # - Opening and closing issues. # - Downloading repository archives as tar.gz and tar.bz2 +# Run with +# [nixpkgs]$ nix-build -A nixosTests.gitlab + { pkgs, lib, ... }: with lib; From f7e248bb6a3ce52fbaa848e62da709e0111a4f38 Mon Sep 17 00:00:00 2001 From: QJoly Date: Thu, 11 May 2023 08:07:39 +0200 Subject: [PATCH 146/175] kubefirst: init at 2.0.8 doCheck under ldflags Fix lint --- .../networking/cluster/kubefirst/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kubefirst/default.nix diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix new file mode 100644 index 000000000000..c90460d1692b --- /dev/null +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubefirst"; + version = "2.0.8"; + + src = fetchFromGitHub { + owner = "kubefirst"; + repo = pname; + rev = "v${version}"; + hash = "sha256-JGseXRUehRuH1kuTfmkAJcfRN3vM0zN7K8pnOfJ0LAs="; + }; + + vendorHash = "sha256-Sc6HXJXkZ9vW6sxEKCTo6LDHeOGLTz0oN9JH11iUA/k="; + + ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"]; + + doCheck = false; + + meta = with lib; { + description = "The Kubefirst CLI creates instant GitOps platforms that integrate some of the best tools in cloud native from scratch."; + homepage = "https://github.com/kubefirst/kubefirst/"; + license = licenses.mit; + maintainers = with maintainers; [ qjoly ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8b6ffab9979..451510d3f496 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31653,6 +31653,8 @@ with pkgs; kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; + kubefirst = callPackage ../applications/networking/cluster/kubefirst { }; + kube-score = callPackage ../applications/networking/cluster/kube-score { }; kubectl-evict-pod = callPackage ../applications/networking/cluster/kubectl-evict-pod { From 485eb94007ddc068fd3e8b3cc0882ed1658145a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 13:58:53 +0000 Subject: [PATCH 147/175] cmctl: 1.11.1 -> 1.11.2 --- pkgs/applications/networking/cluster/cmctl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 9f313f3ae1bc..ab4789741fbf 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cmctl"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; - rev = "e3a2a803e8ed7f8a88d5f535d6e9a061c1571194"; - sha256 = "0484dh520plgmrv39lbih44z1dz0r3sf115kqvcpfmg13b0328d0"; + rev = "4767427a40e0e193c976fd6bc228f50de8950572"; + sha256 = "128s5vd4hp5mr0rnb21grzmijzx0ibpv71as36dcgw7z4v3gq7lx"; }; - vendorSha256 = "sha256-tKvvqYGwLEoSfGzBRLx8xC/0Kz1uLmHYQ+gcHOW+550="; + vendorSha256 = "sha256-+r0QpD97r6dokUr07Qjb9kvoK+oz2rvml0cIebtYuHg="; subPackages = [ "cmd/ctl" ]; From b213791e7e85ced036ac1f8c41ef07e53d89e83a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 7 May 2023 15:44:54 +0200 Subject: [PATCH 148/175] nixos/all-tests.nix: Add readOnlyPkgs module --- nixos/lib/testing/nodes.nix | 1 + nixos/tests/all-tests.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index e9649e724c35..5a6b30b8f8d5 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -17,6 +17,7 @@ let virtualisation.qemu.package = testModuleArgs.config.qemu.package; }) ({ + key = "nodes.nix-pkgs"; config = { # Ensure we do not use aliases. Ideally this is only set # when the test framework is used by Nixpkgs NixOS tests. diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5dd39c9b142f..643162a2d863 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -65,6 +65,27 @@ let runTestOn ; + # Using a single instance of nixpkgs makes test evaluation faster. + # To make sure we don't accidentally depend on a modified pkgs, we make the + # related options read-only. We need to test the right configuration. + # + # If your service depends on a nixpkgs setting, first try to avoid that, but + # otherwise, you can remove the readOnlyPkgs import and test your service as + # usual. + readOnlyPkgs = + # TODO: We currently accept this for nixosTests, so that the `pkgs` argument + # is consistent with `pkgs` in `pkgs.nixosTests`. Can we reinitialize + # it with `allowAliases = false`? + # warnIf pkgs.config.allowAliases "nixosTests: pkgs includes aliases." + { + _class = "nixosTest"; + defaults = { + nixpkgs.pkgs = pkgs; + imports = [ ../modules/misc/nixpkgs/read-only.nix ]; + disabledModules = [{ key = "nodes.nix-pkgs"; }]; + }; + }; + in { # Testing the test driver From d0b0f9e441c70253ea4ba42162b5e60057ba6883 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 7 May 2023 15:45:11 +0200 Subject: [PATCH 149/175] nixosTests.acme: Use a read-only pkgs This speeds up evaluation by a factor 2. Ballpark figures from my machine: ``` $ time nix-build nixos/release.nix -A tests.acme /nix/store/q4fxp55k64clcarsx8xc8f6s10szlfvz-vm-test-run-acme /nix/store/lnfqg051sxx05hclva84bcbnjfc71c8x-vm-test-run-acme real 1m28.142s user 1m7.474s sys 0m7.932s $ time nix-build nixos/release.nix -A tests.acme /nix/store/q4fxp55k64clcarsx8xc8f6s10szlfvz-vm-test-run-acme /nix/store/lnfqg051sxx05hclva84bcbnjfc71c8x-vm-test-run-acme real 0m38.235s user 0m33.814s sys 0m2.283s ``` --- nixos/tests/all-tests.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 643162a2d863..9abe419b1c03 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -98,7 +98,7 @@ in { _3proxy = runTest ./3proxy.nix; aaaaxy = runTest ./aaaaxy.nix; - acme = runTest ./acme.nix; + acme = runTest { imports = [ ./acme.nix readOnlyPkgs ]; }; adguardhome = runTest ./adguardhome.nix; aesmd = runTestOn ["x86_64-linux"] ./aesmd.nix; agate = runTest ./web-servers/agate.nix; From f659db7ba28e8474df72cb505c790ff2cf92c1a4 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 7 May 2023 17:10:40 +0200 Subject: [PATCH 150/175] nixos/testing: Add node.pkgs option By factoring out this logic, it's easier for other projects to make use of it this optimization too (and do it correctly). --- nixos/lib/testing/nodes.nix | 22 +++++++++++++++++++++- nixos/tests/all-tests.nix | 6 +----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index 5a6b30b8f8d5..d1238a374f24 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -1,7 +1,7 @@ testModuleArgs@{ config, lib, hostPkgs, nodes, ... }: let - inherit (lib) mkOption mkForce optional types mapAttrs mkDefault mdDoc; + inherit (lib) mkOption mkForce optional types mapAttrs mkDefault mkIf mdDoc; baseOS = import ../eval-config.nix { @@ -72,6 +72,19 @@ in default = { }; }; + node.pkgs = mkOption { + description = mdDoc '' + The Nixpkgs to use for the nodes. + + Setting this will make the `nixpkgs.*` options read-only, to avoid mistakenly testing with a Nixpkgs configuration that diverges from regular use. + ''; + type = types.nullOr types.pkgs; + default = null; + defaultText = literalMD '' + `null`, so construct `pkgs` according to the `nixpkgs.*` options as usual. + ''; + }; + node.specialArgs = mkOption { type = types.lazyAttrsOf types.raw; default = { }; @@ -104,5 +117,12 @@ in config.nodes; passthru.nodes = config.nodesCompat; + + defaults = mkIf (config.node.pkgs != null) { + nixpkgs.pkgs = config.node.pkgs; + imports = [ ../../modules/misc/nixpkgs/read-only.nix ]; + disabledModules = [{ key = "nodes.nix-pkgs"; }]; + }; + }; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9abe419b1c03..ccdd572e5ece 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -79,11 +79,7 @@ let # warnIf pkgs.config.allowAliases "nixosTests: pkgs includes aliases." { _class = "nixosTest"; - defaults = { - nixpkgs.pkgs = pkgs; - imports = [ ../modules/misc/nixpkgs/read-only.nix ]; - disabledModules = [{ key = "nodes.nix-pkgs"; }]; - }; + node.pkgs = pkgs; }; in { From 0f83261f0e2ccfa116076d1848550d1b6bccc852 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 7 May 2023 17:39:08 +0200 Subject: [PATCH 151/175] nixos/testing: Add node.pkgsReadOnly escape hatch By adding this option indirection, a test can declare all by itself that it needs a custom nixpkgs. This is a more convenient way of going about this when the caller of the test framework receives a `node.pkgs` unconditionally. --- nixos/lib/testing/nodes.nix | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index d1238a374f24..0197097e8884 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -1,7 +1,17 @@ testModuleArgs@{ config, lib, hostPkgs, nodes, ... }: let - inherit (lib) mkOption mkForce optional types mapAttrs mkDefault mkIf mdDoc; + inherit (lib) + literalExpression + literalMD + mapAttrs + mdDoc + mkDefault + mkIf + mkOption mkForce + optional + types + ; baseOS = import ../eval-config.nix { @@ -85,6 +95,17 @@ in ''; }; + node.pkgsReadOnly = mkOption { + description = mdDoc '' + Whether to make the `nixpkgs.*` options read-only. This is only relevant when [`node.pkgs`](#test-opt-node.pkgs) is set. + + Set this to `false` when any of the [`nodes`](#test-opt-nodes) needs to configure any of the `nixpkgs.*` options. This will slow down evaluation of your test a bit. + ''; + type = types.bool; + default = config.node.pkgs != null; + defaultText = literalExpression ''node.pkgs != null''; + }; + node.specialArgs = mkOption { type = types.lazyAttrsOf types.raw; default = { }; @@ -118,7 +139,7 @@ in passthru.nodes = config.nodesCompat; - defaults = mkIf (config.node.pkgs != null) { + defaults = mkIf config.node.pkgsReadOnly { nixpkgs.pkgs = config.node.pkgs; imports = [ ../../modules/misc/nixpkgs/read-only.nix ]; disabledModules = [{ key = "nodes.nix-pkgs"; }]; From b0e17891f2d27c2661a5b7a03d77bfec64b508e4 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 7 May 2023 17:47:29 +0200 Subject: [PATCH 152/175] nixos/testing/nodes.nix: Do not rely on disabledModules It's just not necessary. --- nixos/lib/testing/nodes.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index 0197097e8884..6e439fd814db 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -10,6 +10,7 @@ let mkIf mkOption mkForce optional + optionalAttrs types ; @@ -26,7 +27,7 @@ let { virtualisation.qemu.package = testModuleArgs.config.qemu.package; }) - ({ + (optionalAttrs (!config.node.pkgsReadOnly) { key = "nodes.nix-pkgs"; config = { # Ensure we do not use aliases. Ideally this is only set @@ -142,7 +143,6 @@ in defaults = mkIf config.node.pkgsReadOnly { nixpkgs.pkgs = config.node.pkgs; imports = [ ../../modules/misc/nixpkgs/read-only.nix ]; - disabledModules = [{ key = "nodes.nix-pkgs"; }]; }; }; From 9e7fbfbaff750d12bc89e6c193bcdbdd1c266a27 Mon Sep 17 00:00:00 2001 From: MakiseKurisu Date: Thu, 11 May 2023 22:25:07 +0800 Subject: [PATCH 153/175] ch9344: fix build on Linux 6.3 --- pkgs/os-specific/linux/ch9344/default.nix | 3 +++ .../ch9344/fix-incompatible-pointer-types_6_3.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types_6_3.patch diff --git a/pkgs/os-specific/linux/ch9344/default.nix b/pkgs/os-specific/linux/ch9344/default.nix index 25d7ecf02552..8f258d227bb1 100644 --- a/pkgs/os-specific/linux/ch9344/default.nix +++ b/pkgs/os-specific/linux/ch9344/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { patches = lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.1") [ # https://github.com/torvalds/linux/commit/a8c11c1520347be74b02312d10ef686b01b525f1 ./fix-incompatible-pointer-types.patch + ] ++ lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.3") [ + # https://github.com/torvalds/linux/commit/5d420399073770134d2b03e004b2c0201c7fa26f + ./fix-incompatible-pointer-types_6_3.patch ]; sourceRoot = "${src.name}/driver"; diff --git a/pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types_6_3.patch b/pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types_6_3.patch new file mode 100644 index 000000000000..b4cf265daac9 --- /dev/null +++ b/pkgs/os-specific/linux/ch9344/fix-incompatible-pointer-types_6_3.patch @@ -0,0 +1,13 @@ +diff --git a/ch9344.c b/ch9344.c +index a16af82..8922ed9 100644 +--- a/ch9344.c ++++ b/ch9344.c +@@ -774,7 +774,7 @@ static inline void *tty_get_portdata(struct ch9344_ttyport *port) + return (port->portdata); + } + +-static void ch9344_port_dtr_rts(struct tty_port *port, int raise) ++static void ch9344_port_dtr_rts(struct tty_port *port, bool raise) + { + struct ch9344_ttyport *ttyport = container_of(port, struct ch9344_ttyport, port); + struct ch9344 *ch9344 = tty_get_portdata(ttyport); From 16e3647337b4cacb8f9200d4e2dfbf2f0ba87a98 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 7 May 2023 19:25:33 +0200 Subject: [PATCH 154/175] nixos/all-tests: Enable readOnlyPkgs by default for runTest Most tests are not affected by this because they use the `handleTest` function instead. --- nixos/tests/all-tests.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ccdd572e5ece..ae21f60c03dc 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -46,7 +46,7 @@ let inherit (rec { doRunTest = arg: ((import ../lib/testing-python.nix { inherit system pkgs; }).evalTest { - imports = [ arg ]; + imports = [ arg readOnlyPkgs ]; }).config.result; findTests = tree: if tree?recurseForDerivations && tree.recurseForDerivations @@ -94,7 +94,7 @@ in { _3proxy = runTest ./3proxy.nix; aaaaxy = runTest ./aaaaxy.nix; - acme = runTest { imports = [ ./acme.nix readOnlyPkgs ]; }; + acme = runTest ./acme.nix; adguardhome = runTest ./adguardhome.nix; aesmd = runTestOn ["x86_64-linux"] ./aesmd.nix; agate = runTest ./web-servers/agate.nix; From 64d505e2273e0b1df1e019c506a2e28aa9289bc9 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 11 May 2023 18:03:14 +0300 Subject: [PATCH 155/175] nixos/tests/harmonia: check if settings work --- nixos/tests/harmonia.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/harmonia.nix b/nixos/tests/harmonia.nix index 3057caf70160..6cf9ad4d2335 100644 --- a/nixos/tests/harmonia.nix +++ b/nixos/tests/harmonia.nix @@ -8,6 +8,7 @@ services.harmonia = { enable = true; signKeyPath = pkgs.writeText "cache-key" "cache.example.com-1:9FhO0w+7HjZrhvmzT1VlAZw4OSAlFGTgC24Seg3tmPl4gZBdwZClzTTHr9cVzJpwsRSYLTu7hEAQe3ljy92CWg=="; + settings.priority = 35; }; networking.firewall.allowedTCPPorts = [ 5000 ]; @@ -26,7 +27,8 @@ start_all() harmonia.wait_for_unit("harmonia.service") - client01.wait_until_succeeds("curl -f http://harmonia:5000/nix-cache-info") + + client01.wait_until_succeeds("curl -f http://harmonia:5000/nix-cache-info | grep '${toString nodes.harmonia.services.harmonia.settings.priority}' >&2") client01.succeed("curl -f http://harmonia:5000/version | grep '${nodes.harmonia.services.harmonia.package.version}' >&2") client01.succeed("cat /etc/nix/nix.conf >&2") From f02865c040a2b279bdd4a12c8dba12159009e90d Mon Sep 17 00:00:00 2001 From: Tomas Kala Date: Wed, 10 May 2023 14:32:35 +0200 Subject: [PATCH 156/175] aws-secretsmanager-caching: init at 1.1.1.5 --- .../aws-secretsmanager-caching/default.nix | 63 +++++++++++++++++++ .../remove-coverage-tests.patch | 14 +++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 79 insertions(+) create mode 100644 pkgs/development/python-modules/aws-secretsmanager-caching/default.nix create mode 100644 pkgs/development/python-modules/aws-secretsmanager-caching/remove-coverage-tests.patch diff --git a/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix b/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix new file mode 100644 index 000000000000..95343fbf373d --- /dev/null +++ b/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools-scm +, botocore +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aws_secretsmanager_caching"; + version = "1.1.1.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "5cee2762bb89b72f3e5123feee8e45fbe44ffe163bfca08b28f27b2e2b7772e1"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + botocore + ]; + + patches = [ + # Remove coverage tests from the pytest invocation in setup.cfg. + ./remove-coverage-tests.patch + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # Integration tests require networking. + "test/integ" + ]; + + pythonImportsCheck = [ + "aws_secretsmanager_caching" + ]; + + meta = with lib; { + description = "Client-side AWS secrets manager caching library"; + homepage = "https://github.com/aws/aws-secretsmanager-caching-python"; + changelog = "https://github.com/aws/aws-secretsmanager-caching-python/releases/tag/v${version}"; + longDescription = '' + The AWS Secrets Manager Python caching client enables in-process caching of secrets for Python applications. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ tomaskala ]; + }; +} diff --git a/pkgs/development/python-modules/aws-secretsmanager-caching/remove-coverage-tests.patch b/pkgs/development/python-modules/aws-secretsmanager-caching/remove-coverage-tests.patch new file mode 100644 index 000000000000..57af75dcb4fa --- /dev/null +++ b/pkgs/development/python-modules/aws-secretsmanager-caching/remove-coverage-tests.patch @@ -0,0 +1,14 @@ +diff --git a/setup.cfg b/setup.cfg +index 5aa81b2..0c02ded 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -3,9 +3,6 @@ xfail_strict = true + addopts = + --verbose + --doctest-modules +- --cov aws_secretsmanager_caching +- --cov-fail-under 90 +- --cov-report term-missing + --ignore doc/ + + [aliases] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e3021fe6a9b..f35b6f8addd1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -869,6 +869,8 @@ self: super: with self; { aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { }; + aws-secretsmanager-caching = callPackage ../development/python-modules/aws-secretsmanager-caching { }; + aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; awscrt = callPackage ../development/python-modules/awscrt { From a99852ad181f2399983dd9ac60798cf89ef3b711 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 11 May 2023 13:36:05 +0200 Subject: [PATCH 157/175] lldap: build frontend from source Co-authored-by: Emily Lange --- pkgs/servers/ldap/lldap/default.nix | 127 +++++++++++++++++++--------- 1 file changed, 87 insertions(+), 40 deletions(-) diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix index 50249e9dbe45..c4c6e1cc4384 100644 --- a/pkgs/servers/ldap/lldap/default.nix +++ b/pkgs/servers/ldap/lldap/default.nix @@ -1,68 +1,115 @@ -{ fetchFromGitHub +{ binaryen +, fetchFromGitHub +, fetchpatch , fetchzip , lib , lldap , nixosTests , rustPlatform +, stdenv +, wasm-bindgen-cli +, wasm-pack +, which }: let - # We cannot build the wasm frontend from source, as the - # wasm32-unknown-unknown rustc target isn't available in nixpkgs yet. - # Tracking issue: https://github.com/NixOS/nixpkgs/issues/89426 - frontend = fetchzip { - url = "https://github.com/lldap/lldap/releases/download/v${lldap.version}/amd64-lldap.tar.gz"; - hash = "sha256-/Ml4L5Gxpnmt1pLSiLNuxtzQYjTCatsVe/hE+Btl8BI="; - name = "lldap-frontend-${lldap.version}"; - postFetch = '' - mv $out $TMPDIR/extracted - mv $TMPDIR/extracted/app $out + + # version of wasm-opt, with https://github.com/rustwasm/wasm-pack/pull/1257 backported + wasm-pack-git = wasm-pack.overrideAttrs (oldAttrs: { + version = oldAttrs.version + "-git"; + patches = [(fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/rustwasm/wasm-pack/pull/1257.patch"; + sha256 = "sha256-npi9ewh0NaD67crTcje9AYxaLLOJOMzqjqEJXZF2LbQ="; + })]; + }); + + # replace with upstream wasm rustc, after resolution of + # https://github.com/NixOS/nixpkgs/issues/89426 + rustc-wasm = (rustPlatform.rust.rustc.override { + stdenv = stdenv.override { + targetPlatform = stdenv.targetPlatform // { + parsed = { + cpu.name = "wasm32"; + vendor.name = "unknown"; + kernel.name = "unknown"; + abi.name = "unknown"; + }; + }; + }; + }).overrideAttrs (attrs: { + configureFlags = attrs.configureFlags ++ ["--set=build.docs=false"]; + }); + + commonDerivationAttrs = rec { + pname = "lldap"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "lldap"; + repo = "lldap"; + rev = "v${version}"; + hash = "sha256-FAUTykFh2eGVpx6LrCjV9xWbBPH8pCgAJv3vOXFMFZ4="; + }; + + postPatch = '' + ln -s --force ${./Cargo.lock} Cargo.lock ''; - }; -in -rustPlatform.buildRustPackage rec { - pname = "lldap"; - version = "0.4.3"; - src = fetchFromGitHub { - owner = "lldap"; - repo = "lldap"; - rev = "v${version}"; - hash = "sha256-FAUTykFh2eGVpx6LrCjV9xWbBPH8pCgAJv3vOXFMFZ4="; - }; - - # `Cargo.lock` has git dependencies, meaning can't use `cargoHash` - cargoLock = { - # 0.4.3 has been tagged before the actual Cargo.lock bump, resulting in an inconsitent lock file. - # To work around this, the Cargo.lock below is from the commit right after the tag: - # https://github.com/lldap/lldap/commit/7b4188a376baabda48d88fdca3a10756da48adda - lockFile = ./Cargo.lock; - outputHashes = { - "lber-0.4.1" = "sha256-2rGTpg8puIAXggX9rEbXPdirfetNOHWfFc80xqzPMT4="; - "opaque-ke-0.6.1" = "sha256-99gaDv7eIcYChmvOKQ4yXuaGVzo2Q6BcgSQOzsLF+fM="; - "yew_form-0.1.8" = "sha256-1n9C7NiFfTjbmc9B5bDEnz7ZpYJo9ZT8/dioRXJ65hc="; + # `Cargo.lock` has git dependencies, meaning can't use `cargoHash` + cargoLock = { + # 0.4.3 has been tagged before the actual Cargo.lock bump, resulting in an inconsitent lock file. + # To work around this, the Cargo.lock below is from the commit right after the tag: + # https://github.com/lldap/lldap/commit/7b4188a376baabda48d88fdca3a10756da48adda + lockFile = ./Cargo.lock; + outputHashes = { + "lber-0.4.1" = "sha256-2rGTpg8puIAXggX9rEbXPdirfetNOHWfFc80xqzPMT4="; + "opaque-ke-0.6.1" = "sha256-99gaDv7eIcYChmvOKQ4yXuaGVzo2Q6BcgSQOzsLF+fM="; + "yew_form-0.1.8" = "sha256-1n9C7NiFfTjbmc9B5bDEnz7ZpYJo9ZT8/dioRXJ65hc="; + }; }; }; + frontend = rustPlatform.buildRustPackage (commonDerivationAttrs // { + pname = commonDerivationAttrs.pname + "-frontend"; + + nativeBuildInputs = [ + wasm-pack-git wasm-bindgen-cli binaryen which rustc-wasm rustc-wasm.llvmPackages.lld + ]; + + buildPhase = '' + HOME=`pwd` RUSTFLAGS="-C linker=lld" ./app/build.sh + ''; + + installPhase = '' + mkdir -p $out + cp -R app/{index.html,pkg,static} $out/ + ''; + + doCheck = false; + }); + +in rustPlatform.buildRustPackage (commonDerivationAttrs // { patches = [ ./static-frontend-path.patch ]; - postPatch = '' - ln -s --force ${./Cargo.lock} Cargo.lock + postPatch = commonDerivationAttrs.postPatch + '' substituteInPlace server/src/infra/tcp_server.rs --subst-var-by frontend '${frontend}' ''; - passthru.tests = { - inherit (nixosTests) lldap; + passthru = { + inherit frontend; + tests = { + inherit (nixosTests) lldap; + }; }; meta = with lib; { description = "A lightweight authentication server that provides an opinionated, simplified LDAP interface for authentication"; homepage = "https://github.com/lldap/lldap"; - changelog = "https://github.com/lldap/lldap/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/lldap/lldap/blob/v${lldap.version}/CHANGELOG.md"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ indeednotjames ]; + maintainers = with maintainers; [ indeednotjames bendlas ]; }; -} +}) From 479076de89ccee98684841d3b115c84ef8d839d4 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 11 May 2023 12:49:45 -0400 Subject: [PATCH 158/175] python311Packages.pymedio: unbreak; enable tests --- .../python-modules/pymedio/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymedio/default.nix b/pkgs/development/python-modules/pymedio/default.nix index d7f90f9f8453..bf220a4dc248 100644 --- a/pkgs/development/python-modules/pymedio/default.nix +++ b/pkgs/development/python-modules/pymedio/default.nix @@ -3,7 +3,11 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook +, cryptography +, nibabel , numpy +, pydicom +, simpleitk }: buildPythonPackage rec { @@ -18,14 +22,20 @@ buildPythonPackage rec { hash = "sha256-iHbClOrtYkHT1Nar+5j/ig4Krya8LdQdFB4Mmm5B9bg="; }; - # relax Python dep to work with 3.10.x + # relax Python dep to work with 3.10.x and 3.11.x postPatch = '' - substituteInPlace setup.cfg --replace "!=3.10.*," "" + substituteInPlace setup.cfg --replace "!=3.10.*," "" --replace "!=3.11.*" "" ''; propagatedBuildInputs = [ numpy ]; - doCheck = false; # requires SimpleITK python package (not in Nixpkgs) + nativeCheckInputs = [ + pytestCheckHook + cryptography + nibabel + pydicom + simpleitk + ]; pythonImportsCheck = [ "pymedio" From 8989ea27780eb8a38086b707226af20bc1c3d604 Mon Sep 17 00:00:00 2001 From: Kai Norman Clasen Date: Wed, 10 May 2023 15:58:50 +0200 Subject: [PATCH 159/175] nixos/vector: add `package` Option --- nixos/modules/services/logging/vector.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/logging/vector.nix b/nixos/modules/services/logging/vector.nix index a923373d1861..f2edeabfc06f 100644 --- a/nixos/modules/services/logging/vector.nix +++ b/nixos/modules/services/logging/vector.nix @@ -8,6 +8,8 @@ in options.services.vector = { enable = mkEnableOption (lib.mdDoc "Vector"); + package = mkPackageOptionMD pkgs "vector" { }; + journaldAccess = mkOption { type = types.bool; default = false; @@ -47,7 +49,7 @@ in ''; in { - ExecStart = "${pkgs.vector}/bin/vector --config ${validateConfig conf}"; + ExecStart = "${getExe cfg.package} --config ${validateConfig conf}"; DynamicUser = true; Restart = "no"; StateDirectory = "vector"; From 3142dd9827a58824fcf1b76a0caa11efc6e7b2fb Mon Sep 17 00:00:00 2001 From: Kai Norman Clasen Date: Thu, 11 May 2023 16:50:25 +0200 Subject: [PATCH 160/175] nixosTests.vector: fix race condition --- nixos/tests/vector.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/vector.nix b/nixos/tests/vector.nix index 9309f6a14dd7..a55eb4e012c5 100644 --- a/nixos/tests/vector.nix +++ b/nixos/tests/vector.nix @@ -31,7 +31,7 @@ with pkgs.lib; # ensure vector is forwarding the messages appropriately testScript = '' machine.wait_for_unit("vector.service") - machine.succeed("test -f /var/lib/vector/logs.log") + machine.wait_for_file("/var/lib/vector/logs.log") ''; }; } From 8d311b355dfb1ee80cdb926ca8b1c837a145edcc Mon Sep 17 00:00:00 2001 From: Jack Leightcap Date: Wed, 10 May 2023 16:02:35 -0400 Subject: [PATCH 161/175] python310Packages.crc: init at 4.2.0 Signed-off-by: Jack Leightcap --- .../python-modules/crc/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/crc/default.nix diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix new file mode 100644 index 000000000000..6117ad4c5aea --- /dev/null +++ b/pkgs/development/python-modules/crc/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "crc"; + version = "4.2.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Nicoretti"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-h/RVMIJX+Lyted0FHNBcKY54EiirSclkBXCpAQSATq8="; + }; + + nativeBuildInputs = [ poetry-core ]; + + pythonImportsCheck = [ "crc" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ "test/bench" ]; + + meta = with lib; { + changelog = "https://github.com/Nicoretti/crc/releases/tag/${version}"; + description = "Python module for calculating and verifying predefined & custom CRC's"; + homepage = "https://nicoretti.github.io/crc/"; + license = licenses.bsd2; + maintainers = with maintainers; [ jleightcap ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e3021fe6a9b..933bd772f03c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2099,6 +2099,8 @@ self: super: with self; { crayons = callPackage ../development/python-modules/crayons { }; + crc = callPackage ../development/python-modules/crc { }; + crc16 = callPackage ../development/python-modules/crc16 { }; crc32c = callPackage ../development/python-modules/crc32c { }; From 8317bbe57a2b785b04aabb7ea8c520a8e8cdadd8 Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 11 May 2023 20:37:17 +0200 Subject: [PATCH 162/175] gitlab: 15.11.2 -> 15.11.3 (#231234) https://about.gitlab.com/releases/2023/05/10/security-release-gitlab-15-11-3-released/ Fixes CVE-2023-2181 --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitlab/rubyEnv/Gemfile | 2 +- .../version-management/gitlab/rubyEnv/Gemfile.lock | 6 +++--- .../version-management/gitlab/rubyEnv/gemset.nix | 8 ++++---- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 4a25742d54cc..c520ff1eec8e 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.11.2", - "repo_hash": "sha256-4wdbe/DkZdfmOuKHlmBEKQYYduIaB1SD5ZYICHqADeE=", + "version": "15.11.3", + "repo_hash": "sha256-fOIh1x1ci2J1J8bXANOQObn8gqELeu0nisb+EdjyJzw=", "yarn_hash": "02ipm7agjy3c75df76c00k3qq5gpw3d876f6x91xnwizswsv9agb", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.11.2-ee", + "rev": "v15.11.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.11.2", - "GITLAB_PAGES_VERSION": "15.11.2", + "GITALY_SERVER_VERSION": "15.11.3", + "GITLAB_PAGES_VERSION": "15.11.3", "GITLAB_SHELL_VERSION": "14.18.0", - "GITLAB_WORKHORSE_VERSION": "15.11.2" + "GITLAB_WORKHORSE_VERSION": "15.11.3" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index ef4c7ba946b4..f668d1050644 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.11.2"; + version = "15.11.3"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-yX93YHHajXqAQq93mM/bRCQciDfJ0GR3kLSO4MQsWPY="; + sha256 = "sha256-3bbk9LDqo6hm8eG17+a7udM/yHjvXi3f32gNwXhrMrI="; }; vendorSha256 = "sha256-gJelagGPogeCdJtRpj4RaYlqzZRhtU0EIhmj1aK4ZOk="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 5a3fb60b456e..fe2b8deaa070 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "15.11.2"; + version = "15.11.3"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-c5brpl9OEW4N8vmphdCRYl5TGkMN3FmXmINPpyEajUs="; + sha256 = "sha256-1qf/ZXOQBMT1aH0f6IyItTBUuhwVuE76sU8llRapZ0Q="; }; vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 5b2827d85441..b9427e0e34c8 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.11.2"; + version = "15.11.3"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 5c2d39a66920..25fbc65d271c 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -435,7 +435,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.8.0', require: false + gem 'gitlab-dangerfiles', '~> 3.9.0', require: false end group :development, :test, :coverage do diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 2940d6145726..cbc11b360a2d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -485,7 +485,7 @@ GEM faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-http-cache (2.4.1) + faraday-http-cache (2.5.0) faraday (>= 0.8) faraday-httpclient (1.0.1) faraday-multipart (1.0.4) @@ -595,7 +595,7 @@ GEM terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.8.0) + gitlab-dangerfiles (3.9.0) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake @@ -1746,7 +1746,7 @@ DEPENDENCIES gettext_i18n_rails_js (~> 1.3) gitaly (~> 15.9.0.pre.rc3) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.8.0) + gitlab-dangerfiles (~> 3.9.0) gitlab-experiment (~> 0.7.1) gitlab-fog-azure-rm (~> 1.7.0) gitlab-labkit (~> 0.31.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 6b38b3f01680..579dcd4242c2 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -1700,10 +1700,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qsycf92z2797m9v6calp4yhz565vdsfazi7rj0rxy3jxvlv4lgv"; + sha256 = "0qvl49xpl2mwxgcj6aj11qrjk94xrqhbnpl5vp1y2275crnkddv4"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.0"; }; faraday-httpclient = { groups = ["danger" "default" "development" "test"]; @@ -2157,10 +2157,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zhsdnr3zbsym6j689d039hrd9if07jbircyl6ns4f5abwhc7w3y"; + sha256 = "13npl2yqcapsxwzm3b84537sa5s1cplcvba43nlwdcb1d22skfip"; type = "gem"; }; - version = "3.8.0"; + version = "3.9.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; From 75916a2403fe35218ae40c28ee0a2efe5eb6cb95 Mon Sep 17 00:00:00 2001 From: squalus Date: Thu, 11 May 2023 11:55:18 -0700 Subject: [PATCH 163/175] librewolf: 112.0.1-2 -> 113.0-1 --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index a84b2a038ae7..fe4ad087cf08 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "112.0.1-2", + "packageVersion": "113.0-1", "source": { - "rev": "112.0.1-2", - "sha256": "1pm4ilc2zx6qx3qqjl7ypl51mcfwq22abi850kq7l3pznb2z0ljw" + "rev": "113.0-1", + "sha256": "0cqb9lphaqvmf443ha6fhd8q7qyy09bsg923rq8jy8cjmhkq2n6i" }, "firefox": { - "version": "112.0.1", - "sha512": "23a5cd9c1f165275d8ca7465bebce86018441c72292421f4ed56d7ad8ada9402dc8d22a08467d9d0ef3ef8c62338006dfa3bcbddf12cb8a59eafa0bd7d0cda50" + "version": "113.0", + "sha512": "96b0f0774083270f4fcce06085b177ced25ba05da7291d777f1da1d5bbad30721bc6363b76e06ccb64fc092778c8326a426a8bfdfa3cbaafd4f1169b924744a5" } } From 8cac6243a34545ffa36411ef5a3bdfddd72cbc31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 19:13:50 +0000 Subject: [PATCH 164/175] bind: 9.18.12 -> 9.18.14 --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index e7e904cb94cd..939ef23275d7 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.12"; + version = "9.18.14"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-R3Zrt7BjqrutBUOGsZCqf2wUUkQnr9Qnww7EJlEgJ+c="; + sha256 = "sha256-muEu32rDxDCzPs0afAwMYIddJVGF64eFD6ml55SmSgk="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From 9020896b6f5bb2f7c6df769096540d0a62ac1d97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 17:54:10 +0000 Subject: [PATCH 165/175] alsa-utils: 1.2.8 -> 1.2.9 --- pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix index 37870fb37b47..07705f568a1d 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; - sha256 = "sha256-4UD6YEw1Hza9chZ8iGDGnYG5ZK5qtTmS1kNN3jjpMzw="; + sha256 = "sha256-52I9RSVZX5LhHOJe6al/IEChTG5NzQJ6qW4Gy854F70="; }; nativeBuildInputs = [ gettext makeWrapper ]; From 67b4a946732a215d728ef7373194d576d6f95484 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 19:33:53 +0000 Subject: [PATCH 166/175] audacious-plugins: 4.3 -> 4.3.1 --- pkgs/applications/audio/audacious/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/applications/audio/audacious/plugins.nix index bd9bb5149747..6f5d171e2ef1 100644 --- a/pkgs/applications/audio/audacious/plugins.nix +++ b/pkgs/applications/audio/audacious/plugins.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "audacious-plugins"; - version = "4.3"; + version = "4.3.1"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "sha256-Zi72yMS9cNDzX9HF8IuRVJuUNmOLZfihozlWsJ34n8Y="; + sha256 = "sha256-Leom469YOi1oTfJAsnsrKTK81lPfTbUAqF9P5dX9yKY="; }; patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ]; From 2e26d5bedf52568631cb892a5243df22f7486c11 Mon Sep 17 00:00:00 2001 From: StepBroBD Date: Thu, 11 May 2023 14:18:46 -0600 Subject: [PATCH 167/175] raycast: 1.50.0 -> 1.51.1 --- pkgs/os-specific/darwin/raycast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index 611c15ad4171..6e2b83f3d128 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -6,7 +6,7 @@ stdenvNoCC.mkDerivation rec { pname = "raycast"; - version = "1.50.0"; + version = "1.51.1"; src = fetchurl { # https://github.com/NixOS/nixpkgs/pull/223495 @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { # to host GitHub Actions to periodically check for updates # and re-release the `.dmg` file to Internet Archive (https://archive.org/details/raycast) url = "https://archive.org/download/raycast/raycast-${version}.dmg"; - sha256 = "sha256-+LvQDQZjbj/p8VT/af9XwKSKkKd65YzcwrKF9hoXCog="; + sha256 = "sha256-6U0dsDlIuU4OjgF8lvXbtVQ+xFB54KZpasvd307jca4="; }; dontPatch = true; From 8a92dd9a9af7131c9bf9860af3fd5bdf4e1d1a06 Mon Sep 17 00:00:00 2001 From: affeldt-aist <33154536+affeldt-aist@users.noreply.github.com> Date: Fri, 12 May 2023 06:09:28 +0900 Subject: [PATCH 168/175] mathcomp-infotheo: init at 0.5.1 (#231077) --- .../coq-modules/mathcomp-infotheo/default.nix | 19 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/coq-modules/mathcomp-infotheo/default.nix diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix new file mode 100644 index 000000000000..6a8bd17628d1 --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix @@ -0,0 +1,19 @@ +{ coq, mkCoqDerivation, mathcomp-analysis, lib, version ? null }: + +mkCoqDerivation { + namePrefix = [ "coq" "mathcomp" ]; + pname = "infotheo"; + owner = "affeldt-aist"; + inherit version; + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [ + { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.2") ]; out = "0.5.1"; } + ] null; + release."0.5.1".sha256 = "sha256-yBBl5l+V+dggsg5KM59Yo9CULKog/xxE8vrW+ZRnX7Y="; + + propagatedBuildInputs = [ mathcomp-analysis ]; + + meta = with lib; { + description = "A Coq formalization of information theory and linear error-correcting codes"; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index f8e249b7bbbd..e83f18786f1b 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -82,6 +82,7 @@ let mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {}; mathcomp-classical = self.mathcomp-analysis.classical; mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {}; + mathcomp-infotheo = callPackage ../development/coq-modules/mathcomp-infotheo {}; mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {}; mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {}; mathcomp-word = callPackage ../development/coq-modules/mathcomp-word {}; From 3fc5d42ecdd5e5316f434e6ecc8029112fffe40a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 May 2023 14:09:42 -0700 Subject: [PATCH 169/175] python310Packages.weaviate-client: 3.15.4 -> 3.18.0 (#231329) --- pkgs/development/python-modules/weaviate-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 7b33099338b4..da0e6348024e 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "3.15.4"; + version = "3.18.0"; src = fetchPypi { inherit pname version; - hash = "sha256-XmHr/+++32KwdR195WL/1ThHF8juat/KTqbrFQ0BLhw="; + hash = "sha256-QjpSZRijJQXFKTMo5fJS5su/IOSzEkcz9w0Q/A1oI8k="; }; postPatch = '' From 141d9cd96151b6cece20b0e37f2d07b27e84dd91 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 11 May 2023 23:26:13 +0200 Subject: [PATCH 170/175] ungoogled-chromium: 113.0.5672.64 -> 113.0.5672.93 --- .../networking/browsers/chromium/upstream-info.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d7911acefb91..4b565a209d95 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,8 +45,8 @@ } }, "ungoogled-chromium": { - "version": "113.0.5672.64", - "sha256": "0knw3i37hh874ycjlc8bl68wdhyqhma5pn7alwa6254qr5dkci9h", + "version": "113.0.5672.93", + "sha256": "1cy33mvhws59d358s30xqs2p9hdb28n37wmv5ihx0d07x30y3azb", "sha256bin64": null, "deps": { "gn": { @@ -56,8 +56,8 @@ "sha256": "12w4g2dl58283allclpi1c4i6ih9v2xvdb9hpbmfda12v8lizmlq" }, "ungoogled-patches": { - "rev": "113.0.5672.64-1", - "sha256": "0xvgq6971qvvn0cf4z5wkfabhm7dsx2f68npfl4y2nix7hwfs6lq" + "rev": "113.0.5672.93-1", + "sha256": "0ffb33k2kgnpswq1f61gzcblvgsw7qazh8yq2kcdwc4k9bd9gr93" } } } From 6b30711c43f4c5059cc0b5be76922f717e3b1da0 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Fri, 12 May 2023 07:55:11 +1000 Subject: [PATCH 171/175] flutter: Install Android variant artifacts in platform subdirectories (#231296) * flutter: Allow installing artifacts in subdirectories * flutter: Install Android variant artifacts in platform subdirectories --- .../compilers/flutter/engine-artifacts/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/pkgs/development/compilers/flutter/engine-artifacts/default.nix index 214a195e0c4b..ebcf019966f1 100644 --- a/pkgs/development/compilers/flutter/engine-artifacts/default.nix +++ b/pkgs/development/compilers/flutter/engine-artifacts/default.nix @@ -30,7 +30,7 @@ let variants = lib.genAttrs [ "profile" "release" ] (variant: [ { archive = "artifacts.zip"; } - { archive = "${lib.toLower hostPlatform.uname.system}-x64.zip"; } + { subdirectory = true; archive = "${lib.toLower hostPlatform.uname.system}-x64.zip"; } ]); })) // { @@ -80,7 +80,7 @@ let }; }; - mkArtifactDerivation = { platform ? null, variant ? null, archive, ... }@args: + mkArtifactDerivation = { platform ? null, variant ? null, subdirectory ? null, archive, ... }@args: let artifactDirectory = if platform == null then null else "${platform}${lib.optionalString (variant != null) "-${variant}"}"; archiveBasename = lib.removeSuffix ".${(lib.last (lib.splitString "." archive))}" archive; @@ -97,7 +97,14 @@ let nativeBuildInputs = [ autoPatchelfHook ]; - installPhase = "cp -r . $out"; + installPhase = + let + destination = "$out/${if subdirectory == true then archiveBasename else if subdirectory != null then subdirectory else "."}"; + in + '' + mkdir -p "${destination}" + cp -r . "${destination}" + ''; } // args); artifactDerivations = { From c3aebe638be1331fdcb1a23b69185ad0272d3b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Fri, 5 May 2023 13:56:11 +0300 Subject: [PATCH 172/175] replxx: unstable-2023-01-21 -> unstable-2023-02-26 --- pkgs/development/interpreters/bqn/cbqn/replxx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/replxx.nix b/pkgs/development/interpreters/bqn/cbqn/replxx.nix index c94927144348..2074111d45f5 100644 --- a/pkgs/development/interpreters/bqn/cbqn/replxx.nix +++ b/pkgs/development/interpreters/bqn/cbqn/replxx.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation { pname = "replxx"; - version = "unstable-2023-01-21"; + version = "unstable-2023-02-26"; src = fetchFromGitHub { owner = "dzaima"; repo = "replxx"; - rev = "eb6bcecff4ca6051120c99e9dd64c3bd20fcc42f"; - hash = "sha256-cb486FGF+4sUxgBbRfnbTTnZn2WQ3p93fSwDRCEtFJg="; + rev = "1da4681a8814366ec51e7630b76558e53be0997d"; + hash = "sha256-Zs7ItuK31n0VSxwOsPUdZZLr68PypitZqcydACrx90Q="; }; dontConfigure = true; From 6d7cba7a8eee1f90427ea23989e5704fe77631a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Fri, 5 May 2023 13:56:11 +0300 Subject: [PATCH 173/175] singeli: unstable-2023-01-23 -> unstable-2023-04-12 --- pkgs/development/interpreters/bqn/cbqn/singeli.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/singeli.nix b/pkgs/development/interpreters/bqn/cbqn/singeli.nix index 9b14985e3a7d..253f7549a6c0 100644 --- a/pkgs/development/interpreters/bqn/cbqn/singeli.nix +++ b/pkgs/development/interpreters/bqn/cbqn/singeli.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation { pname = "singeli"; - version = "unstable-2023-01-23"; + version = "unstable-2023-04-12"; src = fetchFromGitHub { owner = "mlochbaum"; repo = "Singeli"; - rev = "0bc519ccbbe4051204d40bfc861a5bed7132e95f"; - hash = "sha256-zo4yr9t3hp6BOX1ac3md6R/O+hl5MphZdCmI8nNP9Yc="; + rev = "3327956fedfdc6aef12954bc12120f20de2226d0"; + hash = "sha256-k25hk5zTn0m+2Nh9buTJYhtM98/VRlQ0guoRw9el3VE="; }; dontConfigure = true; From afea6a0e869a864fe68090399f9d955e55cb6e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Fri, 5 May 2023 13:56:11 +0300 Subject: [PATCH 174/175] mbqn: 0.pre+date=2022-11-24 -> 0.pre+date=2023-05-09 --- pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix b/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix index 1390eebe44ef..85a3be161caa 100644 --- a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix +++ b/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "bqn"; - version = "0.pre+date=2022-11-24"; + version = "0.pre+date=2023-05-09"; src = fetchFromGitHub { owner = "mlochbaum"; repo = "BQN"; - rev = "976bd82fb0e830876cca117c302c8a19048033a4"; - hash = "sha256:1nhn30ypc2zvq58b3zi66ypc9wv3v8cryn43cqihazc1lq8qxqdw"; + rev = "656b176c5dc783b038b018f0ed17a5414ea62b4d"; + hash = "sha256-6r+N0eCvwvaoB84cw+Vtoqa6MXuI0NXLbOPblemY4M8="; }; nativeBuildInputs = [ makeWrapper ]; From 53875c54daf7271383d9a2a4c7ee0c102bf8693c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Wed, 10 May 2023 21:42:57 +0300 Subject: [PATCH 175/175] cbqn: make REPLXX flag explicit Makefile target o3n-singeli enables REPLXX by default, we want to adhere the enableReplxx variable. --- pkgs/development/interpreters/bqn/cbqn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index 575e1ea7b943..a6e8f4c9feb9 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" - ] - ++ lib.optional enableReplxx "REPLXX=1"; + ]; buildFlags = [ # interpreter binary (lib.flatten (if enableSingeli then ["o3n-singeli" "f='-mavx2'"] else ["o3"])) + "REPLXX=${if enableReplxx then "1" else "0"}" ] ++ lib.optionals enableLibcbqn [ # embeddable interpreter as a shared lib "shared-o3"