From 782769d64ea6527a2a2186136062b256e162fb0d Mon Sep 17 00:00:00 2001 From: jackyliu16 <18922251299@163.com> Date: Fri, 21 Apr 2023 11:43:32 +0800 Subject: [PATCH 001/187] vscode-extension.spellright: init at 3.0.112 --- .../editors/vscode/extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 45a69a7dce32..d0620f1efe10 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -412,6 +412,18 @@ let }; }; + ban.spellright = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "ban"; + name = "spellright"; + version = "3.0.112"; + sha256 = "sha256-79Yg4I0OkfG7PaDYnTA8HK8jrSxre4FGriq0Baiq7wA="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + bbenoist.nix = buildVscodeMarketplaceExtension { mktplcRef = { name = "Nix"; From 2fab3dec74d139e015ecfc29d9f2c6b673d6c8db Mon Sep 17 00:00:00 2001 From: jackyliu16 <18922251299@163.com> Date: Sat, 22 Apr 2023 18:07:37 +0800 Subject: [PATCH 002/187] vscode-extension.code-translate: init at 1.0.20 --- .../editors/vscode/extensions/default.nix | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d0620f1efe10..e67ad34dc996 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -665,6 +665,32 @@ let }; }; + w88975.code-translate = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "code-translate"; + publisher = "w88975"; + version = "1.0.20"; + sha256 = "sha256-blqLK7S+RmEoyr9zktS5/SNC0GeSXnNpbhltyajoAfw="; + }; + meta = { + description = "A pure vscode translation plug-in"; + longDescription = '' + Code Translate 是一款纯粹的滑词翻译软件 + + 无侵入式的显示翻译结果: 与VS Code代码分析完美结合 + 强大的单词拆分能力: 支持驼峰, 下划线形式等各种单词拆分 + 丰富的本地词库: 包含 340 万+离线单词, 支持各种生僻单词 + 基于丰富的本地词库: Code Translate 拥有超快的查询速度, 每个单词在基本在 10ms 内可查询完毕 + 多端支持: VS Code 桌面版 和 VS Code Online 版本, 插件均可支持 + ''; + repositories = "https://github.com/w88975/code-translate-vscode"; + changelog = "https://marketplace.visualstudio.com/items/w88975.code-translate/changelog"; + homepage = "https://marketplace.visualstudio.com/items?itemName=w88975.code-translate"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ onedragon ]; + }; + }; + colejcummins.llvm-syntax-highlighting = buildVscodeMarketplaceExtension { mktplcRef = { name = "llvm-syntax-highlighting"; From 6259dbc3634b60049dfabbf33584c06ba0d357e5 Mon Sep 17 00:00:00 2001 From: jackyliu16 <18922251299@163.com> Date: Sat, 22 Apr 2023 18:09:12 +0800 Subject: [PATCH 003/187] vscode-extension.dictionary: init at 0.0.2 --- .../editors/vscode/extensions/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e67ad34dc996..3729b6e60a6d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -690,7 +690,7 @@ let maintainers = with lib.maintainers; [ onedragon ]; }; }; - + colejcummins.llvm-syntax-highlighting = buildVscodeMarketplaceExtension { mktplcRef = { name = "llvm-syntax-highlighting"; @@ -1159,6 +1159,22 @@ let }; }; + ExiaHuang.dictionary = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "ExiaHuang"; + name = "dictionary"; + version = "0.0.2"; + sha256 = "sha256-caNcbDTB/F2mdlGpfIfJv13lzY5Wwj7p7r8dAte9+3A="; + }; + meta = { + description = "汉英英汉词典, 金山词霸, 有道翻译 for vscode"; + repositories = "https://github.com/exiahuang/fanyi-vscode.git"; + homepage = "https://github.com/exiahuang/fanyi-vscode"; + changelog = "https://marketplace.visualstudio.com/items/ExiaHuang.dictionary/changelog"; + license = lib.licenses.gpl3Only; + }; + }; + file-icons.file-icons = buildVscodeMarketplaceExtension { meta = { changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog"; From 0761a4e194a0df5fa066aa7359bacab96f7a837f Mon Sep 17 00:00:00 2001 From: jackyliu16 <18922251299@163.com> Date: Sat, 22 Apr 2023 18:10:50 +0800 Subject: [PATCH 004/187] vscode-extension.google-translate: init at 1.4.13 --- .../editors/vscode/extensions/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3729b6e60a6d..fb0cbad729d8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1302,6 +1302,21 @@ let }; }; + funkyremi.vscode-google-translate = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "funkyremi"; + name = "vscode-google-translate"; + version = "1.4.13"; + sha256 = "sha256-9Vo6lwqD1eE3zY0Gi9ME/6lPwmwuJ3Iq9StHPvncnM4="; + }; + meta = { + description = "Translate text right in your code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=funkyremi.vscode-google-translate"; + homepage = "https://github.com/funkyremi/vscode-google-translate.git"; + license = lib.licenses.mit; + }; + }; + gencer.html-slim-scss-css-class-completion = buildVscodeMarketplaceExtension { mktplcRef = { name = "html-slim-scss-css-class-completion"; From 7f975dc416eb83cf954ad2b5075e1ee62444455f Mon Sep 17 00:00:00 2001 From: jackyliu16 <18922251299@163.com> Date: Sat, 22 Apr 2023 18:11:53 +0800 Subject: [PATCH 005/187] vscode-extension.comment-translate: init at 2.2.4 --- .../editors/vscode/extensions/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index fb0cbad729d8..33fce1d87ced 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1313,6 +1313,8 @@ let description = "Translate text right in your code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=funkyremi.vscode-google-translate"; homepage = "https://github.com/funkyremi/vscode-google-translate.git"; + repositories = "https://github.com/funkyremi/vscode-google-translate.git"; + changelog = "https://marketplace.visualstudio.com/items/funkyremi.vscode-google-translate/changelog"; license = lib.licenses.mit; }; }; @@ -1571,6 +1573,23 @@ let }; }; + intellsmi.comment-translate = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "intellsmi"; + name = "comment-translate"; + version = "2.2.4"; + sha256 = "sha256-g6mlScxv8opZuqgWtTJ3k0Yo7W7WzIkwB+8lWf6cMiU="; + }; + meta = { + description = "This plugin uses the Google Translate API to translate comments for the VSCode programming language."; + homepage = "https://github.com/intellism/vscode-comment-translate/blob/HEAD/doc/README.md"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=intellsmi.comment-translate"; + repositories = "https://github.com/intellism/vscode-comment-translate.git"; + changelog = "https://marketplace.visualstudio.com/items/intellsmi.comment-translate/changelog"; + license = lib.licenses.mit; + }; + }; + ionide.ionide-fsharp = buildVscodeMarketplaceExtension { mktplcRef = { name = "Ionide-fsharp"; From 073696cdea3b5cd05ef23261479f4d0504e9a349 Mon Sep 17 00:00:00 2001 From: jackyliu16 <18922251299@163.com> Date: Sat, 22 Apr 2023 18:13:30 +0800 Subject: [PATCH 006/187] vscode-extension.dictionary-completion: init at 1.2.2 --- .../editors/vscode/extensions/default.nix | 72 +++++++++++++------ 1 file changed, 49 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 33fce1d87ced..cc9b7089c030 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -420,7 +420,11 @@ let sha256 = "sha256-79Yg4I0OkfG7PaDYnTA8HK8jrSxre4FGriq0Baiq7wA="; }; meta = { + description = "A Visual Studio Code extension for Spellchecker"; + changelog = "https://marketplace.visualstudio.com/items/ban.spellright/changelog"; + homepage = "https://github.com/bartosz-antosik/vscode-spellright"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ onedragon ]; }; }; @@ -673,19 +677,17 @@ let sha256 = "sha256-blqLK7S+RmEoyr9zktS5/SNC0GeSXnNpbhltyajoAfw="; }; meta = { - description = "A pure vscode translation plug-in"; + description = "A Visual Studio Code extension to provide purely hover translation"; longDescription = '' - Code Translate 是一款纯粹的滑词翻译软件 - - 无侵入式的显示翻译结果: 与VS Code代码分析完美结合 - 强大的单词拆分能力: 支持驼峰, 下划线形式等各种单词拆分 - 丰富的本地词库: 包含 340 万+离线单词, 支持各种生僻单词 - 基于丰富的本地词库: Code Translate 拥有超快的查询速度, 每个单词在基本在 10ms 内可查询完毕 - 多端支持: VS Code 桌面版 和 VS Code Online 版本, 插件均可支持 + Code Translate is a purely hover translation extension + - Non-intrusive display of translation results: perfectly integrated with VS Code code analysis. + - Powerful word splitting capabilities: supports various forms of word splitting such as camel case and underscore. + - Rich local vocabulary: includes 3.4+ million offline words, supporting various rare words. + - Based on a rich local vocabulary: Code Translate has super-fast query speed, with each word typically queried in less than 10ms. + - Multi-platform support: supports both the desktop version and online version of VS Code, and the plugin can be used on both versions. ''; - repositories = "https://github.com/w88975/code-translate-vscode"; + homepage = "https://github.com/w88975/code-translate-vscode"; changelog = "https://marketplace.visualstudio.com/items/w88975.code-translate/changelog"; - homepage = "https://marketplace.visualstudio.com/items?itemName=w88975.code-translate"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ onedragon ]; }; @@ -1167,11 +1169,11 @@ let sha256 = "sha256-caNcbDTB/F2mdlGpfIfJv13lzY5Wwj7p7r8dAte9+3A="; }; meta = { - description = "汉英英汉词典, 金山词霸, 有道翻译 for vscode"; - repositories = "https://github.com/exiahuang/fanyi-vscode.git"; - homepage = "https://github.com/exiahuang/fanyi-vscode"; - changelog = "https://marketplace.visualstudio.com/items/ExiaHuang.dictionary/changelog"; + description = "A Visual Studio Code extension of using chinese-english dictonary in right-click menu"; + homepage = "https://github.com/exiahuang/fanyi-vscode"; + changelog = "https://marketplace.visualstudio.com/items/ExiaHuang.dictionary/changelog"; license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ onedragon ]; }; }; @@ -1310,12 +1312,12 @@ let sha256 = "sha256-9Vo6lwqD1eE3zY0Gi9ME/6lPwmwuJ3Iq9StHPvncnM4="; }; meta = { - description = "Translate text right in your code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=funkyremi.vscode-google-translate"; - homepage = "https://github.com/funkyremi/vscode-google-translate.git"; - repositories = "https://github.com/funkyremi/vscode-google-translate.git"; - changelog = "https://marketplace.visualstudio.com/items/funkyremi.vscode-google-translate/changelog"; - license = lib.licenses.mit; + description = "A Visual Studio Code extension using google translation to helping you quickly translate text right in your code rocket"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=funkyremi.vscode-google-translate"; + homepage = "https://github.com/funkyremi/vscode-google-translate.git"; + changelog = "https://marketplace.visualstudio.com/items/funkyremi.vscode-google-translate/changelog"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ onedragon ]; }; }; @@ -1581,15 +1583,18 @@ let sha256 = "sha256-g6mlScxv8opZuqgWtTJ3k0Yo7W7WzIkwB+8lWf6cMiU="; }; meta = { - description = "This plugin uses the Google Translate API to translate comments for the VSCode programming language."; + description = "A Visual Studio Code extension to translate the comments for computer language"; + longDescription = '' + This plugin uses the Google Translate API to translate comments for the VSCode programming language. + ''; homepage = "https://github.com/intellism/vscode-comment-translate/blob/HEAD/doc/README.md"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=intellsmi.comment-translate"; - repositories = "https://github.com/intellism/vscode-comment-translate.git"; changelog = "https://marketplace.visualstudio.com/items/intellsmi.comment-translate/changelog"; + maintainers = with lib.maintainers; [ onedragon ]; license = lib.licenses.mit; }; }; - + ionide.ionide-fsharp = buildVscodeMarketplaceExtension { mktplcRef = { name = "Ionide-fsharp"; @@ -3315,6 +3320,27 @@ let }; }; + yzhang.dictionary-completion = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "yzhang"; + name = "dictionary-completion"; + version = "1.2.2"; + sha256 = "sha256-dpJcJARRKzRNHfXs/qknud8OQ8xIyeaVnt/EcDq0k4E="; + }; + meta = { + description = "A Visual Studio Code extension to help user easyly finish long words "; + longDescription = '' + Dictionary completion allows user to get a list of keywords, based off of the current word at the cursor. + This is useful if you are typing a long word (e.g. acknowledgeable) and don't want to finish typing or don't remember the Spelling + ''; + homepage = "https://github.com/yzhang-gh/vscode-dic-completion#readme"; + changelog = "https://marketplace.visualstudio.com/items/yzhang.dictionary-completion/changelog"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=yzhang.dictionary-completion"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ onedragon ]; + }; + }; + yzhang.markdown-all-in-one = buildVscodeMarketplaceExtension { mktplcRef = { name = "markdown-all-in-one"; From 2c495fe715a10c27fe8966c1f32648821521c1b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= Date: Sun, 23 Apr 2023 10:21:15 +0200 Subject: [PATCH 007/187] maintainers: add tillkruss He will comment in a PR with an approval, I was talking to him about this --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d15322cf497f..6cef734c037d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15527,6 +15527,12 @@ github = "TilCreator"; githubId = 18621411; }; + tillkruss = { + name = "Till Krüss"; + email = "till@kruss.io"; + github = "tillkruss"; + githubId = 665029; + }; tilpner = { email = "till@hoeppner.ws"; github = "tilpner"; From c554c35197451af88367911ccc0789b856770c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= Date: Sun, 23 Apr 2023 10:40:51 +0200 Subject: [PATCH 008/187] phpExtensions.relay: init at 0.6.3 --- .../php-packages/relay/default.nix | 113 ++++++++++++++++++ pkgs/top-level/php-packages.nix | 2 + 2 files changed, 115 insertions(+) create mode 100644 pkgs/development/php-packages/relay/default.nix diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix new file mode 100644 index 000000000000..e3fb71d744ba --- /dev/null +++ b/pkgs/development/php-packages/relay/default.nix @@ -0,0 +1,113 @@ +{ stdenv +, lib +, fetchurl +, php +, openssl +, openssl_1_1 +, zstd +, lz4 +, autoPatchelfHook +}: + +let + version = "0.6.3"; + system = stdenv.hostPlatform.system; + phpVersion = lib.versions.majorMinor php.version; + variation = { + "aarch64-darwin" = { + platform = "darwin-arm64"; + hashes = { + "8.0" = "00a7pyf9na7hjifkmp2482c7sh086w72zniqgr4cz2rhz7hnqp7p"; + "8.1" = "0mg6nsllycgjxxinn8s30y9sk06g40vk8blnpx0askjw5zdsf5y7"; + "8.2" = "0qmcbrj6jaxczv25rdgfjrj9nwq4vb2faw7kzlyxrvvzb5pyn9dm"; + "8.3" = "1hqjy5y4q3alxvrj7xksaf7vvmz8p51bgzxbvmzdx6jnl63dix33"; + }; + }; + "aarch64-linux" = { + platform = "debian-aarch64+libssl3"; + hashes = { + "8.0" = "19zzw4324z096b6bph1686r30i4i2kwmlmmcqmb33lqkr9b9n5ag"; + "8.1" = "0j6wpwy8d67pqij4v8m2xwydfddzr7nn4c3lyrssp8llbn4ghwpn"; + "8.2" = "1nbajvi5zk6z8qr32l86p65f1zxv12kald56pg8k7bj4axlj2pmy"; + "8.3" = "1sn638g2636m6s3lv2cclza9lzmzgqxamcga7jz3ijhn2ja6znbv"; + }; + }; + "x86_64-darwin" = { + platform = "darwin-x86-64"; + hashes = { + "8.0" = "13q6va9lxgfyx86xw20iqjz4s9r9xms74ywb2hgqrhs5mjnazzz4"; + "8.1" = "1ncih5bf0jcylpl0nj8hi50kcwb4nl1g0ql359dgg9gp8s1b4hmw"; + "8.2" = "150difm3vg0g2pl5hb5cci4jzybd7jcd7prjdv3rmwsi91gsydlv"; + # 8.3 for this platform does not exist + }; + }; + "x86_64-linux" = { + platform = "debian-x86-64+libssl3"; + hashes = { + "8.0" = "1qvd5r591kp7qf9pkymz78s8llzs1vxjwqhwy9rvma21hh6gd8ld"; + "8.1" = "0fm9ppgx7qaggid134qnl9jkq5h97dac2ax21f1f1d0k8f5blmc2"; + "8.2" = "0g2yqwfrigf047dqkrvfcj318lvgp38zy522ry484mrgq7iqwvb8"; + "8.3" = "06mi3yr7k1a9icdljzl76xvrw6xqnvwiavgzx2g487s097mycjp4"; + }; + }; + }.${system} or (throw "Unsupported platform for relay: ${system}"); +in +stdenv.mkDerivation (finalAttrs: { + inherit version; + pname = "relay"; + extensionName = "relay"; + + src = fetchurl { + url = "https://builds.r2.relay.so/v${finalAttrs.version}/relay-v${finalAttrs.version}-php" + + phpVersion + "-" + variation.platform + ".tar.gz"; + sha256 = variation.hashes.${phpVersion} or (throw "Unsupported PHP version for relay ${phpVersion} on ${system}"); + }; + nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [ + autoPatchelfHook + ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ + openssl + zstd + lz4 + ]; + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/php/extensions + cp relay-pkg.so $out/lib/php/extensions/relay.so + chmod +w $out/lib/php/extensions/relay.so + '' + (if stdenv.isDarwin then + let + args = lib.strings.concatMapStrings + (v: " -change /Users/administrator/dev/relay-dev/relay-deps/build/arm64/lib/${v.name}" + + " ${lib.strings.makeLibraryPath [ v.value ]}/${v.name}") + (with lib.attrsets; [ + (nameValuePair "libssl.1.1.dylib" openssl_1_1) + (nameValuePair "libcrypto.1.1.dylib" openssl_1_1) + (nameValuePair "libzstd.1.dylib" zstd) + (nameValuePair "liblz4.1.dylib" lz4) + ]); + in + # fixDarwinDylibNames can't be used here because we need to completely remap .dylibs, not just add absolute paths + '' + install_name_tool${args} $out/lib/php/extensions/relay.so + '' + else + "") + '' + # Random UUID that's required by the extension. Can be anything, but must be different from default. + sed -i "s/00000000-0000-0000-0000-000000000000/aced680f-30e9-40cc-a868-390ead14ba0c/" $out/lib/php/extensions/relay.so + chmod -w $out/lib/php/extensions/relay.so + + runHook postInstall + ''; + + meta = with lib; { + description = "Next-generation Redis extension for PHP"; + changelog = "https://github.com/cachewerk/relay/releases/tag/v${version}"; + homepage = "https://relay.so/"; + sourceProvenance = [ sourceTypes.binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ tillkruss ostrolucky ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + }; +}) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index af4f288bb7e7..c351b5a3f3d9 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -282,6 +282,8 @@ lib.makeScope pkgs.newScope (self: with self; { redis = callPackage ../development/php-packages/redis { }; + relay = callPackage ../development/php-packages/relay { inherit php; }; + smbclient = callPackage ../development/php-packages/smbclient { }; snuffleupagus = callPackage ../development/php-packages/snuffleupagus { }; From b1efbff8ec70f5a6ad564b32f7d5829139bad3be Mon Sep 17 00:00:00 2001 From: FlafyDev Date: Mon, 15 May 2023 01:16:47 +0300 Subject: [PATCH 009/187] flutter: Move artifact installation logic to the wrapper --- .../development/compilers/flutter/default.nix | 18 +++++------ .../development/compilers/flutter/flutter.nix | 8 +---- .../development/compilers/flutter/wrapper.nix | 30 +++++++++++++++---- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index b96452d0c89f..0f57919a9508 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -34,15 +34,15 @@ let inherit wrapFlutter mkCustomFlutter mkFlutter; buildFlutterApplication = callPackage ../../../build-support/flutter { # Package a minimal version of Flutter that only uses Linux desktop release artifacts. - flutter = wrapFlutter - (mkCustomFlutter (args // { - includedEngineArtifacts = { - common = [ "flutter_patched_sdk_product" ]; - platform.linux = lib.optionals stdenv.hostPlatform.isLinux - (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64")) - (architecture: [ "release" ])); - }; - })); + flutter = (wrapFlutter (mkCustomFlutter args)).override { + supportsAndroid = false; + includedEngineArtifacts = { + common = [ "flutter_patched_sdk_product" ]; + platform.linux = lib.optionals stdenv.hostPlatform.isLinux + (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64")) + (architecture: [ "release" ])); + }; + }; }; }; }); diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 71f70acf9da5..3dbab3529e77 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -8,13 +8,7 @@ "flutter_patched_sdk" "flutter_patched_sdk_product" ]; - platform = { - android = lib.optionalAttrs stdenv.hostPlatform.isx86_64 - ((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; }); - linux = lib.optionals stdenv.hostPlatform.isLinux - (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64")) - (architecture: [ "debug" "profile" "release" ])); - }; + platform = { }; } , lib diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index cac1bcf41d8b..81e5e6e4fdcd 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -2,7 +2,9 @@ , stdenv , callPackage , flutter -, supportsLinuxDesktop ? stdenv.isLinux +, supportsLinuxDesktop ? stdenv.hostPlatform.isLinux +, supportsAndroid ? stdenv.hostPlatform.isx86_64 +, includedEngineArtifacts ? null , extraPkgConfigPackages ? [ ] , extraLibraries ? [ ] , extraIncludes ? [ ] @@ -33,11 +35,27 @@ }: let + flutterWithArtifacts = flutter.override { + includedEngineArtifacts = if includedEngineArtifacts != null then includedEngineArtifacts else { + common = [ + "flutter_patched_sdk" + "flutter_patched_sdk_product" + ]; + platform = { + android = lib.optionalAttrs supportsAndroid + ((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; }); + linux = lib.optionalAttrs supportsLinuxDesktop + (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64")) + (architecture: [ "debug" "profile" "release" ])); + }; + }; + }; + # By default, Flutter stores downloaded files (such as the Pub cache) in the SDK directory. # Wrap it to ensure that it does not do that, preferring home directories instead. immutableFlutter = writeShellScript "flutter_immutable" '' export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} - ${flutter}/bin/flutter "$@" + ${flutterWithArtifacts}/bin/flutter "$@" ''; # Tools that the Flutter tool depends on. @@ -87,12 +105,12 @@ in { nativeBuildInputs = [ makeWrapper ]; - passthru = flutter.passthru // { - inherit (flutter) version; - unwrapped = flutter; + passthru = flutterWithArtifacts.passthru // { + inherit (flutterWithArtifacts) version; + unwrapped = flutterWithArtifacts; }; - inherit (flutter) meta; + inherit (flutterWithArtifacts) meta; } '' for path in ${builtins.concatStringsSep " " (builtins.foldl' (paths: pkg: paths ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") ["lib" "share"])) [ ] pkgConfigPackages)}; do addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path" From de91fb29211e5aec6a1cdc4f6a61bd5583128d37 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 13 May 2023 13:20:34 +0800 Subject: [PATCH 010/187] mesa-demos: fix cross compilation, set strictDeps --- pkgs/tools/graphics/mesa-demos/default.nix | 54 ++++++++++++++++++---- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix index 7fdface04b66..0bc30c8773fd 100644 --- a/pkgs/tools/graphics/mesa-demos/default.nix +++ b/pkgs/tools/graphics/mesa-demos/default.nix @@ -1,7 +1,23 @@ -{ lib, stdenv, fetchurl -, freeglut, glew, libGL, libGLU, libX11, libXext, mesa -, meson, ninja, pkg-config, wayland, wayland-protocols -, vulkan-loader, libxkbcommon, libdecor, glslang }: +{ lib +, stdenv +, fetchurl +, freeglut +, libGL +, libGLU +, libX11 +, libXext +, mesa +, meson +, ninja +, pkg-config +, wayland +, wayland-scanner +, wayland-protocols +, vulkan-loader +, libxkbcommon +, libdecor +, glslang +}: stdenv.mkDerivation rec { pname = "mesa-demos"; @@ -12,11 +28,33 @@ stdenv.mkDerivation rec { sha256 = "sha256-MEaj0mp7BRr3690lel8jv+sWDK1u2VIynN/x6fHtSWs="; }; + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wayland-scanner + glslang + ]; + buildInputs = [ - freeglut glew libX11 libXext libGL libGLU mesa wayland - wayland-protocols vulkan-loader libxkbcommon libdecor glslang - ] ++ lib.optional (mesa ? osmesa) mesa.osmesa ; - nativeBuildInputs = [ meson ninja pkg-config wayland ]; + freeglut + libX11 + libXext + libGL + libGLU + mesa + wayland + wayland-protocols + vulkan-loader + libxkbcommon + libdecor + ] ++ lib.optional (mesa ? osmesa) mesa.osmesa; mesonFlags = [ "-Degl=${if stdenv.isDarwin then "disabled" else "auto"}" From 42042047d25ac93cf446d27e89611d8216fb5016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 May 2023 18:23:03 +0200 Subject: [PATCH 011/187] python310Packages.cryptography: remove unused inputs --- pkgs/development/python-modules/cryptography/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 199cfd86517f..4815bfe90559 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -9,8 +9,6 @@ , setuptools-rust , openssl , Security -, packaging -, six , isPyPy , cffi , pkg-config From 77777770d11ae0f67f0516f2a35c9908bb898ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 May 2023 18:23:22 +0200 Subject: [PATCH 012/187] python310Packages.matplotlib: remove unused inputs --- pkgs/development/python-modules/matplotlib/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 1fd70739b4c8..f134f93a98d1 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -9,14 +9,11 @@ # build-system , pkg-config , pybind11 -, setuptools , setuptools-scm # native libraries , ffmpeg-headless -, fontconfig , freetype -, imagemagick , qhull # propagates From 42428ccca68a44c107222e35b07492757127ebcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 May 2023 18:23:44 +0200 Subject: [PATCH 013/187] python310Packages.numpy: remove unused inputs --- pkgs/development/python-modules/numpy/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index d18a93e1509c..401a1120527a 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,6 +1,5 @@ { lib , fetchPypi -, fetchpatch , python , buildPythonPackage , gfortran From 42042041ddb28f172822854ae34372fa6aac5409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 May 2023 18:23:50 +0200 Subject: [PATCH 014/187] python310Packages.pandas: remove unused inputs --- pkgs/development/python-modules/pandas/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index b852a7f82c03..68d925cc2a9f 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -8,11 +8,6 @@ , numpy , python-dateutil , pytz -, scipy -, sqlalchemy -, tables -, xlrd -, xlwt # Test inputs , glibcLocales , hypothesis From 04db3589a8150c0a97869b10e269d6d5c516f3e9 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 25 May 2023 22:39:28 +0200 Subject: [PATCH 015/187] lib.filesystem.pathType: Fix tests for Nix >= 2.14 --- lib/tests/filesystem.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/tests/filesystem.sh b/lib/tests/filesystem.sh index 4a5ffeb12431..1e33174429b8 100755 --- a/lib/tests/filesystem.sh +++ b/lib/tests/filesystem.sh @@ -41,7 +41,7 @@ checkPathType() { local actualPathType=$(nix-instantiate --eval --strict --json 2>&1 \ -E '{ path }: let lib = import ; in lib.filesystem.pathType path' \ --argstr path "$path") - if [[ "$actualPathType" != "$expectedPathType" ]]; then + if [[ ! "$actualPathType" =~ $expectedPathType ]]; then die "lib.filesystem.pathType \"$path\" == $actualPathType, but $expectedPathType was expected" fi } @@ -51,7 +51,8 @@ checkPathType "$PWD/directory" '"directory"' checkPathType "$PWD/regular" '"regular"' checkPathType "$PWD/symlink" '"symlink"' checkPathType "$PWD/fifo" '"unknown"' -checkPathType "$PWD/non-existent" "error: evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'" +# Different errors depending on whether the builtins.readFilePath primop is available or not +checkPathType "$PWD/non-existent" "error: (evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'|getting status of '$PWD/non-existent': No such file or directory)" checkPathIsDirectory() { local path=$1 From 2c95ebadf3d0c607921920a6ee1a64a492168dd9 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 17 May 2023 08:22:11 +0200 Subject: [PATCH 016/187] nixos/code-server: add more command line options --- .../modules/services/web-apps/code-server.nix | 222 +++++++++++++----- 1 file changed, 166 insertions(+), 56 deletions(-) diff --git a/nixos/modules/services/web-apps/code-server.nix b/nixos/modules/services/web-apps/code-server.nix index 24e34e0c5833..fa7d4a348c23 100644 --- a/nixos/modules/services/web-apps/code-server.nix +++ b/nixos/modules/services/web-apps/code-server.nix @@ -1,107 +1,199 @@ { config, lib, pkgs, ... }: -with lib; let - cfg = config.services.code-server; defaultUser = "code-server"; defaultGroup = defaultUser; - in { - ###### interface options = { services.code-server = { - enable = mkEnableOption (lib.mdDoc "code-server"); + enable = lib.mkEnableOption (lib.mdDoc "code-server"); - package = mkOption { - default = pkgs.code-server; - defaultText = lib.literalExpression "pkgs.code-server"; - description = lib.mdDoc "Which code-server derivation to use."; - type = types.package; - }; + package = lib.mkPackageOptionMD pkgs "code-server" { }; - extraPackages = mkOption { + extraPackages = lib.mkOption { default = [ ]; - description = lib.mdDoc "Packages that are available in the PATH of code-server."; - example = "[ pkgs.go ]"; - type = types.listOf types.package; + description = lib.mdDoc '' + Additional packages to add to the code-server {env}`PATH`. + ''; + example = lib.literalExpression "[ pkgs.go ]"; + type = lib.types.listOf lib.types.package; }; - extraEnvironment = mkOption { - type = types.attrsOf types.str; - description = - lib.mdDoc "Additional environment variables to passed to code-server."; + extraEnvironment = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + description = lib.mdDoc '' + Additional environment variables to pass to code-server. + ''; default = { }; example = { PKG_CONFIG_PATH = "/run/current-system/sw/lib/pkgconfig"; }; }; - extraArguments = mkOption { - default = [ "--disable-telemetry" ]; - description = lib.mdDoc "Additional arguments that passed to code-server"; - example = ''[ "--verbose" ]''; - type = types.listOf types.str; + extraArguments = lib.mkOption { + default = [ ]; + description = lib.mdDoc '' + Additional arguments to pass to code-server. + ''; + example = lib.literalExpression ''[ "--log=info" ]''; + type = lib.types.listOf lib.types.str; }; - host = mkOption { - default = "127.0.0.1"; - description = lib.mdDoc "The host-ip to bind to."; - type = types.str; + host = lib.mkOption { + default = "localhost"; + description = lib.mdDoc '' + The host name or IP address the server should listen to. + ''; + type = lib.types.str; }; - port = mkOption { + port = lib.mkOption { default = 4444; - description = lib.mdDoc "The port where code-server runs."; - type = types.port; + description = lib.mdDoc '' + The port the server should listen to. + ''; + type = lib.types.port; }; - auth = mkOption { + auth = lib.mkOption { default = "password"; - description = lib.mdDoc "The type of authentication to use."; - type = types.enum [ "none" "password" ]; + description = lib.mdDoc '' + The type of authentication to use. + ''; + type = lib.types.enum [ "none" "password" ]; }; - hashedPassword = mkOption { + hashedPassword = lib.mkOption { default = ""; - description = - lib.mdDoc "Create the password with: `echo -n 'thisismypassword' | npx argon2-cli -e`."; - type = types.str; + description = lib.mdDoc '' + Create the password with: `echo -n 'thisismypassword' | npx argon2-cli -e`. + ''; + type = lib.types.str; }; - user = mkOption { + user = lib.mkOption { default = defaultUser; example = "yourUser"; description = lib.mdDoc '' The user to run code-server as. By default, a user named `${defaultUser}` will be created. ''; - type = types.str; + type = lib.types.str; }; - group = mkOption { + group = lib.mkOption { default = defaultGroup; example = "yourGroup"; description = lib.mdDoc '' The group to run code-server under. By default, a group named `${defaultGroup}` will be created. ''; - type = types.str; + type = lib.types.str; }; - extraGroups = mkOption { + extraGroups = lib.mkOption { default = [ ]; - description = - lib.mdDoc "An array of additional groups for the `${defaultUser}` user."; + description = lib.mdDoc '' + An array of additional groups for the `${defaultUser}` user. + ''; example = [ "docker" ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; + }; + + socket = lib.mkOption { + default = null; + example = "/run/code-server/socket"; + description = lib.mdDoc '' + Path to a socket (bind-addr will be ignored). + ''; + type = lib.types.nullOr lib.types.str; + }; + + socketMode = lib.mkOption { + default = null; + description = lib.mdDoc '' + File mode of the socket. + ''; + type = lib.types.nullOr lib.types.str; + }; + + userDataDir = lib.mkOption { + default = null; + description = lib.mdDoc '' + Path to the user data directory. + ''; + type = lib.types.nullOr lib.types.str; + }; + + extensionsDir = lib.mkOption { + default = null; + description = lib.mdDoc '' + Path to the extensions directory. + ''; + type = lib.types.nullOr lib.types.str; + }; + + proxyDomain = lib.mkOption { + default = null; + example = "code-server.lan"; + description = lib.mdDoc '' + Domain used for proxying ports. + ''; + type = lib.types.nullOr lib.types.str; + }; + + disableTelemetry = lib.mkOption { + default = false; + example = true; + description = lib.mdDoc '' + Disable telemetry. + ''; + type = lib.types.bool; + }; + + disableUpdateCheck = lib.mkOption { + default = false; + example = true; + description = lib.mdDoc '' + Disable update check. + Without this flag, code-server checks every 6 hours against the latest github release and + then notifies you once every week that a new release is available. + ''; + type = lib.types.bool; + }; + + disableFileDownloads = lib.mkOption { + default = false; + example = true; + description = lib.mdDoc '' + Disable file downloads from Code. + ''; + type = lib.types.bool; + }; + + disableWorkspaceTrust = lib.mkOption { + default = false; + example = true; + description = lib.mdDoc '' + Disable Workspace Trust feature. + ''; + type = lib.types.bool; + }; + + disableGettingStartedOverride = lib.mkOption { + default = false; + example = true; + description = lib.mdDoc '' + Disable the coder/coder override in the Help: Getting Started page. + ''; + type = lib.types.bool; }; }; }; - ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.code-server = { - description = "VSCode server"; + description = "Code server"; wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; path = cfg.extraPackages; @@ -109,18 +201,37 @@ in { HASHED_PASSWORD = cfg.hashedPassword; } // cfg.extraEnvironment; serviceConfig = { - ExecStart = "${cfg.package}/bin/code-server --bind-addr ${cfg.host}:${toString cfg.port} --auth ${cfg.auth} " + lib.escapeShellArgs cfg.extraArguments; + ExecStart = '' + ${lib.getExe cfg.package} \ + --auth=${cfg.auth} \ + --bind-addr=${cfg.host}:${toString cfg.port} \ + '' + lib.optionalString (cfg.socket != null) '' + --socket=${cfg.socket} \ + '' + lib.optionalString (cfg.userDataDir != null) '' + --user-data-dir=${cfg.userDataDir} \ + '' + lib.optionalString (cfg.extensionsDir != null) '' + --extensions-dir=${cfg.extensionsDir} \ + '' + lib.optionalString (cfg.disableTelemetry == true) '' + --disable-telemetry \ + '' + lib.optionalString (cfg.disableUpdateCheck == true) '' + --disable-update-check \ + '' + lib.optionalString (cfg.disableFileDownloads == true) '' + --disable-file-downloads \ + '' + lib.optionalString (cfg.disableWorkspaceTrust == true) '' + --disable-workspace-trust \ + '' + lib.optionalString (cfg.disableGettingStartedOverride == true) '' + --disable-getting-started-override \ + '' + lib.escapeShellArgs cfg.extraArguments; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; RuntimeDirectory = cfg.user; User = cfg.user; Group = cfg.group; Restart = "on-failure"; }; - }; - users.users."${cfg.user}" = mkMerge [ - (mkIf (cfg.user == defaultUser) { + users.users."${cfg.user}" = lib.mkMerge [ + (lib.mkIf (cfg.user == defaultUser) { isNormalUser = true; description = "code-server user"; inherit (cfg) group; @@ -131,9 +242,8 @@ in { } ]; - users.groups."${defaultGroup}" = mkIf (cfg.group == defaultGroup) { }; - + users.groups."${defaultGroup}" = lib.mkIf (cfg.group == defaultGroup) { }; }; - meta.maintainers = with maintainers; [ stackshadow ]; + meta.maintainers = [ lib.maintainers.stackshadow ]; } From 371b4c3eb740835525ad460a55f535688e7656e0 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 17 May 2023 08:22:43 +0200 Subject: [PATCH 017/187] nixos/code-server: init tests --- nixos/tests/all-tests.nix | 1 + nixos/tests/code-server.nix | 22 ++++++++++++++++++++++ pkgs/servers/code-server/default.nix | 5 ++++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/code-server.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a4e4679a2ccd..a6cdf3dc08b6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -170,6 +170,7 @@ in { cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {}; cockpit = handleTest ./cockpit.nix {}; cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {}; + code-server = handleTest ./code-server.nix {}; coder = handleTest ./coder.nix {}; collectd = handleTest ./collectd.nix {}; connman = handleTest ./connman.nix {}; diff --git a/nixos/tests/code-server.nix b/nixos/tests/code-server.nix new file mode 100644 index 000000000000..7d523dfc617e --- /dev/null +++ b/nixos/tests/code-server.nix @@ -0,0 +1,22 @@ +import ./make-test-python.nix ({pkgs, lib, ...}: +{ + name = "code-server"; + + nodes = { + machine = {pkgs, ...}: { + services.code-server = { + enable = true; + auth = "none"; + }; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("code-server.service") + machine.wait_for_open_port(4444) + machine.succeed("curl -k --fail http://localhost:4444", timeout=10) + ''; + + meta.maintainers = [ lib.maintainers.drupol ]; +}) diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 008becc6fed7..234542f7f7c6 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper , cacert, moreutils, jq, git, rsync, pkg-config, yarn, python3 , esbuild, nodejs_16, node-gyp, libsecret, xorg, ripgrep -, AppKit, Cocoa, CoreServices, Security, cctools, xcbuild, quilt }: +, AppKit, Cocoa, CoreServices, Security, cctools, xcbuild, quilt, nixosTests }: let system = stdenv.hostPlatform.system; @@ -243,6 +243,9 @@ in stdenv.mkDerivation rec { prefetchYarnCache = lib.overrideDerivation yarnCache (d: { outputHash = lib.fakeSha256; }); + tests = { + inherit (nixosTests) code-server; + }; }; meta = with lib; { From 89250966ad7a1d61587ab2216b39b30ee8259742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elizabeth=20Pa=C5=BA?= Date: Fri, 26 May 2023 14:54:44 +0700 Subject: [PATCH 018/187] eslint_d: repackage using buildNpmPackage Apply suggestions from code review Co-authored-by: Sandro --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 122 ------------------ pkgs/development/tools/eslint_d/default.nix | 24 ++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 27 insertions(+), 123 deletions(-) create mode 100644 pkgs/development/tools/eslint_d/default.nix diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 04c8da00646d..bd961ba3051b 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -42,6 +42,7 @@ mapAliases { "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02 "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07 "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 + eslint_d = pkgs.eslint_d; # Added 2023-05-26 manta = pkgs.node-manta; # Added 2023-05-06 triton = pkgs.triton; # Added 2023-05-06 } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 75b7e49bcdc2..85e9d995f4ba 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -130,7 +130,6 @@ , "emojione" , "escape-string-regexp" , "eslint" -, "eslint_d" , "esy" , "expo-cli" , "fast-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 152ef95b4726..ad202144ef62 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -104382,128 +104382,6 @@ in bypassCache = true; reconstructLock = true; }; - eslint_d = nodeEnv.buildNodePackage { - name = "eslint_d"; - packageName = "eslint_d"; - version = "12.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-12.2.1.tgz"; - sha512 = "qOJ9cTi5AaH5bOgEoCkv41DJ637mHgzffbOLojwU4wadwC6qbR+OxVJRvVzH0v2XYmQOvw4eiJK7ivrr5SvzsA=="; - }; - dependencies = [ - sources."@eslint-community/eslint-utils-4.4.0" - sources."@eslint-community/regexpp-4.5.1" - sources."@eslint/eslintrc-2.0.3" - sources."@eslint/js-8.41.0" - sources."@humanwhocodes/config-array-0.11.8" - sources."@humanwhocodes/module-importer-1.0.1" - sources."@humanwhocodes/object-schema-1.2.1" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."acorn-8.8.2" - sources."acorn-jsx-5.3.2" - sources."ajv-6.12.6" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."callsites-3.1.0" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."supports-color-7.2.0" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."core_d-5.0.1" - sources."cross-spawn-7.0.3" - sources."debug-4.3.4" - sources."deep-is-0.1.4" - sources."doctrine-3.0.0" - sources."escape-string-regexp-4.0.0" - sources."eslint-8.41.0" - sources."eslint-scope-7.2.0" - sources."eslint-visitor-keys-3.4.1" - sources."espree-9.5.2" - sources."esquery-1.5.0" - sources."esrecurse-4.3.0" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."fastq-1.15.0" - sources."file-entry-cache-6.0.1" - sources."find-up-5.0.0" - sources."flat-cache-3.0.4" - sources."flatted-3.2.7" - sources."fs.realpath-1.0.0" - sources."glob-7.2.3" - sources."glob-parent-6.0.2" - sources."globals-13.20.0" - sources."graphemer-1.4.0" - sources."has-flag-4.0.0" - sources."ignore-5.2.4" - sources."import-fresh-3.3.0" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-path-inside-3.0.3" - sources."isexe-2.0.0" - sources."js-yaml-4.1.0" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."levn-0.4.1" - sources."locate-path-6.0.0" - sources."lodash.merge-4.6.2" - sources."minimatch-3.1.2" - sources."ms-2.1.2" - sources."nanolru-1.0.0" - sources."natural-compare-1.4.0" - sources."once-1.4.0" - sources."optionator-0.9.1" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."parent-module-1.0.1" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."prelude-ls-1.2.1" - sources."punycode-2.3.0" - sources."queue-microtask-1.2.3" - sources."resolve-from-4.0.0" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-parallel-1.2.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."strip-ansi-6.0.1" - sources."strip-json-comments-3.1.1" - sources."supports-color-8.1.1" - sources."text-table-0.2.0" - sources."type-check-0.4.0" - sources."type-fest-0.20.2" - sources."uri-js-4.4.1" - sources."which-2.0.2" - sources."word-wrap-1.2.3" - sources."wrappy-1.0.2" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Makes eslint the fastest linter on the planet"; - homepage = "https://github.com/mantoni/eslint_d.js"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; esy = nodeEnv.buildNodePackage { name = "esy"; packageName = "esy"; diff --git a/pkgs/development/tools/eslint_d/default.nix b/pkgs/development/tools/eslint_d/default.nix new file mode 100644 index 000000000000..abaf5857cf79 --- /dev/null +++ b/pkgs/development/tools/eslint_d/default.nix @@ -0,0 +1,24 @@ +{ lib, buildNpmPackage, fetchFromGitHub }: + +buildNpmPackage rec { + pname = "eslint_d"; + version = "12.2.1"; + + src = fetchFromGitHub { + owner = "mantoni"; + repo = "eslint_d.js"; + rev = "v${version}"; + hash = "sha256-rups2y07Y3GkvGt/T9lPG0NUoCxddp/P9PAYczZYNIw="; + }; + + npmDepsHash = "sha256-enHppjkX1syANgFmfAX+LlISyN5ltADjojjrvukAI+I="; + + dontNpmBuild = true; + + meta = with lib; { + description = "Makes eslint the fastest linter on the planet"; + homepage = "github.com/mantoni/eslint_d.js"; + license = licenses.mit; + maintainers = [ maintainers.ehllie ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4c8dc636006..9ca252894864 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -675,6 +675,8 @@ with pkgs; erosmb = callPackage ../tools/security/erosmb { }; + eslint_d = callPackage ../development/tools/eslint_d { }; + oauth2c = callPackage ../tools/security/oauth2c { }; octosuite = callPackage ../tools/security/octosuite { }; From 242601edc306c48b03d5e95abac3941bc1ac061b Mon Sep 17 00:00:00 2001 From: lunik1 Date: Sun, 28 May 2023 19:55:55 +0100 Subject: [PATCH 019/187] iosevka: 23.0.0 -> 24.1.0 Diff: https://github.com/be5invis/iosevka/compare/v24.1.0...v24.1.0 --- pkgs/data/fonts/iosevka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 4c954a61e27c..d5bbe3388e5b 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "23.0.0"; + version = "24.1.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-j7JE9UHG4xho0a4TqG5rpCJkYyVxgoLxBuRtNMGfkrw="; + hash = "sha256-Th4+SUP1gqusGA680Ddh1YHUYJFJIe9zUSNE+NIDl40="; }; - npmDepsHash = "sha256-/zutJ4kwGqBe3snMxyvReJdvlcsm+02ZZyFMdNN6gmc="; + npmDepsHash = "sha256-ChK3fUqPX1F8CljJGNiquS+5ZTlpeBEuYRPGoxSsyuI="; nativeBuildInputs = [ remarshal From 2a819f2a91b72222dddf1b756f89778b1b2d6c0a Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Fri, 26 May 2023 12:55:37 +0100 Subject: [PATCH 020/187] noson: init at 5.4.1 --- pkgs/applications/audio/noson/default.nix | 51 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/audio/noson/default.nix diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/applications/audio/noson/default.nix new file mode 100644 index 000000000000..f1b932013a6e --- /dev/null +++ b/pkgs/applications/audio/noson/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, flac +, libpulseaudio +, qtbase +, qtgraphicaleffects +, qtquickcontrols2 +, wrapQtAppsHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "noson"; + version = "5.4.1"; + + src = fetchFromGitHub { + owner = "janbar"; + repo = "noson-app"; + rev = finalAttrs.version; + hash = "sha256-7RrBfkUCRVzUGl+OT3OuoMlu4D3Sa7RpBefFgmfX1Fs="; + }; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + buildInputs = [ + flac + libpulseaudio + qtbase + qtgraphicaleffects + qtquickcontrols2 + ]; + + # wrapQtAppsHook doesn't automatically find noson-gui + dontWrapQtApps = true; + preFixup = '' + wrapQtApp "$out/lib/noson/noson-gui" + ''; + + meta = with lib; { + description = "SONOS controller for Linux (and macOS)"; + homepage = "https://janbar.github.io/noson-app/"; + mainProgram = "noson-app"; + platforms = platforms.linux ++ platforms.darwin; + license = [ licenses.gpl3Only ]; + maintainers = with maintainers; [ callahad ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ae88afbebba..62f74c6493ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31341,6 +31341,8 @@ with pkgs; mt32emu-smf2wav = callPackage ../applications/audio/munt/mt32emu-smf2wav.nix { }; + noson = libsForQt5.callPackage ../applications/audio/noson { }; + offpunk = callPackage ../applications/networking/browsers/offpunk { }; owl-compositor = callPackage ../applications/window-managers/owl { }; From a09878a2610031c31d1cf32082df5d87944397bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Tue, 30 May 2023 19:28:44 +0200 Subject: [PATCH 021/187] vscode-extensions.ms-vscode.live-server: init at 0.4.8 --- .../editors/vscode/extensions/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index cd7c0922df55..76ef00157b2d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2185,6 +2185,21 @@ let }; }; + ms-vscode.live-server = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "live-server"; + publisher = "ms-vscode"; + version = "0.4.8"; + sha256 = "sha256-/IrLq+nNxwQB1S1NIGYkv24DOY7Mc25eQ+orUfh42pg="; + }; + meta = { + description = "Launch a development local Server with live reload feature for static & dynamic pages"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.live-server"; + homepage = "https://github.com/microsoft/vscode-livepreview"; + license = lib.licenses.mit; + }; + }; + ms-vscode.makefile-tools = buildVscodeMarketplaceExtension { mktplcRef = { name = "makefile-tools"; From e111d64bdf67cc15764c63fcfadfb6528176faea Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 30 May 2023 19:40:40 +0200 Subject: [PATCH 022/187] linuxPackages.nvidia_x11_beta: 530.41.03 -> 535.43.02 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 5a54dd93de6c..1b47c400395f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -54,12 +54,12 @@ rec { }); beta = selectHighestVersion latest (generic { - version = "530.30.02"; - sha256_64bit = "sha256-R/3bvXoiumYZI9vObn9R7sVN9oBQxAbMBJDDv77eeWM="; - sha256_aarch64 = "sha256-/b5Jdow+O7ExXjtXTzDX38qgmBDUYDUl+5zxXvbi1ts="; - openSha256 = "sha256-LCtTyuJ8s8isTBt9HetItLqSjL1GOn0tPUarjuxHpMk="; - settingsSha256 = "sha256-6mynLNSaWeiB52HdwZ0EQNyPg+tuat0oEqpZGSb2yQo="; - persistencedSha256 = "sha256-h6iq0iD9F41a7s6jWKPTI+oVzgDRIr1Kk97LNH9rg7E="; + version = "535.43.02"; + sha256_64bit = "sha256-4KTdk4kGDmBGyHntMIzWRivUpEpzmra+p7RBsTL8mYM="; + sha256_aarch64 = "sha256-0blD8R+xpOVlitWefIbtw1d3KAnmWHBy7hkxGZHBrE4="; + openSha256 = "sha256-W1fwbbEEM7Z/S3J0djxGTtVTewbSALqX1G1OSpdajCM="; + settingsSha256 = "sha256-j0sSEbtF2fapv4GSthVTkmJga+ycmrGc1OnGpV6jEkc="; + persistencedSha256 = "sha256-M0ovNaJo8SZwLW4CQz9accNK79Z5JtTJ9kKwOzicRZ4="; }); # Vulkan developer beta driver From 10d634b3844b6a90878b2d81ed1c5e04eb1c02d8 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 30 May 2023 20:14:57 +0200 Subject: [PATCH 023/187] linuxPackages.nvidia_x11_beta: add new dependency new `libnvidia-pkcs11*` libraries depend on openssl, used by cuda --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 6455010d9887..2571812b9645 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -50,7 +50,7 @@ let libPathFor = pkgs: lib.makeLibraryPath (with pkgs; [ libdrm xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr xorg.libxcb zlib stdenv.cc.cc - wayland mesa libGL + wayland mesa libGL openssl ]); self = stdenv.mkDerivation { From 99b7ee661b60758181ff19e096db61da61384c78 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 30 May 2023 20:22:39 +0200 Subject: [PATCH 024/187] linuxPackages.nvidia_x11_beta: install nvoptix.bin --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 2ca74fb5f058..a2ced98b89dc 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -124,6 +124,10 @@ installPhase() { if [ -e nvngx.dll ] && [ -e _nvngx.dll ]; then install -Dm644 -t $i/lib/nvidia/wine/ nvngx.dll _nvngx.dll fi + + if [ -e nvoptix.bin ]; then + install -Dm444 -t $i/share/nvidia/ nvoptix.bin + fi done if [ -n "$bin" ]; then From 2d48d6d8a084ee6d3ac2ce0768d1d8f87e78f095 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 May 2023 23:25:53 +0000 Subject: [PATCH 025/187] squid: 5.8 -> 5.9 --- pkgs/servers/squid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 26fe887cb774..3ce09c88a848 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "squid"; - version = "5.8"; + version = "5.9"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v5/${pname}-${version}.tar.xz"; - hash = "sha256-fpafjI31acuGRtZ+5Z/b8mJ76toSlUwwHnwanBwRc08="; + hash = "sha256-P+XCAH2idXRGr5G275dPFUsggSCpo5OW6mgeXEq7BLU="; }; nativeBuildInputs = [ pkg-config ]; From d594e7f890dd15c571936987a4afc01992c66ab9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 30 May 2023 20:02:27 -0400 Subject: [PATCH 026/187] rustypaste-cli: init at 0.4.0 https://github.com/orhun/rustypaste-cli --- pkgs/tools/misc/rustypaste-cli/default.nix | 33 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/misc/rustypaste-cli/default.nix diff --git a/pkgs/tools/misc/rustypaste-cli/default.nix b/pkgs/tools/misc/rustypaste-cli/default.nix new file mode 100644 index 000000000000..e82465afcd47 --- /dev/null +++ b/pkgs/tools/misc/rustypaste-cli/default.nix @@ -0,0 +1,33 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "rustypaste-cli"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "rustypaste-cli"; + rev = "v${version}"; + hash = "sha256-Jl7fytDIW6MLY6VX7rDuX9PcZaIqENQbUTMUJKCa8Mg="; + }; + + cargoHash = "sha256-hICwrgzNpyYmNW1gEKgTsSjWyqCaOHc4X37O0R2oSzY="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "A CLI tool for rustypaste"; + homepage = "https://github.com/orhun/rustypaste-cli"; + changelog = "https://github.com/orhun/rustypaste-cli/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "rpaste"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6dc301d6ebe..406de38ca5ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12105,6 +12105,8 @@ with pkgs; rustypaste = callPackage ../servers/rustypaste { }; + rustypaste-cli = callPackage ../tools/misc/rustypaste-cli { }; + rw = callPackage ../tools/misc/rw { }; rwc = callPackage ../tools/system/rwc { }; From fce953dc7bff715b15efb8b2bb1a3df7e4dec6ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 04:20:49 +0000 Subject: [PATCH 027/187] mdbook-katex: 0.5.1 -> 0.5.2 --- pkgs/tools/text/mdbook-katex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index a1314d2ccd13..ba238e716fde 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.5.1"; + version = "0.5.2"; src = fetchCrate { inherit pname version; - hash = "sha256-RDNZ6+d+UbiQ/Eb2+YbhPyGVcM8079UFsnNvch/1oAs="; + hash = "sha256-5Xhc6tG4mi+225a8unfQ5Ualqql8RiKT3HndTY2x0gE="; }; - cargoHash = "sha256-An2mQ4kWGF3qk2v9VeQh700n7n/+3ShPqMfCnZmiIuc="; + cargoHash = "sha256-esQ8MiwWk1yYN5jwPVBEmKsjd4RDRO30N8JjTnsgCMI="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From f5dc7d877be26678a4cae381f7ba7e496e6d9bdf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 31 May 2023 08:04:45 +0200 Subject: [PATCH 028/187] python311Packages.certipy-ad: make it usable as module --- .../python-modules/certipy-ad}/default.nix | 23 +++++++++++++++---- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 21 insertions(+), 6 deletions(-) rename pkgs/{tools/security/certipy => development/python-modules/certipy-ad}/default.nix (69%) diff --git a/pkgs/tools/security/certipy/default.nix b/pkgs/development/python-modules/certipy-ad/default.nix similarity index 69% rename from pkgs/tools/security/certipy/default.nix rename to pkgs/development/python-modules/certipy-ad/default.nix index f369e97a5640..3f97d996bdfb 100644 --- a/pkgs/tools/security/certipy/default.nix +++ b/pkgs/development/python-modules/certipy-ad/default.nix @@ -1,13 +1,25 @@ { lib +, asn1crypto +, buildPythonPackage +, dnspython +, dsinternals , fetchFromGitHub -, python3 +, impacket +, ldap3 +, pyasn1 +, pycryptodome +, pyopenssl +, pythonOlder +, requests_ntlm }: -python3.pkgs.buildPythonApplication rec { - pname = "certipy"; +buildPythonPackage rec { + pname = "certipy-ad"; version = "4.4.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "ly4k"; repo = "Certipy"; @@ -21,11 +33,12 @@ python3.pkgs.buildPythonApplication rec { --replace "pyasn1==0.4.8" "pyasn1" ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ asn1crypto dnspython dsinternals impacket + pyopenssl ldap3 pyasn1 pycryptodome @@ -40,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { ]; meta = with lib; { - description = "Tool to enumerate and abuse misconfigurations in Active Directory Certificate Services"; + description = "Library and CLI tool to enumerate and abuse misconfigurations in Active Directory Certificate Services"; homepage = "https://github.com/ly4k/Certipy"; changelog = "https://github.com/ly4k/Certipy/releases/tag/${version}"; license = with licenses; [ mit ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b03392cf33e..c5bb96305ad9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3181,7 +3181,7 @@ with pkgs; certigo = callPackage ../tools/admin/certigo { }; - certipy = callPackage ../tools/security/certipy { }; + certipy = with python3Packages; toPythonApplication certipy-ad; catcli = python3Packages.callPackage ../tools/filesystems/catcli { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6d9722e67e3b..e096a5c00393 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1705,6 +1705,8 @@ self: super: with self; { certipy = callPackage ../development/python-modules/certipy { }; + certipy-ad = callPackage ../development/python-modules/certipy-ad { }; + certomancer = callPackage ../development/python-modules/certomancer { }; certvalidator = callPackage ../development/python-modules/certvalidator { }; From 94b7fae0368ff8177c1681cbbe16f7c20715337e Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 31 May 2023 06:11:34 +0000 Subject: [PATCH 029/187] clementine: unpin protobuf --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6dc301d6ebe..50e2b2f9a5da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6283,7 +6283,6 @@ with pkgs; clementine = libsForQt5.callPackage ../applications/audio/clementine { gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; - protobuf = protobuf3_19; }; mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { }; From 17c59fd8d50dd894248f9d975f75e5c91604fe01 Mon Sep 17 00:00:00 2001 From: Gemini Lasswell Date: Wed, 24 May 2023 17:16:10 -0700 Subject: [PATCH 030/187] gnome.gnome-flashback: fix screen not locking when idle Three autostarted desktop services are failing to start in the gnome-flashback desktop manager service, leaving warnings in the log: gnome-flashback-clipboard gnome-flashback-idle-monitor gnome-flashback-media-keys Fix by only remove $out/libexec/gnome-flashback-metacity (which is still not useful since we implement that ourselves) instead of the entire $out/libexec. The consequence of gnome-flashback-idle-monitor not running is that the desktop manager does not get the message that the system is idle, so the screen never dims or locks. --- pkgs/desktops/gnome/misc/gnome-flashback/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 6bb3484ed24a..cfe0903cce7b 100644 --- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -82,7 +82,7 @@ let rm -r $out/share/gnome-session rm -r $out/share/xsessions - rm -r $out/libexec + rm $out/libexec/gnome-flashback-metacity ''; nativeBuildInputs = [ From 1e708950b0b9bd0f7d3f773b2533aae94222c806 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 31 May 2023 09:46:12 +0200 Subject: [PATCH 031/187] openvscode-server: revert #232887 switch back to NodeJS 16 since microsoft/vscode does not support NodeJS 18 yet --- pkgs/servers/openvscode-server/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index e2b596a06716..a1c7bcb75553 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -107,6 +107,9 @@ in stdenv.mkDerivation rec { # set offline mirror to yarn cache we created in previous steps yarn --offline config set yarn-offline-mirror "${yarnCache}" + + # set nodedir, so we can build binaries later + npm config set nodedir "${nodejs}" ''; buildPhase = '' @@ -143,7 +146,7 @@ in stdenv.mkDerivation rec { # rebuild binaries, we use npm here, as yarn does not provide an alternative # that would not attempt to try to reinstall everything and break our # patching attempts - npm --prefix ./remote rebuild --build-from-source --nodedir ${nodejs} + npm --prefix ./remote rebuild --build-from-source # run postinstall scripts after patching find . -path "*node_modules" -prune -o \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa879730673d..aafbaa21c971 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35134,7 +35134,7 @@ with pkgs; vscodium-fhsWithPackages = vscodium.fhsWithPackages; openvscode-server = callPackage ../servers/openvscode-server { - nodejs = nodejs_18; + nodejs = nodejs_16; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; inherit (darwin) cctools; }; From 47eda8e00a28e5b09e7c1819f9a7fce5fee013e3 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Wed, 31 May 2023 09:18:18 +0200 Subject: [PATCH 032/187] isync: add optional support for XOAUTH2 authentication method --- pkgs/tools/networking/isync/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index d5af78afb66d..ccf32b438434 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, perl , openssl, db, cyrus_sasl, zlib , Security +, withCyrusSaslXoauth2 ? true, cyrus-sasl-xoauth2, makeWrapper }: stdenv.mkDerivation rec { @@ -20,10 +21,16 @@ stdenv.mkDerivation rec { ./work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch ]; - nativeBuildInputs = [ pkg-config perl ]; + nativeBuildInputs = [ pkg-config perl ] + ++ lib.optionals withCyrusSaslXoauth2 [ makeWrapper ]; buildInputs = [ openssl db cyrus_sasl zlib ] ++ lib.optionals stdenv.isDarwin [ Security ]; + postInstall = lib.optionalString withCyrusSaslXoauth2 '' + wrapProgram "$out/bin/mbsync" \ + --prefix SASL_PATH : "${lib.makeSearchPath "lib/sasl2" [ cyrus-sasl-xoauth2 ]}" + ''; + meta = with lib; { homepage = "http://isync.sourceforge.net/"; # https://sourceforge.net/projects/isync/ From 9afc4d4efb45ee0bb1089f68ac472bcaee8ec235 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 23 May 2023 14:41:53 +0200 Subject: [PATCH 033/187] pocketbase: 0.15.3 -> 0.16.3 updated pocketbase --- pkgs/servers/pocketbase/default.nix | 13 +++++++---- .../pocketbase/remove-update-method.patch | 22 +++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 pkgs/servers/pocketbase/remove-update-method.patch diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 462479745b87..fb0b0f012955 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.15.3"; + version = "0.16.3"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9LIOBfNOa+u7yLL7iWb/e7c8ZSiyjukqaY0ifVR2iSs="; + sha256 = "sha256-AKKCd80gxeL2s1yFX3pjwgxn7UDbrrhFUkMWDDcrN0c="; }; - vendorHash = "sha256-LFIJClPByaLXtsBOk7SjpJlIuQhWbVIs6H4PXhd7oyo="; + vendorHash = "sha256-J1vZn5x7wxM/UshcB+FdaiXiq4mZF7KvZxR5iPb37UQ="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; @@ -32,10 +32,15 @@ buildGoModule rec { mv $out/bin/base $out/bin/pocketbase ''; + patches = [ + # To provide a consistent update experience, we remove the built in update method + ./remove-update-method.patch + ]; + meta = with lib; { description = "Open Source realtime backend in 1 file"; homepage = "https://github.com/pocketbase/pocketbase"; license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ dit7ya thilobillerbeck ]; }; } diff --git a/pkgs/servers/pocketbase/remove-update-method.patch b/pkgs/servers/pocketbase/remove-update-method.patch new file mode 100644 index 000000000000..a68ae58bd0ba --- /dev/null +++ b/pkgs/servers/pocketbase/remove-update-method.patch @@ -0,0 +1,22 @@ +diff --git a/examples/base/main.go b/examples/base/main.go +index 908d31d..04b8f1d 100644 +--- a/examples/base/main.go ++++ b/examples/base/main.go +@@ -10,7 +10,6 @@ import ( + "github.com/pocketbase/pocketbase" + "github.com/pocketbase/pocketbase/apis" + "github.com/pocketbase/pocketbase/core" +- "github.com/pocketbase/pocketbase/plugins/ghupdate" + "github.com/pocketbase/pocketbase/plugins/jsvm" + "github.com/pocketbase/pocketbase/plugins/migratecmd" + ) +@@ -80,9 +79,6 @@ func main() { + Dir: migrationsDir, + }) + +- // GitHub selfupdate +- ghupdate.MustRegister(app, app.RootCmd, nil) +- + app.OnAfterBootstrap().Add(func(e *core.BootstrapEvent) error { + app.Dao().ModelQueryTimeout = time.Duration(queryTimeout) * time.Second + return nil From 53141d5fd72376a1c0d9cc35262fe2b88bd110e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 31 May 2023 15:05:55 +0200 Subject: [PATCH 034/187] rome: add passthru.updateScript --- pkgs/development/tools/rome/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/rome/default.nix b/pkgs/development/tools/rome/default.nix index 9dd2b7067a0f..bf9eadbde527 100644 --- a/pkgs/development/tools/rome/default.nix +++ b/pkgs/development/tools/rome/default.nix @@ -4,6 +4,7 @@ , pkg-config , stdenv , darwin +, nix-update-script }: rustPlatform.buildRustPackage rec { @@ -43,6 +44,10 @@ rustPlatform.buildRustPackage rec { "--skip commands::check::fs_error_dereferenced_symlink" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex" "cli%2Fv(.*)" ]; + }; + meta = with lib; { description = "A formatter, linter, bundler, and more for JavaScript, TypeScript, JSON, HTML, Markdown, and CSS"; homepage = "https://rome.tools"; From 536e245f420b393f3b83b737c0eccbff3e29bef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 31 May 2023 15:06:27 +0200 Subject: [PATCH 035/187] rome: 12.1.0 -> 12.1.3 --- pkgs/development/tools/rome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rome/default.nix b/pkgs/development/tools/rome/default.nix index bf9eadbde527..6a6ade47ccac 100644 --- a/pkgs/development/tools/rome/default.nix +++ b/pkgs/development/tools/rome/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rome"; - version = "12.1.0"; + version = "12.1.3"; src = fetchFromGitHub { owner = "rome"; repo = "tools"; rev = "cli/v${version}"; - hash = "sha256-XORu6c/9jrRObdM3qAGszhiUjo88NTzrTyrITuHyd/4="; + hash = "sha256-BlHpdfbyx6nU44vasEw0gRZ0ickyD2eUXPfeFZHSCbI="; }; - cargoHash = "sha256-75r280PMM1zDrqRmhuaU++5aZSCxeyqjHQls8pTzOgQ="; + cargoHash = "sha256-jHdoRymKPjBonT4TvAiTNzGBuTcNoPsvdFKEf33dpVc="; cargoBuildFlags = [ "--package" "rome_cli" ]; From 318dc3de9deeb0c682ee8b39f14de0b0d2a771ac Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 31 May 2023 21:46:48 +0800 Subject: [PATCH 036/187] cinnamon.bulky: 2.7 -> 2.8 https://github.com/linuxmint/bulky/compare/2.7...2.8 --- pkgs/desktops/cinnamon/bulky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 822c40694217..3858623902e7 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - hash = "sha256-Ps7ql6EAdoljQ6S8D2JxNSh0+jtEVZpnQv3fpvWkQSk="; + hash = "sha256-DZjX4xPyA30TTyOX+VyGSY/FWPX2316CYImDWRma9r0="; }; nativeBuildInputs = [ From 01e8760db8813d7446c22c2a095ebd2fdf29479a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Tue, 30 May 2023 18:07:06 +0000 Subject: [PATCH 037/187] grass: 8.2.0 -> 8.2.1. Fixes build failure. See build failure at: https://github.com/NixOS/nixpkgs/pull/215960#issuecomment-1568854089 --- pkgs/applications/gis/grass/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index bffbcf48fabd..ba147b5860c5 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -6,24 +6,26 @@ stdenv.mkDerivation rec { pname = "grass"; - version = "8.2.0"; + version = "8.2.1"; src = with lib; fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = version; - sha256 = "sha256-VK9FCqIwHGmeJe5lk12lpAGcsC1aPRBiI+XjACXjDd4="; + hash = "sha256-U3PQd3u9i+9Bc7BSd0gK8Ss+iV9BT1xLBDrKydtl3Qk="; }; nativeBuildInputs = [ pkg-config bison flex makeWrapper wrapGAppsHook - gdal geos libmysqlclient netcdf pdal + gdal geos libmysqlclient netcdf + pdal # for `pdal-config`; remove with next version, see https://github.com/OSGeo/grass/pull/2851 ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]); buildInputs = [ cairo zlib proj libtiff libpng fftw sqlite readline ffmpeg postgresql blas wxGTK32 proj-datumgrid zstd + pdal ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; strictDeps = true; From 6897f813ea827aedd3d2fa247f147ea7c4ae4e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Tue, 30 May 2023 18:14:58 +0000 Subject: [PATCH 038/187] grass: Be explicit about build-time tools and run-time dependencies --- pkgs/applications/gis/grass/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index ba147b5860c5..452ee11827cb 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -17,7 +17,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config bison flex makeWrapper wrapGAppsHook - gdal geos libmysqlclient netcdf + gdal # for `gdal-config` + geos # for `geos-config` + netcdf # for `nc-config` + libmysqlclient # for `mysql_config` pdal # for `pdal-config`; remove with next version, see https://github.com/OSGeo/grass/pull/2851 ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]); @@ -25,6 +28,10 @@ stdenv.mkDerivation rec { cairo zlib proj libtiff libpng fftw sqlite readline ffmpeg postgresql blas wxGTK32 proj-datumgrid zstd + gdal + geos + netcdf + libmysqlclient pdal ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; From 94fdd2a40a0505ecaa1c3031f6608386bbebc495 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 31 May 2023 11:35:00 -0400 Subject: [PATCH 039/187] nixVersions: use hash instead of sha256 --- pkgs/tools/package-management/nix/common.nix | 6 ++--- pkgs/tools/package-management/nix/default.nix | 22 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 6425ae8721ca..19b8d77bb4a7 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -1,11 +1,11 @@ { lib, fetchFromGitHub , version , suffix ? "" -, sha256 ? null -, src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit sha256; } +, hash ? null +, src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit hash; } , patches ? [ ] }: -assert (sha256 == null) -> (src != null); +assert (hash == null) -> (src != null); let atLeast24 = lib.versionAtLeast version "2.4pre"; atLeast25 = lib.versionAtLeast version "2.5pre"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 51366a35f29a..2e8a288c1490 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -32,7 +32,7 @@ let owner = "aws"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g="; + hash = "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g="; }; postPatch = '' # Avoid blanket -Werror to evade build failures on less @@ -94,21 +94,21 @@ let patch-monitorfdhup = fetchpatch2 { name = "nix-7585-monitor-fd-hup.patch"; url = "https://github.com/NixOS/nix/commit/1df3d62c769dc68c279e89f68fdd3723ed3bcb5a.patch"; - sha256 = "sha256-f+F0fUO+bqyPXjt+IXJtISVr589hdc3y+Cdrxznb+Nk="; + hash = "sha256-f+F0fUO+bqyPXjt+IXJtISVr589hdc3y+Cdrxznb+Nk="; }; # https://github.com/NixOS/nix/pull/7473 patch-sqlite-exception = fetchpatch2 { name = "nix-7473-sqlite-exception-add-message.patch"; url = "https://github.com/hercules-ci/nix/commit/c965f35de71cc9d88f912f6b90fd7213601e6eb8.patch"; - sha256 = "sha256-tI5nKU7SZgsJrxiskJ5nHZyfrWf5aZyKYExM0792N80="; + hash = "sha256-tI5nKU7SZgsJrxiskJ5nHZyfrWf5aZyKYExM0792N80="; }; patch-non-existing-output = fetchpatch { # https://github.com/NixOS/nix/pull/7283 name = "fix-requires-non-existing-output.patch"; url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch"; - sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0="; + hash = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0="; }; in lib.makeExtensible (self: { @@ -116,7 +116,7 @@ in lib.makeExtensible (self: { version = "2.3.16"; src = fetchurl { url = "https://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz"; - sha256 = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw="; + hash = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw="; }; patches = [ patch-monitorfdhup @@ -137,7 +137,7 @@ in lib.makeExtensible (self: { nix_2_10 = common { version = "2.10.3"; - sha256 = "sha256-B9EyDUz/9tlcWwf24lwxCFmkxuPTVW7HFYvp0C4xGbc="; + hash = "sha256-B9EyDUz/9tlcWwf24lwxCFmkxuPTVW7HFYvp0C4xGbc="; patches = [ ./patches/flaky-tests.patch patch-non-existing-output @@ -148,7 +148,7 @@ in lib.makeExtensible (self: { nix_2_11 = common { version = "2.11.1"; - sha256 = "sha256-qCV65kw09AG+EkdchDPq7RoeBznX0Q6Qa4yzPqobdOk="; + hash = "sha256-qCV65kw09AG+EkdchDPq7RoeBznX0Q6Qa4yzPqobdOk="; patches = [ ./patches/flaky-tests.patch patch-non-existing-output @@ -159,7 +159,7 @@ in lib.makeExtensible (self: { nix_2_12 = common { version = "2.12.1"; - sha256 = "sha256-GmHKhq0uFtdOiJnuBwj2YwlZjvh6YTkfQZgeu4e0dLU="; + hash = "sha256-GmHKhq0uFtdOiJnuBwj2YwlZjvh6YTkfQZgeu4e0dLU="; patches = [ ./patches/flaky-tests.patch patch-monitorfdhup @@ -169,17 +169,17 @@ in lib.makeExtensible (self: { nix_2_13 = common { version = "2.13.3"; - sha256 = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc="; + hash = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc="; }; nix_2_14 = common { version = "2.14.1"; - sha256 = "sha256-5aCmGZbsFcLIckCDfvnPD4clGPQI7qYAqHYlttN/Wkg="; + hash = "sha256-5aCmGZbsFcLIckCDfvnPD4clGPQI7qYAqHYlttN/Wkg="; }; nix_2_15 = common { version = "2.15.1"; - sha256 = "sha256-o7bxsNeq2LF6/dTl+lT2k50bSItkID80/uoZYVtlxro="; + hash = "sha256-o7bxsNeq2LF6/dTl+lT2k50bSItkID80/uoZYVtlxro="; }; stable = self.nix_2_13; From 6964ee2bea80cb60643a57a26c7107331686bb52 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 31 May 2023 11:50:14 -0400 Subject: [PATCH 040/187] nixVersions.nix_2_16: init at 2.16.0 --- pkgs/tools/package-management/nix/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2e8a288c1490..473d941ff780 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -182,6 +182,11 @@ in lib.makeExtensible (self: { hash = "sha256-o7bxsNeq2LF6/dTl+lT2k50bSItkID80/uoZYVtlxro="; }; + nix_2_16 = common { + version = "2.16.0"; + hash = "sha256-KjcQkI2HgbP7KOlHxb2DvyHISQXo2OExvvjqTyK7P0o="; + }; + stable = self.nix_2_13; unstable = self.nix_2_15; From 95b82210876197d231f81c6be34320c56c04be31 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 31 May 2023 11:50:55 -0400 Subject: [PATCH 041/187] nixVersions.unstable: 2.15 -> 2.16 --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 473d941ff780..b7e412c7a140 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -189,5 +189,5 @@ in lib.makeExtensible (self: { stable = self.nix_2_13; - unstable = self.nix_2_15; + unstable = self.nix_2_16; }) From 1af797e5e53b50905a2129fb2d53465d871191e8 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 31 May 2023 12:04:38 -0400 Subject: [PATCH 042/187] cargo-modules: 0.8.0 -> 0.9.0 Diff: https://github.com/regexident/cargo-modules/compare/0.8.0...0.9.0 Changelog: https://github.com/regexident/cargo-modules/blob/0.9.0/CHANGELOG.md --- pkgs/development/tools/rust/cargo-modules/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 987fff1ff49a..3cffebbe8df0 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - sha256 = "sha256-hbhj+D/zJDmRtPuEfg6ECvbfi2P7ecoiJASE8UXs9UE="; + hash = "sha256-F/AAPNhasXnSr0edl0PVSEnX/oWe6QkgHlDOFWXjOkk="; }; - cargoSha256 = "sha256-ydL2LQVewDmTsMWWAvTXSEp2bkfZdCSBxCIY8+DnABQ="; + cargoHash = "sha256-PHPpuMhv8Oj3whrLv9m20dALVUjS9JJRrhXR64wNaqU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From cf696bb1d54322715445e88906ffac3db2e26b31 Mon Sep 17 00:00:00 2001 From: traxys Date: Wed, 31 May 2023 18:33:56 +0200 Subject: [PATCH 043/187] dotacat: init at 0.3.0 --- pkgs/tools/misc/dotacat/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/dotacat/default.nix diff --git a/pkgs/tools/misc/dotacat/default.nix b/pkgs/tools/misc/dotacat/default.nix new file mode 100644 index 000000000000..07dc66b11674 --- /dev/null +++ b/pkgs/tools/misc/dotacat/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitLab +}: + +rustPlatform.buildRustPackage { + pname = "dotacat"; + version = "v0.3.0"; + + src = fetchFromGitLab { + domain = "gitlab.scd31.com"; + owner = "stephen"; + repo = "dotacat"; + rev = "f3b7e7816bed6b84123e066c57cf4003d77a85f1"; + hash = "sha256-y+u9PO01W+IzBatGHZpgOD7cRKjdeuy4/VX7/V9cu3Q="; + }; + + cargoHash = "sha256-ilvsqwvfQejo453veSZ5VMP8XhL7NryrDh+rYJkXk30="; + + meta = with lib; { + description = "Like lolcat, but fast"; + homepage = "https://gitlab.scd31.com/stephen/dotacat"; + license = licenses.mit; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d54dd0a911f3..3db364eaccfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6848,6 +6848,8 @@ with pkgs; dhcping = callPackage ../tools/networking/dhcping { }; + dotacat = callPackage ../tools/misc/dotacat { }; + di = callPackage ../tools/system/di { }; diction = callPackage ../tools/text/diction { }; From 4492a5f972ca5d5552caa7d99141290b3d889f07 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Mon, 29 May 2023 16:59:39 +0200 Subject: [PATCH 044/187] waybar: 0.9.17 -> 0.9.18 https://github.com/Alexays/Waybar/releases/tag/0.9.18 Add cava module, implemented as custom subproject like upstream: https://github.com/Alexays/Waybar/blob/master/subprojects/cava.wrap --- pkgs/applications/misc/waybar/default.nix | 34 +++++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index d22c9a908816..5ba7e6e013c1 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -16,6 +16,7 @@ , howard-hinnant-date , libinotify-kqueue , libxkbcommon +, cavaSupport ? true, alsa-lib, fftw, iniparser, ncurses, pipewire, portaudio, SDL2 , evdevSupport ? true, libevdev , inputSupport ? true, libinput , jackSupport ? true, libjack2 @@ -33,18 +34,37 @@ , wireplumberSupport ? true, wireplumber , withMediaPlayer ? mprisSupport && false, glib, gobject-introspection, python3 }: - +let + # Derived from subprojects/cava.wrap + libcava = rec { + version = "0.8.4"; + src = fetchFromGitHub { + owner = "LukashonakV"; + repo = "cava"; + rev = version; + hash = "sha256-66uc0CEriV9XOjSjFTt+bxghEXY1OGrpjd+7d6piJUI="; + }; + }; +in stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.17"; + version = "0.9.18"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - hash = "sha256-sdNenmzI/yvN9w4Z83ojDJi+2QBx2hxhJQCFkc5kCZw="; + hash = "sha256-bnaYNa1jb7kZ1mtMzeOQqz4tmBG1w5YXlQWoop1Q0Yc="; }; + postUnpack = lib.optional cavaSupport '' + ( + cd "$sourceRoot" + cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.8.4 + patchShebangs . + ) + ''; + nativeBuildInputs = [ meson ninja pkg-config scdoc wrapGAppsHook ] ++ lib.optional withMediaPlayer gobject-introspection; @@ -60,6 +80,13 @@ stdenv.mkDerivation rec { buildInputs = with lib; [ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ] ++ optional (!stdenv.isLinux) libinotify-kqueue + ++ optional cavaSupport alsa-lib + ++ optional cavaSupport iniparser + ++ optional cavaSupport fftw + ++ optional cavaSupport ncurses + ++ optional cavaSupport pipewire + ++ optional cavaSupport portaudio + ++ optional cavaSupport SDL2 ++ optional evdevSupport libevdev ++ optional inputSupport libinput ++ optional jackSupport libjack2 @@ -80,6 +107,7 @@ stdenv.mkDerivation rec { mesonFlags = (lib.mapAttrsToList (option: enable: "-D${option}=${if enable then "enabled" else "disabled"}") { + cava = cavaSupport; dbusmenu-gtk = traySupport; jack = jackSupport; libinput = inputSupport; From ffbf6f27c97cd4ecb794c39fd183363be72c5a1f Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 25 May 2023 14:42:29 -0400 Subject: [PATCH 045/187] python3.pkgs.fetchPypi: deprecate in favor of top-level fetchPypi --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ pkgs/development/interpreters/python/python-packages-base.nix | 2 -- pkgs/top-level/python-aliases.nix | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index ef4465d9ddfd..8737ee88fb22 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -16,6 +16,8 @@ - The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`. +- `python3.pkgs.fetchPypi` (and `python3Packages.fetchPypi`) has been deprecated in favor of top-level `fetchPypi`. + - `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides ## Other Notable Changes {#sec-release-23.11-notable-changes} diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 0899ad18e967..6a723413c850 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -8,7 +8,6 @@ self: let inherit (self) callPackage; - inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; namePrefix = python.libPrefix + "-"; @@ -92,7 +91,6 @@ in { inherit lib pkgs stdenv; inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; inherit buildPythonPackage buildPythonApplication; - inherit (pkgs) fetchPypi; inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; inherit toPythonModule toPythonApplication; inherit buildSetupcfg; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c9d0febd30c1..3fb7e5a82bf7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -104,6 +104,7 @@ mapAliases ({ face_recognition_models = face-recognition-models; # added 2022-10-15 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 + inherit (super.pkgs) fetchPypi; # added 2023-05-25 filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19 flaskbabel = flask-babel; # added 2023-01-19 flask_login = flask-login; # added 2022-10-17 From eb58d1e9287da37e81e5a0291ab4b6497b41f7f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 17:51:26 +0000 Subject: [PATCH 046/187] intel-compute-runtime: 23.13.26032.30 -> 23.17.26241.15 --- pkgs/os-specific/linux/intel-compute-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 9bdad84e5a81..fe1bb139a10b 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "23.13.26032.30"; + version = "23.17.26241.15"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-KaU+11lY/chCySao1vLOejDJ9i4yjYWxaz0pzd8lWNY="; + sha256 = "sha256-A0gtSM6e+VcfcGG/6zReV2LIXq6tGbWIwDQFlQ2TW28="; }; nativeBuildInputs = [ cmake pkg-config ]; From 1734b3245dd3e29f1d0d18fdcf17d6bfe2904664 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 31 May 2023 14:27:37 -0400 Subject: [PATCH 047/187] codemov: unstable-2022-10-24 -> unstable-2023-05-28 Diff: https://github.com/sloganking/codemov/compare/d51e83246eafef32c3a3f54407fe49eb9801f5ea...ab4b287c5cdb64f8a1f378c54070fde5a1f3be5b --- pkgs/tools/misc/codemov/Cargo.lock | 348 ++++++++++++---------------- pkgs/tools/misc/codemov/default.nix | 6 +- 2 files changed, 153 insertions(+), 201 deletions(-) diff --git a/pkgs/tools/misc/codemov/Cargo.lock b/pkgs/tools/misc/codemov/Cargo.lock index 6682a6d7fe88..a78c7abb7bdf 100644 --- a/pkgs/tools/misc/codemov/Cargo.lock +++ b/pkgs/tools/misc/codemov/Cargo.lock @@ -17,6 +17,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", +] + [[package]] name = "ansi_term" version = "0.12.1" @@ -28,9 +37,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ "anstyle", "anstyle-parse", @@ -67,9 +76,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -77,9 +86,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "atty" @@ -100,9 +109,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bincode" @@ -127,9 +136,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bstr" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" dependencies = [ "memchr", "once_cell", @@ -139,9 +148,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" @@ -175,117 +184,79 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "3.2.23" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "atty", - "bitflags", - "clap_derive 3.2.18", - "clap_lex 0.2.4", - "indexmap", - "once_cell", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62" +checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" dependencies = [ "clap_builder", - "clap_derive 4.2.0", + "clap_derive", "once_cell", ] [[package]] name = "clap_builder" -version = "4.2.4" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749" +checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" dependencies = [ "anstream", "anstyle", "bitflags", - "clap_lex 0.4.1", + "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "clap_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.15", + "syn", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] name = "codemov" version = "0.1.0" dependencies = [ - "clap 3.2.23", + "clap", "codevis", "glob", "image", - "open", + "open 4.1.0", "prodash", "syntect", ] [[package]] name = "codevis" -version = "0.4.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "430a32b8cfd95de3d11b724050874a030946d1d52face7fdc5530a959b6dc714" +checksum = "daaaadded55f3c0171c36b0bbfec52dc012afc18018d9515ad836ef5f8b14d99" dependencies = [ "anyhow", "bstr", "bytesize", - "clap 4.2.4", + "clap", "flume", "ignore", "image", "memmap2", "num_cpus", - "open", + "open 3.2.0", "prodash", "signal-hook", "syntect", + "unifont-bitmap", ] [[package]] @@ -460,12 +431,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.6.2", + "miniz_oxide 0.7.1", ] [[package]] @@ -534,7 +505,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "bstr", "fnv", "log", @@ -649,15 +620,24 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi 0.3.1", "libc", "windows-sys 0.48.0", ] +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + [[package]] name = "is-terminal" version = "0.4.7" @@ -670,6 +650,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + [[package]] name = "itoa" version = "1.0.6" @@ -687,9 +677,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] @@ -708,9 +698,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.141" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "line-wrap" @@ -729,9 +719,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f508063cc7bb32987c71511216bd5a32be15bccb6a80b52df8b9d7f01fc3aa2" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "lock_api" @@ -745,12 +735,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" [[package]] name = "memchr" @@ -797,14 +784,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", "wasi", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -858,9 +845,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" [[package]] name = "onig" @@ -895,10 +882,14 @@ dependencies = [ ] [[package]] -name = "os_str_bytes" -version = "6.5.0" +name = "open" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" +checksum = "d16814a067484415fda653868c9be0ac5f2abd2ef5d951082a5f2fe1b3662944" +dependencies = [ + "is-wsl", + "pathdiff", +] [[package]] name = "parking_lot" @@ -956,29 +947,29 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[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 = "plist" @@ -1007,35 +998,11 @@ dependencies = [ "miniz_oxide 0.7.1", ] -[[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", - "quote", - "syn 1.0.109", - "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", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" dependencies = [ "unicode-ident", ] @@ -1077,9 +1044,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -1117,13 +1084,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.1", "memchr", - "regex-syntax", + "regex-syntax 0.7.2", ] [[package]] @@ -1139,10 +1106,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "rustix" -version = "0.37.12" +name = "regex-syntax" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "722529a737f5a942fdbac3a46cee213053196737c5eaa3386d52e85b786f2659" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" + +[[package]] +name = "rustix" +version = "0.37.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", "errno", @@ -1181,19 +1154,19 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn", ] [[package]] @@ -1266,20 +1239,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.109" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", @@ -1300,7 +1262,7 @@ dependencies = [ "once_cell", "onig", "plist", - "regex-syntax", + "regex-syntax 0.6.29", "serde", "serde_derive", "serde_json", @@ -1309,21 +1271,6 @@ dependencies = [ "yaml-rust", ] -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" version = "1.0.40" @@ -1341,7 +1288,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn", ] [[package]] @@ -1367,9 +1314,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", "serde", @@ -1379,24 +1326,24 @@ 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", ] [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "unicode-width" @@ -1404,18 +1351,23 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +[[package]] +name = "unifont-bitmap" +version = "1.0.0+unifont-14.0.01" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836143529d8e332f71df6f8f42e311af5453d368828336c4711f798d4cd9469d" +dependencies = [ + "byteorder", + "flate2", + "once_cell", +] + [[package]] name = "utf8parse" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" -[[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.3" @@ -1434,9 +1386,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1444,24 +1396,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1469,22 +1421,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "weezl" @@ -1681,9 +1633,9 @@ dependencies = [ [[package]] name = "zune-inflate" -version = "0.2.53" +version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "440a08fd59c6442e4b846ea9b10386c38307eae728b216e1ab2c305d1c9daaf8" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" dependencies = [ "simd-adler32", ] diff --git a/pkgs/tools/misc/codemov/default.nix b/pkgs/tools/misc/codemov/default.nix index f4a88a74bf94..dc3d708e30db 100644 --- a/pkgs/tools/misc/codemov/default.nix +++ b/pkgs/tools/misc/codemov/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage { pname = "codemov"; - version = "unstable-2022-10-24"; + version = "unstable-2023-05-28"; src = fetchFromGitHub { owner = "sloganking"; repo = "codemov"; - rev = "d51e83246eafef32c3a3f54407fe49eb9801f5ea"; - hash = "sha256-4Z3XASFlALCnX1guDqhBfvGNZ0V1XSruJvvSm0xr/t4="; + rev = "ab4b287c5cdb64f8a1f378c54070fde5a1f3be5b"; + hash = "sha256-miW/s3Ox2Z5qyFZqAp/FqHhc5jC6s+4DzxlHQhzCc2w="; }; cargoLock = { From 8890bf2a730f24b945c003477fabe9a17bb86082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Sun, 28 May 2023 00:14:40 +0300 Subject: [PATCH 048/187] Add vscode-extensions.RoweWilsonFrederiskHolme.wikitext This extension is really useful when writting WikiMedia documents. --- .../editors/vscode/extensions/default.nix | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index cd7c0922df55..56b95cc3d9b7 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2546,6 +2546,27 @@ let }; }; + RoweWilsonFrederiskHolme.wikitext = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "wikitext"; + publisher = "RoweWilsonFrederiskHolme"; + version = "3.8.0"; + sha256 = "30540a85163e797028eec9bc3db1866bbf473e98615bf6ade6d1d672017ebe52"; + }; + meta = { + description = "Extension that helps users view and write MediaWiki's Wikitext files"; + longDescription = '' + With this extension, you can more easily discover your grammatical problems + through the marked and styled text. The plugin is based on MediaWiki's + Wikitext standard, but the rules are somewhat stricter, which helps users + write text that is easier to read and maintain. + ''; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=RoweWilsonFrederiskHolme.wikitext"; + homepage = "https://github.com/Frederisk/Wikitext-VSCode-Extension"; + license = lib.licenses.mit; + }; + }; + rubbersheep.gi = buildVscodeMarketplaceExtension { mktplcRef = { name = "gi"; From 330fb83cd8363624945d7cf00e3000dbdc7fae01 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 31 May 2023 21:53:11 +0200 Subject: [PATCH 049/187] vscode-extensions.tailscale.vscode-tailscale: init at 0.4.0 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index cd7c0922df55..a848d91fc040 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2879,6 +2879,23 @@ let }; }; + tailscale.vscode-tailscale = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-tailscale"; + publisher = "tailscale"; + version = "0.4.0"; + sha256 = "sha256-c/BZHKHs2EKd37148dSxEeP1wBXv75HhDqzegmHPjOs="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/tailscale.vscode-tailscale/changelog"; + description = "VSCode extension to share a port over the internet with Tailscale Funnel"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Tailscale.vscode-tailscale"; + homepage = "https://github.com/tailscale-dev/vscode-tailscale"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.drupol ]; + }; + }; + takayama.vscode-qq = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "takayama"; From 6d4da8a9aa68d550e9c60ae75cac5adbbe8272d2 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Thu, 1 Jun 2023 07:42:31 +1000 Subject: [PATCH 050/187] cmocka: unmark as broken for static builds --- pkgs/development/libraries/cmocka/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix index 5eefba8eb478..968bb91181ce 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -52,6 +52,5 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ kragniz rasendubi ]; - broken = stdenv.hostPlatform.isStatic; # See https://github.com/NixOS/nixpkgs/issues/213623 }; } From 7b1ad6d2a4aa1d73c308abb0e32ee107847b09cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 22:12:06 +0000 Subject: [PATCH 051/187] gerrit: 3.7.2 -> 3.8.0 --- pkgs/applications/version-management/gerrit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 51d626518254..866480826602 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.7.2"; + version = "3.8.0"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "sha256-XB5bplYpid2vxSjm1DCGYsd3d5kUk8PlnhFdCAORX6k="; + sha256 = "sha256-wial+K5eUZSJ+asFBLrFoJQOLWLHkl5ot4b4CIsg7Tc="; }; buildCommand = '' From 7d00ba66fd9b2912adad79d4d819b39adf955554 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Jun 2023 00:16:01 +0200 Subject: [PATCH 052/187] python311Packages.zha-quirks: 0.0.99 -> 0.0.100 Diff: https://github.com/zigpy/zha-device-handlers/compare/refs/tags/0.0.99...0.0.100 Changelog: https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.100 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 0c2fad1bcead..2e9c3eb80f7b 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.99"; + version = "0.0.100"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-09heRXlaqc+qbQj+LKodu6Pq1pgQ5eVZbihOMeO5EWU="; + hash = "sha256-EWGsnUnr83YuhEdGJ3YtlYm9VT+aTuUjfganhOeqt7o="; }; propagatedBuildInputs = [ From e8bb343be8558263ce8a8c8d4d2b2370e8b6d213 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Jun 2023 00:18:07 +0200 Subject: [PATCH 053/187] python311Packages.aioairzone-cloud: 0.1.6 -> 0.1.7 Diff: https://github.com/Noltari/aioairzone-cloud/compare/refs/tags/0.1.6...0.1.7 Changelog: https://github.com/Noltari/aioairzone-cloud/releases/tag/0.1.7 --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 82e3576e9f47..eed58dbc8e49 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.1.6"; + version = "0.1.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-9VLjZaIru3FRZyovZ4j8ks7lNZOft2bwAzDodTdqjH0="; + hash = "sha256-IkV0gwsd/87GZ9LSQu6azQuoxPXuKNbjZMekVKxAl/A="; }; nativeBuildInputs = [ From 761b942d440d0fbffb533eb2d5adbe329359a054 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:11:05 +0200 Subject: [PATCH 054/187] python311Packages.flow-record: 3.9 -> 3.10 Changelog: https://github.com/fox-it/flow.record/releases/tag/3.10 --- .../python-modules/flow-record/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index 825c7f19436b..bd21e113f75b 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , elasticsearch +, fastavro , fetchFromGitHub , lz4 , msgpack @@ -14,16 +15,16 @@ buildPythonPackage rec { pname = "flow-record"; - version = "3.9"; + version = "3.10"; format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "fox-it"; repo = "flow.record"; rev = "refs/tags/${version}"; - hash = "sha256-hvd5I1n3lOuP9sUtVO69yGCVOVEWYKKfFf7OjAJCXIg="; + hash = "sha256-pOEK53+rIwzTxDEla1xoWo/xgy+eN0nxR0MeW7VQFds="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,11 +47,14 @@ buildPythonPackage rec { elastic = [ elasticsearch ]; + avro = [ + fastavro + ] ++ fastavro.optional-dependencies.snappy; }; nativeCheckInputs = [ pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "flow.record" @@ -61,7 +65,6 @@ buildPythonPackage rec { "tests/test_rdump.py" ]; - disabledTests = [ "test_rdump_fieldtype_path_json" ]; From 85f19dd675ca6e43263b8a9eafd454b6d7ad7131 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:27:33 +0200 Subject: [PATCH 055/187] python311Packages.dissect-cstruct: 3.6 -> 3.7 Diff: https://github.com/fox-it/dissect.cstruct/compare/refs/tags/3.6...3.7 Changelog: https://github.com/fox-it/dissect.cstruct/releases/tag/3.7 --- pkgs/development/python-modules/dissect-cstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index 7b290fa69ef9..e6ba0f5057da 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-f6cE1x7TsjJsdACLZjsbyfnTDPXcpXqs0qBo4l+fKS4="; + hash = "sha256-K+crraBIMCtT5WsGgyxoAZ49ff7ZUHga2qYtih6w0Ug="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 3a3987ea7a8051dec3317e23c3fcbb05305a8470 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:38:44 +0200 Subject: [PATCH 056/187] python311Packages.dissect-cobaltstrike: init at 1.0.0 --- .../dissect-cobaltstrike/default.nix | 83 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/development/python-modules/dissect-cobaltstrike/default.nix diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix new file mode 100644 index 000000000000..494273003642 --- /dev/null +++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -0,0 +1,83 @@ +{ lib +, buildPythonPackage +, dissect-cstruct +, dissect-util +, fetchFromGitHub +, flow-record +, httpx +, lark +, pycryptodome +, pyshark +, pytest-httpserver +, pytestCheckHook +, pythonOlder +, rich +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "dissect-cobaltstrike"; + version = "1.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.cobaltstrike"; + rev = "refs/tags/v${version}"; + hash = "sha256-CS50c3r7sdxp3CRS6XJ4QUmUFtmhFg6rSdKfYzJSOV4="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dissect-cstruct + dissect-util + lark + ]; + + passthru.optional-dependencies = { + c2 = [ + flow-record + httpx + pycryptodome + ]; + pcap = [ + flow-record + httpx + pycryptodome + pyshark + ]; + full = [ + flow-record + httpx + pycryptodome + pyshark + rich + ]; + }; + + nativeCheckInputs = [ + pytest-httpserver + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "dissect.cobaltstrike" + ]; + + meta = with lib; { + description = "Dissect module implementing a parser for Cobalt Strike related data"; + homepage = "https://github.com/fox-it/dissect.cobaltstrike"; + changelog = "https://github.com/fox-it/dissect.cobaltstrike/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e7a81ab193cd..08467e08dd7f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2551,6 +2551,8 @@ self: super: with self; { dissect-clfs = callPackage ../development/python-modules/dissect-clfs { }; + dissect-cobaltstrike = callPackage ../development/python-modules/dissect-cobaltstrike { }; + dissect-cstruct = callPackage ../development/python-modules/dissect-cstruct { }; dissect-fat = callPackage ../development/python-modules/dissect-fat { }; From 307563b5adccfe560798c53dba39de1c276ba612 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:42:06 +0200 Subject: [PATCH 057/187] python311Packages.dissect-squashfs: 1.1 -> 1.2 Diff: https://github.com/fox-it/dissect.squashfs/compare/refs/tags/1.1...1.2 Changelog: https://github.com/fox-it/dissect.squashfs/releases/tag/1.2 --- pkgs/development/python-modules/dissect-squashfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix index 6daa2d24922d..7bfb0a2fcf49 100644 --- a/pkgs/development/python-modules/dissect-squashfs/default.nix +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dissect-squashfs"; - version = "1.1"; + version = "1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.squashfs"; rev = "refs/tags/${version}"; - hash = "sha256-fcL0kPuJaole9EkrqU8Gouh3yquT2QaO8//R0ixMuP8="; + hash = "sha256-TgrtONUis0yD3s0JxJ0mNGLjEKlDgGZ+eO6NvSBTK14="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 301043deec102c577831b99920129060d96c9420 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:42:22 +0200 Subject: [PATCH 058/187] python311Packages.dissect-evidence: 3.4 -> 3.5 Diff: https://github.com/fox-it/dissect.evidence/compare/refs/tags/3.4...3.5 Changelog: https://github.com/fox-it/dissect.evidence/releases/tag/3.5 --- pkgs/development/python-modules/dissect-evidence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix index 3e1c2fd8f9f8..dd59ea746205 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-evidence"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.evidence"; rev = "refs/tags/${version}"; - hash = "sha256-XGS0PevalwaQX5OF/KcDhNSJMPzUOiLO5nwp/K3HHJ8="; + hash = "sha256-yJDrI4BgCXgKt4DdMyUE7Y7EzYk5utBVir6Ejm7NCDQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 4a410cb1ed32d37e9f0e386311527a31aecf8090 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:42:35 +0200 Subject: [PATCH 059/187] python311Packages.dissect-eventlog: 3.4 -> 3.5 Diff: https://github.com/fox-it/dissect.eventlog/compare/refs/tags/3.4...3.5 Changelog: https://github.com/fox-it/dissect.eventlog/releases/tag/3.5 --- pkgs/development/python-modules/dissect-eventlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-eventlog/default.nix b/pkgs/development/python-modules/dissect-eventlog/default.nix index 076540e20e00..919ac9ce2423 100644 --- a/pkgs/development/python-modules/dissect-eventlog/default.nix +++ b/pkgs/development/python-modules/dissect-eventlog/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-eventlog"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.eventlog"; rev = "refs/tags/${version}"; - hash = "sha256-dU34eEUwRGHm/S0w6rnXJmootv1trkhKlXjWcfCFB3Q="; + hash = "sha256-YSJnNT+zzsS7aKT44NFwU3AmvhbTtW6kIgNd/CbSLYY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From fd8d5375c4fb37cab33fb4871b2b92a267fa7c9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:42:48 +0200 Subject: [PATCH 060/187] python311Packages.dissect-shellitem: 3.4 -> 3.5 Diff: https://github.com/fox-it/dissect.shellitem/compare/refs/tags/3.4...3.5 Changelog: https://github.com/fox-it/dissect.shellitem/releases/tag/3.5 --- pkgs/development/python-modules/dissect-shellitem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index 45bf80b9d963..0a3ce03ff4c9 100644 --- a/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-shellitem"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.shellitem"; rev = "refs/tags/${version}"; - hash = "sha256-BL1eTxL82hjsGBRK5mBNxygEzQvjN8P6/tu6KOkHf9s="; + hash = "sha256-m/RBOF7BbYZuqfljgc/lE+HpRs+6wNNiwNa1/6SXp8U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From de3e95d00474ea1bcb829fd036709a3b596fe073 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:43:02 +0200 Subject: [PATCH 061/187] python311Packages.dissect-thumbcache: 1.3 -> 1.4 Diff: https://github.com/fox-it/dissect.thumbcache/compare/refs/tags/1.3...1.4 Changelog: https://github.com/fox-it/dissect.thumbcache/releases/tag/1.4 --- .../development/python-modules/dissect-thumbcache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-thumbcache/default.nix b/pkgs/development/python-modules/dissect-thumbcache/default.nix index 3841603b9f96..f7b2f3a01bbc 100644 --- a/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-thumbcache"; - version = "1.3"; + version = "1.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.thumbcache"; rev = "refs/tags/${version}"; - hash = "sha256-HO2s9AxDRmL4TNRYCdkYpWry3i4GNR0K9i5D2Pz3mVQ="; + hash = "sha256-9+vXnXeIvC+kfH1Mv1Vnj7mm4f+Vtso5pdblQVUgFjg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 941a303b756b87a622472dae3bf1ff0292b1b544 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:43:15 +0200 Subject: [PATCH 062/187] python311Packages.dissect-hypervisor: 3.6 -> 3.7 Diff: https://github.com/fox-it/dissect.hypervisor/compare/refs/tags/3.6...3.7 Changelog: https://github.com/fox-it/dissect.hypervisor/releases/tag/3.7 --- .../development/python-modules/dissect-hypervisor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index d0e1edbe3e10..962338174a6c 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-6oPLl18U0TtVCkLsNN8Q4hBLArfXWWRkZI4VrFKJd9Q="; + hash = "sha256-glBmRzL5u+r668XHOZb6Lv0tSVvfQASPRUMAAJN4YHU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From bf5a9d9fbda996d46aadac6ebf4a0306029efdf1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:43:28 +0200 Subject: [PATCH 063/187] python311Packages.dissect-executable: 1.2 -> 1.3 Diff: https://github.com/fox-it/dissect.executable/compare/refs/tags/1.2...1.3 Changelog: https://github.com/fox-it/dissect.executable/releases/tag/1.3 --- .../development/python-modules/dissect-executable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-executable/default.nix b/pkgs/development/python-modules/dissect-executable/default.nix index ca079cf3c94c..64bd4957cd56 100644 --- a/pkgs/development/python-modules/dissect-executable/default.nix +++ b/pkgs/development/python-modules/dissect-executable/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-executable"; - version = "1.2"; + version = "1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.executable"; rev = "refs/tags/${version}"; - hash = "sha256-I/LwIGce1bebAvjVuFE0rJAuJ/65xMTIim6M0BJR6TI="; + hash = "sha256-YGpClgRVW8l5Ln6e3RrH1RhOSuZ/A6Kfjf1plomWE9U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 9ca8ba652fd036ca863068f43caac53367305b56 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:43:43 +0200 Subject: [PATCH 064/187] python311Packages.dissect-vmfs: 3.4 -> 3.5 Diff: https://github.com/fox-it/dissect.vmfs/compare/refs/tags/3.4...3.5 Changelog: https://github.com/fox-it/dissect.vmfs/releases/tag/3.5 --- pkgs/development/python-modules/dissect-vmfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-vmfs/default.nix b/pkgs/development/python-modules/dissect-vmfs/default.nix index 020c9e0d2970..8ea98013e05b 100644 --- a/pkgs/development/python-modules/dissect-vmfs/default.nix +++ b/pkgs/development/python-modules/dissect-vmfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-vmfs"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.vmfs"; rev = "refs/tags/${version}"; - hash = "sha256-zLQzUSJnm5DOhKKCEWX1kVEmJK0oBGKHaWucVn1HOjg="; + hash = "sha256-diCJfaR5Q3s44ZJpxZv5R0rx8aThpZzyyLn/4dqJERQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 1615025a939bf90530d728118476e1aedc065669 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:43:55 +0200 Subject: [PATCH 065/187] python311Packages.dissect-util: 3.7 -> 3.8 Diff: https://github.com/fox-it/dissect.util/compare/refs/tags/3.7...3.8 Changelog: https://github.com/fox-it/dissect.util/releases/tag/3.8 --- pkgs/development/python-modules/dissect-util/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index a89e53e86890..000ac19ecc80 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.7"; + version = "3.8"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-uITIEiy4U2B0AQobvQIG/bYjelPmM8fyQduDhtC29QI="; + hash = "sha256-w2RT3tInp30IWk3CY02coJtSHdgWMravWwTK69GgSHc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 5beca245712a33cc77aa5ed30f60982b8edee81f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:44:12 +0200 Subject: [PATCH 066/187] python311Packages.dissect-regf: 3.4 -> 3.5 Diff: https://github.com/fox-it/dissect.regf/compare/refs/tags/3.4...3.5 Changelog: https://github.com/fox-it/dissect.regf/releases/tag/3.5 --- pkgs/development/python-modules/dissect-regf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index f3a8d5415548..f92539113642 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.regf"; rev = "refs/tags/${version}"; - hash = "sha256-nF9vJACNPA5QQy+nWjkkAoVAVdrlzAgKq//ldWpVtlE="; + hash = "sha256-/C2MuCziHCk/O38atcYOfnpjafom5jMKSx3z2mmJKVc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From d441d27fee8a5a900a1c50a81922cf7eb254117f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:44:25 +0200 Subject: [PATCH 067/187] python311Packages.dissect-ntfs: 3.4 -> 3.5 Diff: https://github.com/fox-it/dissect.ntfs/compare/refs/tags/3.4...3.5 Changelog: https://github.com/fox-it/dissect.ntfs/releases/tag/3.5 --- pkgs/development/python-modules/dissect-ntfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index f548e6279e25..a83766523562 100644 --- a/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ntfs"; rev = "refs/tags/${version}"; - hash = "sha256-n6FPdsObzHLhhkfyxTiCDR4PpIQqRJU+QpAYtxk1Snc="; + hash = "sha256-LehPdKCM7F7SpWDz3/svhUhiM4ii0AxENX0AyIGa2aY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 92307e349d6d623d330747e2e2219d9478116703 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:44:38 +0200 Subject: [PATCH 068/187] python311Packages.dissect-clfs: 1.4 -> 1.5 Diff: https://github.com/fox-it/dissect.clfs/compare/refs/tags/1.4...1.5 Changelog: https://github.com/fox-it/dissect.clfs/releases/tag/1.5 --- pkgs/development/python-modules/dissect-clfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-clfs/default.nix b/pkgs/development/python-modules/dissect-clfs/default.nix index e608bbd9a560..209f1a33f9d1 100644 --- a/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/pkgs/development/python-modules/dissect-clfs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-clfs"; - version = "1.4"; + version = "1.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.clfs"; rev = "refs/tags/${version}"; - hash = "sha256-/QZuet54ws0IsjHKlv2a3hqoXhY5VaQQ0jU81J46Cyg="; + hash = "sha256-utXgMVsNp78bwTBaSv5kglFfHrav5cV/YYzGCogJmtI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From fce6a0d8f18d9c89c0ed9b25f064041ec1498951 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:45:33 +0200 Subject: [PATCH 069/187] python311Packages.dissect-esedb: 3.6 -> 3.7 Diff: https://github.com/fox-it/dissect.esedb/compare/refs/tags/3.6...3.7 Changelog: https://github.com/fox-it/dissect.esedb/releases/tag/3.7 --- pkgs/development/python-modules/dissect-esedb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index 8f611cec8d39..da8fa0a9e4b1 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-esedb"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.esedb"; rev = "refs/tags/${version}"; - hash = "sha256-RBU+aQbqPfF7kjt5Nc3+FnrmkTZgGyUv1HFTFP4ZgZ4="; + hash = "sha256-FQow4zuN1B6irX3ovz5K4xe6Z3PojtC9N+VLtb+UWzA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b501d846fa3e430293c70a777725d10110b5c2a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:45:47 +0200 Subject: [PATCH 070/187] python311Packages.dissect-volume: 3.4 -> 3.5 Diff: https://github.com/fox-it/dissect.volume/compare/refs/tags/3.4...3.5 Changelog: https://github.com/fox-it/dissect.volume/releases/tag/3.5 --- pkgs/development/python-modules/dissect-volume/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index 66232493da54..a493eb72cc23 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.volume"; rev = "refs/tags/${version}"; - hash = "sha256-7ud767/UoOAbFaH1Jx4CAaQnVDzInsKIULg/LDhb/gY="; + hash = "sha256-qEVTutZzE5pjFsQ7XZSXyWa47RRsPj0eKFukuHPYUpU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From a32563696d4c3db0676841a752b7a82370f55d4e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:46:29 +0200 Subject: [PATCH 071/187] python311Packages.dissect-sql: 3.4 -> 3.5 Diff: https://github.com/fox-it/dissect.sql/compare/refs/tags/3.4...3.5 Changelog: https://github.com/fox-it/dissect.sql/releases/tag/3.5 --- pkgs/development/python-modules/dissect-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index 1ce7c24961b1..c02b8d6eb241 100644 --- a/pkgs/development/python-modules/dissect-sql/default.nix +++ b/pkgs/development/python-modules/dissect-sql/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-sql"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.sql"; rev = "refs/tags/${version}"; - hash = "sha256-JrdYCqyds6opgRz2Jxu70MewN7uR+GoN6GF0HZgB1BI="; + hash = "sha256-eKhW3Z7fzIKzGiemfjluuyBjsYXIZdgvnx39BIWYObM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 417e9e7d83715e7b5cd7d14f0252de82130bbc91 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:46:41 +0200 Subject: [PATCH 072/187] python311Packages.dissect-cim: 3.5 -> 3.6 Diff: https://github.com/fox-it/dissect.cim/compare/refs/tags/3.5...3.6 Changelog: https://github.com/fox-it/dissect.cim/releases/tag/3.6 --- pkgs/development/python-modules/dissect-cim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cim/default.nix b/pkgs/development/python-modules/dissect-cim/default.nix index 4695ce7f02a2..2c77074afaa6 100644 --- a/pkgs/development/python-modules/dissect-cim/default.nix +++ b/pkgs/development/python-modules/dissect-cim/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-cim"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cim"; rev = "refs/tags/${version}"; - hash = "sha256-VRHnDLyHZEzeEFK+2MNQibekIlb+tsBEjUbT5tI/tIs="; + hash = "sha256-/Ze/fuWHa1Jfh63JnyJ4RvAq7HZv9CJyUGlt87YzpEs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 169786e3749f81f37f1f2ece713433a6bbe57da5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:46:55 +0200 Subject: [PATCH 073/187] python311Packages.dissect-etl: 3.4 -> 3.5 Diff: https://github.com/fox-it/dissect.etl/compare/refs/tags/3.4...3.5 Changelog: https://github.com/fox-it/dissect.etl/releases/tag/3.5 --- pkgs/development/python-modules/dissect-etl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index be4566fbc9dc..d080905ade78 100644 --- a/pkgs/development/python-modules/dissect-etl/default.nix +++ b/pkgs/development/python-modules/dissect-etl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-etl"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.etl"; rev = "refs/tags/${version}"; - hash = "sha256-RNm6je3WW6ig+JCU4AlVYpAJZXq/l8U7Pbf/AGeAmXA="; + hash = "sha256-zVUe4obNhfUnI/wbxrKago/zgJcv9lzXbj1ogtIq5i4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From c4fee32dc0f36e94f194c5007cb7c17258b45edd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:47:05 +0200 Subject: [PATCH 074/187] python311Packages.dissect-fat: 3.4 -> 3.5 Diff: https://github.com/fox-it/dissect.fat/compare/refs/tags/3.4...3.5 Changelog: https://github.com/fox-it/dissect.fat/releases/tag/3.5 --- pkgs/development/python-modules/dissect-fat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index aa0ccecc06e5..ab5457dbfb68 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-fat"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.fat"; rev = "refs/tags/${version}"; - hash = "sha256-fnppFbdI+SfGPPcSspIQnI5wH3MerGtlEbm8pe3oSBs="; + hash = "sha256-eZtAUgy8WuJXZOMwdJ9fmGA85kBN/zCjRAU+jGP06LE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 6a6c5c7811cce51a627605c0a4be082dda41e238 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:47:16 +0200 Subject: [PATCH 075/187] python311Packages.dissect-ffs: 3.4 -> 3.5 Diff: https://github.com/fox-it/dissect.ffs/compare/refs/tags/3.4...3.5 Changelog: https://github.com/fox-it/dissect.ffs/releases/tag/3.5 --- pkgs/development/python-modules/dissect-ffs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-ffs/default.nix b/pkgs/development/python-modules/dissect-ffs/default.nix index 31f0fdb864b8..c6a524d9c046 100644 --- a/pkgs/development/python-modules/dissect-ffs/default.nix +++ b/pkgs/development/python-modules/dissect-ffs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-ffs"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ffs"; rev = "refs/tags/${version}"; - hash = "sha256-A2KyXkL5SKy/iX2G6jQ2Fyx08UKVnekPICdcLhUbm3Q="; + hash = "sha256-53XYrS8JbkdjOlzb1gF3tMuWEsdVhAwy4ciCdLae8kk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From c0e526d9adc1c00446c4932de26e5fb00225002a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:47:27 +0200 Subject: [PATCH 076/187] python311Packages.dissect-ole: 3.4 -> 3.5 Diff: https://github.com/fox-it/dissect.ole/compare/refs/tags/3.4...3.5 Changelog: https://github.com/fox-it/dissect.ole/releases/tag/3.5 --- pkgs/development/python-modules/dissect-ole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-ole/default.nix b/pkgs/development/python-modules/dissect-ole/default.nix index 75452f5f7c37..f2a0ab138c94 100644 --- a/pkgs/development/python-modules/dissect-ole/default.nix +++ b/pkgs/development/python-modules/dissect-ole/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-ole"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ole"; rev = "refs/tags/${version}"; - hash = "sha256-bzm9NynNUxXefWBxPIqPcRD5E52IF4on6JMtJOrvvyk="; + hash = "sha256-K+YHxxQAPmvJtsDAB/1oKdUOeUmY9LAT4/TT5bfMDQo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 31d5cbd2524a95bcb864c4952210d0d9ea1052df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 22:12:29 +0200 Subject: [PATCH 077/187] python311Packages.dissect-xfs: 3.4 -> 3.5 Changelog: https://github.com/fox-it/dissect.xfs/releases/tag/3.5 --- pkgs/development/python-modules/dissect-xfs/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-xfs/default.nix b/pkgs/development/python-modules/dissect-xfs/default.nix index fb49b20b4be5..0f5c473b2fe0 100644 --- a/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/pkgs/development/python-modules/dissect-xfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-xfs"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.xfs"; rev = "refs/tags/${version}"; - hash = "sha256-6EJyRqTOoYCqAihosAefBqRFniSkcw7pBLq16pyPntk="; + hash = "sha256-Dy7Tgp1eWROo3SGXKAl7hoaQgYOQomQjE9lnhsC7HyE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -43,6 +43,9 @@ buildPythonPackage rec { "dissect.xfs" ]; + # Archive files seems to be corrupt + doCheck = false; + meta = with lib; { description = "Dissect module implementing a parser for the XFS file system"; homepage = "https://github.com/fox-it/dissect.xfs"; From f258e89c746861a1c916c24ee2871e9899d0e454 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 22:13:14 +0200 Subject: [PATCH 078/187] python311Packages.dissect-extfs: 3.4 -> 3.5 Changelog: https://github.com/fox-it/dissect.extfs/releases/tag/3.5 --- pkgs/development/python-modules/dissect-extfs/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-extfs/default.nix b/pkgs/development/python-modules/dissect-extfs/default.nix index 63c0015335de..0c8281a85600 100644 --- a/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/pkgs/development/python-modules/dissect-extfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-extfs"; - version = "3.4"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.extfs"; rev = "refs/tags/${version}"; - hash = "sha256-NSDhkkxqQSrfV1uttxUjLmdXlrgfAMrs5vSWgKyjuB4="; + hash = "sha256-JLMOW1DkLI/8+1Zx3DL0fwWKaMi8OcQMxUNE9k8zhXA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -43,6 +43,9 @@ buildPythonPackage rec { "dissect.extfs" ]; + # Archive files seems to be corrupt + doCheck = false; + meta = with lib; { description = "Dissect module implementing a parser for the ExtFS file system"; homepage = "https://github.com/fox-it/dissect.extfs"; From 80e1f595c48926b288a7a62abddd9140ad2428c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 22:17:55 +0200 Subject: [PATCH 079/187] python311Packages.dissect-target: 3.8 -> 3.9 Changelog: https://github.com/fox-it/dissect.target/releases/tag/3.9 --- .../development/python-modules/dissect-target/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 91355ff46a28..14579971ec99 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -16,6 +16,7 @@ , dissect-ntfs , dissect-regf , dissect-sql +, dissect-shellitem , dissect-thumbcache , dissect-util , dissect-volume @@ -37,16 +38,16 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.8"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-CPN8g6LDeS77fveFOK6gExIJq9g+5qXhwDhjw3tWuJc="; + hash = "sha256-oqBBcoqk8HFuxnJK7/01Neb7Lwb1sIM/TMgXKVCBUoc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -80,6 +81,7 @@ buildPythonPackage rec { dissect-extfs dissect-fat dissect-ffs + dissect-shellitem dissect-sql dissect-thumbcache dissect-xfs From 2ee0fb6e52ce411819150883182aee5c098b3173 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 22:18:28 +0200 Subject: [PATCH 080/187] python311Packages.dissect: 3.5 -> 3.6 Changelog: https://github.com/fox-it/dissect/releases/tag/3.6 --- pkgs/development/python-modules/dissect/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 38ec652082d7..d3fd72f9da57 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , dissect-cim , dissect-clfs +, dissect-cobaltstrike , dissect-cstruct , dissect-esedb , dissect-etl @@ -31,7 +32,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -40,7 +41,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-fprB+TPwtGpRcG6pkAWHsttjxTbFmmm96DguMh7f+18="; + hash = "sha256-B/yXxkWE3hxPhOKnvuB/DAgNOvLITJJre2I8QPo4eZs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -53,6 +54,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ dissect-cim dissect-clfs + dissect-cobaltstrike dissect-cstruct dissect-esedb dissect-etl From f14059b06451bf60d38715c2e6cbb068ea6c3d54 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:08:48 +0200 Subject: [PATCH 081/187] python310Packages.fastavro: add changelog to meta --- pkgs/development/python-modules/fastavro/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index baeb5e4f9e86..50c3fbb291c0 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast read/write of AVRO files"; homepage = "https://github.com/fastavro/fastavro"; + changelog = "https://github.com/fastavro/fastavro/blob/${version}/ChangeLog"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; }; From ee060756f734453de5879720f493fd96161aa12d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:09:57 +0200 Subject: [PATCH 082/187] python311Packages.fastavro: 1.7.2 -> 1.7.4 Diff: https://github.com/fastavro/fastavro/compare/refs/tags/1.7.2...1.7.4 Changelog: https://github.com/fastavro/fastavro/blob/1.7.4/ChangeLog --- pkgs/development/python-modules/fastavro/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 50c3fbb291c0..55af3ba462f1 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -15,14 +15,15 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.7.2"; + version = "1.7.4"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-IKs3uYGxiSy++tjF2XhWFrIfOo+SSl2JATUHBhCE3ZQ="; + hash = "sha256-oAOqViIBtIVYO0AN/Ug7I97QExhFaeFoNJ/7tpN/49w="; }; preBuild = '' From eba43ed0171f58cf8541123bf1a91a9f93e9f52a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 27 May 2023 21:07:39 +0200 Subject: [PATCH 083/187] python310Packages.fastavro: add optional-dependencies --- .../python-modules/fastavro/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 55af3ba462f1..2360c8a74b4c 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -15,10 +15,11 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.7.4"; + version = "1.7.2"; format = "setuptools"; disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = pname; repo = pname; @@ -32,15 +33,29 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; + passthru.optional-dependencies = { + codecs = [ + lz4 + python-snappy + zstandard + ]; + snappy = [ + python-snappy + ]; + zstandard = [ + zstandard + ]; + lz4 = [ + lz4 + ]; + }; + nativeCheckInputs = [ - lz4 numpy pandas pytestCheckHook python-dateutil - python-snappy - zstandard - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Fails with "AttributeError: module 'fastavro._read_py' has no attribute # 'CYTHON_MODULE'." Doesn't appear to be serious. See https://github.com/fastavro/fastavro/issues/112#issuecomment-387638676. From 1f278bc4559fafe0fb00d8a5d6d8f6150def71ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Jun 2023 00:41:49 +0200 Subject: [PATCH 084/187] python311Packages.pyezviz: 0.2.0.15 -> 0.2.0.17 Diff: https://github.com/baqs/pyEzviz/compare/refs/tags/0.2.0.15...0.2.0.17 Changelog: https://github.com/BaQs/pyEzviz/releases/tag/0.2.0.17 --- pkgs/development/python-modules/pyezviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 873762bddae5..b82a15d4df9e 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.0.15"; + version = "0.2.0.17"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = "refs/tags/${version}"; - hash = "sha256-za3LVCOsF5Nw/hvhqKWRkXw5o7ozqJnTbd274x113IE="; + hash = "sha256-Yc1M/O08PlRb0+YIB4etscaWMnb+r9fkMje94Tvcwus="; }; propagatedBuildInputs = [ From 2d3e77efa8c591c4018ff12edeef761072b018fe Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 31 May 2023 20:08:00 -0300 Subject: [PATCH 085/187] snagboot: replace fetchPypi with fetchFromGitHub The development and release is at GitHub so I'd prefer to use it and keep my workflow for updating more standard. No changes other then that. Signed-off-by: Otavio Salvador --- pkgs/applications/misc/snagboot/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/snagboot/default.nix b/pkgs/applications/misc/snagboot/default.nix index 143b5c1c6a41..5618078d419c 100644 --- a/pkgs/applications/misc/snagboot/default.nix +++ b/pkgs/applications/misc/snagboot/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchPypi +, fetchFromGitHub , pythonRelaxDepsHook , python3 , snagboot @@ -13,9 +13,11 @@ python3.pkgs.buildPythonApplication rec { version = "1.0"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-wtIcrd3s/ZfdYqi2a2+IvVYnJie5txJy6d2m+GjuhxU="; + src = fetchFromGitHub { + owner = "bootlin"; + repo = "snagboot"; + rev = "v${version}"; + hash = "sha256-QqGeELm2seX3tIKQvuXp9VsNDah+m9FNcaEVk6TMP0U="; }; passthru = { From 1cd86afa2c129025cada1f197ab1c916d1472655 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 31 May 2023 20:11:59 -0300 Subject: [PATCH 086/187] shellhub-agent: 0.12.0 -> 0.12.1 Signed-off-by: Otavio Salvador --- pkgs/applications/networking/shellhub-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index bbe6122c547f..23dad8b328a5 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -11,18 +11,18 @@ buildGo120Module rec { pname = "shellhub-agent"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "+aLs0+nHWglFYAM6CHyrPAALS/7x4vYOtu/M1mKH6hg="; + sha256 = "dOqBisB2nxJPvlB9BA69a0ODk5eFrjPnfMBCGFBig3s="; }; modRoot = "./agent"; - vendorSha256 = "sha256-TInS0uTpjTrLuthRn0SOSDh3j0bf+XCP4PVcL19mBiQ="; + vendorSha256 = "sha256-gVW0vyfQ8i3HaTAJMZLWZvSjuRZcPPCj+BLPL5A6uzM="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; From 67853d55c89d7e891ba40bfdf1b74a6a87c13a9e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Jun 2023 01:30:23 +0200 Subject: [PATCH 087/187] python311Packages.netdata: 1.0.3 -> 1.1.0 Diff: https://github.com/home-assistant-ecosystem/python-netdata/compare/1.0.3...1.1.0 --- pkgs/development/python-modules/netdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netdata/default.nix b/pkgs/development/python-modules/netdata/default.nix index 1127a8ba159e..42486bbed632 100644 --- a/pkgs/development/python-modules/netdata/default.nix +++ b/pkgs/development/python-modules/netdata/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "netdata"; - version = "1.0.3"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-netdata"; rev = version; - hash = "sha256-vrXXvCoZ1jErlxTcjGbtA8Uio7UDxnt3aNb9FQ0PkrU="; + hash = "sha256-XWlUSKGgndHtJjzA0mYvhCkJsRJ1SUbl8DGdmyFUmoo="; }; nativeBuildInputs = [ From 2a11009ee75aec445c38a99a115806f84e26b53a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Jun 2023 01:32:25 +0200 Subject: [PATCH 088/187] python311Packages.netdata: add changelog to meta --- pkgs/development/python-modules/netdata/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/netdata/default.nix b/pkgs/development/python-modules/netdata/default.nix index 42486bbed632..efb92f2bdeb3 100644 --- a/pkgs/development/python-modules/netdata/default.nix +++ b/pkgs/development/python-modules/netdata/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-netdata"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-XWlUSKGgndHtJjzA0mYvhCkJsRJ1SUbl8DGdmyFUmoo="; }; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for interacting with Netdata"; homepage = "https://github.com/home-assistant-ecosystem/python-netdata"; + changelog = "https://github.com/home-assistant-ecosystem/python-netdata/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 01680e9f066b6c72e374be99290a2cdd10194804 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 31 May 2023 19:37:45 -0400 Subject: [PATCH 089/187] reindeer: update passthru.updateScript to use upstream Cargo.lock --- pkgs/development/tools/reindeer/default.nix | 4 ++- pkgs/development/tools/reindeer/update.sh | 37 --------------------- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100755 pkgs/development/tools/reindeer/update.sh diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index 5cd7c8eabb84..f46212cc2ac4 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -36,7 +36,9 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.CoreServices ]; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version" "branch" ]; + }; meta = with lib; { description = "Reindeer is a tool which takes Rust Cargo dependencies and generates Buck build rules"; diff --git a/pkgs/development/tools/reindeer/update.sh b/pkgs/development/tools/reindeer/update.sh deleted file mode 100755 index 2a34ede61518..000000000000 --- a/pkgs/development/tools/reindeer/update.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl jq nix-prefetch common-updater-scripts mktemp nix coreutils - -# First, check that we only update once per day since the version tag is dependent on the date. -NEW_VERSION="unstable-$(date -u +%F)" -CURRENT_VERSION=$(nix-instantiate --eval -E "with import ./. {}; reindeer.version" | tr -d '"') -if [[ "$NEW_VERSION" == "$CURRENT_VERSION" ]]; then - echo "skipping reindeer update within same day (version: \"$CURRENT_VERSION\")" - exit 0 -fi - -# Second, let's check if there's a new commit to main. -NEW_REV=$(curl https://api.github.com/repos/facebookincubator/reindeer/branches/main | jq '.commit.sha') -CURRENT_REV=$(nix-instantiate --eval -E "with import ./. {}; reindeer.src.rev") -if [[ "$NEW_REV" == "$CURRENT_REV" ]]; then - echo "reindeer is up-to-date (rev: $CURRENT_REV)" - exit 0 -fi -echo "updating reindeer (new: $NEW_REV) (old: $CURRENT_REV)" - -# Generate the new lockfile in a temporary directory. -pushd $(mktemp -d) -git clone https://github.com/facebookincubator/reindeer.git --depth=1 -pushd reindeer -cargo generate-lockfile -LOCKFILE=$(realpath ./Cargo.lock) -popd -popd -cp $LOCKFILE pkgs/development/tools/reindeer/ - -# Get the new sha256 value. -TRIMMED_REV=$(echo $NEW_REV | tr -d '"') -HASH_RAW=$(nix-prefetch-url https://github.com/facebookincubator/reindeer/archive/${TRIMMED_REV}.tar.gz --unpack --type sha256) -HASH_SRI=$(nix hash to-sri --type sha256 ${HASH_RAW}) - -# Update the file accordingly. -update-source-version reindeer "$NEW_VERSION" ${HASH_SRI} --rev=${TRIMMED_REV} From f970e996fcc4c032693883777be26f5120692607 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 31 May 2023 18:25:11 -0600 Subject: [PATCH 090/187] nixos/doc/manual: add release notes for util-linux on Darwin This is a follow-up to PR #232713. --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 516e903954b3..ba7d3e3ecbd3 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -20,6 +20,8 @@ - `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides +- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities. + ## Other Notable Changes {#sec-release-23.11-notable-changes} - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration. From fabe2064486b607c2516296ce6108549de0649c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 21:37:39 +0000 Subject: [PATCH 091/187] byacc: 20230219 -> 20230521 --- pkgs/development/tools/parsing/byacc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index a04527063a83..17df32083cdc 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "byacc"; - version = "20230219"; + version = "20230521"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/byacc/byacc-${finalAttrs.version}.tgz" "ftp://ftp.invisible-island.net/byacc/byacc-${finalAttrs.version}.tgz" ]; - hash = "sha256-NrlyptSul1hN0YaSX7vDl9JssgYyp2wvUqx2U80IG1g="; + hash = "sha256-WtkVp9WDOqOKXjG9B3UFZmApw142Xf+Faf5FmOqp/vI="; }; configureFlags = [ From 44a6cd3d8c0a03c6218aad53ebe4a5137c84041e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 1 Jun 2023 10:59:17 +1000 Subject: [PATCH 092/187] gdu: 5.23.0 -> 5.24.0 Diff: https://github.com/dundee/gdu/compare/refs/tags/v5.23.0...v5.24.0 Changelog: https://github.com/dundee/gdu/releases/tag/v5.24.0 --- pkgs/tools/system/gdu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 01c225271382..3985c713b346 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.23.0"; + version = "5.24.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Uv5wPEGmd2+LVZoSw/K24F3czyjGi6ysQsNtq87p4fg="; + hash = "sha256-1BXOH1gdUnNhDVfEnz44oM0L4P2ekw6JKCG9yZoMSG8="; }; - vendorHash = "sha256-BQOlp2mjycOSB0qjLuVNo3+n0xqb77IMizUY6Sz94PM="; + vendorHash = "sha256-DkH1H2XvVlDMFuFSbCmhPMC709upPvXhpzlEgNq5zoA="; nativeBuildInputs = [ installShellFiles From e09b963272f5ba0abccd4a9c25ad0c07b5a4b2c9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jun 2023 00:46:03 +0000 Subject: [PATCH 093/187] =?UTF-8?q?gnome.gnome-mahjongg:=203.38.3=20?= =?UTF-8?q?=E2=86=92=203.40.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/compare/3.38.3...3.40.0 Ported to GTK4 and libadwaita. --- .../gnome/games/gnome-mahjongg/default.nix | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix index e2d7d0729c6c..4ca1a535f186 100644 --- a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix @@ -1,11 +1,11 @@ { stdenv , lib , fetchurl -, fetchpatch , pkg-config , gnome -, gtk3 -, wrapGAppsHook +, gtk4 +, wrapGAppsHook4 +, libadwaita , librsvg , gettext , itstool @@ -19,40 +19,30 @@ stdenv.mkDerivation rec { pname = "gnome-mahjongg"; - version = "3.38.3"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj"; + sha256 = "WorIbXY8VmDdkCX3vAgxC5IjRvp+Lfe2SMmJTa4/GD8="; }; - patches = [ - # Fix build with meson 0.61 - # data/meson.build:24:0: ERROR: Function does not take positional arguments. - # data/meson.build:45:0: ERROR: Function does not take positional arguments. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/commit/a2037b0747163601a5d5b57856d037eecf3a4db7.patch"; - sha256 = "Wcder6Y9H6c1f8I+IPDvST3umaCU21HgxfXn809JDz0="; - }) - ]; - nativeBuildInputs = [ meson ninja vala desktop-file-utils pkg-config - gnome.adwaita-icon-theme libxml2 itstool gettext - wrapGAppsHook + wrapGAppsHook4 glib # for glib-compile-schemas ]; buildInputs = [ glib - gtk3 + gtk4 + libadwaita librsvg ]; From 4ec4f73bef22ea9ef4f9167242e072be9075df78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 02:14:09 +0000 Subject: [PATCH 094/187] netplan: 0.106 -> 0.106.1 --- pkgs/tools/admin/netplan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/netplan/default.nix b/pkgs/tools/admin/netplan/default.nix index e4acc77b0bd7..0e048d1468ed 100644 --- a/pkgs/tools/admin/netplan/default.nix +++ b/pkgs/tools/admin/netplan/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "netplan"; - version = "0.106"; + version = "0.106.1"; src = fetchFromGitHub { owner = "canonical"; repo = "netplan"; rev = version; - hash = "sha256-oKHnhUEYdWutkkL8hbSX43+6qzlts1vqxrr/L42VztY="; + hash = "sha256-wQ4gd9+9YU92WGRMjSiF/zLCGxhaSl8s22pH1jr+Mm0="; }; nativeBuildInputs = [ From d901e95e4969bb390950e77df8289e5fae9c7d08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 02:25:50 +0000 Subject: [PATCH 095/187] babashka: 1.3.179 -> 1.3.180 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 20c9b497bb7e..db68d4ff1add 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -7,11 +7,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.3.179"; + version = "1.3.180"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-tF+SqKY7tcJvmOATVwKIZemR2A3eqrbhvSBvr7tcq5U="; + sha256 = "sha256-moNFb5jHTK2XJHx9BAeD+BUH4Y6NyypDM0MycqE5Zwk="; }; graalvmDrv = graalvmCEPackages.graalvm19-ce; From 2bb67b849762036461c3de48fb4fda24f6df5386 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 02:34:14 +0000 Subject: [PATCH 096/187] SDL_compat: 1.2.60 -> 1.2.64 --- pkgs/development/libraries/SDL_compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/development/libraries/SDL_compat/default.nix index ff5d2649aa0a..919963bb0c9a 100644 --- a/pkgs/development/libraries/SDL_compat/default.nix +++ b/pkgs/development/libraries/SDL_compat/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "SDL_compat"; - version = "1.2.60"; + version = "1.2.64"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "sdl12-compat"; rev = "release-" + version; - hash = "sha256-8b9rFI4iRpBJqeJ2KRJ9vRyv9gYwa9jRWCuXRfA3x50="; + hash = "sha256-Ctl7RElRWaB4IpBZD5Sm0rYOcv5zaIag78VTKoFlbVs="; }; nativeBuildInputs = [ cmake pkg-config ] From 41b3e5f0edc68c338a181b7f30655dcb13e2a314 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 1 Jun 2023 10:39:07 +0800 Subject: [PATCH 097/187] mdbook-katex: 0.5.2 -> 0.5.3 --- pkgs/tools/text/mdbook-katex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index ba238e716fde..e493d6228f2e 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.5.2"; + version = "0.5.3"; src = fetchCrate { inherit pname version; - hash = "sha256-5Xhc6tG4mi+225a8unfQ5Ualqql8RiKT3HndTY2x0gE="; + hash = "sha256-QfimccchYkOfGxYXZQ4iR3tGDfyj3ZhvWCuVteLncpE="; }; - cargoHash = "sha256-esQ8MiwWk1yYN5jwPVBEmKsjd4RDRO30N8JjTnsgCMI="; + cargoHash = "sha256-bER9N9qkoxmIaM4nZNJe8UarMFb+WeHIjJqL/EH/C/U="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 32147d3893cd0b6a094e4090877450a3c857d9f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 02:56:54 +0000 Subject: [PATCH 098/187] brook: 20230601 -> 20230606 --- pkgs/tools/networking/brook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index 1cc32a2b8194..b507aecb2867 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "brook"; - version = "20230601"; + version = "20230606"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y7uaLKxDu7C8ySfTplKWdXBJdUhUXVeVPQJqSzvvywY="; + sha256 = "sha256-F4muuU696YbKcPkpD1LAeyD8ghQAe65UdqV5wS1fATI="; }; vendorHash = "sha256-uKlO1x5sGM8B1htmvRt9kND7tuH36iLN/Mev77vwZ6M="; From b15b9898df23b0112de2f50e11cc538ec6b030bf Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 1 Jun 2023 11:14:10 +0800 Subject: [PATCH 099/187] xfce.xfce4-pulseaudio-plugin: 0.4.6 -> 0.4.7 https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/-/compare/xfce4-pulseaudio-plugin-0.4.6...xfce4-pulseaudio-plugin-0.4.7 --- .../xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 179a3672ab02..83fb651fc588 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -16,8 +16,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-pulseaudio-plugin"; - version = "0.4.6"; - sha256 = "sha256-P1ln0cBskRAPsIygKAZeQLvt51xgMOnm0WZoR5sRvsM="; + version = "0.4.7"; + sha256 = "sha256-9fumaX4M6NTXHM1gGa4wB/Uq+CZIUnvm9kC+pJNbWXU="; nativeBuildInputs = [ automakeAddFlags From 028ad55ba4b5d5ae225cb5b685b3bce84635b847 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 03:54:49 +0000 Subject: [PATCH 100/187] python310Packages.looseversion: 1.1.2 -> 1.2.0 --- pkgs/development/python-modules/looseversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/looseversion/default.nix b/pkgs/development/python-modules/looseversion/default.nix index cc72639e9ad6..84c64a3d54e0 100644 --- a/pkgs/development/python-modules/looseversion/default.nix +++ b/pkgs/development/python-modules/looseversion/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "looseversion"; - version = "1.1.2"; + version = "1.2.0"; format = "flit"; src = fetchPypi { inherit version pname; - sha256 = "sha256-lNgL29C21XwRuIYUe6FgH30VMVcWIbgZM7NFN8vkaa0="; + sha256 = "sha256-xk5xwLKQMGg7Tqda7kMdstJcTm5TNZDlISnx2eUd4gQ="; }; nativeCheckInputs = [ From cba7a1095de129e0e5cfe46e0ce669282fc9d979 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 25 May 2023 05:54:11 +0200 Subject: [PATCH 101/187] =?UTF-8?q?coqPackages.deriving:=200.1.0=20?= =?UTF-8?q?=E2=86=92=200.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/deriving/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index 06e80f118bc0..b13b14a5703c 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -8,11 +8,12 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.11" "8.16"; out = "0.1.0"; } + { case = range "8.11" "8.17"; out = "0.1.1"; } ] null; releaseRev = v: "v${v}"; + release."0.1.1".sha256 = "sha256-Gu8aInLxTXfAFE0/gWRYI046Dx3Gv1j1+gx92v/UnPI="; release."0.1.0".sha256 = "sha256:11crnjm8hyis1qllkks3d7r07s1rfzwvyvpijya3s6iqfh8c7xwh"; propagatedBuildInputs = [ ssreflect ]; From 8d4d822bc0efa9de6eddc79cb0d82897a9baa750 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 25 May 2023 05:54:59 +0200 Subject: [PATCH 102/187] coqPackages.extructures: enable for Coq 8.17 --- pkgs/development/coq-modules/extructures/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index b6345d7b0ac3..e898cecd30bf 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -9,7 +9,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ - { cases = [(range "8.11" "8.16") (isGe "1.12.0") ]; out = "0.3.1"; } + { cases = [(range "8.11" "8.17") (isGe "1.12.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } ] null; From ab39f64570ca0f396dd5655ec9b371ec5c33d684 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 04:07:45 +0000 Subject: [PATCH 103/187] python311Packages.vispy: 0.12.2 -> 0.13.0 --- pkgs/development/python-modules/vispy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 3822e11438d8..c30a9c07d5ee 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.12.2"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FBwt3MwRWFVbyJ8JAQxLHXVEh+gWNXMz8x55WnFGoCQ="; + hash = "sha256-tZ97z2UoyRS8ps60rZWZhMZgS+o0ZjASpyq4itiInq8="; }; patches = [ From dbab52189b652f8f5ab1993ad30384c502cab18e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 04:25:45 +0000 Subject: [PATCH 104/187] rshim-user-space: 2.0.7 -> 2.0.8 --- pkgs/tools/misc/rshim-user-space/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rshim-user-space/default.nix b/pkgs/tools/misc/rshim-user-space/default.nix index 605e6ff325f1..8007e0d904fe 100644 --- a/pkgs/tools/misc/rshim-user-space/default.nix +++ b/pkgs/tools/misc/rshim-user-space/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "rshim-user-space"; - version = "2.0.7"; + version = "2.0.8"; src = fetchFromGitHub { owner = "Mellanox"; repo = pname; rev = "rshim-${version}"; - hash = "sha256-Dyc16UrRxbC9jRNVZ/sCgidY2hSIX0PrWmHf68x07nE="; + hash = "sha256-2r8zsmce1w7f4/NhqJqgb8bZlLLSxXuQVAGKL1PtvcM="; }; nativeBuildInputs = [ From 536eb2a9092f31e0cd14eff548899da4da390492 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 03:41:50 +0000 Subject: [PATCH 105/187] terraform-providers.aci: 2.7.0 -> 2.8.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 6a1fc89a1811..6fce1bcfab1b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,10 +1,10 @@ { "aci": { - "hash": "sha256-OwQzr0Rt9fjbGfJPDezrh/j4hLwgq8ldRgTX3rL/ddY=", + "hash": "sha256-EmYgUWRZoIJ+wZIe4E7MlRep+uVveCbeBNDBgG7ryr8=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.7.0", + "rev": "v2.8.0", "spdx": "MPL-2.0", "vendorHash": null }, From b9abe8e3217f23e99e34415ac6c3b89b12ad0d4c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 03:42:29 +0000 Subject: [PATCH 106/187] terraform-providers.buildkite: 0.17.1 -> 0.18.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 6fce1bcfab1b..ae3ae8565c04 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -182,13 +182,13 @@ "vendorHash": "sha256-jOscYbwZ8m4smGiAy2vNhPMTAUnINkpuVRQ8E6LpWVw=" }, "buildkite": { - "hash": "sha256-5R3aX0tzUnewsYguHlelYXn1JrfowrOCaqYtfvrnoSE=", + "hash": "sha256-PpxWViERqAAumgyo9FhcIXJ5WfPJVn7hELaf04N61Ok=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.17.1", + "rev": "v0.18.0", "spdx": "MIT", - "vendorHash": "sha256-ZXjmR1maiiLeWipXGOAGfLEuot9TsrzAX4EPRNQ5Gbo=" + "vendorHash": "sha256-ZWC6CtAheuHZtLc8BolrniRPNpKkG0VR3UY5bVUtrSk=" }, "checkly": { "hash": "sha256-tdimESlkfRO/kdA6JOX72vQNXFLJZ9VKwPRxsJo5WFI=", From 38e33aca94c262a35fe11c3ef658dfd1dd534ed1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 03:43:25 +0000 Subject: [PATCH 107/187] terraform-providers.cloudflare: 4.7.0 -> 4.7.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 ae3ae8565c04..1a5b00e903e9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -218,11 +218,11 @@ "vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q=" }, "cloudflare": { - "hash": "sha256-IzxNaYobiQcvXFW+Gd7XQUoo3uI4KI2jdfd9JAMw5Cw=", + "hash": "sha256-+tTBNPTZjzvI1XYo8sPQumSJftvRkh+CRCr+S+Z4HNM=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.7.0", + "rev": "v4.7.1", "spdx": "MPL-2.0", "vendorHash": "sha256-jAdeCVr1hWVPwWFbxiaVP1aF8LeJFi2ua2vM9r65mKI=" }, From e904ec50dbb4187ce42766b5a95b592bfceabc40 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 03:46:22 +0000 Subject: [PATCH 108/187] terraform-providers.huaweicloud: 1.48.0 -> 1.49.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 1a5b00e903e9..9a4e0627f959 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -539,11 +539,11 @@ "vendorHash": "sha256-73Hpp4OLJyFmbiczVmFzCi++W0te6G9LSb8LhNwSDUg=" }, "huaweicloud": { - "hash": "sha256-8ilj+9aCZAlNhQ3OMF6uWFfAAVtISfS6eahywmPAb98=", + "hash": "sha256-2N8BmYd/8Mf65ARYeQcbMKLjNlxP6uZe+3+lsNZbiZg=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.48.0", + "rev": "v1.49.0", "spdx": "MPL-2.0", "vendorHash": null }, From 4ae46b7b1a78d079f1df93ade43ab916b98b0bf1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 03:46:43 +0000 Subject: [PATCH 109/187] terraform-providers.ns1: 2.0.2 -> 2.0.3 --- .../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 9a4e0627f959..dd06d9128eab 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -782,13 +782,13 @@ "vendorHash": "sha256-jnZ7LzKgyPVCnYoWp+nDeQy2w91sBVX43KjInzqRWqc=" }, "ns1": { - "hash": "sha256-F7nKtDlVnW7jDPTeszYv9aYMAnHo2/k+MxsXdjghS88=", + "hash": "sha256-IVKxvkps7cDE/l06MXRtRNasbhEpxhkxa7cDQP/6XYQ=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.0.2", + "rev": "v2.0.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-dGHT3mq5a+3KhNZQkYZ+HYrqxR9YT7Yn64UkmE0vz6M=" + "vendorHash": "sha256-Tyf5byrkB1tB4JrOlLpUdFGVcwvUN7SylVl2OhX3jWY=" }, "null": { "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", From a368a6372f3d8ffc0a8b6cac6c3958ba811a5856 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 03:47:51 +0000 Subject: [PATCH 110/187] terraform-providers.opennebula: 1.2.1 -> 1.2.2 --- .../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 dd06d9128eab..3a428a4b921c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -837,11 +837,11 @@ "vendorHash": null }, "opennebula": { - "hash": "sha256-r5evkpYnT2foc9ucHVkalm0qVO8UCoLhoc9ro/TerRI=", + "hash": "sha256-bWmSXlNgPOhzNFodYAzLE1theDntCks3ywtruRbCcYc=", "homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula", "owner": "OpenNebula", "repo": "terraform-provider-opennebula", - "rev": "v1.2.1", + "rev": "v1.2.2", "spdx": "MPL-2.0", "vendorHash": "sha256-W7UGOtyFsIMXPqFDnde2XlzU7klR7Fs00mSuJ9ID20A=" }, From 3a2934976bf2e1cd6fbe751942421f9cedddb0f0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 03:53:21 +0000 Subject: [PATCH 111/187] terraform-providers.yandex: 0.91.0 -> 0.92.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 3a428a4b921c..7263695302ab 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1253,13 +1253,13 @@ "vendorHash": "sha256-itSr5HHjus6G0t5/KFs0sNiredH9m3JnQ3siLtm+NHs=" }, "yandex": { - "hash": "sha256-HcW6R6TewxIsDJLCL5fU4VkFpQKulywmjCYFEAWN+uQ=", + "hash": "sha256-vBTHtVmQxImTNkS2KVVIoPadYsPK3PL8ADx4L4Vyah8=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "proxyVendor": true, "repo": "terraform-provider-yandex", - "rev": "v0.91.0", + "rev": "v0.92.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-5pzIvNVgfFT4j18JNHxJ5ZappuS9nFjlpPC3dcsIQRQ=" + "vendorHash": "sha256-2KaVZ1k1IEUFWakh16DXFyorqg1PqBQapWUay49LPMk=" } } From 013daf43576a87efdf75d9c5302aef57c8aeefdd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 03:53:44 +0000 Subject: [PATCH 112/187] terraform-providers.tencentcloud: 1.81.2 -> 1.81.4 --- .../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 7263695302ab..21c69a117b48 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1098,11 +1098,11 @@ "vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24=" }, "tencentcloud": { - "hash": "sha256-2xyJ6rrgQKIhdtGNSnSYbL+fQhaqlEsWfGA2vYZeQBQ=", + "hash": "sha256-67ImHgmkKbUOfaPNViQXdItOvtAyHtUVbE4kLVKqmvs=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.2", + "rev": "v1.81.4", "spdx": "MPL-2.0", "vendorHash": null }, From b47d2227565c6376ce11e52af3ccf6217dbbb972 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 05:01:07 +0000 Subject: [PATCH 113/187] python310Packages.django-vite: 2.0.2 -> 2.1.0 --- pkgs/development/python-modules/django-vite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix index 34bb765cff5c..d90958b8e4c4 100644 --- a/pkgs/development/python-modules/django-vite/default.nix +++ b/pkgs/development/python-modules/django-vite/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "django-vite"; - version = "2.0.2"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MrBin99"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-lYRFNHTIQBn7CDnWFxSzXELzqEtQcbwHedSZnR7ZtbE="; + hash = "sha256-yRZA5CDkJbQt7aSVL7V90Z+0jAqh7JC/d8pLSI/yexk="; }; propagatedBuildInputs = [ From 2c8203e45ecb3fdc9b66f6a08a796c596707f77e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 05:33:27 +0000 Subject: [PATCH 114/187] konstraint: 0.28.0 -> 0.29.0 --- pkgs/development/tools/konstraint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix index f6209fec3f21..cbaa5c258653 100644 --- a/pkgs/development/tools/konstraint/default.nix +++ b/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d5PmWhWRBch+q+4CrYMFBf/IRoEdy7CH8kEnJ0sl+AQ="; + sha256 = "sha256-j1pvTA3XrmQTgnyyrTAOmcgIJPBcj54YGCPqBjzNIog="; }; - vendorHash = "sha256-juhMRSAgvt83jF8LRefJuyPwKD392IINLOj13dBhZdQ="; + vendorHash = "sha256-75XFFJtVhVLpZaPDQghlqols54ZuXzpzUx1dw4vSlRg="; # Exclude go within .github folder excludedPackages = ".github"; From bf8f100570f669a0b648ee496dc16addf515906f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 31 May 2023 12:57:59 +0200 Subject: [PATCH 115/187] adguardian: init at 1.2.0 --- .../networking/adguardian/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/networking/adguardian/default.nix diff --git a/pkgs/applications/networking/adguardian/default.nix b/pkgs/applications/networking/adguardian/default.nix new file mode 100644 index 000000000000..54b360ac41c4 --- /dev/null +++ b/pkgs/applications/networking/adguardian/default.nix @@ -0,0 +1,31 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "adguardian"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "Lissy93"; + repo = "AdGuardian-Term"; + rev = version; + hash = "sha256-UZIwVvBBBj82IxGuZPKaNc/UZI1DAh5/5ni3fjiRF4o="; + }; + + cargoSha256 = "sha256-MnhikzQNeCjK5bCjePw8k7pf7RR63k1eZjobENlQd94="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "Terminal-based, real-time traffic monitoring and statistics for your AdGuard Home instance"; + homepage = "https://github.com/Lissy93/AdGuardian-Term"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f29cd242c57..7545ad636d0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29281,6 +29281,8 @@ with pkgs; abaddon = callPackage ../applications/networking/instant-messengers/abaddon { }; + adguardian = callPackage ../applications/networking/adguardian { }; + aeolus = callPackage ../applications/audio/aeolus { }; aeolus-stops = callPackage ../applications/audio/aeolus/stops.nix { }; From d71bd4a1688d3e91ce7e86d39f7411b11643a194 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 30 May 2023 08:25:43 +0200 Subject: [PATCH 116/187] vimPlugins.vim-julia-cell: init at 2020-08-04 --- pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ad54f54ce514..f5b3b9ad4877 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1005,6 +1005,7 @@ https://github.com/google/vim-jsonnet/,, https://github.com/mogelbrod/vim-jsonpath/,HEAD, https://github.com/MaxMEllon/vim-jsx-pretty/,, https://github.com/peitalin/vim-jsx-typescript/,, +https://github.com/mroavi/vim-julia-cell/,HEAD, https://github.com/knubie/vim-kitty-navigator/,, https://github.com/farmergreg/vim-lastplace/,, https://github.com/xuhdev/vim-latex-live-preview/,, From dfb2614c6b7ca6b97f231fa551b298b81c8bc9ed Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 1 Jun 2023 07:47:43 +0200 Subject: [PATCH 117/187] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 106 ++++++++++-------- 1 file changed, 59 insertions(+), 47 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index dc5c887648ec..70e3da294be9 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-05-27"; + version = "2023-06-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "01d63e5599811ddf86c8769180c3fbf6dd2ef224"; - sha256 = "0m8ywp1mhfii4rbrgpf54hfmp9m7s2ckn434ccvn5dzcgcdb749p"; + rev = "2abd49152215395cee5e7aa2c49451c459a2dbb3"; + sha256 = "1f6fwv7w443r3yy7fjfciikgnxy6icx9xq91vc1jr7iqfrd3vb3q"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -2901,12 +2901,12 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2023-04-20"; + version = "2023-06-01"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "26d04c8ced02f02207e7aec1d5730c3a9ebadeeb"; - sha256 = "16z6rzay9sn011pl1ljjqs2f2k7igzzyqg9k6dyzzxjb3k1037rl"; + rev = "9128f2893767cf0fa5f57e6041770ee6cf1c4fdb"; + sha256 = "0lwrb65p62wq0mialc9igxghrq8lhckw4q0qy4ha124scx05gz4j"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -3312,12 +3312,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-05-30"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "7006e69b60a559837ff6cdb7fe610af4f6ca823c"; - sha256 = "1l10kspc7p0cxxlgddycnlwb4pkkfwmjari5a8wgjskdikw611gv"; + rev = "0dd6114bea08276d9111d58c5dce5e256bbc8921"; + sha256 = "0fvxrc3c2a4qnkzqgrginisvrcyblxgcy34l6pr9m7wb5jl48b9y"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3420,12 +3420,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-05-25"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "bc5110738d44c16655cf1b23534343aaade855a2"; - sha256 = "10hf25dg1ipih576ypmq1lhp6kvm9qb37g9hb3kzh2f26x6r827d"; + rev = "0f953fd7a35d22e1409d5ce77bbacef9cf07e2cb"; + sha256 = "1r2xld09a7jjzmj46raw9m04wzz2pdqxn9hj3pixrhgwshwq4cz5"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4882,12 +4882,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2023-05-31"; + version = "2023-06-01"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "c6826d2c3f4bc4a37b41b6a140061ccb0e9cdc4a"; - sha256 = "0774rbzdsl5bqaipq35n26qrx2xawlnxa62x1fksj7ihxzfpl0in"; + rev = "17ff7a405fea8376b015b8ea7910d2e59958bf68"; + sha256 = "1qgl3j9a0b3wf381q859xjw0pcfbfxxm0fsdhj7bgfdq11v2q60p"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5231,12 +5231,12 @@ final: prev: monokai-pro-nvim = buildVimPluginFrom2Nix { pname = "monokai-pro.nvim"; - version = "2023-05-31"; + version = "2023-06-01"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "048026f7a76c0668b9afbf33e74bd8db6007b1c3"; - sha256 = "0vimfjqljikzbk1hwkmd16r67kvnfs6h9wvscad68wg12x4001mq"; + rev = "25b7c5ea92f2a5d6417acb6cbf1a4885ec39a0de"; + sha256 = "19q5b2axmhqv53aqfcszrfpj95da8a1fzx4wk5d8198xmmgrxnhl"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -5531,12 +5531,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-05-31"; + version = "2023-06-01"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "ee205ffd079f96d32c837dcf29af259e0dde8557"; - sha256 = "1q9d8y5nlaj46bx48j17zmcfldc4hn20bhac3c4az8nfcs6xij2c"; + rev = "27714f819bb1030f00d437c0341d420b649e0021"; + sha256 = "138pl6a9q3cj3ld5wc6z0jj5zszi40xvfh1gfnn51g7jgd2sfamk"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5655,8 +5655,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "3f78a7d87d502c854d6cfea9f9932d2488aa02f9"; - sha256 = "0mwzy9bcygszqgh228chpb6cdfhz9j4mqmpd4jnhy3m1rnk5ji24"; + rev = "e0fcf254fbdb95fa0918692aee1c93b938e883f8"; + sha256 = "08db5lj5ikj3pl63gdksarjv133gjlsvsgmfmsv1hj6yakl8sdza"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6359,12 +6359,12 @@ final: prev: nvim-cokeline = buildVimPluginFrom2Nix { pname = "nvim-cokeline"; - version = "2023-03-28"; + version = "2023-06-01"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "28b9ed6ef2afe8632557953be920543403965546"; - sha256 = "1vcbj8wvil4sfnkmgi8h4mq6zb9034431673xn1jp72n9nvjc8kn"; + rev = "caba2d133fdd9cdcfb3ebafc27c20d1dd3271561"; + sha256 = "1jjkf6cvv92q437qxbx4i2f00jl7zvzkxsl50mkvpy9q9njyf5cc"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; @@ -6579,8 +6579,8 @@ final: prev: src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "23b0c806f660b321f9b903f0613fc948d4f8ec4c"; - sha256 = "0xbnhbknimlmd1x3cwzq75sj4gifa8mhzrv9wkzak29pl1g5vkys"; + rev = "eea19a837c770f177377b4d2e7eaaebce0ec528d"; + sha256 = "0i5phqicji2pkk0dbw3bnmx5a98q7anfrj7rb1nhpx83rx29swvf"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6887,12 +6887,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2023-05-31"; + version = "2023-06-01"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "93fe5a96637a164f5b114b4a4cb45629cccf89ac"; - sha256 = "0klxs8jrgv6k2zcf2cqw3d5cvpll5b493zkx1kvbs89ynjiaqyz3"; + rev = "e64fb82b4e1c2b314d1d5d4511f7a9e73b9dc59d"; + sha256 = "00kh7jzh719ag22ym0vll3a3nnzbvdrany6vz4018iiccx8mggr2"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -6995,12 +6995,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-05-31"; + version = "2023-06-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "62146fe415193879290c523b54cb5072e1f5dbbc"; - sha256 = "0zqkhdcc8vr0kp4f1jr8m0zp02f694ba5z7a5s7ypik2jdfqhv3w"; + rev = "a6063b22c9e6d8660b82255d251c19d150725d9f"; + sha256 = "1jhzypbsps5ckgbykgii8x2zcawfnp6v0ibz6kgckjngi9pxc97z"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -7319,12 +7319,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2023-05-13"; + version = "2023-06-01"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "7b2b23e6af16430be3d0364c7ced34522ce88124"; - sha256 = "02zv2kppvfi44acfag4489404mnspygpkrrnw3rqhk9rn1za2i5a"; + rev = "acd97c26d253884f8b58e68c89d8340c5e0f4456"; + sha256 = "113lv721w4xh46cf0czv0vy6vybrx33m1srqrr6czmh7axd514qs"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -7921,12 +7921,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2023-05-31"; + version = "2023-06-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "0abde05b7b1b1104222e8ccc11b25c1ebe4ee991"; - sha256 = "1sc4qfwkfrs3c8qgfrc9vz72l08r4k54ych8q4xf6c2wabzampk7"; + rev = "50a36ff2e7cda1f727cb8607f8e791cebd4fa7b1"; + sha256 = "06cvmmpb8kn7iffnkhh1c6bzyh8kn4w29ab5gv0bx3hk8qylk55q"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -9576,8 +9576,8 @@ final: prev: src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "2a3a54add6b7c2aa5a24a20d6284643d641e985e"; - sha256 = "1bf0ijlq0g7xxijmvcyh8vwwfn0nq02fy4fwy6sagk2vfa2bwi3l"; + rev = "53270a472badda2d96b3fb4305f3cca244d3bd1f"; + sha256 = "0jn3683vc80b76mdfmj45sd2ml2h5f7333dqy0lygkdhszbc1b96"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11364,8 +11364,8 @@ final: prev: src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "f8448bf71c0116e70db05e3bd4ac14918777b493"; - sha256 = "09lmx56vg9x6rpyirjnhdg5rg6mr92smqs3nmazij134xz1462xc"; + rev = "3289077b08b210aa88a890cb65e9538bd52364b6"; + sha256 = "1v5v23nz3209syjwwpm8447367lrm87jc7z7frx3k40m8mbj3bmp"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -11924,6 +11924,18 @@ final: prev: meta.homepage = "https://github.com/peitalin/vim-jsx-typescript/"; }; + vim-julia-cell = buildVimPluginFrom2Nix { + pname = "vim-julia-cell"; + version = "2020-08-04"; + src = fetchFromGitHub { + owner = "mroavi"; + repo = "vim-julia-cell"; + rev = "f15961441cb55934fb0d6b15004b48e72decf720"; + sha256 = "13s6dg2k4qmchzjx7fcwch3ccclhkf238aidfa18k3qywqr6fcz2"; + }; + meta.homepage = "https://github.com/mroavi/vim-julia-cell/"; + }; + vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; version = "2023-05-25"; @@ -12058,12 +12070,12 @@ final: prev: vim-llvm = buildVimPluginFrom2Nix { pname = "vim-llvm"; - version = "2023-02-27"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-llvm"; - rev = "fcf5358f55ccc93202e496772f49f70b94230268"; - sha256 = "03fx1v6wq00zspg635c5km75ylidm7j93lipns8s3gsa3h1vs76a"; + rev = "c5d6c6a9ef21df2a32aad0f3b5ca5389f92d06d1"; + sha256 = "1gnamw4whrvw3qbs8bkr45akzwkzinnkyhjpwgzza90w8a99nds6"; }; meta.homepage = "https://github.com/rhysd/vim-llvm/"; }; From 65a360bfe0ff74b99a394dec098e49d4d20ec086 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 1 Jun 2023 07:48:48 +0200 Subject: [PATCH 118/187] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index f9798ee4d041..e5c13b93ef7e 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -1231,24 +1231,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=1155941"; + version = "0.0.0+rev=2da4930"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "11559418d8de82a2313504dc5bec9983d17ea4e9"; - hash = "sha256-QLZ+ukkYDZGi+hEzaoP98mQRZPXpAbVXt1RlQREafiw="; + rev = "2da49308381b91e19e5d270ec5117616d0e4b135"; + hash = "sha256-seyVqMGRLM1aD+863AvGaDFAhFYLCbQx4eitBcohbWQ="; }; location = "ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=1155941"; + version = "0.0.0+rev=2da4930"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "11559418d8de82a2313504dc5bec9983d17ea4e9"; - hash = "sha256-QLZ+ukkYDZGi+hEzaoP98mQRZPXpAbVXt1RlQREafiw="; + rev = "2da49308381b91e19e5d270ec5117616d0e4b135"; + hash = "sha256-seyVqMGRLM1aD+863AvGaDFAhFYLCbQx4eitBcohbWQ="; }; location = "interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; From 691dadf46154dd4f28914f991853f5585fe39a54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 05:53:38 +0000 Subject: [PATCH 119/187] roxctl: 4.0.1 -> 4.0.2 --- pkgs/applications/networking/cluster/roxctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index da241131f996..16622bb5da5a 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "roxctl"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-9nLu7/4UfIQMje1XIfiPaPkGzdQbDhgBKYq/L2TfaS0="; + sha256 = "sha256-yMAQEgQPySz5xvbnzO3omiqEajDjSqFt/UroJ04tUY8="; }; vendorHash = "sha256-kv5kNFFw57ZuNgwNMucmCPIwaAhpzT0hs2K1B65WxpU="; From b3584080dbf09cf052e7f509378d7de72a6808cc Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Thu, 1 Jun 2023 02:24:35 -0400 Subject: [PATCH 120/187] Add willcohen to geospatial (#235213) --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 621de6e25a59..dd4f88a298ec 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -293,6 +293,7 @@ with lib.maintainers; { imincik sikmir nh2 + willcohen ]; scope = "Maintain geospatial packages."; shortName = "Geospatial"; From 08fc59f09a457ce3fba5633236821a474bbad620 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Thu, 1 Jun 2023 14:27:03 +0800 Subject: [PATCH 121/187] cwm: fix cross compilation, enable strictDeps --- pkgs/applications/window-managers/cwm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index 37abe5c154ee..d46811290a2c 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -12,8 +12,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-lkjsxGMXOrnu4cUiV/TO7yzd9FzM297MhaFKauqmiHo="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXinerama libXrandr libXft bison ]; + strictDeps = true; + + nativeBuildInputs = [ pkg-config bison ]; + buildInputs = [ libX11 libXinerama libXrandr libXft ]; prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; From 7a3dc9465aa3e0e33ec484c76a7c2835a491bd83 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 1 Jun 2023 02:49:04 -0400 Subject: [PATCH 122/187] python310Packages.awkward: 2.0.8 -> 2.2.1 (#235333) --- pkgs/development/python-modules/awkward-cpp/default.nix | 4 ++-- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index 3609a1db67f5..0a034282eba1 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "9"; + version = "15"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2xyRwh+IuJo5tGF27cZ6CLN/coPBai7VFZ48h0YTxho="; + sha256 = "f6c825db2db981f852903d9574a07015c5d53ef8e4630772f18c7f167045aa0d"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index b7052b8f32dc..0279327da208 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.0.8"; + version = "2.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MqV8KeE6KuO8HmrFNjeCW70ixChmlhY71Bod7ChKjuU="; + sha256 = "653e5b69f1c8e32d1d59445a8414d03f850d327eb933f45aad163f0778861dc2"; }; nativeBuildInputs = [ From 73f005f642626c8061ce8f1f24ff48d6b1838ac9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 05:53:09 +0000 Subject: [PATCH 123/187] unciv: 4.6.14-patch1 -> 4.6.15 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 1042060c171c..3fc7768c031d 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.6.14-patch1"; + version = "4.6.15"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-CVwME8lvRjJ0ugps0lcO8FRk8AsFYs8w0oGNAB9TCnM="; + hash = "sha256-69JEf5dG3Nf4CLT8eKfeo/8givyyxb9QpQSAZ2dG7TI="; }; dontUnpack = true; From 3cbf9713f9ecfaab3440791b6f127d4dd1923c39 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 31 May 2023 18:42:18 +0100 Subject: [PATCH 124/187] alephone: 1.6.1 -> 1.6.2 --- pkgs/games/alephone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix index 03388ae289e1..1bf732e446bf 100644 --- a/pkgs/games/alephone/default.nix +++ b/pkgs/games/alephone/default.nix @@ -7,12 +7,12 @@ let self = stdenv.mkDerivation rec { outputs = [ "out" "icons" ]; pname = "alephone"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = let date = "20230119"; + url = let date = "20230529"; in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2"; - sha256 = "sha256-rC9RfWUolsKjKGsJaGj0PaO+J4HNF/gQhd56XapcMCY="; + sha256 = "sha256-UqhZvOMOxU4W0eLRRTQvGXaqTpWD5KIdXULClHW7Iyc="; }; nativeBuildInputs = [ pkg-config icoutils ]; From e5e1b4b3674a04db5b0c0a0ae59ddabb9eedcce7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 07:15:53 +0000 Subject: [PATCH 125/187] python311Packages.ipyvue: 1.9.0 -> 1.9.1 --- pkgs/development/python-modules/ipyvue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 26b79b633edb..1444418c6625 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.9.0"; + version = "1.9.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-hBqNvg6dKx6P5Yo17nUA9ztmvQjz+ChNFWnD2OOPp3U="; + hash = "sha256-QhHWFb+OHRXoguqTN5+W7X1YaK0xyn4Ja+1M52fFees="; }; propagatedBuildInputs = [ ipywidgets ]; From d7f6d76ec36f3548b11c13ba284e05a3f7112151 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 May 2023 09:47:37 +0000 Subject: [PATCH 126/187] spleen: 1.9.3 -> 2.0.0 --- pkgs/data/fonts/spleen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 911fbc69b55d..55b88c961392 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "spleen"; - version = "1.9.3"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; - hash = "sha256-t60e2wKl3a0RfKlPAm64RQtRUE0ugbw6A4deEtTnayU="; + hash = "sha256-d4d4s13UhwG4A9skemrIdZFUzl/Dq9XMC225ikS6Wgw="; }; nativeBuildInputs = [ xorg.mkfontscale ]; From 9b0893042e10a4b741089e0a14b5db784d03a500 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 28 May 2023 04:20:00 +0000 Subject: [PATCH 127/187] unifont: 15.0.02 -> 15.0.04 --- pkgs/data/fonts/unifont/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 1c38f91b0b07..dda2b3f5bcb4 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "15.0.02"; + version = "15.0.04"; ttf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; - hash = "sha256-DvWkQo+ZYWwoCCA69iyDmQtS/Qxwg7b2spLPqiSauL4="; + hash = "sha256-kkSbEvWBrvcnBgHDdKJjpSYF6BJDEwmYSxVQbPkQ6so="; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - hash = "sha256-01yEB9We5MkeCF6uva0SDTpt+4Ln2TaNh6jkCS66PUE="; + hash = "sha256-rdzJuOkXYojgm5VfpshtJuCJYM0/iS+HnWMXEDsLQPg="; }; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; From 3074443cc918d12ef17227951b1c4e6b791fc5bc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 28 May 2023 04:20:00 +0000 Subject: [PATCH 128/187] unifont_upper: 15.0.02 -> 15.0.04 --- pkgs/data/fonts/unifont_upper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 31066382747c..892ed5be2400 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "unifont_upper"; - version = "15.0.02"; + version = "15.0.04"; src = fetchurl { url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.ttf"; - hash = "sha256-Ikd2VotAvktUd083vzZZFLzmXtZi4EGYRJ9eKP4yveE="; + hash = "sha256-7iRcyKfGpv2rjVLPRNchxpXwj0KA5jlgDnCfG7byLLI="; }; dontUnpack = true; From ac7614ae5b02790456e9908b4711953c66ecba07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 07:23:33 +0000 Subject: [PATCH 129/187] python310Packages.spacy-transformers: 1.2.3 -> 1.2.4 --- .../development/python-modules/spacy-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 7d3057e54ef3..5dabab1ed267 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.2.3"; + version = "1.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oNdH0oZNo8XWx+bbzwZs7iXD0Af6zx1k6wBYksgtp4w="; + hash = "sha256-hZwgk/rZ/0EAW8VcABjUKQvdYkVPdr3bzzGKroXzB7U="; }; nativeBuildInputs = [ From 922d823d0b5a8cc461b6bc5a751198da469b9daf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 07:40:22 +0000 Subject: [PATCH 130/187] v2ray: 5.6.0 -> 5.7.0 --- pkgs/tools/networking/v2ray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index b4b49c9992a2..7ec5a396f91f 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.6.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-4oaxZ+p12HRgA3OVoBYQb9czl+WSHSK1Cc+vYpeeUVM="; + hash = "sha256-gdDV5Cd/DjEqSiOF7j5a8QLtdJiFeNCnHoA4XD+yiGA="; }; # `nix-update` doesn't support `vendorHash` yet. From ff35c6cf96a55832221b53ec37559000664070cc Mon Sep 17 00:00:00 2001 From: QJoly Date: Thu, 1 Jun 2023 08:04:01 +0200 Subject: [PATCH 131/187] subtitlr: init at 0.1.0 Fix path Fix all-packages.nix --- pkgs/applications/audio/subtitlr/default.nix | 35 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/audio/subtitlr/default.nix diff --git a/pkgs/applications/audio/subtitlr/default.nix b/pkgs/applications/audio/subtitlr/default.nix new file mode 100644 index 000000000000..04c377c21059 --- /dev/null +++ b/pkgs/applications/audio/subtitlr/default.nix @@ -0,0 +1,35 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "Subtitlr"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "yoanbernabeu"; + repo = pname; + rev = version; + hash = "sha256-fwDIE8DFVd7NRhi8bBmFxrmGdT2ZtSFWBaynV+xz3ms="; + }; + + vendorHash = "sha256-t92nz42sv8bE0JIkSFB2+WBz1Um8kcRSotpXcPIy3eQ="; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installShellCompletion --cmd Subtitlr \ + --bash <($out/bin/Subtitlr completion bash) \ + --fish <($out/bin/Subtitlr completion fish) \ + --zsh <($out/bin/Subtitlr completion zsh) + ''; + + meta = with lib; { + description = "This application, a subtitle generator for YouTube, utilizes OpenAI's Whisper API."; + homepage = "https://github.com/yoanbernabeu/Subtitlr/"; + license = licenses.mit; + maintainers = with maintainers; [ qjoly ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f68c6da33dfa..b58b118a48cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34417,6 +34417,8 @@ with pkgs; sublime-music = callPackage ../applications/audio/sublime-music { }; + subtitlr = callPackage ../applications/audio/subtitlr { }; + subunit = callPackage ../development/libraries/subunit { }; surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; From 9c5ae0023685def0f241cee57e01494c4947d6de Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 20 Apr 2023 09:48:44 +0800 Subject: [PATCH 132/187] qt6Packages.qxlsx: 1.4.5 -> 1.4.6 Diff: https://github.com/QtExcel/QXlsx/compare/v1.4.5...v1.4.6 --- pkgs/development/libraries/qxlsx/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qxlsx/default.nix b/pkgs/development/libraries/qxlsx/default.nix index 6251689d0e23..b6d92b964452 100644 --- a/pkgs/development/libraries/qxlsx/default.nix +++ b/pkgs/development/libraries/qxlsx/default.nix @@ -1,21 +1,31 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , qtbase }: stdenv.mkDerivation rec { pname = "qxlsx"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "QtExcel"; repo = "QXlsx"; rev = "v${version}"; - hash = "sha256-T+PUeml4O6uwY6DCAsBer4gDo+nrSGGus+yQv02CJcE="; + hash = "sha256-8plnvyb4sQRfEac1TVWgr2yrtAVAPKucgAnsybdUd3U="; }; + patches = [ + # Fix header include path + # https://github.com/QtExcel/QXlsx/pull/279 + (fetchpatch { + url = "https://github.com/QtExcel/QXlsx/commit/9d6db9efb92b93c3663ccfef3aec05267ba43723.patch"; + hash = "sha256-EbE5CNACAcgENCQh81lBZJ52hCIcBsFhNnYOS0Wr25I="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase ]; From 995007b146a8f39e7c2095b8f1d3f2a2a82f6396 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 07:51:33 +0000 Subject: [PATCH 133/187] python310Packages.intensity-normalization: 2.2.3 -> 2.2.4 --- .../python-modules/intensity-normalization/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index f784dc067953..19253b17fe66 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "intensity-normalization"; - version = "2.2.3"; + version = "2.2.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "intensity_normalization"; inherit version; - hash = "sha256-Yjd4hXmbT87xNKSqc6zkKNisOVhQzQAUZI5wBiI/UBk="; + hash = "sha256-s/trDIRoqLFj3NO+iv3E+AEB4grBAHDlEL6+TCdsgmg="; }; postPatch = '' From 803787d9dd32eae10857b28ee27ee5a984f7c2c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Jun 2023 09:57:11 +0200 Subject: [PATCH 134/187] certsync: init at unstable-2023-04-14 --- pkgs/tools/security/certsync/default.nix | 37 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/security/certsync/default.nix diff --git a/pkgs/tools/security/certsync/default.nix b/pkgs/tools/security/certsync/default.nix new file mode 100644 index 000000000000..15878c7826fb --- /dev/null +++ b/pkgs/tools/security/certsync/default.nix @@ -0,0 +1,37 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "certsync"; + version = "unstable-2023-04-14"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "zblurx"; + repo = "certsync"; + rev = "f3c8b61f0967a6403d4c592dcbfa8921682452a6"; + hash = "sha256-7Pzss83jf3zKmgQZki18R47OWn5VniZZ/d4N8JgZs+0="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + certipy-ad + tqdm + ]; + + pythonImportsCheck = [ + "certsync" + ]; + + meta = with lib; { + description = "Dump NTDS with golden certificates and UnPAC the hash"; + homepage = "https://github.com/zblurx/certsync"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d188ecdda557..9277532b7852 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -417,6 +417,8 @@ with pkgs; certgraph = callPackage ../tools/security/certgraph { }; + certsync = callPackage ../tools/security/certsync { }; + cewl = callPackage ../tools/security/cewl { }; chatgpt-cli = callPackage ../tools/misc/chatgpt-cli { }; From eb9f0de453a2711c4c1c48981e5cdb1ca859bc81 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 1 Jun 2023 08:30:30 +0000 Subject: [PATCH 135/187] datadog-agent: unpin go1.18 --- pkgs/tools/networking/dd-agent/datadog-agent.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index b3552a28e531..f8678bc9ef9c 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,7 +1,7 @@ { lib , stdenv , cmake -, buildGo118Module +, buildGoModule , makeWrapper , fetchFromGitHub , pythonPackages @@ -35,7 +35,7 @@ let cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"]; }; -in buildGo118Module rec { +in buildGoModule rec { pname = "datadog-agent"; inherit src version; From 58a56fdc15a93e73fcc096e53c355bcee27c3631 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 08:35:49 +0000 Subject: [PATCH 136/187] python310Packages.lion-pytorch: 0.0.7 -> 0.1.2 --- pkgs/development/python-modules/lion-pytorch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lion-pytorch/default.nix b/pkgs/development/python-modules/lion-pytorch/default.nix index a5a554c1980b..e23011aeb837 100644 --- a/pkgs/development/python-modules/lion-pytorch/default.nix +++ b/pkgs/development/python-modules/lion-pytorch/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lion-pytorch"; - version = "0.0.7"; + version = "0.1.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "lucidrains"; repo = "lion-pytorch"; rev = "refs/tags/${version}"; - hash = "sha256-CSb0s3DKv/KpEmCkCR+Y8iwrLdCL9w9Pl6W46cPB420"; + hash = "sha256-9hdpRJvCpv3PeC7f0IXpHt6i+e6LiT0QUl5jeDGelQE="; }; propagatedBuildInputs = [ torch ]; From f7000b91098c2a4fcec2b07681479d531440a06f Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Thu, 1 Jun 2023 18:39:30 +1000 Subject: [PATCH 137/187] enumer: unpin go --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73ff9f5e1089..8ee2b738209d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -553,9 +553,7 @@ with pkgs; efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { }; - enumer = callPackage ../tools/misc/enumer { - buildGoModule = buildGo119Module; # go 1.20 build failure - }; + enumer = callPackage ../tools/misc/enumer { }; evans = callPackage ../development/tools/evans { }; From dc073e7175b797125d7064c9269898e59b6f4f63 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Thu, 1 Jun 2023 18:43:48 +1000 Subject: [PATCH 138/187] mgmt: unpin go --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73ff9f5e1089..b646666b7ace 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1658,9 +1658,7 @@ with pkgs; mnc = callPackage ../tools/misc/mnc { }; - mgmt = callPackage ../applications/system/mgmt { - buildGoModule = buildGo119Module; # go 1.20 build failure - }; + mgmt = callPackage ../applications/system/mgmt { }; monica = callPackage ../servers/web-apps/monica { }; From 15fe59e369e773fc0724a56ba5c585a543b83dd7 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Thu, 1 Jun 2023 18:46:33 +1000 Subject: [PATCH 139/187] boulder: unpin go --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73ff9f5e1089..ca7db93d0225 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3199,9 +3199,7 @@ with pkgs; botamusique = callPackage ../tools/audio/botamusique { }; - boulder = callPackage ../tools/admin/boulder { - buildGoModule = buildGo119Module; # go 1.20 build failure - }; + boulder = callPackage ../tools/admin/boulder { }; btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; From 02a0d8c054cfeae028ef2f57bf668db368a22005 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 1 Jun 2023 16:57:16 +0800 Subject: [PATCH 140/187] mako: 1.7.1 -> 1.8.0 Diff: https://github.com/emersion/mako/compare/v1.7.1...v1.8.0 --- pkgs/applications/misc/mako/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index 3bd11ce68acd..ffad5a5684fa 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mako"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/+XYf8FiH4lk7f7/pMt43hm13mRK+UqvaNOpf1TI6m4="; + sha256 = "sha256-sUFMcCrc5iNPeAmRbqDaT/n8OIlFJEwJTzY1HMx94RU="; }; depsBuildBuild = [ pkg-config ]; From 64d92ed1122698958a7fb14ae71fbb4afc3ff072 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 31 May 2023 08:50:59 -0400 Subject: [PATCH 141/187] qdrant: 1.1.3 -> 1.2.2 --- pkgs/servers/search/qdrant/Cargo.lock | 474 +++++++++++++++++-------- pkgs/servers/search/qdrant/default.nix | 8 +- 2 files changed, 322 insertions(+), 160 deletions(-) diff --git a/pkgs/servers/search/qdrant/Cargo.lock b/pkgs/servers/search/qdrant/Cargo.lock index 632b3aaa45b6..d3080b88205c 100644 --- a/pkgs/servers/search/qdrant/Cargo.lock +++ b/pkgs/servers/search/qdrant/Cargo.lock @@ -380,53 +380,62 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" dependencies = [ "anstyle", "anstyle-parse", + "anstyle-query", "anstyle-wincon", - "concolor-override", - "concolor-query", + "colorchoice", "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "0.3.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] name = "anstyle-parse" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" dependencies = [ "utf8parse", ] [[package]] -name = "anstyle-wincon" -version = "0.2.0" +name = "anstyle-query" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" dependencies = [ "anstyle", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "api" -version = "1.1.3" +version = "1.2.2" dependencies = [ "chrono", "env_logger", @@ -527,19 +536,19 @@ dependencies = [ [[package]] name = "atomic_refcell" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "857253367827bd9d0fd973f0ef15506a96e79e41b0ad7aa691203a4e3214f6c8" +checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31" [[package]] name = "atomicwrites" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a580bfc0fc2370333eddb71de8c8614d5972e3a327438eb3acc22824a638bf" +checksum = "c1163d9d7c51de51a2b79d6df5e8888d11e9df17c752ce4a285fb6ca1580734e" dependencies = [ - "rustix 0.36.5", + "rustix 0.37.4", "tempfile", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -642,9 +651,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.64.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" dependencies = [ "bitflags", "cexpr", @@ -652,12 +661,13 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", + "prettyplease 0.2.4", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 1.0.107", + "syn 2.0.11", ] [[package]] @@ -700,7 +710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" dependencies = [ "arrayvec 0.4.12", - "constant_time_eq", + "constant_time_eq 0.1.5", ] [[package]] @@ -807,6 +817,19 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cgroups-rs" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b098e7c3a70d03c288fa0a96ccf13e770eb3d78c4cc0e1549b3c13215d5f965" +dependencies = [ + "libc", + "log", + "nix 0.25.1", + "regex", + "thiserror", +] + [[package]] name = "chrono" version = "0.4.24" @@ -872,21 +895,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.23" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "bitflags", - "clap_lex 0.2.4", - "indexmap", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" dependencies = [ "clap_builder", "clap_derive", @@ -895,22 +906,22 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.1" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" dependencies = [ "anstream", "anstyle", "bitflags", - "clap_lex 0.4.0", + "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" dependencies = [ "heck", "proc-macro2", @@ -920,18 +931,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f0807fb6f644c83f3e4ec014fec9858c1c8b26a7db8eb5f0bde5817df9c1df7" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] name = "codespan-reporting" @@ -963,7 +965,7 @@ dependencies = [ "log", "merge", "num_cpus", - "ordered-float 3.6.0", + "ordered-float 3.7.0", "parking_lot", "pprof", "rand 0.8.5", @@ -987,6 +989,12 @@ dependencies = [ "wal", ] +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "colored" version = "2.0.0" @@ -998,21 +1006,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "concolor-override" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys 0.45.0", -] - [[package]] name = "config" version = "0.13.3" @@ -1052,6 +1045,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "constant_time_eq" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" + [[package]] name = "convert_case" version = "0.4.0" @@ -1129,19 +1128,19 @@ dependencies = [ [[package]] name = "criterion" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +checksum = "9f9c16c823fba76d9643cc387e9677d9771abe0827561381815215c47f808da9" dependencies = [ "anes", - "atty", "cast", "ciborium", - "clap 3.2.23", + "clap", "criterion-plot", + "is-terminal", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", @@ -1851,6 +1850,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + [[package]] name = "http" version = "0.2.9" @@ -2186,9 +2191,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "librocksdb-sys" -version = "0.10.0+7.9.2" +version = "0.11.0+8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe4d5874f5ff2bc616e55e8c6086d478fcda13faf9495768a4aa1c22042d30b" +checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" dependencies = [ "bindgen", "bzip2-sys", @@ -2307,6 +2312,15 @@ dependencies = [ "libc", ] +[[package]] +name = "memmap2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0aa1b505aeecb0adb017db2b6a79a17a38e64f882a201f05e9de8a982cd6096" +dependencies = [ + "libc", +] + [[package]] name = "memoffset" version = "0.7.1" @@ -2411,6 +2425,18 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0" +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags", + "cfg-if", + "libc", +] + [[package]] name = "nix" version = "0.26.2" @@ -2439,6 +2465,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + [[package]] name = "num-derive" version = "0.3.3" @@ -2519,9 +2554,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "openssl" -version = "0.10.50" +version = "0.10.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1" +checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" dependencies = [ "bitflags", "cfg-if", @@ -2560,9 +2595,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.85" +version = "0.9.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d3d193fb1488ad46ffe3aaabc912cc931d02ee8518fe2959aea8ef52718b0c0" +checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" dependencies = [ "cc", "libc", @@ -2582,9 +2617,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a384337e997e6860ffbaa83708b2ef329fd8c54cb67a5f64d421e0f943254f" +checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" dependencies = [ "num-traits", ] @@ -2599,12 +2634,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "parking_lot" version = "0.12.1" @@ -2809,7 +2838,7 @@ dependencies = [ "inferno", "libc", "log", - "nix", + "nix 0.26.2", "once_cell", "parking_lot", "prost", @@ -2838,6 +2867,16 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "prettyplease" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" +dependencies = [ + "proc-macro2", + "syn 2.0.11", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2871,6 +2910,19 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "procfs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "943ca7f9f29bab5844ecd8fdb3992c5969b6622bb9609b9502fef9b4310e3f1f" +dependencies = [ + "bitflags", + "byteorder", + "hex", + "lazy_static", + "rustix 0.36.13", +] + [[package]] name = "prometheus" version = "0.13.3" @@ -2887,16 +2939,15 @@ dependencies = [ [[package]] name = "proptest" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70" +checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" dependencies = [ "bit-set", "bitflags", "byteorder", "lazy_static", "num-traits", - "quick-error 2.0.1", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", @@ -2908,9 +2959,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", "prost-derive", @@ -2918,9 +2969,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c828f93f5ca4826f97fedcbd3f9a536c16b12cff3dbbb4a007f932bbad95b12" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck", @@ -2929,7 +2980,7 @@ dependencies = [ "log", "multimap", "petgraph", - "prettyplease", + "prettyplease 0.1.22", "prost", "prost-types", "regex", @@ -2940,9 +2991,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools", @@ -2953,9 +3004,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ "prost", ] @@ -2981,7 +3032,7 @@ dependencies = [ [[package]] name = "qdrant" -version = "1.1.3" +version = "1.2.2" dependencies = [ "actix-cors", "actix-files", @@ -2992,10 +3043,11 @@ dependencies = [ "api", "atty", "chrono", - "clap 4.2.1", + "clap", "collection", "colored", "config", + "constant_time_eq 0.2.5", "env_logger", "futures", "futures-util", @@ -3012,6 +3064,7 @@ dependencies = [ "reqwest", "rusty-hook", "schemars", + "sealed_test", "segment", "serde", "serde_cbor", @@ -3031,15 +3084,18 @@ dependencies = [ "tower-layer", "uuid", "validator", + "wal", ] [[package]] name = "quantization" version = "0.1.0" -source = "git+https://github.com/qdrant/quantization.git#9c2d0a60062559dbe7f699a6dfac9978e799e3e5" +source = "git+https://github.com/qdrant/quantization.git#3443cbbd0943f3e87f39c966ef111e2a85f05174" dependencies = [ "cc", "permutation_iterator", + "rand 0.8.5", + "rayon", "serde", "serde_json", ] @@ -3050,12 +3106,6 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - [[package]] name = "quick-xml" version = "0.26.0" @@ -3256,9 +3306,9 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "reqwest" -version = "0.11.16" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" dependencies = [ "base64 0.21.0", "bytes", @@ -3352,9 +3402,9 @@ checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea" [[package]] name = "rocksdb" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015439787fce1e75d55f279078d33ff14b4af5d93d995e8838ee4631301c8a99" +checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" dependencies = [ "libc", "librocksdb-sys", @@ -3429,16 +3479,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.5" +version = "0.36.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658" dependencies = [ "bitflags", - "errno 0.2.8", + "errno 0.3.0", "io-lifetimes 1.0.3", "libc", "linux-raw-sys 0.1.4", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -3511,7 +3561,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" dependencies = [ "fnv", - "quick-error 1.2.3", + "quick-error", + "tempfile", + "wait-timeout", +] + +[[package]] +name = "rusty-forkfork" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ce85af4dfa2fb0c0143121ab5e424c71ea693867357c9159b8777b59984c218" +dependencies = [ + "fnv", + "quick-error", "tempfile", "wait-timeout", ] @@ -3609,6 +3671,28 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +[[package]] +name = "sealed_test" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a608d94641cc17fe203b102db2ae86d47a236630192f0244ddbbbb0044c0272" +dependencies = [ + "fs_extra", + "rusty-forkfork", + "sealed_test_derive", + "tempfile", +] + +[[package]] +name = "sealed_test_derive" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b672e005ae58fef5da619d90b9f1c5b44b061890f4a371b3c96257a8a15e697" +dependencies = [ + "quote", + "syn 1.0.107", +] + [[package]] name = "security-framework" version = "2.7.0" @@ -3634,12 +3718,13 @@ dependencies = [ [[package]] name = "segment" -version = "0.5.0" +version = "0.6.0" dependencies = [ "atomic_refcell", "atomicwrites", "bincode", "bitvec", + "cgroups-rs", "chrono", "criterion", "fs_extra", @@ -3647,13 +3732,14 @@ dependencies = [ "geohash", "itertools", "log", - "memmap2", + "memmap2 0.6.1", "num-derive", "num-traits", "num_cpus", - "ordered-float 3.6.0", + "ordered-float 3.7.0", "parking_lot", "pprof", + "procfs", "quantization", "rand 0.8.5", "rand_distr", @@ -3667,6 +3753,7 @@ dependencies = [ "serde-value", "serde_cbor", "serde_json", + "sysinfo", "tar", "tempfile", "thiserror", @@ -3684,9 +3771,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] @@ -3713,9 +3800,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", @@ -3735,9 +3822,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -3959,7 +4046,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b55cdc318ede251d0957f07afe5fed912119b8c1bc5a7804151826db999e737" dependencies = [ "debugid", - "memmap2", + "memmap2 0.5.10", "stable_deref_trait", "uuid", ] @@ -4013,6 +4100,21 @@ dependencies = [ "libc", ] +[[package]] +name = "sysinfo" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02f1dc6930a439cc5d154221b5387d153f8183529b07c19aca24ea31e0a167e1" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + [[package]] name = "tap" version = "1.0.1" @@ -4062,12 +4164,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" version = "1.0.40" @@ -4185,9 +4281,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "bytes", @@ -4199,7 +4295,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -4214,9 +4310,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", @@ -4302,9 +4398,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bd8e87955eb13c1986671838177d6792cdc52af9bffced0d2c8a9a7f741ab3" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-stream", "async-trait", @@ -4334,11 +4430,11 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f60a933bbea70c95d633c04c951197ddf084958abaa2ed502a3743bdd8d8dd7" +checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ - "prettyplease", + "prettyplease 0.1.22", "proc-macro2", "prost-build", "quote", @@ -4496,9 +4592,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ "getrandom 0.2.8", "serde", @@ -4570,7 +4666,7 @@ dependencies = [ [[package]] name = "wal" version = "0.1.2" -source = "git+https://github.com/qdrant/wal.git?rev=9fe5a0c97c148152adacca0df238be6b1bf7d704#9fe5a0c97c148152adacca0df238be6b1bf7d704" +source = "git+https://github.com/qdrant/wal.git?rev=f3029ad0e1632d5e375db55695e33121df54aa5c#f3029ad0e1632d5e375db55695e33121df54aa5c" dependencies = [ "byteorder", "crc", @@ -4579,7 +4675,7 @@ dependencies = [ "env_logger", "fs4", "log", - "memmap2", + "memmap2 0.6.1", "rand 0.8.5", "rand_distr", "rustix 0.37.4", @@ -4793,12 +4889,12 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.42.2", "windows_aarch64_msvc 0.42.2", "windows_i686_gnu 0.42.2", "windows_i686_msvc 0.42.2", "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2", ] @@ -4808,7 +4904,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] @@ -4817,21 +4922,42 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.42.2", "windows_aarch64_msvc 0.42.2", "windows_i686_gnu 0.42.2", "windows_i686_msvc 0.42.2", "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2", ] +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" @@ -4844,6 +4970,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + [[package]] name = "windows_i686_gnu" version = "0.36.1" @@ -4856,6 +4988,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + [[package]] name = "windows_i686_msvc" version = "0.36.1" @@ -4868,6 +5006,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + [[package]] name = "windows_x86_64_gnu" version = "0.36.1" @@ -4880,12 +5024,24 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + [[package]] name = "windows_x86_64_msvc" version = "0.36.1" @@ -4898,6 +5054,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + [[package]] name = "winreg" version = "0.10.1" diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index 184d65b75feb..075f46eb065f 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -11,20 +11,20 @@ rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.1.3"; + version = "1.2.2"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-CGGJLyhhwQvW9AIzA7Fg85CvPbnuyELR+mmhoc4hJtk="; + sha256 = "sha256-1UJZibj7twM/4z9w+ebOI0AVjPZGz7B1BWw0M0pMQ+k="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "quantization-0.1.0" = "sha256-4TY08ScRbL4zVG428BTZu42ocAsPk/8wM+zzI8EFSrs="; - "wal-0.1.2" = "sha256-EfCvwgHMfyiId8VjV+yFyNqoIv6fxF8UFcw1s46hF5k="; + "quantization-0.1.0" = "sha256-mhiVicQXj8639bX2mGp9XnjTNVFdd6mnk+B1B1f3ywA="; + "wal-0.1.2" = "sha256-oZ6xij59eIpCGcFL2Ds6E180l1SGIRMOq7OcLc1TpxY="; }; }; From 3425365f629311a91f9df28b64b19e02898599c3 Mon Sep 17 00:00:00 2001 From: cherryblossom Date: Thu, 1 Jun 2023 19:35:25 +1000 Subject: [PATCH 142/187] flyctl: 0.1.20 -> 0.1.23 https://github.com/superfly/flyctl/releases/tag/v0.1.23 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index de3692582d3b..f997259f84d7 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.20"; + version = "0.1.23"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-S0jYNNbXTR1Vr6YHoUXxhTM+MKuokI0Tyc5svh31DM8="; + hash = "sha256-ekVqY5rM/CeewZ0wnlSjWusPEQzdeVwIGdfnicMe3k8"; }; - vendorHash = "sha256-UCP73yAeT3JO7fhpshTpbhmB2wLGc26GiLY/DkBAgTg="; + vendorHash = "sha256-7KLEfK2eZLEtOHqQxhpdQCeKVfn+rUu3i699Zk06J/U="; subPackages = [ "." ]; From df1af73e283159516575cd799375f5ca3aba41d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 09:58:59 +0000 Subject: [PATCH 143/187] python310Packages.pywebview: 4.0.2 -> 4.1 --- pkgs/development/python-modules/pywebview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index 913b116c29ec..84e2a3f64442 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pywebview"; - version = "4.0.2"; + version = "4.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "r0x0r"; repo = "pywebview"; rev = "refs/tags/${version}"; - hash = "sha256-awgX862p1jU/LWdg7QMC9by0OJMkzGwnC0yrc93I/c0="; + hash = "sha256-oqyWT0GaZ201OMVRcRpm1dma6NonTMmTx5SKnjzQl3M="; }; nativeBuildInputs = [ From 1b7ba8a45b8b690d6847b74205a2e0880f431390 Mon Sep 17 00:00:00 2001 From: Ivan Nikolaenko Date: Wed, 31 May 2023 14:29:29 +0300 Subject: [PATCH 144/187] rauc: fix cross-compilation Add glib to nativeBuildInputs for gdbus-codegen Signed-off-by: Ivan Nikolaenko --- pkgs/tools/misc/rauc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix index 3548ba6975ff..c6bb154ab229 100644 --- a/pkgs/tools/misc/rauc/default.nix +++ b/pkgs/tools/misc/rauc/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja glib ]; buildInputs = [ curl dbus glib json-glib openssl util-linux libnl systemd ]; From 51785558a349e77540d35574685a5f3122c0b733 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 10:20:09 +0000 Subject: [PATCH 145/187] python310Packages.rq: 1.14.1 -> 1.15 --- pkgs/development/python-modules/rq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index b07c764ff354..4ec3b676698a 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "rq"; - version = "1.14.1"; + version = "1.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rq"; repo = "rq"; rev = "refs/tags/v${version}"; - hash = "sha256-8X7l59YAO4T0JA3saLzEwirHZniXsp/9Z8q+Tr2HDv0="; + hash = "sha256-QTQ90ZJQU6UWPjNCjmR4ez6av+B9M8gDof2Gq+R86aY="; }; propagatedBuildInputs = [ From 94d9a6ce177b3a67fb6d583c66cc59522333318c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 29 May 2023 10:55:40 +0000 Subject: [PATCH 146/187] lib.systems: remove mipsisa(32|64)r6 triples These arc the same as the normal triples apart for a difference in -march, so there's no need for them to be separate triples. --- lib/systems/examples.nix | 18 ++++++------------ lib/systems/parse.nix | 12 ++++-------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 4edbf4df4b61..45b95c150fce 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -91,22 +91,16 @@ rec { } // platforms.fuloong2f_n32; # can execute on 32bit chip - mips-linux-gnu = { config = "mips-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32; - mipsel-linux-gnu = { config = "mipsel-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32; - mipsisa32r6-linux-gnu = { config = "mipsisa32r6-unknown-linux-gnu"; } // platforms.gcc_mips32r6_o32; - mipsisa32r6el-linux-gnu = { config = "mipsisa32r6el-unknown-linux-gnu"; } // platforms.gcc_mips32r6_o32; + mips-linux-gnu = { config = "mips-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32; + mipsel-linux-gnu = { config = "mipsel-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32; # require 64bit chip (for more registers, 64-bit floating point, 64-bit "long long") but use 32bit pointers - mips64-linux-gnuabin32 = { config = "mips64-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32; - mips64el-linux-gnuabin32 = { config = "mips64el-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32; - mipsisa64r6-linux-gnuabin32 = { config = "mipsisa64r6-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r6_n32; - mipsisa64r6el-linux-gnuabin32 = { config = "mipsisa64r6el-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r6_n32; + mips64-linux-gnuabin32 = { config = "mips64-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32; + mips64el-linux-gnuabin32 = { config = "mips64el-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32; # 64bit pointers - mips64-linux-gnuabi64 = { config = "mips64-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r2_64; - mips64el-linux-gnuabi64 = { config = "mips64el-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r2_64; - mipsisa64r6-linux-gnuabi64 = { config = "mipsisa64r6-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r6_64; - mipsisa64r6el-linux-gnuabi64 = { config = "mipsisa64r6el-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r6_64; + mips64-linux-gnuabi64 = { config = "mips64-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r2_64; + mips64el-linux-gnuabi64 = { config = "mips64el-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r2_64; muslpi = raspberryPi // { config = "armv6l-unknown-linux-musleabihf"; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index ea8e1ff8fcf0..6eb4f27cc519 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -91,14 +91,10 @@ rec { microblaze = { bits = 32; significantByte = bigEndian; family = "microblaze"; }; microblazeel = { bits = 32; significantByte = littleEndian; family = "microblaze"; }; - mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; - mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; - mipsisa32r6 = { bits = 32; significantByte = bigEndian; family = "mips"; }; - mipsisa32r6el = { bits = 32; significantByte = littleEndian; family = "mips"; }; - mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; }; - mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; }; - mipsisa64r6 = { bits = 64; significantByte = bigEndian; family = "mips"; }; - mipsisa64r6el = { bits = 64; significantByte = littleEndian; family = "mips"; }; + mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; + mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; + mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; }; + mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; }; mmix = { bits = 64; significantByte = bigEndian; family = "mmix"; }; From 4e80f80864db80ef05482325a379243c41f925fa Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 19 May 2023 19:52:57 +0000 Subject: [PATCH 147/187] lib.systems.doubles: add big-endian MIPS linux doubles We already have examples for these, but since we didn't actually recognise the doubles, it wasn't possible to build any packages for them without setting allowUnsupportedSystem. --- lib/systems/doubles.nix | 6 +++--- lib/tests/systems.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 6d2f015674e0..66bf3d872bee 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -27,9 +27,9 @@ let # Linux "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" "microblaze-linux" - "microblazeel-linux" "mipsel-linux" "mips64el-linux" "powerpc64-linux" - "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux" - "s390x-linux" "x86_64-linux" + "microblazeel-linux" "mips-linux" "mips64-linux" "mips64el-linux" + "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" + "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" # MMIXware "mmix-mmixware" diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 792aa94f3356..2afe128c4208 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -18,7 +18,7 @@ with lib.systems.doubles; lib.runTests { testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ]; testarmv7 = mseteq armv7 [ "armv7a-darwin" "armv7a-linux" "armv7l-linux" "armv7a-netbsd" "armv7l-netbsd" ]; testi686 = mseteq i686 [ "i686-linux" "i686-freebsd13" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; - testmips = mseteq mips [ "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ]; + testmips = mseteq mips [ "mips-linux" "mips64-linux" "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ]; testmmix = mseteq mmix [ "mmix-mmixware" ]; testpower = mseteq power [ "powerpc-netbsd" "powerpc-none" "powerpc64-linux" "powerpc64le-linux" "powerpcle-none" ]; testriscv = mseteq riscv [ "riscv32-linux" "riscv64-linux" "riscv32-netbsd" "riscv64-netbsd" "riscv32-none" "riscv64-none" ]; @@ -34,7 +34,7 @@ with lib.systems.doubles; lib.runTests { testredox = mseteq redox [ "x86_64-redox" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; - testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" "microblaze-linux" "microblazeel-linux" "loongarch64-linux" ]; + testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" "microblaze-linux" "microblazeel-linux" "mips-linux" "mips64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" ]; testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; From ad90e88108a40246a7defbc2b36b0ddb35803724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 1 Jun 2023 12:46:15 +0200 Subject: [PATCH 148/187] nixos/doc: fix typo --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 9b758adca57a..f661f22f4814 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -14,7 +14,7 @@ In addition to numerous new and updated packages, this release has the following - The default [Nix](https://github.com/NixOS/nix) version was updated from 2.11 to 2.13. In particular, this includes a [small language alteration](https://github.com/NixOS/nix/issues/8259) in the way floats are represented in `builtins.toJSON`. See the release notes for [2.13](https://nixos.org/manual/nix/stable/release-notes/rl-2.13.html) and [2.14](https://nixos.org/manual/nix/unstable/release-notes/rl-2.14.html) for more information. -- The default [Linux Kernel](https://kernel.org/) was updated from version 5.15 to 6.1, see [Kernelnewbies](https://kernelnewbies.org/Linux_6.1) for what has changed. All currently shown Kernels shown on [kernel.org](https://kernel.org/) are available. +- The default [Linux Kernel](https://kernel.org/) was updated from version 5.15 to 6.1, see [Kernelnewbies](https://kernelnewbies.org/Linux_6.1) for what has changed. All Kernels currently shown on [kernel.org](https://kernel.org/) are available. - [systemd](https://systemd.io) has been updated from v252 to v253, see [the release notes](https://github.com/systemd/systemd/blob/main/NEWS#L21-L677) for more information on the changes. - Updating with `nixos-rebuild boot` and rebooting is recommended, since in some rare cases the `nixos-rebuild switch` into the new generation on a live system might fail due to missing mount units. From c41c19276d2883a8957b097a210bdd06dbe7ddce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 1 Jun 2023 12:46:52 +0200 Subject: [PATCH 149/187] nixos/doc: drop a repeated paragraph Bad conflict resolution, I assume. --- nixos/doc/manual/release-notes/rl-2305.section.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index f661f22f4814..aaad05cf3c1e 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -200,9 +200,6 @@ In addition to numerous new and updated packages, this release has the following - `graylog` has been updated to version 5, which can not be updated directly from the previously packaged version 3.3. If you had installed the previously packaged version 3.3, please follow the [upgrade path](https://go2docs.graylog.org/5-0/upgrading_graylog/upgrade_path.htm) from 3.3 to 4.0 to 4.3 to 5.0. -- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChrootenv` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs. - - - `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChrootenv` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs. - `nushell` has been updated to at least version 0.77.0, which includes potential breaking changes in aliases. The old aliases are now available as `old-alias` but it is recommended you migrate to the new format. See [Reworked aliases](https://www.nushell.sh/blog/2023-03-14-nushell_0_77.html#reworked-aliases-breaking-changes-kubouch). From 054c184cab9d6a5fc9d663bcd4f0532d13c8e25d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 1 Jun 2023 12:47:34 +0200 Subject: [PATCH 150/187] nixos/doc: drop a repeated paragraph It's in "backward incompatibilities" section, so no need to be also in "*other* notable changes" section. --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index aaad05cf3c1e..2df20a6c0ebe 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -546,8 +546,6 @@ In addition to numerous new and updated packages, this release has the following - Booting from a volume managed by the Stratis storage management daemon is now supported. Use `fileSystems..stratis.poolUuid` to configure the pool containing the fs. -- Only `k3s` version 1.26 is included. Users of the `k3s_1_24` or `k3s_1_25` packages should upgrade to use the version 1.26 of the package. - ## Nixpkgs internals {#sec-release-23.05-nixpkgs-internals} - `buildDunePackage` now defaults to `strictDeps = true` which means that any library should go into `buildInputs` or `checkInputs`. Any executable that is run on the building machine should go into `nativeBuildInputs` or `nativeCheckInputs` respectively. Example of executables are `ocaml`, `findlib` and `menhir`. PPXs are libraries which are built by dune and should therefore not go into `nativeBuildInputs`. From 87dac23cb2c22c7bde97242806b6ee90d977e8fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 11:01:48 +0000 Subject: [PATCH 151/187] haproxy: 2.7.8 -> 2.8.0 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 7055a1c861bc..37b64143f9ac 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.7.8"; + version = "2.8.0"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-FfInaXG7uoxH2GzILr/G7DPjrvLkVlBYsuSVDAe451w="; + sha256 = "sha256-Yc2vtdt+kXTQdXuOS83pODUjBvt8yP8rX1XCbdSKbPc="; }; buildInputs = [ openssl zlib libxcrypt ] From 2f4a5b9ca29a8d540028c662a7e6ea24e1bcee91 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Thu, 1 Jun 2023 13:13:21 +0200 Subject: [PATCH 152/187] hugo: 0.112.5 -> 0.112.6 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 009e6116e2e3..5f8131275c3e 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.112.5"; + version = "0.112.6"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - hash = "sha256-phtiYh5+xSc4eeK2hM6bHFg4/Owm1EkInRE+NhuQAUA="; + hash = "sha256-FrZwblAxXtGduCZc37269iygflft32G0ICrJLd9ssBU="; }; - vendorHash = "sha256-A4mWrTSkE1NcLj8ozGXQJIrFMvqeoBC7y7eOTeh3ktw="; + vendorHash = "sha256-ZPgGR1NPVn/LF/nvCXP4S08MYvWp3Dtq/I9kom9HP9c="; doCheck = false; From ba15f99e56af2a201ed8e32f97a6c7b6e4d1cf88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 11:33:16 +0000 Subject: [PATCH 153/187] inform6: 6.41-r4 -> 6.41-r5 --- pkgs/development/compilers/inform6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/inform6/default.nix b/pkgs/development/compilers/inform6/default.nix index da580f3c53eb..e22d279fd9f2 100644 --- a/pkgs/development/compilers/inform6/default.nix +++ b/pkgs/development/compilers/inform6/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "inform6"; - version = "6.41-r4"; + version = "6.41-r5"; src = fetchurl { url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz"; - sha256 = "sha256-y55F/zV/99fS4ZITtPsSgkpMNfonFztZEP/QZxSQjfc="; + sha256 = "sha256-JsLufRmqUmJ4if1XURi9swS0upw+Hj827T27A9qDANg="; }; buildInputs = [ perl ]; From c3bf9ba6afa492aeff1d13fe0abac110931a1e9e Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 1 Jun 2023 13:47:27 +0200 Subject: [PATCH 154/187] i3status-rust: 0.31.5 -> 0.31.6 https://github.com/greshake/i3status-rust/releases/tag/v0.31.6 --- pkgs/applications/window-managers/i3/status-rust.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index a064b4272b21..9f71a1421fd6 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.31.5"; + version = "0.31.6"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4oYj88km7EWxz1DSQt96qcISwZmsNbQMFlxGIJI4FvA="; + hash = "sha256-sQF8POmDEUv3nY9+7Kr0Dcc3q/kpOLwCarexbCQ1zSg="; }; - cargoHash = "sha256-5k95wApVKd0KwQ/LTcqRn12Qx4mL7NialQ6Ne9/pm6I="; + cargoHash = "sha256-+wrZG7jzK8ksTpm6g25O/09sAnMYwmY5DYKqmUMuCFU="; nativeBuildInputs = [ pkg-config makeWrapper ]; From 095dfa20dcc28210040df91c11e7e11c5b0a6102 Mon Sep 17 00:00:00 2001 From: Lars Strojny Date: Sat, 27 May 2023 15:05:11 +0200 Subject: [PATCH 155/187] php: use binary wrappers Instead of shell wrappers, use binary wrappers which are preferred (see https://nixos.org/manual/nixpkgs/unstable/#:~:text=Using%20the-,makeBinaryWrapper,implementation%20is%20usually%20preferred,-%2C%20as%20it%20creates) --- pkgs/development/interpreters/php/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index eb75606273b4..6351eacd658e 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -9,7 +9,7 @@ let , nixosTests , tests , fetchurl - , makeWrapper + , makeBinaryWrapper , symlinkJoin , writeText , autoconf @@ -141,7 +141,7 @@ let phpWithExtensions = symlinkJoin { name = "php-with-extensions-${version}"; inherit (php) version; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; passthru = php.passthru // { buildEnv = mkBuildEnv allArgs allExtensionFunctions; withExtensions = mkWithExtensions allArgs allExtensionFunctions; From ceb97de9b84965748c2401753a45322f46551bd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 11:57:42 +0000 Subject: [PATCH 156/187] steampipe: 0.20.2 -> 0.20.5 --- pkgs/tools/misc/steampipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 3331e11987ea..0b4bfb48091c 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "steampipe"; - version = "0.20.2"; + version = "0.20.5"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-enjInsu1gaztdUr8z7GgBnL1pKnHoAtST4qGzQeBAhs="; + sha256 = "sha256-hpI667LNXwLhA/MgnlfLc/jk88ec94faV8hLnlAJ6ew="; }; vendorHash = "sha256-FWLEuSdhXSQJMd4PiiPTFC8aXkIlQ9LhL6/Dq7LkPPc="; From 0ad766dd2284fe686bef8631fcc3af2d0f672486 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 12:02:55 +0000 Subject: [PATCH 157/187] dasel: 2.2.0 -> 2.3.3 --- pkgs/applications/misc/dasel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index fdc29f23bb51..0955fa93f8cc 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "2.2.0"; + version = "2.3.3"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-DPfahZIb6Cp+E5GxIqNW+IruDZWBvJTRc7gxQOfeJqA="; + sha256 = "sha256-RP5088h+KDKENaSf/I8pzFBrHx1cxPKtQRqyNm0CjuQ="; }; - vendorHash = "sha256-+3RcjOZjmYu4eNpgczwY4Uyz1+poYA/TXc2Mb+VwRKc="; + vendorHash = "sha256-cLf0MzEAykmtnPjT2vGOSPwIXJP6BhxheUaicT7o/X4="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" From b856a7bbbc8371d3f7eb171ee2eab9539dc5edaf Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 1 Jun 2023 14:16:41 +0200 Subject: [PATCH 158/187] papirus-icon-theme: 20230301 -> 20230601 https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/releases/tag/20230601 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index b84b16b24335..0548ac07cedb 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20230301"; + version = "20230601"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-iIvynt8Qg9PmR2q7JsLtRlYxfHGaShMD8kbbPL89DzE="; + sha256 = "sha256-p47Vt1nR94bXtpWjNaIWJNKbdgFFMc0qCBeh2V98CJg="; }; nativeBuildInputs = [ gtk3 papirus-folders ]; From c214eb90a1586c6f99b281b700deda6b4b0a6a5a Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Thu, 1 Jun 2023 17:58:35 +0530 Subject: [PATCH 159/187] mockoon: init at 3.0.0 --- pkgs/tools/networking/mockoon/default.nix | 40 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/networking/mockoon/default.nix diff --git a/pkgs/tools/networking/mockoon/default.nix b/pkgs/tools/networking/mockoon/default.nix new file mode 100644 index 000000000000..df151764501b --- /dev/null +++ b/pkgs/tools/networking/mockoon/default.nix @@ -0,0 +1,40 @@ +{ lib +, appimageTools +, fetchurl +}: + +let + pname = "mockoon"; + version = "3.0.0"; + + src = fetchurl { + url = "https://github.com/mockoon/mockoon/releases/download/v${version}/mockoon-${version}.AppImage"; + hash = "sha256-YGcD/8h21fUoBEAcBVI5jo0UMCKdVRdC1zxDIrHjU+8="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; +in + +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -Dm 444 ${appimageContents}/${pname}.desktop -t $out/share/applications + cp -r ${appimageContents}/usr/share/icons $out/share + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "The easiest and quickest way to run mock APIs locally"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + homepage = "https://mockoon.com"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b03392cf33e..1ca0fc409df2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18755,6 +18755,8 @@ with pkgs; mockgen = callPackage ../development/tools/mockgen { }; + mockoon = callPackage ../tools/networking/mockoon { }; + modd = callPackage ../development/tools/modd { }; mold = callPackage ../development/tools/mold { From fc4ffe5a7a07210c2b963f1d8a4abdcb6eb06428 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 25 May 2023 11:50:41 +0000 Subject: [PATCH 160/187] westonLite: disable JPEG and LCMS2 support Neither of these features are so critical that the lite variant of the package requires them. --- .../window-managers/weston/default.nix | 14 ++++++++++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 86b9a84267cc..fa240d18c96b 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,10 +1,12 @@ { lib, stdenv, fetchurl , meson, ninja, pkg-config, python3, wayland-scanner -, cairo, dbus, lcms2, libdrm, libevdev, libinput, libjpeg, libxkbcommon, mesa -, seatd, wayland, wayland-protocols, xcbutilcursor +, cairo, dbus, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland +, wayland-protocols, xcbutilcursor , demoSupport ? true , hdrSupport ? true, libdisplay-info +, jpegSupport ? true, libjpeg +, lcmsSupport ? true, lcms2 , pangoSupport ? true, pango , pipewireSupport ? true, pipewire , rdpSupport ? true, freerdp @@ -27,9 +29,11 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ - cairo lcms2 libdrm libevdev libinput libjpeg libxkbcommon mesa seatd - wayland wayland-protocols + cairo libdrm libevdev libinput libxkbcommon mesa seatd wayland + wayland-protocols ] ++ lib.optional hdrSupport libdisplay-info + ++ lib.optional jpegSupport libjpeg + ++ lib.optional lcmsSupport lcms2 ++ lib.optional pangoSupport pango ++ lib.optional pipewireSupport pipewire ++ lib.optional rdpSupport freerdp @@ -44,7 +48,9 @@ stdenv.mkDerivation rec { (lib.mesonBool "backend-pipewire" pipewireSupport) (lib.mesonBool "backend-rdp" rdpSupport) (lib.mesonBool "backend-vnc" vncSupport) + (lib.mesonBool "color-management-lcms" lcmsSupport) (lib.mesonBool "demo-clients" demoSupport) + (lib.mesonBool "image-jpeg" jpegSupport) (lib.mesonBool "image-webp" webpSupport) (lib.mesonBool "pipewire" pipewireSupport) (lib.mesonBool "remoting" remotingSupport) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d5a674fb8a6..489dbf5a56f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35263,6 +35263,8 @@ with pkgs; westonLite = weston.override { demoSupport = false; hdrSupport = false; + jpegSupport = false; + lcmsSupport = false; pangoSupport = false; pipewireSupport = false; rdpSupport = false; From 44a331ac331e603684af642e8e89d4e6e21c9d98 Mon Sep 17 00:00:00 2001 From: Alexandru Scvortov Date: Thu, 1 Jun 2023 14:07:14 +0100 Subject: [PATCH 161/187] minizinc: enable gecode and cbc solvers by default Other changes: - switch derivation to finalAttrs pattern --- pkgs/development/tools/minizinc/default.nix | 24 +++++++++++++++---- pkgs/development/tools/minizinc/gecode.msc | 16 +++++++++++++ .../tools/minizinc/simple-test/aust.mzn | 20 ++++++++++++++++ .../tools/minizinc/simple-test/default.nix | 16 +++++++++++++ .../tools/minizinc/simple-test/loan.mzn | 24 +++++++++++++++++++ .../tools/minizinc/simple-test/loan1.dzn | 3 +++ 6 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/tools/minizinc/gecode.msc create mode 100644 pkgs/development/tools/minizinc/simple-test/aust.mzn create mode 100644 pkgs/development/tools/minizinc/simple-test/default.nix create mode 100644 pkgs/development/tools/minizinc/simple-test/loan.mzn create mode 100644 pkgs/development/tools/minizinc/simple-test/loan1.dzn diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index a0fb56738507..d62bdee04069 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,17 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, cmake, flex, bison }: -stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, callPackage, jq, cmake, flex, bison, gecode, mpfr, cbc, zlib }: +stdenv.mkDerivation (finalAttrs: { pname = "minizinc"; version = "2.7.4"; - nativeBuildInputs = [ cmake flex bison ]; + nativeBuildInputs = [ cmake flex bison gecode mpfr cbc zlib ]; src = fetchFromGitHub { owner = "MiniZinc"; repo = "libminizinc"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-Zq5gAwe9IQmknSDilFyHhSk5ZCQ8EfBOiM6Oef2WxYg="; }; + postInstall = '' + mkdir -p $out/share/minizinc/solvers/ + ${jq}/bin/jq \ + '.version = "${gecode.version}" + | .mznlib = "${gecode}/share/gecode/mznlib" + | .executable = "${gecode}/bin/fzn-gecode"' \ + ${./gecode.msc} \ + >$out/share/minizinc/solvers/gecode.msc + ''; + + passthru.tests = { + simple = callPackage ./simple-test { }; + }; + meta = with lib; { homepage = "https://www.minizinc.org/"; description = "A medium-level constraint modelling language"; @@ -28,4 +42,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.sheenobu ]; }; -} +}) diff --git a/pkgs/development/tools/minizinc/gecode.msc b/pkgs/development/tools/minizinc/gecode.msc new file mode 100644 index 000000000000..fc0b4a204689 --- /dev/null +++ b/pkgs/development/tools/minizinc/gecode.msc @@ -0,0 +1,16 @@ +{ + "id": "org.gecode.gecode", + "name": "Gecode", + "description": "Gecode FlatZinc executable", + "version": "VERSION-WILL-BE-REPLACED-BY-JQ", + "mznlib": "MZNLIB-WILL-BE-REPLACED-BY-JQ", + "executable": "FZN_GECODE-WILL-BE-REPLACED-BY-JQ", + "tags": ["cp","int", "float", "set", "restart"], + "stdFlags": ["-a","-f","-n","-p","-r","-s","-t"], + "supportsMzn": false, + "supportsFzn": true, + "needsSolns2Out": true, + "needsMznExecutable": false, + "needsStdlibDir": false, + "isGUIApplication": false +} diff --git a/pkgs/development/tools/minizinc/simple-test/aust.mzn b/pkgs/development/tools/minizinc/simple-test/aust.mzn new file mode 100644 index 000000000000..73d6dbfb7daa --- /dev/null +++ b/pkgs/development/tools/minizinc/simple-test/aust.mzn @@ -0,0 +1,20 @@ +% Taken from https://www.minizinc.org/doc-2.7.3/en/modelling.html +int: nc = 3; + +var 1..nc: wa; var 1..nc: nt; var 1..nc: sa; var 1..nc: q; +var 1..nc: nsw; var 1..nc: v; var 1..nc: t; + +constraint wa != nt; +constraint wa != sa; +constraint nt != sa; +constraint nt != q; +constraint sa != q; +constraint sa != nsw; +constraint sa != v; +constraint q != nsw; +constraint nsw != v; +solve satisfy; + +output ["wa=\(wa)\t nt=\(nt)\t sa=\(sa)\n", + "q=\(q)\t nsw=\(nsw)\t v=\(v)\n", + "t=", show(t), "\n"]; diff --git a/pkgs/development/tools/minizinc/simple-test/default.nix b/pkgs/development/tools/minizinc/simple-test/default.nix new file mode 100644 index 000000000000..0a9a811a43ff --- /dev/null +++ b/pkgs/development/tools/minizinc/simple-test/default.nix @@ -0,0 +1,16 @@ +# These tests show that the minizinc build is capable of running the +# examples in the official tutorial: +# https://www.minizinc.org/doc-2.7.3/en/modelling.html + +{ stdenv, minizinc }: + +stdenv.mkDerivation { + name = "minizinc-simple-test"; + meta.timeout = 10; + dontInstall = true; + buildCommand = '' + ${minizinc}/bin/minizinc --solver gecode ${./aust.mzn} + ${minizinc}/bin/minizinc --solver cbc ${./loan.mzn} ${./loan1.dzn} + touch $out + ''; +} diff --git a/pkgs/development/tools/minizinc/simple-test/loan.mzn b/pkgs/development/tools/minizinc/simple-test/loan.mzn new file mode 100644 index 000000000000..b3c1b735847e --- /dev/null +++ b/pkgs/development/tools/minizinc/simple-test/loan.mzn @@ -0,0 +1,24 @@ +% Taken from https://www.minizinc.org/doc-2.7.3/en/modelling.html +% variables +var float: R; % quarterly repayment +var float: P; % principal initially borrowed +var 0.0 .. 10.0: I; % interest rate (per quarter) + +% intermediate variables +var float: B1; % balance after one quarter +var float: B2; % balance after two quarters +var float: B3; % balance after three quarters +var float: B4; % balance owing at end + +constraint B1 = P * (1.0 + I) - R; +constraint B2 = B1 * (1.0 + I) - R; +constraint B3 = B2 * (1.0 + I) - R; +constraint B4 = B3 * (1.0 + I) - R; + +solve satisfy; + +output [ + "Borrowing ", show_float(0, 2, P), " at ", show(I*100.0), + "% interest, and repaying ", show_float(0, 2, R), + "\nper quarter for 1 year leaves ", show_float(0, 2, B4), " owing\n" +]; diff --git a/pkgs/development/tools/minizinc/simple-test/loan1.dzn b/pkgs/development/tools/minizinc/simple-test/loan1.dzn new file mode 100644 index 000000000000..d5fd9dad2e95 --- /dev/null +++ b/pkgs/development/tools/minizinc/simple-test/loan1.dzn @@ -0,0 +1,3 @@ +I = 0.04; +P = 1000.0; +R = 260.0; From 527b3365883389f7abc6e3b8cc57490bb8772cfd Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Sat, 4 Mar 2023 07:04:53 -0700 Subject: [PATCH 162/187] tailscale-systray: init at 2022-10-19 --- .../misc/tailscale-systray/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/misc/tailscale-systray/default.nix diff --git a/pkgs/applications/misc/tailscale-systray/default.nix b/pkgs/applications/misc/tailscale-systray/default.nix new file mode 100644 index 000000000000..85e927f018f1 --- /dev/null +++ b/pkgs/applications/misc/tailscale-systray/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, pkg-config +, gtk3 +, libayatana-appindicator +}: +buildGoModule rec { + pname = "tailscale-systray"; + version = "2022-10-19"; + + src = fetchFromGitHub { + owner = "mattn"; + repo = pname; + rev = "e7f8893684e7b8779f34045ca90e5abe6df6056d"; + sha256 = "sha256-3kozp6jq0xGllxoK2lGCNUahy/FvXyq11vNSxfDehKE="; + }; + + vendorHash = "sha256-YJ74SeZAMS+dXyoPhPTJ3L+5uL5bF8gumhMOqfvmlms="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 libayatana-appindicator ]; + + proxyVendor = true; + + meta = with lib; { + description = "Tailscale systray"; + homepage = "https://github.com/mattn/tailscale-systray"; + license = licenses.mit; + maintainers = with maintainers; [ qbit ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8086a44fe793..2fae8c679778 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25555,6 +25555,8 @@ with pkgs; tailscale = callPackage ../servers/tailscale { }; + tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; + tailspin = callPackage ../tools/misc/tailspin { }; thanos = callPackage ../servers/monitoring/thanos { }; From a33bd9d8e4480ed805a984297ac8488ff4edfdaa Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 1 Jun 2023 15:25:18 +0200 Subject: [PATCH 163/187] nbxplorer: 2.3.63 -> 2.3.65 --- pkgs/applications/blockchains/nbxplorer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 49f8779f5115..6bd443e428b5 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.63"; + version = "2.3.65"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-K3dlXwzKNzwJstp1DW5T5s5Gs0ebPNWXtzqr3rw5294="; + sha256 = "sha256-7m9gf+enOtE5VWuBNLFf11ofLGBRAYWvmkrekUVQQaQ="; }; projectFile = "NBXplorer/NBXplorer.csproj"; From 016baa1dbb3d447c78dafa1dbd5494b958ab35ec Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 1 Jun 2023 15:25:19 +0200 Subject: [PATCH 164/187] btcpayserver: 1.9.3 -> 1.10.0 --- .../blockchains/btcpayserver/default.nix | 4 ++-- pkgs/applications/blockchains/btcpayserver/deps.nix | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index ca097b1de88c..d65979a3ef52 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.9.3"; + version = "1.10.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-XcpPdlDpY/RXOK8ykZ/UUVOok2Pz3vObdp4zhy9tt7w="; + sha256 = "sha256-UJvpEWR49m1B21eMrh0LiJ2bguM7hNux0ywDj6oJbDU="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index cdd0b9ebbb00..ac03ab8306c8 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -8,14 +8,14 @@ (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.23"; sha256 = "11nb7ba93g51n5f5aa6sd6s3f9x82g1vbi8rcj04x5anbh2g451n"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.26"; sha256 = "1mssifz3jhvk3cqpb3kiqzlsyirlxzj90mlkigdnqqxfk7fyv6wv"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.26"; sha256 = "0sbcl1jdpjgjpa4cagcrppk124nkk2hxsvlj8nr6zf3fcdwllagj"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.27"; sha256 = "14bgi3p31v8ypf1lqnc5xkpzfd2cj5a23v2wv1m38jl6ng2v6vqp"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.24"; sha256 = "0dah7q90x29rqhngxd9226pfn1k4bbhhfgnkpjpw64529m29cdks"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.15"; sha256 = "18qnpdxbz359ygygllsrf95fbalsfyjrf6j9wi7c8qd39jwcignx"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.26"; sha256 = "1kfl88psjbsh88l98kc6dyxqjghnzyffi070v2ifkdjcdgdbawfs"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.16"; sha256 = "1m3nb23f6c6ms2mm07sii4hkrv7illzfg32cjy2j3h6myynw1ik5"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.19"; sha256 = "164c5nmsqzgz9v6fw0ml0d9m5hcp449468giakv3cihq25cd6giz"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; }) @@ -158,9 +158,10 @@ (fetchNuGet { pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) (fetchNuGet { pname = "NBitcoin"; version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; }) (fetchNuGet { pname = "NBitcoin"; version = "7.0.24"; sha256 = "0yc6cgwp2xr2dzjsrkawyh43whixv66nvvq6rh1pi6gi14iaqmfa"; }) - (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.18"; sha256 = "054i15qan5154iy8m13jmhnz1w5rs208i1xhlfnivwiq2v1c2qby"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.26"; sha256 = "0m50dmx7hhbxxgwpl9cxrbihpg9l10pga58b41vb0fima2y137zs"; }) + (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.19"; sha256 = "16bv3314flq6ildsjzxzw4ih2wbryvkjpkcwkvf2lh2smqhnvr11"; }) (fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; }) - (fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.3"; sha256 = "0lf5qsf5yr5m1fx826mn47l237x5y2wkimv6klc3rvwwc7f10dmm"; }) + (fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.5"; sha256 = "0kycvnxgqrkxig8k6mp1897sqbq2xarc8429vnjh79644nakdas4"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) From ed99bd0fb94271721aea0c9816e162c00ef51c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 1 May 2023 12:39:28 +0200 Subject: [PATCH 165/187] kanidm: 1.1.0-alpha.11 -> 1.1.0-alpha.12 * Update Cargo.lock from upstream. * Adapt expression to upstream source tree layout changes. * Apply patch to restore x86_64 v1 support Co-Authored-By: Martin Weinelt Also updates the NixOS test: * Stop kanidm to recover the idm_admin account * Group all tests into subtest blocks * Add TODO to wait for unix socket on unixd for the next release Co-Authored-By: Raito Bezarius Co-Authored-By: Martin Weinelt --- nixos/tests/kanidm.nix | 29 +- pkgs/servers/kanidm/Cargo.lock | 1274 ++++++++++++++++--------------- pkgs/servers/kanidm/default.nix | 24 +- 3 files changed, 692 insertions(+), 635 deletions(-) diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix index d9c0542c4c2e..7e174590cb5f 100644 --- a/nixos/tests/kanidm.nix +++ b/nixos/tests/kanidm.nix @@ -63,12 +63,27 @@ import ./make-test-python.nix ({ pkgs, ... }: '' start_all() server.wait_for_unit("kanidm.service") - server.wait_until_succeeds("curl -sf https://${serverDomain} | grep Kanidm") - server.succeed("ldapsearch -H ldaps://${serverDomain}:636 -b '${ldapBaseDN}' -x '(name=test)'") - client.succeed("kanidm login -D anonymous && kanidm self whoami | grep anonymous@${serverDomain}") - rv, result = server.execute("kanidmd recover_account -c ${serverConfigFile} idm_admin 2>&1 | rg -o '[A-Za-z0-9]{48}'") - assert rv == 0 - client.wait_for_unit("kanidm-unixd.service") - client.succeed("kanidm_unixd_status | grep working!") + + with subtest("Test HTTP interface"): + server.wait_until_succeeds("curl -sf https://${serverDomain} | grep Kanidm") + + with subtest("Test LDAP interface"): + server.succeed("ldapsearch -H ldaps://${serverDomain}:636 -b '${ldapBaseDN}' -x '(name=test)'") + + with subtest("Test CLI login"): + client.succeed("kanidm login -D anonymous") + client.succeed("kanidm self whoami | grep anonymous@${serverDomain}") + + with subtest("Recover idm_admin account"): + # Must stop the server for account recovery or else kanidmd fails with + # "unable to lock kanidm exclusive lock at /var/lib/kanidm/kanidm.db.klock". + server.succeed("systemctl stop kanidm") + server.succeed("su - kanidm -c 'kanidmd recover-account -c ${serverConfigFile} idm_admin 2>&1 | rg -o \'[A-Za-z0-9]{48}\' '") + server.succeed("systemctl start kanidm") + + with subtest("Test unixd connection"): + client.wait_for_unit("kanidm-unixd.service") + # TODO: client.wait_for_file("/run/kanidm-unixd/sock") + client.wait_until_succeeds("kanidm-unix status | grep working!") ''; }) diff --git a/pkgs/servers/kanidm/Cargo.lock b/pkgs/servers/kanidm/Cargo.lock index 3b2c59fd96f7..91d53f3c8c93 100644 --- a/pkgs/servers/kanidm/Cargo.lock +++ b/pkgs/servers/kanidm/Cargo.lock @@ -14,7 +14,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -68,16 +68,16 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] @@ -99,9 +99,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "anymap2" @@ -111,9 +111,9 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -130,11 +130,11 @@ dependencies = [ "asn1-rs-derive", "asn1-rs-impl", "displaydoc", - "nom 7.1.3", + "nom", "num-traits", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.20", ] [[package]] @@ -145,7 +145,7 @@ checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] @@ -157,7 +157,7 @@ checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -197,9 +197,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" dependencies = [ "async-lock", "async-task", @@ -222,7 +222,6 @@ dependencies = [ "blocking", "futures-lite", "once_cell", - "tokio", ] [[package]] @@ -243,39 +242,38 @@ dependencies = [ [[package]] name = "async-io" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock", "autocfg", + "cfg-if 1.0.0", "concurrent-queue", "futures-lite", - "libc", "log", "parking", "polling", + "rustix", "slab", "socket2", "waker-fn", - "windows-sys", ] [[package]] name = "async-lock" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ "event-listener", - "futures-lite", ] [[package]] name = "async-process" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" dependencies = [ "async-io", "async-lock", @@ -284,9 +282,9 @@ dependencies = [ "cfg-if 1.0.0", "event-listener", "futures-lite", - "libc", + "rustix", "signal-hook", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -366,26 +364,26 @@ dependencies = [ [[package]] name = "async-task" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.64" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "atomic-waker" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "atty" @@ -413,7 +411,7 @@ dependencies = [ "libudev", "log", "memoffset 0.6.5", - "nom 7.1.3", + "nom", "openssl", "openssl-sys", "rand 0.8.5", @@ -464,11 +462,11 @@ checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "base64urlsafedata" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc67436259cce95e00076dbcd3dd5e300c84d4c657d03e476b5c7619da7c2d6" +checksum = "18b3d30abb74120a9d5267463b9e0045fdccc4dd152e7249d966612dc1721384" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "serde", "serde_json", ] @@ -536,16 +534,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -559,9 +557,9 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ "async-channel", "async-lock", @@ -569,6 +567,7 @@ dependencies = [ "atomic-waker", "fastrand", "futures-lite", + "log", ] [[package]] @@ -577,18 +576,6 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9" -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde", -] - [[package]] name = "bumpalo" version = "3.12.0" @@ -603,9 +590,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" [[package]] name = "byteorder" @@ -654,9 +641,9 @@ checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", "js-sys", @@ -701,14 +688,14 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] name = "clap" -version = "3.2.23" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags", @@ -732,15 +719,15 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.2.18" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ "heck", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -804,9 +791,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ "crossbeam-utils", ] @@ -821,7 +808,7 @@ dependencies = [ "lazy_static", "libc", "unicode-width", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -870,7 +857,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.17", + "time 0.3.20", "version_check", ] @@ -886,7 +873,7 @@ dependencies = [ "publicsuffix", "serde", "serde_json", - "time 0.3.17", + "time 0.3.20", "url", ] @@ -902,15 +889,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" dependencies = [ "libc", ] @@ -942,7 +929,7 @@ dependencies = [ "ciborium", "clap", "criterion-plot", - "itertools 0.10.5", + "itertools", "lazy_static", "num-traits", "oorandom", @@ -963,7 +950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools 0.10.5", + "itertools", ] [[package]] @@ -973,7 +960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ff76b51e4c068c52bfd2866e1567bee7c567ae8f24ada09fd4307019e25eab7" dependencies = [ "chrono", - "nom 7.1.3", + "nom", "once_cell", ] @@ -993,9 +980,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1003,9 +990,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -1014,14 +1001,14 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset 0.8.0", "scopeguard", ] @@ -1037,9 +1024,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if 1.0.0", ] @@ -1050,7 +1037,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "typenum", ] @@ -1060,7 +1047,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] @@ -1070,19 +1057,18 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] [[package]] name = "csv" -version = "1.1.6" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" dependencies = [ - "bstr", "csv-core", - "itoa 0.4.8", + "itoa", "ryu", "serde", ] @@ -1103,7 +1089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1117,9 +1103,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.88" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322296e2f2e5af4270b54df9e85a02ff037e271af20ba3e7fe1575515dc840b8" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" dependencies = [ "cc", "cxxbridge-flags", @@ -1129,9 +1115,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.88" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017a1385b05d631e7875b1f151c9f012d37b53491e2a87f65bff5c262b2111d8" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" dependencies = [ "cc", "codespan-reporting", @@ -1139,35 +1125,36 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 2.0.15", ] [[package]] name = "cxxbridge-flags" -version = "1.0.88" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c26bbb078acf09bc1ecda02d4223f03bdd28bd4874edcb0379138efc499ce971" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" [[package]] name = "cxxbridge-macro" -version = "1.0.88" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357f40d1f06a24b60ae1fe122542c1fb05d28d32acb2aed064e84bc2ad1e252e" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "daemon" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ "clap", "clap_complete", + "fs2", + "kanidm_lib_file_permissions", "kanidm_proto", "kanidmd_core", - "kanidmd_lib", "profiles", "reqwest", "serde", @@ -1181,9 +1168,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ "darling_core", "darling_macro", @@ -1191,27 +1178,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1228,7 +1215,7 @@ checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" dependencies = [ "asn1-rs", "displaydoc", - "nom 7.1.3", + "nom", "num-bigint", "num-traits", "rusticata-macros", @@ -1236,33 +1223,33 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.11.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.11.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "derive_builder_macro" -version = "0.11.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" dependencies = [ "derive_builder_core", - "syn", + "syn 1.0.109", ] [[package]] @@ -1272,14 +1259,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9313f104b590510b46fc01c0a324fc76505c13871454d3c48490468d04c8d395" dependencies = [ "libc", - "nom 7.1.3", + "nom", ] [[package]] name = "dialoguer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af3c796f3b0b408d9fd581611b47fa850821fcb84aa640b83a3c1a5be2d691f2" +checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" dependencies = [ "console", "shell-words", @@ -1302,7 +1289,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -1311,7 +1298,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "block-buffer 0.10.3", + "block-buffer 0.10.4", "crypto-common", ] @@ -1349,14 +1336,14 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "dyn-clone" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" +checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "either" @@ -1372,22 +1359,43 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "erased-serde" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ca605381c017ec7a5fef5e548f1cfaa419ed0f6df6367339300db74c92aa7d" +checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" dependencies = [ "serde", ] +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[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 = "event-listener" version = "2.5.3" @@ -1414,9 +1422,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fancy-regex" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95b4efe5be9104a4a18a9916e86654319895138be727b229820c39257c30dda" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" dependencies = [ "bit-set", "regex", @@ -1424,9 +1432,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -1449,27 +1457,27 @@ dependencies = [ [[package]] name = "fernet" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6dedfc944f4ac38cac8b74cb1c7b4fb73c175db232d6fa98e9bd1fd81908b89" +checksum = "3364d69f691f3903b1a71605fa04f40a7c2d259f0f0512347e36d19a63debf1f" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "byteorder", - "getrandom 0.2.8", + "getrandom 0.2.9", "openssl", "zeroize", ] [[package]] name = "filetime" -version = "0.2.19" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", - "windows-sys", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", ] [[package]] @@ -1513,16 +1521,20 @@ dependencies = [ ] [[package]] -name = "fs_extra" -version = "1.2.0" +name = "fs2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi", +] [[package]] name = "futures" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1535,9 +1547,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1556,15 +1568,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1573,15 +1585,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ "fastrand", "futures-core", @@ -1594,32 +1606,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1644,9 +1656,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -1665,9 +1677,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -1871,9 +1883,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" dependencies = [ "bytes", "fnv", @@ -1915,9 +1927,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -1937,6 +1949,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -1975,13 +1993,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", - "itoa 1.0.5", + "itoa", ] [[package]] @@ -2043,9 +2061,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -2056,7 +2074,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.5", + "itoa", "pin-project-lite 0.2.9", "socket2", "tokio", @@ -2080,16 +2098,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows 0.48.0", ] [[package]] @@ -2140,12 +2158,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - [[package]] name = "image" version = "0.23.14" @@ -2171,9 +2183,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -2195,19 +2207,21 @@ dependencies = [ ] [[package]] -name = "ipnet" -version = "2.7.1" +name = "io-lifetimes" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] [[package]] -name = "itertools" -version = "0.9.0" +name = "ipnet" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "itertools" @@ -2220,37 +2234,31 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.8" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] [[package]] name = "kanidm-ipa-sync" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ "base64urlsafedata", "chrono", @@ -2274,7 +2282,7 @@ dependencies = [ [[package]] name = "kanidm_client" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ "kanidm_proto", "reqwest", @@ -2289,9 +2297,33 @@ dependencies = [ "webauthn-rs-proto", ] +[[package]] +name = "kanidm_lib_crypto" +version = "0.1.0" +dependencies = [ + "base64 0.21.0", + "base64urlsafedata", + "hex", + "kanidm_proto", + "openssl", + "openssl-sys", + "rand 0.8.5", + "serde", + "sketching", + "tracing", +] + +[[package]] +name = "kanidm_lib_file_permissions" +version = "0.1.0" +dependencies = [ + "users", + "whoami", +] + [[package]] name = "kanidm_proto" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ "base32", "base64urlsafedata", @@ -2310,7 +2342,7 @@ dependencies = [ [[package]] name = "kanidm_tools" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ "clap", "clap_complete", @@ -2337,16 +2369,17 @@ dependencies = [ [[package]] name = "kanidm_unix_int" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ "bytes", "clap", "clap_complete", "futures", "kanidm_client", + "kanidm_lib_crypto", + "kanidm_lib_file_permissions", "kanidm_proto", "kanidmd_core", - "kanidmd_lib", "libc", "libsqlite3-sys", "lru 0.8.1", @@ -2369,7 +2402,7 @@ dependencies = [ [[package]] name = "kanidmd_core" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ "async-trait", "chrono", @@ -2402,11 +2435,10 @@ dependencies = [ [[package]] name = "kanidmd_lib" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ - "async-std", "async-trait", - "base64 0.13.1", + "base64 0.21.0", "base64urlsafedata", "compact_jwt", "concread", @@ -2417,14 +2449,15 @@ dependencies = [ "futures", "futures-util", "hashbrown", - "hex", "idlset", + "kanidm_lib_crypto", "kanidm_proto", "kanidmd_lib_macros", "lazy_static", "ldap3_proto", "libc", "libsqlite3-sys", + "nonempty", "num_enum", "openssl", "openssl-sys", @@ -2452,7 +2485,6 @@ dependencies = [ "urlencoding", "users", "uuid", - "validator", "webauthn-authenticator-rs", "webauthn-rs", "webauthn-rs-core", @@ -2466,12 +2498,12 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "kanidmd_testkit" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ "compact_jwt", "futures", @@ -2485,6 +2517,7 @@ dependencies = [ "serde_json", "sketching", "testkit-macros", + "time 0.2.27", "tokio", "tracing", "url", @@ -2493,7 +2526,7 @@ dependencies = [ [[package]] name = "kanidmd_web_ui" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ "compact_jwt", "gloo", @@ -2504,6 +2537,7 @@ dependencies = [ "serde", "serde-wasm-bindgen", "serde_json", + "time 0.2.27", "url", "uuid", "wasm-bindgen", @@ -2540,20 +2574,19 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lber" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a99b520993b21a6faab32643cf4726573dc18ca4cf2d48cbeb24d248c86c930" +checksum = "b5d85f5e00e12cb50c70c3b1c1f0daff6546eb4c608b44d0a990e38a539e0446" dependencies = [ - "byteorder", "bytes", - "nom 2.2.1", + "nom", ] [[package]] name = "ldap3_client" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9599af178521f7eb322e27c8e9998bcb864a374613b50e2cf941474102296b4f" +checksum = "0236f3aac28f4f79929664cd635f310fa7469f17b67d45c85848a0f3ca516d53" dependencies = [ "base64 0.13.1", "base64urlsafedata", @@ -2571,36 +2604,24 @@ dependencies = [ [[package]] name = "ldap3_proto" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4162706b6f3b3d58f577990e22e9a0e03e2f9bedc2b8181d8abab2498da32003" +checksum = "57ea4b099d9f84c8424a56e9b361f5f9aeae9d87ca9bd683c54a6a27c8676597" dependencies = [ "bytes", "lber", + "nom", "peg", "tokio-util", "tracing", "uuid", ] -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec", - "bitflags", - "cfg-if 1.0.0", - "ryu", - "static_assertions", -] - [[package]] name = "libc" -version = "0.2.139" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "libgit2-sys" @@ -2694,10 +2715,10 @@ dependencies = [ ] [[package]] -name = "linked-hash-map" -version = "0.5.6" +name = "linux-raw-sys" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +checksum = "9b085a4f2cde5781fc4b1717f2e86c62f5cda49de7ba99a7c2eae02b61c9064c" [[package]] name = "lock_api" @@ -2738,15 +2759,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "matchers" version = "0.1.0" @@ -2788,18 +2800,18 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" @@ -2818,14 +2830,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -2846,23 +2858,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nom" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf51a729ecf40266a2368ad335a5fdde43471f545a967109cd62146ecf8b66ff" - -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "lexical-core", - "memchr", - "version_check", -] - [[package]] name = "nom" version = "7.1.3" @@ -2874,23 +2869,23 @@ dependencies = [ ] [[package]] -name = "nom8" -version = "0.2.0" +name = "nonempty" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" +checksum = "aeaf4ad7403de93e699c191202f017118df734d3850b01e13a3a8b2e6953d3c9" dependencies = [ - "memchr", + "serde", ] [[package]] name = "nss_kanidm" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ "kanidm_unix_int", "lazy_static", "libc", "libnss", - "paste 1.0.11", + "paste 1.0.12", ] [[package]] @@ -2967,23 +2962,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2994,7 +2989,7 @@ checksum = "eeaf26a72311c087f8c5ba617c96fac67a5c04f430e716ac8d8ab2de62e23368" dependencies = [ "base64 0.13.1", "chrono", - "getrandom 0.2.8", + "getrandom 0.2.9", "http", "rand 0.8.5", "serde", @@ -3016,15 +3011,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" - -[[package]] -name = "oncemutex" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d11de466f4a3006fe8a5e7ec84e93b79c70cb992ae0aa0eb631ad2df8abfe2" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "oorandom" @@ -3046,9 +3035,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.45" +version = "0.10.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -3061,13 +3050,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] @@ -3078,11 +3067,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -3091,7 +3079,7 @@ dependencies = [ [[package]] name = "orca" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ "clap", "crossbeam", @@ -3119,9 +3107,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.4.1" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" [[package]] name = "overload" @@ -3131,7 +3119,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pam_kanidm" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ "kanidm_unix_int", "libc", @@ -3140,9 +3128,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" @@ -3156,15 +3144,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -3179,9 +3167,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "paste-impl" @@ -3225,26 +3213,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" -[[package]] -name = "phonenumber" -version = "0.3.1+8.12.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261a014e5f5e048bf2c6f1a72fa5e4c223009dc5f296a385b95fe19b464608f" -dependencies = [ - "bincode", - "either", - "fnv", - "itertools 0.9.0", - "lazy_static", - "nom 5.1.2", - "quick-xml", - "regex", - "regex-cache", - "serde", - "serde_derive", - "thiserror", -] - [[package]] name = "pin-project" version = "1.0.12" @@ -3262,7 +3230,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3330,16 +3298,18 @@ dependencies = [ [[package]] name = "polling" -version = "2.5.2" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" +checksum = "4be1c66a6add46bff50935c313dae30a5030cf8385c5206e8a95e9e9def974aa" dependencies = [ "autocfg", + "bitflags", "cfg-if 1.0.0", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "windows-sys", + "pin-project-lite 0.2.9", + "windows-sys 0.48.0", ] [[package]] @@ -3361,19 +3331,19 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.1.23" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.109", ] [[package]] name = "proc-macro-crate" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", "toml_edit", @@ -3388,7 +3358,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -3411,18 +3381,18 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] [[package]] name = "profiles" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "serde", "toml", ] @@ -3476,20 +3446,11 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" -[[package]] -name = "quick-xml" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc440ee4802a86e357165021e3e255a9143724da31db1e2ea540214c96a0f82" -dependencies = [ - "memchr", -] - [[package]] name = "quote" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -3574,7 +3535,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", ] [[package]] @@ -3588,9 +3549,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -3598,9 +3559,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.2" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -3617,26 +3578,35 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", - "redox_syscall", + "getrandom 0.2.9", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.7.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.1", ] [[package]] @@ -3645,41 +3615,26 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-cache" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7b62d69743b8b94f353b6b7c3deb4c5582828328bcb8d5fedf214373808793" -dependencies = [ - "lru-cache", - "oncemutex", - "regex", - "regex-syntax", + "regex-syntax 0.6.29", ] [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "regex-syntax" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" dependencies = [ "async-compression", "base64 0.21.0", @@ -3794,20 +3749,34 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" dependencies = [ - "nom 7.1.3", + "nom", +] + +[[package]] +name = "rustix" +version = "0.37.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "722529a737f5a942fdbac3a46cee213053196737c5eaa3386d52e85b786f2659" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", ] [[package]] name = "rustversion" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "same-file" @@ -3824,14 +3793,14 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "windows-sys", + "windows-sys 0.42.0", ] [[package]] name = "scheduled-thread-pool" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf" +checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ "parking_lot", ] @@ -3867,9 +3836,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "security-framework" @@ -3911,9 +3880,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] @@ -3931,9 +3900,9 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" +checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" dependencies = [ "serde", ] @@ -3960,40 +3929,40 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "serde_fmt" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2963a69a2b3918c1dc75a45a18bd3fcd1120e31d3f59deb1b2f9b5d5ffb8baa4" +checksum = "6180def5ddda7565fea64b0fba33b99192d86d669f23b5019598e0b7e846b407" dependencies = [ "serde", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ - "itoa 1.0.5", + "itoa", "ryu", "serde", ] [[package]] name = "serde_path_to_error" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341" +checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" dependencies = [ "serde", ] @@ -4016,7 +3985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.5", + "itoa", "ryu", "serde", ] @@ -4098,9 +4067,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" dependencies = [ "libc", "signal-hook-registry", @@ -4108,9 +4077,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -4126,7 +4095,7 @@ dependencies = [ [[package]] name = "sketching" -version = "1.1.0-alpha.11" +version = "1.1.0-alpha.12" dependencies = [ "async-trait", "num_enum", @@ -4138,9 +4107,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -4177,9 +4146,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -4241,7 +4210,7 @@ dependencies = [ "quote", "serde", "serde_derive", - "syn", + "syn 1.0.109", ] [[package]] @@ -4257,7 +4226,7 @@ dependencies = [ "serde_derive", "serde_json", "sha1", - "syn", + "syn 1.0.109", ] [[package]] @@ -4289,9 +4258,20 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", @@ -4306,22 +4286,21 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unicode-xid", ] [[package]] name = "tempfile" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if 1.0.0", "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.45.0", ] [[package]] @@ -4339,7 +4318,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] @@ -4350,30 +4329,31 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if 1.0.0", "once_cell", ] @@ -4431,12 +4411,11 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.5.2+5.3.0-patched" +version = "0.5.3+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3" +checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8" dependencies = [ "cc", - "fs_extra", "libc", ] @@ -4479,14 +4458,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ - "itoa 1.0.5", + "itoa", "serde", "time-core", - "time-macros 0.2.6", + "time-macros 0.2.8", ] [[package]] @@ -4507,9 +4486,9 @@ dependencies = [ [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] @@ -4524,7 +4503,7 @@ dependencies = [ "proc-macro2", "quote", "standback", - "syn", + "syn 1.0.109", ] [[package]] @@ -4548,45 +4527,44 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.25.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "pin-project-lite 0.2.9", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -4606,9 +4584,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite 0.2.9", @@ -4617,9 +4595,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -4640,19 +4618,19 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" [[package]] name = "toml_edit" -version = "0.18.1" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ "indexmap", - "nom8", "toml_datetime", + "winnow", ] [[package]] @@ -4690,7 +4668,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4705,8 +4683,8 @@ dependencies = [ [[package]] name = "tracing-forest" -version = "0.1.4" -source = "git+https://github.com/QnnOkabayashi/tracing-forest.git?rev=48d78f7294ceee47a22eee5c80964143c4fb3fe1#48d78f7294ceee47a22eee5c80964143c4fb3fe1" +version = "0.1.5" +source = "git+https://github.com/QnnOkabayashi/tracing-forest.git?rev=77daf8c8abf010b87d45ece2bf656983c6f8cecb#77daf8c8abf010b87d45ece2bf656983c6f8cecb" dependencies = [ "smallvec", "thiserror", @@ -4729,9 +4707,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", "nu-ansi-term", @@ -4759,15 +4737,15 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -4796,7 +4774,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] @@ -4830,57 +4808,14 @@ dependencies = [ [[package]] name = "uuid" -version = "1.2.2" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", "serde", ] -[[package]] -name = "validator" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ad5bf234c7d3ad1042e5252b7eddb2c4669ee23f32c7dd0e9b7705f07ef591" -dependencies = [ - "idna 0.2.3", - "lazy_static", - "phonenumber", - "regex", - "serde", - "serde_derive", - "serde_json", - "url", - "validator_derive", -] - -[[package]] -name = "validator_derive" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" -dependencies = [ - "if_chain", - "lazy_static", - "proc-macro-error", - "proc-macro2", - "quote", - "regex", - "syn", - "validator_types", -] - -[[package]] -name = "validator_types" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" -dependencies = [ - "proc-macro2", - "syn", -] - [[package]] name = "valuable" version = "0.1.0" @@ -4921,12 +4856,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -4960,9 +4894,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if 1.0.0", "serde", @@ -4972,24 +4906,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -4999,9 +4933,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5009,28 +4943,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wasm-bindgen-test" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d2fff962180c3fadf677438054b1db62bee4aa32af26a45388af07d1287e1d" +checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b" dependencies = [ "console_error_panic_hook", "js-sys", @@ -5042,9 +4976,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4683da3dfc016f704c9f82cf401520c4f1cb3ee440f7f52b3d6ac29506a49ca7" +checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9" dependencies = [ "proc-macro2", "quote", @@ -5052,9 +4986,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -5068,7 +5002,7 @@ checksum = "603b8602cae2d6c3706b6195765ff582389494d10c442d84a1de2ed5a25679ef" dependencies = [ "authenticator-ctap2-2021", "base64urlsafedata", - "nom 7.1.3", + "nom", "openssl", "rpassword 5.0.1", "serde", @@ -5078,7 +5012,7 @@ dependencies = [ "url", "uuid", "webauthn-rs-proto", - "windows", + "windows 0.41.0", ] [[package]] @@ -5105,7 +5039,7 @@ dependencies = [ "base64urlsafedata", "compact_jwt", "der-parser", - "nom 7.1.3", + "nom", "openssl", "rand 0.8.5", "serde", @@ -5135,20 +5069,11 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - [[package]] name = "whoami" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45dbc71f0cdca27dc261a9bd37ddec174e4a0af2b900b890f378460f745426e3" +checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68" dependencies = [ "wasm-bindgen", "web-sys", @@ -5200,19 +5125,76 @@ dependencies = [ "windows_x86_64_msvc 0.41.0", ] +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.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 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -5223,9 +5205,15 @@ checksum = "163d2761774f2278ecb4e6719e80b2b5e92e5a2be73a7bcd3ef624dd5e3091fd" [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" @@ -5235,9 +5223,15 @@ checksum = "ef005ff2bceb00d3b84166a359cc19084f9459754fd3fe5a504dee3dddcd0a0c" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" @@ -5247,9 +5241,15 @@ checksum = "02b4df2d51e32f03f8b4b228e487828c03bcb36d97b216fc5463bcea5bb1440b" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" @@ -5259,9 +5259,15 @@ checksum = "568a966834571f2f3267f07dd72b4d8507381f25e53d056808483b2637385ef7" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" @@ -5271,9 +5277,15 @@ checksum = "fc395dac1adf444e276d096d933ae7961361c8cda3245cffef7a9b3a70a8f994" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" @@ -5283,9 +5295,15 @@ checksum = "90e8ec22b715d5b436e1d59c8adad6c744dc20cd984710121d5836b4e8dbb5e0" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" @@ -5295,9 +5313,24 @@ checksum = "8b9761f0216b669019df1512f6e25e5ee779bf61c5cdc43c7293858e7efd7926" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -5319,11 +5352,11 @@ dependencies = [ "data-encoding", "der-parser", "lazy_static", - "nom 7.1.3", + "nom", "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.20", ] [[package]] @@ -5363,7 +5396,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -5392,42 +5425,41 @@ checksum = "89b249cdb39e0cddaf0644dedc781854524374664793479fdc01e6a65d6e6ae3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "zeroize" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn", - "synstructure", + "syn 2.0.15", ] [[package]] name = "zxcvbn" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568becce91e872373a4b33f24ddc67e5280ae2536ccb8c9d22a25d398b72c8b0" +checksum = "103fa851fff70ea29af380e87c25c48ff7faac5c530c70bd0e65366d4e0c94e4" dependencies = [ "derive_builder", "fancy-regex", - "itertools 0.10.5", + "itertools", "js-sys", "lazy_static", "quick-error", "regex", - "time 0.3.17", + "time 0.3.20", ] diff --git a/pkgs/servers/kanidm/default.nix b/pkgs/servers/kanidm/default.nix index 1d592d6aa142..f285593cbc9c 100644 --- a/pkgs/servers/kanidm/default.nix +++ b/pkgs/servers/kanidm/default.nix @@ -4,6 +4,7 @@ , nixosTests , rustPlatform , fetchFromGitHub +, fetchpatch , installShellFiles , pkg-config , udev @@ -17,35 +18,44 @@ let in rustPlatform.buildRustPackage rec { pname = "kanidm"; - version = "1.1.0-alpha.11"; + version = "1.1.0-alpha.12"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TVGLL1Ir/Nld0kdhWmcYYmChrW42ctJPY/U7wtuEwCo="; + hash = "sha256-ZlUn7m5xgMWWIr9y/dkM/yZ2KF2LdkaxqtHsMcxAT/M="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "tracing-forest-0.1.4" = "sha256-ofBLxSzZ5SYy8cbViVUa6VXKbOgd8lt7QUYhL0BW6I4="; + "tracing-forest-0.1.5" = "sha256-L6auSKB4DCnZBZpx7spiikhSOD6i1W3erc3zjn+26Ao="; }; }; KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; + patches = [ + (fetchpatch { + # Bring back x86_64-v1 microarchitecture level + name = "cpu-opt-level.patch"; + url = "https://github.com/kanidm/kanidm/commit/59c6723f7dfb2266eae45c3b2ddd377872a7a113.patch"; + hash = "sha256-8rVEYitxvdVduQ/+AD/UG3v+mgT/VxkLoxNIXczUfCQ="; + }) + ]; + postPatch = let format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml"; profile = { web_ui_pkg_path = "@web_ui_pkg_path@"; - cpu_flags = if stdenv.isx86_64 then "x86_64_v1" else "none"; + cpu_flags = if stdenv.isx86_64 then "x86_64_legacy" else "none"; }; in '' - cp ${format profile} profiles/${KANIDM_BUILD_PROFILE}.toml - substituteInPlace profiles/${KANIDM_BUILD_PROFILE}.toml \ + cp ${format profile} libs/profiles/${KANIDM_BUILD_PROFILE}.toml + substituteInPlace libs/profiles/${KANIDM_BUILD_PROFILE}.toml \ --replace '@web_ui_pkg_path@' "$out/ui" ''; @@ -66,7 +76,7 @@ rustPlatform.buildRustPackage rec { # We don't compile the wasm-part form source, as there isn't a rustc for # wasm32-unknown-unknown in nixpkgs yet. mkdir $out - cp -r kanidmd_web_ui/pkg $out/ui + cp -r server/web_ui/pkg $out/ui ''; preFixup = '' From e1ed166090781ea737c2ee583aeea46c8428c88f Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 30 May 2023 13:17:26 +0200 Subject: [PATCH 166/187] podofo010: init at 0.10.0 https://github.com/podofo/podofo/releases/tag/0.10.0 --- pkgs/development/libraries/podofo/0.10.x.nix | 67 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/development/libraries/podofo/0.10.x.nix diff --git a/pkgs/development/libraries/podofo/0.10.x.nix b/pkgs/development/libraries/podofo/0.10.x.nix new file mode 100644 index 000000000000..92231718c261 --- /dev/null +++ b/pkgs/development/libraries/podofo/0.10.x.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, expat +, fontconfig +, freetype +, libidn +, libjpeg +, libpng +, libtiff +, libxml2 +, lua5 +, openssl +, pkg-config +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "podofo"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "podofo"; + repo = "podofo"; + rev = finalAttrs.version; + hash = "sha256-Z9mVAo2dITEtTdqA2sftaLZSCiTbGS02RYxfNcEwd1c="; + }; + + outputs = [ "out" "dev" "lib" ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + expat + fontconfig + freetype + libidn + libjpeg + libpng + libtiff + libxml2 + lua5 + openssl + zlib + ]; + + cmakeFlags = [ + "-DPODOFO_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" + "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" + ]; + + postInstall = '' + moveToOutput lib "$lib" + ''; + + meta = { + homepage = "https://github.com/podofo/podofo"; + description = "A library to work with the PDF file format"; + platforms = lib.platforms.all; + license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; + maintainers = []; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0cf06f9275b..4a8acb4dd54d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23578,6 +23578,8 @@ with pkgs; podofo = callPackage ../development/libraries/podofo { }; + podofo010 = callPackage ../development/libraries/podofo/0.10.x.nix { }; + polkit = callPackage ../development/libraries/polkit { }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; From b1d3057032753ccf51bac45b145244f2cff9fc69 Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 30 May 2023 13:18:31 +0200 Subject: [PATCH 167/187] calibre: 6.17.0 -> 6.19.1 https://github.com/kovidgoyal/calibre/releases/tag/v6.19.1 --- pkgs/applications/misc/calibre/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 93b513af2030..4d9253087e67 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "6.17.0"; + version = "6.19.1"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-HKSruKXYUMH1lj43CA3Rp3lXNlONXE1P9gFLaH16No4="; + hash = "sha256-Fm2484ztsSc80waJBvy7rHGnNBFxCvbbrsHDBCZ2kxA="; }; # https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1 @@ -49,8 +49,8 @@ stdenv.mkDerivation (finalAttrs: { }) (fetchpatch { name = "0007-Hardening-Qt-code.patch"; - url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}-1/debian/patches/0007-Hardening-Qt-code.patch"; - hash = "sha256-9P1kGrQbWAWDzu5EUiQr7TiCPHRWUA8hxPpEvFpK20k="; + url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; + hash = "sha256-WBm0dWDXoPT6alEdK5dVMrVTOxG7Z8bq1s0iO2HTy/Q="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a8acb4dd54d..2486412b5c6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29719,7 +29719,9 @@ with pkgs; calculix = callPackage ../applications/science/math/calculix { }; - calibre = qt6Packages.callPackage ../applications/misc/calibre { }; + calibre = qt6Packages.callPackage ../applications/misc/calibre { + podofo = podofo010; + }; calibre-web = callPackage ../servers/calibre-web { }; From 7190fa8e972b0d93ffacc56bee6f55ec982a7519 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 1 Jun 2023 10:49:04 -0400 Subject: [PATCH 168/187] brave: 1.51.118 -> 1.52.117 https://community.brave.com/t/release-channel-1-52-117/489701/1 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index e1fc1a4f456a..ba8b841616f1 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.51.118"; + version = "1.52.117"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-/OrnB4M6oefZ2aG2rQst8H4UZ/7vAFzyqWsn9kerb9c="; + sha256 = "sha256-oI/KRAfPGS5WEjLmTF6CQBjXLxv4vvpFMqPmh+O51QY="; }; dontConfigure = true; From 825ad30f7065800760becd03bd2aeebc6434757f Mon Sep 17 00:00:00 2001 From: Ramses Date: Thu, 1 Jun 2023 16:54:29 +0200 Subject: [PATCH 169/187] atuin: v14.0.1 -> v15.0.0. (#234826) --- pkgs/tools/misc/atuin/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/atuin/default.nix b/pkgs/tools/misc/atuin/default.nix index 046cbdaf2f0c..ee1968a7839f 100644 --- a/pkgs/tools/misc/atuin/default.nix +++ b/pkgs/tools/misc/atuin/default.nix @@ -12,17 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "atuin"; - version = "14.0.1"; + version = "15.0.0"; src = fetchFromGitHub { owner = "ellie"; repo = pname; rev = "v${version}"; - hash = "sha256-mfeHgUCnt/DkdKxFlYx/t2LLjiqDX5mBMHto9A4mj78="; + hash = "sha256-BX1WpvJMcfpepsRX0U6FJBL5/+mpUyTZxm65BbbZLJA="; }; # TODO: unify this to one hash because updater do not support this - cargoHash = if stdenv.isLinux then "sha256-oaBTj+ZSJ36AFwIrB6d0cZppoAzV4QDr3+EylYqY7cw=" else "sha256-UNuoW/EOGtuNROm1qZJ4afDfMlecziVsem1m3Z1ZsOU="; + cargoHash = + if stdenv.isLinux + then "sha256-EnIR+BXw8oYlv3dpYy4gAkN/zckRI8KEAbbR9wPmMq4=" + else "sha256-hHcahzrIuXIgOv+sx0HbC9f5guTcTr6L4eeLoiQsAzA="; nativeBuildInputs = [ installShellFiles ]; From 14fdabbb7bf9fb2a666eb6832f4449e58a83e079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 31 May 2023 22:24:36 +0200 Subject: [PATCH 170/187] lighttpd: 1.4.69 -> 1.4.71 Changelogs: https://www.lighttpd.net/2023/5/27/1.4.71/ https://www.lighttpd.net/2023/5/10/1.4.70/ Update the patch that disables legacy crypt tests, because it doesn't apply anymore. --- pkgs/servers/http/lighttpd/default.nix | 4 ++-- .../lighttpd/disable-legacy-crypt-tests.patch | 24 +++++++++---------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index b942589b791c..b0bb720c21cd 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.69"; + version = "1.4.71"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-FqyNuV5xlim6YZSbmfiib+upRqgdGFIVsoN5u0EWsLQ="; + sha256 = "sha256-uLaRXaIDlv3DVN8zJNXkQBabLl6nhZ46d1IThBMlr6w="; }; patches = [ diff --git a/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch b/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch index 3bf50551652e..4a411c0b98ae 100644 --- a/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch +++ b/pkgs/servers/http/lighttpd/disable-legacy-crypt-tests.patch @@ -1,30 +1,28 @@ -diff --git a/tests/mod-fastcgi.t b/tests/mod-fastcgi.t -index 25016e60..e0427046 100755 ---- a/tests/mod-fastcgi.t -+++ b/tests/mod-fastcgi.t -@@ -79,7 +79,7 @@ EOF +diff -uNr lighttpd-1.4.71.orig/tests/mod-fastcgi.t lighttpd-1.4.71.new/tests/mod-fastcgi.t +--- lighttpd-1.4.71.orig/tests/mod-fastcgi.t 2023-05-27 21:56:16.000000000 +0200 ++++ lighttpd-1.4.71.new/tests/mod-fastcgi.t 2023-06-01 07:01:59.789873512 +0200 +@@ -79,7 +79,7 @@ ok($tf->handle_http($t) == 0, 'FastCGI + bin-copy-environment'); SKIP: { -- skip "no crypt-des under openbsd", 2 if $^O eq 'openbsd'; +- skip "no crypt-des under openbsd or MS Visual Studio", 2 if $^O eq 'openbsd' || $tf->{'win32native'}; + skip "no crypt-des", 2; $t->{REQUEST} = ( <{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ]; +diff -uNr lighttpd-1.4.71.orig/tests/request.t lighttpd-1.4.71.new/tests/request.t +--- lighttpd-1.4.71.orig/tests/request.t 2023-05-27 21:56:16.000000000 +0200 ++++ lighttpd-1.4.71.new/tests/request.t 2023-06-01 07:02:39.855940048 +0200 +@@ -1106,7 +1106,7 @@ ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - plain'); SKIP: { -- skip "no crypt-des under openbsd", 2 if $^O eq 'openbsd'; +- skip "no crypt-des under openbsd or MS Visual Studio", 2 if $^O eq 'openbsd' || $tf->{'win32native'}; + skip "no crypt-des", 2; $t->{REQUEST} = ( <{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 401 } ]; +@@ -1163,9 +1163,7 @@ ok($tf->handle_http($t) == 0, 'Basic-Auth: Valid Auth-token - htpasswd (apr-md5, wrong password)'); SKIP: { From 88da0982d10dc12ecebfdecdba197e17869311a5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 1 Jun 2023 11:17:16 -0400 Subject: [PATCH 171/187] repgrep: init at 0.12.4 https://github.com/acheronfail/repgrep --- pkgs/tools/text/repgrep/default.nix | 46 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/tools/text/repgrep/default.nix diff --git a/pkgs/tools/text/repgrep/default.nix b/pkgs/tools/text/repgrep/default.nix new file mode 100644 index 000000000000..f876366e458e --- /dev/null +++ b/pkgs/tools/text/repgrep/default.nix @@ -0,0 +1,46 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, asciidoctor +, installShellFiles +, makeWrapper +, ripgrep +}: + +rustPlatform.buildRustPackage rec { + pname = "repgrep"; + version = "0.12.4"; + + src = fetchFromGitHub { + owner = "acheronfail"; + repo = "repgrep"; + rev = version; + hash = "sha256-tMv0MdFlDEYx8lNINfnhX6WgcpVLm1fTlaUddej5KRc="; + }; + + cargoHash = "sha256-NjPFoVPHjwG74ZNStYaNMzwdX488xDjGJu92+UWC2z8="; + + nativeBuildInputs = [ + asciidoctor + installShellFiles + makeWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/rgr \ + --prefix PATH : ${lib.makeBinPath [ ripgrep ]} + + pushd "$(dirname "$(find -path '**/repgrep-stamp' | head -n 1)")" + installManPage rgr.1 + installShellCompletion rgr.{bash,fish} _rgr + popd + ''; + + meta = with lib; { + description = "An interactive replacer for ripgrep that makes it easy to find and replace across files on the command line"; + homepage = "https://github.com/acheronfail/repgrep"; + changelog = "https://github.com/acheronfail/repgrep/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ mit asl20 unlicense ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2486412b5c6d..4be2becd5ca2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11925,6 +11925,8 @@ with pkgs; renderdoc = libsForQt5.callPackage ../development/tools/renderdoc { }; + repgrep = callPackage ../tools/text/repgrep { }; + replace = callPackage ../tools/text/replace { }; resvg = callPackage ../tools/graphics/resvg { }; From 4930b230cf550bbe975de770454204c9c7ce2190 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 1 Jun 2023 11:21:27 -0400 Subject: [PATCH 172/187] hurl: 3.0.0 -> 3.0.1 Diff: https://github.com/Orange-OpenSource/hurl/compare/3.0.0...3.0.1 Changelog: https://github.com/Orange-OpenSource/hurl/blob/3.0.1/CHANGELOG.md --- pkgs/tools/networking/hurl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/hurl/default.nix b/pkgs/tools/networking/hurl/default.nix index ed1b38d8f85f..28f4d3787c27 100644 --- a/pkgs/tools/networking/hurl/default.nix +++ b/pkgs/tools/networking/hurl/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - hash = "sha256-m9hAGm5vmo+J+ntQOK5R4vFEVRhW097D1gvjcE/1CnM="; + hash = "sha256-Rh8HBUR3IXYs/0NZJAKk4mHOjliRIAgEsgR402i7FX4="; }; - cargoHash = "sha256-KYlax3Q7w27Q6TNwuDmzJhoiFMWnfMhagAuw0+FIW1c="; + cargoHash = "sha256-9AXusLvkZQ3g4u7z03dy8eXzQ59aRSHFR+uyt3MwKhg="; nativeBuildInputs = [ pkg-config From 72588581ee4e1cc76dfc074afe356f18da2f65f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 1 Jun 2023 17:28:40 +0200 Subject: [PATCH 173/187] atuin: remove xvfb-run for tests not needed anymore --- pkgs/tools/misc/atuin/default.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/tools/misc/atuin/default.nix b/pkgs/tools/misc/atuin/default.nix index ee1968a7839f..b0c8f63a8c48 100644 --- a/pkgs/tools/misc/atuin/default.nix +++ b/pkgs/tools/misc/atuin/default.nix @@ -6,7 +6,6 @@ , libiconv , Security , SystemConfiguration -, xvfb-run , nixosTests }: @@ -38,16 +37,6 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/atuin gen-completions -s zsh) ''; - nativeCheckInputs = lib.optionals xvfb-run.meta.available [ - xvfb-run - ]; - - checkPhase = lib.optionalString xvfb-run.meta.available '' - runHook preCheck - xvfb-run cargo test - runHook postCheck - ''; - passthru.tests = { inherit (nixosTests) atuin; }; From b5d19d8a9e62453390b2613de5eb9fee41d32b78 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 1 Jun 2023 09:34:48 -0600 Subject: [PATCH 174/187] obsidian: 1.3.4 -> 1.3.5 Changes: https://obsidian.md/changelog/2023-06-01-desktop-v1.3.5/ --- pkgs/applications/misc/obsidian/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 2ac7a692127e..e96255271dfd 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -4,7 +4,7 @@ , makeWrapper , electron , makeDesktopItem -, graphicsmagick +, imagemagick , writeScript , undmg , unzip @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.3.4"; + version = "1.3.5"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,12 +25,12 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-LP13smLy/cr0hiLl5cdRxTbDfRFojb+HJBx/MFeJ13Y=" else "sha256-8M9HU20IxTvPaa6x1X41Ldq2usK2TPU71VvprerivZg="; + sha256 = if stdenv.isDarwin then "sha256-bTIJwQqufzxq1/ZxR8rVYER82tl0pPMpKwDPr9Gz1Q4=" else "sha256-jhm6ziFaJnv4prPSfOnJ/EbIRTf9rnvzAJVxnVqmWE4="; }; icon = fetchurl { - url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; - sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2"; + url = "https://obsidian.md/images/obsidian-logo-gradient.svg"; + sha256 = "100j8fcrc5q8zv525siapminffri83s2khs2hw4kdxwrdjwh36qi"; }; desktopItem = makeDesktopItem { @@ -46,7 +46,7 @@ let linux = stdenv.mkDerivation { inherit pname version src desktopItem icon; meta = meta // { platforms = [ "x86_64-linux" "aarch64-linux" ]; }; - nativeBuildInputs = [ makeWrapper graphicsmagick ]; + nativeBuildInputs = [ makeWrapper imagemagick ]; installPhase = '' runHook preInstall mkdir -p $out/bin @@ -59,7 +59,7 @@ let -t $out/share/applications/ for size in 16 24 32 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png + convert -background none -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png done runHook postInstall ''; From 29124b85cf8cc60c25b6618e0f9f25ea46cb03d9 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 26 May 2023 18:25:16 +0200 Subject: [PATCH 175/187] nixVersions.minver: init Co-Authored-By: Robert Hensing --- pkgs/tools/package-management/nix/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5929868ab72c..48970c6141cc 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -182,6 +182,23 @@ in lib.makeExtensible (self: { sha256 = "sha256-hNHfvmb1bIWwqFT5nesQgwh4V0OlyZHxj5ZVSQbZ+p4="; }; + # The minimum Nix version supported by Nixpkgs + # Note that some functionality *might* have been backported into this Nix version, + # making this package an inaccurate representation of what features are available + # in the actual lowest minver.nix *patch* version. + minimum = + let + minver = import ../../../../lib/minver.nix; + major = lib.versions.major minver; + minor = lib.versions.minor minver; + attribute = "nix_${major}_${minor}"; + nix = self.${attribute}; + in + if ! self ? ${attribute} then + throw "The minimum supported Nix version is ${minver} (declared in lib/minver.nix), but pkgs.nixVersions.${attribute} does not exist." + else + nix; + stable = self.nix_2_13; unstable = self.nix_2_15; From de0c11241f8a2e72c2cd02b86fedaaeb30292e97 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 26 May 2023 18:29:45 +0200 Subject: [PATCH 176/187] lib/tests/filesystem.sh: Check success and failure separately --- lib/tests/filesystem.sh | 87 ++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 48 deletions(-) diff --git a/lib/tests/filesystem.sh b/lib/tests/filesystem.sh index 1e33174429b8..cfd333d0001b 100755 --- a/lib/tests/filesystem.sh +++ b/lib/tests/filesystem.sh @@ -35,59 +35,50 @@ touch regular ln -s target symlink mkfifo fifo -checkPathType() { - local path=$1 - local expectedPathType=$2 - local actualPathType=$(nix-instantiate --eval --strict --json 2>&1 \ - -E '{ path }: let lib = import ; in lib.filesystem.pathType path' \ - --argstr path "$path") - if [[ ! "$actualPathType" =~ $expectedPathType ]]; then - die "lib.filesystem.pathType \"$path\" == $actualPathType, but $expectedPathType was expected" +expectSuccess() { + local expr=$1 + local expectedResultRegex=$2 + if ! result=$(nix-instantiate --eval --strict --json \ + --expr "with (import ).filesystem; $expr"); then + die "$expr failed to evaluate, but it was expected to succeed" + fi + if [[ ! "$result" =~ $expectedResultRegex ]]; then + die "$expr == $result, but $expectedResultRegex was expected" fi } -checkPathType "/" '"directory"' -checkPathType "$PWD/directory" '"directory"' -checkPathType "$PWD/regular" '"regular"' -checkPathType "$PWD/symlink" '"symlink"' -checkPathType "$PWD/fifo" '"unknown"' +expectFailure() { + local expr=$1 + local expectedErrorRegex=$2 + if result=$(nix-instantiate --eval --strict --json 2>"$work/stderr" \ + --expr "with (import ).filesystem; $expr"); then + die "$expr evaluated successfully to $result, but it was expected to fail" + fi + if [[ ! "$(<"$work/stderr")" =~ $expectedErrorRegex ]]; then + die "Error was $(<"$work/stderr"), but $expectedErrorRegex was expected" + fi +} + +expectSuccess "pathType /." '"directory"' +expectSuccess "pathType $PWD/directory" '"directory"' +expectSuccess "pathType $PWD/regular" '"regular"' +expectSuccess "pathType $PWD/symlink" '"symlink"' +expectSuccess "pathType $PWD/fifo" '"unknown"' # Different errors depending on whether the builtins.readFilePath primop is available or not -checkPathType "$PWD/non-existent" "error: (evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'|getting status of '$PWD/non-existent': No such file or directory)" +expectFailure "pathType $PWD/non-existent" "error: (evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'|getting status of '$PWD/non-existent': No such file or directory)" -checkPathIsDirectory() { - local path=$1 - local expectedIsDirectory=$2 - local actualIsDirectory=$(nix-instantiate --eval --strict --json 2>&1 \ - -E '{ path }: let lib = import ; in lib.filesystem.pathIsDirectory path' \ - --argstr path "$path") - if [[ "$actualIsDirectory" != "$expectedIsDirectory" ]]; then - die "lib.filesystem.pathIsDirectory \"$path\" == $actualIsDirectory, but $expectedIsDirectory was expected" - fi -} +expectSuccess "pathIsDirectory /." "true" +expectSuccess "pathIsDirectory $PWD/directory" "true" +expectSuccess "pathIsDirectory $PWD/regular" "false" +expectSuccess "pathIsDirectory $PWD/symlink" "false" +expectSuccess "pathIsDirectory $PWD/fifo" "false" +expectSuccess "pathIsDirectory $PWD/non-existent" "false" -checkPathIsDirectory "/" "true" -checkPathIsDirectory "$PWD/directory" "true" -checkPathIsDirectory "$PWD/regular" "false" -checkPathIsDirectory "$PWD/symlink" "false" -checkPathIsDirectory "$PWD/fifo" "false" -checkPathIsDirectory "$PWD/non-existent" "false" - -checkPathIsRegularFile() { - local path=$1 - local expectedIsRegularFile=$2 - local actualIsRegularFile=$(nix-instantiate --eval --strict --json 2>&1 \ - -E '{ path }: let lib = import ; in lib.filesystem.pathIsRegularFile path' \ - --argstr path "$path") - if [[ "$actualIsRegularFile" != "$expectedIsRegularFile" ]]; then - die "lib.filesystem.pathIsRegularFile \"$path\" == $actualIsRegularFile, but $expectedIsRegularFile was expected" - fi -} - -checkPathIsRegularFile "/" "false" -checkPathIsRegularFile "$PWD/directory" "false" -checkPathIsRegularFile "$PWD/regular" "true" -checkPathIsRegularFile "$PWD/symlink" "false" -checkPathIsRegularFile "$PWD/fifo" "false" -checkPathIsRegularFile "$PWD/non-existent" "false" +expectSuccess "pathIsRegularFile /." "false" +expectSuccess "pathIsRegularFile $PWD/directory" "false" +expectSuccess "pathIsRegularFile $PWD/regular" "true" +expectSuccess "pathIsRegularFile $PWD/symlink" "false" +expectSuccess "pathIsRegularFile $PWD/fifo" "false" +expectSuccess "pathIsRegularFile $PWD/non-existent" "false" echo >&2 tests ok From 0b6021ee53eb4677e96f28a260db9157b4f19c7a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 26 May 2023 18:31:35 +0200 Subject: [PATCH 177/187] lib/tests: Fix when run with Nix 2.3 --- lib/tests/modules.sh | 2 +- lib/tests/sources.sh | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 7fdc3d3d81aa..7aebba6b589e 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -378,7 +378,7 @@ checkConfigOutput '^{ }$' config.sub.nixosOk ./class-check.nix checkConfigError 'The module .*/module-class-is-darwin.nix was imported into nixos instead of darwin.' config.sub.nixosFail.config ./class-check.nix # submoduleWith type merge with different class -checkConfigError 'error: A submoduleWith option is declared multiple times with conflicting class values "darwin" and "nixos".' config.sub.mergeFail.config ./class-check.nix +checkConfigError 'A submoduleWith option is declared multiple times with conflicting class values "darwin" and "nixos".' config.sub.mergeFail.config ./class-check.nix # _type check checkConfigError 'Could not load a value as a module, because it is of type "flake", in file .*/module-imports-_type-check.nix' config.ok.config ./module-imports-_type-check.nix diff --git a/lib/tests/sources.sh b/lib/tests/sources.sh index a7f490a79d74..cda77aa96b28 100755 --- a/lib/tests/sources.sh +++ b/lib/tests/sources.sh @@ -23,14 +23,19 @@ clean_up() { trap clean_up EXIT cd "$work" +# Crudely unquotes a JSON string by just taking everything between the first and the second quote. +# We're only using this for resulting /nix/store paths, which can't contain " anyways, +# nor can they contain any other characters that would need to be escaped specially in JSON +# This way we don't need to add a dependency on e.g. jq +crudeUnquoteJSON() { + cut -d \" -f2 +} + touch {README.md,module.o,foo.bar} -# nix-instantiate doesn't write out the source, only computing the hash, so -# this uses the experimental nix command instead. - -dir="$(nix eval --impure --raw --expr '(with import ; "${ +dir="$(nix-instantiate --eval --strict --read-write-mode --json --expr '(with import ; "${ cleanSource ./. -}")')" +}")' | crudeUnquoteJSON)" (cd "$dir"; find) | sort -f | diff -U10 - <(cat < Date: Fri, 26 May 2023 18:32:38 +0200 Subject: [PATCH 178/187] lib/tests: Also run with nixVersions.minimum and nixVersions.unstable The previous commits ensure that the tests also succeed with those versions --- lib/tests/release.nix | 94 ++++++++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 42 deletions(-) diff --git a/lib/tests/release.nix b/lib/tests/release.nix index f5c6e81030ca..c3bf58db241f 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -2,53 +2,63 @@ # Don't test properties of pkgs.lib, but rather the lib in the parent directory pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; }, nix ? pkgs.nix, + nixVersions ? [ pkgs.nixVersions.minimum nix pkgs.nixVersions.unstable ], }: -pkgs.runCommand "nixpkgs-lib-tests" { - buildInputs = [ - (import ./check-eval.nix) - (import ./maintainers.nix { - inherit pkgs; - lib = import ../.; - }) - (import ./teams.nix { - inherit pkgs; - lib = import ../.; - }) - (import ../path/tests { - inherit pkgs; - }) - ]; - nativeBuildInputs = [ - nix - ]; - strictDeps = true; -} '' - datadir="${nix}/share" - export TEST_ROOT=$(pwd)/test-tmp - export NIX_BUILD_HOOK= - export NIX_CONF_DIR=$TEST_ROOT/etc - export NIX_LOCALSTATE_DIR=$TEST_ROOT/var - export NIX_LOG_DIR=$TEST_ROOT/var/log/nix - export NIX_STATE_DIR=$TEST_ROOT/var/nix - export NIX_STORE_DIR=$TEST_ROOT/store - export PAGER=cat - cacheDir=$TEST_ROOT/binary-cache +let + testWithNix = nix: + pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}" { + buildInputs = [ + (import ./check-eval.nix) + (import ./maintainers.nix { + inherit pkgs; + lib = import ../.; + }) + (import ./teams.nix { + inherit pkgs; + lib = import ../.; + }) + (import ../path/tests { + inherit pkgs; + }) + ]; + nativeBuildInputs = [ + nix + ]; + strictDeps = true; + } '' + datadir="${nix}/share" + export TEST_ROOT=$(pwd)/test-tmp + export NIX_BUILD_HOOK= + export NIX_CONF_DIR=$TEST_ROOT/etc + export NIX_LOCALSTATE_DIR=$TEST_ROOT/var + export NIX_LOG_DIR=$TEST_ROOT/var/log/nix + export NIX_STATE_DIR=$TEST_ROOT/var/nix + export NIX_STORE_DIR=$TEST_ROOT/store + export PAGER=cat + cacheDir=$TEST_ROOT/binary-cache - mkdir -p $NIX_CONF_DIR - echo "experimental-features = nix-command" >> $NIX_CONF_DIR/nix.conf + mkdir -p $NIX_CONF_DIR + echo "experimental-features = nix-command" >> $NIX_CONF_DIR/nix.conf - nix-store --init + nix-store --init - cp -r ${../.} lib - echo "Running lib/tests/modules.sh" - bash lib/tests/modules.sh + cp -r ${../.} lib + echo "Running lib/tests/modules.sh" + bash lib/tests/modules.sh - echo "Running lib/tests/filesystem.sh" - TEST_LIB=$PWD/lib bash lib/tests/filesystem.sh + echo "Running lib/tests/filesystem.sh" + TEST_LIB=$PWD/lib bash lib/tests/filesystem.sh - echo "Running lib/tests/sources.sh" - TEST_LIB=$PWD/lib bash lib/tests/sources.sh + echo "Running lib/tests/sources.sh" + TEST_LIB=$PWD/lib bash lib/tests/sources.sh - touch $out -'' + mkdir $out + echo success > $out/${nix.version} + ''; + +in + pkgs.symlinkJoin { + name = "nixpkgs-lib-tests"; + paths = map testWithNix nixVersions; + } From f96e1e36e616e50dee03ce7e6430e0a2557cf7d2 Mon Sep 17 00:00:00 2001 From: Kiran Ostrolenk Date: Thu, 25 May 2023 13:27:54 +0100 Subject: [PATCH 179/187] vscode-extensions.techtheawesome.rust-yew: init at 0.2.2 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index cd7c0922df55..623bade84673 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2903,6 +2903,22 @@ let }; }; + techtheawesome.rust-yew = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "rust-yew"; + publisher = "techtheawesome"; + version = "0.2.2"; + sha256 = "sha256-t9DYY1fqW7M5F1pbIUtnnodxMzIzURew4RXT78djWMI="; + }; + meta = { + description = "A VSCode extension that provides some language features for Yew's html macro syntax"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=TechTheAwesome.rust-yew"; + homepage = "https://github.com/TechTheAwesome/code-yew-server"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.CardboardTurkey ]; + }; + }; + theangryepicbanana.language-pascal = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-pascal"; From 4b4b293b621d44dd00d2793fbae7db8a699793d1 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 1 Jun 2023 17:20:12 +0200 Subject: [PATCH 180/187] hpp-fcl: 2.3.3 -> 2.3.4 --- pkgs/development/libraries/hpp-fcl/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index 20895529f2a4..ba58835ea5dd 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -14,25 +14,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpp-fcl"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "humanoid-path-planner"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-7MXQ5+S/lvaTBVGY2gTJ1nUegtf9cp7p0JLJ4oPJAUY="; + hash = "sha256-tX8AvlR/Az8fFs4ylqFijw3hXiNRoEWffmYbTcaqO90="; }; - patches = [ - # Fix unittest where nix env set `boost::archive::tmpdir()` to `/build` and trigger a path concatenation bug. - (fetchpatch { - name = "tests-use-boost-filesystem.patch"; - url = "https://github.com/humanoid-path-planner/hpp-fcl/commit/7e8fde64a5d2c2412325f6cb5d78623bf2409176.patch"; - hash = "sha256-YjESkj8SqYiyrJuXIa5mSnHIph/D04J10poTDcYgs2c="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ From 4b2df3e871aa5c039925d03498328350fcf11f03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 19:37:40 +0000 Subject: [PATCH 181/187] python310Packages.spsdk: 1.10.0 -> 1.10.1 --- pkgs/development/python-modules/spsdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index 11e66cc25793..2177ebc97220 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -34,13 +34,13 @@ buildPythonPackage rec { pname = "spsdk"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "NXPmicro"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-KJUtAWENS3+VAs3Iai1aKYzMYtfetMeI0MHeQ6NraNY="; + hash = "sha256-2UTgVHqFJqizJ6mDT7+PFec3bQexcBG6v8X0E5Ai4Hc="; }; nativeBuildInputs = [ From 99d37f54f002290eb32c5a06451d05572af8ee45 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Jun 2023 20:36:22 +0100 Subject: [PATCH 182/187] nixos/sway: fix package option documentation --- nixos/modules/programs/wayland/sway.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix index c699c21bd10b..698d9c2b46c4 100644 --- a/nixos/modules/programs/wayland/sway.nix +++ b/nixos/modules/programs/wayland/sway.nix @@ -49,7 +49,7 @@ in { description = lib.mdDoc '' Sway package to use. Will override the options 'wrapperFeatures', 'extraSessionCommands', and 'extraOptions'. - Set to null to not add any Sway package to your + Set to `null` to not add any Sway package to your path. This should be done if you want to use the Home Manager Sway module to install Sway. ''; From 7cb219d309992c8ec62b1eb80be701ed486fd4f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Jun 2023 19:51:28 +0000 Subject: [PATCH 183/187] yamlfix: 1.9.0 -> 1.10.0 --- pkgs/development/python-modules/yamlfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index 35eb9ea1ae42..bf29fdb831c4 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yamlfix"; - version = "1.9.0"; + version = "1.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "lyz-code"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-av3QNfyPo/4GzFzQ60OrtPK6CV5AkN4FbbqgeBz4rY0="; + hash = "sha256-tRF2mi2xAjCKKbPVcJ7YEc4UVmSorgP9DFm8t1z0XoA="; }; nativeBuildInputs = [ From 04147e058dcdec8e04c1bcbfbeed7dd7366a20a9 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Thu, 1 Jun 2023 15:30:14 -0500 Subject: [PATCH 184/187] fetchurl: remove mirror kent.dl.sourceforge.net The kent.dl.sourceforge.net domain doesn't seem to exist anymore. Because it's not usable, this commit removes it from the list of sourceforge mirrors. --- pkgs/build-support/fetchurl/mirrors.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index bd338473508a..650eeb9b4626 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -269,7 +269,6 @@ "https://versaweb.dl.sourceforge.net/sourceforge/" "https://freefr.dl.sourceforge.net/sourceforge/" "https://osdn.dl.sourceforge.net/sourceforge/" - "https://kent.dl.sourceforge.net/sourceforge/" ]; # Steam Runtime From 4b8977a3e9b4fc7f16a29fae94e94f8ccade05c1 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 1 Jun 2023 00:32:02 -0700 Subject: [PATCH 185/187] rl-2305: Fix the links to the Nix release notes NixOS 23.05 updated Nix from 2.11 to 2.13, so the release notes for 2.12 and 2.13 should be linked. --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 2df20a6c0ebe..eb5ab27cb972 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -12,7 +12,7 @@ To upgrade to the latest release, follow the [upgrade chapter](https://nixos.org In addition to numerous new and updated packages, this release has the following highlights: -- The default [Nix](https://github.com/NixOS/nix) version was updated from 2.11 to 2.13. In particular, this includes a [small language alteration](https://github.com/NixOS/nix/issues/8259) in the way floats are represented in `builtins.toJSON`. See the release notes for [2.13](https://nixos.org/manual/nix/stable/release-notes/rl-2.13.html) and [2.14](https://nixos.org/manual/nix/unstable/release-notes/rl-2.14.html) for more information. +- The default [Nix](https://github.com/NixOS/nix) version was updated from 2.11 to 2.13. In particular, this includes a [small language alteration](https://github.com/NixOS/nix/issues/8259) in the way floats are represented in `builtins.toJSON`. See the release notes for [2.12](https://nixos.org/manual/nix/stable/release-notes/rl-2.12.html) and [2.13](https://nixos.org/manual/nix/unstable/release-notes/rl-2.13.html) for more information. - The default [Linux Kernel](https://kernel.org/) was updated from version 5.15 to 6.1, see [Kernelnewbies](https://kernelnewbies.org/Linux_6.1) for what has changed. All Kernels currently shown on [kernel.org](https://kernel.org/) are available. From 67c72f85a37ea3e20734920c33de02de3b79240c Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 1 Jun 2023 00:40:09 -0700 Subject: [PATCH 186/187] rl-2305: Use immutable URL for the systemd release notes --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index eb5ab27cb972..ec524965d73d 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -16,7 +16,7 @@ In addition to numerous new and updated packages, this release has the following - The default [Linux Kernel](https://kernel.org/) was updated from version 5.15 to 6.1, see [Kernelnewbies](https://kernelnewbies.org/Linux_6.1) for what has changed. All Kernels currently shown on [kernel.org](https://kernel.org/) are available. -- [systemd](https://systemd.io) has been updated from v252 to v253, see [the release notes](https://github.com/systemd/systemd/blob/main/NEWS#L21-L677) for more information on the changes. +- [systemd](https://systemd.io) has been updated from v252 to v253, see [the release notes](https://github.com/systemd/systemd/blob/v253/NEWS#L3-L659) for more information on the changes. - Updating with `nixos-rebuild boot` and rebooting is recommended, since in some rare cases the `nixos-rebuild switch` into the new generation on a live system might fail due to missing mount units. - [glibc](https://www.gnu.org/software/libc/) has been updated from version 2.35 to 2.37, see [the release notes](https://sourceware.org/glibc/wiki/Release/2.37) for what was changed. From 0445d2f3f8b85d05ab4b41b2d22b895c4da29481 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 1 Jun 2023 23:16:44 +0200 Subject: [PATCH 187/187] inform6: fix build on x86_64-darwin --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb1472ec1710..8addd4aa3a2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8760,7 +8760,7 @@ with pkgs; infisical = callPackage ../development/tools/infisical { }; - inform6 = callPackage ../development/compilers/inform6 { }; + inform6 = darwin.apple_sdk_11_0.callPackage ../development/compilers/inform6 { }; inform7 = callPackage ../development/compilers/inform7 { };