Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-10-31 00:16:58 +00:00
committed by GitHub
192 changed files with 3755 additions and 4711 deletions
@@ -202,6 +202,10 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has
_Default value:_ `false`.
`meta` (Attribute Set)
: The `meta` attribute of the resulting derivation, as in `stdenv.mkDerivation`. Accepts `description`, `maintainers` and any other `meta` attributes.
`contents` **DEPRECATED**
: This attribute is deprecated, and users are encouraged to use `copyToRoot` instead.
@@ -635,6 +639,10 @@ This allows the function to produce reproducible images.
_Default value:_ `false`.
`meta` (Attribute Set)
: The `meta` attribute of the resulting derivation, as in `stdenv.mkDerivation`. Accepts `description`, `maintainers` and any other `meta` attributes.
`passthru` (Attribute Set; _optional_)
: Use this to pass any attributes as [`passthru`](#chap-passthru) for the resulting derivation.
+5 -1
View File
@@ -64,13 +64,15 @@ builders = ssh-ng://builder@linux-builder ${ARCH}-linux /etc/nix/builder_ed25519
builders-use-substitutes = true
```
To allow Nix to connect to a remote builder not running on port 22, you will also need to create a new file at `/etc/ssh/ssh_config.d/100-linux-builder.conf`:
To allow Nix to connect to the default remote builder, which does not run on port 22, you will also need to create a new file at `/etc/ssh/ssh_config.d/100-linux-builder.conf`:
```
Host linux-builder
Hostname localhost
HostKeyAlias linux-builder
Port 31022
User builder
IdentityFile /etc/nix/builder_ed25519
```
… and then restart your Nix daemon to apply the change:
@@ -79,6 +81,8 @@ Host linux-builder
$ sudo launchctl kickstart -k system/org.nixos.nix-daemon
```
Note that if the builder is running and you have created the above ssh conf file, you can ssh into the builder with `sudo ssh builder@linux-builder`.
## Example flake usage {#sec-darwin-builder-example-flake}
```nix
+135
View File
@@ -864,4 +864,139 @@ rec {
transformDrv
;
};
/**
Removes a prefix from the attribute names of a cross index.
A cross index (short for "Cross Platform Pair Index") is a 6-field structure
organizing values by cross-compilation platform relationships.
# Inputs
`prefix`
: The prefix to remove from cross index attribute names
`crossIndex`
: A cross index with prefixed names
# Type
```
renameCrossIndexFrom :: String -> AttrSet -> AttrSet
```
# Examples
:::{.example}
## `lib.customisation.renameCrossIndexFrom` usage example
```nix
renameCrossIndexFrom "pkgs" { pkgsBuildBuild = ...; pkgsBuildHost = ...; ... }
=> { buildBuild = ...; buildHost = ...; ... }
```
:::
*/
renameCrossIndexFrom = prefix: x: {
buildBuild = x."${prefix}BuildBuild";
buildHost = x."${prefix}BuildHost";
buildTarget = x."${prefix}BuildTarget";
hostHost = x."${prefix}HostHost";
hostTarget = x."${prefix}HostTarget";
targetTarget = x."${prefix}TargetTarget";
};
/**
Adds a prefix to the attribute names of a cross index.
A cross index (short for "Cross Platform Pair Index") is a 6-field structure
organizing values by cross-compilation platform relationships.
# Inputs
`prefix`
: The prefix to add to cross index attribute names
`crossIndex`
: A cross index to be prefixed
# Type
```
renameCrossIndexTo :: String -> AttrSet -> AttrSet
```
# Examples
:::{.example}
## `lib.customisation.renameCrossIndexTo` usage example
```nix
renameCrossIndexTo "self" { buildBuild = ...; buildHost = ...; ... }
=> { selfBuildBuild = ...; selfBuildHost = ...; ... }
```
:::
*/
renameCrossIndexTo = prefix: x: {
"${prefix}BuildBuild" = x.buildBuild;
"${prefix}BuildHost" = x.buildHost;
"${prefix}BuildTarget" = x.buildTarget;
"${prefix}HostHost" = x.hostHost;
"${prefix}HostTarget" = x.hostTarget;
"${prefix}TargetTarget" = x.targetTarget;
};
/**
Takes a function and applies it pointwise to each field of a cross index.
A cross index (short for "Cross Platform Pair Index") is a 6-field structure
organizing values by cross-compilation platform relationships.
# Inputs
`f`
: Function to apply to each cross index value
`crossIndex`
: A cross index to transform
# Type
```
mapCrossIndex :: (a -> b) -> AttrSet -> AttrSet
```
# Examples
:::{.example}
## `lib.customisation.mapCrossIndex` usage example
```nix
mapCrossIndex (x: x * 10) { buildBuild = 1; buildHost = 2; ... }
=> { buildBuild = 10; buildHost = 20; ... }
```
```nix
# Extract a package from package sets
mapCrossIndex (pkgs: pkgs.hello) crossIndexedPackageSets
```
:::
*/
mapCrossIndex =
f:
{
buildBuild,
buildHost,
buildTarget,
hostHost,
hostTarget,
targetTarget,
}:
{
buildBuild = f buildBuild;
buildHost = f buildHost;
buildTarget = f buildTarget;
hostHost = f hostHost;
hostTarget = f hostTarget;
targetTarget = f targetTarget;
};
}
+3
View File
@@ -397,6 +397,9 @@ let
makeScopeWithSplicing
makeScopeWithSplicing'
extendMkDerivation
renameCrossIndexFrom
renameCrossIndexTo
mapCrossIndex
;
inherit (self.derivations) lazyDerivation optionalDrvAttr warnOnInstantiate;
inherit (self.generators) mkLuaInline;
+78
View File
@@ -4741,4 +4741,82 @@ runTests {
expected = "/non-existent/this/does/not/exist/for/real/please-dont-mess-with-your-local-fs/default.nix";
};
# Tests for cross index utilities
testRenameCrossIndexFrom = {
expr = lib.renameCrossIndexFrom "pkgs" {
pkgsBuildBuild = "dummy-build-build";
pkgsBuildHost = "dummy-build-host";
pkgsBuildTarget = "dummy-build-target";
pkgsHostHost = "dummy-host-host";
pkgsHostTarget = "dummy-host-target";
pkgsTargetTarget = "dummy-target-target";
};
expected = {
buildBuild = "dummy-build-build";
buildHost = "dummy-build-host";
buildTarget = "dummy-build-target";
hostHost = "dummy-host-host";
hostTarget = "dummy-host-target";
targetTarget = "dummy-target-target";
};
};
testRenameCrossIndexTo = {
expr = lib.renameCrossIndexTo "self" {
buildBuild = "dummy-build-build";
buildHost = "dummy-build-host";
buildTarget = "dummy-build-target";
hostHost = "dummy-host-host";
hostTarget = "dummy-host-target";
targetTarget = "dummy-target-target";
};
expected = {
selfBuildBuild = "dummy-build-build";
selfBuildHost = "dummy-build-host";
selfBuildTarget = "dummy-build-target";
selfHostHost = "dummy-host-host";
selfHostTarget = "dummy-host-target";
selfTargetTarget = "dummy-target-target";
};
};
testMapCrossIndex = {
expr = lib.mapCrossIndex (x: x * 10) {
buildBuild = 1;
buildHost = 2;
buildTarget = 3;
hostHost = 4;
hostTarget = 5;
targetTarget = 6;
};
expected = {
buildBuild = 10;
buildHost = 20;
buildTarget = 30;
hostHost = 40;
hostTarget = 50;
targetTarget = 60;
};
};
testMapCrossIndexString = {
expr = lib.mapCrossIndex (x: "prefix-${x}") {
buildBuild = "bb";
buildHost = "bh";
buildTarget = "bt";
hostHost = "hh";
hostTarget = "ht";
targetTarget = "tt";
};
expected = {
buildBuild = "prefix-bb";
buildHost = "prefix-bh";
buildTarget = "prefix-bt";
hostHost = "prefix-hh";
hostTarget = "prefix-ht";
targetTarget = "prefix-tt";
};
};
}
@@ -379,6 +379,8 @@ Alongside many enhancements to NixOS modules and general system improvements, th
- `virtualisation.azure.agent` option provided by `azure-agent.nix` is replaced by `services.waagent`, and will be removed in a future release.
- Netdata removed support for non cloud deployments in version 2, so the `withCloud` option has been removed.
- The ZFS import service now respects `fileSystems.*.options = [ "noauto" ];` and does not add that pool's import service to `zfs-import.target`, meaning it will not be automatically imported at boot.
- Default file names of images generated by several builders in `system.build` have been changed as outlined in the table below.
+4 -4
View File
@@ -7,8 +7,6 @@
let
cfg = config.security.doas;
inherit (pkgs) doas;
mkUsrString = user: toString user;
mkGrpString = group: ":${toString group}";
@@ -67,6 +65,8 @@ in
'';
};
package = lib.mkPackageOption pkgs "doas" { };
wheelNeedsPassword = lib.mkOption {
type = with lib.types; bool;
default = true;
@@ -256,11 +256,11 @@ in
setuid = true;
owner = "root";
group = "root";
source = "${doas}/bin/doas";
source = lib.getExe cfg.package;
};
environment.systemPackages = [
doas
cfg.package
];
security.pam.services.doas = {
+13 -2
View File
@@ -17,7 +17,10 @@ let
upstreamPostgresqlVersion = lib.getVersion pkgs.postgresql_15;
postgresqlPackage =
if config.services.postgresql.enable then config.services.postgresql.package else pkgs.postgresql;
if config.services.postgresql.enable then
config.services.postgresql.finalPackage
else
pkgs.postgresql;
postgresqlVersion = lib.getVersion postgresqlPackage;
@@ -540,7 +543,7 @@ in
assertions = [
{
assertion = (cfg.database.host != null) -> (cfg.database.passwordFile != null);
message = "When services.gitlab.database.host is customized, services.discourse.database.passwordFile must be set!";
message = "When services.discourse.database.host is customized, services.discourse.database.passwordFile must be set!";
}
{
assertion = cfg.hostname != "";
@@ -694,6 +697,9 @@ in
services.postgresql = lib.mkIf databaseActuallyCreateLocally {
enable = true;
extensions = ps: [
ps.pgvector
];
ensureUsers = [ { name = "discourse"; } ];
};
@@ -719,6 +725,7 @@ in
psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'discourse'" | grep -q 1 || psql -tAc 'CREATE DATABASE "discourse" OWNER "discourse"'
psql '${cfg.database.name}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm"
psql '${cfg.database.name}' -tAc "CREATE EXTENSION IF NOT EXISTS hstore"
psql '${cfg.database.name}' -tAc "CREATE EXTENSION IF NOT EXISTS vector"
'';
serviceConfig = {
@@ -805,8 +812,11 @@ in
cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/
cp -r ${cfg.package}/share/discourse/public.dist/* /run/discourse/public/
cp -r ${cfg.package.assets.generated}/* /run/discourse/assets-generated/
ln -sf /var/lib/discourse/uploads /run/discourse/public/uploads
ln -sf /var/lib/discourse/backups /run/discourse/public/backups
# discourse creates images in this folder, and by default it only has u=rx
chmod 750 /run/discourse/public/images
(
umask u=rwx,g=,o=
@@ -839,6 +849,7 @@ in
"assets/javascripts/plugins"
"public"
"sockets"
"assets-generated"
];
RuntimeDirectoryMode = "0750";
StateDirectory = map (p: "discourse/" + p) [
+16 -11
View File
@@ -14,10 +14,15 @@
# where said tests are unsupported.
# Example callTest that just extracts the derivation from the test:
# callTest = t: t.test;
with pkgs.lib;
let
inherit (pkgs.lib)
isAttrs
isFunction
mapAttrs
elem
recurseIntoAttrs
;
# TODO: remove when handleTest is gone (make sure nixosTests and nixos/release.nix#tests are unaffected)
# TODO: when removing, also deprecate `test` attribute in ../lib/testing/run.nix
discoverTests =
@@ -667,7 +672,7 @@ in
guacamole-server = runTest ./guacamole-server.nix;
guix = handleTest ./guix { };
gvisor = runTest ./gvisor.nix;
h2o = import ./web-servers/h2o { inherit recurseIntoAttrs runTest; };
h2o = import ./web-servers/h2o { inherit runTest; };
hadoop = import ./hadoop {
inherit handleTestOn;
package = pkgs.hadoop;
@@ -737,13 +742,13 @@ in
immich-vectorchord-migration = runTest ./web-apps/immich-vectorchord-migration.nix;
immich-vectorchord-reindex = runTest ./web-apps/immich-vectorchord-reindex.nix;
incron = runTest ./incron.nix;
incus = pkgs.recurseIntoAttrs (
incus = recurseIntoAttrs (
handleTest ./incus {
lts = false;
inherit system pkgs;
}
);
incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit system pkgs; });
incus-lts = recurseIntoAttrs (handleTest ./incus { inherit system pkgs; });
influxdb = runTest ./influxdb.nix;
influxdb2 = runTest ./influxdb2.nix;
initrd-luks-empty-passphrase = runTest ./initrd-luks-empty-passphrase.nix;
@@ -754,7 +759,7 @@ in
initrdNetwork = runTest ./initrd-network.nix;
input-remapper = runTest ./input-remapper.nix;
inspircd = runTest ./inspircd.nix;
installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { });
installed-tests = recurseIntoAttrs (handleTest ./installed-tests { });
installer = handleTest ./installer.nix { };
installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix { };
intune = runTest ./intune.nix;
@@ -808,7 +813,7 @@ in
ksm = runTest ./ksm.nix;
kthxbye = runTest ./kthxbye.nix;
kubernetes = handleTestOn [ "x86_64-linux" ] ./kubernetes { };
kubo = import ./kubo { inherit recurseIntoAttrs runTest; };
kubo = import ./kubo { inherit runTest; };
lact = runTest ./lact.nix;
ladybird = runTest ./ladybird.nix;
languagetool = runTest ./languagetool.nix;
@@ -891,7 +896,7 @@ in
man = runTest ./man.nix;
mariadb-galera = handleTest ./mysql/mariadb-galera.nix { };
marytts = runTest ./marytts.nix;
mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; });
mastodon = recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; });
mate = runTest ./mate.nix;
mate-wayland = runTest ./mate-wayland.nix;
matomo = runTest ./matomo.nix;
@@ -953,7 +958,7 @@ in
mopidy = runTest ./mopidy.nix;
morph-browser = runTest ./morph-browser.nix;
mosquitto = runTest ./mosquitto.nix;
movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; };
movim = import ./web-apps/movim { inherit runTest; };
mpd = runTest ./mpd.nix;
mpv = runTest ./mpv.nix;
mtp = runTest ./mtp.nix;
@@ -1410,7 +1415,7 @@ in
suricata = runTest ./suricata.nix;
suwayomi-server = import ./suwayomi-server.nix {
inherit runTest;
lib = pkgs.lib;
inherit (pkgs) lib;
};
svnserve = runTest ./svnserve.nix;
swap-file-btrfs = runTest ./swap-file-btrfs.nix;
+1 -1
View File
@@ -29,7 +29,7 @@ in
nodes.discourse =
{ nodes, ... }:
{
virtualisation.memorySize = 2048;
virtualisation.memorySize = 4096;
virtualisation.cores = 4;
virtualisation.useNixStoreImage = true;
virtualisation.writableStore = false;
+2 -2
View File
@@ -1,5 +1,5 @@
{ recurseIntoAttrs, runTest }:
recurseIntoAttrs {
{ lib, runTest }:
lib.recurseIntoAttrs {
kubo = runTest ./kubo.nix;
kubo-fuse = runTest ./kubo-fuse.nix;
}
+2 -3
View File
@@ -1,6 +1,5 @@
{ recurseIntoAttrs, runTest }:
recurseIntoAttrs {
{ lib, runTest }:
lib.recurseIntoAttrs {
ejabberd-h2o = runTest ./ejabberd-h2o.nix;
prosody-nginx = runTest ./prosody-nginx.nix;
}
+2 -3
View File
@@ -1,6 +1,5 @@
{ recurseIntoAttrs, runTest }:
recurseIntoAttrs {
{ lib, runTest }:
lib.recurseIntoAttrs {
basic = runTest ./basic.nix;
mruby = runTest ./mruby.nix;
tls-recommendations = runTest ./tls-recommendations.nix;
@@ -53,7 +53,6 @@
ncurses,
nixosTests,
pkg-config,
recurseIntoAttrs,
sigtool,
sqlite,
replaceVars,
@@ -496,7 +495,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit withNativeCompilation;
inherit withTreeSitter;
inherit withXwidgets;
pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);
pkgs = lib.recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);
tests = {
inherit (nixosTests) emacs-daemon;
withPackages = callPackage ./build-support/wrapper-test.nix {
@@ -128,7 +128,7 @@ let
}
);
in
pkgs.recurseIntoAttrs rec {
pkgs.lib.recurseIntoAttrs rec {
inherit nmt;
@@ -1,9 +1,10 @@
{
lib,
callPackage,
lowPrio,
}:
let
inherit (lib) lowPrio;
base3 = callPackage ./tesseract3.nix { };
base4 = callPackage ./tesseract4.nix { };
base5 = callPackage ./tesseract5.nix { };
@@ -16,13 +16,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ausweisapp";
version = "2.3.2";
version = "2.4.0";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = finalAttrs.version;
hash = "sha256-xY5V5Z6HVtkFzLzWOVRTKdms356OO0EKnG+Nymurowo=";
hash = "sha256-vMvCnYSj7y6ETGoudV1YJwI2bibXePSkR4nQ4T5HqTo=";
};
nativeBuildInputs = [
@@ -68,7 +68,7 @@ lib:
socat,
sqlite,
stdenv,
su,
shadow,
systemdMinimal,
util-linuxMinimal,
yq-go,
@@ -373,7 +373,7 @@ buildGoModule (finalAttrs: {
conntrack-tools
runc
bash
su
shadow # kubelet wants 'getsubids' when using user namespaces
];
k3sKillallDeps = [
+13 -1
View File
@@ -579,10 +579,16 @@ rec {
{
name,
compressor ? "gz",
meta ? { },
...
}@args:
let
stream = streamLayeredImage (removeAttrs args [ "compressor" ]);
stream = streamLayeredImage (
removeAttrs args [
"compressor"
"meta"
]
);
compress = compressorForImage compressor name;
in
runCommand "${baseNameOf name}.tar${compress.ext}" {
@@ -592,6 +598,7 @@ rec {
inherit stream;
};
nativeBuildInputs = compress.nativeInputs;
inherit meta;
} "${stream} | ${compress.compress} > $out"
);
@@ -641,6 +648,8 @@ rec {
includeNixDB ? false,
# Deprecated.
contents ? null,
# Meta options to set on the resulting derivation.
meta ? { },
}:
let
@@ -735,6 +744,7 @@ rec {
lib.head (
lib.strings.splitString "-" (baseNameOf (builtins.unsafeDiscardStringContext result.outPath))
);
inherit meta;
}
''
${lib.optionalString (tag == null) ''
@@ -1008,6 +1018,7 @@ rec {
includeStorePaths ? true,
includeNixDB ? false,
passthru ? { },
meta ? { },
# Pipeline used to produce docker layers. If not set, popularity contest
# algorithm is used. If set, maxLayers is ignored as the author of the
# pipeline can use one of the available functions (like "limit_layers")
@@ -1233,6 +1244,7 @@ rec {
isExe = true;
};
nativeBuildInputs = [ makeWrapper ];
inherit meta;
}
''
makeWrapper $streamScript $out --add-flags $conf
+8
View File
@@ -77,6 +77,8 @@ let
"${nginxPort}/tcp" = { };
};
};
meta.description = "Basic nginx docker image example";
};
in
@@ -91,6 +93,8 @@ rec {
paths = [ pkgs.bashInteractive ];
pathsToLink = [ "/bin" ];
};
meta.description = "Basic example image";
};
# 2. service example, layered on another image
@@ -138,6 +142,8 @@ rec {
Retries = 3;
};
};
meta.description = "Service example, layered on another image";
};
# 3. another service example
@@ -204,6 +210,8 @@ rec {
"USER=nobody"
];
};
meta.description = "nix example to play with the container nix store";
};
# 7. example of adding something on top of an image pull by our
+2 -2
View File
@@ -1,7 +1,7 @@
# `fetchPypi` function for fetching artifacts from PyPI.
{
lib,
fetchurl,
makeOverridable,
}:
let
@@ -46,7 +46,7 @@ let
compute (removeAttrs attrs [ "format" ]);
in
makeOverridable (
lib.makeOverridable (
{
format ? "setuptools",
sha256 ? "",
@@ -7,16 +7,16 @@
buildNpmPackage rec {
pname = "all-the-package-names";
version = "2.0.2247";
version = "2.0.2250";
src = fetchFromGitHub {
owner = "nice-registry";
repo = "all-the-package-names";
tag = "v${version}";
hash = "sha256-IK94a6XOTOqyUnMPfjV3GzKUpf0WpPwINbhxzbTvAKA=";
hash = "sha256-Txh+ijQwl2x2FBQp5oWtmGdDRvDnmQoQYc1QShsFEo8=";
};
npmDepsHash = "sha256-sdCRKOtwDEixjCZdg1Tl5CXvfAcFOIWK7Iw17h1caOE=";
npmDepsHash = "sha256-V3Zm1vy333WfarVVUbnpeEKkXW3HBwVDO3JltRLVNSk=";
passthru.updateScript = nix-update-script { };
+6 -5
View File
@@ -1,8 +1,10 @@
{
lib,
callPackage,
writeShellApplication,
buildFHSEnv,
webkitgtk_4_1,
ffmpeg,
gtk3,
pango,
atk,
@@ -33,14 +35,12 @@ let
echo "Release: 22.04"
'';
};
pname = "aws-workspaces";
in
buildFHSEnv {
inherit pname;
pname = "aws-workspaces";
inherit (workspacesclient) version;
runScript = "${workspacesclient}/bin/workspacesclient";
runScript = lib.getExe workspacesclient;
includeClosures = true;
@@ -49,6 +49,7 @@ buildFHSEnv {
custom_lsb_release
webkitgtk_4_1
gtk3
ffmpeg
pango
atk
cairo
@@ -64,7 +65,7 @@ buildFHSEnv {
# expected executable doesn't match the name of this package
extraInstallCommands = ''
mv $out/bin/${pname} $out/bin/workspacesclient
mv $out/bin/aws-workspaces $out/bin/${workspacesclient.meta.mainProgram}
ln -s ${workspacesclient}/share $out/
'';
+6 -6
View File
@@ -15,12 +15,12 @@
}:
python3Packages.buildPythonApplication rec {
pname = "borgmatic";
version = "2.0.7";
version = "2.0.9";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-HunKXVuDGTdH+CzIQbtkN0oRMocQ7gVh6Mf6L7wlhAY=";
hash = "sha256-St4ZaZOgJhdMWr75V5OJAt/4JgOkvkCMmpYpn2mbxh0=";
};
passthru.updateScript = nix-update-script { };
@@ -67,10 +67,10 @@ python3Packages.buildPythonApplication rec {
# there is another "sleep", so choose the one with the space after it
# due to https://github.com/borgmatic-collective/borgmatic/commit/2e9f70d49647d47fb4ca05f428c592b0e4319544
substitute sample/systemd/borgmatic.service \
$out/lib/systemd/system/borgmatic.service \
--replace /root/.local/bin/borgmatic $out/bin/borgmatic \
--replace systemd-inhibit ${systemd}/bin/systemd-inhibit \
--replace "sleep " "${coreutils}/bin/sleep "
$out/lib/systemd/system/borgmatic.service \
--replace-fail /root/.local/bin/borgmatic $out/bin/borgmatic \
--replace-fail systemd-inhibit ${systemd}/bin/systemd-inhibit \
--replace-fail "sleep " "${coreutils}/bin/sleep "
'';
passthru.tests = {
+5 -5
View File
@@ -3,24 +3,24 @@
let
pname = "brave";
version = "1.83.120";
version = "1.84.132";
allArchives = {
aarch64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
hash = "sha256-DQX+HKNLakI6G7K53SmcmtmA+h7ZmvkcjUgd/k3C/cc=";
hash = "sha256-/3LF5T/Y7eyjrDZMJ6UtBmjqxSZTsBcJJ6LtDG3Xnvc=";
};
x86_64-linux = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-E1IKc6ftBO88WVXa0RgjAFhtckBNm/hTQgxzMzK17PY=";
hash = "sha256-UPV4krI4jnXNNL6RjvhO/ftxS53eWernG1YVVI2AXbg=";
};
aarch64-darwin = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
hash = "sha256-aMyTGhxnExd1kaoHHTZu7UU42/WSOkB9PAyc8M0B/xU=";
hash = "sha256-FzWiCVwscggFgjKLd4thp1j3A5xMn4AjCSE3PvaBYR0=";
};
x86_64-darwin = {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
hash = "sha256-lTxFrmQzWWegmlyBc71fL81iTPqVLB3r8q2gqvrlM3o=";
hash = "sha256-CBjBfqy9n5/WH2NBc1GUz13n8KyqhryTx849gMUq+j8=";
};
};
+3 -3
View File
@@ -8,15 +8,15 @@
rustPlatform.buildRustPackage rec {
pname = "capnproto-rust";
version = "0.21.4";
version = "0.23.2";
src = fetchCrate {
crateName = "capnpc";
inherit version;
hash = "sha256-pJF0S6mRxPjpwa367eOUgc7GBeKgUwux1GgUIJE8JuI=";
hash = "sha256-dmLR1jMH90axlylkA3m48FK367c67o4CgIc+M6gKz0o=";
};
cargoHash = "sha256-nPDfBpY7WtNr1St6HAymWBLho5n0UXibqDjVA1vXeNg=";
cargoHash = "sha256-g3/SpeqVtNCu35jj7apAg64/R5R/m1Z2jbKMARph7jo=";
postInstall = ''
mkdir -p $out/include/capnp
+2 -2
View File
@@ -37,14 +37,14 @@ with py.pkgs;
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.488";
version = "3.2.489";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
tag = version;
hash = "sha256-j1NcGruoYrZfaeKZZ6iNPg8k2v5L7srrSgaHXmX8eec=";
hash = "sha256-uh6yp3hPRv9+EtJbsN6cnOQeDNzlJNJOHeJeGmKP8rQ=";
};
pythonRelaxDeps = [
@@ -10,11 +10,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "copilot-language-server";
version = "1.388.0";
version = "1.389.0";
src = fetchzip {
url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
hash = "sha256-qFFLDy1/4w5Qlp3wcWlISoBMYVNHCsVLW27JBuoCcMk=";
hash = "sha256-QX3gSKV/FABXbeu1KzrSEyxFJU/xptSVvuxqTjTI9Go=";
stripRoot = false;
};
+2 -2
View File
@@ -13,13 +13,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "darkly-qt${qtMajorVersion}";
version = "0.5.23";
version = "0.5.24";
src = fetchFromGitHub {
owner = "Bali10050";
repo = "Darkly";
tag = "v${finalAttrs.version}";
hash = "sha256-BENROvRjnKLjCc1qwGgScfk6WIdHGwz4vZhsmfa///Q=";
hash = "sha256-iyvYHJn9K+cnW2+icxGA3qm69W8RpCz1v8+rb2U/KzQ=";
};
nativeBuildInputs = [
+3 -4
View File
@@ -5,13 +5,12 @@
curl,
runCommandLocal,
unzip,
appimage-run,
appimageTools,
addDriverRunpath,
dbus,
libGLU,
xorg,
buildFHSEnv,
buildFHSEnvChroot,
bash,
writeText,
ocl-icd,
@@ -38,7 +37,7 @@ let
version = "20.2.2";
nativeBuildInputs = [
(appimage-run.override { buildFHSEnv = buildFHSEnvChroot; })
appimageTools.appimage-exec
addDriverRunpath
copyDesktopItems
unzip
@@ -148,7 +147,7 @@ let
mkdir -p $out
test -e ${lib.escapeShellArg appimageName}
appimage-run ${lib.escapeShellArg appimageName} -i -y -n -C $out
appimage-exec.sh -x $out ${lib.escapeShellArg appimageName}
mkdir -p $out/{"Apple Immersive/Calibration",configs,DolbyVision,easyDCP,Extras,Fairlight,GPUCache,logs,Media,"Resolve Disk Database",.crashreport,.license,.LUT}
runHook postInstall
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "dblab";
version = "0.34.1";
version = "0.34.2";
src = fetchFromGitHub {
owner = "danvergara";
repo = "dblab";
rev = "v${version}";
hash = "sha256-9gQjO9u/wONqmJjt5ejztWlFkqsJ8HUyPp3j5OyZEz4=";
hash = "sha256-e3p2+QBoxyJu15fTb/7gH32zE4h8V2iDxbxoNMVqElM=";
};
vendorHash = "sha256-NhBT0dBS3jKgWHxCMVV6NUMcvqCbKS+tlm3y1YI/sAE=";
+4 -7
View File
@@ -29,17 +29,17 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "deno";
version = "2.5.3";
version = "2.5.6";
src = fetchFromGitHub {
owner = "denoland";
repo = "deno";
tag = "v${finalAttrs.version}";
fetchSubmodules = true; # required for tests
hash = "sha256-UqD9Va33XVX73bjwUdb6woZ3kP/Xz6iBVqV1ceRbXq0=";
hash = "sha256-Ppw2fyfFvSmGO+FcEvclkOU7LATOqkYH3wErBdKgWJY=";
};
cargoHash = "sha256-OrKg3bOA5AyLQA+LIsHwWpk9DHodhcCVzdKW/S9+mNY=";
cargoHash = "sha256-EN87p8wX5QAzf3cWfX8I/+XzYRc9rA5EWj996iUpSPg=";
patches = [
# Patch out the remote upgrade (deno update) check.
@@ -53,10 +53,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
./patches/0002-tests-replace-hardcoded-paths.patch
./patches/0003-tests-linux-no-chown.patch
./patches/0004-tests-darwin-fixes.patch
# some new TS tests don't identify `deno` location from parent actively
# running `deno` instance
# https://github.com/denoland/deno/pull/30914
./patches/0005-tests-fix-deno-path.patch
];
postPatch = ''
# Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857
@@ -182,6 +178,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
"--skip=watcher"
"--skip=node_unit_tests::_fs_watch_test"
"--skip=js_unit_tests::fs_events_test"
"--skip=js_unit_tests::utime_test"
]
++ lib.optionals stdenv.hostPlatform.isLinux [
# Wants to access /etc/resolv.conf: https://github.com/hickory-dns/hickory-dns/issues/2959
@@ -1,34 +0,0 @@
From 798fc5e7e87c1b985a383b7b92a7e55c82e41efa Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Fri, 3 Oct 2025 14:20:53 +0100
Subject: [PATCH] test: leverage `Deno.execPath()` matching other tests
Currently most TS tests use `Deno.execPath()` to identify where `deno` lives
In the event deno is not on the `$PATH` these tests will fail.
If deno is on the `$PATH` you can end up testing the wrong instance of `deno`.
---
tests/unit/process_test.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/unit/process_test.ts b/tests/unit/process_test.ts
index 7b82fe5ba782f5..1c26a6f990d1b0 100644
--- a/tests/unit/process_test.ts
+++ b/tests/unit/process_test.ts
@@ -623,7 +623,7 @@ Deno.test(
// @ts-ignore `Deno.run()` was soft-removed in Deno 2.
const p = Deno.run({
- cmd: ["deno", "run", "--watch", tempFile],
+ cmd: [Deno.execPath(), "run", "--watch", tempFile],
stdout: "piped",
stderr: "null",
});
@@ -661,7 +661,7 @@ Deno.serve({ signal: ac.signal }, () => new Response("Hello World"));
// @ts-ignore `Deno.run()` was soft-removed in Deno 2.
const p = Deno.run({
- cmd: ["deno", "run", "--watch", tempFile],
+ cmd: [Deno.execPath(), "run", "--watch", tempFile],
stdout: "piped",
stderr: "null",
});
+104 -75
View File
@@ -54,24 +54,24 @@
"jakarta/platform#jakartaee-api-parent/9.1.0": {
"pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
},
"net/jsign#jsign-core/7.2": {
"jar": "sha256-xzyar4S3WGndJhSk2eaIgajlImHtsKh6Uzgs8osLf00=",
"pom": "sha256-4DteLTjsvktBBuGdgKwCzPDQLIO6v4R9p4Jaa8HdK1Q="
"net/jsign#jsign-core/7.3": {
"jar": "sha256-bA9oYq6wsr2CyLAQI1/9kyg5InyW23aKyPsXhHkC9XA=",
"pom": "sha256-iBAcWvZMjJl+0DIQwLyFGLjInvcF0bKM5E49qse5F34="
},
"net/jsign#jsign-crypto/7.2": {
"jar": "sha256-UJQnz8cturPc5ceYvV55rP+rID7v4E/D88/DAo3qNJc=",
"pom": "sha256-tDqAde1LDp0G++vg2fT9SbKaKtDCpLe0wHPEOTFC4dw="
"net/jsign#jsign-crypto/7.3": {
"jar": "sha256-slHwB5e/C8I1QbLxK8q3/relDaudPFAFHIPtIk2ZiRo=",
"pom": "sha256-ewX0NDiexnCXAihAy7CBudcRK9n4xlUYdS20NSEAN6s="
},
"net/jsign#jsign-gradle-plugin/7.2": {
"jar": "sha256-+uyJfxc85kMoLWYEMxgLpN8W+SOl0y+xbuxL1JQtcpU=",
"module": "sha256-pdEQ33z7JGZdGHHECeUFeDhtsEPZpEZgWTuWvhjZ048=",
"pom": "sha256-j6lgWfT7m/xQJh0JJodpYUi8/9MnxA4dcnmfhebPtUs="
"net/jsign#jsign-gradle-plugin/7.3": {
"jar": "sha256-hIO6LPpch+KPHBOAvReuXeGTU4Ogz4gdZ3Lb9v+P0R4=",
"module": "sha256-HZbhMlaO0Uhz0JHItnQ+4kL3q+79Ky0BCEJ/zXOAeY8=",
"pom": "sha256-QnV3M85vh7bSorpuyXrb0NZrJzua/Dw7KN4+txkF9Ac="
},
"net/jsign#jsign-parent/7.2": {
"pom": "sha256-BuIjfFMHFgcwGQh/4BcgrpDT/hRukfR3u1lqBH99vbc="
"net/jsign#jsign-parent/7.3": {
"pom": "sha256-nI9hwRHaJ0oG5ImYa76vDGTOpYY+6vYNvVO+ugov0yg="
},
"net/jsign#net.jsign.gradle.plugin/7.2": {
"pom": "sha256-/fXnGXhngCBVFSar0Ns+U2jjaAwvpd8lzvoaw4i/06I="
"net/jsign#net.jsign.gradle.plugin/7.3": {
"pom": "sha256-1iba9d1D6mjxyJIpjy4Qpegv5jV/DLiQ2P3pb/p9a2c="
},
"net/rdrei/android/buildtimetracker#net.rdrei.android.buildtimetracker.gradle.plugin/0.11.0": {
"pom": "sha256-SbQtvX9N5DU8ntUmpcpTtrTdDhla7rQR7L213fZ6kG8="
@@ -214,16 +214,16 @@
"jar": "sha256-9pwt46aVwRPRJayAU8kqaAo86dAuolhFCVzy1GJqdmM=",
"pom": "sha256-WCLfSRg9+SK6Wa53Oi2Mzrhq4eIPQfGYcxMd0YJJT3o="
},
"ch/qos/logback#logback-classic/1.5.18": {
"jar": "sha256-PhUz0DIfiBXu9GdQruARG0FVT5pGRMPE0tQEdEsJ9g8=",
"pom": "sha256-1VfNKrI95KR+zocGQhYqn5Rzn80LHDE+J4MlFO4gODM="
"ch/qos/logback#logback-classic/1.5.20": {
"jar": "sha256-EijbmeGvYC4ZGisUIlLYqvaBKeZDwZ5/khN85fcgmtM=",
"pom": "sha256-s+hotrfIsqgGswDIrsddcCeI/l5lM9P2ljYHmu1bU3c="
},
"ch/qos/logback#logback-core/1.5.18": {
"jar": "sha256-hROee1e0ZPjl42Mm3YExdki+0ZnMxPmM1CWF+NdXECc=",
"pom": "sha256-x3JHKX1dm7ngTpLUyC51xujqviRUNokvkRQzW4t5DIM="
"ch/qos/logback#logback-core/1.5.20": {
"jar": "sha256-Kf4JW7e3+FCQeuw/3etAyNOZ2F5WgOjTUz49pdmq6Rc=",
"pom": "sha256-XFJJldocTKrot6y/aQFin468ltUkfZGw2afuCKsQ7Eo="
},
"ch/qos/logback#logback-parent/1.5.18": {
"pom": "sha256-U8PiGxI7vTijAbQNDYFAlOrUehAj0h1hPMdI1w57nGk="
"ch/qos/logback#logback-parent/1.5.20": {
"pom": "sha256-Fwus2jsPfYA9jteOcPEg7Ncmu5qKk8F6MmfzP8HryiA="
},
"com/fasterxml#oss-parent/30": {
"pom": "sha256-0OJUZlIJgf9X7K29yUA00dFpA7kulQvp+dQkQcWU+fA="
@@ -478,9 +478,9 @@
"io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.0.0": {
"pom": "sha256-xWt36BjHjUZoXWbQ/2UJ85G5KE3+hrueEnARHrwBJYI="
},
"io/github/classgraph#classgraph/4.8.181": {
"jar": "sha256-YqZDbWlxDvX6tuwkN4HOTFspkEftGEG1+SdGroUs5UU=",
"pom": "sha256-kj4br0msZAeQ30WHuMz0AfYG8L/HBZZh9xhVG2Jw8Ug="
"io/github/classgraph#classgraph/4.8.184": {
"jar": "sha256-blZOKc7JWjkiaKYJ8JBx1WGZOD2QascOkXU6eZjRo+g=",
"pom": "sha256-N7I1NJqAx1rokS+gCO3unouINL52mortCLp0xbCvgeA="
},
"io/github/pustike#commons-csv/1.7.0": {
"jar": "sha256-PB0BZmOIW/KPqgi3rE//Ewin5PFd6BZvd2D5jC5m3LI=",
@@ -505,10 +505,10 @@
"module": "sha256-2jn02k/u133+ELmAnVyysvO0Ra6nG2nhUjKkJpiThzs=",
"pom": "sha256-chJrr7gKEse1WFJNCRkj5pYSODxHQay34Aw1ybBUazQ="
},
"io/sentry#sentry/8.22.0": {
"jar": "sha256-7QJzzosBRsvyeZkmkyqLWXiAlUkABQcC646p8eM6GOE=",
"module": "sha256-5ZOJtyrsJgmO9B7sNS7xLKh945o/o3sWdyKisjW5Zr8=",
"pom": "sha256-9wniVOh/5PhDESS1X9IEwhgiBqrl5PVCFINpVIr9HBE="
"io/sentry#sentry/8.23.0": {
"jar": "sha256-qbL8cx7DCXkJ/pOOb6f9F3spGNIwsbPXt1j115CNUFk=",
"module": "sha256-WLKcCwmvgkJJ3XEihti2Q4hrLql1wX4NPfcMcoFt2EI=",
"pom": "sha256-wWqaLKt1YvEdl9DEdmBJAWFmzPEvanTKmzp93YvPEY4="
},
"jakarta/json/bind#jakarta.json.bind-api/2.0.0": {
"jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=",
@@ -551,6 +551,10 @@
"jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
"pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
},
"me/xdrop#fuzzywuzzy/1.4.0": {
"jar": "sha256-I6LdH1S5EGdZRPTI1IRdfq8beA3Q6ol2NzP9C0OoJYo=",
"pom": "sha256-vbc6Si9VvNZAv42a4SlslYY2TK4Vxvw/MDsCdLCiJ3I="
},
"net/bytebuddy#byte-buddy-agent/1.17.7": {
"jar": "sha256-qbqIfcolKtYbfVFTKU805vO99LJzawQ3PRNhWmlfwP8=",
"pom": "sha256-gU7kLWsBF/S40etrHWLBbbTAtZfYOzrY2qV4HrFF19w="
@@ -571,13 +575,13 @@
"net/java#jvnet-parent/5": {
"pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
},
"net/java/dev/jna#jna-platform/5.18.0": {
"jar": "sha256-eH7Jywp2Eh/1TTVI8GKNsJAB8TVSHj7b+/rJV953qzw=",
"pom": "sha256-4zkW2g+tjn0EZgihqx3/6RzJ4trVsUqY4LpkD//iP58="
"net/java/dev/jna#jna-platform/5.18.1": {
"jar": "sha256-rRTBsexPQ9OWIxIZ36Y16/go9zjqyfiQ6hvAd5WJLZo=",
"pom": "sha256-OdU4qVmaRHR3CDiGXtQs+j5rPRMIbLHld7i7QxSNGmU="
},
"net/java/dev/jna#jna/5.18.0": {
"jar": "sha256-/ifB5eNKasqEy0TaXxUnHNaQabHPcBq1unMgxXxVxDk=",
"pom": "sha256-SIq1HOC+VwAYcI0M0VtfpPp9Kx022BzvdTfVG9TXsDs="
"net/java/dev/jna#jna/5.18.1": {
"jar": "sha256-JgxLHiKx254RDuRBxPE84RX4QfpIxB14dQmGIUs5VVc=",
"pom": "sha256-mLYq5v8oDXR/s1n8QuSP7RE9Rbw3Kagj3DC4MIqAZkU="
},
"net/rdrei/android/buildtimetracker#gradle-plugin/0.11.1": {
"jar": "sha256-VTLp3rXka/R3KpkXFRrW4TqRLj8jZH8ffuoi/DsLTsg=",
@@ -840,55 +844,75 @@
"module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
"pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
},
"org/junit/jupiter#junit-jupiter-api/5.13.4": {
"jar": "sha256-0buBq/2eA0GDBrTmozkMjbUsWDcudJwpgKwp8MCCePE=",
"module": "sha256-/kZNN/XIEKgF/zGRmBZcrDPCVY4iYQIdjzEqglpIZx8=",
"pom": "sha256-xWBTV9MRgTZCxABEHgR7ynF8rcFXs/5+GJhbxv8jLls="
"org/junit#junit-bom/5.14.0": {
"module": "sha256-etPdstdOanfWWuiaykXUaMl7+ZFba8UvRJ1nXk5vmzU=",
"pom": "sha256-9apHs2ZIPo0fm+8Q5noMZvZq/A8zHJ+WaxMQutYND28="
},
"org/junit/jupiter#junit-jupiter-engine/5.13.4": {
"jar": "sha256-AnQEqS/mGLckZXkqJXlRSVxQOn1XUeJ5Hg9RyH9n9bw=",
"module": "sha256-zu7m0ANKc4E1vZ84IM/gicZWkWPGI7qOPptE9yCP0ho=",
"pom": "sha256-E4Nt6C2Xf/JSCPXgypvfEzFV3C7+0Wr2Dfrojp3KzUc="
"org/junit#junit-bom/6.0.0": {
"module": "sha256-R98chw1F2mEXtKYNzAYhRmrD332s6I2aL5TXhAYkbkU=",
"pom": "sha256-s9mDL1wRu7aw5ihRuTqinSeMOfsadR63cbRtAEohYhk="
},
"org/junit/jupiter#junit-jupiter-params/5.13.4": {
"jar": "sha256-OoxjZXFtu2mMDUmgVFbB4a0FxAZhPFUPndUAN4cu/EE=",
"module": "sha256-/DZvvmB5ma/IzwK53KldHgKgawzocqRWBanZaMJG9LQ=",
"pom": "sha256-wPNik+IEJzLWJu4HWMrlLDeMKklXnUW9CBUojyDdTGw="
"org/junit/jupiter#junit-jupiter-api/6.0.0": {
"jar": "sha256-iNaQ0tNzzWYXB3DDF5dxls6eRl8jiJMPS8lmXohzhfY=",
"module": "sha256-ulAS9rG1AydsxsokGUPC2bJuJFkCXowg3VjsMeumcXU=",
"pom": "sha256-rNeSzwaDpEvqadPP/uujfRm5kAwdnogijjKfJsRBNQM="
},
"org/junit/jupiter#junit-jupiter/5.13.4": {
"jar": "sha256-uWD3khfdAchjAxtnjwffRzC78erGUMdK1rDGH6rXg3k=",
"module": "sha256-RpRiJ8KWfRZZ6VX1PTTshzGBHUr0AcKsfWRveTx44fk=",
"pom": "sha256-q3sscJnzXPorMVmhpaQLlO414hKyWo172XwSJ7+u5Y4="
"org/junit/jupiter#junit-jupiter-engine/6.0.0": {
"jar": "sha256-j6HWw32ymm70cYO0mFHudnbwj9exwntozPOk5XzgL0g=",
"module": "sha256-/BOeA32ssQfRpQ6FVVg2h0+pwgKIwx17a86To9PoUEw=",
"pom": "sha256-qzyiIIkCJq8xuRVzeT+n8APHqBdSuskFZx3Krum5fXM="
},
"org/junit/platform#junit-platform-commons/1.13.4": {
"jar": "sha256-HCXKZB66rkT/OtIcobLvaNDdhL/rB8SAW6eECJm3dAg=",
"module": "sha256-Gnot58eYmV+5eyRNbvnpnDpXmbV6D7rNaElrp+6BWdc=",
"pom": "sha256-RKWQ1nrsTSdskMUVj+EEePITPwoj7DLPqzqlXUK4aIM="
"org/junit/jupiter#junit-jupiter-params/6.0.0": {
"jar": "sha256-IIR+RcVT1R45JEbgM1UGnxOP4MUekdfvG9v/wNOvBFQ=",
"module": "sha256-VfWJwqiUZt40HEAL8AzdGihwp+bc1oUL2tcyLbONc7c=",
"pom": "sha256-91zeM8lEa0XsSlqaKC3LWyv7dj1KMKshv8+EgqZg5UI="
},
"org/junit/platform#junit-platform-engine/1.13.4": {
"jar": "sha256-OQxfd7hCg6ZLZE+IJRs5fgsN67gL3MUPiZiBrs/0Olo=",
"module": "sha256-NeT9aOvzFOYmYBSJNkNrOa4QXTVb6qwapU65HCBmync=",
"pom": "sha256-lYOVQk9rRhK9edgWXte9+vWmWU9GmbjviTmVyljDwKU="
"org/junit/jupiter#junit-jupiter/6.0.0": {
"jar": "sha256-jb8LIX4usBPWU9kW/BBgkklrfMrI8IQyiYHlXjZzrnE=",
"module": "sha256-YdlnTuitkcdk2IbQzTFjO1up967ad6okIPglNaJVXOE=",
"pom": "sha256-9j4gTo0IDEzis05lnzGVzHHYpKZrcyqAW5pv0rjyVrs="
},
"org/junit/platform#junit-platform-launcher/1.13.4": {
"jar": "sha256-Cwvq62iAoxFJZB0thIuGNxKIVGlnDBIJlYbX95hSJWQ=",
"module": "sha256-EV93RVdA4MPFOYvN2EHIqmmcLYACsRAPKuemQ9lAWSg=",
"pom": "sha256-OuOHauC4fbi96hJ5ryuXjaKfE4selfYFoD2aUtE529I="
"org/junit/platform#junit-platform-commons/1.14.0": {
"module": "sha256-Kwq1YmEUumwASZEJ6MOJoXy6XhP7+BEExBjoY3UNSLw=",
"pom": "sha256-Ed3u4UN656ybNGhLDophehZaIKobIjyk0YM3ZMxwZJI="
},
"org/junit/platform#junit-platform-runner/1.13.4": {
"jar": "sha256-ISaDWloIABNZhDxmhl2lgqo1pWsM+O3yzI0epCnL6ao=",
"module": "sha256-pozyPYUVEngVDtPLL+9m4mk1Oza26ZlfVnqwp7nIjyg=",
"pom": "sha256-C7mXJe+9m3MoLKcKCzpk2zbp4bHC/tOjPpLlIHXX3Lo="
"org/junit/platform#junit-platform-commons/6.0.0": {
"jar": "sha256-huj6+H8xUaPVRYUIUqDyzFXqiiQ07ungj4OIHFLVWZI=",
"module": "sha256-oNE82wfx2950q74HZmT/XcQEOtXRO/+UD3i55gTyElE=",
"pom": "sha256-lDFdk3FOzUB6kg2TOcj0S0DPCEBBMWMu1/m3dwzxCgU="
},
"org/junit/platform#junit-platform-suite-api/1.13.4": {
"jar": "sha256-mgW/d+EoNx9bPiX/yJ969Gep9o3TZf387UaevPUzq8k=",
"module": "sha256-OfuRkgMHvFx6FjAHOpV2CiYURYJgiA0pO5F2wc0ImIQ=",
"pom": "sha256-hxhnBdIt+Wrdoe/aMqShB1f49lgAbxd350zvJ6XkLKg="
"org/junit/platform#junit-platform-engine/6.0.0": {
"jar": "sha256-b4GELpwT6ZfKxmtEYUUi82OUGeI4iuLQAMS8CmuS2T8=",
"module": "sha256-GcijGiINhY0hWr20mfYjuLxy/ig3jMBABI0ymTCliSE=",
"pom": "sha256-TD7A1PapQGLOgr3kLuvtHya5m7XLHWl24VmPzF+KSS0="
},
"org/junit/platform#junit-platform-suite-commons/1.13.4": {
"jar": "sha256-59rPz6O8aSwKekE879X1GuQgQVoU05CRvfiK6/26cLY=",
"module": "sha256-WQtO531F+0Lf0GGccCGndnkgbQSJ9Cbn8Auazlmqvh0=",
"pom": "sha256-VOR+M8iA1vupejBP02oXJVdQLDRR2nQM2beBTp6Nh5k="
"org/junit/platform#junit-platform-launcher/1.14.0": {
"module": "sha256-pJlI15aokT/22Jl1ITnUl2YxQ7AS3fgEqxzlMuC/1zw=",
"pom": "sha256-q41bLHzlSaDJEsG9E7yNV0dYOcLneiLlb4DxniPcdQI="
},
"org/junit/platform#junit-platform-launcher/6.0.0": {
"jar": "sha256-Xwl7AMZxS7cez7XexitZu0wveJdj+v0ezpbE7w5sKA8=",
"module": "sha256-/OwWMsXFlyf/nn6jCKmTh9ci/6iC2FzKUFKv7Iw47ug=",
"pom": "sha256-RwG8mhY9lbI1zhatdt4Z8qyFTFyjT689LsThAYsIzHQ="
},
"org/junit/platform#junit-platform-runner/1.14.0": {
"jar": "sha256-PtsxSpMnsqcyMAAOmFCmf0CnVcj03CKLiKTGsFO0gRM=",
"module": "sha256-QBQISBtUFXXU/7SRBPdRbfexxp8Nj+pcAQwdJ92v9lU=",
"pom": "sha256-Nl+KzheLaRQi9D6bMXgpQ+6jo6sHVnDVnhP/6I0dvEk="
},
"org/junit/platform#junit-platform-suite-api/1.14.0": {
"module": "sha256-tx89J31twkIWiSbi7Bh/Krxruz+hW5aoR3ep3gxL068=",
"pom": "sha256-BDhG11banrl+29u1t5momv0fhNUBleBbVfKQMZlCmaY="
},
"org/junit/platform#junit-platform-suite-api/6.0.0": {
"jar": "sha256-JDr0KmCoOf21WE7wCKNClWOSq3UXOI/v4jx8Iqm7PsY=",
"module": "sha256-GglozfimQNCDuT9Tb78XOzVS2vcnp6RXSqrXXjLixJc=",
"pom": "sha256-r+n5I0po+iwNbxJLD8gAm0nAuWpl9nh4t+StAk505s8="
},
"org/junit/platform#junit-platform-suite-commons/1.14.0": {
"jar": "sha256-uGgjf4yy4ZN3Xj9xK5QFyz1P+qGAV5zIOn/h9tucXME=",
"module": "sha256-2b8/TF1wJ0gCDDgzNw47kevnlo80Eq9txTKGlrSfptE=",
"pom": "sha256-9Uvj4x1RgvEvW/xo8yuE5hfQtmuazPI9kukalCJojlA="
},
"org/leadpony/justify#justify-parent/3.1.0": {
"pom": "sha256-ckfhOlVhg4gPqnP7EeWQJ7R+fG1Ghx0sUIg3WwDbJY0="
@@ -1104,6 +1128,11 @@
"release": "1.5"
}
},
"jixxed/ed/confidential#ed-confidential-api/1.3": {
"jar": "sha256-iPBjgHIFGjuquG+zga0ZdTxMMIEqAquzGt41IDriGKw=",
"module": "sha256-THaam0o2oBL75yHgsXW7+pPz3lbjf9ktcRL+N+WFs98=",
"pom": "sha256-0pk2PyeZ6u7PJSqzsCwdwv90wpXnOAoRHaHYpIBGLDc="
},
"jixxed/lept4j#lept4j/1.16.6": {
"jar": "sha256-39j+jS92/MW/A8WLaUZYKTkNPB+0IgNWkjcau9MMlx0=",
"module": "sha256-fPk3r5TQdJrz0O5SgutXUWnI44UqKJxPBiiQC+wcSgA=",
@@ -21,13 +21,13 @@ let
in
stdenv.mkDerivation rec {
pname = "ed-odyssey-materials-helper";
version = "3.0.7";
version = "3.1.2";
src = fetchFromGitHub {
owner = "jixxed";
repo = "ed-odyssey-materials-helper";
tag = version;
hash = "sha256-TcRj+TZ4shY1UAE7TseRXZZJZtL8aaD79pBL9LeoMJA=";
hash = "sha256-2xUMl8AqZD/v+js/QyWBD4RfV8nfCAqVr0UgWaOtBrk=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -7,12 +7,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "eliza";
version = "0-unstable-2025-10-06";
version = "0-unstable-2025-10-28";
src = fetchFromGitHub {
owner = "anthay";
repo = "ELIZA";
rev = "448707201101635eb4a56911d2d45f5b36e4a3cd";
hash = "sha256-tCNuF+WbukSL9Sp8mCdjJUMRV4hlbCDsrMdpe8Xi84U=";
rev = "e4c47439232c162ca0d515c5f8e1a714a80fefc0";
hash = "sha256-xHJLn/nxs8nWwXJE8p8fVhHzeIo1H3gxW5g4/jGCSx8=";
};
doCheck = true;
+3 -8
View File
@@ -1,12 +1,7 @@
{
"ente_crypto_dart": "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=",
"flutter_inappwebview": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
"flutter_inappwebview_android": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
"flutter_inappwebview_ios": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
"flutter_inappwebview_macos": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
"flutter_inappwebview_platform_interface": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
"flutter_inappwebview_web": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
"flutter_inappwebview_windows": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
"fk_user_agent": "sha256-GmuQPohnTi4SVta1FyEErOb7n0Jp6UdLcX/Cf+koJNA=",
"flutter_local_authentication": "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=",
"sqflite": "sha256-+XTVtkFJ94VifwnutvUuAqqiyWwrcEiZ3Uz0H4D9zWA="
"move_to_background": "sha256-cLH3vUrPmEtYKlfn2hi6Wl4JQG4dt9aEyTmVCj7zBe0=",
"qr_code_scanner": "sha256-g8CUwQVOgEhJO5BZAdsM5bBS485nu7POO8eu8mknga8="
}
+7 -7
View File
@@ -1,14 +1,14 @@
{
lib,
flutter324,
flutter332,
fetchFromGitHub,
webkitgtk_4_1,
sqlite,
libayatana-appindicator,
makeDesktopItem,
copyDesktopItems,
makeWrapper,
jdk17_headless,
yq-go,
}:
let
# fetch simple-icons directly to avoid cloning with submodules,
@@ -16,16 +16,16 @@ let
simple-icons = fetchFromGitHub (lib.importJSON ./simple-icons.json);
desktopId = "io.ente.auth";
in
flutter324.buildFlutterApplication rec {
flutter332.buildFlutterApplication rec {
pname = "ente-auth";
version = "4.4.4";
version = "4.4.8-beta";
src = fetchFromGitHub {
owner = "ente-io";
repo = "ente";
sparseCheckout = [ "mobile/apps/auth" ];
sparseCheckout = [ "mobile" ];
tag = "auth-v${version}";
hash = "sha256-VpxF6BMofCgMWcxsscbYC3uYse0QZyTBf84zN03leC4=";
hash = "sha256-3it1tf/Gj8RBF+Htei4LHrXTJACHR4O2kmPPg3SqNfo=";
};
sourceRoot = "${src.name}/mobile/apps/auth";
@@ -41,6 +41,7 @@ flutter324.buildFlutterApplication rec {
postPatch = ''
rmdir assets/simple-icons
ln -s ${simple-icons} assets/simple-icons
${lib.getExe yq-go} -i 'del(.dependencies.sqlite3_flutter_libs)' pubspec.yaml
'';
nativeBuildInputs = [
@@ -49,7 +50,6 @@ flutter324.buildFlutterApplication rec {
];
buildInputs = [
webkitgtk_4_1
sqlite
libayatana-appindicator
# The networking client used by ente-auth (native_dio_adapter)
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gojq nix-prefetch-github common-updater-scripts
#!nix-shell -i bash -p curl gojq nix-prefetch-github nix-prefetch-git common-updater-scripts
set -eou pipefail
pkg_dir="$(dirname "$0")"
+2 -2
View File
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "exploitdb";
version = "2025-09-18";
version = "2025-10-30";
src = fetchFromGitLab {
owner = "exploit-database";
repo = "exploitdb";
tag = finalAttrs.version;
hash = "sha256-+5zXe+64tZD7zjZKXrAuv5ggBRb1ecKzKZSY2Knzklg=";
hash = "sha256-3e1NRjuLNgxKTEPTAhNp1rJNJ7ZQGnPZOXCCpuAYvLM=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -1,21 +1,21 @@
{
"version": "12.3.3",
"version": "12.4.0",
"sources": {
"aarch64-linux": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-linux-aarch64.tar.xz",
"sha256": "ad2a957493f2ad9aea294ca0322c6b744f6c1188fbefbd772c0a5c0e65832456"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.4.0/floorp-linux-aarch64.tar.xz",
"sha256": "a9ac6e381a828715f9595430c1eaab40d1e6b73c11a6ab2f3a6e75829e2ac7c6"
},
"x86_64-linux": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-linux-x86_64.tar.xz",
"sha256": "9bcbfadbae583cdd8a45ab3735fa08e0f613151645fc8ae5ee716cbb6140b76c"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.4.0/floorp-linux-x86_64.tar.xz",
"sha256": "454098dbda9a4b22dd77f189f6b6f7833bdc6247363a8b487e5f0f3c9741dbc0"
},
"aarch64-darwin": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-macOS-universal.dmg",
"sha256": "0f9c3d2efe228f63c8f7c95aae19eee137f2a4ddfa980cdedf0d1da4fc4a975c"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.4.0/floorp-macOS-universal.dmg",
"sha256": "80fc3499394aea7a44175f2359866e5471213ca03d21e69cde81ebf4ff0d5ae7"
},
"x86_64-darwin": {
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-macOS-universal.dmg",
"sha256": "0f9c3d2efe228f63c8f7c95aae19eee137f2a4ddfa980cdedf0d1da4fc4a975c"
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.4.0/floorp-macOS-universal.dmg",
"sha256": "80fc3499394aea7a44175f2359866e5471213ca03d21e69cde81ebf4ff0d5ae7"
}
}
}
+7 -1
View File
@@ -7,6 +7,7 @@
makeWrapper,
openjdk,
libGL,
alsa-lib,
makeDesktopItem,
copyDesktopItems,
imagemagick,
@@ -106,7 +107,12 @@ maven.buildMavenPackage {
chmod 555 $out/share/forge/$commandToInstall.sh
PREFIX_CMD=""
if [ "$commandToInstall" = "forge-adventure" ]; then
PREFIX_CMD="--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}"
PREFIX_CMD="--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath [
libGL
alsa-lib
]
}"
fi
makeWrapper $out/share/forge/$commandToInstall.sh $out/bin/$commandToInstall \
+19 -9
View File
@@ -9,44 +9,54 @@
compressDrvWeb,
gitea,
gzip,
nodejs,
openssh,
pnpm,
stdenv,
sqliteSupport ? true,
nixosTests,
buildNpmPackage,
}:
let
frontend = buildNpmPackage {
frontend = stdenv.mkDerivation (finalAttrs: {
pname = "gitea-frontend";
inherit (gitea) src version;
npmDepsHash = "sha256-86SIiBamHdilEWbwBk6usVU/tzdYTT3Zvph3w/ZVjTs=";
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 2;
hash = "sha256-0p7P68BvO3hv0utUbnPpHSpGLlV7F9HHmOITvJAb/ww=";
};
nativeBuildInputs = [
nodejs
pnpm.configHook
];
# use webpack directly instead of 'make frontend' as the packages are already installed
buildPhase = ''
BROWSERSLIST_IGNORE_OLD_DATA=true npx webpack
make frontend
'';
installPhase = ''
mkdir -p $out
cp -R public $out/
'';
};
});
in
buildGoModule rec {
pname = "gitea";
version = "1.24.7";
version = "1.25.0";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
tag = "v${gitea.version}";
hash = "sha256-0UOzEVy7SqYVnH3dJCzS9/jvRg7F/uqjZgQvUhh7RoE=";
hash = "sha256-uBBL62Q/aigsCo0S0hwNooKljTn+OfcqoJxan6Ac0rM=";
};
proxyVendor = true;
vendorHash = "sha256-t9KeK1S16xaPxfg+LYRp6/PuuxeEOgRF4GEvgKusDiI=";
vendorHash = "sha256-HHW7xgXJKnzj6HLKAUXKYIZgOKKbXVSK+YGSKCwBeLU=";
outputs = [
"out"
+4 -4
View File
@@ -1,10 +1,10 @@
diff --git a/modules/setting/server.go b/modules/setting/server.go
index 183906268..fa02e8915 100644
index 38e166e02a..bbe9af4718 100644
--- a/modules/setting/server.go
+++ b/modules/setting/server.go
@@ -319,7 +319,7 @@ func loadServerFrom(rootCfg ConfigProvider) {
OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
Log.DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
@@ -351,7 +351,7 @@ func loadServerFrom(rootCfg ConfigProvider) {
RedirectorUseProxyProtocol = sec.Key("REDIRECTOR_USE_PROXY_PROTOCOL").MustBool(UseProxyProtocol)
OfflineMode = sec.Key("OFFLINE_MODE").MustBool(true)
if len(StaticRootPath) == 0 {
- StaticRootPath = AppWorkPath
+ StaticRootPath = "@data@"
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "google-java-format";
version = "1.31.0";
version = "1.32.0";
src = fetchurl {
url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
sha256 = "sha256-jUv6Lck4iCASp4nMaEl2ivpK+06wEwjGtx+R8I4sVQg=";
sha256 = "sha256-uO/EpRIkI5Kq7Y+21bqlNz5wUBkPY90FxnuOwlXAF/8=";
};
dontUnpack = true;
+2 -2
View File
@@ -12,14 +12,14 @@
}:
python3Packages.buildPythonApplication rec {
pname = "harlequin";
version = "2.4.0";
version = "2.4.1";
pyproject = true;
src = fetchFromGitHub {
owner = "tconbeer";
repo = "harlequin";
tag = "v${version}";
hash = "sha256-jg29EEwPVTy1n6PYAxNqbyCsmmAxzRWD3vLCvvMd+6E=";
hash = "sha256-W/Za/k/XusZmPLiX4ER9XaQWG4jdkrIh7JualHeeqZM=";
};
pythonRelaxDeps = [
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hath-rust";
version = "1.13.1";
version = "1.14.0";
src = fetchFromGitHub {
owner = "james58899";
repo = "hath-rust";
tag = "v${finalAttrs.version}";
hash = "sha256-3fi18oarPXe9vUhn4MkyLWA4I2d6PtcbW+rpEYsq8/o=";
hash = "sha256-shixrhIl4bbZQrJea2Dx4bbeGXOaPvMKUHgHq+JfAWs=";
};
cargoHash = "sha256-/n4GwqK2i2YwH1q7U29PZh9JzDTuEbP3YRJktsknQeM=";
cargoHash = "sha256-eoki+QXqBC26PC7qNlOLlgkXxc6Fsx7T4o9GIbAaO8Y=";
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
@@ -7,27 +7,28 @@
npmHooks,
python3,
cacert,
versionCheckHook,
}:
buildNpmPackage (finalAttrs: {
pname = "homebridge-config-ui-x";
version = "5.6.0";
version = "5.8.0";
src = fetchFromGitHub {
owner = "homebridge";
repo = "homebridge-config-ui-x";
tag = "v${finalAttrs.version}";
hash = "sha256-RsUrJ6WR78yN+thKbrN53S32XNZ8N4pSDAzzhGso01A=";
hash = "sha256-pbE3s1MzZM8r29oJsZjHTCahRNuWExsvGfERue4RQv4=";
};
# Deps hash for the root package
npmDepsHash = "sha256-YFWbzhjUVMa9Do5TEVQPvXwwY9ap4j8kdbGVM2wCt4c=";
npmDepsHash = "sha256-L7sC/4iHSGE9H562pbtESkFpty6eGdmkU60dpUWPQaQ=";
# Deps src and hash for ui subdirectory
npmDeps_ui = fetchNpmDeps {
name = "npm-deps-ui";
src = "${finalAttrs.src}/ui";
hash = "sha256-Y4rB1GzsFX9Uw+UeiYJPcD5+u2kpmZw0tWhsmzaWo04=";
hash = "sha256-Yhk7cplZlmcChKPmwoI192MJujuq+v8+JXT08rwfL3Q=";
};
# Need to also run npm ci in the ui subdirectory
@@ -53,11 +54,17 @@ buildNpmPackage (finalAttrs: {
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ cacert ];
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
versionCheckProgramArg = "--version";
meta = {
description = "Configure Homebridge, monitor and backup from a browser";
homepage = "https://github.com/homebridge/homebridge-config-ui-x";
license = lib.licenses.mit;
mainProgram = "homebridge-config-ui-x";
mainProgram = "hb-service";
platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = with lib.maintainers; [ fmoda3 ];
# Works on darwin when not in sandbox because it downloads a prebuilt binary
+2 -2
View File
@@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "itsycal";
version = "0.15.6";
version = "0.15.7";
src = fetchzip {
url = "https://itsycal.s3.amazonaws.com/Itsycal-${finalAttrs.version}.zip";
hash = "sha256-e1h81Lsi9mC/3HfUbCk9JkLztGZSVRG6NeQb9voPDk0=";
hash = "sha256-0JQ7fZ0cZM8DnAODZQKzUQEHQGhkNvV+0NY10Ef7MEw=";
};
installPhase = ''
+2 -2
View File
@@ -17,13 +17,13 @@
}:
let
version = "1.8.6";
version = "1.8.7";
src = fetchFromGitHub {
owner = "Predidit";
repo = "Kazumi";
tag = version;
hash = "sha256-/CtWN9E9O0PS9uzRfywO3QECkZvS8qy0CJfb3oellw4=";
hash = "sha256-pt5mM6dCI0v+WExs7oExSGhDKj8yJ9Dpjk5NfCvr20I=";
};
in
flutter335.buildFlutterApplication {
+1 -1
View File
@@ -2223,6 +2223,6 @@
},
"sdks": {
"dart": ">=3.8.0 <4.0.0",
"flutter": ">=3.35.6"
"flutter": ">=3.35.7"
}
}
+2 -2
View File
@@ -1,10 +1,10 @@
{
lib,
lammps,
mpi,
lowPrio,
}:
lowPrio (
lib.lowPrio (
lammps.override {
extraBuildInputs = [
mpi
+3 -3
View File
@@ -8,7 +8,7 @@
nix-update-script,
}:
let
version = "0.4.2";
version = "0.5.0";
in
rustPlatform.buildRustPackage {
pname = "lla";
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
owner = "chaqchase";
repo = "lla";
tag = "v${version}";
hash = "sha256-7/VfEcqvYGC1Pw9wJh5FF3c7BXgcg9LVDvcr4zCrros=";
hash = "sha256-xbXTiOr3c9PX0SRfjO+3Kib5S0fruFhjHO2Mf00BVBg=";
};
nativeBuildInputs = [
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
installShellFiles
];
cargoHash = "sha256-LYRNXNhPgpNZWP5XKqfgM6t9Ts2k/e09iXWMcuEp9LA=";
cargoHash = "sha256-qKeNSaZMpyQpI7oGqn416pfBINMsIE+0sjzg38roxc8=";
cargoBuildFlags = [ "--workspace" ];
+2 -2
View File
@@ -10,14 +10,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "loksh";
version = "7.7";
version = "7.8";
src = fetchFromGitHub {
owner = "dimkr";
repo = "loksh";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-BxQ7SZwRP9PlD2MV7DqG7tQ2lqzlkTwmaKwbgC7NYrc=";
hash = "sha256-daodwoq2NoJ343CWjtT6qqBirEIuHBWLQO9MkAN4s/Q=";
};
outputs = [
+34 -3
View File
@@ -7,8 +7,30 @@
python3Packages,
nix-update-script,
nixos-icons,
buildPackages,
customLogo ? "${nixos-icons}/share/icons/hicolor/256x256/apps/nix-snowflake.png",
withChainloading ? false,
}:
let
stdenvOpts = {
targetPlatform.system = "aarch64-none-elf";
targetPlatform.rust.rustcTarget = "${stdenv.hostPlatform.parsed.cpu.name}-unknown-none-softfloat";
targetPlatform.rust.rustcTargetSpec = "${stdenv.hostPlatform.parsed.cpu.name}-unknown-none-softfloat";
};
rust = buildPackages.rust.override {
stdenv = lib.recursiveUpdate buildPackages.stdenv stdenvOpts;
};
rustPackages = rust.packages.stable.overrideScope (
f: p: {
rustc-unwrapped = p.rustc-unwrapped.override {
stdenv = lib.recursiveUpdate p.rustc-unwrapped.stdenv stdenvOpts;
};
}
);
rustPlatform = buildPackages.makeRustPlatform rustPackages;
in
stdenv.mkDerivation (finalAttrs: {
pname = "m1n1";
version = "1.5.2";
@@ -17,9 +39,12 @@ stdenv.mkDerivation (finalAttrs: {
owner = "AsahiLinux";
repo = "m1n1";
tag = "v${finalAttrs.version}";
hash = "sha256-/TQpR/3OUM4OIrfv6cBgZigyLR0VKw6Rd1v9465wy3o=";
hash = "sha256-rxop5r+EVXnp1OVkGT6MUwcl6yNTJxJSJuruZiaou7g=";
fetchSubmodules = true;
};
cargoVendorDir = ".";
postPatch = lib.optionalString (customLogo != null) ''
magick ${customLogo} -resize 128x128 data/custom_128.png
magick ${customLogo} -resize 256x256 data/custom_256.png
@@ -27,6 +52,11 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
imagemagick
]
++ lib.optionals withChainloading [
rustPackages.rustc
rustPackages.cargo
rustPlatform.cargoSetupHook
];
postConfigure = ''
@@ -40,8 +70,9 @@ stdenv.mkDerivation (finalAttrs: {
makeFlags = [
"ARCH=${stdenv.cc.targetPrefix}"
"RELEASE=1"
(lib.optionalString (customLogo != null) "LOGO=custom")
];
]
++ lib.optional (customLogo != null) "LOGO=custom"
++ lib.optional withChainloading "CHAINLOADING=1";
enableParallelBuilding = true;
+2 -2
View File
@@ -10,11 +10,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "maestro";
version = "2.0.6";
version = "2.0.8";
src = fetchurl {
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip";
hash = "sha256-v7AzQzYmhvqBdAK5wXd0tIe18y/BVeJP3Jp1eqfBmcE=";
hash = "sha256-VBXpbEdGWY5v9E0GT+2Q9hko8lZoVmE1T7FzrQL/cs4=";
};
dontUnpack = true;
+9 -9
View File
@@ -1,21 +1,21 @@
{
"version": "3.168.1",
"version": "3.170.0",
"assets": {
"x86_64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_linux_x86_64",
"hash": "sha256-guBC7Zuh5xT+d/lcJVwDLZ++tMy97mcLZo31XkkU2HM="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_linux_x86_64",
"hash": "sha256-q5A4KELOl/rbWxrlBk2XjCOq4A/tFySx46FNhDanTsE="
},
"aarch64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_linux_aarch64",
"hash": "sha256-ScKDz4nc4N0mjdaN2mBIJfXckZJZkQ32OValSl3JbQ8="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_linux_aarch64",
"hash": "sha256-G8xrksOIqJ//kXYY7tdL9GzKFrt4ttPnviRnCUuyvuk="
},
"aarch64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_mac_universal",
"hash": "sha256-tSpVWlfbJQi2Ww1Ovc2BPXfeb/Bm7vgfDDPKyMfLZMg="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_mac_universal",
"hash": "sha256-N7PS2iNVTb9uuPavyfcMNPughGIJzt9PHeSbNSwST9Y="
},
"x86_64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_mac_universal",
"hash": "sha256-tSpVWlfbJQi2Ww1Ovc2BPXfeb/Bm7vgfDDPKyMfLZMg="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_mac_universal",
"hash": "sha256-N7PS2iNVTb9uuPavyfcMNPughGIJzt9PHeSbNSwST9Y="
}
}
}
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mymake";
version = "2.3.6";
version = "2.4.1";
src = fetchFromGitHub {
owner = "fstromback";
repo = "mymake";
tag = "v${finalAttrs.version}";
hash = "sha256-UQjvxdOvD9O6TrzBFJwh3CistDGZM9HZbcwVPx1n4+A=";
hash = "sha256-FVY6Ep6619W3fMDRYdU/FdnltNUahkY33aVhz8kXEGU=";
};
buildPhase = ''
+3 -3
View File
@@ -19,14 +19,14 @@
}:
stdenv.mkDerivation rec {
version = "2025-10-23";
version = "2025-10-27";
pname = "oh-my-zsh";
src = fetchFromGitHub {
owner = "ohmyzsh";
repo = "ohmyzsh";
rev = "99017b8eac3d7d0e5ba01c7bf0cf9c6d38985536";
sha256 = "sha256-/q9BRzRAzD5iepT2i0y72K4kPAZiJCPbX45boD2V7aU=";
rev = "136298e11073c7b34e5a977595c7ba5345ca910e";
sha256 = "sha256-4yF9gqC1TJdLAOASp8nP1GTnA2OQVNXrjBlHyyYXDW0=";
};
strictDeps = true;
+3 -3
View File
@@ -6,15 +6,15 @@
buildGoModule rec {
pname = "opcr-policy";
version = "0.3.0";
version = "0.3.2";
src = fetchFromGitHub {
owner = "opcr-io";
repo = "policy";
rev = "v${version}";
sha256 = "sha256-vTUlC/LQTQEpzd1AXgcJJBZXmbSuX8JACbM60KVuT9E=";
sha256 = "sha256-T6awF6NXVsglYBBVzGfuIF42imXjqCwxUAI3RPZNmGo=";
};
vendorHash = "sha256-3KBHK9CKn9h45eq0wAwLivm3Lj3COGYn/zGltonLP9k=";
vendorHash = "sha256-0oZpogeKMQW4SS4e2n5qK6nStYwB/nsHleftvrdXWrw=";
ldflags = [
"-s"
+2 -2
View File
@@ -30,7 +30,7 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "pdm";
version = "2.26.0";
version = "2.26.1";
pyproject = true;
disabled = python.pkgs.pythonOlder "3.8";
@@ -39,7 +39,7 @@ python.pkgs.buildPythonApplication rec {
owner = "pdm-project";
repo = "pdm";
tag = version;
hash = "sha256-Ici9XFUgtlk5yBYckZGE64KFUvA0UdX+9wo7CfaRrLI=";
hash = "sha256-ObBZoX5RwO7cf0zzOQ0aTWklq/Zzgh0DFLM9qxZHk8I=";
};
pythonRelaxDeps = [ "hishel" ];
+3 -3
View File
@@ -42,13 +42,13 @@ let
};
pname = "pretix";
version = "2025.8.0";
version = "2025.9.0";
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix";
rev = "refs/tags/v${version}";
hash = "sha256-89BAQZpXyyTg6T9hxm4EV8QHZDcD3FcnGKxAulxziyg=";
hash = "sha256-d0RunBCUUvS4tosbXWkEp7mvUKEOa5KgvIZK4XydN7I=";
};
npmDeps = buildNpmPackage {
@@ -56,7 +56,7 @@ let
inherit version src;
sourceRoot = "${src.name}/src/pretix/static/npm_dir";
npmDepsHash = "sha256-E2K9SYqRbhpQi83va8D02cwPnf51haoKv4P/ppU2m08=";
npmDepsHash = "sha256-0FQldyGJXFhXFv7L7ozAoWEfpUTo+d2pibWyhnJ4F7A=";
dontBuild = true;
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pretix-mollie";
version = "2.4.1";
version = "2.5.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix-mollie";
tag = "v${version}";
hash = "sha256-YdBDYpxKqb0UOkSU6zEYoLAtlUbkfDHUTIA538ILbjk=";
hash = "sha256-lQ1y6w7zP0sy67jf5+K6584DP10LAZqo1hLsHF3H2UA=";
};
build-system = [
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pretix-zugferd";
version = "2.5.0";
version = "2.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix-zugferd";
rev = "v${version}";
hash = "sha256-Qy/yfinj5EGjzhJmiczOSIP/GsTZabFt8e6Ki4AaN6w=";
hash = "sha256-yBlbHhiA+Tk1IHnFqYxu0hrQHWQP8LrLHgzu9+OHyN4=";
};
postPatch = ''
+125 -313
View File
@@ -11,18 +11,18 @@
},
{
"pname": "Azure.Core",
"version": "1.38.0",
"hash": "sha256-gzWMtIZJgwtE51dTMzLCbN4KxmE4/bzdjb/NU86N1uY="
"version": "1.47.1",
"hash": "sha256-YJR1bDI9H9lr6p/9QcOWEhnpMD8ePyxxO39S32VAOak="
},
{
"pname": "Azure.Identity",
"version": "1.11.4",
"hash": "sha256-J3nI80CQwS7fwRLnqBxqZNemxqP05rcn3x44YpIf2no="
"version": "1.14.2",
"hash": "sha256-PpGcGQrzcEzDtTm65gLmjWrt8yavst4VOKDlr+NuLQo="
},
{
"pname": "BouncyCastle.Cryptography",
"version": "2.5.1",
"hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c="
"version": "2.6.1",
"hash": "sha256-0NNwK/UZlnIK4Nb7bs4ya0XfoVluKQPUVQvaR88UHKo="
},
{
"pname": "Castle.Core",
@@ -31,15 +31,8 @@
},
{
"pname": "coverlet.collector",
"version": "3.0.4-preview.27.ge7cb7c3b40",
"hash": "sha256-UiiFa/GfLf3gcKb1atAz5gwR0sIA7sA1GFKSbk6sIgM=",
"url": "https://pkgs.dev.azure.com/Servarr/7f7f0cec-b6d1-4285-a8c2-5c0b3ce99d29/_packaging/88cb5621-d569-46bd-ab53-84dba1855910/nuget/v3/flat2/coverlet.collector/3.0.4-preview.27.ge7cb7c3b40/coverlet.collector.3.0.4-preview.27.ge7cb7c3b40.nupkg"
},
{
"pname": "coverlet.core",
"version": "3.0.4-preview.27.ge7cb7c3b40",
"hash": "sha256-nIVBoe0qz5e5eDmrhlMslznVzXne6eXbd8T4m2c+Qb8=",
"url": "https://pkgs.dev.azure.com/Servarr/7f7f0cec-b6d1-4285-a8c2-5c0b3ce99d29/_packaging/88cb5621-d569-46bd-ab53-84dba1855910/nuget/v3/flat2/coverlet.core/3.0.4-preview.27.ge7cb7c3b40/coverlet.core.3.0.4-preview.27.ge7cb7c3b40.nupkg"
"version": "6.0.4",
"hash": "sha256-ieiUl7G5pVKQ4V6rxhEe0ehep0/u1RBD3EAI63AQTI0="
},
{
"pname": "Dapper",
@@ -88,8 +81,13 @@
},
{
"pname": "MailKit",
"version": "4.12.1",
"hash": "sha256-fwI0YTbwfzrvdkbATWGbv4D8ugOXgaPO/WFvGxQ9WS8="
"version": "4.14.0",
"hash": "sha256-vAFqKaKvLUUiFbpu1mJdL/W5CIlb6rh3U6ef883g+Bs="
},
{
"pname": "Microsoft.ApplicationInsights",
"version": "2.23.0",
"hash": "sha256-5sf3bg7CZZjHseK+F3foOchEhmVeioePxMZVvS6Rjb0="
},
{
"pname": "Microsoft.AspNetCore.Cryptography.Internal",
@@ -108,8 +106,8 @@
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
"version": "1.1.1",
"hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="
"version": "8.0.0",
"hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
},
{
"pname": "Microsoft.Bcl.Cryptography",
@@ -121,11 +119,6 @@
"version": "17.10.0",
"hash": "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="
},
{
"pname": "Microsoft.CSharp",
"version": "4.0.1",
"hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="
},
{
"pname": "Microsoft.CSharp",
"version": "4.7.0",
@@ -133,19 +126,14 @@
},
{
"pname": "Microsoft.Data.SqlClient",
"version": "6.0.2",
"hash": "sha256-QkvGoucU8jo4PXCCgZ10v5I5hG0gyaVA36rOcu3IBLA="
"version": "6.1.1",
"hash": "sha256-IBVkAipJyF7KO9uid+5QyfVzWEeY/BbQUofKc6zQoW0="
},
{
"pname": "Microsoft.Data.SqlClient.SNI.runtime",
"version": "6.0.2",
"hash": "sha256-CQuJfjZYoRxfc07cSzUNCOOdzmUJu0p10J+WpcG2BJ0="
},
{
"pname": "Microsoft.DotNet.PlatformAbstractions",
"version": "2.1.0",
"hash": "sha256-vrZhYp94SjycUMGaVYCFWJ4p7KBKfqVyLWtIG73fzeM="
},
{
"pname": "Microsoft.Extensions.Caching.Abstractions",
"version": "8.0.0",
@@ -206,11 +194,6 @@
"version": "2.0.0",
"hash": "sha256-+KqiuV8ncy9b1xhtDExh4s4U57tKxqx4pAyr6d//EQU="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
"version": "2.2.0",
"hash": "sha256-k/3UKceE1hbgv1sfV9H85hzWvMwooE8PcasHvHMhe1M="
},
{
"pname": "Microsoft.Extensions.DependencyInjection",
"version": "8.0.0",
@@ -226,11 +209,6 @@
"version": "2.0.0",
"hash": "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "2.2.0",
"hash": "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s="
},
{
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
"version": "7.0.0",
@@ -246,11 +224,6 @@
"version": "8.0.2",
"hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
},
{
"pname": "Microsoft.Extensions.DependencyModel",
"version": "2.1.0",
"hash": "sha256-7dFo5itkB2OgSgS7dN87h0Xf2p5/f6fl2Ka6+CTEhDY="
},
{
"pname": "Microsoft.Extensions.Diagnostics",
"version": "8.0.1",
@@ -271,11 +244,6 @@
"version": "8.0.0",
"hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="
},
{
"pname": "Microsoft.Extensions.FileSystemGlobbing",
"version": "2.0.1",
"hash": "sha256-QBdcLyJAHf10+RUlquXWTs155FZmHDRKbL0uzXZZPVw="
},
{
"pname": "Microsoft.Extensions.FileSystemGlobbing",
"version": "8.0.0",
@@ -326,6 +294,11 @@
"version": "8.0.2",
"hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
},
{
"pname": "Microsoft.Extensions.Logging.Abstractions",
"version": "8.0.3",
"hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
},
{
"pname": "Microsoft.Extensions.Logging.Configuration",
"version": "8.0.1",
@@ -383,13 +356,13 @@
},
{
"pname": "Microsoft.Identity.Client",
"version": "4.61.3",
"hash": "sha256-1cccC8EWlIQlJ3SSOB7CNImOYSaxsJpRHvlCgv2yOtA="
"version": "4.73.1",
"hash": "sha256-cd5ArtDvQK4gdX8M0GHQEsCFWlqpdm6lxvaM2yMHkhc="
},
{
"pname": "Microsoft.Identity.Client.Extensions.Msal",
"version": "4.61.3",
"hash": "sha256-nFQ2C7S4BQ4nvQmGAc5Ar7/ynKyztvK7fPKrpJXaQFE="
"version": "4.73.1",
"hash": "sha256-wc4oHBGKCJhAqNIyD4LlugCFvmyiW5iVzGYP88bnWqs="
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
@@ -398,33 +371,33 @@
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
"version": "7.5.0",
"hash": "sha256-C849ySgag1us+IfgbSsloz6HTKeuEkN14HGFv4OML1o="
"version": "7.7.1",
"hash": "sha256-v83O6Gb8s4wGhbRPvOA95t0LSX+MAhF6WpA6qZeK2XM="
},
{
"pname": "Microsoft.IdentityModel.JsonWebTokens",
"version": "7.5.0",
"hash": "sha256-TbU0dSLxUaTBxd9aLAlG4EeR2lrBE+6RJUlgefbqsQg="
"version": "7.7.1",
"hash": "sha256-vGUx0HYrhDGQiHuIZoe4YOXx3UV9hT+a0krlPGJPQzw="
},
{
"pname": "Microsoft.IdentityModel.Logging",
"version": "7.5.0",
"hash": "sha256-RdUbGTvnbB11pmWxEKRaP6uPI2ITEcB/PxqgxHl33uM="
"version": "7.7.1",
"hash": "sha256-JtQclRXgzsFBFnD+kgD59OILf7XkMD2czLupLZkc100="
},
{
"pname": "Microsoft.IdentityModel.Protocols",
"version": "7.5.0",
"hash": "sha256-SX8JpQ4HzFzngmh9QHGVz2GH7TrUdX8WXBSkykQFFaU="
"version": "7.7.1",
"hash": "sha256-PVS46Ut/2814hy0tdNLahG266hBmepw/fzZ9pku1PNg="
},
{
"pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect",
"version": "7.5.0",
"hash": "sha256-m4FYxiqNyU9FnqFJKcQnE7npc5HTulHdbk3bcooqWp8="
"version": "7.7.1",
"hash": "sha256-zXRZLfgOG/0l8aF6mZuAVGWB3wYz5uTkTJwlucYPafw="
},
{
"pname": "Microsoft.IdentityModel.Tokens",
"version": "7.5.0",
"hash": "sha256-AI74ljCROXqXcktxc9T80NpBvwDZeVnRlJz+ofk1RVs="
"version": "7.7.1",
"hash": "sha256-WgbdkeG0R/f+4GJeXlj1WMpFyGv7+iW1JM9Pgt95UFk="
},
{
"pname": "Microsoft.Net.Http.Headers",
@@ -438,13 +411,13 @@
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.0.1",
"hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="
"version": "1.1.0",
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.1.0",
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
"version": "1.1.1",
"hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="
},
{
"pname": "Microsoft.NETCore.Platforms",
@@ -458,13 +431,13 @@
},
{
"pname": "Microsoft.NETCore.Targets",
"version": "1.0.1",
"hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="
"version": "1.1.0",
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
},
{
"pname": "Microsoft.NETCore.Targets",
"version": "1.1.0",
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
"version": "1.1.3",
"hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="
},
{
"pname": "Microsoft.OpenApi",
@@ -477,15 +450,45 @@
"hash": "sha256-mx/iqHmBMwA8Ulot0n6YFVIKsU1Tx7q4Tru7MSjbEgQ="
},
{
"pname": "Microsoft.TestPlatform.ObjectModel",
"version": "16.9.1",
"hash": "sha256-LZJLTWU2DOnuBiN/g+S+rwG2/BJtKrjydKnj3ujp98U="
"pname": "Microsoft.Testing.Extensions.Telemetry",
"version": "1.7.3",
"hash": "sha256-Z6WsY2FCUbNnT5HJd7IOrfOvqknVXp6PWzTVeb0idVg="
},
{
"pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
"version": "1.7.3",
"hash": "sha256-PTee04FHyTHx/gF5NLckXuVje807G51MzkPrZ1gkgCw="
},
{
"pname": "Microsoft.Testing.Extensions.VSTestBridge",
"version": "1.7.3",
"hash": "sha256-8d+wZmucfSO7PsviHjVxYB4q6NcjgxvnCUpLePq35sM="
},
{
"pname": "Microsoft.Testing.Platform",
"version": "1.7.3",
"hash": "sha256-cavX11P5o9rooqC3ZHw5h002OKRg2ZNR/VaRwpNTQYA="
},
{
"pname": "Microsoft.Testing.Platform.MSBuild",
"version": "1.7.3",
"hash": "sha256-cREl529UQ/c5atT8KimMgrgNdy6MrAd0sBGT8sXRRPM="
},
{
"pname": "Microsoft.TestPlatform.AdapterUtilities",
"version": "17.13.0",
"hash": "sha256-Vr+3Tad/h/nk7f/5HMExn3HvCGFCarehFAzJSfCBaOc="
},
{
"pname": "Microsoft.TestPlatform.ObjectModel",
"version": "17.10.0",
"hash": "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="
},
{
"pname": "Microsoft.TestPlatform.ObjectModel",
"version": "17.13.0",
"hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk="
},
{
"pname": "Microsoft.TestPlatform.TestHost",
"version": "17.10.0",
@@ -498,18 +501,13 @@
},
{
"pname": "Microsoft.Win32.SystemEvents",
"version": "4.7.0",
"hash": "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4="
"version": "8.0.0",
"hash": "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="
},
{
"pname": "MimeKit",
"version": "4.12.0",
"hash": "sha256-4i/RvXyXQsb6LlEs7tZWz5d5ab8mw3R8Wwp7FXSbMaA="
},
{
"pname": "Mono.Cecil",
"version": "0.11.1",
"hash": "sha256-J8+oOA/aJIit4nmhZ3NugJKRupHp9SgivRZUvMHP+jA="
"version": "4.14.0",
"hash": "sha256-06dqA6w2V2D+miq387smCuJ/8fk1FVc0rvRjmglAWyM="
},
{
"pname": "Mono.Nat",
@@ -554,13 +552,8 @@
},
{
"pname": "Newtonsoft.Json",
"version": "13.0.3",
"hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
},
{
"pname": "Newtonsoft.Json",
"version": "9.0.1",
"hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="
"version": "13.0.4",
"hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk="
},
{
"pname": "NLog",
@@ -587,11 +580,6 @@
"version": "9.0.3",
"hash": "sha256-X3F05GNj3vNVl++VOV5TMYE5dvEe6cx0k+5yWo2Q/+o="
},
{
"pname": "NuGet.Frameworks",
"version": "5.0.0",
"hash": "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI="
},
{
"pname": "NUnit",
"version": "3.14.0",
@@ -599,18 +587,18 @@
},
{
"pname": "NUnit3TestAdapter",
"version": "4.2.1",
"hash": "sha256-g73i3yqr0KnC0etKcAw9CmB6ZFAFvpxZn88s1glsND4="
"version": "5.1.0",
"hash": "sha256-5z470sFjV67wGHaw8KfmSloIAYe81Dokp0f8I6zXsDc="
},
{
"pname": "NunitXml.TestLogger",
"version": "3.0.131",
"hash": "sha256-5IqI/e+nm90CAaZHrcbYfCY+zu5FVcpAbV0CmsdOKyg="
"version": "3.1.20",
"hash": "sha256-T6/n9S5vnmznf2P7x5Vejciq8P2P+1OCrdKE2UmWQOw="
},
{
"pname": "Polly",
"version": "8.6.0",
"hash": "sha256-wlvYcfcOExa3LopwRFO4axW682jkUZvioHe+kznspHk="
"version": "8.6.4",
"hash": "sha256-Z+ZbhnHWMu55qgQkxvw3yMiMd+zIMzzQiFhvn/PeQ3I="
},
{
"pname": "Polly.Contrib.WaitAndRetry",
@@ -619,8 +607,8 @@
},
{
"pname": "Polly.Core",
"version": "8.6.0",
"hash": "sha256-NEGMMQ+3+i4ytsGekKfP1trUe0mRZP7MV0eBiSFXHW8="
"version": "8.6.4",
"hash": "sha256-4Xrg/H481Y/WOHk1sGvFNEOfgaGrdKi+4U54PTXhh9I="
},
{
"pname": "RestSharp",
@@ -737,11 +725,6 @@
"version": "4.3.0",
"hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
},
{
"pname": "runtime.native.System",
"version": "4.0.0",
"hash": "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="
},
{
"pname": "runtime.native.System",
"version": "4.3.0",
@@ -814,8 +797,8 @@
},
{
"pname": "runtime.unix.System.Console",
"version": "4.3.0",
"hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="
"version": "4.3.1",
"hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY="
},
{
"pname": "runtime.unix.System.Diagnostics.Debug",
@@ -971,6 +954,11 @@
"version": "1.4.2",
"hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="
},
{
"pname": "SourceGear.sqlite3",
"version": "3.50.4.2",
"hash": "sha256-NsahZ3lW1JYXMq4NOH5nM/EhdjV05sbrhjsGNIinb+M="
},
{
"pname": "Swashbuckle.AspNetCore.Swagger",
"version": "8.1.4",
@@ -981,11 +969,6 @@
"version": "8.1.4",
"hash": "sha256-m0ixgc45HCX2xrvrnhy3WYU/r/basjat535n4rN+vOY="
},
{
"pname": "System.AppContext",
"version": "4.1.0",
"hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="
},
{
"pname": "System.AppContext",
"version": "4.3.0",
@@ -998,13 +981,8 @@
},
{
"pname": "System.ClientModel",
"version": "1.0.0",
"hash": "sha256-yHb72M/Z8LeSZea9TKw2eD0SdYEoCNwVw6Z3695SC2Y="
},
{
"pname": "System.Collections",
"version": "4.0.11",
"hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="
"version": "1.5.1",
"hash": "sha256-n4PHKtjmFXo37s5yhfUQ9UbfnWplqHpC+wsvlHxctow="
},
{
"pname": "System.Collections",
@@ -1062,15 +1040,9 @@
"hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
},
{
"pname": "System.Data.SQLite.Core.Servarr",
"version": "1.0.115.5-18",
"hash": "sha256-H6QvKNKkW6PwHwDWAUVeXlqz9fJTEwIAS3YtcbOwpTc=",
"url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/f762697f-09fa-4960-89a1-64e48069bf6a/nuget/v3/flat2/system.data.sqlite.core.servarr/1.0.115.5-18/system.data.sqlite.core.servarr.1.0.115.5-18.nupkg"
},
{
"pname": "System.Diagnostics.Debug",
"version": "4.0.11",
"hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="
"pname": "System.Data.SQLite",
"version": "2.0.2",
"hash": "sha256-s++mcixhc+QaQKzdXZ6quK8kH5WWWmU0mESZNNuP/ck="
},
{
"pname": "System.Diagnostics.Debug",
@@ -1082,6 +1054,11 @@
"version": "4.3.0",
"hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "5.0.0",
"hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4="
},
{
"pname": "System.Diagnostics.DiagnosticSource",
"version": "6.0.1",
@@ -1092,11 +1069,6 @@
"version": "8.0.1",
"hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA="
},
{
"pname": "System.Diagnostics.Tools",
"version": "4.0.1",
"hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="
},
{
"pname": "System.Diagnostics.Tools",
"version": "4.3.0",
@@ -1114,13 +1086,8 @@
},
{
"pname": "System.Drawing.Common",
"version": "4.7.0",
"hash": "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk="
},
{
"pname": "System.Dynamic.Runtime",
"version": "4.0.11",
"hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="
"version": "8.0.19",
"hash": "sha256-KDCdLN8aKxQmQCe8D5iCyZKo2+mhx00tg7CqTILE/v0="
},
{
"pname": "System.Dynamic.Runtime",
@@ -1132,11 +1099,6 @@
"version": "8.0.1",
"hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="
},
{
"pname": "System.Globalization",
"version": "4.0.11",
"hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="
},
{
"pname": "System.Globalization",
"version": "4.3.0",
@@ -1154,13 +1116,8 @@
},
{
"pname": "System.IdentityModel.Tokens.Jwt",
"version": "7.5.0",
"hash": "sha256-K3OUOGrTYKJdnRTHERdSZWTxb5QNL4wBKCahcswdKrc="
},
{
"pname": "System.IO",
"version": "4.1.0",
"hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="
"version": "7.7.1",
"hash": "sha256-6JfmtdChyt7zd/HKI+/T1HcyesEPx0NNMO/zFJ7lU2c="
},
{
"pname": "System.IO",
@@ -1177,11 +1134,6 @@
"version": "4.3.0",
"hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
},
{
"pname": "System.IO.FileSystem",
"version": "4.0.1",
"hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="
},
{
"pname": "System.IO.FileSystem",
"version": "4.3.0",
@@ -1192,11 +1144,6 @@
"version": "5.0.0",
"hash": "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc="
},
{
"pname": "System.IO.FileSystem.Primitives",
"version": "4.0.1",
"hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="
},
{
"pname": "System.IO.FileSystem.Primitives",
"version": "4.3.0",
@@ -1207,21 +1154,11 @@
"version": "8.0.0",
"hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
},
{
"pname": "System.Linq",
"version": "4.1.0",
"hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="
},
{
"pname": "System.Linq",
"version": "4.3.0",
"hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
},
{
"pname": "System.Linq.Expressions",
"version": "4.1.0",
"hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="
},
{
"pname": "System.Linq.Expressions",
"version": "4.3.0",
@@ -1234,8 +1171,8 @@
},
{
"pname": "System.Memory.Data",
"version": "1.0.2",
"hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0="
"version": "8.0.1",
"hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg="
},
{
"pname": "System.Net.Http",
@@ -1257,16 +1194,6 @@
"version": "4.3.0",
"hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
},
{
"pname": "System.Numerics.Vectors",
"version": "4.5.0",
"hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
},
{
"pname": "System.ObjectModel",
"version": "4.0.12",
"hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="
},
{
"pname": "System.ObjectModel",
"version": "4.3.0",
@@ -1278,20 +1205,15 @@
"hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
},
{
"pname": "System.Reflection",
"version": "4.1.0",
"hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="
"pname": "System.Private.Uri",
"version": "4.3.2",
"hash": "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU="
},
{
"pname": "System.Reflection",
"version": "4.3.0",
"hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
},
{
"pname": "System.Reflection.Emit",
"version": "4.0.1",
"hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="
},
{
"pname": "System.Reflection.Emit",
"version": "4.3.0",
@@ -1302,81 +1224,41 @@
"version": "4.7.0",
"hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="
},
{
"pname": "System.Reflection.Emit.ILGeneration",
"version": "4.0.1",
"hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="
},
{
"pname": "System.Reflection.Emit.ILGeneration",
"version": "4.3.0",
"hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
},
{
"pname": "System.Reflection.Emit.Lightweight",
"version": "4.0.1",
"hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="
},
{
"pname": "System.Reflection.Emit.Lightweight",
"version": "4.3.0",
"hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
},
{
"pname": "System.Reflection.Extensions",
"version": "4.0.1",
"hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="
},
{
"pname": "System.Reflection.Extensions",
"version": "4.3.0",
"hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
},
{
"pname": "System.Reflection.Metadata",
"version": "1.5.0",
"hash": "sha256-wM75ACJUeypeOdaBUj4oTYiSWmg7A1usMpwRQXjSGK8="
},
{
"pname": "System.Reflection.Metadata",
"version": "1.6.0",
"hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
},
{
"pname": "System.Reflection.Primitives",
"version": "4.0.1",
"hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="
},
{
"pname": "System.Reflection.Primitives",
"version": "4.3.0",
"hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
},
{
"pname": "System.Reflection.TypeExtensions",
"version": "4.1.0",
"hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="
},
{
"pname": "System.Reflection.TypeExtensions",
"version": "4.3.0",
"hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
},
{
"pname": "System.Resources.ResourceManager",
"version": "4.0.1",
"hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="
},
{
"pname": "System.Resources.ResourceManager",
"version": "4.3.0",
"hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
},
{
"pname": "System.Runtime",
"version": "4.1.0",
"hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="
},
{
"pname": "System.Runtime",
"version": "4.3.0",
@@ -1392,41 +1274,21 @@
"version": "6.0.0",
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
},
{
"pname": "System.Runtime.Extensions",
"version": "4.1.0",
"hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="
},
{
"pname": "System.Runtime.Extensions",
"version": "4.3.0",
"hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
},
{
"pname": "System.Runtime.Handles",
"version": "4.0.1",
"hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="
},
{
"pname": "System.Runtime.Handles",
"version": "4.3.0",
"hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
},
{
"pname": "System.Runtime.InteropServices",
"version": "4.1.0",
"hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="
},
{
"pname": "System.Runtime.InteropServices",
"version": "4.3.0",
"hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
},
{
"pname": "System.Runtime.InteropServices.RuntimeInformation",
"version": "4.0.0",
"hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="
},
{
"pname": "System.Runtime.InteropServices.RuntimeInformation",
"version": "4.3.0",
@@ -1442,11 +1304,6 @@
"version": "4.3.0",
"hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
},
{
"pname": "System.Runtime.Serialization.Primitives",
"version": "4.1.1",
"hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="
},
{
"pname": "System.Security.AccessControl",
"version": "4.7.0",
@@ -1504,8 +1361,8 @@
},
{
"pname": "System.Security.Cryptography.ProtectedData",
"version": "4.7.0",
"hash": "sha256-dZfs5q3Ij1W1eJCfYjxI2o+41aSiFpaAugpoECaCOug="
"version": "4.5.0",
"hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc="
},
{
"pname": "System.Security.Cryptography.ProtectedData",
@@ -1552,11 +1409,6 @@
"version": "8.0.1",
"hash": "sha256-2cXTzNOyXqJinFPzdVJ9Gu6qrFtycfivu7RHDzBJic8="
},
{
"pname": "System.Text.Encoding",
"version": "4.0.11",
"hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="
},
{
"pname": "System.Text.Encoding",
"version": "4.3.0",
@@ -1567,21 +1419,11 @@
"version": "8.0.0",
"hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="
},
{
"pname": "System.Text.Encoding.Extensions",
"version": "4.0.11",
"hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="
},
{
"pname": "System.Text.Encoding.Extensions",
"version": "4.3.0",
"hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
},
{
"pname": "System.Text.Encodings.Web",
"version": "4.7.2",
"hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="
},
{
"pname": "System.Text.Json",
"version": "5.0.2",
@@ -1589,44 +1431,24 @@
},
{
"pname": "System.Text.Json",
"version": "8.0.5",
"hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
},
{
"pname": "System.Text.RegularExpressions",
"version": "4.1.0",
"hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="
"version": "8.0.6",
"hash": "sha256-qD3WF3jQO9+TLuBWwJhz3iKDArJqcRiy7EdrCQhrtes="
},
{
"pname": "System.Text.RegularExpressions",
"version": "4.3.0",
"hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
},
{
"pname": "System.Threading",
"version": "4.0.11",
"hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="
},
{
"pname": "System.Threading",
"version": "4.3.0",
"hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
},
{
"pname": "System.Threading.Tasks",
"version": "4.0.11",
"hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="
},
{
"pname": "System.Threading.Tasks",
"version": "4.3.0",
"hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
},
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.0.0",
"hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="
},
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.3.0",
@@ -1662,21 +1484,11 @@
"version": "4.7.0",
"hash": "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU="
},
{
"pname": "System.Xml.ReaderWriter",
"version": "4.0.11",
"hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="
},
{
"pname": "System.Xml.ReaderWriter",
"version": "4.3.0",
"hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
},
{
"pname": "System.Xml.XDocument",
"version": "4.0.11",
"hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="
},
{
"pname": "System.Xml.XDocument",
"version": "4.3.0",
+2 -2
View File
@@ -19,7 +19,7 @@
applyPatches,
}:
let
version = "2.0.5.5160";
version = "2.1.5.5216";
# The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
# the already patched lockfile to `fetchYarnDeps`.
src = applyPatches {
@@ -27,7 +27,7 @@ let
owner = "Prowlarr";
repo = "Prowlarr";
tag = "v${version}";
hash = "sha256-xSAEDcBaItA+retaSKtEI6wlwj5Knfi4RwUN6GGYms0=";
hash = "sha256-/7U1V1/fF8fobVwQa/IzCGWIUIKMrSxTyj9KZhmfJ/E=";
};
postPatch = ''
mv src/NuGet.config NuGet.Config
+3 -3
View File
@@ -13,16 +13,16 @@
buildNpmPackage (finalAttrs: {
pname = "qwen-code";
version = "0.1.0";
version = "0.1.1";
src = fetchFromGitHub {
owner = "QwenLM";
repo = "qwen-code";
tag = "v${finalAttrs.version}";
hash = "sha256-5XC4Pwf+vuK1T3/bPptUejg8v9wj3izF80Mt+iqVr9Y=";
hash = "sha256-AciiXcSbRWZJ8+79h8Np2DphzUvxoJ1krsXw4rZxv/E=";
};
npmDepsHash = "sha256-Psj/5SDWBnsRJVJnJwXGUgVbqUnjoH6HpAqqFruHkYw=";
npmDepsHash = "sha256-MKpfLzmWIATAPEf8USr2ZJR8ZGTWKkdlXuA4ByYW/jg=";
nativeBuildInputs = [
jq
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "reindeer";
version = "2025.10.20.00";
version = "2025.10.27.00";
src = fetchFromGitHub {
owner = "facebookincubator";
repo = "reindeer";
tag = "v${version}";
hash = "sha256-SHJIDFhK5y+XxOS76pbSXW8Hr1Y5g0uhSw4km5usIsM=";
hash = "sha256-ykey6fdL9bjf+IfIAKzlIs5Pw/r2rAe6VB8BR1fUtz4=";
};
cargoHash = "sha256-XTp0GaqJhNf6auZzdv0+aGgIJ6hh3027EqPr90nWB3I=";
cargoHash = "sha256-aFDMVxWLeE8TtQCW5U2ULh9yJBc67vkXkPjgo+QPxYM=";
nativeBuildInputs = [ pkg-config ];
+2 -2
View File
@@ -16,7 +16,7 @@
stdenv,
}:
let
version = "2.55.1559";
version = "2.56.1582";
urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version;
in
stdenv.mkDerivation {
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
hash = "sha256-eeQ6Gci63GRdN5HOtT5+RFgWcnpTeCG6hBk1bNKXYoE=";
hash = "sha256-LKuno7SpOpxx3JpM36tYlOHjJWWRLRjPiA096Bv/QvQ=";
};
dontConfigure = true;
@@ -0,0 +1,10 @@
{
"dash_chat_2": "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=",
"desktop_multi_window": "sha256-NOe0jMcH02c0TDTtv62OMTR/qDPnRQrRe73vXDuEq8Q=",
"dynamic_layouts": "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8=",
"flutter_gpu_texture_renderer": "sha256-EZa1FOMbcwdVs/m0vsUvlHv+MifPby4I97ZFe1bqmwQ=",
"texture_rgba_renderer": "sha256-V/bmT/5x+Bt7kdjLTkgkoXdBcFVXxPyp9kIUhf+Rnt4=",
"uni_links": "sha256-O2BgNwu5HFRQyaNkskWHORx8pZhdwEjtljvw1+zFzfo=",
"window_manager": "sha256-40mwj4D8W2xW8C7RshTjOhelOiLPM7uU9rsF4NvQn8c=",
"window_size": "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM="
}
+7 -16
View File
@@ -4,7 +4,7 @@
cargo,
copyDesktopItems,
fetchFromGitHub,
flutter,
flutter329,
ffmpeg,
gst_all_1,
fuse3,
@@ -56,22 +56,22 @@ let
};
ffigen = callPackage ./ffigen {
inherit flutter;
flutter = flutter329;
};
sharedLibraryExt = rustc.stdenv.hostPlatform.extensions.sharedLibrary;
in
flutter.buildFlutterApplication rec {
flutter329.buildFlutterApplication rec {
pname = "rustdesk";
version = "1.4.1";
version = "1.4.3";
src = fetchFromGitHub {
owner = "rustdesk";
repo = "rustdesk";
tag = version;
fetchSubmodules = true;
hash = "sha256-nS8KjLzgdzgvn5mM1lJL2vFk0g/ZUZBvdkjyC+MdHDE=";
hash = "sha256-TCy1AyqBHqrIlip2ZqdzIaYHjIYddThI+YmbcQHaDqQ=";
};
strictDeps = true;
@@ -81,16 +81,7 @@ flutter.buildFlutterApplication rec {
sourceRoot = "${src.name}/flutter";
# curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.4.1/flutter/pubspec.lock | yq > pubspec.lock.json
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=";
desktop_multi_window = "sha256-NOe0jMcH02c0TDTtv62OMTR/qDPnRQrRe73vXDuEq8Q=";
dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8=";
flutter_gpu_texture_renderer = "sha256-EZa1FOMbcwdVs/m0vsUvlHv+MifPby4I97ZFe1bqmwQ=";
window_manager = "sha256-40mwj4D8W2xW8C7RshTjOhelOiLPM7uU9rsF4NvQn8c=";
window_size = "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM=";
texture_rgba_renderer = "sha256-V/bmT/5x+Bt7kdjLTkgkoXdBcFVXxPyp9kIUhf+Rnt4=";
uni_links = "sha256-O2BgNwu5HFRQyaNkskWHORx8pZhdwEjtljvw1+zFzfo=";
};
gitHashes = lib.importJSON ./gitHashes.json;
# Configure the Rust build
cargoRoot = "..";
@@ -101,7 +92,7 @@ flutter.buildFlutterApplication rec {
src
patches
;
hash = "sha256-ecLR6cMVDrTKeoTE5Yxkw5dN4ceAm+RD7BVXwIQ1fnk=";
hash = "sha256-AOKsTPuq1VD6MR4z1K9l2Clbl8d/7IijTsnMRgBXvyw=";
};
dontCargoBuild = true;
+149 -155
View File
@@ -4,17 +4,11 @@
"dependency": "transitive",
"description": {
"name": "_fe_analyzer_shared",
"sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
"sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "72.0.0"
},
"_macros": {
"dependency": "transitive",
"description": "dart",
"source": "sdk",
"version": "0.3.2"
"version": "85.0.0"
},
"after_layout": {
"dependency": "transitive",
@@ -30,31 +24,31 @@
"dependency": "transitive",
"description": {
"name": "analyzer",
"sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
"sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.7.0"
"version": "7.7.1"
},
"animations": {
"dependency": "transitive",
"description": {
"name": "animations",
"sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb",
"sha256": "a8031b276f0a7986ac907195f10ca7cd04ecf2a8a566bd6dbe03018a9b02b427",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.11"
"version": "2.1.0"
},
"archive": {
"dependency": "transitive",
"description": {
"name": "archive",
"sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
"sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.6.1"
"version": "4.0.7"
},
"args": {
"dependency": "transitive",
@@ -130,11 +124,11 @@
"dependency": "transitive",
"description": {
"name": "build",
"sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
"sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.1"
"version": "2.5.4"
},
"build_cli_annotations": {
"dependency": "transitive",
@@ -150,51 +144,51 @@
"dependency": "transitive",
"description": {
"name": "build_config",
"sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1",
"sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.1"
"version": "1.1.2"
},
"build_daemon": {
"dependency": "transitive",
"description": {
"name": "build_daemon",
"sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9",
"sha256": "409002f1adeea601018715d613115cfaf0e31f512cb80ae4534c79867ae2363d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.2"
"version": "4.1.0"
},
"build_resolvers": {
"dependency": "transitive",
"description": {
"name": "build_resolvers",
"sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
"sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.2"
"version": "2.5.4"
},
"build_runner": {
"dependency": "direct dev",
"description": {
"name": "build_runner",
"sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
"sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.13"
"version": "2.5.4"
},
"build_runner_core": {
"dependency": "transitive",
"description": {
"name": "build_runner_core",
"sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
"sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.3.2"
"version": "9.1.2"
},
"built_collection": {
"dependency": "transitive",
@@ -210,11 +204,11 @@
"dependency": "transitive",
"description": {
"name": "built_value",
"sha256": "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27",
"sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.10.1"
"version": "8.12.0"
},
"cached_network_image": {
"dependency": "transitive",
@@ -250,11 +244,11 @@
"dependency": "transitive",
"description": {
"name": "characters",
"sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
"sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.0"
"version": "1.4.0"
},
"charcode": {
"dependency": "transitive",
@@ -290,31 +284,31 @@
"dependency": "transitive",
"description": {
"name": "clock",
"sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
"sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.1"
"version": "1.1.2"
},
"code_builder": {
"dependency": "transitive",
"description": {
"name": "code_builder",
"sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
"sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.10.1"
"version": "4.11.0"
},
"collection": {
"dependency": "transitive",
"description": {
"name": "collection",
"sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
"sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.18.0"
"version": "1.19.1"
},
"contextmenu": {
"dependency": "direct main",
@@ -370,11 +364,11 @@
"dependency": "transitive",
"description": {
"name": "dart_style",
"sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
"sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.7"
"version": "3.1.1"
},
"dash_chat_2": {
"dependency": "direct main",
@@ -442,11 +436,11 @@
"dependency": "transitive",
"description": {
"name": "device_info_plus_platform_interface",
"sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
"sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.0.2"
"version": "7.0.3"
},
"draggable_float_widget": {
"dependency": "direct main",
@@ -493,11 +487,11 @@
"dependency": "direct main",
"description": {
"name": "extended_text",
"sha256": "38c1cac571d6eaf406f4b80040c1f88561e7617ad90795aac6a1be0a8d0bb676",
"sha256": "sha256-2PSm4mdlBbVNwNX16N6QIGZ7QC6cGzqLAwqD5WjJllQ=",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "14.0.0"
"version": "15.0.2"
},
"extended_text_library": {
"dependency": "transitive",
@@ -523,11 +517,11 @@
"dependency": "direct main",
"description": {
"name": "ffi",
"sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
"sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.3"
"version": "2.1.4"
},
"ffigen": {
"dependency": "direct dev",
@@ -573,11 +567,11 @@
"dependency": "transitive",
"description": {
"name": "file_selector_macos",
"sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
"sha256": "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.4+2"
"version": "0.9.4+4"
},
"file_selector_platform_interface": {
"dependency": "transitive",
@@ -613,21 +607,21 @@
"dependency": "direct main",
"description": {
"name": "flex_color_picker",
"sha256": "12dc855ae8ef5491f529b1fc52c655f06dcdf4114f1f7fdecafa41eec2ec8d79",
"sha256": "8f753a1a026a13ea5cc5eddbae3ceb886f2537569ab2e5208efb1e3bb5af72ff",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.6.0"
"version": "3.7.1"
},
"flex_seed_scheme": {
"dependency": "transitive",
"description": {
"name": "flex_seed_scheme",
"sha256": "7639d2c86268eff84a909026eb169f008064af0fb3696a651b24b0fa24a40334",
"sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.4.1"
"version": "3.5.1"
},
"flutter": {
"dependency": "direct main",
@@ -796,11 +790,11 @@
"dependency": "direct main",
"description": {
"name": "flutter_svg",
"sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1",
"sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.0"
"version": "2.2.1"
},
"flutter_web_plugins": {
"dependency": "transitive",
@@ -812,11 +806,11 @@
"dependency": "direct dev",
"description": {
"name": "freezed",
"sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e",
"sha256": "59a584c24b3acdc5250bb856d0d3e9c0b798ed14a4af1ddb7dc1c7b41df91c9c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.7"
"version": "2.5.8"
},
"freezed_annotation": {
"dependency": "direct main",
@@ -862,11 +856,11 @@
"dependency": "direct main",
"description": {
"name": "google_fonts",
"sha256": "b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82",
"sha256": "517b20870220c48752eafa0ba1a797a092fb22df0d89535fd9991e86ee2cdd9c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.2.1"
"version": "6.3.2"
},
"graphs": {
"dependency": "transitive",
@@ -892,11 +886,11 @@
"dependency": "direct main",
"description": {
"name": "http",
"sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
"sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.0"
"version": "1.5.0"
},
"http_multi_server": {
"dependency": "transitive",
@@ -912,11 +906,11 @@
"dependency": "transitive",
"description": {
"name": "http_parser",
"sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
"sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.2"
"version": "4.1.2"
},
"icons_launcher": {
"dependency": "direct dev",
@@ -932,91 +926,91 @@
"dependency": "direct main",
"description": {
"name": "image",
"sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
"sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.3.0"
"version": "4.5.4"
},
"image_picker": {
"dependency": "direct main",
"description": {
"name": "image_picker",
"sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a",
"sha256": "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.2"
"version": "1.2.0"
},
"image_picker_android": {
"dependency": "transitive",
"description": {
"name": "image_picker_android",
"sha256": "82652a75e3dd667a91187769a6a2cc81bd8c111bbead698d8e938d2b63e5e89a",
"sha256": "28f3987ca0ec702d346eae1d90eda59603a2101b52f1e234ded62cff1d5cfa6e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.8.12+21"
"version": "0.8.13+1"
},
"image_picker_for_web": {
"dependency": "transitive",
"description": {
"name": "image_picker_for_web",
"sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
"sha256": "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.6"
"version": "3.1.0"
},
"image_picker_ios": {
"dependency": "transitive",
"description": {
"name": "image_picker_ios",
"sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100",
"sha256": "eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.8.12+2"
"version": "0.8.13"
},
"image_picker_linux": {
"dependency": "transitive",
"description": {
"name": "image_picker_linux",
"sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9",
"sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.1+2"
"version": "0.2.2"
},
"image_picker_macos": {
"dependency": "transitive",
"description": {
"name": "image_picker_macos",
"sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1",
"sha256": "d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.1+2"
"version": "0.2.2"
},
"image_picker_platform_interface": {
"dependency": "transitive",
"description": {
"name": "image_picker_platform_interface",
"sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0",
"sha256": "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.10.1"
"version": "2.11.1"
},
"image_picker_windows": {
"dependency": "transitive",
"description": {
"name": "image_picker_windows",
"sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb",
"sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.1+1"
"version": "0.2.2"
},
"intl": {
"dependency": "direct overridden",
@@ -1078,16 +1072,6 @@
"source": "hosted",
"version": "1.3.0"
},
"macros": {
"dependency": "transitive",
"description": {
"name": "macros",
"sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.2-main.4"
},
"matcher": {
"dependency": "transitive",
"description": {
@@ -1112,11 +1096,11 @@
"dependency": "transitive",
"description": {
"name": "meta",
"sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
"sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.15.0"
"version": "1.16.0"
},
"mime": {
"dependency": "transitive",
@@ -1192,11 +1176,11 @@
"dependency": "direct main",
"description": {
"name": "path",
"sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
"sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.9.0"
"version": "1.9.1"
},
"path_parsing": {
"dependency": "transitive",
@@ -1222,21 +1206,21 @@
"dependency": "transitive",
"description": {
"name": "path_provider_android",
"sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",
"sha256": "3b4c1fc3aa55ddc9cd4aa6759984330d5c8e66aa7702a6223c61540dc6380c37",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.15"
"version": "2.2.19"
},
"path_provider_foundation": {
"dependency": "transitive",
"description": {
"name": "path_provider_foundation",
"sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
"sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.1"
"version": "2.4.2"
},
"path_provider_linux": {
"dependency": "transitive",
@@ -1292,11 +1276,11 @@
"dependency": "transitive",
"description": {
"name": "petitparser",
"sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
"sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.0.2"
"version": "6.1.0"
},
"platform": {
"dependency": "transitive",
@@ -1322,21 +1306,31 @@
"dependency": "transitive",
"description": {
"name": "pool",
"sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
"sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.5.1"
"version": "1.5.2"
},
"posix": {
"dependency": "transitive",
"description": {
"name": "posix",
"sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.0.3"
},
"provider": {
"dependency": "direct main",
"description": {
"name": "provider",
"sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
"sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.1.5"
"version": "6.1.5+1"
},
"pub_semver": {
"dependency": "transitive",
@@ -1352,11 +1346,11 @@
"dependency": "transitive",
"description": {
"name": "pubspec_parse",
"sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0",
"sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.0"
"version": "1.5.0"
},
"pull_down_button": {
"dependency": "direct main",
@@ -1372,11 +1366,11 @@
"dependency": "transitive",
"description": {
"name": "puppeteer",
"sha256": "7a990c68d33882b642214c351f66492d9a738afa4226a098ab70642357337fa2",
"sha256": "e072dc2e8de31934c24d3efa9d4ce3cbedf5d9a83a4e503c086ab3a6e2ed644f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.16.0"
"version": "3.19.0"
},
"qr": {
"dependency": "transitive",
@@ -1462,11 +1456,11 @@
"dependency": "transitive",
"description": {
"name": "shelf",
"sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
"sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.4.1"
"version": "1.4.2"
},
"shelf_static": {
"dependency": "transitive",
@@ -1502,17 +1496,17 @@
"dependency": "transitive",
"description": "flutter",
"source": "sdk",
"version": "0.0.99"
"version": "0.0.0"
},
"source_gen": {
"dependency": "transitive",
"description": {
"name": "source_gen",
"sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
"sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.5.0"
"version": "2.0.0"
},
"source_span": {
"dependency": "transitive",
@@ -1538,11 +1532,11 @@
"dependency": "transitive",
"description": {
"name": "sqflite_common",
"sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709",
"sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.4+6"
"version": "2.5.5"
},
"stack_trace": {
"dependency": "transitive",
@@ -1588,11 +1582,11 @@
"dependency": "transitive",
"description": {
"name": "synchronized",
"sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
"sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.3.0+3"
"version": "3.3.1"
},
"term_glyph": {
"dependency": "transitive",
@@ -1608,11 +1602,11 @@
"dependency": "transitive",
"description": {
"name": "test_api",
"sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
"sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.6"
"version": "0.7.7"
},
"texture_rgba_renderer": {
"dependency": "direct main",
@@ -1720,31 +1714,31 @@
"dependency": "direct main",
"description": {
"name": "url_launcher",
"sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
"sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.1"
"version": "6.3.2"
},
"url_launcher_android": {
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
"sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
"sha256": "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.14"
"version": "6.3.20"
},
"url_launcher_ios": {
"dependency": "direct main",
"description": {
"name": "url_launcher_ios",
"sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
"sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.3"
"version": "6.3.4"
},
"url_launcher_linux": {
"dependency": "transitive",
@@ -1760,11 +1754,11 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_macos",
"sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
"sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.2"
"version": "3.2.3"
},
"url_launcher_platform_interface": {
"dependency": "transitive",
@@ -1780,11 +1774,11 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_web",
"sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
"sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.3"
"version": "2.4.1"
},
"url_launcher_windows": {
"dependency": "transitive",
@@ -1810,11 +1804,11 @@
"dependency": "transitive",
"description": {
"name": "vector_graphics",
"sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de",
"sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.18"
"version": "1.1.19"
},
"vector_graphics_codec": {
"dependency": "transitive",
@@ -1830,11 +1824,11 @@
"dependency": "transitive",
"description": {
"name": "vector_graphics_compiler",
"sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad",
"sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.16"
"version": "1.1.19"
},
"vector_math": {
"dependency": "transitive",
@@ -1850,51 +1844,51 @@
"dependency": "transitive",
"description": {
"name": "video_player",
"sha256": "7d78f0cfaddc8c19d4cb2d3bebe1bfef11f2103b0a03e5398b303a1bf65eeb14",
"sha256": "0d55b1f1a31e5ad4c4967bfaa8ade0240b07d20ee4af1dfef5f531056512961a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.9.5"
"version": "2.10.0"
},
"video_player_android": {
"dependency": "transitive",
"description": {
"name": "video_player_android",
"sha256": "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898",
"sha256": "a8dc4324f67705de057678372bedb66cd08572fe7c495605ac68c5f503324a39",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.7.16"
"version": "2.8.15"
},
"video_player_avfoundation": {
"dependency": "transitive",
"description": {
"name": "video_player_avfoundation",
"sha256": "9ee764e5cd2fc1e10911ae8ad588e1a19db3b6aa9a6eb53c127c42d3a3c3f22f",
"sha256": "f9a780aac57802b2892f93787e5ea53b5f43cc57dc107bee9436458365be71cd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.7.1"
"version": "2.8.4"
},
"video_player_platform_interface": {
"dependency": "transitive",
"description": {
"name": "video_player_platform_interface",
"sha256": "df534476c341ab2c6a835078066fc681b8265048addd853a1e3c78740316a844",
"sha256": "9e372520573311055cb353b9a0da1c9d72b094b7ba01b8ecc66f28473553793b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.0"
"version": "6.5.0"
},
"video_player_web": {
"dependency": "transitive",
"description": {
"name": "video_player_web",
"sha256": "e8bba2e5d1e159d5048c9a491bb2a7b29c535c612bb7d10c1e21107f5bd365ba",
"sha256": "9f3c00be2ef9b76a95d94ac5119fb843dca6f2c69e6c9968f6f2b6c9e7afbdeb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.5"
"version": "2.4.0"
},
"visibility_detector": {
"dependency": "direct main",
@@ -1910,61 +1904,61 @@
"dependency": "direct main",
"description": {
"name": "wakelock_plus",
"sha256": "104d94837bb28c735894dcd592877e990149c380e6358b00c04398ca1426eed4",
"sha256": "f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.1"
"version": "1.1.4"
},
"wakelock_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "wakelock_plus_platform_interface",
"sha256": "e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207",
"sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.3"
"version": "1.3.0"
},
"watcher": {
"dependency": "transitive",
"description": {
"name": "watcher",
"sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
"sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.2"
"version": "1.1.4"
},
"web": {
"dependency": "transitive",
"description": {
"name": "web",
"sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
"sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.5.1"
"version": "1.1.1"
},
"web_socket_channel": {
"dependency": "transitive",
"description": {
"name": "web_socket_channel",
"sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42",
"sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.5"
"version": "2.4.0"
},
"win32": {
"dependency": "direct main",
"description": {
"name": "win32",
"sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e",
"sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.10.1"
"version": "5.13.0"
},
"win32_registry": {
"dependency": "transitive",
@@ -2070,7 +2064,7 @@
}
},
"sdks": {
"dart": ">=3.5.0 <4.0.0",
"flutter": ">=3.24.0"
"dart": ">=3.7.0 <4.0.0",
"flutter": ">=3.29.0"
}
}
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "sentry-native";
version = "0.11.3";
version = "0.12.0";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-native";
tag = version;
hash = "sha256-I+vWQWxFpvLnfW7S3YufjM0CD8YgaLy/FL6xGndiXwE=";
hash = "sha256-f9G2sCh49ChFcLaDALpfgrOwHh2mxMaUEQTeYffjXks=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -6,13 +6,13 @@
}:
buildGoModule {
pname = "starlark";
version = "0-unstable-2025-10-24";
version = "0-unstable-2025-10-29";
src = fetchFromGitHub {
owner = "google";
repo = "starlark-go";
rev = "6d2315cd1916ff6bc9ab3d6b3415e29da31df64d";
hash = "sha256-GAxcKJHrvTPK2IvK3AEhNvYcFZw7mkaubXNiFnsiqDo=";
rev = "7849196f18cf4dd77298ae77c1b42ad53225c348";
hash = "sha256-oDA81ow+KPy9d/iIhPxzYSl9wvcLvNM85X4CV5Jq5LQ=";
};
vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo=";
@@ -0,0 +1,13 @@
diff --git a/SteamPrefill/Settings/AppConfig.cs b/SteamPrefill/Settings/AppConfig.cs
index 05215f9..394b13f 100644
--- a/SteamPrefill/Settings/AppConfig.cs
+++ b/SteamPrefill/Settings/AppConfig.cs
@@ -36,7 +36,7 @@ namespace SteamPrefill.Settings
/// <summary>
/// Contains user configuration. Should not be deleted, doing so will reset the app back to defaults.
/// </summary>
- private static readonly string ConfigDir = Path.Combine(AppContext.BaseDirectory, "Config");
+ private static readonly string ConfigDir = Path.Combine(Directory.GetCurrentDirectory(), "Config");
#region Serialization file paths
+232
View File
@@ -0,0 +1,232 @@
[
{
"pname": "AsyncFixer",
"version": "1.6.0",
"hash": "sha256-8MWfDkTyotnouLwZASK27lM32NoGCLPLr4sBBqPkJFI="
},
{
"pname": "AutoMapper",
"version": "11.0.1",
"hash": "sha256-47l2b8IWIyaOKl5KTpVAPeEL6ZMGlzoFCWby2QIrPfw="
},
{
"pname": "ByteSize",
"version": "2.1.1",
"hash": "sha256-ZPiO0zdDX3F9QkQLWLbkyeicRZZoOGnS5vo55RttS2w="
},
{
"pname": "Devlooped.SponsorLink",
"version": "0.10.5",
"hash": "sha256-m+eCuL8ifD/PJkyA70okbWYIDcp8ZV6mtDvnbthz6DQ="
},
{
"pname": "ErrorProne.NET.Structs",
"version": "0.1.2",
"hash": "sha256-B0kzqe24j0+X96JCtQWXZK3aWfFAYKIYvhrMePMfgPI="
},
{
"pname": "HexMate",
"version": "0.0.3",
"hash": "sha256-pA/wUH3+1CIXNmvpwedOOtfGA5uEMeis3XbSArol8r4="
},
{
"pname": "Intellenum",
"version": "1.0.0-beta.3",
"hash": "sha256-FdLXSwxvQNyZWjFjJnUvuk1LAxPvuch557w0qHvmdfw="
},
{
"pname": "JetBrains.Annotations",
"version": "2022.1.0",
"hash": "sha256-AgCfhDvBb/xOLxNvFoZPYuiSBWEhXihHTBvYqLS+WFM="
},
{
"pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
"version": "3.3.4",
"hash": "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="
},
{
"pname": "Microsoft.CSharp",
"version": "4.5.0",
"hash": "sha256-dAhj/CgXG5VIy2dop1xplUsLje7uBPFjxasz9rdFIgY="
},
{
"pname": "Microsoft.CSharp",
"version": "4.7.0",
"hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
},
{
"pname": "Microsoft.IdentityModel.Abstractions",
"version": "6.34.0",
"hash": "sha256-Al1vWcfH//XZRKSg5JE2nEHMb8Z6kekMHccJEmYo9jU="
},
{
"pname": "Microsoft.IdentityModel.JsonWebTokens",
"version": "6.34.0",
"hash": "sha256-+h0uNBMx6zh/f96+WiSR6c89G1alBOCuTx+VpDxuATA="
},
{
"pname": "Microsoft.IdentityModel.Logging",
"version": "6.34.0",
"hash": "sha256-a0IPOjmYsIT2/HFAdhaN/32X3c8GYCFZ5sRiCGO2pDo="
},
{
"pname": "Microsoft.IdentityModel.Tokens",
"version": "6.34.0",
"hash": "sha256-lO/gLOFYkwCEm98Zn+4X20dXMwYoD+y4Urpx8n3mcu4="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "1.1.0",
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
},
{
"pname": "Microsoft.NETCore.Platforms",
"version": "5.0.0",
"hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="
},
{
"pname": "Microsoft.NETCore.Targets",
"version": "1.1.0",
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
},
{
"pname": "Microsoft.VisualStudio.Threading.Analyzers",
"version": "16.9.60",
"hash": "sha256-1ke2CCKndVws3lgfEuEhKgnm+h706XhfKcpBNyypcDU="
},
{
"pname": "Microsoft.Win32.Registry",
"version": "5.0.0",
"hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
},
{
"pname": "NStack.Core",
"version": "0.17.1",
"hash": "sha256-sVuArQwL2dzytCei2fhCNg1Bcm4vntPb+PpXStk3rqM="
},
{
"pname": "protobuf-net",
"version": "3.2.30",
"hash": "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="
},
{
"pname": "protobuf-net.Core",
"version": "3.2.30",
"hash": "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="
},
{
"pname": "runtime.any.System.Runtime",
"version": "4.3.0",
"hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
},
{
"pname": "runtime.any.System.Text.Encoding",
"version": "4.3.0",
"hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
},
{
"pname": "runtime.native.System",
"version": "4.3.0",
"hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
},
{
"pname": "runtime.unix.System.Private.Uri",
"version": "4.3.0",
"hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
},
{
"pname": "Spectre.Console",
"version": "0.49.2-preview.0.67",
"hash": "sha256-e1BrfX8ME8Ob7ZVKx8VYExKNvLzHHxNJ1R+Yv2lVE3A="
},
{
"pname": "Spectre.Console.Analyzer",
"version": "1.0.0",
"hash": "sha256-Om2PRAfm4LoPImty4zpGo/uoqha6ZnuCU6iNcAvKiUE="
},
{
"pname": "SteamKit2",
"version": "3.0.0-beta.5",
"hash": "sha256-6AXrY3OYtF00FzP3yNWOdyFJE5jTqLegrlMh7hvDHJ8="
},
{
"pname": "System.Collections.Immutable",
"version": "7.0.0",
"hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="
},
{
"pname": "System.IdentityModel.Tokens.Jwt",
"version": "6.34.0",
"hash": "sha256-nv+tAb/Gw2W026gBgoAT53Oj5LOonHYGG1UntQheHpQ="
},
{
"pname": "System.IO.Hashing",
"version": "8.0.0",
"hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="
},
{
"pname": "System.Private.Uri",
"version": "4.3.0",
"hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
},
{
"pname": "System.Runtime",
"version": "4.3.0",
"hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
},
{
"pname": "System.Security.AccessControl",
"version": "5.0.0",
"hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
},
{
"pname": "System.Security.Cryptography.Cng",
"version": "4.5.0",
"hash": "sha256-9llRbEcY1fHYuTn3vGZaCxsFxSAqXl4bDA6Rz9b0pN4="
},
{
"pname": "System.Security.Principal.Windows",
"version": "5.0.0",
"hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
},
{
"pname": "System.Text.Encoding",
"version": "4.3.0",
"hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
},
{
"pname": "System.Text.Encodings.Web",
"version": "4.7.2",
"hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="
},
{
"pname": "System.Text.Json",
"version": "4.7.2",
"hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="
},
{
"pname": "System.Threading.Tasks.Extensions",
"version": "4.5.4",
"hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
},
{
"pname": "System.ValueTuple",
"version": "4.5.0",
"hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="
},
{
"pname": "Terminal.Gui",
"version": "1.7.2",
"hash": "sha256-qt42B0L8Na3kRCKkzmPru8IoLcjyn6nosEJL7nb67aA="
},
{
"pname": "ThisAssembly.AssemblyInfo",
"version": "1.2.14",
"hash": "sha256-Sx9lTx51Nt8XlzuB7FI/8MVRYNw4Mm2lfQECBf3TXJU="
},
{
"pname": "Wcwidth",
"version": "1.0.0",
"hash": "sha256-weNqGgpKcVMkTtaMV5npzbLRbCPyI0tgkN+qmzeqIwo="
}
]
@@ -0,0 +1,52 @@
{
lib,
buildDotnetModule,
dotnetCorePackages,
fetchFromGitHub,
curl,
jq,
unzip,
}:
buildDotnetModule (finalAttrs: {
pname = "steam-lancache-prefill";
version = "3.3.0";
src = fetchFromGitHub {
owner = "tpill90";
repo = "steam-lancache-prefill";
tag = "v${finalAttrs.version}";
hash = "sha256-V3hegWhJCkQiE6pkGLRVKw6UcNNEt0dF9URSfBz3BEk=";
fetchSubmodules = true;
};
projectFile = "SteamPrefill/SteamPrefill.csproj";
nugetDeps = ./deps.json;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
executables = [ "SteamPrefill" ];
patches = [ ./current-dir-config.patch ];
nativeBuildInputs = [
curl
jq
unzip
];
postInstall = ''
rm -rf $out/lib/steam-lancache-prefill/update.sh
'';
meta = {
description = "Automatically fills a Lancache with games from Steam";
homepage = "https://github.com/tpill90/steam-lancache-prefill";
changelog = "https://github.com/tpill90/steam-lancache-prefill/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ rhoriguchi ];
mainProgram = "SteamPrefill";
platforms = lib.platforms.all;
};
})
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "supabase-cli";
version = "2.54.8";
version = "2.55.4";
src = fetchFromGitHub {
owner = "supabase";
repo = "cli";
rev = "v${version}";
hash = "sha256-iU2NFb97458ouDYuTwgCIYtBpM11MXPWS4hV/Q4IDMs=";
hash = "sha256-BJjNWZKqf59sl9+kVIRuBWF71X19wk8fbIJqlXDhM5Q=";
};
vendorHash = "sha256-JhPKfSFQxFwH5nIYIO3mACdDfURIhuISs1tANiCfWSk=";
vendorHash = "sha256-ASNo3T0ziPcMm/xXBnokyVWVTTq2ZEn4qg9yHjxinEA=";
ldflags = [
"-s"
+2 -2
View File
@@ -12,7 +12,7 @@
nix-update-script,
}:
let
version = "4.18.10";
version = "4.18.11";
desktopItem = makeDesktopItem {
name = "unciv";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
hash = "sha256-8gp4h+fKK+gmwL8OnmfKb5pmO4mehClu8FeQe2KJiDk=";
hash = "sha256-k6jIvJvEfLgcYexpzjg7GFGGw9HhFGnhdShEX6zUxiQ=";
};
dontUnpack = true;
@@ -9,12 +9,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20251026234004";
version = "20251028154325";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
hash = "sha256-bZM47aPNLvdkmmCFyie/dlUs9JdGPngkdmGrVzDl8as=";
hash = "sha256-ugNLlCfAhXvIPQTae3Z22rlpNG32RmIrIt/iilIj+iA=";
};
vendorHash = "sha256-HmIXpF7P3J+lPXpmWWoFpSYAu5zbBQSDrj6S88LgWSU=";
meta = with lib; {
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "vdo";
version = "8.3.1.1";
version = "8.3.2.1";
src = fetchFromGitHub {
owner = "dm-vdo";
repo = "vdo";
rev = version;
hash = "sha256-6oX3ngsBPhE6XsMfliWw5Qzu3UosnsIFIAFRCqckU7U=";
hash = "sha256-y3u9f17jMV9dwhfJrsW/GOqszVNvPLDyETfku1t3Djo=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "vfox";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "version-fox";
repo = "vfox";
tag = "v${finalAttrs.version}";
hash = "sha256-lVhw2OB4TVkqYbI+kGvBX2RMisc+1aF3Sl6z/kshmZE=";
hash = "sha256-Dtu0A+BC/9sypnWvA8XOlmQFPsV5LUGCXpdarYeCdlU=";
};
vendorHash = "sha256-+5hJMip3wAR1k6n21I3QFYe++nw4J4Ip+43EujQl2ec=";
+2 -2
View File
@@ -1,10 +1,10 @@
{ callPackage, flutterPackages }:
{
calculator = callPackage ./calculator {
flutter = flutterPackages.v3_24;
flutter = flutterPackages.v3_35;
};
file-manager = callPackage ./file-manager {
flutter = flutterPackages.v3_24;
flutter = flutterPackages.v3_35;
};
}
@@ -8,7 +8,6 @@
{
lib,
config,
recurseIntoAttrs,
generateSplicesForMkScope,
makeScopeWithSplicing',
writeScriptBin,
@@ -92,9 +91,9 @@ let
mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { };
addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { };
dotnet_8 = recurseIntoAttrs (callPackage ./8 { });
dotnet_9 = recurseIntoAttrs (callPackage ./9 { });
dotnet_10 = recurseIntoAttrs (callPackage ./10 { });
dotnet_8 = lib.recurseIntoAttrs (callPackage ./8 { });
dotnet_9 = lib.recurseIntoAttrs (callPackage ./9 { });
dotnet_10 = lib.recurseIntoAttrs (callPackage ./10 { });
}
);
};
@@ -19,7 +19,6 @@
nugetPackageHook,
xmlstarlet,
pkgs,
recurseIntoAttrs,
}:
type: unwrapped:
stdenvNoCC.mkDerivation (finalAttrs: {
@@ -282,7 +281,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
};
}
// lib.optionalAttrs (type == "sdk") {
buildDotnetModule = recurseIntoAttrs (
buildDotnetModule = lib.recurseIntoAttrs (
(pkgs.appendOverlays [
(self: super: {
dotnet-sdk = finalAttrs.finalPackage;
File diff suppressed because it is too large Load Diff
@@ -1,19 +0,0 @@
diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
index 252021cf78..e50ef0885d 100644
--- a/packages/flutter_tools/lib/src/flutter_cache.dart
+++ b/packages/flutter_tools/lib/src/flutter_cache.dart
@@ -51,14 +51,6 @@ class FlutterCache extends Cache {
registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));
}
registerArtifact(FontSubsetArtifacts(this, platform: platform));
- registerArtifact(PubDependencies(
- logger: logger,
- // flutter root and pub must be lazily initialized to avoid accessing
- // before the version is determined.
- flutterRoot: () => Cache.flutterRoot!,
- pub: () => pub,
- projectFactory: projectFactory,
- ));
}
}
@@ -1,30 +0,0 @@
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
index e4e474ab6e..5548599802 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
// Populate the cache. We call this before pub get below so that the
// sky_engine package is available in the flutter cache for pub to find.
- if (shouldUpdateCache) {
+ if (false) {
// First always update universal artifacts, as some of these (e.g.
// ios-deploy on macOS) are required to determine `requiredArtifacts`.
final bool offline;
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
index 50783f8435..db94062840 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner<void> {
globals.analytics.suppressTelemetry();
}
- globals.flutterVersion.ensureVersionFile();
final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;
- if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) {
- await globals.flutterVersion.checkFlutterVersionFreshness();
- }
// See if the user specified a specific device.
final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;
@@ -1,69 +0,0 @@
From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001
From: Philip Hayes <philiphayes9@gmail.com>
Date: Thu, 12 Sep 2024 13:23:00 -0700
Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/
`NixOS/nixpkgs` flutter
This patch cleans up `xcode_backend.sh`. It now effectively just runs
`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`.
The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from
argv[0], even though its presence is already guaranteed (the wrapped
`xcode_backend.dart` also relies on this env).
When using nixpkgs flutter, the flutter SDK directory is composed of several
layers, joined together using symlinks (called a `symlinkJoin`). Without this
patch, the auto-discover traverses the symlinks into the wrong layer, and so it
uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some
important envs/flags (like `$FLUTTER_ROOT`).
Using the "unwrapped" dart then manifests in this error when compiling, since
it doesn't see the ios build-support artifacts:
```
$ flutter run -d iphone
Running Xcode build...
Xcode build done. 6.4s
Failed to build iOS app
Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts".
```
---
packages/flutter_tools/bin/xcode_backend.sh | 25 ++++-----------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh
index 2889d7c8e4..48b9d06c6e 100755
--- a/packages/flutter_tools/bin/xcode_backend.sh
+++ b/packages/flutter_tools/bin/xcode_backend.sh
@@ -6,24 +6,7 @@
# exit on error, or usage of unset var
set -euo pipefail
-# Needed because if it is set, cd may print the path it changed to.
-unset CDPATH
-
-function follow_links() (
- cd -P "$(dirname -- "$1")"
- file="$PWD/$(basename -- "$1")"
- while [[ -h "$file" ]]; do
- cd -P "$(dirname -- "$file")"
- file="$(readlink -- "$file")"
- cd -P "$(dirname -- "$file")"
- file="$PWD/$(basename -- "$file")"
- done
- echo "$file"
-)
-
-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
-FLUTTER_ROOT="$BIN_DIR/../../.."
-DART="$FLUTTER_ROOT/bin/dart"
-
-"$DART" "$BIN_DIR/xcode_backend.dart" "$@"
+# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT.
+dart="${FLUTTER_ROOT}/bin/dart"
+xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart"
+exec "${dart}" "${xcode_backend_dart}" "$@"
--
2.46.0
@@ -1,44 +0,0 @@
This patch introduces an intermediate Gradle build step to alter the behavior
of flutter_tools' Gradle project, specifically moving the creation of `build`
and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.
Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`
directories within the Nix Store. Resulting in read-only errors when trying to build a
Flutter Android app at runtime.
This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project
when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`
`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.
The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it.
This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.
To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.
diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle
new file mode 100644
index 0000000000..b2485c94b4
--- /dev/null
+++ b/packages/flutter_tools/gradle/settings.gradle
@@ -0,0 +1,19 @@
+rootProject.buildFileName = "/dev/null"
+
+def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)
+def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")
+dir.mkdirs()
+def file = new File(dir, "settings.gradle")
+
+file.text = """
+rootProject.projectDir = new File("$settingsDir")
+apply from: new File("$settingsDir/settings.gradle.kts")
+
+gradle.allprojects { project ->
+ project.beforeEvaluate {
+ project.layout.buildDirectory = new File("$dir/build")
+ }
+}
+"""
+
+includeBuild(dir)
+1 -2
View File
@@ -6,7 +6,6 @@
callPackage,
isl_0_20,
noSysDirs,
lowPrio,
wrapCC,
}@args:
@@ -18,7 +17,7 @@ let
majorVersion = lib.versions.major majorMinorVersion;
atLeast = lib.versionAtLeast majorMinorVersion;
attrName = "gcc${lib.replaceStrings [ "." ] [ "" ] majorMinorVersion}";
pkg = lowPrio (
pkg = lib.lowPrio (
wrapCC (
callPackage ./default.nix {
inherit noSysDirs;
@@ -3,7 +3,6 @@
callPackage,
stdenv,
stdenvAdapters,
recurseIntoAttrs,
gccVersions ? { },
patchesFn ? lib.id,
buildPackages,
@@ -44,7 +43,7 @@ let
args.name or (if (gitRelease != null) then "git" else lib.versions.major release_version);
in
lib.nameValuePair attrName (
recurseIntoAttrs (
lib.recurseIntoAttrs (
callPackage ./common (
{
inherit (stdenvAdapters) overrideCC;
@@ -1,5 +1,4 @@
{
lowPrio,
pkgs,
targetPackages,
lib,
@@ -190,14 +189,14 @@ makeScopeWithSplicing' {
clang-unwrapped = self.libclang;
llvm-manpages = lowPrio (
llvm-manpages = lib.lowPrio (
self.libllvm.override {
enableManpages = true;
python3 = pkgs.python3; # don't use python-boot
}
);
clang-manpages = lowPrio (
clang-manpages = lib.lowPrio (
self.libclang.override {
enableManpages = true;
python3 = pkgs.python3; # don't use python-boot
@@ -261,7 +260,7 @@ makeScopeWithSplicing' {
lldb = callPackage ./lldb { };
lldb-manpages = lowPrio (
lldb-manpages = lib.lowPrio (
self.lldb.override {
enableManpages = true;
python3 = pkgs.python3; # don't use python-boot
+1 -2
View File
@@ -6,7 +6,6 @@
targetPackages,
stdenv,
pkgs,
recurseIntoAttrs,
# This is the default binutils, but with *this* version of LLD rather
# than the default LLVM version's, if LLD is the choice. We use these for
# the `useLLVM` bootstrapping below.
@@ -56,7 +55,7 @@ let
args.name or (if (gitRelease != null) then "git" else lib.versions.major release_version);
in
lib.nameValuePair attrName (
recurseIntoAttrs (
lib.recurseIntoAttrs (
callPackage ./common (
{
inherit (stdenvAdapters) overrideCC;
@@ -58,7 +58,7 @@ let
";./?.lua;${lua}/share/luajit-2.1/?.lua;/usr/local/share/lua/5.1/?.lua;/usr/local/share/lua/5.1/?/init.lua;${lua}/share/lua/5.1/?.lua;${lua}/share/lua/5.1/?/init.lua;";
};
in
pkgs.recurseIntoAttrs {
lib.recurseIntoAttrs {
checkInterpreterPath =
let
@@ -7,16 +7,16 @@
php.buildComposerProject2 (finalAttrs: {
pname = "grumphp";
version = "2.16.0";
version = "2.17.0";
src = fetchFromGitHub {
owner = "phpro";
repo = "grumphp";
rev = "v${finalAttrs.version}";
hash = "sha256-YEapyEtvI0N9ey9UNbgRd15NyrCqRYJkmD+RuyysIRw=";
hash = "sha256-g2V2clNI0+KzKAPStq1vJZ3gHpBV1EbduWBmzRnuzv8=";
};
vendorHash = "sha256-0MH4Q5FY9nu5Jpz/iMIu99P8ptQY07t3qbXMp6J7bt4=";
vendorHash = "sha256-wDxrLsBA8TMc6Fk+voeHlxQNfJaaef1ydg0ppuJgO2E=";
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
@@ -19,6 +19,7 @@
# dependencies
beartype,
crcmod,
cryptography,
dill,
fastavro,
fasteners,
@@ -63,14 +64,14 @@
buildPythonPackage rec {
pname = "apache-beam";
version = "2.68.0";
version = "2.69.0";
pyproject = true;
src = fetchFromGitHub {
owner = "apache";
repo = "beam";
tag = "v${version}";
hash = "sha256-ENtvgu9qT1OPsDqFJQzKgIATE7F+S5I+AfoBT2iEL8M=";
hash = "sha256-7trrdGQ9jkzG+5/PyBMvHXjR0B4HjOxBhUuxXEcKkLg=";
};
sourceRoot = "${src.name}/sdks/python";
@@ -123,6 +124,7 @@ buildPythonPackage rec {
dependencies = [
beartype
crcmod
cryptography
dill
fastavro
fasteners
@@ -254,10 +256,15 @@ buildPythonPackage rec {
"test_reshuffle_custom_window_preserves_metadata_1"
"test_reshuffle_default_window_preserves_metadata_1"
# AttributeError: 'MaybeReshuffle' object has no attribute 'side_inputs'
# https://github.com/apache/beam/issues/33854
# Dill version 0.3.1.1 is required when using pickle_library=dill.
# Other versions of dill are untested with Apache Beam.
"LocalCombineFnLifecycleTest_0_dill"
"LocalCombineFnLifecycleTest_2_dill"
"test_runner_overrides_default_pickler"
# Require internet access
"test_local_jar_fallback_to_google_maven_mirror"
# AssertionError: Lists differ
"test_default_resources"
"test_files_to_stage"
@@ -4,6 +4,7 @@
buildPythonPackage,
fetchFromGitHub,
setuptools,
addBinToPathHook,
curl-impersonate-chrome,
cffi,
certifi,
@@ -24,14 +25,14 @@
buildPythonPackage rec {
pname = "curl-cffi";
version = "0.12.0";
version = "0.14.0b2";
pyproject = true;
src = fetchFromGitHub {
owner = "lexiforest";
repo = "curl_cffi";
tag = "v${version}";
hash = "sha256-VE/b1Cs/wpZlu7lOURT/QfP7DuNudD441zG603LT4LM=";
hash = "sha256-JXfqZTf26kl2P0OMAw/aTdjQaGtdyTpNnhRPlwMiZNw=";
};
patches = [ ./use-system-libs.patch ];
@@ -47,13 +48,10 @@ buildPythonPackage rec {
certifi
];
env = lib.optionalAttrs stdenv.cc.isGNU {
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
};
pythonImportsCheck = [ "curl_cffi" ];
nativeCheckInputs = [
addBinToPathHook
charset-normalizer
cryptography
fastapi
@@ -81,6 +79,8 @@ buildPythonPackage rec {
disabledTestPaths = [
# test accesses network
"tests/unittest/test_smoke.py::test_async"
# Runs out of memory while testing
"tests/unittest/test_websockets.py"
];
disabledTests = [
@@ -97,11 +97,11 @@ buildPythonPackage rec {
__darwinAllowLocalNetworking = true;
meta = with lib; {
meta = {
changelog = "https://github.com/lexiforest/curl_cffi/releases/tag/${src.tag}";
description = "Python binding for curl-impersonate via cffi";
homepage = "https://curl-cffi.readthedocs.io";
license = licenses.mit;
maintainers = with maintainers; [ chuangzhu ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ chuangzhu ];
};
}
@@ -1,8 +1,6 @@
diff --git a/scripts/build.py b/scripts/build.py
index b705a0d..9bfcaab 100644
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -105,7 +105,6 @@ def get_curl_libraries():
@@ -141,7 +141,6 @@ def get_curl_libraries():
ffibuilder = FFI()
system = platform.system()
root_dir = Path(__file__).parent.parent
@@ -10,7 +8,7 @@ index b705a0d..9bfcaab 100644
ffibuilder.set_source(
@@ -114,9 +113,7 @@ ffibuilder.set_source(
@@ -150,9 +149,7 @@ ffibuilder.set_source(
#include "shim.h"
""",
# FIXME from `curl-impersonate`

Some files were not shown because too many files have changed in this diff Show More