Merge 387c9d3d61 into haskell-updates
This commit is contained in:
@@ -62,7 +62,7 @@ jobs:
|
||||
merged-as-untrusted-at: ${{ inputs.mergedSha }}
|
||||
target-as-trusted-at: ${{ inputs.targetSha }}
|
||||
|
||||
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
|
||||
- uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
|
||||
with:
|
||||
# Sandbox is disabled on MacOS by default.
|
||||
extra_nix_config: sandbox = true
|
||||
|
||||
@@ -85,7 +85,7 @@ jobs:
|
||||
merged-as-untrusted-at: ${{ inputs.mergedSha }}
|
||||
target-as-trusted-at: ${{ inputs.targetSha }}
|
||||
|
||||
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
|
||||
- uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
|
||||
|
||||
- uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
|
||||
continue-on-error: true
|
||||
|
||||
@@ -132,7 +132,7 @@ jobs:
|
||||
core.info(`Found pinned.json commit: ${ciPinBumpCommit}`)
|
||||
|
||||
- name: Install Nix
|
||||
uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
|
||||
uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
|
||||
|
||||
- name: Load supported versions
|
||||
id: versions
|
||||
@@ -180,7 +180,7 @@ jobs:
|
||||
target-as-trusted-at: ${{ inputs.targetSha }}
|
||||
|
||||
- name: Install Nix
|
||||
uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
|
||||
uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
|
||||
|
||||
- uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
|
||||
continue-on-error: true
|
||||
@@ -270,7 +270,7 @@ jobs:
|
||||
merge-multiple: true
|
||||
|
||||
- name: Install Nix
|
||||
uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
|
||||
uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
|
||||
|
||||
- name: Combine all output paths and eval stats
|
||||
run: |
|
||||
@@ -451,7 +451,7 @@ jobs:
|
||||
merged-as-untrusted-at: ${{ inputs.mergedSha }}
|
||||
|
||||
- name: Install Nix
|
||||
uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
|
||||
uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
|
||||
|
||||
- name: Ensure flake outputs on all systems still evaluate
|
||||
run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1'
|
||||
|
||||
@@ -35,7 +35,7 @@ jobs:
|
||||
with:
|
||||
merged-as-untrusted-at: ${{ inputs.mergedSha }}
|
||||
|
||||
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
|
||||
- uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
|
||||
|
||||
# TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
|
||||
# because the cache would be invalidated on every commit - treefmt checks every file.
|
||||
@@ -70,7 +70,7 @@ jobs:
|
||||
with:
|
||||
merged-as-untrusted-at: ${{ inputs.mergedSha }}
|
||||
|
||||
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
|
||||
- uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
|
||||
|
||||
- uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
|
||||
continue-on-error: true
|
||||
@@ -100,7 +100,7 @@ jobs:
|
||||
merged-as-untrusted-at: ${{ inputs.mergedSha }}
|
||||
target-as-trusted-at: ${{ inputs.targetSha }}
|
||||
|
||||
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
|
||||
- uses: cachix/install-nix-action@1ca7d21a94afc7c957383a2d217460d980de4934 # v31.10.1
|
||||
|
||||
- uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
|
||||
continue-on-error: true
|
||||
|
||||
@@ -76,6 +76,17 @@ See [Symbolic](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/oct
|
||||
`requiredOctavePackages`
|
||||
: This is a special dependency that ensures the specified Octave packages are dependent on others, and are made available simultaneously when loading them in Octave.
|
||||
|
||||
### Testing Octave packages {#sssec-testing-octave-packages}
|
||||
|
||||
Octave packages built using the `buildOctavePackage` function do not have a `checkPhase` or `installCheckPhase`.
|
||||
Instead, the tests `testOctaveBuildEnv` and `testOctavePkgTests` are added to the package's `passthru.tests`.
|
||||
|
||||
`passthru.tests.testOctaveBuildEnv` tests whether the package can be used by `octave.withPackages` successfully.
|
||||
|
||||
`passthru.tests.testOctavePkgTests` runs a `pkg test` command for the package.
|
||||
If the package needs additional inputs to successfully run the tests, the `nativeOctavePkgTestInputs` attribute can be specified.
|
||||
If the package needs environment variables to be set to successfully run the tests, ensure that `__structuredAttrs = true;` in the package, then set the environment variables you need in `octavePkgTestEnv` (which should be an attrset where the key is the name of the variable and the value is its value (as a string)).
|
||||
|
||||
### Installing Octave Packages {#sssec-installing-octave-packages}
|
||||
|
||||
By default, the `buildOctavePackage` function does _not_ install the requested package into Octave for use.
|
||||
|
||||
@@ -695,6 +695,9 @@
|
||||
"footnote-stdenv-find-inputs-location.__back.0": [
|
||||
"index.html#footnote-stdenv-find-inputs-location.__back.0"
|
||||
],
|
||||
"sssec-testing-octave-packages": [
|
||||
"index.html#sssec-testing-octave-packages"
|
||||
],
|
||||
"strictflexarrays1": [
|
||||
"index.html#strictflexarrays1"
|
||||
],
|
||||
|
||||
+1
-1
@@ -1185,7 +1185,7 @@ rec {
|
||||
name = "optionType";
|
||||
description = "optionType";
|
||||
descriptionClass = "noun";
|
||||
check = value: value._type or null == "option-type";
|
||||
check = isType "option-type";
|
||||
merge =
|
||||
loc: defs:
|
||||
if length defs == 1 then
|
||||
|
||||
@@ -22215,6 +22215,12 @@
|
||||
githubId = 30029970;
|
||||
keys = [ { fingerprint = "66AE 3F93 364C 6AB8 18F9 F35D 8D1E 0726 2DFD BD00"; } ];
|
||||
};
|
||||
Ra77a3l3-jar = {
|
||||
email = "raffaelemeo77@gmail.com";
|
||||
name = "Raffaele Meo";
|
||||
github = "Ra77a3l3-jar";
|
||||
githubId = 175424218;
|
||||
};
|
||||
raboof = {
|
||||
email = "arnout@bzzt.net";
|
||||
matrix = "@raboof:matrix.org";
|
||||
@@ -22719,6 +22725,12 @@
|
||||
githubId = 3302;
|
||||
name = "Renzo Carbonara";
|
||||
};
|
||||
replicapra = {
|
||||
name = "replicapra";
|
||||
github = "replicapra";
|
||||
githubId = 154707993;
|
||||
email = "nixpkgs@replicapra.dev";
|
||||
};
|
||||
repparw = {
|
||||
email = "ubritos@gmail.com";
|
||||
github = "repparw";
|
||||
@@ -26047,6 +26059,12 @@
|
||||
matrix = "@superherointj:matrix.org";
|
||||
name = "Sérgio Marcelo";
|
||||
};
|
||||
supermarin = {
|
||||
email = "git+nixpkgs@mar.in";
|
||||
name = "marin";
|
||||
github = "supermarin";
|
||||
githubId = 627285;
|
||||
};
|
||||
SuperSandro2000 = {
|
||||
email = "sandro.jaeckel@gmail.com";
|
||||
matrix = "@sandro:supersandro.de";
|
||||
|
||||
@@ -79,22 +79,39 @@ in
|
||||
|
||||
culture = mkOption {
|
||||
type = types.enum [
|
||||
"de"
|
||||
"en"
|
||||
"bg_BG"
|
||||
"ca"
|
||||
"cs"
|
||||
"da"
|
||||
"de"
|
||||
"el_GR"
|
||||
"en"
|
||||
"en_GB"
|
||||
"es"
|
||||
"et_EE"
|
||||
"fi"
|
||||
"fr"
|
||||
"he_IL"
|
||||
"hu"
|
||||
"it"
|
||||
"ja"
|
||||
"ko_KR"
|
||||
"lt"
|
||||
"nl"
|
||||
"no"
|
||||
"pl"
|
||||
"pt_BR"
|
||||
"pt_PT"
|
||||
"ro_RO"
|
||||
"ru"
|
||||
"sk_SK"
|
||||
"sl"
|
||||
"sv_SE"
|
||||
"ta"
|
||||
"tr"
|
||||
"uk"
|
||||
"zh_CN"
|
||||
"zh_TW"
|
||||
];
|
||||
default = "en";
|
||||
description = ''
|
||||
@@ -119,6 +136,37 @@ in
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
entryPage = mkOption {
|
||||
# https://github.com/grocy/grocy/blob/v4.6.0/config-dist.php#L75-L78
|
||||
type = types.enum [
|
||||
"stock"
|
||||
"shoppinglist"
|
||||
"recipes"
|
||||
"chores"
|
||||
"tasks"
|
||||
"batteries"
|
||||
"equipment"
|
||||
"calendar"
|
||||
"mealplan"
|
||||
];
|
||||
default = "stock";
|
||||
description = ''
|
||||
Specify an custom homepage if desired.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = ''
|
||||
These lines go at the end of config.php verbatim.
|
||||
'';
|
||||
example = ''
|
||||
Setting('FEATURE_FLAG_RECIPES', false);
|
||||
Setting('FEATURE_FLAG_STOCK_PRODUCT_FREEZING', false);
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
@@ -129,6 +177,8 @@ in
|
||||
Setting('CURRENCY', '${cfg.settings.currency}');
|
||||
Setting('CALENDAR_FIRST_DAY_OF_WEEK', '${toString cfg.settings.calendar.firstDayOfWeek}');
|
||||
Setting('CALENDAR_SHOW_WEEK_OF_YEAR', ${boolToString cfg.settings.calendar.showWeekNumber});
|
||||
Setting('ENTRY_PAGE', '${cfg.settings.entryPage}');
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
|
||||
users.users.grocy = {
|
||||
@@ -149,11 +199,8 @@ in
|
||||
user = "grocy";
|
||||
group = "nginx";
|
||||
|
||||
# PHP 8.2 and 8.3 are the only version which are supported/tested by upstream:
|
||||
# https://github.com/grocy/grocy/blob/v4.5.0/README.md#platform-support
|
||||
phpPackage = pkgs.php83;
|
||||
|
||||
inherit (cfg.phpfpm) settings;
|
||||
inherit (cfg.package.passthru) phpPackage;
|
||||
|
||||
phpEnv = {
|
||||
GROCY_CONFIG_FILE = "/etc/grocy/config.php";
|
||||
|
||||
@@ -201,33 +201,28 @@ in
|
||||
server.succeed("systemctl --no-pager -l status apparmor.service")
|
||||
server.wait_for_unit("apparmor.service")
|
||||
''
|
||||
+ lib.optionalString cfg.feature.user (
|
||||
# python
|
||||
''
|
||||
with subtest("incus-user allows restricted access for users"):
|
||||
server.fail("incus project show user-1000")
|
||||
server.succeed("su - testuser bash -c 'incus list'")
|
||||
# a project is created dynamically for the user
|
||||
server.succeed("incus project show user-1000")
|
||||
# user can create an instance
|
||||
server.succeed("su - testuser bash -c 'incus create --empty'")
|
||||
''
|
||||
+ lib.optionalString (lib.versionOlder cfg.package.version "6.21") ''
|
||||
# users shouldn't be able to list storage pools
|
||||
server.fail("su - testuser bash -c 'incus storage list'")
|
||||
''
|
||||
+ lib.optionalString (lib.versionAtLeast cfg.package.version "6.21") ''
|
||||
# users shouldn't be able to read storage pools
|
||||
server.succeed("su - testuser bash -c 'incus storage list'")
|
||||
+
|
||||
lib.optionalString cfg.feature.user
|
||||
# python
|
||||
''
|
||||
with subtest("incus-user allows restricted access for users"):
|
||||
server.fail("incus project show user-1000")
|
||||
server.succeed("su - testuser bash -c 'incus list'")
|
||||
# a project is created dynamically for the user
|
||||
server.succeed("incus project show user-1000")
|
||||
# user can create an instance
|
||||
server.succeed("su - testuser bash -c 'incus create --empty'")
|
||||
|
||||
# pre-check that there is a pool source
|
||||
pool_source = server.succeed("incus storage get default source").strip()
|
||||
assert pool_source == "/var/lib/incus/storage-pools/default", f"Expected pool source /var/lib/incus/storage-pools/default, got {pool_source}"
|
||||
# users should be able to read storage pools
|
||||
server.succeed("su - testuser bash -c 'incus storage list'")
|
||||
|
||||
# users shouldn't be able to read storage pool config
|
||||
code, pool_source = server.execute("su - testuser bash -c 'incus storage get default source'")
|
||||
assert pool_source.strip() == "", f"Expected empty string, got {pool_source}"
|
||||
''
|
||||
)
|
||||
# pre-check that there is a pool source
|
||||
pool_source = server.succeed("incus storage get default source").strip()
|
||||
assert pool_source == "/var/lib/incus/storage-pools/default", f"Expected pool source /var/lib/incus/storage-pools/default, got {pool_source}"
|
||||
|
||||
# users shouldn't be able to read storage pool config
|
||||
code, pool_source = server.execute("su - testuser bash -c 'incus storage get default source'")
|
||||
assert pool_source.strip() == "", f"Expected empty string, got {pool_source}"
|
||||
''
|
||||
+ instanceScript;
|
||||
}
|
||||
|
||||
@@ -121,5 +121,6 @@ with pkgs;
|
||||
};
|
||||
kafka_4_0 = makeKafkaTest "kafka_4_0" { kafkaPackage = apacheKafka_4_0; };
|
||||
kafka_4_1 = makeKafkaTest "kafka_4_1" { kafkaPackage = apacheKafka_4_1; };
|
||||
kafka_4_2 = makeKafkaTest "kafka_4_2" { kafkaPackage = apacheKafka_4_2; };
|
||||
kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; };
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ let
|
||||
driver.find_element(By.ID, 'oc-login-password').send_keys(password)
|
||||
wait.until(EC.visibility_of_element_located((By.XPATH, '//button[@type="submit"]')))
|
||||
driver.find_element(By.XPATH, '//button[@type="submit"]').click()
|
||||
wait.until(EC.visibility_of_element_located((By.ID, 'new-file-menu-btn')))
|
||||
wait.until(EC.visibility_of_element_located((By.ID, 'app-floating-action-button-com-github-opencloud-eu-web-files-floating-action-button')))
|
||||
wait.until(EC.title_contains("Personal"))
|
||||
'';
|
||||
in
|
||||
|
||||
@@ -93,6 +93,14 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
luaDependencies = lib.mkOption {
|
||||
readOnly = true;
|
||||
type = lib.types.listOf (lib.types.nullOr lib.types.package);
|
||||
example = lib.literalExpression "[ (lp: [ lp.mpack ]) ]";
|
||||
description = ''
|
||||
Lua dependencies required by the plugins.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config =
|
||||
@@ -122,5 +130,11 @@ in
|
||||
) [ ] pluginsNormalized;
|
||||
|
||||
pluginPython3Packages = map (plugin: plugin.python3Dependencies or (_: [ ])) pluginsNormalized;
|
||||
|
||||
luaDependencies =
|
||||
let
|
||||
op = acc: p: acc ++ (p.plugin.requiredLuaModules or [ ]);
|
||||
in
|
||||
lib.foldl' op [ ] pluginsNormalized;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -112,6 +112,7 @@ let
|
||||
runtimeDeps
|
||||
pluginAdvisedLua
|
||||
pluginPython3Packages
|
||||
luaDependencies
|
||||
;
|
||||
|
||||
# A Vim "package", see ':h packages'
|
||||
|
||||
@@ -109,7 +109,7 @@ let
|
||||
|
||||
luaPathLuaRc =
|
||||
let
|
||||
luaEnv = lua.withPackages extraLuaPackages;
|
||||
luaEnv = lua.withPackages (lp: extraLuaPackages lp ++ vimPackageInfo.luaDependencies);
|
||||
|
||||
# getLuaPath / getLuaCPath are not interpreter dependant at the moment and might thus cause
|
||||
# errors between luajit/Puc lua
|
||||
@@ -122,10 +122,8 @@ let
|
||||
'';
|
||||
|
||||
rcContent = lib.concatStringsSep "\n" (
|
||||
[
|
||||
luaPathLuaRc
|
||||
providerLuaRc
|
||||
]
|
||||
lib.optional (extraLuaPackages lua.pkgs != [ ]) luaPathLuaRc
|
||||
++ [ providerLuaRc ]
|
||||
++ lib.optional (luaRcContent != "") luaRcContent
|
||||
++ lib.optional (neovimRcContent' != "") ''
|
||||
vim.cmd.source "${writeText "init.vim" neovimRcContent'}"
|
||||
|
||||
+7
-1
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
vscode-utils,
|
||||
vsce,
|
||||
gemini-cli,
|
||||
}:
|
||||
vscode-utils.buildVscodeExtension (finalAttrs: {
|
||||
@@ -18,7 +19,12 @@ vscode-utils.buildVscodeExtension (finalAttrs: {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
npm --workspace=gemini-cli-vscode-ide-companion run package -- --out $out
|
||||
npm --workspace=gemini-cli-vscode-ide-companion run prepackage
|
||||
|
||||
# the bundled vsce is broken, using our packaged version
|
||||
pushd packages/vscode-ide-companion
|
||||
${vsce}/bin/vsce package --no-dependencies --out $out
|
||||
popd
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-wakatime";
|
||||
publisher = "WakaTime";
|
||||
version = "27.0.0";
|
||||
hash = "sha256-SCgVX/s4fjMXPA4wrjIqzdi+RHMuhq+kf5gN2oWpQQY=";
|
||||
version = "29.0.3";
|
||||
hash = "sha256-+MNm0IYbvq2OdqOyhXwfMAhzp/V4jR0Qpf461KIP6Ho=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.76";
|
||||
hash = "sha256-dZOzj9qNsLLgR1FN1cklPfJPhUG52dtmzC3dyXiIqUY=";
|
||||
version = "2.1.77";
|
||||
hash = "sha256-fK1Exshw1mRV1S2DXjza01YaExGVeY371aXNTNlhhfE=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -1210,8 +1210,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "databricks";
|
||||
publisher = "databricks";
|
||||
version = "2.10.5";
|
||||
hash = "sha256-BOJP4yJXaVwojFlk12/eitqCdzeqghAzSdxJQZSr6yg=";
|
||||
version = "2.10.6";
|
||||
hash = "sha256-6D8QRH8x2LCZehkkaKf3s3yKzmAkiBg9gFaUCIzGJB4=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog";
|
||||
@@ -1729,8 +1729,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "foam-vscode";
|
||||
publisher = "foam";
|
||||
version = "0.31.0";
|
||||
hash = "sha256-Z3M20CjSEFSG5KVfsbLa7gokNnGAG1IrdD0xe7Ch3t8=";
|
||||
version = "0.33.0";
|
||||
hash = "sha256-xeZp75qnxnW2LNtRz0IUzrBjBe5Po3VHGTta+6VCLvQ=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
|
||||
@@ -3766,8 +3766,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "prisma";
|
||||
publisher = "Prisma";
|
||||
version = "31.5.35";
|
||||
hash = "sha256-gS1uNqDH3dKcValRXrTbPoXbkLa+A8BaBdhs1WF7jcc=";
|
||||
version = "31.6.0";
|
||||
hash = "sha256-jbcAB3IeUrdWTVV+8ssMumHd5aeXJH6tivWGezJ7amU=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";
|
||||
@@ -5219,8 +5219,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "gitblame";
|
||||
publisher = "waderyan";
|
||||
version = "12.0.3";
|
||||
sha256 = "sha256-W22JqjzRnyvqZPHt7eQgFXfCRRTcKXSXE7dPam8cs24=";
|
||||
version = "12.1.0";
|
||||
sha256 = "sha256-S+OeS7YlygElzO/jgHidlIMLFmAOL3tQPcv/063LIEM=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mednafen-pce-fast";
|
||||
version = "0-unstable-2026-01-23";
|
||||
version = "0-unstable-2026-03-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "beetle-pce-fast-libretro";
|
||||
rev = "52675734da114a19b3705f03906b1455f3d76644";
|
||||
hash = "sha256-hITofg0UB5sGNOKAijfORz3ZtHY5CCdqFmbT4nMkmG8=";
|
||||
rev = "0fa44d2500ebc9bf96d2808209be27a69006df79";
|
||||
hash = "sha256-NBL506+aaLRQh9XawvvynNRunWDPqxrt7ngy6FCmiIQ=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "pcsx-rearmed";
|
||||
version = "0-unstable-2026-03-08";
|
||||
version = "0-unstable-2026-03-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "pcsx_rearmed";
|
||||
rev = "6eb679d064a1efe92af79fe9970c0591c8da02d4";
|
||||
hash = "sha256-InGMQTGCnbRMLQE5GVDF3aqnH0NY9EjDgJHoh00KGDk=";
|
||||
rev = "4dfc616b9389f9997d1f2afcb9e61023b87c12c7";
|
||||
hash = "sha256-UVgCeA4+I+7vA0DHgfDUt8Vbg37xnu/lfoRcZmnQ21w=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "twitch-chat-downloader";
|
||||
version = "2.5.4";
|
||||
version = "2.5.5";
|
||||
format = "setuptools";
|
||||
|
||||
# NOTE: Using maintained fork because upstream has stopped working, and it has
|
||||
@@ -19,7 +19,7 @@ buildPythonApplication rec {
|
||||
owner = "TheDrHax";
|
||||
repo = "twitch-chat-downloader";
|
||||
rev = version;
|
||||
hash = "sha256-mV60ygrtQa9ZkJ2CImhAV59ckCJ7vJSA9cWkYE2xo1M=";
|
||||
hash = "sha256-9wIp0uttVBOdexOMb8VvpUEEdZ97SGSlZcFQ4jM/tqM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -400,13 +400,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"fastly_fastly": {
|
||||
"hash": "sha256-EQlK21yB1PcM74NBKnslB/Q4Y9JO1SOzvmpGZkJ74HQ=",
|
||||
"hash": "sha256-qEBjalezQhcDDeAW/GGf8d70A5iWpWU4C0ABN5HZpAM=",
|
||||
"homepage": "https://registry.terraform.io/providers/fastly/fastly",
|
||||
"owner": "fastly",
|
||||
"repo": "terraform-provider-fastly",
|
||||
"rev": "v8.7.1",
|
||||
"rev": "v8.7.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-xgIAmxi9VvPsWqBtQHchv5UvwALkayxmoMsUp0aYJVs="
|
||||
"vendorHash": "sha256-I+8Ql0/m/vYchnGsg0ADX/wpWwgH79ALN8Cl6gzcS2c="
|
||||
},
|
||||
"flexibleenginecloud_flexibleengine": {
|
||||
"hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=",
|
||||
@@ -526,11 +526,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"hashicorp_azurerm": {
|
||||
"hash": "sha256-sg6CJVQJybbYghcp8dBhm2B7xvmsuUS7Je2jmGZHwZE=",
|
||||
"hash": "sha256-6SzcMWDKloX8qmBW8sGKOAKVxFVegaSYSm7xSZBS3p4=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v4.63.0",
|
||||
"rev": "v4.64.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -1238,13 +1238,13 @@
|
||||
"vendorHash": "sha256-E9e4+n12uSc12F428D8Oqe0iquTMywAY4DYWhSC+hmk="
|
||||
},
|
||||
"splunk-terraform_signalfx": {
|
||||
"hash": "sha256-lDFwuSZdc0gI5LotTSJk0FSBc9jn7WN43hXEsVHiwG0=",
|
||||
"hash": "sha256-N9vAa6/FAGQaLFv2GUz4P8vKXR1F8QPFJ+sIaFoNFpw=",
|
||||
"homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
|
||||
"owner": "splunk-terraform",
|
||||
"repo": "terraform-provider-signalfx",
|
||||
"rev": "v9.25.0",
|
||||
"rev": "v9.26.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-EOr4Ps0IYYOtRq19tt87NFfCEvJTaFBGb5B4mKMll7c="
|
||||
"vendorHash": "sha256-oan+TCct0oHyVHgf09WbH+Xo9IUoEywEYkgGE/pzUzQ="
|
||||
},
|
||||
"spotinst_spotinst": {
|
||||
"hash": "sha256-dZStuj7YjSF9X5/AEkrZyqDT2l2orpV4jY6CJrXjOgA=",
|
||||
@@ -1409,11 +1409,11 @@
|
||||
"vendorHash": "sha256-OVdhM8Zqnm1J8KducnkNkroBoSLER3fHfZBjyp7kBu8="
|
||||
},
|
||||
"ucloud_ucloud": {
|
||||
"hash": "sha256-UOVnfWYhntmRHMApQgemjUBsyUIz0bexsc1gwDGGee4=",
|
||||
"hash": "sha256-lDLYp0ApFCV6XYCxCunkpFwEXpACoChQWLx2bHTjeQs=",
|
||||
"homepage": "https://registry.terraform.io/providers/ucloud/ucloud",
|
||||
"owner": "ucloud",
|
||||
"repo": "terraform-provider-ucloud",
|
||||
"rev": "v1.39.2",
|
||||
"rev": "v1.39.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@@ -1,42 +1,42 @@
|
||||
{
|
||||
"linux-canary": {
|
||||
"hash": "sha256-+OgSY9bh0hiO3z4RO5cePGnB92DO9tcjPiswt5fhQCM=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.889/discord-canary-0.0.889.tar.gz",
|
||||
"version": "0.0.889"
|
||||
"hash": "sha256-0/A5x/5F60fGN/V6n+OZh6dqsi7D2zuSNABflXK0zF4=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.902/discord-canary-0.0.902.tar.gz",
|
||||
"version": "0.0.902"
|
||||
},
|
||||
"linux-development": {
|
||||
"hash": "sha256-wybYWGNo7FhKC7W3zPEKBc4VO5UulCaRacjjKqbleQE=",
|
||||
"url": "https://development.dl2.discordapp.net/apps/linux/0.0.97/discord-development-0.0.97.tar.gz",
|
||||
"version": "0.0.97"
|
||||
"hash": "sha256-Xe5PjHDWXU+eIAcBID34gjuADmAl1JAQLmXUAi/p4tg=",
|
||||
"url": "https://development.dl2.discordapp.net/apps/linux/0.0.99/discord-development-0.0.99.tar.gz",
|
||||
"version": "0.0.99"
|
||||
},
|
||||
"linux-ptb": {
|
||||
"hash": "sha256-47k+PQf1A79cSIBLktcB8olCoV5DnxTjPg+Dx5YSb8w=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.181/discord-ptb-0.0.181.tar.gz",
|
||||
"version": "0.0.181"
|
||||
"hash": "sha256-Oywm/ckDY3Mhoy3rbW5PdBSQVsPG4vzR/zHXBFfda4c=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.182/discord-ptb-0.0.182.tar.gz",
|
||||
"version": "0.0.182"
|
||||
},
|
||||
"linux-stable": {
|
||||
"hash": "sha256-cef++sTEiqq1H+mHYyIw5Z/Tj1dAoLtKQRw7OSB/axY=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.127/discord-0.0.127.tar.gz",
|
||||
"version": "0.0.127"
|
||||
"hash": "sha256-90XmXUbkzwiMXh1UGpeO8xqkXb589+dwUlt7iHGEwQU=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.128/discord-0.0.128.tar.gz",
|
||||
"version": "0.0.128"
|
||||
},
|
||||
"osx-canary": {
|
||||
"hash": "sha256-VbyhJjp2EblclRnYfzuAVnOx1cdVtbcZYunJivNSA1I=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.994/DiscordCanary.dmg",
|
||||
"version": "0.0.994"
|
||||
"hash": "sha256-cK3Yo7NT7MIUJYzaatO9qxNeAFwEDikPsv4CQPUZKZQ=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.1007/DiscordCanary.dmg",
|
||||
"version": "0.0.1007"
|
||||
},
|
||||
"osx-development": {
|
||||
"hash": "sha256-85i2vjOj4JhoKwcACyXzUKwonb5qndYoy+4AjrXtaLE=",
|
||||
"url": "https://development.dl2.discordapp.net/apps/osx/0.0.111/DiscordDevelopment.dmg",
|
||||
"version": "0.0.111"
|
||||
"hash": "sha256-UWZYRgykAiYPXPQ63cRIRiPdvG3a8lml84zgNABd0/E=",
|
||||
"url": "https://development.dl2.discordapp.net/apps/osx/0.0.116/DiscordDevelopment.dmg",
|
||||
"version": "0.0.116"
|
||||
},
|
||||
"osx-ptb": {
|
||||
"hash": "sha256-oxj36f0N9hGcMSurQdgJfFHKgEdv9xL1+SSmszcct68=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.213/DiscordPTB.dmg",
|
||||
"version": "0.0.213"
|
||||
"hash": "sha256-jnzl9VXIH0AlTtt8BKfVlIRVxAPUBq6iyxECjpE/c+E=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.214/DiscordPTB.dmg",
|
||||
"version": "0.0.214"
|
||||
},
|
||||
"osx-stable": {
|
||||
"hash": "sha256-3tNPV9Xk0yZQTV3yhHsYxEOJCFC1Kk2dzO2Wy7GNkCc=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.379/Discord.dmg",
|
||||
"version": "0.0.379"
|
||||
"hash": "sha256-zMIBZtvmncIAR3IEYblss7oP7miyRpmCkqao/NSA67k=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.380/Discord.dmg",
|
||||
"version": "0.0.380"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
mkHyprlandPlugin {
|
||||
pluginName = "hypr-dynamic-cursors";
|
||||
version = "0-unstable-2026-02-23";
|
||||
version = "0-unstable-2026-03-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirtCode";
|
||||
repo = "hypr-dynamic-cursors";
|
||||
rev = "0c6b2be864a0cfd4ef73429d6eeb9220eba842ab";
|
||||
hash = "sha256-hXVBQ/F6tkNE4W+c/FS1LB3k6hEEkEnU5O+qTBXRK5s=";
|
||||
rev = "57e14edd0ae265b01828e466e287e96eb1e84dd3";
|
||||
hash = "sha256-hHMMP4h9VvacDLb8lkI6gZcUnhDbEt+GP2RLLL2s2C4=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
@@ -71,17 +71,22 @@ async function main() {
|
||||
// Don't unlink this file, we just wrote it.
|
||||
managed.delete(file);
|
||||
|
||||
// Link file
|
||||
// No need to replace the symlink if it already points to the right target
|
||||
try {
|
||||
await fs.promises.symlink(sourcePath, targetPath);
|
||||
if (await fs.promises.readlink(targetPath) === sourcePath) {
|
||||
return
|
||||
}
|
||||
} catch (err) {
|
||||
// If the target file already exists remove it and try again
|
||||
if (err.code !== "EEXIST") {
|
||||
// If the symlink doesn't already exist, keep going. If we get a
|
||||
// different error trying to stat it, fail.
|
||||
if (err.code !== "ENOENT") {
|
||||
throw err;
|
||||
}
|
||||
await fs.promises.unlink(targetPath);
|
||||
await fs.promises.symlink(sourcePath, targetPath);
|
||||
}
|
||||
// Replace the link, if it exists, atomically.
|
||||
const tmpPath = `${targetPath}.tmp.${process.pid}`
|
||||
await fs.promises.symlink(sourcePath, tmpPath);
|
||||
await fs.promises.rename(tmpPath, targetPath);
|
||||
})
|
||||
);
|
||||
|
||||
|
||||
@@ -65,22 +65,50 @@
|
||||
"@node-rs/jieba-win32-arm64-msvc@npm:1.10.4": "68146cf2b5324c461847da9fd36aa851aeb5655f94b0178a194630c80926e914b71f5fe60a6853c9197516e2b2680303bf28c405963f8655d0099d335c5178bd",
|
||||
"@node-rs/jieba-win32-ia32-msvc@npm:1.10.4": "38deadbf93c6ffb410a880f8938034635e2ca755b956b7cf0b751f287dbfb4b5e58a492f532f23b30e77a7b3889467055c4d9be4d76df8c4416d97f96c242f93",
|
||||
"@node-rs/jieba-win32-x64-msvc@npm:1.10.4": "073b499e19d211f416a604a791c7a29c99552b328d0565d8381258a49682f87014274eebdaafcc9477238a2fd555b0e18fedccb45a49715ad3332958c6f43905",
|
||||
"@oxfmt/darwin-arm64@npm:0.26.0": "7935654492f237b7bd24ee1a08c6455d797a97f435e93490e9a315858b4fe3cd961bbd9c81e951de8c0383cf094b0f816b316a2ff26bd1dcec3016c53b4036f1",
|
||||
"@oxfmt/darwin-x64@npm:0.26.0": "b375a2b7fe93831a1d517ce86fd275c2c67ace54b8b5de8b4195006863b17f0fe99854dd09d364000ef0a0797eaadf97476e5d30e6eb94988062851c8d3dd635",
|
||||
"@oxfmt/linux-arm64-gnu@npm:0.26.0": "a5239df32f8512334652ebc271df540e48d72e3971f6d363aab76085643f2f4324a5f5ec0c2fd3ffb8c1e84b482fc1835ac481f16790f9d2c8a9c2e70494ecbc",
|
||||
"@oxfmt/linux-arm64-musl@npm:0.26.0": "20365527d2d4fd48cd04858ab228ca62df0a6c43c6bc1b483ef42feb71c0ad54bf70b847b2495e4509843bbad8f0b82bad026d565b7890695e42f1872334cf46",
|
||||
"@oxfmt/linux-x64-gnu@npm:0.26.0": "8a0e58fc960d350c00fed4ffbc48572bc8916ffc5c837512c4b397cf91deed916410ca8353a99536943a62e45f5afaf3ed6ec7ba286be35377906eba47064936",
|
||||
"@oxfmt/linux-x64-musl@npm:0.26.0": "de6737ad58451a8203f1c5c8af797080ea9f8efdc52d00e8ad20ba3855cfdaf796cdb6840e5ac0407873aaadae680bb038313a52218332748ff470b4981e7ee5",
|
||||
"@oxfmt/win32-arm64@npm:0.26.0": "d70bf0c6117170dd3ce739276352baf59907b74c91e957f0b0fe231f12c2d459eaff37cd8e15a6c9e74c6af98cb5fbec8222948a35f9536196417b74a864c2d8",
|
||||
"@oxfmt/win32-x64@npm:0.26.0": "8a1dfa4ad594b174f44c9e5a37db585b29c2022c39609007eefb2c5705325268dd88b1bcd98087c87052d48b350205f4997b8a3763f532820491354036e2cfa8",
|
||||
"@oxlint/darwin-arm64@npm:1.41.0": "f89cbee9ac6b471aacc5f7f9ccd83488768c962da0efffbb87f3c74cd4916744119b553435900d6370c340e0f2d26641d44f073d0394a55667b1f3dda7a4f311",
|
||||
"@oxlint/darwin-x64@npm:1.41.0": "21f664015813c05f24aeeab89f1819c5b8ae732ccdce3aedf1a8e1c87db3784acd51f9c4e4a1b7368d7fe62ce22e0f5230abdbd3bbbeb01c3b9c2a0a03c5688d",
|
||||
"@oxlint/linux-arm64-gnu@npm:1.41.0": "6b4f5aa8d658f46989febb54256ab23f3ac98a74d2f23607df97af405f07a62b4e734e138dec94508057937988da33d169e91a69a016b6bfc832ed5412faa311",
|
||||
"@oxlint/linux-arm64-musl@npm:1.41.0": "3b35d850ed96305fdbb565bbcf065796558624107456c28dee1728230f53f6e10d39564b86c5c716b11d6056fe75614358e5c607ce186084ad077fc298336c80",
|
||||
"@oxlint/linux-x64-gnu@npm:1.41.0": "d8788979fa8a7fc4dc1ceb5e382c470b2c41a0dafc75c528792b87290466abe5f26ebca4c7aa286a90ee88852dca801bd168a6756eb8fda1a08faf3443f5aff5",
|
||||
"@oxlint/linux-x64-musl@npm:1.41.0": "892e3141ff0187bb0e94775dffbd9781888f771819089d7d4a01429539fc2c9e94c48a25c4998db8d426e49f84d453a108ed2c35056938ff7efd1e1f5fcafed1",
|
||||
"@oxlint/win32-arm64@npm:1.41.0": "d4a8dfca1ded97ac0394636d77afeea997b1133460dd4f746dfe722827d14d98fa7a4e3a1e1dcf42d1f97654637c99c329cd051ffcec793619c46b017526097d",
|
||||
"@oxlint/win32-x64@npm:1.41.0": "522705b9fda83477ca691f3cfd139d32cd0dd177b318fb4a98ca55af4ba3c120ab45104ab10194ac81d191cc575d898c768f25ff23c73604a03f4c8ee1ddc412",
|
||||
"@oxfmt/binding-android-arm-eabi@npm:0.32.0": "edad7a793a30eef9d34b2d904fc50a849e8aecfcd8e2c2246cadb6fce8ae14c371100f1fa636c5b66b9118949259eefb968df4391c4047c3a92e678696697b64",
|
||||
"@oxfmt/binding-android-arm64@npm:0.32.0": "e1c3eb67b295627353f0ab9874e53aca9539a35f8157fbbfc6021ccee4d2761bf27db7905b106afe30a646af9e2c802c226f4a58c85b3431df88d352d02a4e2d",
|
||||
"@oxfmt/binding-darwin-arm64@npm:0.32.0": "0c4a98fb78f9984cda0f74f7f64145597beca8ba2916333bd9e6f4aaf49fdbe5f5cc99fe2aff4a202c7e64d640251997c3ed9d64eefa1b51382f92c47518723a",
|
||||
"@oxfmt/binding-darwin-x64@npm:0.32.0": "b97916dd2fe96a09b387f3e950efcce3f4f9b1302c7efa5e7a9b587154929d072a7105aca9d6e4e140ab30b4901d803b1ba5657d0181cbe12a75b92d94400b42",
|
||||
"@oxfmt/binding-freebsd-x64@npm:0.32.0": "5c0eb0d0e7911ee3f6e062c0bc122b92a09aba4d4d55236df331ca24eeb3e90848064c45570a44bbb1fb2cbafc0aab06ea4f85d2c07b68ff4fc1d2bac60d21a2",
|
||||
"@oxfmt/binding-linux-arm-gnueabihf@npm:0.32.0": "3e76615d5369cdc639983209994c7ede0fbc5aa2e05674cf94f5bd325e290fb772f98ad7576da30bb744634e14c82bd7ba03a3715e1977c87c0204918ea7e18d",
|
||||
"@oxfmt/binding-linux-arm-musleabihf@npm:0.32.0": "a4de9deb92d9582a6bce41316d14d9a0867812db561f8514e1f88d6783bb86d396cf39289c203cf1d840636e65687b8fab40ee3823459fae23579778743dc7a9",
|
||||
"@oxfmt/binding-linux-arm64-gnu@npm:0.32.0": "c8d7d6011b3ea535399d40790ac89ec04211dc54c066f2bd624c131df51653be47f8ddfe499bdaebeb1ef655cf72a09ebbd58446f376eae6153ed45c8513dbad",
|
||||
"@oxfmt/binding-linux-arm64-musl@npm:0.32.0": "a6d4281feb3babe222ca0c12cb837ee3f836e6c36f25f036376e8df7976c0ecd46588e202f4553d9858ceb44c277604803870ae3847cca697eef883dd16e878e",
|
||||
"@oxfmt/binding-linux-ppc64-gnu@npm:0.32.0": "69d40a7e7ffe699e07d22b8581ef4f9152075a88f8ee87f83c02aea5d8666c3445d4b121125b2db0b05d533447f8f8b15a86ce10151bfb4d5a48e9ed985cd514",
|
||||
"@oxfmt/binding-linux-riscv64-gnu@npm:0.32.0": "352e28463804f4f5774a7c6375314c8f66e910945da060e7129ea6f9ef4e2b05172f398825279c008ecd2df278fdf25ffe81ceb2c42c7be745dad1e8caea7176",
|
||||
"@oxfmt/binding-linux-riscv64-musl@npm:0.32.0": "e108350c2ebbadd6e0c7e7193f87ec816c3175478c17d63b8eebbb8901dff5c73d14265beff33b9613fc17ffa62956831f57d74eb326defed61c9238386c99d7",
|
||||
"@oxfmt/binding-linux-s390x-gnu@npm:0.32.0": "6cf9b827c188e2d2676d3e52ec5c80d07c1ec1dee8d2b8f21784e70b2f881efdc1b0566d6ff611104b62d83e880b91e253cea6f6154052a724f70e5bbe41e1b9",
|
||||
"@oxfmt/binding-linux-x64-gnu@npm:0.32.0": "65308d09753a0390eb1485297d853c943b2c28fadcb11f8e566fbeb74e58ea7b977f996eb14f2f839ae58bddc1fd9fc2562dc21807aa4a50f86be5ed5f506435",
|
||||
"@oxfmt/binding-linux-x64-musl@npm:0.32.0": "13fe9b607e30cce76e9600ac510035b27f387d57cb3424927853f74af1467580c5bfee6021774044ae12b817985a49793711d6f9f10eb368d762d7bc18ae709d",
|
||||
"@oxfmt/binding-openharmony-arm64@npm:0.32.0": "5df994c65584856841c72097fd9bdba825446cc37b36538655f440af61511bd9a7fc54691e5fa67af116f16cfc88dfe25c2d3cd292c098165cde4e598e96ca71",
|
||||
"@oxfmt/binding-win32-arm64-msvc@npm:0.32.0": "425871b575111f7738404b70d927ec99d5cea4486780371f9b7fb08165afd26988cbfd9248d6daea6a922bcfd8cbe16caa6374fdfa9d3b62b317f5cd565f83ef",
|
||||
"@oxfmt/binding-win32-ia32-msvc@npm:0.32.0": "4cd056aa20632b2b40bb29d31e6f3f29b7645113339d514bcbe67fcf532ee474e357b851366177d4e333e6e9cce8008099b7c81d2098b5c2c3dc3b1c3bef7746",
|
||||
"@oxfmt/binding-win32-x64-msvc@npm:0.32.0": "177af22b383015f3e4ebb46ae308e21c28df9a157b098533c45039de96008ab05b0f91f0148c159b4d5f6ca1627b8e600d71c2ce800826bda5961b9e23b4eb95",
|
||||
"@oxlint-tsgolint/darwin-arm64@npm:0.13.0": "452933ef927377bf5a8339abae8480168838dcf43dbac185138dced6bcb182a82415e45bceb60176cefed270f3a6f0b25b82c51407ce47b5affa33c147b9e6e3",
|
||||
"@oxlint-tsgolint/darwin-x64@npm:0.13.0": "7572222e4cc5c3fae9ba51f86f30542d9581b6e9493ebbcb54842f5321a34972e7d6d7e6cf802a096d17bafa983e000fd6a72025897e3181b64a3e5fb4440802",
|
||||
"@oxlint-tsgolint/linux-arm64@npm:0.13.0": "94cc4283f9c9857778d68030ce4e2e337b258dea153e71fe4d3505b4b4c996d8c69d18c1969953ef5030e64ff2aabb49811ba5a03069d95ed9f880a22502118e",
|
||||
"@oxlint-tsgolint/linux-x64@npm:0.13.0": "c2855e98f9bcf2ecc893c06518ab23dbcb661ba4c18bca60e6a48d12ed3a52737b23fed5ebe30f0c6afd4df9538a9c34330e15e42de4efb120b7eb0ebfeeba2a",
|
||||
"@oxlint-tsgolint/win32-arm64@npm:0.13.0": "e46e11b10c2d2e8efdbe110e99153036e34d1f1e19d0eb111c8717602228d3bfcee4aea04f2a1d2510aa6884fdf4c47f3a533782e45a6872721cb828f5065ab9",
|
||||
"@oxlint-tsgolint/win32-x64@npm:0.13.0": "d200689f40a6bc805b079230f1a731dae3b87d0747ea197ffcfaed94b2131335941c71b2e2df64df917ecf14f13cee4892195727c5fe996909d81edff499964f",
|
||||
"@oxlint/binding-android-arm-eabi@npm:1.47.0": "1fe82b13b323947787a09cc095c9cefe72918886d06e46913267628d40d56852052d46df8150a1926c743b57345c85d1d975e8052592ed0689c28e103d6c299f",
|
||||
"@oxlint/binding-android-arm64@npm:1.47.0": "02ad4a87cc64fa3fee178c566bdca5a529be9933c095b5fa22595f4824e2b54d5579fb309971d905f60e56e8071573ba4ac8b9f9613efcd3324c61b2fd6a5447",
|
||||
"@oxlint/binding-darwin-arm64@npm:1.47.0": "519bc2385dad9e31c547735d783826ba23f1f6d3bf135e17313c5f5ba3a304ca65c991dd9a40fe31d519b7be99d4ad1231a7635e47cd85f1d851626cb7a144bf",
|
||||
"@oxlint/binding-darwin-x64@npm:1.47.0": "86b116293ce19f3a71dc48bb23872a53a1a7c2b3ecf2e5ab2b839702704f6e360e57350bdb5510e42f3cdf91d29f6d092edc2816fdff400c06f056cef5ba0c91",
|
||||
"@oxlint/binding-freebsd-x64@npm:1.47.0": "cb2edba0ee407462cc4d602fe707d10efde5104f0ac54674c5ba6081603f2fe9112e0f5b1098357fd5d1e7a9b47ff8994a97338223553709a3d1313cfcb8f219",
|
||||
"@oxlint/binding-linux-arm-gnueabihf@npm:1.47.0": "e3534b373817510760db8f780185155596084baecd7fb30cdd61a6e6cb8d828b8ad2290f59675893eadabdd61466adc48e6bde2f08cad112fce1386cbb46d5a1",
|
||||
"@oxlint/binding-linux-arm-musleabihf@npm:1.47.0": "842f447947ad42351d0cab63eb8b1568b2389298a16a5410d8f6dca1870c299fb058853297869320e1911cffeed0676d628773c88c166da4e3c71c674b14318f",
|
||||
"@oxlint/binding-linux-arm64-gnu@npm:1.47.0": "1c42d827c2faad069ce8bc9ba1710b4e00a3c920617dffb77ca74b1f0b1b1a81dc67aed04f8cc0d53853b9ae847fde8f95ddb2021555c7b5d060d05ecc2039cb",
|
||||
"@oxlint/binding-linux-arm64-musl@npm:1.47.0": "224a2d0f716e18f651aa8bffc1e91941229a311742aa1687cd0ca4844d3c4d9ce94ca459b3d2250e386c0965e3c15baa05789ce2864e770516efe70ac81375c1",
|
||||
"@oxlint/binding-linux-ppc64-gnu@npm:1.47.0": "5be589bce11d156ad8ea25a651d3910f4cc0cef7b00ddd8e87db1db007d7d1aa62d665740cc76509368ed734a440c8bf8282a7e851bef5a9a4147d69f45f0d12",
|
||||
"@oxlint/binding-linux-riscv64-gnu@npm:1.47.0": "35e1582bf13c2907192af9fd1852dd35e647ee3e04a304dcb9b5235e929731f1925920965090722624648b0ae3f6f9d3f5feabfc4913ef261cadd3751894e25c",
|
||||
"@oxlint/binding-linux-riscv64-musl@npm:1.47.0": "355ea8587334e1f24c4ed0fcf76a453061e44bde1bf27a3d5fff28217bc9b0f5e79f0ecbaf0e25b5aa454cd777283a037157f482a9ad9eb164571956c26eec5f",
|
||||
"@oxlint/binding-linux-s390x-gnu@npm:1.47.0": "3bb53f7cc220a1a07722f4fa034d23ee0eb7640d4763fc42a513c3f4774c063a7cd50e7960b87f63685f470d9cd48e0dc51ab70a0617ddaa262a808a5881f6cf",
|
||||
"@oxlint/binding-linux-x64-gnu@npm:1.47.0": "6a37061689e582ffbabd0cd0909ab80580e336460c222ad3b97826b8e417b5825b2437a049d98917bcc50f57636094ecaca3fc9b5cc0d97ec4172c2109dd72bd",
|
||||
"@oxlint/binding-linux-x64-musl@npm:1.47.0": "4d4907fd33ebe28bc244abadb22be33d45ad9203507b802d26edff461a8217e867bf1167b1fcd50d6e35e4f35e1a235931d7bf2b5e04724ee2585af8b58b01a1",
|
||||
"@oxlint/binding-openharmony-arm64@npm:1.47.0": "58add856ee91d1454ddc433b7110799374b0fe9e3ed4d39edcffd68d263bca4933d6b8f9f08ce0ebd85318066bece1f41f9083654317e13905a78f4170a0678f",
|
||||
"@oxlint/binding-win32-arm64-msvc@npm:1.47.0": "9991e2a52d4b1537f13d4897e99264d5649f3819d766fdd33be2c99bc72d77557c55b7575d661d34de36a0d07cc4168a9df10601729fab7aea462a62c0e02293",
|
||||
"@oxlint/binding-win32-ia32-msvc@npm:1.47.0": "48a2ba7e9c82933cfc45579e4a8adc3611db8b98da644cb204253b88b9b3cdce20cfc9380592cbecb6143d3aaa6885b58bbdf285ac51b6524b3771d2b0224292",
|
||||
"@oxlint/binding-win32-x64-msvc@npm:1.47.0": "0be3f7d47412c8fc5d516e60e50980a9f90824f5e5ab602f93ab096b12b3dac4ebd1d9079ea8c8bbf07a28e44d31aa8632fcc4ed46cb6882fffb84e97bccf5c5",
|
||||
"@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141",
|
||||
"@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea",
|
||||
"@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134",
|
||||
@@ -114,16 +142,16 @@
|
||||
"@rollup/rollup-win32-arm64-msvc@npm:4.40.1": "d4c9002b95c4b6ee842faaa5087582a0772578c0969c9ee470697a6d3fd251845481285f5a4027bc8c0524bf277f3437844cae9936c5f96ca753dcca61e2f47f",
|
||||
"@rollup/rollup-win32-ia32-msvc@npm:4.40.1": "446e3ce5b037d1847af84e9a2b52734ae9f5425937fec2558d26ffb5c253dd8925dc35591abd78b0d43f7154222e47ee9aaeb3b167b3d69627805a97c5147185",
|
||||
"@rollup/rollup-win32-x64-msvc@npm:4.40.1": "39fe3c6b86ef880fb1d1261f6096d19707584c628271d6ae01f5a5f50d8a24ef62128b5929064c0aed4390c7c0c0b7cc9590e300fa5f10ed624816748da2fbb2",
|
||||
"@swc/core-darwin-arm64@npm:1.15.8": "4458d26f6682bdbf88565d548a04f6e8ed81ea05691204703a511adf4d4ef1889883da727349b5e492b2e53a4f2969fd06ea34f84e32cc5a963ac25194d6caa1",
|
||||
"@swc/core-darwin-x64@npm:1.15.8": "4075f73359b4cda8d7bcc68a636fbff60db3dea0ef4813b7e1a5ebdaa2c1197b4f888f7565a411f77ee5e8fe2398e3f1c27dfe06b2b087e7004009aeefac2019",
|
||||
"@swc/core-linux-arm-gnueabihf@npm:1.15.8": "6b82976fd35007ac7be41a7d8529dbb0c93bfa858e532c6a8d3fd899c41ecc9976fa40746f6005cd48d82340fcdf0a426296bef248ac7b77334c3744141fa823",
|
||||
"@swc/core-linux-arm64-gnu@npm:1.15.8": "ed3a8f363bc589886d44db58dabe6d53ce23d2cb8fe93a80fd05dd1ff46ebf438d2f1d38cf4144f4d5b89504dc73d15bd84540ac23b20d4aeb4f463de99c416a",
|
||||
"@swc/core-linux-arm64-musl@npm:1.15.8": "b063f086e3e92f622fd8fb1585bf0cf0b49eb910361844a4bdb0d0165fdb906fe53051cfbcd92ccfcbfb13ae6c0d85f2c12e373a01df5a4136b513ae94d7f626",
|
||||
"@swc/core-linux-x64-gnu@npm:1.15.8": "7028720f8aa475896f0468dcd77cc2512362082357e4e89d6e31ec559c87d25f0f9d7fc1702d59766217ea4ee7cfc0d1de817fde56958537f8f3ed9259673b55",
|
||||
"@swc/core-linux-x64-musl@npm:1.15.8": "be913db41e70ae8b9553a759f7a9cc80e50c4f521f058672471a182938c3789605c2122c77c32579d2b739ba4f91fa7e8beb8be31f87858e9b52e199c6644e0c",
|
||||
"@swc/core-win32-arm64-msvc@npm:1.15.8": "7047d7250e10577921b9250985c8e4408767fca73963b594f1e747f64e77eb5e2a4d2067a58debca9d33b2fd69385fd56410d5dca0e15bb6957aec9475909809",
|
||||
"@swc/core-win32-ia32-msvc@npm:1.15.8": "4992c3c2fe8fc0dd870319080b806e965278a07d23d0463b16b2c95d0299c0b2e03a1b7bb84c7da41002556b8a71f86b721037e743648321c2186d68bd2b4e32",
|
||||
"@swc/core-win32-x64-msvc@npm:1.15.8": "4faf5a9cbbe7e7afc038aa26ec658e41614c06116265be1a938e91839b027e1a847a0a767d9821165693f84fb98700032ad92830fee875164b672ac2024a035f",
|
||||
"@swc/core-darwin-arm64@npm:1.15.11": "5ab85440e42aef149a895e75e6c3574d3e29fcdd4ad76c0dbef4aaa903472cce82457239105d1a43bffaf6d1d4ede967e6a498e7c02946a7a3d713f89eab4c66",
|
||||
"@swc/core-darwin-x64@npm:1.15.11": "368d7ee0a3624327f2452c7b307d702b677bdf0cf97b86c783b20a8f2083af31eaaba880bf2aee2729e16aecb8b246d51df6473b6b78493b07033528c8f34ef7",
|
||||
"@swc/core-linux-arm-gnueabihf@npm:1.15.11": "679c4e43f25710e1a51a543e32f1142e906597c06862bb202c2a677f6aaee2dfeba6903c1c63c7d34c63b9ab73a610e47680a44d023f7a213b97377e904082b8",
|
||||
"@swc/core-linux-arm64-gnu@npm:1.15.11": "c1347763e73fd8c26757ed90f55f805fead5a045b8e5ef08a2393c31dc79e704a3a768631e7db3fa5c97937acbe42dd4039a15eb90b9bdf691fff5b2dbf055bd",
|
||||
"@swc/core-linux-arm64-musl@npm:1.15.11": "95135575cfb9dc708add3c238dc16f72ff9fbcb98f52d36b078b06e7183b9e3e56eb8324d84a47d5e222c71e403503eab36c365d7d60c46f323bb8c2599c8377",
|
||||
"@swc/core-linux-x64-gnu@npm:1.15.11": "2d6569466096c7b2e79283ae771bce075f29f50a09f333656983d616e1a92975fc744a37ef6facc229839d121479004498c08738f8a01f6d23dbe2e417793aa3",
|
||||
"@swc/core-linux-x64-musl@npm:1.15.11": "9115262bfabe0dcb3064506a3ba7b7583a383b550b0ce69aa1d7224ac98e1fd77702b9b039e6bce3827c0781f4111113d19fca01a36d0a5755c5185938b758a0",
|
||||
"@swc/core-win32-arm64-msvc@npm:1.15.11": "66d61ad408757f20f5a98e1c85f9ae84863ea68ca80bb29822e1c23c423698db466e41f139226c0ff30b471531644f91085e84355531964165cfdf41c5453151",
|
||||
"@swc/core-win32-ia32-msvc@npm:1.15.11": "9ac651bec3106cceb2f97d443f1ed3cafa30bbfae0574a4c3023eeeb4d20bdb1192203c673e5140c43889e15d5a163d42b7c379a04b6cc6e6c656ced0832f175",
|
||||
"@swc/core-win32-x64-msvc@npm:1.15.11": "e7f412c2cf9532464b9ebeec7af8c1caa95ec569b89d7eb004315ab65661a2c66056f85869a11758cba4497ac432322d14cc904bfe6c09d2ff71b36da63a011e",
|
||||
"dmg-license@npm:1.0.11": "36c0a7b030801b91216affa9b2bb00caa345b2327f298accb2263a80a0320ca305f90b99da68007d187c830c543410d58a0a2bbc229e8d169b0e1d1652ff42aa",
|
||||
"glob-hasher-darwin-arm64@npm:1.4.2": "1abc74c6f6c6251b8bea6e412090eff4e4918f3489a371971840ee81534344b9f9e62a610efb98157970fc46561161bf23382c8572578da98a7e884d6fb6853e",
|
||||
"glob-hasher-darwin-x64@npm:1.4.2": "44110045f0b2e0b3abaf4f70f917a3c57b9b0c6ee56e5d02932e1772cc63a36b066fb3bc1e6a275c40978b3b2d2ad62752e899bcd966930d4df8884b1d554764",
|
||||
@@ -131,4 +159,4 @@
|
||||
"glob-hasher-win32-arm64-msvc@npm:1.4.2": "809cd80c3e3e6e7bb82e2fc2ba917ce3ca91287a83faaa7b63cf0a1fcb14c228e974baffb731fa82c34dd8a9236622ab2b5238e21b62f8b0267adaa2da7b4de6",
|
||||
"glob-hasher-win32-x64-msvc@npm:1.4.2": "1ab2a78b788b21754f656cae706fa2e1db34185ffef79a6b85d3f24e169bc01e1faadc6a2588eef5fde5a1fe6ced68acfb815c7b03024c0a746e7c5631b0959e",
|
||||
"iconv-corefoundation@npm:1.1.7": "0189733ef51a9f481379202cb1919f2677efc44aa014ba662a6fd99e47993e350eab0ff724ed18cda8011c9b78c4702b2d374f732955f1def3fd2a14a29d25c0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
let
|
||||
nodejs = nodejs_22;
|
||||
yarn-berry = yarn-berry_4.override { inherit nodejs; };
|
||||
version = "26.2.1";
|
||||
version = "26.3.0";
|
||||
src = fetchFromGitHub {
|
||||
name = "actualbudget-actual-source";
|
||||
owner = "actualbudget";
|
||||
repo = "actual";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8cRt1WKa4Yp6rE2Jzko0rKJoCp7+KSzVdtKcv/aKK8o=";
|
||||
hash = "sha256-V7dysdY5m5b96aPEqD7xsNhvZrfm1FnX9I2D6+d/uAg=";
|
||||
};
|
||||
translations = fetchFromGitHub {
|
||||
name = "actualbudget-translations-source";
|
||||
@@ -27,8 +27,8 @@ let
|
||||
repo = "translations";
|
||||
# Note to updaters: this repo is not tagged, so just update this to the Git
|
||||
# tip at the time the update is performed.
|
||||
rev = "3917dc0ea36608c3a1857518f0205d8ab4011d69";
|
||||
hash = "sha256-g4GI+zIKZ63lL+NC+EMEk01GVlbUDVGey0UgqO6Fk+8=";
|
||||
rev = "d65b77cf33d4456f037605215d1be64b8b0644c0";
|
||||
hash = "sha256-xVokghZuM/q0meTeK3sKYVNQcCgJnhq6htvwPYhQ3Go=";
|
||||
};
|
||||
|
||||
in
|
||||
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
missingHashes = ./missing-hashes.json;
|
||||
offlineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src missingHashes;
|
||||
hash = "sha256-7ZZGtwQM9+odozLi95MFshNjde3oFTgWkgimj8Ei2W8=";
|
||||
hash = "sha256-wdOIUYtiLbAkLngl+hIB/TlMLuX/YWZ9dt+a4qm+Fp8=";
|
||||
};
|
||||
|
||||
pname = "actual-server";
|
||||
@@ -139,8 +139,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://actualbudget.org/";
|
||||
mainProgram = "actual-server";
|
||||
license = lib.licenses.mit;
|
||||
# https://github.com/NixOS/nixpkgs/issues/403846
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
maintainers = [
|
||||
lib.maintainers.oddlama
|
||||
lib.maintainers.patrickdag
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.2.12";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aliyun";
|
||||
repo = "aliyun-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RY6d3JaiRKaht8MAg0IETwFZVvoDHmaXpg9XcLlE0DM=";
|
||||
hash = "sha256-yCHxFJyh4TpQ4Me/WR5YKc7ff7m+qidIWQyKOC8umI0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hDgwZiXRjcuQOo7ezjtGS1DawtOffllW64gsGKnTFQM=";
|
||||
vendorHash = "sha256-smlPjS2kda0ij+3Jch/FKRHm820Zux6vWXooqhm6fCA=";
|
||||
|
||||
subPackages = [ "main" ];
|
||||
|
||||
|
||||
@@ -8,30 +8,26 @@
|
||||
vala,
|
||||
wrapGAppsHook4,
|
||||
desktop-file-utils,
|
||||
gtk3,
|
||||
shared-mime-info,
|
||||
libarchive,
|
||||
libgee,
|
||||
pantheon,
|
||||
libxml2,
|
||||
libhandy,
|
||||
libportal-gtk4,
|
||||
libwebp,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "annotator";
|
||||
version = "2.0.0";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phase1geo";
|
||||
repo = "annotator";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-mv3fMlYB4XcAWI6O6wN8ujNRDLZlX3ef/gKdOMYEHq0=";
|
||||
hash = "sha256-nJxms/df5OnASbdj4a2IjHyRT5PA2EaKHkBoQsyv8T8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/Application.vala \
|
||||
--replace-fail 'Environment.set_variable( "GDK_BACKEND", "x11", true );' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
meson
|
||||
@@ -39,15 +35,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
vala
|
||||
wrapGAppsHook4
|
||||
desktop-file-utils
|
||||
shared-mime-info
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libarchive
|
||||
libgee
|
||||
pantheon.granite7
|
||||
libportal-gtk4
|
||||
libxml2
|
||||
libhandy
|
||||
gtk3
|
||||
libwebp
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,7 +9,7 @@ let
|
||||
self = REAndroidLibrary {
|
||||
pname = "arsclib";
|
||||
# 1.3.8 is not new enough for APKEditor because of API changes
|
||||
version = "1.3.8-unstable-2025-09-23";
|
||||
version = "1.3.8-unstable-2026-02-27";
|
||||
projectName = "ARSCLib";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -18,8 +18,8 @@ let
|
||||
# This is the latest commit at the time of packaging.
|
||||
# It can be changed to a stable release ("V${version}")
|
||||
# if it is compatible with APKEditor.
|
||||
rev = "7238433395dea6f7d0fce3139f1659063ac31f42";
|
||||
hash = "sha256-93eskC/qdkkNAZFYqSzoFxhmWgzTvDyZmZxOvwELGCs=";
|
||||
rev = "b34f2e36d29077400e5b9f24fef9af3a3d9e8100";
|
||||
hash = "sha256-FhIZ9O1af8UcmcDcEWewMNBDr5Knd3BZL5PqEltCqxE=";
|
||||
};
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
|
||||
@@ -55,7 +55,7 @@ let
|
||||
apkeditor =
|
||||
let
|
||||
pname = "apkeditor";
|
||||
version = "1.4.5";
|
||||
version = "1.4.7";
|
||||
projectName = "APKEditor";
|
||||
in
|
||||
REAndroidLibrary {
|
||||
@@ -71,7 +71,7 @@ let
|
||||
owner = "REAndroid";
|
||||
repo = "APKEditor";
|
||||
tag = "V${version}";
|
||||
hash = "sha256-yuNMyEnxTjHPSBPWVD8b+f612hWGGayZHKHxtWtxXDg=";
|
||||
hash = "sha256-xvb/shZj39yxejoXF8Sruylyj4843SeAc0AIiM5s1rs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -39,6 +39,11 @@ update() {
|
||||
if (( use_last_commit )); then
|
||||
local repo_info="$(github_api "/repos/$owner/$repo/commits?per_page=1" | jq ".[0]")"
|
||||
local new_rev="$(echo "$repo_info" | jq -r .sha)"
|
||||
local old_rev="$(nixpkgs_attr "$1.src.rev")"
|
||||
if [[ "$new_rev" == "$old_rev" ]]; then
|
||||
echo "Already up to date (rev $new_rev)" >&2
|
||||
return
|
||||
fi
|
||||
local date="$(echo "$repo_info" | jq -r .commit.author.date)"
|
||||
date="$(date -u -d "$date" +%Y-%m-%d)"
|
||||
local new_version="${old_version%%-unstable*}-unstable-$(date -u -d "$date" +%Y-%m-%d)"
|
||||
|
||||
@@ -48,6 +48,11 @@ stdenv.mkDerivation {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/td.c \
|
||||
--replace-fail 'static void show_usage();' 'static void show_usage(int exit_code);'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Sample implementation of the ARIB STD-B25 standard";
|
||||
homepage = "https://code.videolan.org/videolan/aribb25";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "arkade";
|
||||
version = "0.11.86";
|
||||
version = "0.11.88";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-w8Z6gGWS9M0n98XGJ7pQ7zsrImPKKYyiSYlep5p1oGc=";
|
||||
hash = "sha256-ISito/qTolDRyYSn3z/J6Zc07RlaKWm7t1ugUt3bDkI=";
|
||||
};
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "automatic-timezoned";
|
||||
version = "2.0.122";
|
||||
version = "2.0.123";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = "automatic-timezoned";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-jUmcAAh4gp4uAtwle4GdnVvV82tCyOVLddDKB6IH+gA=";
|
||||
sha256 = "sha256-Czewvy/IJluulgvfnSQDA+FKiHD/13fE5i2wz0AaVxs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vbOlpFUYbHxG397wqiD9ZqmLshhX9lkkdIsFQ7hIX88=";
|
||||
cargoHash = "sha256-C5HT5u4Z7kJm550VfApr2IfMNk4Lhw8nQCNlZzqYeKk=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bazel-watcher";
|
||||
version = "0.28.0";
|
||||
version = "0.28.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "bazel-watcher";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-zbZhV1IjFW4USdj3MGdyfPabfCPUmAAaGBaguXqmcnY=";
|
||||
hash = "sha256-4pM7z1GAhLxvCLwtHBcteRMQwtdvOFtRu8eF+H6UJBE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-u1Zg/M9DSkwscy49qtPQygk1gyxKaPbhlFDYNtBQ9NY=";
|
||||
|
||||
@@ -208,6 +208,11 @@ stdenv.mkDerivation rec {
|
||||
usrBinEnv = "${coreutils}/bin/env";
|
||||
})
|
||||
|
||||
# Bazel tries to run "/bin/true" to test if linux-sandbox works.
|
||||
(replaceVars ./patches/linux_sandbox.patch {
|
||||
binTrue = "${coreutils}/bin/true";
|
||||
})
|
||||
|
||||
# Provide default JRE for Bazel process by setting --server_javabase=
|
||||
# in a new default system bazelrc file
|
||||
(replaceVars ./patches/bazel_rc.patch {
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java
|
||||
index dc188b4ce2..46d338c9af 100644
|
||||
--- a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java
|
||||
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java
|
||||
@@ -106,7 +106,7 @@ final class LinuxSandboxedSpawnRunner extends AbstractSandboxSpawnRunner {
|
||||
ImmutableList<String> linuxSandboxArgv =
|
||||
LinuxSandboxCommandLineBuilder.commandLineBuilder(linuxSandbox)
|
||||
.setTimeout(options.getLocalSigkillGraceSeconds())
|
||||
- .buildForCommand(ImmutableList.of("/bin/true"));
|
||||
+ .buildForCommand(ImmutableList.of("@binTrue@"));
|
||||
ImmutableMap<String, String> env = ImmutableMap.of();
|
||||
Path execRoot = cmdEnv.getExecRoot();
|
||||
File cwd = execRoot.getPathFile();
|
||||
@@ -29,18 +29,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bcachefs-tools";
|
||||
version = "1.37.1";
|
||||
version = "1.37.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koverstreet";
|
||||
repo = "bcachefs-tools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6w7Ig6wJKmWxkS730CZKFkEqefIQDJI+OJHPPJ3aPEk=";
|
||||
hash = "sha256-q0/WRO52KZr/7ogZ+xb3UxpBB3Y63Ti1mwkDwypP2iw=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-mNexPIDeUwJYKsM8Hzeh5opfLk9Wf4bHRlwUZLnLAKo=";
|
||||
hash = "sha256-UqpznSuuSXCzoNovOrLhWcuiOtkyY9iM2Uu0g9J7ZZE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "beekeeper-studio";
|
||||
version = "5.6.0";
|
||||
version = "5.6.2";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -54,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
fetchurl {
|
||||
url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${finalAttrs.version}/${asset}";
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-dqwB1kCUL3DetfFCsBVh3xq3fNKSOMabJepDV7DpLGA=";
|
||||
aarch64-linux = "sha256-dv321Lszm+xJiXK4Hfi0ij7TvkuJx8o8mepWjGnGBD8=";
|
||||
x86_64-darwin = "sha256-AQb+HcLP+7e+SuqKWxHH+O2O6/Daf14CuTQj90T2yoo=";
|
||||
aarch64-darwin = "sha256-tJ2N3KtdC4VNXe0lKSb9cD3YF61GRc5/kpSZw9TNkb4=";
|
||||
x86_64-linux = "sha256-s1Smb8du7pZjcVMnLsJ39P28erApDLnf5lqO9rO7asw=";
|
||||
aarch64-linux = "sha256-ZHFiIJ6zYYXjbEGGttvcNxnnKz+/4j8oQ1PsXAdeAUM=";
|
||||
x86_64-darwin = "sha256-NasWIn1OA4LvewLbNzyMXuPXFvbvl41tpEN1xEC6jSk=";
|
||||
aarch64-darwin = "sha256-DZUm7/3/wvyZDV3/HrK1glNo4pMWyt16z5B3FfSYdqw=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bento";
|
||||
version = "1.15.1";
|
||||
version = "1.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "warpstreamlabs";
|
||||
repo = "bento";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-K82/ly9r8ZxoV7RmIk6cH6ODxrqN31JxrfiR5yC8Xss=";
|
||||
hash = "sha256-Y7uQoWuf96+y0VVmCFgONr7zMMJCpJR1lisAd8oYvnw=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-sUiK5ThDfXtyG1ixppncOsMGQ2kw8nzYu7TjUuhvm60=";
|
||||
vendorHash = "sha256-vHDHH5yyAFqBF08drxqEUFWDXLcW3QZ01gk4SBikzTU=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/bento"
|
||||
|
||||
@@ -135,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pykakasi
|
||||
pyqt-builder
|
||||
pyqt6
|
||||
pystache
|
||||
python
|
||||
regex
|
||||
sip
|
||||
|
||||
@@ -10,20 +10,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-mobile2";
|
||||
version = "0.22.2";
|
||||
version = "0.22.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = "cargo-mobile2";
|
||||
rev = "cargo-mobile2-v${finalAttrs.version}";
|
||||
hash = "sha256-pSp7w823Jjjg0PEnCc7jVLBbOgvR7JAjtD8OK5voC0A=";
|
||||
hash = "sha256-rPLGh7/lGsmoidtr+UNrxzUgqtiHvkqZs2/la4L6zQM=";
|
||||
};
|
||||
|
||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||
# sourceRoot = "${src.name}/tooling/cli";
|
||||
|
||||
cargoHash = "sha256-aci1QF/O2J6Yix4UkxPCVW+c+xoqm7AvdhlkF7y1GqA=";
|
||||
cargoHash = "sha256-ht9ofFa4H/Ux6a31vMNdKNhrX48yoYM1qAPoxCjude0=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-shear";
|
||||
version = "1.9.1";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "cargo-shear";
|
||||
version = finalAttrs.version;
|
||||
hash = "sha256-QRWYVmFCxntEFzC9iqEoZQ5sG57P2gpBUFu8A8aI+7g=";
|
||||
hash = "sha256-1NQ9Ws6aMFuMawoCPHjvbVLCP2ztLgAeXvKY4952aqU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yMUdZCIJTWCvi+07a1Erj6SD7i34opnvZ2CZ027PWzU=";
|
||||
cargoHash = "sha256-PkcRFzwC5M0wFSFXOuuLxWcZWrznzs9GdykE/8AjSMw=";
|
||||
|
||||
env = {
|
||||
# https://github.com/Boshen/cargo-shear/blob/v1.6.2/src/lib.rs#L51-L54
|
||||
|
||||
@@ -48,8 +48,18 @@ makeSetupHook {
|
||||
installScript =
|
||||
{
|
||||
darwin = ''
|
||||
mkdir -p $out
|
||||
mv "$targetDir"/bundle/macos $out/Applications
|
||||
mkdir -p "$out/Applications"
|
||||
|
||||
shopt -s nullglob
|
||||
appBundles=("$targetDir"/bundle/macos/*.app)
|
||||
shopt -u nullglob
|
||||
|
||||
if [ "''${#appBundles[@]}" -eq 0 ]; then
|
||||
echo "cargo-tauri.hook: no .app bundles found in $targetDir/bundle/macos" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mv -- "''${appBundles[@]}" "$out/Applications/"
|
||||
'';
|
||||
|
||||
linux = ''
|
||||
|
||||
@@ -64,10 +64,40 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
preBuild = ''
|
||||
pnpm --filter '@tauri-apps/api' build
|
||||
'';
|
||||
postBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
bundleDir="target/${stdenv.hostPlatform.rust.cargoShortTarget}/''${cargoBuildType:-release}/bundle/macos"
|
||||
touch "$bundleDir/.test-hidden-entry"
|
||||
touch "$bundleDir/test-visible-entry"
|
||||
'';
|
||||
|
||||
# No one should be actually running this, so lets save some time
|
||||
buildType = "debug";
|
||||
doCheck = false;
|
||||
doInstallCheck = stdenv.hostPlatform.isDarwin;
|
||||
installCheckPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
runHook preInstallCheck
|
||||
|
||||
test -d "$out/Applications"
|
||||
|
||||
shopt -s nullglob dotglob
|
||||
appBundles=("$out"/Applications/*.app)
|
||||
nonAppEntries=("$out"/Applications/*)
|
||||
shopt -u nullglob dotglob
|
||||
|
||||
test "''${#appBundles[@]}" -gt 0
|
||||
|
||||
for entry in "''${nonAppEntries[@]}"; do
|
||||
case "$entry" in
|
||||
*.app) ;;
|
||||
*)
|
||||
echo "unexpected non-.app entry in Applications: $entry" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (cargo-tauri.hook.meta) platforms;
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
libepoxy,
|
||||
wayland,
|
||||
wayland-scanner,
|
||||
wlroots_0_18,
|
||||
wlroots_0_19,
|
||||
libxkbcommon,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "casilda";
|
||||
version = "1.0.0";
|
||||
version = "1.2.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "jpu";
|
||||
repo = "casilda";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-KXICqldEJC3xKc0bd1X4O2glLeipzqHE1cGle7TKvAw=";
|
||||
hash = "sha256-JaWHKKNYeeW7QKB6DpGrXowvufeBZUnc9pP0ZAAo3gU=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wayland-protocols
|
||||
wayland # for wayland-server
|
||||
libxkbcommon
|
||||
wlroots_0_18
|
||||
wlroots_0_19
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ gtk4 ];
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
cargo-tauri_1,
|
||||
cargo-tauri,
|
||||
cinny,
|
||||
desktop-file-utils,
|
||||
wrapGAppsHook3,
|
||||
@@ -14,24 +14,25 @@
|
||||
webkitgtk_4_1,
|
||||
jq,
|
||||
moreutils,
|
||||
nix-update-script,
|
||||
_experimental-update-script-combinators,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cinny-desktop";
|
||||
# We have to be using the same version as cinny-web or this isn't going to work.
|
||||
version = "4.10.5";
|
||||
version = "4.11.1";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "cinnyapp";
|
||||
repo = "cinny-desktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DRSafPNED9fpm3w5K4a9r8581xMpttfo7BEDBIJ87Kc=";
|
||||
hash = "sha256-/zHXlAqIxWN1obFO3H/eqFj38pjopF4D5ooz0YiVgD0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src-tauri";
|
||||
|
||||
cargoHash = "sha256-q6YMAjK+BBYBpk8menA1sM3x/FCnAh40t70fs9knnRo=";
|
||||
cargoHash = "sha256-bchjUTC0/hWPf/cOs+cxRbqho/B9LMJ3ChW530zEoXU=";
|
||||
|
||||
postPatch =
|
||||
let
|
||||
@@ -47,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
in
|
||||
''
|
||||
${lib.getExe jq} \
|
||||
'del(.tauri.updater) | .build.distDir = "${cinny'}" | del(.build.beforeBuildCommand)' tauri.conf.json \
|
||||
'del(.plugins.tauri.updater) | .build.frontendDist = "${cinny'}" | del(.build.beforeBuildCommand) | .bundle.createUpdaterArtifacts = false' tauri.conf.json \
|
||||
| ${lib.getExe' moreutils "sponge"} tauri.conf.json
|
||||
'';
|
||||
|
||||
@@ -60,7 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
desktop-file-edit \
|
||||
--set-comment "Yet another matrix client for desktop" \
|
||||
--set-key="Categories" --set-value="Network;InstantMessaging;" \
|
||||
$out/share/applications/cinny.desktop
|
||||
$out/share/applications/Cinny.desktop
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
@@ -70,7 +71,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri_1.hook
|
||||
cargo-tauri.hook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
desktop-file-utils
|
||||
@@ -87,6 +88,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = _experimental-update-script-combinators.sequence [
|
||||
(nix-update-script { attrPath = "cinny-unwrapped"; })
|
||||
(nix-update-script { })
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Yet another matrix client for desktop";
|
||||
homepage = "https://github.com/cinnyapp/cinny-desktop";
|
||||
@@ -98,8 +106,5 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
license = lib.licenses.agpl3Only;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
mainProgram = "cinny";
|
||||
# Waiting for update to Tauri v2, webkitgtk_4_0 is deprecated
|
||||
# See https://github.com/cinnyapp/cinny-desktop/issues/398 and https://github.com/NixOS/nixpkgs/pull/450065
|
||||
broken = stdenv.hostPlatform.isLinux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -2,26 +2,22 @@
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
nodejs_22,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "cinny-unwrapped";
|
||||
# Remember to update cinny-desktop when bumping this version.
|
||||
version = "4.10.5";
|
||||
version = "4.11.1";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "cinnyapp";
|
||||
repo = "cinny";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Napy3AcsLRDZPcBh3oq1U30FNtvoNtob0+AZtZSvcbM=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dwI3zNey/ukF3t2fhH/ePf4o4iBDwZyLWMYebPgXmWU=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmDepsHash = "sha256-2Lrd0jAwAH6HkwLHyivqwaEhcpFAIALuno+MchSIfxo=";
|
||||
npmDepsHash = "sha256-27WFjb08p09aJRi0S2PvYq3bivEuG5+z2QhFahTSj4Q=";
|
||||
|
||||
# Skip rebuilding native modules since they're not needed for the web app
|
||||
npmRebuildFlags = [
|
||||
@@ -46,4 +42,4 @@ buildNpmPackage rec {
|
||||
license = lib.licenses.agpl3Only;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,46 +1,46 @@
|
||||
{
|
||||
"version": "2.1.76",
|
||||
"buildDate": "2026-03-14T00:18:17Z",
|
||||
"version": "2.1.77",
|
||||
"buildDate": "2026-03-16T22:20:42Z",
|
||||
"platforms": {
|
||||
"darwin-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "ffe922f4f4ac542f4edbeeabbce2a7492308d034c66a2427caec5c31c39b71c8",
|
||||
"size": 190891760
|
||||
"checksum": "6426772419c758e71146725582d67f1dda42687c693c83def9ad3422bb81ebf1",
|
||||
"size": 191188976
|
||||
},
|
||||
"darwin-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "2a13d9a3ca0fe330fd786341897af2e5250066bbbb1fdcb6cfdffa50cf0f90fe",
|
||||
"size": 196972016
|
||||
"checksum": "9be4a24a213cd3f475713e8fb7548c631aabdc355ca191e926ccb63f12976409",
|
||||
"size": 197269232
|
||||
},
|
||||
"linux-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "40f753c07f070df34ca83e400f746a8279a3fd343967a453d9fbfab2f3ca7acd",
|
||||
"size": 232783142
|
||||
"checksum": "f4303a1a3455b0ebbdd356c1337ae3076affc122fb79a78a2d1886e5c62f289c",
|
||||
"size": 233092192
|
||||
},
|
||||
"linux-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "801a085676c3d54392c42e8e43c44947df7c52132356575f7d9267c4f22d6992",
|
||||
"size": 235555347
|
||||
"checksum": "34559c9cc9eeadc942d6731367aed3915b6b7351d98c61ebfebbd8fa59508ecd",
|
||||
"size": 235864091
|
||||
},
|
||||
"linux-arm64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "18fb9e236149bd475d9c5b9ec033f5c93d2dec0dca1f7b34cec96fd42379497c",
|
||||
"size": 223318614
|
||||
"checksum": "6e0fa4b8375637c96aafc9a53652bdd1db6dee159e0017a4b23b5f1243f6888e",
|
||||
"size": 223627664
|
||||
},
|
||||
"linux-x64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "f17ad0fe5448799cdaa7ae5fd77132e0003942195da91546a4f5e7b2f7bf2f05",
|
||||
"size": 226152835
|
||||
"checksum": "9608235989878d70a42f048db20d3b009d4dc3dd4c0cbf60280058a70a7c1cd9",
|
||||
"size": 226461579
|
||||
},
|
||||
"win32-x64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "bb40de8e810d985698e14eec9935036621bf37c495a609f5b70db7aa9f927b83",
|
||||
"size": 240100000
|
||||
"checksum": "ba97366072c87110b130e886d071de19f29bbd1080db92d33c4ceadb5ba39611",
|
||||
"size": 240405152
|
||||
},
|
||||
"win32-arm64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "1dac83677e68a48368f945e693a5dd039baff21115871223c622df362c0cd61b",
|
||||
"size": 236293792
|
||||
"checksum": "fb703bb40c5ae851f0d8e34a5aee3bc8c8a996a63de1f874d10c06161bad4d98",
|
||||
"size": 236599456
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.76",
|
||||
"version": "2.1.77",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.76",
|
||||
"version": "2.1.77",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.1.76";
|
||||
version = "2.1.77";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-kjzPTG32f35eN6S85gGLUCmsNwH70Sq5rruEs/0hioM=";
|
||||
hash = "sha256-3bsFS3EZYbU8htlO7QtA9Qs8xlm0ZPz02bJ3ROZaugY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-sk1RdPMgZD+Ejd6JdKWcK24AdfasnwWATQkwAx5MjmY=";
|
||||
npmDepsHash = "sha256-spxAd9PEGRQFiGjaNRqGCu23PdmfwmBQyhT+gwTiTMs=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
makeWrapper,
|
||||
alsa-lib,
|
||||
libogg,
|
||||
libvorbis,
|
||||
ffmpeg,
|
||||
flac,
|
||||
yt-dlp,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cliamp";
|
||||
version = "1.21.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bjarneo";
|
||||
repo = "cliamp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xqiFtMw5kFRAnc4CSkc7/RcAejWxlJAoGFkQ2f5Z3bc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UMDCpfSGfvJmI+sImaFzgZpLNaLMgEnmGCqERwPokHM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
libogg
|
||||
libvorbis
|
||||
flac
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/cliamp \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
ffmpeg
|
||||
yt-dlp
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Terminal Winamp - a retro terminal music player inspired by Winamp 2.x";
|
||||
homepage = "https://github.com/bjarneo/cliamp";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ supermarin ];
|
||||
mainProgram = "cliamp";
|
||||
};
|
||||
})
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
buildGraalvmNativeImage (finalAttrs: {
|
||||
pname = "clj-kondo";
|
||||
version = "2025.10.23";
|
||||
version = "2026.01.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/clj-kondo/clj-kondo/releases/download/v${finalAttrs.version}/clj-kondo-${finalAttrs.version}-standalone.jar";
|
||||
sha256 = "sha256-bqHCDPL0R/Or6xHb5QDaw32S+Q2hAly3H5BUbQMDU0M=";
|
||||
sha256 = "sha256-S4Fg165BkD1ufuH+8JmDmY/o1GzScZUirEEifGrnmLo=";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
||||
@@ -13,12 +13,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clojure";
|
||||
version = "1.12.4.1602";
|
||||
version = "1.12.4.1618";
|
||||
|
||||
src = fetchurl {
|
||||
# https://github.com/clojure/brew-install/releases
|
||||
url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-B9ld7oGEVcoI/QJb/SBHGAhSI7E1vc1LXQA5scxvkqM=";
|
||||
hash = "sha256-E3adptY6mN6yAkN4rhpk5O4hGsEDU0DfynppRMQc3iE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clpeak";
|
||||
version = "1.1.6";
|
||||
version = "1.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "krrishnarraj";
|
||||
repo = "clpeak";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-cRsQo+yOXwMfyppjSapb7nwdCmyFgm5WvFZEZ4tfLko=";
|
||||
hash = "sha256-TvlO2/teOoTCQ5uMBw/Pc4uQZ5O0bnwZFBdC/ZzQ6wc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
bash,
|
||||
openssh,
|
||||
procps,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cmc";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TimidRobot";
|
||||
repo = "cmc";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-BJYXXyj3RmmKG6pficPbsqhDmBwcrHlvQhEK5Ptv1qo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp cmc $out/bin/cmc
|
||||
wrapProgram $out/bin/cmc \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
bash
|
||||
openssh
|
||||
procps
|
||||
]
|
||||
}
|
||||
'';
|
||||
meta = {
|
||||
homepage = "https://github.com/TimidRobot/cmc";
|
||||
description = "Manages SSH ControlMaster sessions";
|
||||
mainProgram = "cmc";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ chordtoll ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "commons-logging";
|
||||
version = "1.3.5";
|
||||
version = "1.3.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/commons/logging/binaries/commons-logging-${finalAttrs.version}-bin.tar.gz";
|
||||
sha256 = "sha256-4s/DfNYp/CXSIAtUAUHC2GReQrmlhpN8tRwvpHmB2G0=";
|
||||
sha256 = "sha256-7+wHpv5x63E2u4KEStKz17DIOfqokYzwp/Q1/tBOBxE=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "cosmic-ext-applet-weather";
|
||||
version = "0-unstable-2026-03-05";
|
||||
version = "0-unstable-2026-03-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmic-utils";
|
||||
repo = "cosmic-ext-applet-weather";
|
||||
rev = "a657afea4abb484384e0ca6fc57724d9825a65c1";
|
||||
hash = "sha256-Q0U0cUmcUQZYKJ6yK/iPNWbBKSGyWMxO1705q3qVQsY=";
|
||||
rev = "d63918979b5208a49a6da2e7e338d706248fdae4";
|
||||
hash = "sha256-OswoiPq27efi8lIrW3BnsVGkfFLMpasmHEXWSLIxNu4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tj0skQNt0p6UMUnU6HXw6ZAjEkCuuF4vg1aoWytqCos=";
|
||||
cargoHash = "sha256-4n8NC7IAhANT9FnzBJzzpsKyw8clJw2uqN1Ie2PK+eE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
libcosmicAppHook
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cpuinfo";
|
||||
version = "0-unstable-2026-02-18";
|
||||
version = "0-unstable-2026-03-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "cpuinfo";
|
||||
rev = "7364b490b5f78d58efe23ea76e74210fd6c3c76f";
|
||||
hash = "sha256-lB6e5zcw5UiwTOf+a+B35apXP5t1bxI6yOMiEeFwIwY=";
|
||||
rev = "7607ca500436b37ad23fb8d18614bec7796b68a7";
|
||||
hash = "sha256-LnLtCMMRg+DwB7MijBdt/tmCKD/zN5y2oTgXlYw3hTg=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "cpu-info";
|
||||
maintainers = with lib.maintainers; [ pawelchcki ];
|
||||
pkgConfigModules = [ "libcpuinfo" ];
|
||||
# https://github.com/pytorch/cpuinfo/blob/7364b490b5f78d58efe23ea76e74210fd6c3c76f/CMakeLists.txt#L98
|
||||
# https://github.com/pytorch/cpuinfo/blob/7607ca500436b37ad23fb8d18614bec7796b68a7/CMakeLists.txt#L98
|
||||
platforms = lib.platforms.x86 ++ lib.platforms.aarch ++ lib.platforms.riscv;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cubeb";
|
||||
version = "0-unstable-2026-01-23";
|
||||
version = "0-unstable-2026-03-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "cubeb";
|
||||
rev = "484857522c73318c06f18ba0a3e17525fa98c608";
|
||||
hash = "sha256-Uq+UINIXc3uuqS7MwbTQ5pL72KmknM33/3CLH21Od/Y=";
|
||||
rev = "1b7de400134aac33d9c6b59ac1be9ddbf86d16eb";
|
||||
hash = "sha256-wRk0b+86YgbUUklWLTz2xlR8cQrNycI1YOxrrpz75pM=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "difftastic";
|
||||
version = "0.67.0";
|
||||
version = "0.68.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wilfred";
|
||||
repo = "difftastic";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-AgY/v1z4ETHawT+yEwTEaPOLC9GmhR8bGUUBKHY/meQ=";
|
||||
hash = "sha256-4CkAifz48qLegXTBmXqJe3+LAE1uCUUb28ZgXTVggOk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TTg5Cky1exlvJokIw1IFGbPq4eJe2xSAPsGgI7BU+Jw=";
|
||||
cargoHash = "sha256-MwoRr8aQAT5plkfapAY2oPrSYYmHGeqxOhCpOMEtUoc=";
|
||||
|
||||
buildInputs = [ rust-jemalloc-sys ];
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dyff";
|
||||
version = "1.11.2";
|
||||
version = "1.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "homeport";
|
||||
repo = "dyff";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-+z9AaoSu7FNRI+jPwW6s0qRHz2roPXq4/CTNDOQW77Y=";
|
||||
sha256 = "sha256-3zfKEyVVqbzlqQ0GMjIgrIUFtsKEgu+/EEYhSGu9Fgs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vpmgSQKmnvaos4ZVuk4R419doAdULjtg95y5ORRwhZg=";
|
||||
vendorHash = "sha256-hxDDfxLCGov0IYYy9wn5bub7qiGUdjsNfFbvuWAgHH4=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/dyff"
|
||||
|
||||
@@ -59,13 +59,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "easyeffects";
|
||||
version = "8.1.2";
|
||||
version = "8.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "easyeffects";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Tz14pjI5pNJOQH0KFaf9mJkFdup1GVxlkMnzVQusx/M=";
|
||||
hash = "sha256-0/xbvmj7p8JE3aH84SrcEf8kr+0X1KgHMRkBca+2rtY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"amd64": {
|
||||
"path": "pool/main/e/enpass/enpass_6.11.6.1833_amd64.deb",
|
||||
"sha256": "91a7f4ac1bee55106edc6f3e8236b8ef8ed985926482b058899e0c73075f0d56",
|
||||
"version": "6.11.6.1833"
|
||||
"path": "pool/main/e/enpass/enpass_6.11.13.1957_amd64.deb",
|
||||
"sha256": "2d8c90643851591aff41057b380a7e87bb839bf5c5aa0ca1456144e9996c902a",
|
||||
"version": "6.11.13.1957"
|
||||
},
|
||||
"i386": {
|
||||
"path": "pool/main/e/enpass/enpass_5.6.9_i386.deb",
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
nodejs,
|
||||
electron_38,
|
||||
electron_41,
|
||||
yarnConfigHook,
|
||||
copyDesktopItems,
|
||||
vips,
|
||||
@@ -13,14 +13,20 @@
|
||||
autoPatchelfHook,
|
||||
makeDesktopItem,
|
||||
imagemagick,
|
||||
wasm-pack,
|
||||
rustPlatform,
|
||||
cargo,
|
||||
rustc,
|
||||
wasm-bindgen-cli_0_2_108,
|
||||
binaryen,
|
||||
}:
|
||||
let
|
||||
electron = electron_38;
|
||||
electron = electron_41;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ente-desktop";
|
||||
version = "1.7.15";
|
||||
version = "1.7.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ente-io";
|
||||
@@ -29,13 +35,25 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sparseCheckout = [
|
||||
"desktop"
|
||||
"web"
|
||||
"rust"
|
||||
];
|
||||
tag = "photosd-v${finalAttrs.version}";
|
||||
hash = "sha256-QnJp+oHkRsb/uMobA33Hgo2VOzfDFDtJ6vchCAzyb+c=";
|
||||
hash = "sha256-nkI2wfjpQPWPmu+IKbNMQuqby2odRG3Dbyzd7cSxmYY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/desktop";
|
||||
cargoRoot = "../web/packages/wasm";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
version
|
||||
src
|
||||
sourceRoot
|
||||
cargoRoot
|
||||
;
|
||||
hash = "sha256-ftb0h5MOHyQ2iec6iE7/WdHXgrviLCy8oIqFXv5OTq8=";
|
||||
};
|
||||
offlineCache = fetchYarnDeps {
|
||||
name = "ente-desktop-${finalAttrs.version}-offline-cache";
|
||||
inherit (finalAttrs) src sourceRoot;
|
||||
@@ -45,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
name = "ente-desktop-${finalAttrs.version}-web-offline-cache";
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "${finalAttrs.src.name}/web";
|
||||
hash = "sha256-m+7woB5XnOPDMLpoIBui1GxeW1BOms18SKJ8vaJcv68=";
|
||||
hash = "sha256-NhpSwesQ9B5gEeBQVjEEAKO4A68wfmBoQ3ga/baieNE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -55,6 +73,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
autoPatchelfHook # for onnxruntime
|
||||
copyDesktopItems
|
||||
imagemagick
|
||||
|
||||
wasm-pack
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
rustc.llvmPackages.lld
|
||||
wasm-bindgen-cli_0_2_108
|
||||
binaryen
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -72,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pushd ../web
|
||||
offlineCache=$webOfflineCache yarnConfigHook
|
||||
rm -rf node_modules/wasm-pack node_modules/.bin/wasm-pack
|
||||
popd
|
||||
|
||||
cp -r ${electron.dist} ./electron_dist
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.302.1";
|
||||
version = "0.303.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-pqm8amG+jeSgWCTsOLOui+8v4RyHYgX2h2e4HKhR5l4=";
|
||||
hash = "sha256-D7Rm+UWAW8/QHJ2BQcvwL+yIYlXENJOrmBXKuoDEoAY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-t70o3VWfypvWOLMCqC4I8GXywzrDgNKUi5yAaB0NdZw=";
|
||||
vendorHash = "sha256-lcSCMLOijqcug6RZGd2W3wjJxTWRlag3gz5bQoKglWg=";
|
||||
|
||||
commonMeta = {
|
||||
license = lib.licenses.mit;
|
||||
@@ -52,7 +52,7 @@ buildGo126Module rec {
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-lHbFy2iddAitNz9qxAnhKrhFKPn/w9yeyuNqaBCALEk=";
|
||||
hash = "sha256-LvSANb1ehVqYHwIRujR3pgSdEhX4FaRzbji+fW64GtA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fabric-ai";
|
||||
version = "1.4.433";
|
||||
version = "1.4.437";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielmiessler";
|
||||
repo = "fabric";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PsAG5qmlviae+4xuHa1pOHYEIqYvNX3yY57bWcgjA2s=";
|
||||
hash = "sha256-VqCMswvMUBqfIcVphjMtgr5BrrDOmshTRSCGnZKMbBg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aE2b6Pe3v+2kT7nSHrmW3Vd/0ky6SQMag6ndsWuYSqs=";
|
||||
|
||||
@@ -22,13 +22,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants
|
||||
stdenvNoCC.mkDerivation
|
||||
{
|
||||
inherit pname;
|
||||
version = "0-unstable-2026-03-08";
|
||||
version = "0-unstable-2026-03-16";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "aiyahm";
|
||||
repo = "FairyWren-Icons";
|
||||
rev = "07bcdd4e83c4d46a698a4af60b9b8acc422af39f";
|
||||
hash = "sha256-Gzr3AiVD+IFnJa3X3wp8CAFl6SL/gD3dCrFGMDHDMos=";
|
||||
rev = "612fd0b98b1b566d772f8e1ecfe60ae2b4f281ce";
|
||||
hash = "sha256-D/iR0+fO/j3e4mdyDs/qrUQMlzatICnoUcTAwOLRfxs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "feishu-cli";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "riba2534";
|
||||
repo = "feishu-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7o5WMUhmA9BEjmz55E90DS6BKHKZhNfo1WV0jdJVrkw=";
|
||||
hash = "sha256-yawSIznUCu0rTs4CcVEbPf8jubgLNIO0hCUwmAFukgk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MZv772U+3+Fcanaiuhz+OCqfIsYyCG7B4iZOnEftbi8=";
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "flexget";
|
||||
version = "3.19.0";
|
||||
version = "3.19.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-77jGAju6ZKSsJWHgqJ7aC4xG7Iycwr3mGfRCNDPknEY=";
|
||||
hash = "sha256-hQNn3q5D1eBsQ7/HzeMv5G/ChL3wdjV3zD+tYirB0zE=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "12.10.4",
|
||||
"version": "12.11.0",
|
||||
"sources": {
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.4/floorp-linux-aarch64.tar.xz",
|
||||
"sha256": "6fb5030be0209744dd9aac0fa5645c45a21d135d4e487836a300359a695327e5"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.11.0/floorp-linux-aarch64.tar.xz",
|
||||
"sha256": "e3d1b8c928bf8c3c1a2e64270f83acfee1db04c49bfb8182d64e7895889e4348"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.4/floorp-linux-x86_64.tar.xz",
|
||||
"sha256": "1cc457b0b23d29d863749a9a4f000b47fa480aa0579774bb39eff5978160df21"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.11.0/floorp-linux-x86_64.tar.xz",
|
||||
"sha256": "307bcc82f9eb086aea636851d3774a7ec746bc45dd0a6a5d4681f5a477ded9c4"
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.4/floorp-macOS-universal.dmg",
|
||||
"sha256": "1fa4e85c9aa58d989f0aa01389c0b3a5f231ad08485606427498777daba81398"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.11.0/floorp-macOS-universal.dmg",
|
||||
"sha256": "adac6b0bc406b132dcc9fd72ac10ebbdfc87b5e276d89d4b4155c5e515716ecf"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.10.4/floorp-macOS-universal.dmg",
|
||||
"sha256": "1fa4e85c9aa58d989f0aa01389c0b3a5f231ad08485606427498777daba81398"
|
||||
"url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.11.0/floorp-macOS-universal.dmg",
|
||||
"sha256": "adac6b0bc406b132dcc9fd72ac10ebbdfc87b5e276d89d4b4155c5e515716ecf"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "frida-tools";
|
||||
version = "14.5.2";
|
||||
version = "14.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) version;
|
||||
pname = "frida_tools";
|
||||
hash = "sha256-yan13hoxurv8cUzvBW8iEmhedSOms+lTLpOmlJFbz9U=";
|
||||
hash = "sha256-EwpoRBHT6NyR1sHV4oEXqu5R/Wcud4n3DWxEkeZXdzM=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -62,14 +62,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gamescope";
|
||||
version = "3.16.20";
|
||||
version = "3.16.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValveSoftware";
|
||||
repo = "gamescope";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-o/mzamXrKxhxlGlYy9zW2VfVh4gHL/eNw4PuK138WYc=";
|
||||
hash = "sha256-FuQkKguW00yI2w5nCctcxz7e1ZUKSWJOCIS1UMJzsMA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -15,18 +15,18 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "gemini-cli";
|
||||
version = "0.31.0";
|
||||
version = "0.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google-gemini";
|
||||
repo = "gemini-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-huPd4W7Jf4/dZshWElicYpcHhktE83wPs/z5jVYwynM=";
|
||||
hash = "sha256-ypqdT8TA3gke4RPTxOG3SZdKkGnwoty6+bbqCil04mQ=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
npmDepsHash = "sha256-iRlwCSGigRi/ilfXi8rI68vlfkeec3vB5nZWPmTLnK8=";
|
||||
npmDepsHash = "sha256-+k8DyoT3uBDEvBhzmZzacUUqN2scr9ODKSvy7l3pVy8=";
|
||||
|
||||
dontPatchElf = stdenv.isDarwin;
|
||||
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gh-enhance";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlvhdr";
|
||||
repo = "gh-enhance";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IHtI8wnPLMkqxdBFXqkt6inYMOIqKjdTKdZbTxIhPzo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rgql0vsHAzWeubw4EYBu/yPmm2QeADsIeACWsbcWtSk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/dlvhdr/gh-enhance/cmd.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
checkFlags = [
|
||||
# requires network
|
||||
"-skip=TestFullOutput"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
|
||||
doInstallCheck = true;
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd gh-enhance \
|
||||
--bash <($out/bin/gh-enhance completion bash) \
|
||||
--fish <($out/bin/gh-enhance completion fish) \
|
||||
--zsh <($out/bin/gh-enhance completion zsh)
|
||||
'';
|
||||
meta = {
|
||||
changelog = "https://github.com/dlvhdr/gh-enhance/releases/tag/${finalAttrs.src.rev}";
|
||||
description = "Terminal UI for GitHub Actions";
|
||||
homepage = "https://www.gh-dash.dev/enhance";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ replicapra ];
|
||||
mainProgram = "gh-enhance";
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,70 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
desktop-file-utils,
|
||||
fetchurl,
|
||||
flatpak,
|
||||
glib,
|
||||
gnome,
|
||||
gom,
|
||||
gtk4,
|
||||
libadwaita,
|
||||
libdex,
|
||||
libfoundry,
|
||||
libpanel,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
webkitgtk_6_0,
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-manuals";
|
||||
version = "49.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/manuals/${lib.versions.major finalAttrs.version}/manuals-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-7WRGxMLSnCuQYrKoynJxzbrPx4z9tP3NDzvEjYyefwg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
flatpak
|
||||
glib
|
||||
gom
|
||||
gtk4
|
||||
libadwaita
|
||||
libdex
|
||||
libfoundry
|
||||
libpanel
|
||||
webkitgtk_6_0
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${libpanel}/share")
|
||||
'';
|
||||
|
||||
passthru.updateScript = gnome.updateScript {
|
||||
packageName = "manuals";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Tool for browsing documentation";
|
||||
mainProgram = "manuals";
|
||||
homepage = "https://apps.gnome.org/Manuals/";
|
||||
changelog = "https://gitlab.gnome.org/GNOME/manuals/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
teams = [ lib.teams.gnome ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-dnscollector";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmachard";
|
||||
repo = "go-dnscollector";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-b1fKxjdZpCuPg+lRhpYn8tjVOqQU1kyhta63G+8Pxr4=";
|
||||
hash = "sha256-497qilu1/76XbAO3fKIRpDWjQaCmdDgdxswkE5y8pNU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UNp2lttwBQM9Xx6+aOQGKdOgeMBsyCHQdhCAbyvDCN4=";
|
||||
vendorHash = "sha256-4gvGqNPRdB/t498WBF9vTqyuTl2rkAo7nRvNEpTMPqY=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gomplate";
|
||||
version = "4.3.3";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hairyhenderson";
|
||||
repo = "gomplate";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LhCOpXptsZLoVXYH2u+YIXPlqNTMQ3tQt+KY8c54oA0=";
|
||||
hash = "sha256-xzWPZk8eI3/4sPceFNELeVJ1Spbey5bWhhgez+PQpz4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lesPZAnN7K6hWYqAB69pGo4fVQAQH0VTh4DBtl2yhg8=";
|
||||
vendorHash = "sha256-Wix7ABkI2MnCd1qjfeTNLaXPgembjb9RY+spRqEp2cs=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "clasp";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "clasp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JLfkGxUHvde5RXlIWH+raBvTwqvpHOR/ul4yArLFj28=";
|
||||
hash = "sha256-6HHkGcWzzrfIjQUPycSkF4pM/vrOo9rvWUnhHrA4LJ8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-dT0HA21wvU+wP5/9juMYinY60Fq5ngWl5dgj0JJi9hM=";
|
||||
npmDepsHash = "sha256-zQt+diejFiG1oEkXxN5/X9rh33wHenk+iWeHsack/kY=";
|
||||
|
||||
# `npm run build` tries installing clasp globally
|
||||
npmBuildScript = [ "compile" ];
|
||||
|
||||
@@ -100,9 +100,7 @@ buildGo126Module (finalAttrs: {
|
||||
--set PDFCPU_BIN_PATH "${getExe pdfcpu}" \
|
||||
--set PDFTK_BIN_PATH "${getExe pdftk}" \
|
||||
--set QPDF_BIN_PATH "${getExe qpdf}" \
|
||||
--set UNOCONVERTER_BIN_PATH "${getExe unoconv}" \
|
||||
--set CHROMIUM_BIN_PATH "${getExe chromium}" \
|
||||
--set LIBREOFFICE_BIN_PATH "${libreoffice'}"
|
||||
--set UNOCONVERTER_BIN_PATH "${getExe unoconv}"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
version = "3.6.6";
|
||||
version = "3.6.7";
|
||||
pname = "grafana-loki";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "loki";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Mdopa7Nhdcwn4VBz/R5zI3Zccuht2hIdnAeCsAS6B+0=";
|
||||
hash = "sha256-Gg86aV/7/VoLHGLO40kxng6tYOMpbmSCwV1BRlrW+qc=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -1,107 +1,107 @@
|
||||
From b1df18da8735ed8c043e5e63753a6524cce620e1 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Moultrie <tebriel@frodux.in>
|
||||
Date: Tue, 4 Mar 2025 08:20:58 -0500
|
||||
Subject: [PATCH 1/2] Define configs with env vars
|
||||
|
||||
---
|
||||
app.php | 8 ++++----
|
||||
controllers/BaseApiController.php | 2 +-
|
||||
services/DatabaseService.php | 2 +-
|
||||
services/FilesService.php | 2 +-
|
||||
services/StockService.php | 2 +-
|
||||
5 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/app.php b/app.php
|
||||
index 9cdd14e5..c0b30b6e 100644
|
||||
--- a/app.php
|
||||
+++ b/app.php
|
||||
@@ -12,7 +12,7 @@ use Slim\Views\Blade;
|
||||
require_once __DIR__ . '/packages/autoload.php';
|
||||
|
||||
// Load config files
|
||||
-require_once GROCY_DATAPATH . '/config.php';
|
||||
+require_once getenv('GROCY_CONFIG_FILE');
|
||||
require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
|
||||
require_once __DIR__ . '/helpers/ConfigurationValidator.php';
|
||||
|
||||
@@ -52,7 +52,7 @@ catch (EInvalidConfig $ex)
|
||||
}
|
||||
|
||||
// Create data/viewcache folder if it doesn't exist
|
||||
-$viewcachePath = GROCY_DATAPATH . '/viewcache';
|
||||
+$viewcachePath = getenv('GROCY_CACHE_DIR');
|
||||
if (!file_exists($viewcachePath))
|
||||
{
|
||||
mkdir($viewcachePath);
|
||||
@@ -85,7 +85,7 @@ $app = AppFactory::create();
|
||||
$container = $app->getContainer();
|
||||
$container->set('view', function (Container $container)
|
||||
{
|
||||
- return new Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
|
||||
+ return new Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
|
||||
});
|
||||
|
||||
$container->set('UrlManager', function (Container $container)
|
||||
@@ -127,7 +127,7 @@ $errorMiddleware->setDefaultErrorHandler(
|
||||
|
||||
$app->add(new CorsMiddleware($app->getResponseFactory()));
|
||||
|
||||
-$app->getRouteCollector()->setCacheFile(GROCY_DATAPATH . '/viewcache/route_cache.php');
|
||||
+$app->getRouteCollector()->setCacheFile(getenv('GROCY_CACHE_DIR') . '/route_cache.php');
|
||||
|
||||
ob_clean(); // No response output before here
|
||||
$app->run();
|
||||
diff --git a/controllers/BaseApiController.php b/controllers/BaseApiController.php
|
||||
index 5941e348..9283ba93 100644
|
||||
--- a/controllers/BaseApiController.php
|
||||
+++ b/controllers/BaseApiController.php
|
||||
@@ -162,7 +162,7 @@ class BaseApiController extends BaseController
|
||||
if (self::$htmlPurifierInstance == null)
|
||||
{
|
||||
$htmlPurifierConfig = \HTMLPurifier_Config::createDefault();
|
||||
- $htmlPurifierConfig->set('Cache.SerializerPath', GROCY_DATAPATH . '/viewcache');
|
||||
+ $htmlPurifierConfig->set('Cache.SerializerPath', getenv('GROCY_CACHE_DIR'));
|
||||
$htmlPurifierConfig->set('HTML.Allowed', 'div,b,strong,i,em,u,a[href|title|target],iframe[src|width|height|frameborder],ul,ol,li,p[style],br,span[style],img[style|width|height|alt|src],table[border|width|style],tbody,tr,td,th,blockquote,*[style|class|id],h1,h2,h3,h4,h5,h6');
|
||||
$htmlPurifierConfig->set('Attr.EnableID', true);
|
||||
$htmlPurifierConfig->set('HTML.SafeIframe', true);
|
||||
diff --git a/services/DatabaseService.php b/services/DatabaseService.php
|
||||
index c5914e49..c249a3bf 100644
|
||||
--- a/services/DatabaseService.php
|
||||
+++ b/services/DatabaseService.php
|
||||
@@ -145,6 +145,6 @@ class DatabaseService
|
||||
return GROCY_DATAPATH . '/grocy_' . $dbSuffix . '.db';
|
||||
}
|
||||
|
||||
- return GROCY_DATAPATH . '/grocy.db';
|
||||
+ return getenv('GROCY_DB_FILE');
|
||||
}
|
||||
}
|
||||
diff --git a/services/FilesService.php b/services/FilesService.php
|
||||
index 113a6478..61568bc6 100644
|
||||
--- a/services/FilesService.php
|
||||
+++ b/services/FilesService.php
|
||||
@@ -10,7 +10,7 @@ class FilesService extends BaseService
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
- $this->StoragePath = GROCY_DATAPATH . '/storage';
|
||||
+ $this->StoragePath = getenv('GROCY_STORAGE_DIR');
|
||||
if (!file_exists($this->StoragePath))
|
||||
{
|
||||
mkdir($this->StoragePath);
|
||||
diff --git a/services/StockService.php b/services/StockService.php
|
||||
index 2261db4e..cd438942 100644
|
||||
--- a/services/StockService.php
|
||||
+++ b/services/StockService.php
|
||||
@@ -1752,7 +1752,7 @@ class StockService extends BaseService
|
||||
|
||||
// User plugins take precedence
|
||||
$standardPluginPath = __DIR__ . "/../plugins/$pluginName.php";
|
||||
- $userPluginPath = GROCY_DATAPATH . "/plugins/$pluginName.php";
|
||||
+ $userPluginPath = getenv('GROCY_PLUGIN_DIR') . "/$pluginName.php";
|
||||
if (file_exists($userPluginPath))
|
||||
{
|
||||
require_once $userPluginPath;
|
||||
--
|
||||
2.47.2
|
||||
|
||||
From 4c9e6a687162729f96a2de428aa19058c04efe2b Mon Sep 17 00:00:00 2001
|
||||
From: Chris Moultrie <tebriel@frodux.in>
|
||||
Date: Sat, 7 Mar 2026 10:51:40 -0500
|
||||
Subject: [PATCH 1/2] Define configs with env vars
|
||||
|
||||
---
|
||||
app.php | 8 ++++----
|
||||
controllers/BaseApiController.php | 2 +-
|
||||
services/DatabaseService.php | 2 +-
|
||||
services/FilesService.php | 2 +-
|
||||
services/StockService.php | 2 +-
|
||||
5 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/app.php b/app.php
|
||||
index 9224796a..da5c2357 100644
|
||||
--- a/app.php
|
||||
+++ b/app.php
|
||||
@@ -12,7 +12,7 @@ use Slim\Factory\AppFactory;
|
||||
require_once __DIR__ . '/packages/autoload.php';
|
||||
|
||||
// Load config files
|
||||
-require_once GROCY_DATAPATH . '/config.php';
|
||||
+require_once getenv('GROCY_CONFIG_FILE');
|
||||
require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
|
||||
|
||||
// Error reporting definitions
|
||||
@@ -51,7 +51,7 @@ catch (\Grocy\Helpers\EInvalidConfig $ex)
|
||||
}
|
||||
|
||||
// Create data/viewcache folder if it doesn't exist
|
||||
-$viewcachePath = GROCY_DATAPATH . '/viewcache';
|
||||
+$viewcachePath = getenv('GROCY_CACHE_DIR');
|
||||
if (!file_exists($viewcachePath))
|
||||
{
|
||||
mkdir($viewcachePath);
|
||||
@@ -84,7 +84,7 @@ $app = AppFactory::create();
|
||||
$container = $app->getContainer();
|
||||
$container->set('view', function (Container $container)
|
||||
{
|
||||
- return new SlimBladeView(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
|
||||
+ return new SlimBladeView(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
|
||||
});
|
||||
|
||||
$container->set('UrlManager', function (Container $container)
|
||||
@@ -126,7 +126,7 @@ $errorMiddleware->setDefaultErrorHandler(
|
||||
|
||||
$app->add(new CorsMiddleware($app->getResponseFactory()));
|
||||
|
||||
-$app->getRouteCollector()->setCacheFile(GROCY_DATAPATH . '/viewcache/route_cache.php');
|
||||
+$app->getRouteCollector()->setCacheFile(getenv('GROCY_CACHE_DIR') . '/route_cache.php');
|
||||
|
||||
ob_clean(); // No response output before here
|
||||
$app->run();
|
||||
diff --git a/controllers/BaseApiController.php b/controllers/BaseApiController.php
|
||||
index 5941e348..9283ba93 100644
|
||||
--- a/controllers/BaseApiController.php
|
||||
+++ b/controllers/BaseApiController.php
|
||||
@@ -162,7 +162,7 @@ class BaseApiController extends BaseController
|
||||
if (self::$htmlPurifierInstance == null)
|
||||
{
|
||||
$htmlPurifierConfig = \HTMLPurifier_Config::createDefault();
|
||||
- $htmlPurifierConfig->set('Cache.SerializerPath', GROCY_DATAPATH . '/viewcache');
|
||||
+ $htmlPurifierConfig->set('Cache.SerializerPath', getenv('GROCY_CACHE_DIR'));
|
||||
$htmlPurifierConfig->set('HTML.Allowed', 'div,b,strong,i,em,u,a[href|title|target],iframe[src|width|height|frameborder],ul,ol,li,p[style],br,span[style],img[style|width|height|alt|src],table[border|width|style],tbody,tr,td,th,blockquote,*[style|class|id],h1,h2,h3,h4,h5,h6');
|
||||
$htmlPurifierConfig->set('Attr.EnableID', true);
|
||||
$htmlPurifierConfig->set('HTML.SafeIframe', true);
|
||||
diff --git a/services/DatabaseService.php b/services/DatabaseService.php
|
||||
index 0b6672fb..94bb9412 100644
|
||||
--- a/services/DatabaseService.php
|
||||
+++ b/services/DatabaseService.php
|
||||
@@ -145,6 +145,6 @@ class DatabaseService
|
||||
return GROCY_DATAPATH . '/grocy_' . $dbSuffix . '.db';
|
||||
}
|
||||
|
||||
- return GROCY_DATAPATH . '/grocy.db';
|
||||
+ return getenv('GROCY_DB_FILE');
|
||||
}
|
||||
}
|
||||
diff --git a/services/FilesService.php b/services/FilesService.php
|
||||
index 113a6478..61568bc6 100644
|
||||
--- a/services/FilesService.php
|
||||
+++ b/services/FilesService.php
|
||||
@@ -10,7 +10,7 @@ class FilesService extends BaseService
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
- $this->StoragePath = GROCY_DATAPATH . '/storage';
|
||||
+ $this->StoragePath = getenv('GROCY_STORAGE_DIR');
|
||||
if (!file_exists($this->StoragePath))
|
||||
{
|
||||
mkdir($this->StoragePath);
|
||||
diff --git a/services/StockService.php b/services/StockService.php
|
||||
index da27dacc..ffe714ec 100644
|
||||
--- a/services/StockService.php
|
||||
+++ b/services/StockService.php
|
||||
@@ -1784,7 +1784,7 @@ class StockService extends BaseService
|
||||
|
||||
// User plugins take precedence
|
||||
$standardPluginPath = __DIR__ . "/../plugins/$pluginName.php";
|
||||
- $userPluginPath = GROCY_DATAPATH . "/plugins/$pluginName.php";
|
||||
+ $userPluginPath = getenv('GROCY_PLUGIN_DIR') . "/$pluginName.php";
|
||||
if (file_exists($userPluginPath))
|
||||
{
|
||||
require_once $userPluginPath;
|
||||
--
|
||||
2.51.2
|
||||
|
||||
|
||||
+24
-24
@@ -1,24 +1,24 @@
|
||||
From f397d6e82d73761358d815a5ba880a05e7e281c3 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Moultrie <tebriel@frodux.in>
|
||||
Date: Tue, 4 Mar 2025 08:21:28 -0500
|
||||
Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy
|
||||
|
||||
---
|
||||
helpers/PrerequisiteChecker.php | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/helpers/PrerequisiteChecker.php b/helpers/PrerequisiteChecker.php
|
||||
index 8e12a5c5..37b433db 100644
|
||||
--- a/helpers/PrerequisiteChecker.php
|
||||
+++ b/helpers/PrerequisiteChecker.php
|
||||
@@ -18,7 +18,6 @@ class PrerequisiteChecker
|
||||
public function checkRequirements()
|
||||
{
|
||||
self::checkForPhpVersion();
|
||||
- self::checkForConfigFile();
|
||||
self::checkForConfigDistFile();
|
||||
self::checkForComposer();
|
||||
self::checkForPhpExtensions();
|
||||
--
|
||||
2.47.2
|
||||
|
||||
From ecb28fe2fc0527957c41651cd53e7af4b3cc9047 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Moultrie <tebriel@frodux.in>
|
||||
Date: Sat, 7 Mar 2026 10:52:29 -0500
|
||||
Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy
|
||||
|
||||
---
|
||||
helpers/PrerequisiteChecker.php | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/helpers/PrerequisiteChecker.php b/helpers/PrerequisiteChecker.php
|
||||
index dbc9c138..cd7d2526 100644
|
||||
--- a/helpers/PrerequisiteChecker.php
|
||||
+++ b/helpers/PrerequisiteChecker.php
|
||||
@@ -20,7 +20,6 @@ class PrerequisiteChecker
|
||||
public function checkRequirements()
|
||||
{
|
||||
self::checkForPhpVersion();
|
||||
- self::checkForConfigFile();
|
||||
self::checkForConfigDistFile();
|
||||
self::checkForComposer();
|
||||
self::checkForPhpExtensions();
|
||||
--
|
||||
2.51.2
|
||||
|
||||
|
||||
@@ -2,30 +2,32 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
php,
|
||||
php85,
|
||||
yarn,
|
||||
fixup-yarn-lock,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
let
|
||||
php = php85;
|
||||
in
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "grocy";
|
||||
version = "4.5.0";
|
||||
version = "4.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grocy";
|
||||
repo = "grocy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MnN6TIkNZWT+pAQf0+z5l3hj/7K/d3BfI7VAaUEKG8s=";
|
||||
hash = "sha256-qdN+stXuwChv6IaFSX2SrSdej7Id/M0UaO2cggAvWdc=";
|
||||
};
|
||||
|
||||
# Upstream composer.json file is missing the name, description and license fields
|
||||
composerStrictValidation = false;
|
||||
vendorHash = "sha256-11+NIZX8i9uwcImwSE0HAeMc/WOCsecpMRqiba1mkrs=";
|
||||
vendorHash = "sha256-xoPO/LAvMcpvx2sszSj3K9p09izeW1l67KYwpydMdNI=";
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
hash = "sha256-Q+9hUxIfNrfdok39h04rz5I63RxOJ0qk3XlwvD1TcqI=";
|
||||
hash = "sha256-48+u0NYZZiYvP2ADAkRdL079wmjWMHwPHi8rlDP41Eo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -57,7 +59,10 @@ php.buildComposerProject2 (finalAttrs: {
|
||||
rm -r $out/share
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) grocy; };
|
||||
passthru = {
|
||||
phpPackage = php;
|
||||
tests = { inherit (nixosTests) grocy; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
nix = nixVersions.nix_2_33;
|
||||
nix = nixVersions.nix_2_34;
|
||||
|
||||
perlDeps = buildEnv {
|
||||
name = "hydra-perl-deps";
|
||||
@@ -132,14 +132,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hydra";
|
||||
version = "0-unstable-2026-01-23";
|
||||
version = "0-unstable-2026-03-13";
|
||||
# nixpkgs-update: no auto update
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "hydra";
|
||||
rev = "8bc95a96f787eb36f29ceec773f5bf48bd121097";
|
||||
hash = "sha256-Ro+qOHWmWuKJiUwX8bmNuGpb0cLUaPr0vsuZGAi2QCI=";
|
||||
rev = "5decc46ce66335b225c1504a509fefa0f804436f";
|
||||
hash = "sha256-wBVp3TDCBKyqyWbMlya+egjhSN7R067v20pUZINSF0g=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprlax";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sandwichfarm";
|
||||
repo = "hyprlax";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VlSJ5pM2h6+dqU4N0zAvm55pZNbKCyqAWxz6i5gf5KE=";
|
||||
hash = "sha256-nBJkVBaeT2GIGWVYGEWRCQ14UznplKE2zm+4HyEfq3M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "iaito";
|
||||
version = "6.0.7";
|
||||
version = "6.1.0";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "radareorg";
|
||||
repo = "iaito";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-sATBtjNboSnk3j1PVm60HZO1MDw1A4FRttVp0M4t+/I=";
|
||||
hash = "sha256-nvMx0zbfsphfBgxdQnk+EhRpQnJ2Qv05rF7w+zQUUQg=";
|
||||
name = "main";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dwith_qt6=true"
|
||||
(lib.mesonBool "with_qt6" true)
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
|
||||
@@ -113,14 +113,10 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
# add our lxc location to incus's acceptable rootFsPaths
|
||||
# this is necessary for tmpfs/tmpfs-overlay to work
|
||||
postPatch =
|
||||
if (lib.versionAtLeast finalAttrs.version "6.16") then
|
||||
''
|
||||
substituteInPlace internal/server/device/disk.go \
|
||||
--replace-fail '"/opt/incus/lib/lxc/rootfs/"' '"${lxc}/lib/lxc/rootfs/"'
|
||||
''
|
||||
else
|
||||
null;
|
||||
postPatch = ''
|
||||
substituteInPlace internal/server/device/disk.go \
|
||||
--replace-fail '"/opt/incus/lib/lxc/rootfs/"' '"${lxc}/lib/lxc/rootfs/"'
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
# build docs
|
||||
@@ -172,16 +168,9 @@ buildGoModule (finalAttrs: {
|
||||
--zsh <($out/bin/incus completion zsh)
|
||||
|
||||
mkdir -p $agent_loader/bin $agent_loader/etc/systemd/system $agent_loader/lib/udev/rules.d
|
||||
''
|
||||
+ lib.optionalString (lib.versionOlder finalAttrs.version "6.18") ''
|
||||
cp internal/server/instance/drivers/agent-loader/incus-agent{,-setup} $agent_loader/bin/
|
||||
''
|
||||
+ lib.optionalString (lib.versionAtLeast finalAttrs.version "6.18") ''
|
||||
# the agent_loader output is used by virtualisation.incus.agent
|
||||
cp internal/server/instance/drivers/agent-loader/incus-agent-linux $agent_loader/bin/incus-agent
|
||||
cp internal/server/instance/drivers/agent-loader/incus-agent-setup-linux $agent_loader/bin/incus-agent-setup
|
||||
''
|
||||
+ ''
|
||||
chmod +x $agent_loader/bin/incus-agent{,-setup}
|
||||
patchShebangs $agent_loader/bin/incus-agent{,-setup}
|
||||
cp internal/server/instance/drivers/agent-loader/systemd/incus-agent.service $agent_loader/etc/systemd/system/
|
||||
|
||||
@@ -1,20 +1,11 @@
|
||||
import ./generic.nix {
|
||||
hash = "sha256-Sg3+399EgwEcZ8fp9cb2KEWQtBpYr5PkwTdnGl/AdfA";
|
||||
version = "6.0.5-unstable-2026-01-23";
|
||||
rev = "f8da60633e493bb5c0521981fa031bc909988c95";
|
||||
vendorHash = "sha256-KOJqPvp+w7G505ZMJ1weRD2SATmfq1aeyCqmbJ6WMAY=";
|
||||
hash = "sha256-DgPSH5t1Zx2X9T8dbpz54M5nXNcCJbdfcq9AEd8kmYo=";
|
||||
version = "6.0.6";
|
||||
vendorHash = "sha256-bVJwg9VaiSgfpKo+e2oMsYgmaKk42dktq0pahcfbjp0=";
|
||||
patches = [
|
||||
# qemu 9.1 compat, remove when added to LTS
|
||||
./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch
|
||||
./0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch
|
||||
# post 6.0.5 patches, remove >= 6.0.6
|
||||
# ./c5359c809836c0f3b1e6022bf0528bb90ce06ad7.patch
|
||||
# ./57096066959c843e1c413c4a97f64077b95cb397.patch
|
||||
# ./f3dc9c0e6b77bb8765b347564702e026c2a8f9c6.patch
|
||||
# ./d6a1ea3912938dae740cf821cd070e66e7a623ff.patch
|
||||
# ./d6f0a77dd26df4c1ced80ffa63848279fd4330cc.patch
|
||||
# ./92ac6ac999a4928cfdb92c485a048e4d51f471d0.patch
|
||||
# ./f8da60633e493bb5c0521981fa031bc909988c95,patch
|
||||
];
|
||||
lts = true;
|
||||
nixUpdateExtraArgs = [
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "intel-compute-runtime";
|
||||
version = "26.05.37020.3";
|
||||
version = "26.09.37435.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "compute-runtime";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-V5PoGvUJtNL9Y7RkFWqhpYEbpiqv3Gj4GB1uBUKOvNg=";
|
||||
hash = "sha256-FKqsyjkxOcqtVv+chGTFn9dhYwkWaDomWdFQlF85RDM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "jjui";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "idursun";
|
||||
repo = "jjui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-o648hMSoEa21GqK4VGSa4hf5KP5FVu80Ea5NB2QwII0=";
|
||||
hash = "sha256-VTaOd5LSBxo6EhTyjoyAqX+wTEcm88qIgUCcd+TRYY4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GDYgZI6X7UwnyKXOJVmqXXtm4ulA10uuX5MeqKVTheA=";
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
asciidoc,
|
||||
brotli,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
giflib,
|
||||
gtest,
|
||||
lcms2,
|
||||
libjpeg,
|
||||
libhwy,
|
||||
libpng,
|
||||
ninja,
|
||||
openexr,
|
||||
pkg-config,
|
||||
python3Minimal,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "jpegli";
|
||||
version = "0-unstable-2025-02-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "jpegli";
|
||||
rev = "bc19ca2393f79bfe0a4a9518f77e4ad33ce1ab7a";
|
||||
hash = "sha256-8th+QHLOoAIbSJwFyaBxUXoCXwj7K7rgg/cCK7LgOb0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoc
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
python3Minimal
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
brotli
|
||||
giflib
|
||||
gtest
|
||||
lcms2
|
||||
libhwy
|
||||
libjpeg
|
||||
libpng
|
||||
openexr
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "JPEGXL_ENABLE_JPEGLI_LIBJPEG" false)
|
||||
(lib.cmakeBool "JPEGXL_BUNDLE_LIBPNG" false)
|
||||
(lib.cmakeBool "JPEGXL_FORCE_SYSTEM_BROTLI" true)
|
||||
(lib.cmakeBool "JPEGXL_FORCE_SYSTEM_GTEST" true)
|
||||
(lib.cmakeBool "JPEGXL_FORCE_SYSTEM_LCMS2" true)
|
||||
(lib.cmakeBool "JPEGXL_FORCE_SYSTEM_HWY" true)
|
||||
# Enable hardware-dependent optimizations
|
||||
(lib.cmakeBool "JPEGXL_ENABLE_SIZELESS_VECTORS" true)
|
||||
(lib.cmakeBool "JPEGXL_ENABLE_AVX512" true)
|
||||
(lib.cmakeBool "JPEGXL_ENABLE_AVX512_SPR" true)
|
||||
(lib.cmakeBool "JPEGXL_ENABLE_AVX512_ZEN4" true)
|
||||
(lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Improved JPEG encoder and decoder implementation";
|
||||
homepage = "https://github.com/google/jpegli";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
jwillikers
|
||||
leiserfg
|
||||
];
|
||||
mainProgram = "cjpegli";
|
||||
};
|
||||
}
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "just-lsp";
|
||||
version = "0.3.4";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terror";
|
||||
repo = "just-lsp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5tjyn27PhxVmWPesoFJXoF5yq1j4LUqaF8+XyR1PWfY=";
|
||||
hash = "sha256-Ic/IRJhyKBqniQUeEME0z2ywUFqLXTWg9XtnkQbGi8U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8Jz7neEcmTDag2GaJqWHsZ8IPF/zIwU47vQ+0sPI9w8=";
|
||||
cargoHash = "sha256-dskTlKEEekfutV8WPJ3XOIszMSShzjPbRPxSEN3jbgQ=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -6,26 +6,16 @@
|
||||
}:
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "keycloak-discord";
|
||||
version = "0.6.1";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wadahiro";
|
||||
owner = "iForged";
|
||||
repo = "keycloak-discord";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BA7x28k/aMI3VPQmEgNhKD9N34DdYqadAD/m4cxLSYg=";
|
||||
hash = "sha256-xTGXETkE5Ct+h3mYbj3VUoQhi5Wx5oZqz3G1uN0pDns=";
|
||||
};
|
||||
|
||||
mvnHash =
|
||||
let
|
||||
mvnHashes = {
|
||||
"aarch64-darwin" = "sha256-Or7VOZwz4NfDtb0kmHbbTYE/avAc+H8+Y6JPw+HGjxs=";
|
||||
"x86_64-darwin" = "sha256-sX10vYlb2hWArTLZsPTcKYHHsPffQKtBxpcI42wcZZA=";
|
||||
"aarch64-linux" = "sha256-I5qjhfAXPXMb+1SPG29t/IKH/zBQqdnu3U7dYSQhTL8=";
|
||||
"x86_64-linux" = "sha256-uhm++MGgTN32/xbHNd+Z3Hes9Q5tl8ztIQ92LxMWKjg=";
|
||||
};
|
||||
in
|
||||
mvnHashes.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
mvnHash = "sha256-zFsVRFFGrHvTFW6+Y1o2OVFaf34JgqPVv+vMAfkSOJw=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@@ -34,7 +24,7 @@ maven.buildMavenPackage rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/wadahiro/keycloak-discord";
|
||||
homepage = "https://github.com/iForged/keycloak-discord";
|
||||
description = "Keycloak Identity Provider extension for Discord";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
|
||||
@@ -3,23 +3,23 @@
|
||||
{
|
||||
"kicad" = {
|
||||
kicadVersion = {
|
||||
version = "9.0.7";
|
||||
version = "9.0.8";
|
||||
src = {
|
||||
rev = "45f01a94961af4dfa9a179d25bcf642cd8c80b92";
|
||||
sha256 = "0glsdq5c54d2sif0jmpym79i6vham5w3kzcvcr0yq5nimqig7h0q";
|
||||
rev = "1b361e77008b6a38253c4d90d7c749f4aef0f07f";
|
||||
sha256 = "1b995p0qb9cjpj0n3x3szbqr6d7fxwmrp2nbx37y7ym2bc1lpxd8";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "9.0.7";
|
||||
version = "9.0.8";
|
||||
libSources = {
|
||||
symbols.rev = "65d897cc92950ff2af888eb67e527ba7a2b99fe8";
|
||||
symbols.rev = "83b87ce54ef7c17da4cefe45ad99a5f8d375abe6";
|
||||
symbols.sha256 = "08qb4rqxsyhrcvj1k200m2c06jjy7jwjmf9n1qkcm0biqqc5dba4";
|
||||
templates.rev = "cdf507d0373b5bfd8161b45f6fb86a49b56c4694";
|
||||
templates.rev = "319c71222af4205673e0cab9d772a02bbb34c597";
|
||||
templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id";
|
||||
footprints.rev = "084757e0326f98c10943b8ffe5be284fe912a160";
|
||||
footprints.rev = "384ecd066fcaef6aacdd099ca0bb7c47499a9a4b";
|
||||
footprints.sha256 = "1w7dkb93s84ymi1syxpzacbmkxlnlh0k4z1c62nabspb901nn524";
|
||||
packages3d.rev = "123ddef066ce40e20443e678c5baf6a7d4a04399";
|
||||
packages3d.sha256 = "1bv1k8i01x7gyayrlkzl3d2nsf7mcdmzx8gjwx1i2va9557rgli9";
|
||||
packages3d.rev = "6b3a47da075011b33b6de17aa499690f8c5be4a7";
|
||||
packages3d.sha256 = "1j26dmgz7xfixlqrzclb1wpc6zkd10n1fq7rmdrgwwx083p3c7a8";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubevirt";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubevirt";
|
||||
repo = "kubevirt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-fG+iIWAbvgrtrUfDEXFWbxoJdNuQFN9grp4JHzSjlYs=";
|
||||
hash = "sha256-Bx2DzuKNcDkFnkyiEay9WosM6qZ4vnDLrz2NwNn5J3E=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
diff --git a/plugins/fallbacks/host-sdk/plugin-host-sdk.c b/plugins/fallbacks/host-sdk/plugin-host-sdk.c
|
||||
index d3deb4fd..98ea0875 100644
|
||||
--- a/plugins/fallbacks/host-sdk/plugin-host-sdk.c
|
||||
+++ b/plugins/fallbacks/host-sdk/plugin-host-sdk.c
|
||||
@@ -111,5 +111,11 @@ plugin_host_sdk_build_filename (PluginHostSdk *self,
|
||||
if (g_path_is_absolute (joined))
|
||||
return g_steal_pointer (&joined);
|
||||
|
||||
+ if (g_strcmp0(g_get_os_info(G_OS_INFO_KEY_NAME), "NixOS") == 0) {
|
||||
+ GString *str = g_string_new(joined);
|
||||
+ g_string_replace(str, "usr/share", "run/current-system/sw/share", 0);
|
||||
+ joined = g_string_free(str, FALSE);
|
||||
+ }
|
||||
+
|
||||
return g_build_filename ("/", joined, NULL);
|
||||
}
|
||||
@@ -0,0 +1,117 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
cmark,
|
||||
editorconfig-core-c,
|
||||
fetchurl,
|
||||
flatpak,
|
||||
gi-docgen,
|
||||
glib,
|
||||
gnome,
|
||||
gobject-introspection,
|
||||
gom,
|
||||
gtk4,
|
||||
gtksourceview5,
|
||||
json-glib,
|
||||
libdex,
|
||||
libgit2,
|
||||
libpeas2,
|
||||
libsoup_3,
|
||||
libspelling,
|
||||
libssh2,
|
||||
libsysprof-capture,
|
||||
libxml2,
|
||||
libyaml,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
template-glib,
|
||||
vte-gtk4,
|
||||
webkitgtk_6_0,
|
||||
wrapGAppsNoGuiHook,
|
||||
withGtk ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libfoundry${lib.optionalString withGtk "-gtk"}";
|
||||
version = "1.0.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"devdoc"
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/foundry/${lib.versions.majorMinor finalAttrs.version}/foundry-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-wHaJBv6zTdWBmeKFRHOeohe714g+WPJPEjIphryJkzk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./host_sdk_filename_nixos.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gi-docgen
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsNoGuiHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
editorconfig-core-c
|
||||
flatpak
|
||||
gom
|
||||
libgit2
|
||||
libsoup_3
|
||||
libssh2
|
||||
libsysprof-capture
|
||||
libxml2
|
||||
libyaml
|
||||
template-glib
|
||||
]
|
||||
++ lib.optionals withGtk [
|
||||
cmark
|
||||
gtk4
|
||||
gtksourceview5
|
||||
libspelling
|
||||
vte-gtk4
|
||||
webkitgtk_6_0
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
json-glib
|
||||
libdex
|
||||
libpeas2
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "docs" true)
|
||||
(lib.mesonBool "gtk" withGtk)
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
passthru.updateScript = gnome.updateScript {
|
||||
packageName = "foundry";
|
||||
attrPath = "libfoundry";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Command line tool and library that can be used to build developer tools";
|
||||
mainProgram = "foundry";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/foundry";
|
||||
changelog = "https://gitlab.gnome.org/GNOME/foundry/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
teams = [ lib.teams.gnome ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user