Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-11-06 18:06:03 +00:00
committed by GitHub
156 changed files with 8362 additions and 1491 deletions
+4 -1
View File
@@ -576,7 +576,10 @@ module.exports = async ({ github, context, core, dry }) => {
// Controls level of parallelism. Applies to both the number of concurrent requests
// as well as the number of concurrent workers going through the list of PRs.
const maxConcurrent = 20
// We'll only boost concurrency when we're running many PRs in parallel on a schedule,
// but not for single PRs. This avoids things going wild, when we accidentally make
// too many API requests on treewides.
const maxConcurrent = context.payload.pull_request ? 1 : 20
await withRateLimit({ github, core, maxConcurrent }, async (stats) => {
if (context.payload.pull_request) {
+24 -8
View File
@@ -128,11 +128,20 @@ async function handleMerge({
(await getTeamMembers('nixpkgs-committers')).map(({ id }) => id),
)
const files = await github.paginate(github.rest.pulls.listFiles, {
...context.repo,
pull_number,
per_page: 100,
})
const files = (
await github.rest.pulls.listFiles({
...context.repo,
pull_number,
per_page: 100,
})
).data
// Early exit to prevent treewides from using up a lot of API requests (and time!) to list
// all the files in the pull request. For now, the merge-bot will not work when 100 or more
// files are touched in a PR - which should be more than fine.
// TODO: Find a more efficient way of downloading all the *names* of the touched files,
// including an early exit when the first non-by-name file is found.
if (files.length >= 100) return false
// Only look through comments *after* the latest (force) push.
const lastPush = events.findLastIndex(
@@ -182,7 +191,9 @@ async function handleMerge({
}`,
{ node_id: pull_request.node_id, sha: pull_request.head.sha },
)
return `[Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge`
return [
`:heavy_check_mark: [Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge (#306934)`,
]
} catch (e) {
log('Enqueing failed', e.response.errors[0].message)
}
@@ -201,7 +212,12 @@ async function handleMerge({
}`,
{ node_id: pull_request.node_id, sha: pull_request.head.sha },
)
return 'Enabled Auto Merge'
return [
`:heavy_check_mark: Enabled Auto Merge (#306934)`,
'',
'> [!TIP]',
'> Sometimes GitHub gets stuck after enabling Auto Merge. In this case, leaving another approval should trigger the merge.',
]
} catch (e) {
log('Auto Merge failed', e.response.errors[0].message)
throw new Error(e.response.errors[0].message)
@@ -287,7 +303,7 @@ async function handleMerge({
if (result) {
await react('ROCKET')
try {
body.push(`:heavy_check_mark: ${await merge()} (#306934)`)
body.push(...(await merge()))
} catch (e) {
// Remove the HTML comment with node_id reference to allow retrying this merge on the next run.
body.shift()
+35 -20
View File
@@ -13,6 +13,34 @@ async function handleReviewers({
}) {
const pull_number = pull_request.number
const requested_reviewers = new Set(
pull_request.requested_reviewers.map(({ login }) => login),
)
log(
'reviewers - requested_reviewers',
Array.from(requested_reviewers).join(', '),
)
const existing_reviewers = new Set(
reviews.map(({ user }) => user?.login).filter(Boolean),
)
log(
'reviewers - existing_reviewers',
Array.from(existing_reviewers).join(', '),
)
// Early sanity check, before we start making any API requests. The list of maintainers
// does not have duplicates so the only user to filter out from this list would be the
// PR author. Therefore, we check for a limit of 15+1, where 15 is the limit we check
// further down again.
// This is to protect against huge treewides consuming all our API requests for no
// reason.
if (maintainers.length > 16) {
core.warning('Too many potential reviewers, skipping review requests.')
// Return a boolean on whether the "needs: reviewers" label should be set.
return existing_reviewers.size === 0 && requested_reviewers.size === 0
}
const users = new Set([
...(await Promise.all(
maintainers.map(async (id) => (await getUser(id)).login),
@@ -47,6 +75,9 @@ async function handleReviewers({
const reviewers = (
await Promise.all(
Array.from(new_reviewers, async (username) => {
// TODO: Restructure this file to only do the collaborator check for those users
// who were not already part of a team. Being a member of a team makes them
// collaborators by definition.
try {
await github.rest.repos.checkCollaborator({
...context.repo,
@@ -65,29 +96,13 @@ async function handleReviewers({
log('reviewers - reviewers', reviewers.join(', '))
if (reviewers.length > 15) {
log(
core.warning(
`Too many reviewers (${reviewers.join(', ')}), skipping review requests.`,
)
// false indicates, that we do have reviewers and don't need the "needs: reviewers" label.
return false
// Return a boolean on whether the "needs: reviewers" label should be set.
return existing_reviewers.size === 0 && requested_reviewers.size === 0
}
const requested_reviewers = new Set(
pull_request.requested_reviewers.map(({ login }) => login),
)
log(
'reviewers - requested_reviewers',
Array.from(requested_reviewers).join(', '),
)
const existing_reviewers = new Set(
reviews.map(({ user }) => user?.login).filter(Boolean),
)
log(
'reviewers - existing_reviewers',
Array.from(existing_reviewers).join(', '),
)
const non_requested_reviewers = new Set(reviewers)
.difference(requested_reviewers)
// We don't want to rerequest reviews from people who already reviewed.
@@ -117,7 +132,7 @@ async function handleReviewers({
// Return a boolean on whether the "needs: reviewers" label should be set.
return (
new_reviewers.size === 0 &&
non_requested_reviewers.size === 0 &&
existing_reviewers.size === 0 &&
requested_reviewers.size === 0
)
+28 -9
View File
@@ -763,11 +763,26 @@ rec {
# Inputs
`extendMkDerivation`-specific configurations
: `constructDrv`: Base build helper, the `mkDerivation`-like build helper to extend.
: `excludeDrvArgNames`: Argument names not to pass from the input fixed-point arguments to `constructDrv`. Note: It doesn't apply to the updating arguments returned by `extendDrvArgs`.
: `extendDrvArgs` : An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`.
: `inheritFunctionArgs`: Whether to inherit `__functionArgs` from the base build helper (default to `true`).
: `transformDrv`: Function to apply to the result derivation (default to `lib.id`).
: `constructDrv` (required)
: Base build helper, the `mkDerivation`-like build helper to extend.
`excludeDrvArgNames` (default to `[ ]`)
: Argument names not to pass from the input fixed-point arguments to `constructDrv`.
It doesn't apply to the updating arguments returned by `extendDrvArgs`.
`excludeFunctionArgNames` (default to `[ ]`)
: `__functionArgs` attribute names to remove from the result build helper.
`excludeFunctionArgNames` is useful for argument deprecation while avoiding ellipses.
`extendDrvArgs` (required)
: An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`.
`inheritFunctionArgs` (default to `true`)
: Whether to inherit `__functionArgs` from the base build helper.
Set `inheritFunctionArgs` to `false` when `extendDrvArgs`'s `args` set pattern does not contain an ellipsis.
`transformDrv` (default to `lib.id`)
: Function to apply to the result derivation.
# Type
@@ -776,6 +791,7 @@ rec {
{
constructDrv :: ((FixedPointArgs | AttrSet) -> a)
excludeDrvArgNames :: [ String ],
excludeFunctionArgNames :: [ String ]
extendDrvArgs :: (AttrSet -> AttrSet -> AttrSet)
inheritFunctionArgs :: Bool,
transformDrv :: a -> a,
@@ -836,6 +852,7 @@ rec {
{
constructDrv,
excludeDrvArgNames ? [ ],
excludeFunctionArgNames ? [ ],
extendDrvArgs,
inheritFunctionArgs ? true,
transformDrv ? id,
@@ -850,10 +867,12 @@ rec {
)
# Add __functionArgs
(
# Inherit the __functionArgs from the base build helper
optionalAttrs inheritFunctionArgs (removeAttrs (functionArgs constructDrv) excludeDrvArgNames)
# Recover the __functionArgs from the derived build helper
// functionArgs (extendDrvArgs { })
removeAttrs (
# Inherit the __functionArgs from the base build helper
optionalAttrs inheritFunctionArgs (removeAttrs (functionArgs constructDrv) excludeDrvArgNames)
# Recover the __functionArgs from the derived build helper
// functionArgs (extendDrvArgs { })
) excludeFunctionArgNames
)
// {
inherit
+9
View File
@@ -223,6 +223,15 @@ checkConfigError 'A definition for option .* is not of type .path in the Nix sto
checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store/.links"' config.pathInStore.bad4 ./types.nix
checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: "/foo/bar"' config.pathInStore.bad5 ./types.nix
# types.externalPath
checkConfigOutput '".*/foo/bar"' config.externalPath.ok1 ./types.nix
checkConfigOutput '".*/"' config.externalPath.ok2 ./types.nix
checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad1 ./types.nix
checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad2 ./types.nix
checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad3 ./types.nix
checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad4 ./types.nix
checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad5 ./types.nix
# types.fileset
checkConfigOutput '^0$' config.filesetCardinal.ok1 ./fileset.nix
checkConfigOutput '^1$' config.filesetCardinal.ok2 ./fileset.nix
+8
View File
@@ -15,6 +15,7 @@ in
{
options = {
pathInStore = mkOption { type = types.lazyAttrsOf types.pathInStore; };
externalPath = mkOption { type = types.lazyAttrsOf types.externalPath; };
assertions = mkOption { };
};
config = {
@@ -26,6 +27,13 @@ in
pathInStore.bad3 = "${storeDir}/";
pathInStore.bad4 = "${storeDir}/.links"; # technically true, but not reasonable
pathInStore.bad5 = "/foo/bar";
externalPath.bad1 = "${storeDir}/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv";
externalPath.bad2 = "${storeDir}/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15";
externalPath.bad3 = "${storeDir}/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash";
externalPath.bad4 = "";
externalPath.bad5 = "./foo/bar";
externalPath.ok1 = "/foo/bar";
externalPath.ok2 = "/";
assertions =
with lib.types;
+5
View File
@@ -676,6 +676,11 @@ let
inStore = true;
};
externalPath = pathWith {
absolute = true;
inStore = false;
};
pathWith =
{
inStore ? null,
+26 -6
View File
@@ -1069,6 +1069,13 @@
}
];
};
alch-emi = {
email = "emi@alchemi.dev";
github = "Alch-Emi";
githubId = 38897201;
name = "Emi";
matrix = "@emi:the-apothecary.club";
};
aldenparker = {
github = "aldenparker";
githubId = 32986873;
@@ -13986,6 +13993,14 @@
githubId = 4032;
name = "Kristoffer Thømt Ravneberg";
};
krishnans2006 = {
email = "krishnans2006@gmail.com";
matrix = "@krishnans2006:matrix.org";
github = "krishnans2006";
githubId = 62958782;
name = "Krishnan Shankar";
keys = [ { fingerprint = "A30C 1843 F470 4843 5D54 3D68 29CB 06A8 40D0 E14A"; } ];
};
kristian-brucaj = {
email = "kbrucaj@gmail.com";
github = "Flameslice";
@@ -14308,6 +14323,17 @@
githubId = 55911173;
name = "Gwendolyn Quasebarth";
};
lajp = {
email = "lajp@iki.fi";
github = "lajp";
githubId = 31856315;
name = "Luukas Pörtfors";
keys = [
{
fingerprint = "24E8 E4CC 0295 F4ED B9E0 B4A6 C913 9B8D EA65 BD82";
}
];
};
lamarios = {
matrix = "@lamarios:matrix.org";
github = "lamarios";
@@ -21762,12 +21788,6 @@
{ fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048"; }
];
};
redbaron = {
email = "ivanov.maxim@gmail.com";
github = "redbaron";
githubId = 16624;
name = "Maxim Ivanov";
};
redfish64 = {
email = "engler@gmail.com";
github = "redfish64";
@@ -31,6 +31,21 @@ merging is handled.
: A path that is contained in the Nix store. This can be a top-level store
path like `pkgs.hello` or a descendant like `"${pkgs.hello}/bin/hello"`.
`types.externalPath`
: A path that is not contained in the Nix store. Typical use cases are:
secrets, password or any other external file.
::: {.warning}
This type only validates that the path is not *currently* in the Nix store.
It does NOT prevent the value from being copied to the store later when:
- Referenced in a derivation
- Used in certain path operations (e.g., `${path}` interpolation)
- Passed to functions that copy to the store
Users must still be careful about how they reference these paths.
:::
`types.pathWith` { *`inStore`* ? `null`, *`absolute`* ? `null` }
: A filesystem path. Either a string or something that can be coerced
@@ -452,6 +452,8 @@ and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325).
- `services.xserver.desktopManager.deepin` and associated packages have been removed due to being unmaintained. See issue [#422090](https://github.com/NixOS/nixpkgs/issues/422090) for more details.
- `services.matter-server` now hosts a debug dashboard on the configured port. Open the port on the firewall with `services.matter-server.openFirewall`.
- The new option [networking.ipips](#opt-networking.ipips) has been added to create IP within IP kind of tunnels (including 4in6, ip6ip6 and ipip).
With the existing [networking.sits](#opt-networking.sits) option (6in4), it is now possible to create all combinations of IPv4 and IPv6 encapsulation.
@@ -25,6 +25,12 @@ in
description = "Port to expose the matter-server service on.";
};
openFirewall = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Whether to open the port in the firewall.";
};
logLevel = lib.mkOption {
type = lib.types.enum [
"critical"
@@ -48,6 +54,8 @@ in
};
config = lib.mkIf cfg.enable {
networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ];
systemd.services.matter-server = {
after = [ "network-online.target" ];
before = [ "home-assistant.service" ];
+4 -4
View File
@@ -41,10 +41,10 @@ in
default = "never";
example = "within_size";
description = ''
never - Do not allocate huge memory pages. This is the default.
always - Attempt to allocate huge memory page every time a new page is needed.
within_size - Only allocate huge memory pages if it will be fully within i_size. Also respect madvise(2) hints. Recommended.
advise - Only allocate huge memory pages if requested with madvise(2).
- `never` - Do not allocate huge memory pages. This is the default.
- `always` - Attempt to allocate huge memory page every time a new page is needed.
- `within_size` - Only allocate huge memory pages if it will be fully within i_size. Also respect madvise(2) hints. Recommended.
- `advise` - Only allocate huge memory pages if requested with madvise(2).
'';
};
+4
View File
@@ -16,6 +16,7 @@ in
services.matter-server = {
enable = true;
port = 1234;
openFirewall = true;
};
};
};
@@ -43,6 +44,9 @@ in
with subtest("Check storage directory is created"):
machine.succeed("ls /var/lib/matter-server/chip.json")
with subtest("Check dashboard loads"):
machine.succeed("curl -f 127.0.0.1:1234")
with subtest("Check systemd hardening"):
_, output = machine.execute("systemd-analyze security matter-server.service | grep -v ''")
machine.log(output)
@@ -6,11 +6,11 @@
melpaBuild rec {
pname = "ebuild-mode";
version = "1.78";
version = "1.79";
src = fetchzip {
url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2";
hash = "sha256-vpNjhW3U/b+A4O78vYKoMN0Gutd6fRcB4wb3dz1z2Cc=";
hash = "sha256-FV9e6QF85yPnowfmseo53/Q36W3wlOgTG0/X4r7OHiI=";
};
meta = {
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-augment";
publisher = "augment";
version = "0.613.0";
hash = "sha256-2HvDCfNX+snwnqd9XI6rHBkGBydxnf5OYYfBnAAxjZk=";
version = "0.627.0";
hash = "sha256-ceaGN7xhVLcMFC+5jYijpqeTJa1zsgCsvQs5mf1ueYM=";
};
meta = {
@@ -1,10 +1,10 @@
{
"chromium": {
"version": "142.0.7444.59",
"version": "142.0.7444.134",
"chromedriver": {
"version": "142.0.7444.60",
"hash_darwin": "sha256-5Atr7h0jIneU4VbSF20j+3tcYVneYvqOsJ0GG8sD7r4=",
"hash_darwin_aarch64": "sha256-sh2BTEKJaAYbiuNYiSW6iChiCroo95EHoGqxVgX6Jw0="
"version": "142.0.7444.135",
"hash_darwin": "sha256-i34SR1pfHcAA4N4ppIioa7r33PnvY0OYA8/+U1bQFs8=",
"hash_darwin_aarch64": "sha256-dsbjEDkZ0AVghazgF5w9O3aUWZNSy8R9WiHn9m/Sa9g="
},
"deps": {
"depot_tools": {
@@ -21,8 +21,8 @@
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "4b8153ab58d3c3f4c9f7e4baad9616ecf80db5fa",
"hash": "sha256-RZQD9aL/YglC8chM7tqtB1Y2u6DF+6kkgwklUohaBXc=",
"rev": "b6965f826881a60c51151cfc0a0175966a0a4e81",
"hash": "sha256-NTBQrGihsT7kuY/Mac5s4oH1xEn3CFEAR6eOEvZwmYs=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -132,8 +132,8 @@
},
"src/third_party/dawn": {
"url": "https://dawn.googlesource.com/dawn.git",
"rev": "cee9cb0d67e749bf42f5e90cb3b8a6f525dbb920",
"hash": "sha256-loKRLJfTxBxlTbPVWZqGdx0DyPvEopbs2zIf4gaxoLo="
"rev": "95f9c2b375395cc82941babdf1e9f0cf60a32831",
"hash": "sha256-BFJsVt7hkSyyPQiX7QCN7Fu6CgTF/2xwAQbWCkJVq6M="
},
"src/third_party/dawn/third_party/glfw": {
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -257,8 +257,8 @@
},
"src/third_party/devtools-frontend/src": {
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
"rev": "38cfe98a56a034da33ee62a5f1ea235fe47f58a7",
"hash": "sha256-bUJuFEDqgUFdMfmMyroX4s2ky/2n37PsTWaV+iQHCJg="
"rev": "f063edc91e3610a60fb9d486ae8694f2a11fcd17",
"hash": "sha256-qiucde85rKA7TefveIa++sOF+MzT56pe8pHUUCj9Zeo="
},
"src/third_party/dom_distiller_js/dist": {
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -807,8 +807,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "bb294624702efbb17691b642333f06bf5108e600",
"hash": "sha256-ovlKdiBYD9RAjA1XI0PLp/pt25LAvm3fn5AqWlJQfgs="
"rev": "4427aa4a9c14d3d542866c0ed2ae8a8554cfd68d",
"hash": "sha256-SL9YaplMFA1Ez11bIzAfl/F5qQob/PvCP1uknP1LiLs="
}
}
},
@@ -77,5 +77,7 @@ stdenv.mkDerivation rec {
maintainers = [ ];
platforms = lib.platforms.all;
# The last successful Darwin Hydra build was in 2024
broken = stdenv.hostPlatform.isDarwin;
};
}
+13 -5
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
pkg-config,
meson,
ninja,
@@ -9,15 +10,15 @@
libXext,
}:
stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "9menu";
version = "unstable-2021-02-24";
version = "1.11";
src = fetchFromGitHub {
owner = "arnoldrobbins";
repo = "9menu";
rev = "00cbf99c48dc580ca28f81ed66c89a98b7a182c8";
sha256 = "arca8Gbr4ytiCk43cifmNj7SUrDgn1XB26zAhZrVDs0=";
tag = "9menu-release-${finalAttrs.version}";
hash = "sha256-J0vHArLH8WDCOvbbF4TYd9b75+5UkhnVdhbbeiUJ4SM=";
};
nativeBuildInputs = [
@@ -30,6 +31,13 @@ stdenv.mkDerivation {
libXext
];
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"9menu-release-([0-9.]+)"
];
};
meta = {
homepage = "https://github.com/arnoldrobbins/9menu";
description = "Simple X11 menu program for running commands";
@@ -38,4 +46,4 @@ stdenv.mkDerivation {
maintainers = [ ];
platforms = libX11.meta.platforms;
};
}
})
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "argocd-autopilot";
version = "0.4.19";
version = "0.4.20";
src = fetchFromGitHub {
owner = "argoproj-labs";
repo = "argocd-autopilot";
rev = "v${version}";
sha256 = "sha256-ZJVlmZX/eQnOM2mlAe7DOyvykjgi5DHMqHoPAHPZlXM=";
sha256 = "sha256-JLh41ZWiDcDrUtd8d+Ak5TFca4L6VHzUguS55P9lmj0=";
};
vendorHash = "sha256-GzSkA8JO0LEVeGIRKkr1Ff1P8WhNIEvRmry91agYJRo=";
vendorHash = "sha256-Ur0BfIg4lZakjx01UOL4n5/O1yjTJJcGuDxWVDqUOyY=";
proxyVendor = true;
+2
View File
@@ -32,5 +32,7 @@ stdenv.mkDerivation rec {
description = "Virtual filesystem that allows browsing of compressed files";
platforms = lib.platforms.unix;
license = lib.licenses.gpl2Only;
# The last successful Darwin Hydra build was in 2024
broken = stdenv.hostPlatform.isDarwin;
};
}
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "awsbck";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "beeb";
repo = "awsbck";
rev = "v${version}";
hash = "sha256-IFdhfBri1k5u7NfC1HTSegKCtRDK2fz+WkjwHOtp1qk=";
hash = "sha256-WWYUMamMDtnvOR7vjoKd1Kn8vJBAAa9Jj8MFPRGQfEQ=";
};
cargoHash = "sha256-9RKsnGjbP0iQsC2iCq6LTleILHvX0powQu15oopE2XY=";
cargoHash = "sha256-eo7NBGDPhu+v07dUUw/k1O62gxbeXh1PdPogTjg6l8I=";
# tests run in CI on the source repo
doCheck = false;
+10
View File
@@ -1,6 +1,7 @@
{
lib,
stdenv,
fetchpatch,
perlPackages,
shortenPerlShebang,
texlive,
@@ -15,6 +16,15 @@ perlPackages.buildPerlModule {
src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz";
# Test suite checks years that are out of range with 32bit integers
patches = lib.optionals stdenv.hostPlatform.is32bit [
(fetchpatch {
name = "biber-skip-64bit-only-tests.patch";
url = "https://raw.githubusercontent.com/gentoo/gentoo/65871ad2d20b8ab39caf25a0aaec3ab95fbcf511/dev-tex/biber/files/biber-2.16-disable-64bit-only-tests.patch";
hash = "sha256-6Tbp62uZuFPoSKZrXerObg+gcSyLwC66IAcvcP+KcHM=";
})
];
buildInputs = with perlPackages; [
autovivification
BusinessISBN
+10 -39
View File
@@ -5,11 +5,11 @@
cmake,
ninja,
perl,
buildGoModule,
gitUpdater,
}:
# reference: https://boringssl.googlesource.com/boringssl/+/refs/tags/0.20250818.0/BUILDING.md
buildGoModule (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
pname = "boringssl";
version = "0.20251002.0";
@@ -30,18 +30,6 @@ buildGoModule (finalAttrs: {
perl
];
vendorHash = "sha256-IXmnoCYLoiQ/XL2wjksRFv5Kwsje0VNkcupgGxG6rSY=";
proxyVendor = true;
# hack to get both go and cmake configure phase
# (if we use postConfigure then cmake will loop runHook postConfigure)
preBuild = ''
cmakeConfigurePhase
''
+ lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
export GOARCH=$(go env GOHOSTARCH)
'';
env.NIX_CFLAGS_COMPILE = toString (
lib.optionals stdenv.cc.isGNU [
# Needed with GCC 12 but breaks on darwin (with clang)
@@ -52,42 +40,25 @@ buildGoModule (finalAttrs: {
]
);
buildPhase = ''
ninjaBuildPhase
'';
# CMAKE_OSX_ARCHITECTURES is set to x86_64 by Nix, but it confuses boringssl on aarch64-linux.
cmakeFlags = [
"-GNinja"
]
++ lib.optionals (stdenv.hostPlatform.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ];
installPhase = ''
runHook preInstall
mkdir -p $bin/bin $dev $out/lib
install -Dm755 bssl -t $bin/bin
install -Dm644 {libcrypto,libdecrepit,libpki,libssl}.a -t $out/lib
cp -r ../include $dev
runHook postInstall
'';
outputs = [
"out"
"bin"
"dev"
];
passthru.updateScript = gitUpdater { };
meta = {
description = "Free TLS/SSL implementation";
mainProgram = "bssl";
homepage = "https://boringssl.googlesource.com";
maintainers = [ lib.maintainers.thoughtpolice ];
maintainers = with lib.maintainers; [
thoughtpolice
theoparis
niklaskorz
];
license = with lib.licenses; [
openssl
asl20
isc
mit
bsd3
+2 -2
View File
@@ -24,8 +24,8 @@ mkDerivation {
pname = "bruijn";
version = "0.1.0.0";
src = fetchzip {
url = "https://github.com/marvinborner/bruijn/archive/9b7ff47f7c4d75093fcf6910b8d33aa44e0516ad.tar.gz";
sha256 = "1zx2pcrd25gsq6qz0rixpsdwm0h05cjn5f1a2d2ivbmax88yvsjf";
url = "https://github.com/marvinborner/bruijn/archive/c37a9d27b9f654b1e0118d32269a1548800b062b.tar.gz";
sha256 = "1a667693agsc559yy4k04gxv1hlsgkn3aw64yvg876fbn5dr7sk3";
};
isLibrary = true;
isExecutable = true;
+1 -1
View File
@@ -1 +1 @@
0-unstable-2025-10-28
0-unstable-2025-11-01
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cdncheck";
version = "1.2.7";
version = "1.2.8";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cdncheck";
tag = "v${version}";
hash = "sha256-Tit9AJ6V20vutd4veymlyi9thstcf6+sefHfhGeRQ68=";
hash = "sha256-nMKIvRV6lfJgpzPGQVOeFBjkjt3RcFHw8sXiFRP+Vok=";
};
vendorHash = "sha256-n0/9VLnB4y0YSbc6fu9SP0sWfGFSh7QgZfJkHMJB80U=";
+3 -3
View File
@@ -10,10 +10,10 @@
let
pname = "chatzone-desktop";
version = "5.4.1";
version = "5.5.0";
src = fetchurl {
url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.4.1/872/chatzone-desktop-linux-5.4.1.AppImage";
hash = "sha256-ONr8rIP7oXtafACkW4fDHfYew83F4R8un+hGdVI75iA=";
url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.5.0/925/chatzone-desktop-linux-5.5.0.AppImage";
hash = "sha256-2Ly0qABTqleqH0AoAIJ+JNYFyoikxZroiFrYwSxBtdw=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
in
+2
View File
@@ -46,5 +46,7 @@ stdenv.mkDerivation rec {
homepage = "https://coan2.sourceforge.net/";
license = licenses.bsd3;
platforms = platforms.all;
# The last successful Darwin Hydra build was in 2024
broken = stdenv.hostPlatform.isDarwin;
};
}
+2 -2
View File
@@ -23,13 +23,13 @@ let
in
buildDartApplication rec {
pname = "dart-sass";
version = "1.93.2";
version = "1.93.3";
src = fetchFromGitHub {
owner = "sass";
repo = "dart-sass";
tag = version;
hash = "sha256-YE4s0um3WR6N0KsXgLjvoiqjr8dQg8WOyZRbfoZlbqE=";
hash = "sha256-I51wpm2HmeuXk0F9O1uTvFA5Hk8sAs+JsumW+N3EPXA=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
+19 -19
View File
@@ -4,21 +4,21 @@
"dependency": "transitive",
"description": {
"name": "_fe_analyzer_shared",
"sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
"sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "85.0.0"
"version": "91.0.0"
},
"analyzer": {
"dependency": "direct dev",
"description": {
"name": "analyzer",
"sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d",
"sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.7.1"
"version": "8.4.1"
},
"archive": {
"dependency": "direct dev",
@@ -154,11 +154,11 @@
"dependency": "direct dev",
"description": {
"name": "crypto",
"sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
"sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.6"
"version": "3.0.7"
},
"csslib": {
"dependency": "transitive",
@@ -184,21 +184,21 @@
"dependency": "transitive",
"description": {
"name": "dart_style",
"sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
"sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.1"
"version": "3.1.2"
},
"dartdoc": {
"dependency": "direct dev",
"description": {
"name": "dartdoc",
"sha256": "f978526530e42dbb831295af743c057d94533e89c27ce1f4023b252f3d85b8be",
"sha256": "73335ae67d2766ff753dc78b0f33ceb399ba5b94a5cfe8ce8d4128fb631717ee",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.3.4"
"version": "9.0.0"
},
"ffi": {
"dependency": "transitive",
@@ -434,11 +434,11 @@
"dependency": "transitive",
"description": {
"name": "oauth2",
"sha256": "c84470642cbb2bec450ccab2f8520c079cd1ca546a76ffd5c40589e07f4e8bf4",
"sha256": "890a032ba1b44fa8dcfeba500e613df0ecbe16aeace13bb0fe1d25eb42cda5b8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.3"
"version": "2.0.5"
},
"package_config": {
"dependency": "direct main",
@@ -484,21 +484,21 @@
"dependency": "direct main",
"description": {
"name": "protobuf",
"sha256": "de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e",
"sha256": "2fcc8a202ca7ec17dab7c97d6b6d91cf03aa07fe6f65f8afbb6dfa52cc5bd902",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.2.0"
"version": "5.1.0"
},
"protoc_plugin": {
"dependency": "direct dev",
"description": {
"name": "protoc_plugin",
"sha256": "5bf4289e0fa9eec4b0ee4e77111fa47fa2e6b54b2a7b9c2e83ec87a971542f01",
"sha256": "c3893590d5b81345dfd4daa25c1890092667983fd4374bb6671b2a9a481d8359",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "22.5.0"
"version": "23.0.0"
},
"pub_api_client": {
"dependency": "direct dev",
@@ -744,11 +744,11 @@
"dependency": "direct main",
"description": {
"name": "watcher",
"sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
"sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.3"
"version": "1.1.4"
},
"web": {
"dependency": "transitive",
@@ -812,6 +812,6 @@
}
},
"sdks": {
"dart": ">=3.8.0 <4.0.0"
"dart": ">=3.9.0 <4.0.0"
}
}
+3 -3
View File
@@ -9,14 +9,14 @@
rustPlatform.buildRustPackage rec {
pname = "diffedit3";
version = "0.6.0";
version = "0.6.1";
src = fetchCrate {
inherit pname version;
hash = "sha256-o3Y3SQLkMxYMepGyvK6m/8aA5ZDwCAYdYUhGplkckjU=";
hash = "sha256-tlrP97XMAAnk5H5wTHPsP1DMSmDqV9wJp1n+22jUtnM=";
};
cargoHash = "sha256-XAtp5pCKFQRqyF9Y0udrcudgF5i3vWxk//kZ/hRsFaA=";
cargoHash = "sha256-Hv3T0pxNUwp7No5tmFopMGjNdxfje4gRODj3B7sDVcg=";
passthru = {
updateScript = nix-update-script { };
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "dotenv-linter";
version = "3.3.0";
version = "4.0.0";
src = fetchFromGitHub {
owner = "dotenv-linter";
repo = "dotenv-linter";
rev = "v${version}";
sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo=";
sha256 = "sha256-H4a/JM2CFrELmP4w4vrFxbvmvdTQk8k7g3QjQKm++Uk=";
};
cargoHash = "sha256-lBHqvwZrnkSfmMXBmnhovbDn+pf5iLJepJjO/FKT1wY=";
cargoHash = "sha256-11u3a4W3vrGJQXjSMcDAS5D9mqG+XJ0L5FYmqqH/McM=";
meta = with lib; {
description = "Lightning-fast linter for .env files. Written in Rust";
+2 -2
View File
@@ -5,14 +5,14 @@
}:
python3Packages.buildPythonApplication rec {
pname = "dpt-rp1-py";
version = "0.1.16";
version = "0.1.18";
format = "pyproject";
src = fetchFromGitHub {
owner = "janten";
repo = "dpt-rp1-py";
rev = "v${version}";
sha256 = "0zvf09b9rzpx5b0w81ziqd7v321hfhgsgvshdx23karj2hf75bvj";
sha256 = "sha256-5Ny62Kp1GHH9vmPSZ6smNqyEt9PZYPHAiungHZQMB/A=";
};
doCheck = false;
+11 -10
View File
@@ -1,23 +1,23 @@
{
lib,
stdenv,
nix-update-script,
fetchgit,
fetchFromGitHub,
ncurses,
}:
stdenv.mkDerivation (finalAttrs: {
stdenv.mkDerivation {
pname = "ee";
version = "1.5.2";
version = "1.5.2-unstable-2024-06-20";
src = fetchgit {
url = "https://git.freebsd.org/src.git";
tag = "release/14.3.0";
outputHash = "sha256-nMhHXeoam9VtUuhhi0eoGZfcW9zZhpYQKVYbkAbfgc0=";
src = fetchFromGitHub {
owner = "freebsd";
repo = "freebsd-src";
rev = "0667538b888c1171932c6cf28b62fc19d393e119";
hash = "sha256-nMhHXeoam9VtUuhhi0eoGZfcW9zZhpYQKVYbkAbfgc0=";
rootDir = "contrib/ee";
};
passthru.updateScript = nix-update-script { };
passthru.updateScript = ./update.sh;
buildInputs = [ ncurses ];
@@ -48,5 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.bsd2;
platforms = lib.platforms.unix;
mainProgram = "ee";
maintainers = with lib.maintainers; [ qweered ];
};
})
}
+30
View File
@@ -0,0 +1,30 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p curl jq common-updater-scripts
set -euo pipefail
owner=freebsd
repo=freebsd-src
path=contrib/ee
pkg_file=./pkgs/by-name/ee/ee/package.nix
api_url_latest="https://api.github.com/repos/$owner/$repo/commits?path=$path&per_page=1"
json_latest=$(curl -sSfL -H "Accept: application/vnd.github+json" ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "$api_url_latest")
latest_rev=$(printf '%s' "$json_latest" | jq -r '.[0].sha')
latest_date=$(printf '%s' "$json_latest" | jq -r '.[0].commit.committer.date' | cut -dT -f1)
if [[ -z "${latest_rev:-}" || "$latest_rev" == "null" ]]; then
echo "Failed to fetch latest commit for path $path" >&2
exit 1
fi
# Fetch EE_VERSION from that commit
raw_url="https://raw.githubusercontent.com/$owner/$repo/$latest_rev/$path/ee_version.h"
ee_version=$(curl -sSfL ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "$raw_url" | sed -n 's/^#define[[:space:]]*EE_VERSION[[:space:]]*"\([^"]*\)".*/\1/p')
if [[ -z "${ee_version:-}" ]]; then
echo "Failed to parse EE_VERSION from ee_version.h at $latest_rev" >&2
exit 1
fi
new_version="${ee_version}-unstable-${latest_date}"
update-source-version ee "$new_version" --rev="$latest_rev" --file="$pkg_file" --ignore-same-version --print-changes
@@ -1,7 +1,7 @@
{
"version" = "1.12.1";
"version" = "1.12.3";
"hashes" = {
"desktopSrcHash" = "sha256-4C4WJ3HjiXh24umt80lWujeiDvRaS1mf2IjCj6+n87U=";
"desktopYarnHash" = "sha256-CyP0zy/nJoGolmB/p81jL0qAoD7d5xe5kvlmKW7Yaw8=";
"desktopSrcHash" = "sha256-4pv6KxcTocguJo7DlBO+/pi+n8JbTHWukMtagaGaDy8=";
"desktopYarnHash" = "sha256-lQn5dAiC15O/2eaWfWJedFjBgmnglAlmAEOhz+in0DM=";
};
}
+6
View File
@@ -1,5 +1,6 @@
{
stdenvNoCC,
nodejs,
yarn,
cacert,
git,
@@ -13,6 +14,7 @@ stdenvNoCC.mkDerivation {
nativeBuildInputs = [
cacert
nodejs
yarn
git
];
@@ -26,6 +28,10 @@ stdenvNoCC.mkDerivation {
export YARN_ENABLE_TELEMETRY=0
yarn install --frozen-lockfile --ignore-platform --skip-integrity-check --ignore-scripts --no-progress --non-interactive
# Apply upstream patch
# Can be removed if upstream removes patches/@types+auto-launch+5.0.5.patch introduced in
# https://github.com/element-hq/element-desktop/commit/5e882f8e08d58bf9663c8e3ab33885bf7b3709de
node ./node_modules/patch-package/index.js
mkdir -p $out/node_modules
cp -r node_modules/* $out/node_modules/
@@ -1,7 +1,7 @@
{
"version" = "1.12.1";
"version" = "1.12.3";
"hashes" = {
"webSrcHash" = "sha256-c9VoR+F33xDvLn4PkPGBXW5+Yl9vX7FzedN6HfjfHEI=";
"webYarnHash" = "sha256-Bu0rrzPNRdY5G/nhSlhXpBMq6tcjuc16s0UQR64gUc8=";
"webSrcHash" = "sha256-a/RrUzJU/pjyD36WmNIqjSTBn5cfUOGNSe/l6iGp/0A=";
"webYarnHash" = "sha256-TXOehZRw5UIhGTnpR0KzvEizSW9Qk2VTr+cG/XstB+k=";
};
}
+2
View File
@@ -50,5 +50,7 @@ stdenv.mkDerivation rec {
'';
license = lib.licenses.gpl2;
homepage = "https://emboss.sourceforge.net/";
# The last successful Darwin Hydra build was in 2024
broken = stdenv.hostPlatform.isDarwin;
};
}
+3
View File
@@ -1,4 +1,5 @@
{
stdenv,
lib,
rustPlatform,
fetchFromGitHub,
@@ -36,5 +37,7 @@ rustPlatform.buildRustPackage rec {
license = lib.licenses.mit;
maintainers = [ ];
mainProgram = "eureka";
# The last successful Darwin Hydra build was in 2024
broken = stdenv.hostPlatform.isDarwin;
};
}
+3 -3
View File
@@ -8,15 +8,15 @@
let
pname = "everest";
version = "5935";
version = "5961";
phome = "$out/lib/Celeste";
in
stdenvNoCC.mkDerivation {
inherit pname version;
src = fetchzip {
url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5935.0/main.zip";
url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5961.0/main.zip";
extension = "zip";
hash = "sha256-XYvXrfHSjSShAg3r2qikt1CPXldYvsU1EvRJNzJoGTU=";
hash = "sha256-zFGBzRbFJOnJ4d8396SoLEgnicDwEqvSbOZKqWSyR+w=";
};
buildInputs = [
icu
+3 -3
View File
@@ -11,7 +11,7 @@
let
pname = "everest";
version = "5935";
version = "5961";
phome = "$out/lib/Celeste";
in
buildDotnetModule {
@@ -20,11 +20,11 @@ buildDotnetModule {
src = fetchFromGitHub {
owner = "EverestAPI";
repo = "Everest";
rev = "6a6da718227b357f5b997499e454d5dc5c3e2788";
rev = "7972286159c1f4d1f219c1101273067d45cd1161";
fetchSubmodules = true;
# TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink
# Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty.
hash = "sha256-qSDcwqjJeb2pNbyriZ/9Gk72DyR5KdIoncXol7JZvFg=";
hash = "sha256-GkWeOfatzw9uLWkzNzjSEM8p+HWuJPbycv/0YNxTdqk=";
};
nativeBuildInputs = [ autoPatchelfHook ];
@@ -50,5 +50,7 @@ rustPlatform.buildRustPackage {
homepage = "https://github.com/finalfusion/finalfrontier/";
license = licenses.asl20;
maintainers = [ ];
# The last successful Darwin Hydra build was in 2024
broken = stdenv.hostPlatform.isDarwin;
};
}
+5 -4
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
flutter332,
flutter335,
mpv-unwrapped,
patchelf,
fetchFromGitHub,
@@ -9,16 +9,16 @@
makeDesktopItem,
}:
let
version = "0.9.19-beta";
version = "0.9.20-beta";
in
flutter332.buildFlutterApplication {
flutter335.buildFlutterApplication {
inherit version;
pname = "finamp";
src = fetchFromGitHub {
owner = "jmshrv";
repo = "finamp";
rev = version;
hash = "sha256-gvVKiaQ6qqMcE90B8T2FJKoViRxmIGsABmcXq+fO5hs=";
hash = "sha256-YuqYuUse6xugvc2hckZBc9kx+ryBmRQhoZzjwkpoNfo=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -36,6 +36,7 @@ flutter332.buildFlutterApplication {
palette_generator = "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0=";
split_view = "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k=";
flutter_user_certificates_android = "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo=";
smtc_windows = "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A=";
};
postFixup = ''
+145 -134
View File
@@ -34,11 +34,11 @@
"dependency": "direct main",
"description": {
"name": "app_links",
"sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba",
"sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.4.0"
"version": "6.4.1"
},
"app_links_linux": {
"dependency": "transitive",
@@ -174,18 +174,18 @@
"dependency": "direct main",
"description": {
"name": "background_downloader",
"sha256": "c59bff0b66a6704bed8bfb09c67571df88167906e0f5543a722373b3d180a743",
"sha256": "a22acfa37aa06ba5cfe6eb7b1aa700c78af64770ff450c73dd3d279d7c37d4ac",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "9.2.3"
"version": "9.2.6"
},
"balanced_text": {
"dependency": "direct main",
"description": {
"path": ".",
"ref": "e387fcaef4fabf7a24e8c7d9dbb9c967ab1582f4",
"resolved-ref": "e387fcaef4fabf7a24e8c7d9dbb9c967ab1582f4",
"ref": "8f3603a639be6a7d5b0008ec54b0e90df7cd8323",
"resolved-ref": "8f3603a639be6a7d5b0008ec54b0e90df7cd8323",
"url": "https://github.com/Komodo5197/flutter-balanced-text.git"
},
"source": "git",
@@ -195,11 +195,11 @@
"dependency": "direct main",
"description": {
"name": "battery_plus",
"sha256": "fb794c34cee2e4ea31005fb17ff15e1d904951ec7f15eedead741021870ee834",
"sha256": "ad16fcb55b7384be6b4bbc763d5e2031ac7ea62b2d9b6b661490c7b9741155bf",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.2.2"
"version": "7.0.0"
},
"battery_plus_platform_interface": {
"dependency": "transitive",
@@ -235,11 +235,11 @@
"dependency": "transitive",
"description": {
"name": "build_cli_annotations",
"sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172",
"sha256": "e563c2e01de8974566a1998410d3f6f03521788160a02503b0b1f1a46c7b3d95",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.0"
"version": "2.1.1"
},
"build_config": {
"dependency": "transitive",
@@ -305,11 +305,11 @@
"dependency": "transitive",
"description": {
"name": "built_value",
"sha256": "0b1b12a0a549605e5f04476031cd0bc91ead1d7c8e830773a18ee54179b3cb62",
"sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.11.0"
"version": "8.12.0"
},
"characters": {
"dependency": "transitive",
@@ -335,11 +335,11 @@
"dependency": "direct main",
"description": {
"name": "chopper",
"sha256": "f366529b450d0fd91931b08339c7c1d09c746d0d20e5ffb8c8641a79b6114dc2",
"sha256": "fb6106cd29553e34c811874efd8e8ee051ad7b9546e0d8c79394d2b6c9621b45",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.2.0"
"version": "8.4.0"
},
"chopper_generator": {
"dependency": "direct dev",
@@ -375,11 +375,11 @@
"dependency": "direct main",
"description": {
"name": "clipboard",
"sha256": "2ec38f0e59878008ceca0ab122e4bfde98847f88ef0f83331362ba4521f565a9",
"sha256": "1920c0337f8808be4166c5f1b236301ff381ef69633b0757c502d97f1f740102",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.3"
"version": "2.0.2"
},
"clock": {
"dependency": "transitive",
@@ -395,11 +395,11 @@
"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": "direct main",
@@ -425,11 +425,11 @@
"dependency": "direct main",
"description": {
"name": "connectivity_plus",
"sha256": "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99",
"sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.1.4"
"version": "7.0.0"
},
"connectivity_plus_platform_interface": {
"dependency": "transitive",
@@ -555,11 +555,11 @@
"dependency": "direct main",
"description": {
"name": "device_info_plus",
"sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
"sha256": "49413c8ca514dea7633e8def233b25efdf83ec8522955cc2c0e3ad802927e7c6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "11.5.0"
"version": "12.1.0"
},
"device_info_plus_platform_interface": {
"dependency": "transitive",
@@ -612,7 +612,7 @@
"version": "2.1.4"
},
"file": {
"dependency": "transitive",
"dependency": "direct main",
"description": {
"name": "file",
"sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
@@ -625,11 +625,11 @@
"dependency": "direct main",
"description": {
"name": "file_picker",
"sha256": "ef9908739bdd9c476353d6adff72e88fd00c625f5b959ae23f7567bd5137db0a",
"sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.2.0"
"version": "10.3.3"
},
"file_sizes": {
"dependency": "direct main",
@@ -651,6 +651,26 @@
"source": "hosted",
"version": "1.1.1"
},
"flex_color_picker": {
"dependency": "direct main",
"description": {
"name": "flex_color_picker",
"sha256": "8f753a1a026a13ea5cc5eddbae3ceb886f2537569ab2e5208efb1e3bb5af72ff",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.7.1"
},
"flex_seed_scheme": {
"dependency": "transitive",
"description": {
"name": "flex_seed_scheme",
"sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.5.1"
},
"flutter": {
"dependency": "direct main",
"description": "flutter",
@@ -681,31 +701,31 @@
"dependency": "direct main",
"description": {
"name": "flutter_discord_rpc",
"sha256": "9363a803863d56fd89c0a21639c70b126245fcbafaeb0a3d091e7ac06951d03f",
"sha256": "7ee12a3ff928e85e5e0a60c7c23417a2f1f4e604e4983fc0789ff6562fb15f2b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.0"
"version": "1.1.0"
},
"flutter_gen_core": {
"dependency": "transitive",
"description": {
"name": "flutter_gen_core",
"sha256": "eda54fdc5de08e7eeea663eb8442aafc8660b5a13fda4e0c9e572c64e50195fb",
"sha256": "b6bafbbd981da2f964eb45bcb8b8a7676a281084f8922c0c75de4cfbaa849311",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.11.0"
"version": "5.12.0"
},
"flutter_gen_runner": {
"dependency": "direct dev",
"description": {
"name": "flutter_gen_runner",
"sha256": "669bf8b7a9b4acbdcb7fcc5e12bf638aca19acedf43341714cbca3bf3a219521",
"sha256": "c99b10af9d404e3f46fd1927e7d90099779e935e86022674c4c2a9e6c2a93b29",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.11.0"
"version": "5.12.0"
},
"flutter_launcher_icons": {
"dependency": "direct dev",
@@ -721,11 +741,11 @@
"dependency": "direct dev",
"description": {
"name": "flutter_lints",
"sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
"sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.0.0"
"version": "6.0.0"
},
"flutter_localizations": {
"dependency": "direct main",
@@ -737,11 +757,11 @@
"dependency": "transitive",
"description": {
"name": "flutter_plugin_android_lifecycle",
"sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
"sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.28"
"version": "2.0.30"
},
"flutter_riverpod": {
"dependency": "direct main",
@@ -757,11 +777,11 @@
"dependency": "transitive",
"description": {
"name": "flutter_rust_bridge",
"sha256": "0ad5079de35d317650fec59b26cb4d0c116ebc2ce703a29f9367513b8a91c287",
"sha256": "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.0"
"version": "2.11.1"
},
"flutter_staggered_grid_view": {
"dependency": "transitive",
@@ -787,11 +807,11 @@
"dependency": "direct main",
"description": {
"name": "flutter_svg",
"sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845",
"sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.0"
"version": "2.2.1"
},
"flutter_tabler_icons": {
"dependency": "direct main",
@@ -813,11 +833,11 @@
"dependency": "direct main",
"description": {
"name": "flutter_to_airplay",
"sha256": "702408986b652dfaef5ad68c6f3c3008941ae8d8ef5db526792239c8d490a16d",
"sha256": "e71e7cbdf363c3f9686625f68b14e57497b507ef72d54016c14ccdffd3e4305d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.5"
"version": "2.1.0"
},
"flutter_user_certificates_android": {
"dependency": "direct main",
@@ -880,11 +900,11 @@
"dependency": "direct main",
"description": {
"name": "get_it",
"sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1",
"sha256": "a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.7.0"
"version": "8.2.0"
},
"glob": {
"dependency": "transitive",
@@ -930,21 +950,21 @@
"dependency": "direct main",
"description": {
"name": "hive_ce",
"sha256": "708bb39050998707c5d422752159f91944d3c81ab42d80e1bd0ee37d8e130658",
"sha256": "89746b555109029a30780e0a601978460b8065643592667f6e43a238faccb8a4",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.11.3"
"version": "2.13.2"
},
"hive_ce_flutter": {
"dependency": "direct main",
"description": {
"name": "hive_ce_flutter",
"sha256": "a0989670652eab097b47544f1e5a4456e861b1b01b050098ea0b80a5fabe9909",
"sha256": "f5bd57fda84402bca7557fedb8c629c96c8ea10fab4a542968d7b60864ca02cc",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.1"
"version": "2.3.2"
},
"hive_ce_generator": {
"dependency": "direct dev",
@@ -970,11 +990,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",
@@ -1010,11 +1030,11 @@
"dependency": "transitive",
"description": {
"name": "image_size_getter",
"sha256": "9a299e3af2ebbcfd1baf21456c3c884037ff524316c97d8e56035ea8fdf35653",
"sha256": "7c26937e0ae341ca558b7556591fd0cc456fcc454583b7cb665d2f03e93e590f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.0"
"version": "2.4.1"
},
"infinite_scroll_pagination": {
"dependency": "direct main",
@@ -1142,11 +1162,11 @@
"dependency": "transitive",
"description": {
"name": "just_audio_platform_interface",
"sha256": "4cd94536af0219fa306205a58e78d67e02b0555283c1c094ee41e402a14a5c4a",
"sha256": "2532c8d6702528824445921c5ff10548b518b13f808c2e34c2fd54793b999a6a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.5.0"
"version": "4.6.0"
},
"just_audio_web": {
"dependency": "transitive",
@@ -1162,41 +1182,41 @@
"dependency": "transitive",
"description": {
"name": "leak_tracker",
"sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
"sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.0.9"
"version": "11.0.2"
},
"leak_tracker_flutter_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_flutter_testing",
"sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
"sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.9"
"version": "3.0.10"
},
"leak_tracker_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_testing",
"sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
"sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.1"
"version": "3.0.2"
},
"lints": {
"dependency": "transitive",
"description": {
"name": "lints",
"sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
"sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.1.1"
"version": "6.0.0"
},
"locale_names": {
"dependency": "direct main",
@@ -1272,8 +1292,8 @@
"dependency": "direct main",
"description": {
"path": "libs/windows/media_kit_libs_windows_audio",
"ref": "475a08cc97b94702f774bc906e1472b5bddc932b",
"resolved-ref": "475a08cc97b94702f774bc906e1472b5bddc932b",
"ref": "bfbcea1976093311d6b0ab6bc004a0cc7cd25811",
"resolved-ref": "bfbcea1976093311d6b0ab6bc004a0cc7cd25811",
"url": "https://github.com/Komodo5197/media-kit.git"
},
"source": "git",
@@ -1303,11 +1323,11 @@
"dependency": "direct dev",
"description": {
"name": "msix",
"sha256": "edde648a8133bf301883c869d19d127049683037c65ff64173ba526ac7a8af2f",
"sha256": "f88033fcb9e0dd8de5b18897cbebbd28ea30596810f4a7c86b12b0c03ace87e5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.16.9"
"version": "3.16.12"
},
"nested": {
"dependency": "transitive",
@@ -1353,21 +1373,21 @@
"dependency": "direct main",
"description": {
"name": "package_info_plus",
"sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
"sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.3.0"
"version": "9.0.0"
},
"package_info_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "package_info_plus_platform_interface",
"sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
"sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.2.0"
"version": "3.2.1"
},
"palette_generator": {
"dependency": "direct main",
@@ -1414,21 +1434,21 @@
"dependency": "transitive",
"description": {
"name": "path_provider_android",
"sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
"sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.17"
"version": "2.2.18"
},
"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",
@@ -1524,11 +1544,11 @@
"dependency": "transitive",
"description": {
"name": "petitparser",
"sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
"sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.1.0"
"version": "7.0.1"
},
"platform": {
"dependency": "transitive",
@@ -1554,11 +1574,11 @@
"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",
@@ -1584,11 +1604,11 @@
"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",
@@ -1614,21 +1634,11 @@
"dependency": "transitive",
"description": {
"name": "qs_dart",
"sha256": "42a7ca80f965786d8d0730633b7cf05c132ebcb9558e04dbc8752f2865caa705",
"sha256": "23e435223d985630e3880fd667128f520237059ca3af0cc2dc029d5365ce9ec1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.9"
},
"recursive_regex": {
"dependency": "transitive",
"description": {
"name": "recursive_regex",
"sha256": "f7252e3d3dfd1665e594d9fe035eca6bc54139b1f2fee38256fa427ea41adc60",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.0"
"version": "1.5.6"
},
"riverpod": {
"dependency": "transitive",
@@ -1764,21 +1774,21 @@
"dependency": "direct main",
"description": {
"name": "share_plus",
"sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da",
"sha256": "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.1.4"
"version": "12.0.0"
},
"share_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "share_plus_platform_interface",
"sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b",
"sha256": "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.0.2"
"version": "6.1.0"
},
"shared_preferences": {
"dependency": "direct main",
@@ -1794,11 +1804,11 @@
"dependency": "transitive",
"description": {
"name": "shared_preferences_android",
"sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
"sha256": "bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.10"
"version": "2.4.13"
},
"shared_preferences_foundation": {
"dependency": "transitive",
@@ -1899,12 +1909,13 @@
"smtc_windows": {
"dependency": "direct main",
"description": {
"name": "smtc_windows",
"sha256": "80f7c10867da485ffdf87f842bf27e6763589933c18c11af5dc1cd1e158c3154",
"url": "https://pub.dev"
"path": "packages/smtc_windows",
"ref": "7ece49cc16a459aaa0718ed23458802533daef37",
"resolved-ref": "7ece49cc16a459aaa0718ed23458802533daef37",
"url": "https://github.com/Komodo5197/frb_plugins.git"
},
"source": "hosted",
"version": "1.0.0"
"source": "git",
"version": "1.1.0"
},
"source_gen": {
"dependency": "direct main",
@@ -1920,11 +1931,11 @@
"dependency": "transitive",
"description": {
"name": "source_helper",
"sha256": "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1",
"sha256": "a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.6"
"version": "1.3.7"
},
"source_span": {
"dependency": "transitive",
@@ -1971,21 +1982,21 @@
"dependency": "transitive",
"description": {
"name": "sqflite_android",
"sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b",
"sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.1"
"version": "2.4.2+2"
},
"sqflite_common": {
"dependency": "transitive",
"description": {
"name": "sqflite_common",
"sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b",
"sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.5"
"version": "2.5.6"
},
"sqflite_darwin": {
"dependency": "transitive",
@@ -2081,11 +2092,11 @@
"dependency": "transitive",
"description": {
"name": "test_api",
"sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
"sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.4"
"version": "0.7.6"
},
"time": {
"dependency": "transitive",
@@ -2171,21 +2182,21 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
"sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
"sha256": "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.16"
"version": "6.3.22"
},
"url_launcher_ios": {
"dependency": "transitive",
"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",
@@ -2201,11 +2212,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",
@@ -2281,21 +2292,21 @@
"dependency": "transitive",
"description": {
"name": "vector_graphics_compiler",
"sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331",
"sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.17"
"version": "1.1.19"
},
"vector_math": {
"dependency": "transitive",
"description": {
"name": "vector_math",
"sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
"sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.4"
"version": "2.2.0"
},
"visibility_detector": {
"dependency": "direct main",
@@ -2311,41 +2322,41 @@
"dependency": "transitive",
"description": {
"name": "vm_service",
"sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
"sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "15.0.0"
"version": "15.0.2"
},
"wakelock_plus": {
"dependency": "direct main",
"description": {
"name": "wakelock_plus",
"sha256": "a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678",
"sha256": "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.3.2"
"version": "1.4.0"
},
"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": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.2"
"version": "1.1.3"
},
"weak_map": {
"dependency": "transitive",
@@ -2411,11 +2422,11 @@
"dependency": "direct main",
"description": {
"name": "window_manager",
"sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059",
"sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.4.3"
"version": "0.5.1"
},
"xdg_directories": {
"dependency": "transitive",
@@ -2431,11 +2442,11 @@
"dependency": "transitive",
"description": {
"name": "xml",
"sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
"sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.5.0"
"version": "6.6.1"
},
"xxh3": {
"dependency": "transitive",
@@ -2469,7 +2480,7 @@
}
},
"sdks": {
"dart": ">=3.8.0 <4.0.0",
"flutter": ">=3.32.0"
"dart": ">=3.9.0 <4.0.0",
"flutter": ">=3.35.0"
}
}
+4 -4
View File
@@ -8,18 +8,18 @@
let
# make install will use dconf to find desktop background file uri.
# consider adding an args to allow specify pictures manually.
# https://github.com/daniruiz/flat-remix-gnome/blob/20250413/Makefile#L38
# https://github.com/daniruiz/flat-remix-gnome/blob/20250926/Makefile#L38
fake-dconf = writeScriptBin "dconf" "echo -n";
in
stdenv.mkDerivation rec {
pname = "flat-remix-gnome";
version = "20250413";
version = "20250926";
src = fetchFromGitHub {
owner = "daniruiz";
repo = "flat-remix-gnome";
rev = version;
hash = "sha256-NgRqpL2bqdgiLfs08htqAsTFAbi7E+G/R0aBFpE9bmc=";
hash = "sha256-6K/BQqVOeDeJuUi0+NgCFeerX5sSy+nKapYxIQfbKFQ=";
};
nativeBuildInputs = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
# make install will back up this file, it will fail if the file doesn't exist.
# https://github.com/daniruiz/flat-remix-gnome/blob/20250413/Makefile#L56
# https://github.com/daniruiz/flat-remix-gnome/blob/20250926/Makefile#L56
preInstall = ''
mkdir -p $out/share/gnome-shell/
touch $out/share/gnome-shell/gnome-shell-theme.gresource
+7 -4
View File
@@ -3,6 +3,7 @@
fetchFromGitHub,
gnused,
lib,
stdenv,
maven,
makeWrapper,
openjdk,
@@ -108,10 +109,12 @@ maven.buildMavenPackage {
PREFIX_CMD=""
if [ "$commandToInstall" = "forge-adventure" ]; then
PREFIX_CMD="--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath [
libGL
alsa-lib
]
lib.makeLibraryPath (
[
libGL
]
++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform alsa-lib) [ alsa-lib ]
)
}"
fi
+2 -2
View File
@@ -63,13 +63,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "freerdp";
version = "3.17.1";
version = "3.17.2";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = finalAttrs.version;
hash = "sha256-KAlxpoGOqvHTqKkb/yMrquSckFfMXgbEfxr2IuLPZFQ=";
hash = "sha256-r9a+tQ3QIBfF4Vtyo4F4dwqLloxJTTFUQFV8J53ITZ4=";
};
postPatch = ''
+2 -1
View File
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
maintainers = [ ];
platforms = lib.platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
# The last successful Darwin Hydra build was in 2024
broken = stdenv.hostPlatform.isDarwin;
};
}
File diff suppressed because it is too large Load Diff
+23 -14
View File
@@ -17,7 +17,7 @@
nodejs,
openssl,
pkg-config,
pnpm_9,
pnpm_10,
rust,
rustPlatform,
turbo,
@@ -27,23 +27,27 @@
}:
let
pnpm = pnpm_10;
excludeSpec = spec: [
"--exclude"
spec
];
in
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gitbutler";
version = "0.14.19";
version = "0.15.10";
src = fetchFromGitHub {
owner = "gitbutlerapp";
repo = "gitbutler";
tag = "release/${version}";
hash = "sha256-NopuZbgF2jdwuf/p/JzubS0IM5xBnlkh9Tj234auBnE=";
tag = "release/${finalAttrs.version}";
hash = "sha256-6sRSH7OSprOsRMoORjy9HI8SoOAXqPak2kqtgRx2bWI=";
};
# Workaround for https://github.com/NixOS/nixpkgs/issues/359340
cargoPatches = [ ./gix-from-crates-io.patch ];
# Let Tauri know what version we're building
#
# Remove references to non-existent workspaces in `gix` crates
@@ -51,7 +55,7 @@ rustPlatform.buildRustPackage rec {
# Deactivate the built-in updater
postPatch = ''
tauriConfRelease="crates/gitbutler-tauri/tauri.conf.release.json"
jq '.version = "${version}" | .bundle.createUpdaterArtifacts = false' "$tauriConfRelease" | sponge "$tauriConfRelease"
jq '.version = "${finalAttrs.version}" | .bundle.createUpdaterArtifacts = false' "$tauriConfRelease" | sponge "$tauriConfRelease"
tomlq -ti 'del(.lints) | del(.workspace.lints)' "$cargoDepsCopy"/gix*/Cargo.toml
@@ -59,12 +63,12 @@ rustPlatform.buildRustPackage rec {
--replace-fail 'checkUpdate = check;' 'checkUpdate = () => null;'
'';
cargoHash = "sha256-wzSRUZeB5f9Z/D+Sa5Nl77jh7GDnnUehcmwanPcaSKM=";
cargoHash = "sha256-H8YR+euwMGiGckURAWJIE9fOcu/ddJ6ENcnA1gHD9B8=";
pnpmDeps = pnpm_9.fetchDeps {
inherit pname version src;
fetcherVersion = 1;
hash = "sha256-5NtfstUuIYyntt09Mu9GAFAOImfO6VMmJ7g15kvGaLE=";
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 2;
hash = "sha256-I55RNWP6csT08SBIFEyUp9JTC5EzQXjKIPPSxkSpg7Y=";
};
nativeBuildInputs = [
@@ -76,7 +80,7 @@ rustPlatform.buildRustPackage rec {
moreutils
nodejs
pkg-config
pnpm_9.configHook
pnpm.configHook
turbo
wrapGAppsHook4
yq # For `tomlq`
@@ -141,6 +145,11 @@ rustPlatform.buildRustPackage rec {
LIBGIT2_NO_VENDOR = 1;
};
preBuild = ''
turbo run --filter @gitbutler/svelte-comment-injector build
pnpm build:desktop -- --mode production
'';
postInstall =
lib.optionalString stdenv.hostPlatform.isDarwin ''
makeBinaryWrapper $out/Applications/GitButler.app/Contents/MacOS/gitbutler-tauri $out/bin/gitbutler-tauri
@@ -165,7 +174,7 @@ rustPlatform.buildRustPackage rec {
meta = {
description = "Git client for simultaneous branches on top of your existing workflow";
homepage = "https://gitbutler.com";
changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${version}";
changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${finalAttrs.version}";
license = lib.licenses.fsl11Mit;
maintainers = with lib.maintainers; [
getchoo
@@ -174,4 +183,4 @@ rustPlatform.buildRustPackage rec {
mainProgram = "gitbutler-tauri";
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
})
+2 -2
View File
@@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "gnote";
version = "48.2";
version = "49.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
hash = "sha256-PIFooZ3mWJ+56O4RmkRUISOUHB6XSK79NooCjmclx4E=";
hash = "sha256-GXUaLyN3Kb+fSElVQKNeNG5FwbobAW25y3VNReztCl0=";
};
buildInputs = [
+3 -3
View File
@@ -15,17 +15,17 @@ let
in
buildGoModule rec {
pname = "go-ethereum";
version = "1.16.3";
version = "1.16.5";
src = fetchFromGitHub {
owner = "ethereum";
repo = "go-ethereum";
rev = "v${version}";
hash = "sha256-9g+RlOnV3DMLkak+RbSm8RgFB14Yuap8CT1w6kuZRv0=";
hash = "sha256-f9MBHO3oh1Nh+YI1E8cPPaNRj4T12063YLqTDrdZWWA=";
};
proxyVendor = true;
vendorHash = "sha256-GEPSkuEdrYvPGXEGhAT3U765rjY6w6kwOVYOMCgOaCo=";
vendorHash = "sha256-6tGSyx4OXMXUjhIvLJo+vyRkNzHmwiikzrLL0cQPBLo=";
doCheck = false;
+2 -2
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "goodvibes";
version = "0.8.2";
version = "0.8.3";
src = fetchFromGitLab {
owner = "goodvibes";
repo = "goodvibes";
rev = "v${version}";
hash = "sha256-AHw8KlU1lmgH837GOpxGBgngwRIs5XV3+TvH4MuCx54=";
hash = "sha256-Lh4FPH0Bdxg2J4IxsZPs8Zjc7Tcobb4bTpvJzVNIy0Y=";
};
nativeBuildInputs = [
@@ -3,7 +3,6 @@
stdenvNoCC,
fetchFromGitHub,
gitUpdater,
gnome-themes-extra,
gtk-engine-murrine,
jdupes,
sassc,
@@ -76,10 +75,6 @@ lib.checkListOfEnum "${pname}: theme variants"
sassc
];
buildInputs = [
gnome-themes-extra
];
propagatedUserEnvPkgs = [
gtk-engine-murrine
];
+2 -2
View File
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "groovy";
version = "5.0.1";
version = "5.0.2";
src = fetchurl {
url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip";
sha256 = "sha256-vmahfzT2n0c7I5WOvuB3Doiq9zXXm6liRUN1w40oVKU=";
sha256 = "sha256-cPgvEbG3ZOIH3PVWiILHjcdyk/MHgWJCOUo/enTyDoE=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -12,13 +12,13 @@
stdenv.mkDerivation {
pname = "iio-hyprland";
version = "0-unstable-2025-08-21";
version = "0-unstable-2025-10-06";
src = fetchFromGitHub {
owner = "JeanSchoeller";
repo = "iio-hyprland";
rev = "282f38c700ebf0b69df5aae40134d56e4cd67775";
hash = "sha256-mzp2KV9SAsZL/exXSZHFPArcTV8uh3LXufADKX4ppEU=";
rev = "801c4722ea678ddf103fc0ff4c3c0211d13ad046";
hash = "sha256-asLtzpUbwr+Wq2uQvITORBnrxh/mIZneYyfhdsElTeI=";
};
buildInputs = [ dbus ];
+2 -2
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "inotify-tools";
version = "4.23.9.0";
version = "4.25.9.0";
src = fetchFromGitHub {
repo = "inotify-tools";
owner = "inotify-tools";
rev = finalAttrs.version;
hash = "sha256-6kM2JzxRcwUjUmbUWGnQ+gAvZcn7C32/enRwiYiuQGU=";
hash = "sha256-u7bnFmSEXNGVZTJ71kOTscQLymbjJblJCIY9Uj7/3mM=";
};
configureFlags = [
+2
View File
@@ -48,5 +48,7 @@ stdenv.mkDerivation rec {
maintainers = [ ];
license = lib.licenses.asl20;
platforms = lib.platforms.all;
# The last successful Darwin Hydra build was in 2024
broken = stdenv.hostPlatform.isDarwin;
};
}
+2 -2
View File
@@ -9,13 +9,13 @@
buildNpmPackage {
pname = "jsonplaceholder";
version = "0-unstable-2021-06-14";
version = "0.3.3-unstable-2021-06-14";
src = fetchFromGitHub {
owner = "typicode";
repo = "jsonplaceholder";
rev = "7ae4432ac3f60e7226a899c25e04826207d07098";
hash = "sha256-b+p1bByq0oRj3zqVsFFoXFR2ydrbZqWwJdVIaXEmQwQ";
hash = "sha256-b+p1bByq0oRj3zqVsFFoXFR2ydrbZqWwJdVIaXEmQwQ=";
};
npmDepsHash = "sha256-x+EN33CQE4ga9T0V4oJRPkELT8x4WbNIsQmvyW+hHi8=";
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "keychain";
version = "2.9.6";
version = "2.9.7";
src = fetchFromGitHub {
owner = "funtoo";
repo = "keychain";
rev = version;
sha256 = "sha256-R70W8/tE4suGgiSqkJ1RJ0fJ3C+exdoVesXtvxPORVo=";
sha256 = "sha256-/8OY/URIhVl8bTlJPRGidExHzkwzckm/v3QUq7Fxe04=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -11,11 +11,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "kphotoalbum";
version = "6.0.1";
version = "6.1.0";
src = fetchurl {
url = "mirror://kde/stable/kphotoalbum/${finalAttrs.version}/kphotoalbum-${finalAttrs.version}.tar.xz";
hash = "sha256-LLsQ66wKDg77nZUIxjcfzvC3AwLOtojuuDgkJm2dsww=";
hash = "sha256-fznB/B2VriB+Wt6ZxrPrNoJP45AuK1vV4ONpAHYwUlY=";
};
env.LANG = "C.UTF-8";
+2 -2
View File
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "kronosnet";
version = "1.31";
version = "1.32";
src = fetchFromGitHub {
owner = "kronosnet";
repo = "kronosnet";
rev = "v${version}";
sha256 = "sha256-PZWaKrCy0S8d/x3GMh7X2wEiHwgiuEFpfCwKpbLvhsc=";
sha256 = "sha256-g2AgVAFEmRlMaqH7uRabSNJP0ehUQ6Iws4LT2iB8kTA=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "kubectl-gadget";
version = "0.44.1";
version = "0.46.0";
src = fetchFromGitHub {
owner = "inspektor-gadget";
repo = "inspektor-gadget";
rev = "v${version}";
hash = "sha256-S3LF07KY8AwEU8xqgkl4XNNNdygmy0ILfQKVScponlk=";
hash = "sha256-y5eqkTt9CnEPOyFERWhBPqrgnMGaVuWN2FoDV0pDjdI=";
};
vendorHash = "sha256-MSi8nTd9ZAdHq1xONww9qKkgKbXHe7H6oms8/WANuOg=";
vendorHash = "sha256-TBaMbIwR/7MzPn8rYgjqeMLma3arwr5W9HiTztd8z9E=";
env.CGO_ENABLED = 0;
+2
View File
@@ -83,6 +83,8 @@ let
license = lib.licenses.lgpl2Plus;
maintainers = [ ];
platforms = with lib.platforms; linux ++ darwin;
# The last successful Darwin Hydra build was in 2024
broken = stdenv.hostPlatform.isDarwin;
};
};
in
+2 -2
View File
@@ -6,13 +6,13 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "luwen";
version = "0.7.13";
version = "0.7.14";
src = fetchFromGitHub {
owner = "tenstorrent";
repo = "luwen";
tag = "v${finalAttrs.version}";
hash = "sha256-2l+rcWP9Ms0bvvSvZIA4DjH6bIloQGxzRTE1ShP6hEE=";
hash = "sha256-KhkABISkR37MjEwgroVtywYNCxgfwXyM5LG2CIJhu3M=";
};
postUnpack = ''
+2 -2
View File
@@ -10,14 +10,14 @@
stdenv.mkDerivation rec {
pname = "makeself";
version = "2.5.0";
version = "2.6.0";
src = fetchFromGitHub {
owner = "megastep";
repo = "makeself";
tag = "release-${version}";
fetchSubmodules = true;
hash = "sha256-QPisihCGnzG9gaZyb/bUroWdPAoC2GdQiz1tSkoScjs=";
hash = "sha256-F5lx8B2C8CsEUXQPQTK1q8PAMf5yzIEAqq3zbYnseTs=";
};
nativeBuildInputs = [ installShellFiles ];
+24 -3
View File
@@ -3,6 +3,7 @@
rustPlatform,
fetchFromGitHub,
pkg-config,
libredirect,
bzip2,
zstd,
stdenv,
@@ -17,6 +18,7 @@
enableLiburing ? stdenv.hostPlatform.isLinux,
liburing,
nixosTests,
writeTextFile,
}:
let
rust-jemalloc-sys' = rust-jemalloc-sys.override {
@@ -85,16 +87,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-tuwunel";
version = "1.4.2";
version = "1.4.5";
src = fetchFromGitHub {
owner = "matrix-construct";
repo = "tuwunel";
tag = "v${finalAttrs.version}";
hash = "sha256-h7a8nbKZ6cK6SoAGwORc6+D+jJxQOut7y5KzHfBbqDE=";
hash = "sha256-tZKq8ypDU1MkWORHFQhieDSUOqOzBcfqIQ40amyc1ls=";
};
cargoHash = "sha256-RjoO5eiAXYhC8Tg5UNqCpBsFVN1I+0UhchslAmhm0Qo=";
cargoHash = "sha256-x+LhpwDytwH/NzKWqAuRRbX77OZ2JGaYSaQxqinf81Q=";
nativeBuildInputs = [
pkg-config
@@ -137,6 +139,25 @@ rustPlatform.buildRustPackage (finalAttrs: {
]
++ lib.optional enableLiburing "io_uring";
nativeCheckInputs = [
libredirect.hook
];
preCheck =
let
fakeResolvConf = writeTextFile {
name = "resolv.conf";
text = ''
nameserver 0.0.0.0
'';
};
in
''
export NIX_REDIRECTS="/etc/resolv.conf=${fakeResolvConf}"
export TUWUNEL_DATABASE_PATH="$(mktemp -d)/smoketest.db"
'';
doCheck = true;
passthru = {
rocksdb = rocksdb'; # make used rocksdb version available (e.g., for backup scripts)
updateScript = nix-update-script { };
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "mieru";
version = "3.20.1";
version = "3.21.0";
src = fetchFromGitHub {
owner = "enfein";
repo = "mieru";
rev = "v${version}";
hash = "sha256-r4QMETKt8EMSX9BsSizlvlMdlJ+SjlLScNfOxSm84Ec=";
hash = "sha256-9e2V+WwcBp16DsMf31IzANdMlc/r3KFDYjSCKvKKGwM=";
};
vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";
+72
View File
@@ -0,0 +1,72 @@
{
"!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
"!version": 1,
"https://plugins.gradle.org/m2": {
"com/google/code/gson#gson-parent/2.10.1": {
"pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
},
"com/google/code/gson#gson/2.10.1": {
"jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=",
"pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
},
"org/gradle/toolchains#foojay-resolver/0.10.0": {
"jar": "sha256-DNfKn57RuooyPxkCwFryHdYiOhMDRfvnj15I1YzNbUw=",
"module": "sha256-SduV7YEABA8dZfCWuied7msSeCSNL3k7z7itAg59HNA=",
"pom": "sha256-vndZUF4PPTTVzJzcaGwZxlIuhMzg+MEJ69LW9HsYqSU="
},
"org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.10.0": {
"pom": "sha256-OpLrFa3uBcGiaCT2SIcqVx6fk99koO3L4TTjjtLY4Q8="
}
},
"https://repo.maven.apache.org/maven2/org": {
"apiguardian#apiguardian-api/1.1.2": {
"jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
"module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
"pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
},
"junit#junit-bom/5.12.1": {
"module": "sha256-TdKqnplFecYwRX35lbkZsDVFYzZGNy6q3R0WXQv1jBo=",
"pom": "sha256-fIJrxyvt3IF9rZJjAn+QEqD1Wjd9ON+JxCkyolAcK/A="
},
"junit/jupiter#junit-jupiter-api/5.12.1": {
"jar": "sha256-pAHgtgNz7fffCWLCXrMhPkUaR3h5LTOnaHbDuKW7IJs=",
"module": "sha256-iv9r5FYIFhBl7mO4QDyfKTE6HdnzkfP5eIVlpiMxGXY=",
"pom": "sha256-zqRvFdpTNT8vtSYZyvbcAH7CqE8O2vQMwSV/jjzvd9w="
},
"junit/jupiter#junit-jupiter-engine/5.12.1": {
"jar": "sha256-Dn8tvrkb+usNTLM6SHNRuvDlpu1ykGFU2P2ZddMpxZI=",
"module": "sha256-tvSQZ/FmJdFN7gmT8weKTGYeF8kOV0yf0SoWRur98tA=",
"pom": "sha256-GCeXDlNI10sY6757guDLGdxOj5np1NmEyyZJTVcTPao="
},
"junit/jupiter#junit-jupiter-params/5.12.1": {
"jar": "sha256-WVFwaZnjWVHU3w7KbgkdNhn2WanBCFjy9aPOGRy1dnM=",
"module": "sha256-KYwQtU+G3dtCeclfSYnRW+DV5QDEU+yTXv1Wd8v6Guk=",
"pom": "sha256-dHNtHnFnHQDeQFyxnD2GhOHFl9BwfeJmH7gHGyeEJ8M="
},
"junit/jupiter#junit-jupiter/5.12.1": {
"jar": "sha256-IoqUye50PVW/6gm1djBoHqeyCmYaR3RH9cH2DcEtnjo=",
"module": "sha256-OY71Q1eCyqfceKDRVRBpP6Xt7w/HP5PFVOZ3FxtCIj4=",
"pom": "sha256-m42YgPjFl2/JUEKEnzsSwRWdom5UUkMSY3edCx54yKQ="
},
"junit/platform#junit-platform-commons/1.12.1": {
"jar": "sha256-wxYWNYGqpWSSgBIrEuo2/k6cICoaImd1P+p8nh3wVes=",
"module": "sha256-ypN54aC/xbLOQ8dOh0SxT7fEkhPiISv1pH7QIv3bMM4=",
"pom": "sha256-tzKBEektR47QlWxjCgwkZm52gbUTgWj6FchbUJRqcAM="
},
"junit/platform#junit-platform-engine/1.12.1": {
"jar": "sha256-f+3/k/2SrsfSn8YNwB+gJyRrNrgIhCOl78SUnl9q/6Q=",
"module": "sha256-Vb3CX4rhKh3yQQisSArgiAKMiOMV+ou01HbU4RXyrGE=",
"pom": "sha256-TANohTegh/d9NLNNjczZO5NhcWu5u/S0ucbYMXkBS5w="
},
"junit/platform#junit-platform-launcher/1.12.1": {
"jar": "sha256-67sU57KfYHMOrt6GLtadfeDVgeoMA4+mogKVXHVB9SU=",
"module": "sha256-e+5FMgZp1sP8SKnaJV9Xn7zlgA+mY8QgT6NL1XgkUfQ=",
"pom": "sha256-nd9DNXV223LpTvM8ipY09gOrQEb+Cubl4ZJMq2aIjtk="
},
"opentest4j#opentest4j/1.3.0": {
"jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
"module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
"pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
}
}
}
@@ -0,0 +1,36 @@
diff --git a/packages/app-lib/build.rs b/packages/app-lib/build.rs
index 251c4e84..eeacd02a 100644
--- a/packages/app-lib/build.rs
+++ b/packages/app-lib/build.rs
@@ -1,7 +1,7 @@
use std::ffi::OsString;
use std::path::PathBuf;
use std::process::{Command, exit};
-use std::{env, fs};
+use std::env;
fn main() {
println!("cargo::rerun-if-changed=java/gradle");
@@ -19,21 +19,11 @@ fn main() {
out_dir.join("java/libs").display()
);
- let gradle_path = fs::canonicalize(
- #[cfg(target_os = "windows")]
- "java\\gradlew.bat",
- #[cfg(not(target_os = "windows"))]
- "java/gradlew",
- )
- .unwrap();
-
let mut build_dir_str = OsString::from("-Dorg.gradle.project.buildDir=");
build_dir_str.push(out_dir.join("java"));
- let exit_status = Command::new(gradle_path)
+ let exit_status = Command::new("@gradle@")
.arg(build_dir_str)
.arg("build")
- .arg("--no-daemon")
- .arg("--console=rich")
.current_dir(dunce::canonicalize("java").unwrap())
.status()
.expect("Failed to wait on Gradle build");
@@ -5,44 +5,84 @@
cargo-tauri,
desktop-file-utils,
fetchFromGitHub,
gradle_8,
jdk11,
makeBinaryWrapper,
makeShellWrapper,
nix-update-script,
nodejs,
openssl,
pkg-config,
pnpm_9,
replaceVars,
runCommand,
rustPlatform,
turbo,
webkitgtk_4_1,
}:
let
gradle = gradle_8.override { java = jdk; };
jdk = jdk11;
pnpm = pnpm_9;
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "modrinth-app-unwrapped";
version = "0.9.5";
version = "0.10.3";
src = fetchFromGitHub {
owner = "modrinth";
repo = "code";
tag = "v${finalAttrs.version}";
hash = "sha256-1+Fmc8qyU3hCZmRNgp90nuvFgaB/GOH6SNc9AyWZYn0=";
hash = "sha256-XfJbjbVcP9N3exAhXQoMGpoHORpKAlb0dPhQq195roY=";
};
cargoHash = "sha256-6hEnXzaL6PnME9s+T+MtmoTQmaux/0m/6xaQ99lwM2I=";
patches = [
# `packages/app-lib/build.rs` requires a Gradle executable, but our flags
# are injected through a bash function sourced by the stdenv :(
#
# So, re-implement said wrapper to have the same behavior when Gradle is ran in `build.rs`
(replaceVars ./gradle-from-path.patch {
# Yes, it has to be a shell wrapper
# https://github.com/NixOS/nixpkgs/issues/172583
gradle =
runCommand "gradle-exe-wrapper-${gradle.version}" { nativeBuildInputs = [ makeShellWrapper ]; }
''
makeShellWrapper ${lib.getExe gradle} $out \
--add-flags "\''${NIX_GRADLEFLAGS_COMPILE:-}"
'';
})
# `gradle.fetchDeps` doesn't seem to pick up a few integrations here
# Thankfully that's fine, since it's only for development
./remove-spotless.patch
];
# Let the app know about our actual version number
postPatch = ''
substituteInPlace {apps/app,packages/app-lib}/Cargo.toml apps/app-frontend/package.json \
--replace-fail '1.0.0-local' '${finalAttrs.version}'
'';
cargoHash = "sha256-jWMHii65hTnTmiBFHxZ4xO5V+Qt/MPCy75eJvnlyE4c=";
mitmCache = gradle.fetchDeps {
inherit (finalAttrs) pname;
data = ./deps.json;
};
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 1;
hash = "sha256-Q6e942R+3+511qFe4oehxdquw1TgaWMyOGOmP3me54o=";
hash = "sha256-7iqXuIQPbP2p26vrWDjMoyZBPpbVQpigYAylhIg8+ZY=";
};
nativeBuildInputs = [
cacert # Required for turbo
cargo-tauri.hook
desktop-file-utils
gradle
nodejs
pkg-config
pnpm.configHook
@@ -51,16 +91,38 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
gradleFlags = [
"-Dfile.encoding=utf-8"
"--no-configuration-cache"
];
dontUseGradleBuild = true;
dontUseGradleCheck = true;
# Tests fail on other, unrelated packages in the monorepo
cargoTestFlags = [
"--package"
"theseus_gui"
];
# Required for mitmCache
__darwinAllowLocalNetworking = true;
env = {
TURBO_BINARY_PATH = lib.getExe turbo;
};
preGradleUpdate = ''
cd packages/app-lib/java
'';
# Required for the exe wrapper above
preBuild = ''
local nixGradleFlags=()
concatTo nixGradleFlags gradleFlags gradleFlagsArray
export NIX_GRADLEFLAGS_COMPILE="''${nixGradleFlags[@]}"
'';
postInstall =
lib.optionalString stdenv.hostPlatform.isDarwin ''
makeBinaryWrapper "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App "$out"/bin/ModrinthApp
@@ -97,5 +159,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
# Darwin is the only exception
# See https://github.com/modrinth/code/issues/776#issuecomment-1742495678
broken = !stdenv.hostPlatform.isx86_64 && !stdenv.hostPlatform.isDarwin;
sourceProvenance = with lib.sourceTypes; [
fromSource
binaryBytecode # mitm cache
];
};
})
@@ -0,0 +1,25 @@
diff --git a/packages/app-lib/java/build.gradle.kts b/packages/app-lib/java/build.gradle.kts
index b7f9ede0..8a336897 100644
--- a/packages/app-lib/java/build.gradle.kts
+++ b/packages/app-lib/java/build.gradle.kts
@@ -1,6 +1,5 @@
plugins {
java
- id("com.diffplug.spotless") version "7.0.4"
}
repositories {
@@ -23,13 +22,6 @@ tasks.withType<JavaCompile>().configureEach {
options.compilerArgs.addAll(listOf("-Xlint:all", "-Werror"))
}
-spotless {
- java {
- palantirJavaFormat()
- removeUnusedImports()
- }
-}
-
tasks.jar {
archiveFileName = "theseus.jar"
}
+14 -2
View File
@@ -4,7 +4,9 @@
addDriverRunpath,
alsa-lib,
flite,
glib,
glib-networking,
gsettings-desktop-schemas,
jdk17,
jdk21,
jdk8,
@@ -30,9 +32,17 @@ symlinkJoin {
paths = [ modrinth-app-unwrapped ];
nativeBuildInputs = [ wrapGAppsHook4 ];
strictDeps = true;
buildInputs = [ glib-networking ];
nativeBuildInputs = [
glib
wrapGAppsHook4
];
buildInputs = [
glib-networking
gsettings-desktop-schemas
];
runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux (
lib.makeLibraryPath [
@@ -72,6 +82,8 @@ symlinkJoin {
''}
)
glibPostInstallHook
gappsWrapperArgsHook
wrapGAppsHook
'';
+5 -2
View File
@@ -8,17 +8,18 @@
python3.pkgs.buildPythonApplication rec {
pname = "nb-cli";
version = "1.4.2";
version = "1.5.0";
pyproject = true;
src = fetchPypi {
pname = "nb_cli";
inherit version;
hash = "sha256-HZey1RVpx/fHNxdEue1LczYbwYUxEb3i3fHpkKHhn+8=";
hash = "sha256-vZxBjavim4xNp24s7hNsoZK7xoeRJST7NvSRbRTYSz8=";
};
pythonRelaxDeps = [
"watchfiles"
"noneprompt"
];
build-system = [
@@ -35,8 +36,10 @@ python3.pkgs.buildPythonApplication rec {
importlib-metadata
jinja2
noneprompt
nonestorage
pydantic
pyfiglet
textual
tomlkit
typing-extensions
virtualenv
@@ -18,14 +18,14 @@
stdenv.mkDerivation {
pname = "NetworkManager-iodine${lib.optionalString withGnome "-gnome"}";
version = "1.2.0-unstable-2025-09-06";
version = "1.2.0-unstable-2025-10-11";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "network-manager-iodine";
rev = "2a630d5c492521378160882864eb88277f6315cb";
sha256 = "vSvvJVWtV+BHM3rDtgUWYlIOfhP80J3uDHPMwd0vvbM=";
rev = "ad266003aa74ddba1d22259b213a7f9c996e1cd4";
sha256 = "OoJRkU4POW9RajwW05xYPlkodXqytq89GTbJuoLxebY=";
};
patches = [
+2 -16
View File
@@ -5,7 +5,6 @@
desktop-file-utils,
dotnetCorePackages,
fetchFromGitHub,
fetchpatch2,
imagemagick,
lib,
xdg-utils,
@@ -23,13 +22,13 @@ let
in
buildDotnetModule (finalAttrs: {
inherit pname;
version = "0.19.4";
version = "0.20.2";
src = fetchFromGitHub {
owner = "Nexus-Mods";
repo = "NexusMods.App";
tag = "v${finalAttrs.version}";
hash = "sha256-WKfv5y6UmO3dmzkXrqZ+VtIbXf0FszRdsa5Rmp95rYg=";
hash = "sha256-hpsrHHh0Bk+9Z4Qp5aTqH5i8KnqCLQdseYGrbr4sh1k=";
fetchSubmodules = true;
};
@@ -57,14 +56,6 @@ buildDotnetModule (finalAttrs: {
dotnet-sdk = dotnetCorePackages.sdk_9_0;
dotnet-runtime = dotnetCorePackages.runtime_9_0;
patches = [
(fetchpatch2 {
name = "Fix-SMAPI-installation.patch";
url = "https://github.com/Nexus-Mods/NexusMods.App/pull/4026.patch?full_index=1";
hash = "sha256-1LgFTi63fVhGUZXZtS6iD2yqd0RxhdpiXKtWMFNEoD4=";
})
];
postPatch = ''
# Specify a fixed date to improve build reproducibility
echo "1970-01-01T00:00:00Z" >buildDate.txt
@@ -82,11 +73,6 @@ buildDotnetModule (finalAttrs: {
${lib.optionalString finalAttrs.doCheck ''
# For some reason these tests fail (intermittently?) with a zero timestamp
touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png
# Fix expected version number in text fixture
# https://github.com/Nexus-Mods/NexusMods.App/issues/4030
substituteInPlace tests/NexusMods.Backend.Tests/EventTrackerTests.Test_PrepareRequest.verified.txt \
--replace-fail 0.0.1 ${finalAttrs.version}
''}
'';
@@ -6,12 +6,12 @@
"forum_url": "https://forums.nexusmods.com/games/19-stardew-valley/",
"nexusmods_url": "https://www.nexusmods.com/stardewvalley",
"genre": "Simulation",
"file_count": 143212,
"downloads": 627187655,
"file_count": 144372,
"downloads": 635510946,
"domain_name": "stardewvalley",
"approved_date": 1457432329,
"mods": 25945,
"collections": 2020
"mods": 26187,
"collections": 1990
},
{
"id": 1704,
@@ -20,12 +20,12 @@
"forum_url": "https://forums.nexusmods.com/games/6-skyrim/",
"nexusmods_url": "https://www.nexusmods.com/skyrimspecialedition",
"genre": "RPG",
"file_count": 661698,
"downloads": 9193533035,
"file_count": 667120,
"downloads": 9346275237,
"domain_name": "skyrimspecialedition",
"approved_date": 1477480498,
"mods": 118807,
"collections": 4852
"mods": 119859,
"collections": 4876
},
{
"id": 3174,
@@ -34,12 +34,12 @@
"forum_url": "https://forums.nexusmods.com/games/9-mount-blade-ii-bannerlord/",
"nexusmods_url": "https://www.nexusmods.com/mountandblade2bannerlord",
"genre": "Strategy",
"file_count": 50603,
"downloads": 116400189,
"file_count": 50960,
"downloads": 117558949,
"domain_name": "mountandblade2bannerlord",
"approved_date": 1582898627,
"mods": 6341,
"collections": 293
"mods": 6397,
"collections": 294
},
{
"id": 3333,
@@ -48,12 +48,12 @@
"forum_url": "https://forums.nexusmods.com/games/1-cyberpunk-2077/",
"nexusmods_url": "https://www.nexusmods.com/cyberpunk2077",
"genre": "Action",
"file_count": 125224,
"downloads": 930909718,
"file_count": 126752,
"downloads": 958960285,
"domain_name": "cyberpunk2077",
"approved_date": 1607433331,
"mods": 18032,
"collections": 1588
"mods": 18283,
"collections": 1597
},
{
"id": 3474,
@@ -62,11 +62,11 @@
"forum_url": "https://forums.nexusmods.com/games/2-baldurs-gate-3/",
"nexusmods_url": "https://www.nexusmods.com/baldursgate3",
"genre": "RPG",
"file_count": 105632,
"downloads": 351591575,
"file_count": 106755,
"downloads": 359737700,
"domain_name": "baldursgate3",
"approved_date": 1602863114,
"mods": 15020,
"collections": 1752
"mods": 15196,
"collections": 1740
}
]
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "normaliz";
version = "3.10.5";
version = "3.11.0";
src = fetchFromGitHub {
owner = "normaliz";
repo = "normaliz";
rev = "v${finalAttrs.version}";
hash = "sha256-Ku5OTtRxrs9qaSE0mle17eJSE2yKZUUsflEZk4k91jM=";
hash = "sha256-O8zUhuR+e9yNxj9jC2xK7UZ2aUHoEWjwxn3XxTyP8hQ=";
};
buildInputs = [
@@ -13,13 +13,13 @@ let
in
buildGoModule (finalAttrs: {
pname = "nvidia-container-toolkit";
version = "1.17.8";
version = "1.17.9";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "nvidia-container-toolkit";
tag = "v${finalAttrs.version}";
hash = "sha256-B17cPxdrQ8qMNgFh4XcDwwKryukMrn0GV2LNPHM7kBo=";
hash = "sha256-kcE4yDoj+CFbMy0N5v8ImxjZMJ/o5/LaAVVV1M7qGiw=";
};
+2 -2
View File
@@ -86,13 +86,13 @@ buildGoModule (
{
pname = "olivetin";
version = "2025.10.30";
version = "2025.11.06";
src = fetchFromGitHub {
owner = "OliveTin";
repo = "OliveTin";
tag = finalAttrs.version;
hash = "sha256-yzgyv/YLHXCU8h+c53qZQoY9dNOJdF0/EBBZJkN8Urc=";
hash = "sha256-81AcegFKG5TacKAv9kZgbSOKcAx+ZmK3rqrk3ia/res=";
};
modRoot = "service";
+2 -2
View File
@@ -19,13 +19,13 @@ in
buildDunePackage rec {
pname = "opam-publish";
version = "2.6.0";
version = "2.7.0";
src = fetchFromGitHub {
owner = "ocaml-opam";
repo = "opam-publish";
rev = version;
hash = "sha256-HEmeY3k1sHMNhIUD0GmVlUKKRxC+z/tMAqHGQNT48LA=";
hash = "sha256-Li7Js8mrxOrRNNuu8z4X+VXbuECfk7Gsgpy4d6R3RwU=";
};
buildInputs = [
+3
View File
@@ -1,4 +1,5 @@
{
stdenv,
buildGoModule,
fetchFromGitHub,
fetchpatch2,
@@ -45,5 +46,7 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = [ ];
mainProgram = "prometheus-packet-sd";
# The last successful Darwin Hydra build was in 2024
broken = stdenv.hostPlatform.isDarwin;
};
}
+32
View File
@@ -0,0 +1,32 @@
{
lib,
stdenvNoCC,
phira,
phira-unwrapped,
imagemagick,
ubuntu-classic,
}:
phira.override {
overrideAssets = stdenvNoCC.mkDerivation {
pname = "phira-assets";
version = phira.version;
nativeBuildInputs = [ imagemagick ];
dontUnpack = true;
installPhase = ''
runHook preInstall
mkdir -p $out
cp -r ${phira-unwrapped.src}/assets $out
chmod -R +w $out/assets
magick -size 4000x2000 canvas:'rgb(128,162,206)' $out/assets/background.jpg
cp ${ubuntu-classic}/share/fonts/truetype/ubuntu/Ubuntu-R.ttf $out/assets/font.ttf
runHook postInstall
'';
};
}
@@ -0,0 +1,19 @@
diff --git a/prpr/src/core.rs b/prpr/src/core.rs
index 7f9d4db..33c44bb 100644
--- a/prpr/src/core.rs
+++ b/prpr/src/core.rs
@@ -68,6 +68,14 @@ thread_local! {
}
pub fn init_assets() {
+ if let Ok(root_path) = std::env::var("PHIRA_ROOT") {
+ let path = std::path::Path::new(&root_path);
+ if path.exists() {
+ std::env::set_current_dir(path).unwrap();
+ set_pc_assets_folder("assets");
+ return;
+ }
+ }
if let Ok(mut exe) = std::env::current_exe() {
while exe.pop() {
if exe.join("assets").exists() {
@@ -0,0 +1,119 @@
diff --git a/prpr-avc/Cargo.toml b/prpr-avc/Cargo.toml
index 257c575..bf35b10 100644
--- a/prpr-avc/Cargo.toml
+++ b/prpr-avc/Cargo.toml
@@ -9,3 +9,6 @@ edition = "2021"
sasa = { git = "https://github.com/Mivik/sasa", default-features = false }
thiserror = "1.0.56"
tracing = "0.1.37"
+
+[build-dependencies]
+pkg-config = "0.3"
diff --git a/prpr-avc/build.rs b/prpr-avc/build.rs
index 961b032..6d0b714 100644
--- a/prpr-avc/build.rs
+++ b/prpr-avc/build.rs
@@ -1,10 +1,7 @@
use std::path::Path;
fn main() {
- let libs_dir = std::env::var("PRPR_AVC_LIBS").unwrap_or_else(|_| format!("{}/static-lib", std::env::var("CARGO_MANIFEST_DIR").unwrap()));
- let libs_path = Path::new(&libs_dir).join(std::env::var("TARGET").unwrap());
- let libs_path = libs_path.display();
- println!("cargo:rustc-link-search={libs_path}");
- println!("cargo:rustc-link-lib=z");
- println!("cargo:rerun-if-changed={libs_path}");
+ for lib in ["libavformat", "libavcodec", "libavutil", "libswscale", "libswresample"] {
+ let _ = pkg_config::Config::new().statik(false).probe(lib);
+ }
}
diff --git a/prpr-avc/src/ffi.rs b/prpr-avc/src/ffi.rs
index 8218ef3..a2c7f6a 100644
--- a/prpr-avc/src/ffi.rs
+++ b/prpr-avc/src/ffi.rs
@@ -6,7 +6,6 @@ pub const AV_SAMPLE_FMT_FLT: AVSampleFormat = 3;
pub const AV_ROUND_UP: AVRounding = 0;
-#[link(name = "avformat", kind = "static")]
extern "C" {
pub fn avformat_alloc_context() -> *mut AVFormatContext;
pub fn avformat_free_context(s: *mut AVFormatContext);
@@ -20,7 +19,6 @@ extern "C" {
pub fn av_read_frame(s: *mut AVFormatContext, pkt: *mut AVPacket) -> ::std::os::raw::c_int;
}
-#[link(name = "avutil", kind = "static")]
extern "C" {
pub fn av_strerror(errnum: ::std::os::raw::c_int, errbuf: *mut ::std::os::raw::c_char, errbuf_size: usize) -> ::std::os::raw::c_int;
pub fn av_frame_alloc() -> *mut AVFrame;
@@ -29,7 +27,6 @@ extern "C" {
pub fn av_rescale_rnd(a: i64, b: i64, c: i64, r: AVRounding) -> i64;
}
-#[link(name = "avcodec", kind = "static")]
extern "C" {
pub fn avcodec_find_decoder(id: AVCodecID) -> *mut AVCodec;
pub fn avcodec_alloc_context3(codec: *const AVCodec) -> *mut AVCodecContext;
@@ -43,7 +40,6 @@ extern "C" {
pub fn avcodec_default_get_format(s: *mut AVCodecContext, fmt: *const AVPixelFormat) -> AVPixelFormat;
}
-#[link(name = "swscale", kind = "static")]
extern "C" {
pub fn sws_getContext(
srcW: ::std::os::raw::c_int,
@@ -68,10 +64,9 @@ extern "C" {
) -> ::std::os::raw::c_int;
}
-#[link(name = "swresample", kind = "static")]
extern "C" {
- pub fn swr_alloc_set_opts(
- s: *mut SwrContext,
+ pub fn swr_alloc_set_opts2(
+ ps: *mut *mut SwrContext,
out_ch_layout: i64,
out_sample_fmt: AVSampleFormat,
out_sample_rate: ::std::os::raw::c_int,
@@ -80,7 +75,7 @@ extern "C" {
in_sample_rate: ::std::os::raw::c_int,
log_offset: ::std::os::raw::c_int,
log_ctx: *mut ::std::os::raw::c_void,
- ) -> *mut SwrContext;
+ ) -> ::std::os::raw::c_int;
pub fn swr_init(s: *mut SwrContext) -> ::std::os::raw::c_int;
pub fn swr_get_delay(s: *const SwrContext, base: ::std::os::raw::c_int) -> i64;
pub fn swr_convert(
diff --git a/prpr-avc/src/swr.rs b/prpr-avc/src/swr.rs
index 7288a51..c00b874 100644
--- a/prpr-avc/src/swr.rs
+++ b/prpr-avc/src/swr.rs
@@ -5,8 +5,9 @@ pub struct SwrContext(OwnedPtr<ffi::SwrContext>);
impl SwrContext {
pub fn new(in_format: &AudioStreamFormat, out_format: &AudioStreamFormat) -> Result<Self> {
unsafe {
- OwnedPtr::new(ffi::swr_alloc_set_opts(
- null_mut(),
+ let mut raw: *mut ffi::SwrContext = null_mut();
+ let ret = ffi::swr_alloc_set_opts2(
+ &mut raw,
out_format.channel_layout as _,
out_format.sample_fmt,
out_format.sample_rate,
@@ -15,9 +16,12 @@ impl SwrContext {
in_format.sample_rate,
0,
null_mut(),
- ))
- .map(|ctx| Self(ctx))
- .ok_or(Error::AllocationFailed)
+ );
+ if ret < 0 || raw.is_null() {
+ Err(Error::AllocationFailed)
+ } else {
+ OwnedPtr::new(raw).map(|ctx| Self(ctx)).ok_or(Error::AllocationFailed)
+ }
}
}
@@ -0,0 +1,87 @@
{
lib,
stdenv,
fetchFromGitHub,
makeDesktopItem,
copyDesktopItems,
rustPlatform,
pkg-config,
perl,
ffmpeg,
alsa-lib,
gtk3,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "phira-unwrapped";
version = "0.6.7";
src = fetchFromGitHub {
owner = "TeamFlos";
repo = "phira";
tag = "v${finalAttrs.version}";
hash = "sha256-4WIvLfKeh+quu7dHKMlUKt+NQnui2/txlFYZoU3voPA=";
};
nativeBuildInputs = [
pkg-config
perl
copyDesktopItems
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
rustPlatform.bindgenHook # for crate coreaudio-sys
];
buildInputs = [
ffmpeg
]
++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib # for crate alsa-sys
gtk3 # for crate gtk-sys
];
patches = [
# use dynamically linked ffmpeg instead of expecting static lib
./ffmpeg.patch
# error[E0554]: `#![feature]` may not be used on the stable release channel
./stable-features.patch
# missing macro from tracing crate
./tracing.patch
# allow using env var to specify location of assets and data
./assets.patch
];
cargoHash = "sha256-6mRb3M56G20fA+px1cZyrGpel0v54qoVAQK2ZgTzkmI=";
# The developer put assets necessary for this test in gitignore, so it cannot run.
checkFlags = [ "--skip test_parse_chart" ];
desktopItems = [
(makeDesktopItem {
name = "phira";
desktopName = "Phira";
exec = "phira-main";
icon = "phira";
comment = finalAttrs.meta.description;
categories = [ "Game" ];
})
];
postInstall = ''
install -Dm644 assets/icon.png $out/share/icons/hicolor/128x128/apps/phira.png
'';
meta = {
description = "Rhythm game with custom charts and multiplayer";
homepage = "https://github.com/TeamFlos/phira";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ ulysseszhan ];
changelog = "https://github.com/TeamFlos/phira/releases/tag/v${finalAttrs.version}";
platforms = lib.platforms.unix;
mainProgram = "phira-main";
};
})
@@ -0,0 +1,10 @@
diff --git a/prpr/src/lib.rs b/prpr/src/lib.rs
index 15a139f..6b4e469 100644
--- a/prpr/src/lib.rs
+++ b/prpr/src/lib.rs
@@ -1,5 +1,3 @@
-#![feature(local_key_cell_methods)]
-
pub mod bin;
pub mod config;
pub mod core;
@@ -0,0 +1,24 @@
diff --git a/phira-monitor/Cargo.toml b/phira-monitor/Cargo.toml
index 722a022..899b7db 100644
--- a/phira-monitor/Cargo.toml
+++ b/phira-monitor/Cargo.toml
@@ -15,6 +15,7 @@ serde = { version = "*", features = ["derive"] }
serde_yaml = "*"
tokio = { workspace = true }
uuid = { version = "1.4.0", features = ["v4"] }
+tracing = "0.1"
phira-mp-client = { git = "https://github.com/TeamFlos/phira-mp" }
phira-mp-common = { git = "https://github.com/TeamFlos/phira-mp" }
diff --git a/phira-monitor/src/main.rs b/phira-monitor/src/main.rs
index 61bcfba..a4bf8af 100644
--- a/phira-monitor/src/main.rs
+++ b/phira-monitor/src/main.rs
@@ -14,6 +14,7 @@ use prpr::{
use scene::MainScene;
use serde::Deserialize;
use std::fs::File;
+use tracing::warn;
mod dir {
use anyhow::Result;
+51
View File
@@ -0,0 +1,51 @@
{
lib,
stdenv,
symlinkJoin,
fetchzip,
phira-unwrapped,
makeWrapper,
libGL,
# A derivation or a path that contains a dir `assets`.
overrideAssets ? fetchzip {
url = "https://github.com/TeamFlos/phira/releases/download/v${phira-unwrapped.version}/Phira-windows-v${phira-unwrapped.version}.zip";
hash = "sha256-kgmIIIzg+wxyspQTyW1GucW0RVPfBhIRlK5DEGXK1Qs=";
stripRoot = false;
meta.license = lib.licenses.unfree;
},
}:
symlinkJoin {
pname = "phira";
version = phira-unwrapped.version;
paths = [ phira-unwrapped ];
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
phira_root=$out/share/phira
mkdir -p $phira_root
cp -r ${overrideAssets}/assets $phira_root
wrapper_options=(
${lib.optionalString stdenv.hostPlatform.isLinux "--suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}"}
--run '
export PHIRA_ROOT=''${PHIRA_ROOT-"''${XDG_DATA_HOME-"$HOME/.local/share"}/phira"}
if [[ ! -d "$PHIRA_ROOT/assets" ]]; then
mkdir -p "$PHIRA_ROOT"
cp -r "'$phira_root/assets'" "$PHIRA_ROOT"
chmod -R +w "$PHIRA_ROOT/assets"
fi
'
)
wrapProgram $out/bin/phira-main "''${wrapper_options[@]}"
wrapProgram $out/bin/phira-monitor "''${wrapper_options[@]}"
'';
passthru.assets = overrideAssets;
meta = phira-unwrapped.meta;
}
+11 -9
View File
@@ -1,23 +1,25 @@
{
lib,
stdenv,
libressl,
libretls,
openssl,
fetchzip,
pkg-config,
libxcrypt,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "pounce";
version = "3.1";
src = fetchzip {
url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz";
url = "https://git.causal.agency/pounce/snapshot/pounce-${finalAttrs.version}.tar.gz";
sha256 = "sha256-6PGiaU5sOwqO4V2PKJgIi3kI2jXsBOldEH51D7Sx9tg=";
};
buildInputs = [
libressl
libretls
openssl
libxcrypt
];
@@ -29,11 +31,11 @@ stdenv.mkDerivation rec {
"PREFIX=$(out)"
];
meta = with lib; {
meta = {
homepage = "https://code.causal.agency/june/pounce";
description = "Simple multi-client TLS-only IRC bouncer";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ edef ];
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ edef ];
};
}
})
+2 -2
View File
@@ -6,11 +6,11 @@
}:
let
pname = "proxyman";
version = "3.2.0";
version = "3.4.0";
src = fetchurl {
url = "https://github.com/ProxymanApp/proxyman-windows-linux/releases/download/${version}/Proxyman-${version}.AppImage";
hash = "sha256-u6Lu5blU1z7UJyiBZFj/dqKeoCfMniXz6ul2TQwaOqI=";
hash = "sha256-fwkFQOeHb049qFChLfyU20L6mJCDnrcK2HM9PljUdUg=";
};
appimageContents = appimageTools.extract {
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qmapshack";
version = "1.18.1";
version = "1.18.2";
src = fetchFromGitHub {
owner = "Maproom";
repo = "qmapshack";
tag = "V_${finalAttrs.version}";
hash = "sha256-uJO0WBA8/PAvO3yFE7O2Ncz801UBoL2Nf7Dv61yxQag=";
hash = "sha256-vvpDjGFzkbsM/QUiU9EURuU0babWYL1gLzWTqJbHu0c=";
};
nativeBuildInputs = [
+10 -10
View File
@@ -1,12 +1,12 @@
# Generated by ./update.sh - do not update manually!
# Last updated: 2025-10-24
# Last updated: 2025-11-05
{ fetchurl }:
let
any-darwin = {
version = "6.9.82-2025-10-23";
version = "6.9.83-2025-11-05";
src = fetchurl {
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.82_251023_01.dmg";
hash = "sha256-oBhThy9NC0W6gyztHQCL88NDdQrYHzZ27RAzTGcyyRY=";
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.83_251105_01.dmg";
hash = "sha256-/tXuL9WszgWSIFpBSQnmAhRnhNNrK4qCf4uVgBC/DBk=";
};
};
in
@@ -14,17 +14,17 @@ in
aarch64-darwin = any-darwin;
x86_64-darwin = any-darwin;
aarch64-linux = {
version = "3.2.20-2025-10-23";
version = "3.2.21-2025-11-05";
src = fetchurl {
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.20_251023_arm64_01.deb";
hash = "sha256-m90k4S0BAA3R4alRl+1ZfLK3q35LnCVBMUOcJpALIYU=";
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.21_251105_arm64_01.deb";
hash = "sha256-THK5bjq3fGJiGndvIwq+o7t0gKGtthd9JNXf0A0RwCs=";
};
};
x86_64-linux = {
version = "3.2.20-2025-10-23";
version = "3.2.21-2025-11-05";
src = fetchurl {
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.20_251023_amd64_01.deb";
hash = "sha256-PIq2FPB+LpnyfzE51o9eulw93/BofPrlU+PqUyYlh2M=";
url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.21_251105_amd64_01.deb";
hash = "sha256-ERQB+fuf0HBR0TOOGauA+38Qz0QaeoH0EdyICeDe7eY=";
};
};
}
+2 -2
View File
@@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "questdb";
version = "9.0.3";
version = "9.1.0";
src = fetchurl {
url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz";
hash = "sha256-/EkqBK/mero219VUylNLVGD1ZzxBMAYpJ7NcU7BC+aw=";
hash = "sha256-bgeNZi0VonO+L9Vww5n6e0ZOLl9MTXnNe2kPLttbw1c=";
};
nativeBuildInputs = [
+5 -4
View File
@@ -12,14 +12,14 @@
python3,
}:
buildGoModule rec {
buildGoModule (finalAttrs: {
pname = "restic";
version = "0.18.1";
src = fetchFromGitHub {
owner = "restic";
repo = "restic";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-lLinqZUOsZCPPybvVDB1f8o9Hl5qKYi0eHwJAaydsD8=";
};
@@ -72,15 +72,16 @@ buildGoModule rec {
meta = {
homepage = "https://restic.net";
changelog = "https://github.com/restic/restic/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/restic/restic/blob/${finalAttrs.src.rev}/CHANGELOG.md";
description = "Backup program that is fast, efficient and secure";
platforms = with lib.platforms; linux ++ darwin;
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [
mbrgm
djds
dotlambda
ryan4yin
];
mainProgram = "restic";
};
}
})
+2 -2
View File
@@ -40,11 +40,11 @@
stdenv.mkDerivation rec {
pname = "rhythmbox";
version = "3.4.8";
version = "3.4.9";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "IBaoqNKpWcB6RnrJaCxu1gW6iIP7dgQQ1otoq4ON+fI=";
sha256 = "5CKRoY33oh/+azUr9z8F1+KYu04FvOWWf5jujO5ECPE=";
};
patches = [
@@ -1,4 +1,5 @@
{
stdenv,
lib,
rustPlatform,
fetchFromGitHub,
@@ -43,5 +44,7 @@ rustPlatform.buildRustPackage rec {
];
maintainers = [ ];
mainProgram = "sic";
# The last successful Darwin Hydra build was in 2024
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
};
}
+3 -3
View File
@@ -26,13 +26,13 @@ assert
(!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled.";
buildNpmPackage rec {
pname = "sitespeed-io";
version = "38.3.0";
version = "38.4.1";
src = fetchFromGitHub {
owner = "sitespeedio";
repo = "sitespeed.io";
tag = "v${version}";
hash = "sha256-45lvEM8vkoXdbZNJamUR94PD0EwtoNEhWSNyV68yzPo=";
hash = "sha256-7aqZ63q+17MmUjHwh5Z9yqvwRq/Av+UOswIlSA2V14E=";
};
# Don't try to download the browser drivers
@@ -46,7 +46,7 @@ buildNpmPackage rec {
dontNpmBuild = true;
npmInstallFlags = [ "--omit=dev" ];
npmDepsHash = "sha256-rXGoIIbKNZCBhhuRM/0WcaciH/bLQamipmOIh1EXJlU=";
npmDepsHash = "sha256-2v/3Ygy6pAyfoQKcbJphIExcU46xc9c6+yXP2JbX11Y=";
postInstall = ''
mv $out/bin/sitespeed{.,-}io
+2 -2
View File
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "skrooge";
version = "25.4.0";
version = "25.10.0";
src = fetchurl {
url = "mirror://kde/stable/skrooge/skrooge-${version}.tar.xz";
hash = "sha256-HNui/SjCN9LWxUxHDae59n5qPIwYWHX1uFSlVnwBlL8=";
hash = "sha256-kECWi5/q2reBOs9DrubOz5Vol3AkA7lXzOLtbgx2HlE=";
};
nativeBuildInputs = with kdePackages; [

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