From 343d3333ef172794deba624658bcac961f417550 Mon Sep 17 00:00:00 2001 From: Brieuc Dubois Date: Fri, 1 Nov 2024 08:23:43 +0200 Subject: [PATCH 01/24] maintainers: add bhasherbel --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c5fa6ec444af..b6e672d00188 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2815,6 +2815,12 @@ githubId = 24254289; name = "Payas Relekar"; }; + bhasherbel = { + email = "nixos.maintainer@bhasher.com"; + github = "bhasherbel"; + githubId = 45831883; + name = "Brieuc Dubois"; + }; bhipple = { email = "bhipple@protonmail.com"; github = "bhipple"; From e918946e67fe5a1e41ffea6b92910c47feb04eb9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:26:52 +0900 Subject: [PATCH 02/24] python312Packages.vulcan-api: 2.4.0 -> 2.4.1 Diff: https://github.com/kapi2289/vulcan-api/compare/refs/tags/v2.4.0...v2.4.1 Changelog: https://github.com/kapi2289/vulcan-api/releases/tag/v2.4.1 --- pkgs/development/python-modules/vulcan-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix index 1cde8424418c..7b277269f4ea 100644 --- a/pkgs/development/python-modules/vulcan-api/default.nix +++ b/pkgs/development/python-modules/vulcan-api/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "vulcan-api"; - version = "2.4.0"; + version = "2.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "kapi2289"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RtB67Pme/qtKG0T3rzm0OeewNZPg2e3aebL5YnSWWFQ="; + hash = "sha256-FEWm5DvnrEIelRnu/IgWU7h1CTvPQcZ3DbFS2swy/wQ="; }; pythonRemoveDeps = [ "faust-cchardet" ]; From 5162b70d6ef9ac3910f572d4bb536bbe3211c11a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 3 Nov 2024 00:12:36 +0900 Subject: [PATCH 03/24] python312Packages.vulcan-api: switch to pypa builder --- pkgs/development/python-modules/vulcan-api/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix index 7b277269f4ea..5d0ec713cffe 100644 --- a/pkgs/development/python-modules/vulcan-api/default.nix +++ b/pkgs/development/python-modules/vulcan-api/default.nix @@ -4,13 +4,13 @@ aiodns, aiohttp, buildPythonPackage, + setuptools, faust-cchardet, fetchFromGitHub, pyopenssl, pythonOlder, pytz, related, - requests, uonet-request-signer-hebe, yarl, }: @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "vulcan-api"; version = "2.4.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -29,10 +29,11 @@ buildPythonPackage rec { hash = "sha256-FEWm5DvnrEIelRnu/IgWU7h1CTvPQcZ3DbFS2swy/wQ="; }; - pythonRemoveDeps = [ "faust-cchardet" ]; + pythonRemoveDeps = [ "related-without-future" ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aenum aiodns aiohttp @@ -40,7 +41,6 @@ buildPythonPackage rec { pyopenssl pytz related - requests uonet-request-signer-hebe yarl ]; From e101d57e4448f3f3fbaee8fac8bfb3a6f33daadb Mon Sep 17 00:00:00 2001 From: Brieuc Dubois Date: Fri, 1 Nov 2024 08:26:14 +0200 Subject: [PATCH 04/24] hyprsome: init at 0.1.12 --- pkgs/by-name/hy/hyprsome/package.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/hy/hyprsome/package.nix diff --git a/pkgs/by-name/hy/hyprsome/package.nix b/pkgs/by-name/hy/hyprsome/package.nix new file mode 100644 index 000000000000..a7bf15ee4f3b --- /dev/null +++ b/pkgs/by-name/hy/hyprsome/package.nix @@ -0,0 +1,28 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage { + pname = "hyprsome"; + version = "0.1.12-unstable-2024-05-20"; + + src = fetchFromGitHub { + owner = "sopa0"; + repo = "hyprsome"; + rev = "985e1a3b03b5118c98c03983f60ea9f74775858c"; + hash = "sha256-JiOV9c23yOhaVW2NHgs8rjM8l9qt181Tigf5sCnPep8="; + }; + + cargoHash = "sha256-Jqx77/PDWEJ+NPJN2R6n4w9nVPXQoHeuVfYKUB3i9Lg="; + + meta = { + description = "Awesome-like workspaces for Hyprland"; + homepage = "https://github.com/sopa0/hyprsome"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ bhasherbel ]; + platforms = lib.platforms.linux; + mainProgram = "hyprsome"; + }; +} From 04a4f839a48e5d75df926b3b7e3fd36a8a5a2203 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Nov 2024 19:50:56 +0000 Subject: [PATCH 05/24] storj-uplink: 1.114.3 -> 1.116.5 --- pkgs/by-name/st/storj-uplink/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/storj-uplink/package.nix b/pkgs/by-name/st/storj-uplink/package.nix index 09e87c260e39..008c456719f5 100644 --- a/pkgs/by-name/st/storj-uplink/package.nix +++ b/pkgs/by-name/st/storj-uplink/package.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.114.3"; + version = "1.116.5"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-V7Vl2sViRl6olhCdJF4xtR7iyJCqJCrm39/Aq1T9GFQ="; + hash = "sha256-vQftcQU7WUDfVFKYswtpEHbSyReIcWF83vEQrEbzbHk="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-+eqT3VNqw3fOLwfCKPacIEcoXjuzPaY1EAZI95rgLDs="; + vendorHash = "sha256-4wkgQQGbQi9ZcBaExRQysL6r/rJZez9z7keaJReuAeg="; ldflags = [ "-s" "-w" ]; From 77c2f1bb3ce13c3087372eec253c8f9c6ab1e444 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 9 Nov 2024 19:37:32 -0800 Subject: [PATCH 06/24] gitoxide: use new Darwin SDK pattern --- pkgs/applications/version-management/gitoxide/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index f78401a5220f..37190b2440c3 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -4,9 +4,7 @@ , cmake , pkg-config , stdenv -, libiconv -, Security -, SystemConfiguration +, apple-sdk_11 , curl , openssl , buildPackages @@ -33,7 +31,7 @@ in rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config installShellFiles ]; buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin - then [ libiconv Security SystemConfiguration ] + then [ apple-sdk_11 ] else [ openssl ]); preFixup = lib.optionalString canRunCmd '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20efe30fd5b2..e1ee617684a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1250,9 +1250,7 @@ with pkgs; gita = python3Packages.callPackage ../applications/version-management/gita { }; - gitoxide = darwin.apple_sdk_11_0.callPackage ../applications/version-management/gitoxide { - inherit (darwin.apple_sdk_11_0.frameworks) Security SystemConfiguration; - }; + gitoxide = callPackage ../applications/version-management/gitoxide { }; github-cli = gh; git-absorb = callPackage ../applications/version-management/git-absorb { From 358c74b3328b27639b3a97264effb74fa0f90e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 7 Nov 2024 01:03:16 +0100 Subject: [PATCH 07/24] bruno-cli: init at 1.34.2 --- pkgs/by-name/br/bruno-cli/package.nix | 99 +++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 pkgs/by-name/br/bruno-cli/package.nix diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix new file mode 100644 index 000000000000..51d771e9a3eb --- /dev/null +++ b/pkgs/by-name/br/bruno-cli/package.nix @@ -0,0 +1,99 @@ +{ + lib, + stdenv, + buildNpmPackage, + bruno, + pkg-config, + pango, + apple-sdk_11, + testers, + bruno-cli, +}: + +let + pname = "bruno-cli"; +in +buildNpmPackage { + inherit pname; + + # since they only make releases and git tags for bruno, + # we lie about bruno-cli's version and say it's the same as bruno's + # to keep them in sync with easier maintenance + inherit (bruno) version src npmDepsHash; + + npmWorkspace = "packages/bruno-cli"; + npmFlags = [ "--legacy-peer-deps" ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = + [ + pango + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # fix for: https://github.com/NixOS/nixpkgs/issues/272156 + apple-sdk_11 + ]; + + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + + buildPhase = '' + runHook preBuild + + npm run build --workspace=packages/bruno-common + npm run build --workspace=packages/bruno-graphql-docs + npm run build --workspace=packages/bruno-query + + npm run sandbox:bundle-libraries --workspace=packages/bruno-js + + runHook postBuild + ''; + + npmPackFlags = [ "--ignore-scripts" ]; + + postInstall = '' + cp -r packages $out/lib/node_modules/usebruno + + echo "Removing unnecessary files" + pushd $out/lib/node_modules/usebruno + rm -rfv packages/bruno-{app,electron,tests,toml,schema,docs} + rm -rfv packages/*/node_modules/typescript + rm -rfv node_modules/{next,@next,@tabler,pdfjs-dist,*redux*,*babel*,prettier,@types*,*react*,*graphiql*} + for pattern in '*.map' '*.map.js' '*.ts'; do + find . -type f -name "$pattern" -exec rm -v {} + + done + popd + echo "Removed unnecessary files" + ''; + + postFixup = '' + wrapProgram $out/bin/bru \ + --prefix NODE_PATH : $out/lib/node_modules/usebruno/packages/bruno-cli/node_modules \ + --prefix NODE_PATH : $out/lib/node_modules + ''; + + passthru.tests.help = testers.runCommand { + name = "${pname}-help-test"; + nativeBuildInputs = [ bruno-cli ]; + script = '' + bru --help && touch $out + ''; + }; + + meta = { + description = "CLI of the open-source IDE For exploring and testing APIs"; + homepage = "https://www.usebruno.com"; + license = lib.licenses.mit; + mainProgram = "bru"; + maintainers = with lib.maintainers; [ + gepbird + kashw2 + lucasew + mattpolzin + water-sucks + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} From ddb6b26b47d6f699a1e4631253f7d713a73b0f86 Mon Sep 17 00:00:00 2001 From: Mathieu St-Louis Date: Mon, 4 Nov 2024 22:13:36 -0500 Subject: [PATCH 08/24] testkube: init at 2.1.56 --- pkgs/by-name/te/testkube/package.nix | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/te/testkube/package.nix diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix new file mode 100644 index 000000000000..4f4e411f5537 --- /dev/null +++ b/pkgs/by-name/te/testkube/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "testkube"; + version = "2.1.56"; + + src = fetchFromGitHub { + owner = "kubeshop"; + repo = "testkube"; + rev = "v${version}"; + sha256 = "sha256-P+A9lUMzQ3M0SEVZBMDSMj8S0uCsEhadv5vDRxbQORA="; + }; + + vendorHash = "sha256-44aIwddMH6CMfTno90xGkHgna4DO2Ii3KhpMwv6Zjmo="; + + ldflags = [ + "-X main.version=${version}" + "-X main.builtBy=nixpkgs" + "-X main.commit=v${version}" + "-X main.date=1970-01-01-00:00:01" + ]; + + doCheck = false; + subPackages = [ "cmd/kubectl-testkube" ]; + + meta = with lib; { + description = "Kubernetes-native framework for test definition and execution"; + homepage = "https://github.com/kubeshop/testkube/"; + license = licenses.mit; + mainProgram = "kubectl-testkube"; + maintainers = with maintainers; [ ]; + }; +} From 8b389a095b1cc04db34d2f6f0e5e524270ba7e04 Mon Sep 17 00:00:00 2001 From: Mathieu St-Louis Date: Sun, 10 Nov 2024 19:48:56 -0500 Subject: [PATCH 09/24] testkube: removed with lib + added mathstlouis as maintainer --- pkgs/by-name/te/testkube/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix index 4f4e411f5537..11990a86012a 100644 --- a/pkgs/by-name/te/testkube/package.nix +++ b/pkgs/by-name/te/testkube/package.nix @@ -26,11 +26,11 @@ buildGoModule rec { doCheck = false; subPackages = [ "cmd/kubectl-testkube" ]; - meta = with lib; { + meta = { description = "Kubernetes-native framework for test definition and execution"; homepage = "https://github.com/kubeshop/testkube/"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "kubectl-testkube"; - maintainers = with maintainers; [ ]; + maintainers = with lib.maintainers; [ mathstlouis ]; }; } From e25f98f28ddc2fc7ced25ce5bcde8e84293168a2 Mon Sep 17 00:00:00 2001 From: Mathieu St-Louis Date: Sun, 10 Nov 2024 19:53:52 -0500 Subject: [PATCH 10/24] testkube: fetchFromGitHub: use hash instead of sha256 --- pkgs/by-name/te/testkube/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix index 11990a86012a..6f2a5345d2f8 100644 --- a/pkgs/by-name/te/testkube/package.nix +++ b/pkgs/by-name/te/testkube/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { owner = "kubeshop"; repo = "testkube"; rev = "v${version}"; - sha256 = "sha256-P+A9lUMzQ3M0SEVZBMDSMj8S0uCsEhadv5vDRxbQORA="; + hash = "sha256-P+A9lUMzQ3M0SEVZBMDSMj8S0uCsEhadv5vDRxbQORA="; }; vendorHash = "sha256-44aIwddMH6CMfTno90xGkHgna4DO2Ii3KhpMwv6Zjmo="; From feb8a2753c1f2c9fd5a35edc9b4fd26c293ac1e4 Mon Sep 17 00:00:00 2001 From: Mathieu St-Louis Date: Sun, 10 Nov 2024 19:57:52 -0500 Subject: [PATCH 11/24] testkube: do not skip check phase --- pkgs/by-name/te/testkube/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix index 6f2a5345d2f8..d7873de11233 100644 --- a/pkgs/by-name/te/testkube/package.nix +++ b/pkgs/by-name/te/testkube/package.nix @@ -23,7 +23,6 @@ buildGoModule rec { "-X main.date=1970-01-01-00:00:01" ]; - doCheck = false; subPackages = [ "cmd/kubectl-testkube" ]; meta = { From dd9dc00de2374261045af4f184691b3355bc6c34 Mon Sep 17 00:00:00 2001 From: jthulhu Date: Mon, 11 Nov 2024 08:33:54 +0100 Subject: [PATCH 12/24] maintainers: add jthulhu --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/by-name/le/lean4/package.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 44b7464cee3b..55fcf85082a0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10929,6 +10929,12 @@ githubId = 54635632; keys = [ { fingerprint = "4C68 56EE DFDA 20FB 77E8 9169 1964 2151 C218 F6F5"; } ]; }; + jthulhu = { + name = "Adrien Mathieu"; + email = "adrien.lc.mathieu@gmail.com"; + github = "jthulhu"; + githubId = 23179762; + }; jtobin = { email = "jared@jtobin.io"; github = "jtobin"; diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix index cc05d0dbd33b..cd92e1db1985 100644 --- a/pkgs/by-name/le/lean4/package.nix +++ b/pkgs/by-name/le/lean4/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/leanprover/lean4/blob/${finalAttrs.src.rev}/RELEASES.md"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ danielbritten ]; + maintainers = with maintainers; [ danielbritten jthulhu ]; mainProgram = "lean"; }; }) From 9716e3cd43e253bb3b855dff09e6687fe8e447e6 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:12:35 +0800 Subject: [PATCH 13/24] dart.rhttp: init --- .../dart/package-source-builders/default.nix | 1 + .../rhttp/cargokit.patch | 90 +++++++++++++++++++ .../package-source-builders/rhttp/default.nix | 51 +++++++++++ 3 files changed, 142 insertions(+) create mode 100644 pkgs/development/compilers/dart/package-source-builders/rhttp/cargokit.patch create mode 100644 pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix index 48c31cc28cdd..6fedb82c4421 100644 --- a/pkgs/development/compilers/dart/package-source-builders/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/default.nix @@ -6,6 +6,7 @@ matrix = callPackage ./matrix { }; media_kit_libs_linux = callPackage ./media_kit_libs_linux { }; olm = callPackage ./olm { }; + rhttp = callPackage ./rhttp { }; sqlcipher_flutter_libs = callPackage ./sqlcipher_flutter_libs { }; sqlite3 = callPackage ./sqlite3 { }; system_tray = callPackage ./system-tray { }; diff --git a/pkgs/development/compilers/dart/package-source-builders/rhttp/cargokit.patch b/pkgs/development/compilers/dart/package-source-builders/rhttp/cargokit.patch new file mode 100644 index 000000000000..bbb4771b6657 --- /dev/null +++ b/pkgs/development/compilers/dart/package-source-builders/rhttp/cargokit.patch @@ -0,0 +1,90 @@ +--- old/cargokit/cmake/cargokit.cmake 2024-11-08 13:36:13.345889693 +0800 ++++ new/cargokit/cmake/cargokit.cmake 2024-11-08 13:45:26.019632176 +0800 +@@ -17,83 +17,22 @@ + function(apply_cargokit target manifest_dir lib_name any_symbol_name) + + set(CARGOKIT_LIB_NAME "${lib_name}") +- set(CARGOKIT_LIB_FULL_NAME "${CMAKE_SHARED_MODULE_PREFIX}${CARGOKIT_LIB_NAME}${CMAKE_SHARED_MODULE_SUFFIX}") +- if (CMAKE_CONFIGURATION_TYPES) +- set(CARGOKIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$") +- set(OUTPUT_LIB "${CMAKE_CURRENT_BINARY_DIR}/$/${CARGOKIT_LIB_FULL_NAME}") +- else() +- set(CARGOKIT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}") +- set(OUTPUT_LIB "${CMAKE_CURRENT_BINARY_DIR}/${CARGOKIT_LIB_FULL_NAME}") +- endif() +- set(CARGOKIT_TEMP_DIR "${CMAKE_CURRENT_BINARY_DIR}/cargokit_build") +- +- if (FLUTTER_TARGET_PLATFORM) +- set(CARGOKIT_TARGET_PLATFORM "${FLUTTER_TARGET_PLATFORM}") +- else() +- set(CARGOKIT_TARGET_PLATFORM "windows-x64") +- endif() +- +- set(CARGOKIT_ENV +- "CARGOKIT_CMAKE=${CMAKE_COMMAND}" +- "CARGOKIT_CONFIGURATION=$" +- "CARGOKIT_MANIFEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${manifest_dir}" +- "CARGOKIT_TARGET_TEMP_DIR=${CARGOKIT_TEMP_DIR}" +- "CARGOKIT_OUTPUT_DIR=${CARGOKIT_OUTPUT_DIR}" +- "CARGOKIT_TARGET_PLATFORM=${CARGOKIT_TARGET_PLATFORM}" +- "CARGOKIT_TOOL_TEMP_DIR=${CARGOKIT_TEMP_DIR}/tool" +- "CARGOKIT_ROOT_PROJECT_DIR=${CMAKE_SOURCE_DIR}" +- ) +- +- if (WIN32) +- set(SCRIPT_EXTENSION ".cmd") +- set(IMPORT_LIB_EXTENSION ".lib") +- else() +- set(SCRIPT_EXTENSION ".sh") +- set(IMPORT_LIB_EXTENSION "") +- execute_process(COMMAND chmod +x "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}") +- endif() +- +- # Using generators in custom command is only supported in CMake 3.20+ +- if (CMAKE_CONFIGURATION_TYPES AND ${CMAKE_VERSION} VERSION_LESS "3.20.0") +- foreach(CONFIG IN LISTS CMAKE_CONFIGURATION_TYPES) +- add_custom_command( +- OUTPUT +- "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG}/${CARGOKIT_LIB_FULL_NAME}" +- "${CMAKE_CURRENT_BINARY_DIR}/_phony_" +- COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV} +- "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake +- VERBATIM +- ) +- endforeach() +- else() +- add_custom_command( +- OUTPUT +- ${OUTPUT_LIB} +- "${CMAKE_CURRENT_BINARY_DIR}/_phony_" +- COMMAND ${CMAKE_COMMAND} -E env ${CARGOKIT_ENV} +- "${cargokit_cmake_root}/run_build_tool${SCRIPT_EXTENSION}" build-cmake +- VERBATIM +- ) +- endif() +- +- +- set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/_phony_" PROPERTIES SYMBOLIC TRUE) + + if (TARGET ${target}) + # If we have actual cmake target provided create target and make existing + # target depend on it +- add_custom_target("${target}_cargokit" DEPENDS ${OUTPUT_LIB}) ++ add_custom_target("${target}_cargokit" DEPENDS OUTPUT_LIB) + add_dependencies("${target}" "${target}_cargokit") +- target_link_libraries("${target}" PRIVATE "${OUTPUT_LIB}${IMPORT_LIB_EXTENSION}") ++ target_link_libraries("${target}" PRIVATE OUTPUT_LIB) + if(WIN32) + target_link_options(${target} PRIVATE "/INCLUDE:${any_symbol_name}") + endif() + else() + # Otherwise (FFI) just use ALL to force building always +- add_custom_target("${target}_cargokit" ALL DEPENDS ${OUTPUT_LIB}) ++ add_custom_target("${target}_cargokit" ALL DEPENDS OUTPUT_LIB) + endif() + + # Allow adding the output library to plugin bundled libraries +- set("${target}_cargokit_lib" ${OUTPUT_LIB} PARENT_SCOPE) ++ set("${target}_cargokit_lib" OUTPUT_LIB PARENT_SCOPE) + + endfunction() diff --git a/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix b/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix new file mode 100644 index 000000000000..98f4c82c58be --- /dev/null +++ b/pkgs/development/compilers/dart/package-source-builders/rhttp/default.nix @@ -0,0 +1,51 @@ +{ + lib, + rustPlatform, + stdenv, +}: + +{ version, src, ... }: + +let + rustDep = rustPlatform.buildRustPackage { + pname = "rhttp-rs"; + inherit version src; + + sourceRoot = "${src.name}/rust"; + + cargoHash = + { + _0_9_1 = "sha256-Gl3ArdSuw3/yi/JX6oloKJqerSJjTfK8HXRNei/LO+4="; + } + .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw '' + Unsupported version of pub 'rhttp': '${version}' + Please add cargoHash here. If the cargoHash + is the same with existing versions, add an alias here. + ''); + + env.RUSTFLAGS = "--cfg reqwest_unstable"; + + passthru.libraryPath = "lib/librhttp.so"; + }; + +in +stdenv.mkDerivation { + pname = "rhttp"; + inherit version src; + inherit (src) passthru; + + patches = [ ./cargokit.patch ]; + + postPatch = '' + substituteInPlace ./cargokit/cmake/cargokit.cmake --replace-fail "OUTPUT_LIB" "${rustDep}/${rustDep.passthru.libraryPath}" + ''; + + installPhase = '' + runHook preInstall + + mkdir $out/ + cp -r ./* $out/ + + runHook postInstall + ''; +} From 606ea3756ea78be5829c9499cfdd33efa50c5a7e Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 9 Nov 2024 10:16:17 +0800 Subject: [PATCH 14/24] localsend: 1.15.4-unstable-2024-10-26 -> 1.16.1 --- pkgs/by-name/lo/localsend/package.nix | 15 +- pkgs/by-name/lo/localsend/pubspec.lock.json | 440 +++++++++++++------- 2 files changed, 294 insertions(+), 161 deletions(-) diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix index d84aee26984e..648ea6c6fb6c 100644 --- a/pkgs/by-name/lo/localsend/package.nix +++ b/pkgs/by-name/lo/localsend/package.nix @@ -15,17 +15,16 @@ let pname = "localsend"; - version = "1.15.4"; + version = "1.16.1"; linux = flutter324.buildFlutterApplication rec { - inherit pname; - version = "1.15.4-unstable-2024-10-26"; + inherit pname version; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "d0e864ddf6ebe1c55188b33f8fdccd534d203c75"; - hash = "sha256-qaW9LoRQge4K/CAQwbjNxmlUkQmxvaZyBJdAjXbbTw4="; + rev = "v${version}"; + hash = "sha256-9nW1cynvRgX565ZupR+ogfDH9Qem+LQH4XZupVsrEWo="; }; sourceRoot = "${src.name}/app"; @@ -52,6 +51,10 @@ let done ''; + extraWrapProgramArgs = '' + --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" + ''; + desktopItems = [ (makeDesktopItem { name = "LocalSend"; @@ -79,7 +82,7 @@ let src = fetchurl { url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg"; - hash = "sha256-ZU2aXZNKo01TnXNH0e+r0l4J5HIILmGam3T4+6GaeA4="; + hash = "sha256-kgq3AoypDdRwk9bKa1zjUJo4tHHUbDZIg0G0Rk9S3n4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lo/localsend/pubspec.lock.json b/pkgs/by-name/lo/localsend/pubspec.lock.json index 4d8c28b858cc..4e26c81d4063 100644 --- a/pkgs/by-name/lo/localsend/pubspec.lock.json +++ b/pkgs/by-name/lo/localsend/pubspec.lock.json @@ -30,21 +30,21 @@ "dependency": "transitive", "description": { "name": "animated_vector", - "sha256": "e15c6596549ca6e2e7491c11fbe168a1dead87475a828a4bc81cf104feca0432", + "sha256": "f1beb10e6fcfd8bd15abb788e20345def786d1c7391d7c1426bb2a1f2adf2132", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.2" }, "animated_vector_annotations": { "dependency": "transitive", "description": { "name": "animated_vector_annotations", - "sha256": "baa6b4ed98407220f2c9634f7da3cfa5eedb46798e090466f441e666e2f7c8c0", + "sha256": "07c1ea603a2096f7eb6f1c2b8f16c3c330c680843ea78b7782a3217c3c53f979", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.2" }, "ansicolor": { "dependency": "transitive", @@ -70,11 +70,21 @@ "dependency": "transitive", "description": { "name": "args", - "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.6.0" + }, + "assorted_layout_widgets": { + "dependency": "transitive", + "description": { + "name": "assorted_layout_widgets", + "sha256": "5b7f7c76a1a4c7cf95edfb854c3ed09ce9cb7f25a372f2d9a8d4c1569d42ecfb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.2" }, "async": { "dependency": "transitive", @@ -116,6 +126,16 @@ "source": "hosted", "version": "2.4.1" }, + "build_cli_annotations": { + "dependency": "transitive", + "description": { + "name": "build_cli_annotations", + "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, "build_config": { "dependency": "transitive", "description": { @@ -220,11 +240,11 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.10.0" + "version": "4.10.1" }, "collection": { "dependency": "direct main", @@ -259,11 +279,11 @@ "dependency": "direct main", "description": { "name": "connectivity_plus", - "sha256": "2056db5241f96cdc0126bd94459fc4cdc13876753768fc7a31c425e50a7177d0", + "sha256": "876849631b0c7dc20f8b471a2a03142841b482438e3b707955464f5ffca3e4c3", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.5" + "version": "6.1.0" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -279,21 +299,21 @@ "dependency": "transitive", "description": { "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.1.2" }, "coverage": { "dependency": "transitive", "description": { "name": "coverage", - "sha256": "c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5", + "sha256": "88b0fddbe4c92910fefc09cc0248f5e7f0cd23e450ded4c28f16ab8ee8f83268", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.2" + "version": "1.10.0" }, "cross_file": { "dependency": "transitive", @@ -309,21 +329,21 @@ "dependency": "transitive", "description": { "name": "crypto", - "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.6" }, "csslib": { "dependency": "transitive", "description": { "name": "csslib", - "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" + "version": "1.0.2" }, "csv": { "dependency": "transitive", @@ -339,21 +359,21 @@ "dependency": "direct main", "description": { "name": "dart_mappable", - "sha256": "47269caf2060533c29b823ff7fa9706502355ffcb61e7f2a374e3a0fb2f2c3f0", + "sha256": "f69a961ae8589724ebb542e588f228ae844c5f78028899cbe2cc718977c1b382", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.2" + "version": "4.3.0" }, "dart_mappable_builder": { "dependency": "direct dev", "description": { "name": "dart_mappable_builder", - "sha256": "ab5cf9086862d3fceb9773e945b5f95cc5471a28c782a4fc451bd400a4e0c64e", + "sha256": "04a6e7117382f8a8689b3e363bee6c3de8c9ea4332e664148fe01bd576eb1126", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.3" + "version": "4.3.0" }, "dart_style": { "dependency": "transitive", @@ -409,11 +429,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074", + "sha256": "c4af09051b4f0508f6c1dc0a5c085bf014d5c9a4a0678ce1799c2b4d716387a0", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.1.2" + "version": "11.1.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -425,26 +445,6 @@ "source": "hosted", "version": "7.0.1" }, - "dio": { - "dependency": "direct main", - "description": { - "name": "dio", - "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.7.0" - }, - "dio_web_adapter": { - "dependency": "transitive", - "description": { - "name": "dio_web_adapter", - "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, "dynamic_color": { "dependency": "direct main", "description": { @@ -499,21 +499,21 @@ "dependency": "transitive", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "file_picker": { "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "167bb619cdddaa10ef2907609feb8a79c16dfa479d3afaf960f8e223f754bf12", + "sha256": "aac85f20436608e01a6ffd1fdd4e746a7f33c93a2c83752e626bdfaea139b877", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.2" + "version": "8.1.3" }, "file_selector": { "dependency": "direct main", @@ -529,11 +529,11 @@ "dependency": "transitive", "description": { "name": "file_selector_android", - "sha256": "00aafa9ae05a8663d0b4f17abd2a02316911ca0f46f9b9dacb9578b324d99590", + "sha256": "ec439df07c4999faad319ce8ad9e971795c2f1d7132ad5a793b9370a863c6128", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1+9" + "version": "0.5.1+10" }, "file_selector_ios": { "dependency": "transitive", @@ -599,11 +599,11 @@ "dependency": "transitive", "description": { "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "flutter": { "dependency": "direct main", @@ -625,31 +625,31 @@ "dependency": "transitive", "description": { "name": "flutter_gen_core", - "sha256": "638d518897f1aefc55a24278968027591d50223a6943b6ae9aa576fe1494d99d", + "sha256": "46ecf0e317413dd065547887c43f93f55e9653e83eb98dc13dd07d40dd225325", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.7.0" + "version": "5.8.0" }, "flutter_gen_runner": { "dependency": "direct dev", "description": { "name": "flutter_gen_runner", - "sha256": "7f2f02d95e3ec96cf70a1c515700c0dd3ea905af003303a55d6fb081240e6b8a", + "sha256": "77f0a02fc30d9fcf2549fe874eb3fde091435724904bcbb1af60aa40cbfab1f4", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.7.0" + "version": "5.8.0" }, "flutter_lints": { "dependency": "direct dev", "description": { "name": "flutter_lints", - "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c", + "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "5.0.0" }, "flutter_localizations": { "dependency": "direct main", @@ -661,11 +661,11 @@ "dependency": "direct main", "description": { "name": "flutter_markdown", - "sha256": "a23c41ee57573e62fc2190a1f36a0480c4d90bde3a8a8d7126e5d5992fb53fb7", + "sha256": "f0e599ba89c9946c8e051780f0ec99aba4ba15895e0380a7ab68f420046fc44e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3+1" + "version": "0.7.4+1" }, "flutter_plugin_android_lifecycle": { "dependency": "transitive", @@ -677,6 +677,16 @@ "source": "hosted", "version": "2.0.23" }, + "flutter_rust_bridge": { + "dependency": "transitive", + "description": { + "name": "flutter_rust_bridge", + "sha256": "5fe868d3cb8cbc4d83091748552e03f00ccfa41b8e44691bc382611f831d5f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.1" + }, "flutter_test": { "dependency": "transitive", "description": "flutter", @@ -689,6 +699,16 @@ "source": "sdk", "version": "0.0.0" }, + "freezed_annotation": { + "dependency": "transitive", + "description": { + "name": "freezed_annotation", + "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, "frontend_server_client": { "dependency": "transitive", "description": { @@ -763,11 +783,11 @@ "dependency": "transitive", "description": { "name": "html", - "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.15.4" + "version": "0.15.5" }, "http": { "dependency": "transitive", @@ -813,11 +833,11 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8", + "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.0" + "version": "4.3.0" }, "image_picker": { "dependency": "direct main", @@ -833,31 +853,31 @@ "dependency": "transitive", "description": { "name": "image_picker_android", - "sha256": "d3e5e00fdfeca8fd4ffb3227001264d449cc8950414c2ff70b0e06b9c628e643", + "sha256": "8faba09ba361d4b246dc0a17cb4289b3324c2b9f6db7b3d457ee69106a86bd32", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.12+15" + "version": "0.8.12+17" }, "image_picker_for_web": { "dependency": "transitive", "description": { "name": "image_picker_for_web", - "sha256": "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50", + "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.6" }, "image_picker_ios": { "dependency": "transitive", "description": { "name": "image_picker_ios", - "sha256": "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447", + "sha256": "4f0568120c6fcc0aaa04511cb9f9f4d29fc3d0139884b1d06be88dcec7641d6b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.12" + "version": "0.8.12+1" }, "image_picker_linux": { "dependency": "transitive", @@ -923,11 +943,11 @@ "dependency": "transitive", "description": { "name": "in_app_purchase_android", - "sha256": "bee60266e443d4ae0e4809bae7f9cd4d6be75ab5ec6bb3d2ca737774a274a3bd", + "sha256": "81507c7cacc6fc45e7980f887d53566b2847ac02859d0156f171f5056c2dd1b7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.6+9" + "version": "0.3.6+11" }, "in_app_purchase_platform_interface": { "dependency": "transitive", @@ -943,11 +963,11 @@ "dependency": "transitive", "description": { "name": "in_app_purchase_storekit", - "sha256": "e9a408da11d055f9af9849859e1251b2b0a2f84f256fa3bf1285c5614a397079", + "sha256": "96cfa71121f4294079586a2fab7363b01bdb4c3381d9b397012c2580b391281d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.18+1" + "version": "0.3.18+3" }, "intl": { "dependency": "direct main", @@ -1043,21 +1063,21 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", + "sha256": "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "5.0.0" }, "logging": { "dependency": "direct main", "description": { "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "macros": { "dependency": "transitive", @@ -1099,6 +1119,16 @@ "source": "hosted", "version": "0.11.1" }, + "matrix4_transform": { + "dependency": "transitive", + "description": { + "name": "matrix4_transform", + "sha256": "42c42610deecc382be2653f4a21358537401bd5b027c168a174c7c6a64959908", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, "menu_base": { "dependency": "transitive", "description": { @@ -1163,11 +1193,11 @@ "dependency": "direct main", "description": { "name": "network_info_plus", - "sha256": "6a31fa47c1f6e240f1b60de0a57d65a092ac1af7515247660f03643576984eb8", + "sha256": "89bad7bf9614e78716f0f86c905fe2a850dbdcc00c377968d5260c49c2c6f2eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.1" + "version": "6.1.0" }, "network_info_plus_platform_interface": { "dependency": "transitive", @@ -1199,6 +1229,56 @@ "source": "hosted", "version": "2.0.2" }, + "open_dir": { + "dependency": "direct main", + "description": { + "name": "open_dir", + "sha256": "a4884b00e5e5795a9b4b3d582ac6a66e9196795ed760dbc3c63b4837c70c5901", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.2+1" + }, + "open_dir_linux": { + "dependency": "transitive", + "description": { + "name": "open_dir_linux", + "sha256": "566cd9e02403971be06af35e1abc8057a4f3f98888c1226042e96a2af333b8bc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.2+1" + }, + "open_dir_macos": { + "dependency": "transitive", + "description": { + "name": "open_dir_macos", + "sha256": "51fdc8c3a06c9d571b599b5901045ada23d1440b24c3052c0a66cf3ee4ac901b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.2" + }, + "open_dir_platform_interface": { + "dependency": "transitive", + "description": { + "name": "open_dir_platform_interface", + "sha256": "ca189abb02d8e3320f9b2493b6d58e3a33f393d5eb4ccbbef02e0bc0fd393872", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.2" + }, + "open_dir_windows": { + "dependency": "transitive", + "description": { + "name": "open_dir_windows", + "sha256": "ec48df32ce61adb6f6cede0330d13b0d89714d2ee2df198f32ecd520e3a5d250", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.2+1" + }, "open_filex": { "dependency": "direct main", "description": { @@ -1223,11 +1303,11 @@ "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918", + "sha256": "df3eb3e0aed5c1107bb0fdb80a8e82e778114958b1c5ac5644fb1ac9cae8a998", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.2" + "version": "8.1.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", @@ -1264,21 +1344,21 @@ "dependency": "transitive", "description": { "name": "path_parsing", - "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf", + "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.1.0" }, "path_provider": { "dependency": "direct main", "description": { "name": "path_provider", - "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.1.5" }, "path_provider_android": { "dependency": "transitive", @@ -1344,11 +1424,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "76e4ab092c1b240d31177bb64d2b0bea43f43d0e23541ec866151b9f7b2490fa", + "sha256": "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.12" + "version": "12.0.13" }, "permission_handler_apple": { "dependency": "transitive", @@ -1405,31 +1485,31 @@ "dependency": "transitive", "description": { "name": "photo_manager", - "sha256": "32a1ce1095aeaaa792a29f28c1f74613aa75109f21c2d4ab85be3ad9964230a4", + "sha256": "f5ef2618870e9a50d8bfeb81a02c242d580ae8614bd5ea9e1b80dbb7e49d4260", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.5.0" + "version": "3.6.1" }, "photo_manager_image_provider": { "dependency": "transitive", "description": { "name": "photo_manager_image_provider", - "sha256": "b0a6d59f34e48c2b9aa52a4a655308c29b0fc4b3931607f9e0e252bc49aef974", + "sha256": "b6015b67b32f345f57cf32c126f871bced2501236c405aafaefa885f7c821e4f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.2.0" }, "platform": { "dependency": "transitive", "description": { "name": "platform", - "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.5" + "version": "3.1.6" }, "platform_linux": { "dependency": "transitive", @@ -1545,21 +1625,31 @@ "dependency": "direct dev", "description": { "name": "refena_inspector", - "sha256": "c682581e2c2e8f641f5366cd079c0db1cab33a58ec160464d03d02019e92acd2", + "sha256": "c7c93884392493dd6a0ef8762eaaf6a45a64480b11f22f48b8547ef52916496b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.0.2" }, "refena_inspector_client": { "dependency": "direct main", "description": { "name": "refena_inspector_client", - "sha256": "f211414cd0c45a18fa482b8fbc0d8ee3b0383cda2979f127320134c4ffa8cafb", + "sha256": "8bcc1e169bfc0e5ba448f4920067a0579c0b4a42fff39dbdfd4a743bf2b235a6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.0.1" + }, + "rhttp": { + "dependency": "direct main", + "description": { + "name": "rhttp", + "sha256": "92fb57dea6338370efe1e4e2101e8b521f91f15bc60ef6908469b4392dd9803a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.1" }, "routerino": { "dependency": "direct main", @@ -1575,31 +1665,71 @@ "dependency": "direct main", "description": { "name": "saf_stream", - "sha256": "f3ece997ab9202192be0e4b55bfc95a744fb67be9cdf1c72650c60613befd63c", + "sha256": "d90bcbf0fe9e99065e3bab5d5711551b1911ed2001ad8cf94258081ed6f6b7b2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.5" + "version": "0.10.0" }, "screen_retriever": { "dependency": "direct main", "description": { "name": "screen_retriever", - "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.9" + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" }, "share_handler": { "dependency": "direct main", "description": { "name": "share_handler", - "sha256": "2350c7f22579cb753323c533fde05c48e42ec717f76c7090dacd7a9eb0ec68b0", + "sha256": "76575533be04df3fecbebd3c5b5325a8271b5973131f8b8b0ab8490c395a5d37", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.19" + "version": "0.0.22" }, "share_handler_android": { "dependency": "transitive", @@ -1612,14 +1742,14 @@ "version": "0.0.9" }, "share_handler_ios": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "share_handler_ios", - "sha256": "522e5284ef186e83c34acea16fd65469db56a78a4c932c95e71a5be8a0e02d51", + "sha256": "cdc21f88f336a944157a8e9ceb191525cee3b082d6eb6c2082488e4f09dc3ece", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.12" + "version": "0.0.15" }, "share_handler_platform_interface": { "dependency": "transitive", @@ -1745,11 +1875,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "2.0.0" }, "shortid": { "dependency": "transitive", @@ -1771,41 +1901,31 @@ "dependency": "direct main", "description": { "name": "slang", - "sha256": "a2f704508bf9f209b71c881347bd27de45309651e9bd63570e4dd6ed2a77fbd2", + "sha256": "b04db2dbaf927b28600a2f8a272a3bf2ae309556dcc5d6beb02d66af0be39e4c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.31.2" + "version": "4.1.0" }, "slang_build_runner": { "dependency": "direct dev", "description": { "name": "slang_build_runner", - "sha256": "6e60160e8000b91824c47221b20d9642e7408287a5a21837ecefc75270197586", + "sha256": "6338653769ab088ad222e84b1f382fffb867a9a3ead802960aa4d0ab45a62f5f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.31.0" + "version": "4.1.0" }, "slang_flutter": { "dependency": "direct main", "description": { "name": "slang_flutter", - "sha256": "f8400292be49c11697d94af58d7f7d054c91af759f41ffe71e4e5413871ffc62", + "sha256": "59988f37bb8b50d96ee46832a8a389036c0da26c04b1b1d4aa6690c00f70eccf", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.31.0" - }, - "slang_gpt": { - "dependency": "direct dev", - "description": { - "name": "slang_gpt", - "sha256": "98e6f32f518c038c18fdd6b53923966a97f3a358487bfbe1a6dead4e8c1a3a39", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.3" + "version": "4.1.0" }, "source_gen": { "dependency": "transitive", @@ -1971,11 +2091,11 @@ "dependency": "direct main", "description": { "name": "tray_manager", - "sha256": "c9a63fd88bd3546287a7eb8ccc978d707eef82c775397af17dda3a4f4c039e64", + "sha256": "bdc3ac6c36f3d12d871459e4a9822705ce5a1165a17fa837103bc842719bf3f7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.3" + "version": "0.2.4" }, "type_plus": { "dependency": "transitive", @@ -1991,11 +2111,11 @@ "dependency": "transitive", "description": { "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.4.0" }, "uri_content": { "dependency": "direct main", @@ -2011,21 +2131,21 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.0" + "version": "6.3.1" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "8fc3bae0b68c02c47c5c86fa8bfa74471d42687b0eded01b78de87872db745e2", + "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.12" + "version": "6.3.14" }, "url_launcher_ios": { "dependency": "transitive", @@ -2081,41 +2201,41 @@ "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185", + "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" }, "uuid": { "dependency": "direct main", "description": { "name": "uuid", - "sha256": "f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.0" + "version": "4.5.1" }, "vector_graphics_codec": { "dependency": "transitive", "description": { "name": "vector_graphics_codec", - "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", + "sha256": "2430b973a4ca3c4dbc9999b62b8c719a160100dcbae5c819bae0cacce32c9cdb", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.11+1" + "version": "1.1.12" }, "vector_graphics_compiler": { "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", + "sha256": "26d520739b7c6b5d2a2b3274427874a8390831fd4cd5bb8cfbd7d913477d3a2e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.11+1" + "version": "1.1.14" }, "vector_math": { "dependency": "transitive", @@ -2141,11 +2261,11 @@ "dependency": "transitive", "description": { "name": "video_player_android", - "sha256": "ae5287ca367e206eb74d7b3dc1ce0b8912ab9a3fc0597b6a101a0a5239f229d3", + "sha256": "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.9" + "version": "2.7.16" }, "video_player_avfoundation": { "dependency": "transitive", @@ -2171,11 +2291,11 @@ "dependency": "transitive", "description": { "name": "video_player_web", - "sha256": "6dcdd298136523eaf7dfc31abaf0dfba9aa8a8dbc96670e87e9d42b6f2caf774", + "sha256": "881b375a934d8ebf868c7fb1423b2bfaa393a0a265fa3f733079a86536064a10", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.3.3" }, "visibility_detector": { "dependency": "transitive", @@ -2237,15 +2357,25 @@ "source": "hosted", "version": "1.1.0" }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "3.0.1" }, "webkit_inspection_protocol": { "dependency": "transitive", @@ -2261,11 +2391,11 @@ "dependency": "direct main", "description": { "name": "wechat_assets_picker", - "sha256": "e97f0402c5cd5fc75c90f3395874f8c94a60a59e4f206ad5d3f005d48d54e976", + "sha256": "c7d925dfe0f94666a35d4a9791f6dfcb6ff137eb040057adbddd1638f50e65c2", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.3.0" + "version": "9.3.3" }, "wechat_picker_library": { "dependency": "transitive", @@ -2281,11 +2411,11 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec", + "sha256": "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.5.5" + "version": "5.8.0" }, "win32_registry": { "dependency": "direct main", @@ -2301,11 +2431,11 @@ "dependency": "direct main", "description": { "name": "window_manager", - "sha256": "ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792", + "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.2" + "version": "0.4.3" }, "windows_taskbar": { "dependency": "direct main", @@ -2351,11 +2481,11 @@ "dependency": "direct main", "description": { "name": "yaru", - "sha256": "9e07131b9c3b9997d7784c3cb6ad24a218f8e0507d82f8fb07b7e160e111236d", + "sha256": "afc659f78a0bef5e06ebbbd516979afceca7526b7703daa444bf419a54b2dc85", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.2.1" + "version": "5.3.2" }, "yaru_window": { "dependency": "transitive", From e6055e6e748e45338b17184b5cfd9248bcd238f7 Mon Sep 17 00:00:00 2001 From: misilelaboratory Date: Mon, 11 Nov 2024 18:27:15 +0900 Subject: [PATCH 15/24] deno: 2.0.5 -> 2.0.6 --- pkgs/by-name/de/deno/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index bc2cdb54d862..ae16f88a4e85 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -19,16 +19,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; rev = "refs/tags/v${version}"; - hash = "sha256-JTNLxUT1C9Q8XiP3BYn6NhytbvilQ20DzWwLjNXjlCI="; + hash = "sha256-dJ1SHWPgQtr7BdBW63A+/RocHAx1MRnyeRj1Q/Qmcgk="; }; - cargoHash = "sha256-EDphp03j6HpTxgBgsaGHuO+hQX57QXkTz6fHN0+or48="; + cargoHash = "sha256-6sAu8RbC6CcPABUZ2KEmcf2bn0UGiWacHJg4Eso+ozo="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds From 930b1cc3ecc85db1cd2b2bbb9049b1fdb1a7401d Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:28:22 +0100 Subject: [PATCH 16/24] lock-fancy-rapid: add meta.mainProgram --- pkgs/applications/window-managers/i3/lock-fancy-rapid.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix index 654841c7ffce..84b1800b1f9d 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { description = "Faster implementation of i3lock-fancy"; homepage = "https://github.com/yvbbrjdr/i3lock-fancy-rapid"; maintainers = with maintainers; [ nickhu ]; + mainProgram = "i3lock-fancy-rapid"; license = licenses.bsd3; platforms = platforms.linux; }; From 0cad833c26de39d81c58d17c4a682613ceb91cca Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Mon, 11 Nov 2024 11:28:30 +0100 Subject: [PATCH 17/24] lock-fancy-rapid: format --- pkgs/applications/window-managers/i3/lock-fancy-rapid.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix index 84b1800b1f9d..b5ae5c720d7a 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, xorg, i3lock }: +{ + lib, + stdenv, + fetchFromGitHub, + xorg, + i3lock, +}: stdenv.mkDerivation { pname = "i3lock-fancy-rapid"; From e1ada8aab601a6a4e633503f8528518d2cdecf2f Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 11 Nov 2024 20:05:16 +0800 Subject: [PATCH 18/24] dust: fix build on Darwin --- pkgs/by-name/du/dust/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index 53b095574898..6721942945e5 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, AppKit, installShellFiles }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, apple-sdk_11, installShellFiles }: rustPlatform.buildRustPackage rec { # Originally, this package was under the attribute `du-dust`, since `dust` was taken. @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13d3da983e2f..458e67815da1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13881,10 +13881,6 @@ with pkgs; droopy = python3Packages.callPackage ../applications/networking/droopy { }; - dust = callPackage ../by-name/du/dust/package.nix { - inherit (darwin.apple_sdk_11_0.frameworks) AppKit; - }; - dexed = darwin.apple_sdk_11_0.callPackage ../applications/audio/dexed { inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit MetalKit DiscRecording CoreAudioKit; inherit (darwin.apple_sdk_11_0.libs) simd; From bbe98ba0c0f672bfe8d346b040e4682559369549 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Mon, 11 Nov 2024 13:39:04 +0100 Subject: [PATCH 19/24] python312Packages.pipenv-poetry-migrate: 0.5.10 -> 0.5.11 Signed-off-by: Florian Brandes --- .../python-modules/pipenv-poetry-migrate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 02290a60328e..91ddc96483ed 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.5.10"; + version = "0.5.11"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-ROi5Yj4Ht91Go2jkm6BQZyaJWtBKHk4ar1ly8jAPGlc="; + hash = "sha256-du2OJ9gevPr7LOv88aXuq+e3YfD2eNoBp/ppEs522ws="; }; nativeBuildInputs = [ poetry-core ]; From 4b69287c950252bc9f445cbe90d7a8c728e66ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Mon, 11 Nov 2024 18:01:45 +0100 Subject: [PATCH 20/24] maintainers: update email for drawbu --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6ced83f98095..4aa0b1f4d9b3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5841,7 +5841,7 @@ name = "Sebastian Krohn"; }; drawbu = { - email = "clement21.boillot@gmail.com"; + email = "clement2104.boillot@gmail.com"; github = "drawbu"; githubId = 69208565; name = "Clément Boillot"; From 86d9f7ed0d91469ef697b0a9e9f7a40d88bc0bb6 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 11 Nov 2024 19:48:30 +0100 Subject: [PATCH 21/24] doc/tauri: stdenv.is* -> stdenv.hostPlatform.is* Signed-off-by: Sefa Eyeoglu --- doc/hooks/tauri.section.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md index 7658f413b880..2713515015dd 100644 --- a/doc/hooks/tauri.section.md +++ b/doc/hooks/tauri.section.md @@ -52,12 +52,12 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking # Most Tauri apps need networking libsoup webkitgtk_4_0 ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ AppKit From fafa05878de04748cbb817cfbcf418bc957ac5da Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 11 Nov 2024 20:36:01 -0500 Subject: [PATCH 22/24] buildkite-agent: 3.82.1 -> 3.85.1 Diff: https://github.com/buildkite/agent/compare/v3.82.1...v3.85.1 --- pkgs/by-name/bu/buildkite-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix index ccbfc90a3a20..c0d608ec8ed1 100644 --- a/pkgs/by-name/bu/buildkite-agent/package.nix +++ b/pkgs/by-name/bu/buildkite-agent/package.nix @@ -13,16 +13,16 @@ }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.82.1"; + version = "3.85.1"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - hash = "sha256-xTF8zmpwEFHkLwDYBICXJZ4gjJYpcH5i76kPQM6qt5o="; + hash = "sha256-aRgjXzwTC1wCWZ7n0MJpNHcHZgvendFPr4vCrBnCJCk="; }; - vendorHash = "sha256-xKAQ2yvFYl9ld3H6IGafYgCdA8jn9xig/AAej56ACns="; + vendorHash = "sha256-UMnDVxZgqI4430IlA8fSygKEOT86RjCwuzGsvkQ8XIo="; postPatch = '' substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash From 8b1cd0960b7c7396a9087f51d4b364cbe7ac7e96 Mon Sep 17 00:00:00 2001 From: Cryolitia PukNgae Date: Mon, 11 Nov 2024 02:17:55 +0800 Subject: [PATCH 23/24] nixos/graphics: clarify assertion message for enable32Bit configuration The original message is really confusing, when you wrongly enable it on aarch64. --- nixos/modules/hardware/graphics.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/graphics.nix b/nixos/modules/hardware/graphics.nix index 2d6b377ae5fb..10a72b423e83 100644 --- a/nixos/modules/hardware/graphics.nix +++ b/nixos/modules/hardware/graphics.nix @@ -101,7 +101,7 @@ in assertions = [ { assertion = cfg.enable32Bit -> pkgs.stdenv.hostPlatform.isx86_64; - message = "`hardware.graphics.enable32Bit` only makes sense on a 64-bit system."; + message = "`hardware.graphics.enable32Bit` is only supported on an x86_64 system."; } { assertion = cfg.enable32Bit -> (config.boot.kernelPackages.kernel.features.ia32Emulation or false); From 7491971a9c6db5b72f7cc189a16096a639383c22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 05:45:25 +0000 Subject: [PATCH 24/24] python312Packages.ayla-iot-unofficial: 1.4.3 -> 1.4.4 --- .../python-modules/ayla-iot-unofficial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix index df170b4e7992..a2872bfcfa5d 100644 --- a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix +++ b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ayla-iot-unofficial"; - version = "1.4.3"; + version = "1.4.4"; pyproject = true; src = fetchFromGitHub { owner = "rewardone"; repo = "ayla-iot-unofficial"; rev = "refs/tags/v${version}"; - hash = "sha256-y2SjnM48OYyXhBxLHE8R9di4ErORUgS87m/FKs21NLU="; + hash = "sha256-LYHfu02FYoL2D9dEL3CM3llRXMa2M3EMU9CAsl1Cgoo="; }; build-system = [ setuptools ];