Merge master into staging-next
This commit is contained in:
@@ -282,7 +282,7 @@ in
|
||||
mkIf (cfg.servers != { }) {
|
||||
assertions = mapAttrsToList (
|
||||
server: options: {
|
||||
assertion = options.useTransformers -> options.initialPromt == null;
|
||||
assertion = options.useTransformers -> options.initialPrompt == null;
|
||||
message = "wyoming-faster-whisper/${server}: Transformer models (`useTransformers`) do not currently support an `initialPrompt`.";
|
||||
}
|
||||
);
|
||||
|
||||
@@ -7,9 +7,6 @@ The server setup can be automated using
|
||||
client configured to your local Garage instance is available in
|
||||
the global environment as `garage-manage`.
|
||||
|
||||
The current default by NixOS is `garage_0_8` which is also the latest
|
||||
major version available.
|
||||
|
||||
## General considerations on upgrades {#module-services-garage-upgrade-scenarios}
|
||||
|
||||
Garage provides a cookbook documentation on how to upgrade:
|
||||
@@ -21,20 +18,14 @@ Garage has two types of upgrades: patch-level upgrades and minor/major version u
|
||||
In all cases, you should read the changelog and ideally test the upgrade on a staging cluster.
|
||||
|
||||
Checking the health of your cluster can be achieved using `garage-manage repair`.
|
||||
:::
|
||||
|
||||
::: {.warning}
|
||||
Until 1.0 is released, patch-level upgrades are considered as minor version upgrades.
|
||||
Minor version upgrades are considered as major version upgrades.
|
||||
i.e. 0.6 to 0.7 is a major version upgrade.
|
||||
:::
|
||||
|
||||
- **Straightforward upgrades (patch-level upgrades).**
|
||||
Upgrades must be performed one by one, i.e. for each node, stop it, upgrade it : change [stateVersion](#opt-system.stateVersion) or [services.garage.package](#opt-services.garage.package), restart it if it was not already by switching.
|
||||
- **Multiple version upgrades.**
|
||||
Garage do not provide any guarantee on moving more than one major-version forward.
|
||||
E.g., if you're on `0.7`, you cannot upgrade to `0.9`.
|
||||
You need to upgrade to `0.8` first.
|
||||
E.g., if you're on `0.9`, you cannot upgrade to `2.0`.
|
||||
You need to upgrade to `1.2` first.
|
||||
As long as [stateVersion](#opt-system.stateVersion) is declared properly,
|
||||
this is enforced automatically. The module will issue a warning to remind the user to upgrade to latest
|
||||
Garage *after* that deploy.
|
||||
@@ -51,7 +42,7 @@ Here are some baseline instructions to handle advanced upgrades in Garage, when
|
||||
- Run `systemctl stop garage` to stop the actual Garage version.
|
||||
- Backup the metadata folder of ALL your nodes, e.g. for a metadata directory (the default one) in `/var/lib/garage/meta`,
|
||||
you can run `pushd /var/lib/garage; tar -acf meta-v0.7.tar.zst meta/; popd`.
|
||||
- Run the offline migration: `nix-shell -p garage_0_8 --run "garage offline-repair --yes"`, this can take some time depending on how many objects are stored in your cluster.
|
||||
- Run the offline migration: `nix-shell -p garage_1 --run "garage offline-repair --yes"`, this can take some time depending on how many objects are stored in your cluster.
|
||||
- Bump Garage version in your NixOS configuration, either by changing [stateVersion](#opt-system.stateVersion) or bumping [services.garage.package](#opt-services.garage.package), this should restart Garage automatically.
|
||||
- Perform `garage-manage repair --all-nodes --yes tables` and `garage-manage repair --all-nodes --yes blocks`.
|
||||
- Wait for a full table sync to run.
|
||||
@@ -67,8 +58,8 @@ This is inspired from how Nextcloud does it.
|
||||
|
||||
While patch-level updates are no problem and can be done directly in the
|
||||
package-expression (and should be backported to supported stable branches after that),
|
||||
major-releases should be added in a new attribute (e.g. Garage `v0.8.0`
|
||||
should be available in `nixpkgs` as `pkgs.garage_0_8_0`).
|
||||
major-releases should be added in a new attribute (e.g. Garage `v3.0.0`
|
||||
should be available in `nixpkgs` as `pkgs.garage_3`).
|
||||
To provide simple upgrade paths it's generally useful to backport those as well to stable
|
||||
branches. As long as the package-default isn't altered, this won't break existing setups.
|
||||
After that, the versioning-warning in the `garage`-module should be
|
||||
@@ -83,8 +74,8 @@ packages, but mark them as insecure in an expression like this (in
|
||||
```nix
|
||||
/* ... */
|
||||
{
|
||||
garage_0_7_3 = generic {
|
||||
version = "0.7.3";
|
||||
garage_1_2_0 = generic {
|
||||
version = "1.2.0";
|
||||
sha256 = "0000000000000000000000000000000000000000000000000000";
|
||||
eol = true;
|
||||
};
|
||||
|
||||
@@ -260,6 +260,21 @@ pkgs.recurseIntoAttrs (rec {
|
||||
[ "$result" = 0 ]
|
||||
'';
|
||||
|
||||
# Generate a neovim wrapper with only a init.lua and no init.vim file
|
||||
nvim_with_only_init_lua = wrapNeovim2 "-only-lua-init-file" {
|
||||
luaRcContent = "-- some text";
|
||||
};
|
||||
|
||||
# check that we do not generate an init.vim file if it is not needed
|
||||
no_init_vim_file = runTest nvim_with_only_init_lua ''
|
||||
${nvim_with_only_init_lua}/bin/nvim -i NONE -e --headless -c 'if len(getscriptinfo({"name":"init.vim"})) == 0 | quit | else | cquit | fi'
|
||||
# This does now work because the lua file is sourced via loadfile() which
|
||||
# does not add the file name to :scriptnames and getscriptinfo().
|
||||
#${nvim_with_only_init_lua}/bin/nvim -i NONE -e --headless -c 'if len(getscriptinfo({"name":"init.lua"})) == 1 | quit | else | cquit | fi'
|
||||
|
||||
assertFileRegex ${nvim_with_only_init_lua}/bin/nvim 'VIMINIT=.*init.lua'
|
||||
'';
|
||||
|
||||
# check that the vim-doc hook correctly generates the tag
|
||||
# we know for a fact packer has a doc folder
|
||||
checkForTags = vimPlugins.packer-nvim.overrideAttrs (oldAttrs: {
|
||||
|
||||
@@ -119,7 +119,7 @@ let
|
||||
''
|
||||
${luaRcContent}
|
||||
''
|
||||
+ lib.optionalString (neovimRcContent' != null) ''
|
||||
+ lib.optionalString (neovimRcContent' != "") ''
|
||||
vim.cmd.source "${writeText "init.vim" neovimRcContent'}"
|
||||
''
|
||||
+ lib.concatStringsSep "\n" luaPluginRC;
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
libXinerama,
|
||||
libXft,
|
||||
writeText,
|
||||
pkg-config,
|
||||
patches ? [ ],
|
||||
conf ? null,
|
||||
# update script dependencies
|
||||
@@ -21,6 +22,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-Ideev6ny+5MUGDbCZmy4H0eExp1k5/GyNS+blwuglyk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.hostPlatform.isStatic pkg-config;
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXinerama
|
||||
@@ -31,6 +34,10 @@ stdenv.mkDerivation rec {
|
||||
sed -i "s@/usr/local@$out@" config.mk
|
||||
'';
|
||||
|
||||
preBuild = lib.optional stdenv.hostPlatform.isStatic ''
|
||||
makeFlagsArray+=(LDFLAGS="$(${stdenv.cc.targetPrefix}pkg-config --static --libs x11 xinerama xft)")
|
||||
'';
|
||||
|
||||
# Allow users set their own list of patches
|
||||
inherit patches;
|
||||
|
||||
|
||||
@@ -4,22 +4,23 @@
|
||||
buildGoModule,
|
||||
buildNpmPackage,
|
||||
nixosTests,
|
||||
testers,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.62";
|
||||
version = "0.107.63";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = "AdGuardHome";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CqXf19DyDFgSnd/dziUq9Gl1d1V20OWE5MTQMi260Zc=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yu+rw1is5Egs1O2mww8MGe48Cl74j7RULm4FB2JhQN4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lY24TtW4vpMRUzOZmeX3Ip9ikUc4z1HG49DpeECExdk=";
|
||||
vendorHash = "sha256-9w2P3kNSf8I6tGq3K0ULoV+qeq3rUzrevDC+mktfsis=";
|
||||
|
||||
dashboard = buildNpmPackage {
|
||||
inherit src;
|
||||
inherit (finalAttrs) src;
|
||||
name = "dashboard";
|
||||
postPatch = ''
|
||||
cd client
|
||||
@@ -33,25 +34,34 @@ buildGoModule rec {
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${dashboard}/build/static build
|
||||
cp -r ${finalAttrs.dashboard}/build/static build
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/AdguardTeam/AdGuardHome/internal/version.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = ./update.sh;
|
||||
schema_version = 29;
|
||||
tests.adguardhome = nixosTests.adguardhome;
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/AdguardTeam/AdGuardHome";
|
||||
description = "Network-wide ads & trackers blocking DNS server";
|
||||
maintainers = with maintainers; [
|
||||
maintainers = with lib.maintainers; [
|
||||
numkem
|
||||
iagoq
|
||||
rhoriguchi
|
||||
baksa
|
||||
];
|
||||
license = licenses.gpl3Only;
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "AdGuardHome";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "alertmanager-ntfy";
|
||||
version = "0-unstable-2025-05-31";
|
||||
version = "0-unstable-2025-06-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexbakker";
|
||||
repo = "alertmanager-ntfy";
|
||||
rev = "76d5f772f70d6915c89da00414c20009b03cc361";
|
||||
hash = "sha256-newJ1fCMEE3gsZncWU899Q6cS6llPNwJlHT7HdLQZf8=";
|
||||
rev = "dc4ef93f7db7f046a775ef3e4a2a462b2afcec6c";
|
||||
hash = "sha256-J+T3Mt+40vhL3DVBKKH86l45AKSlkT7h+TrfhsWwMac=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-e1JAoDNm2+xB/bZcEGr5l4+va8GIg1R8pdj3d+/Y+UY=";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ast-grep";
|
||||
version = "0.38.5";
|
||||
version = "0.38.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-yI3uAdP7x1zYMtRz4ppG4ySH/xmfQlnUlmJKoN/6Cw4=";
|
||||
hash = "sha256-bgJzu7n/Qy0JAJ19VRXCvMtZBM/wZkQKT9AAXvIg5Ms=";
|
||||
};
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Idd/vrnj6XJYahmmHgGWPoMCmH7hkJFeWhV8YEo41rM=";
|
||||
cargoHash = "sha256-TVPI3394elxDzn/8S4hDkVounWI6bo6vpZeYJJzDOr4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.79.123";
|
||||
version = "1.80.113";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-SINatcbj6EEvvd1St1hLOMrWXA06DZtbSiaecA8hQ5s=";
|
||||
hash = "sha256-fWNRiLLFfbVsvLaay878PEIAK9rKCbRCHZ/Uv/dBuCM=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-XWw8Kn245KPpJxhSRz6xmFwijJSU5vMgpDUNRyRMf0M=";
|
||||
hash = "sha256-xs9Bywb5ZWj/OINP1HEVxAMWhs2BTJVyU+dBOI+w6f8=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-8QZVd1//302jqO24Masz6KEogYCkfUxuQ2HpEeuaujY=";
|
||||
hash = "sha256-SWalaT/+TvKvNBaVX9CQbCDMvPUgvJLG5rYhIHtXVkM=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-IB+08osAXOenRDCSvebRxZlNYsFRoh3g0JwGfXUy1kU=";
|
||||
hash = "sha256-YpEAOZZegpAH9UbNCsEAJeLjjAPJYhJcEF5wd/3ewGE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
flutter332.buildFlutterApplication rec {
|
||||
pname = "chatmcp";
|
||||
version = "0.0.66";
|
||||
version = "0.0.69";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daodao97";
|
||||
repo = "chatmcp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-X4cndztMEncAwosSg2RaK3trvupwumcPpMb94D6JEcE=";
|
||||
hash = "sha256-TA3ncOatmkX7GcaqxJ8yhdpnou2e9cQNweO+AR98Gto=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
@@ -4,21 +4,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "_fe_analyzer_shared",
|
||||
"sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f",
|
||||
"sha256": "c81659312e021e3b780a502206130ea106487b34793bce61e26dc0f9b84807af",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "82.0.0"
|
||||
"version": "83.0.0"
|
||||
},
|
||||
"analyzer": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "analyzer",
|
||||
"sha256": "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0",
|
||||
"sha256": "9c35a79bf2a150b3ea0d40010fbbb45b5ebea143d47096e0f82fd922a324b49b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.4.5"
|
||||
"version": "7.4.6"
|
||||
},
|
||||
"archive": {
|
||||
"dependency": "transitive",
|
||||
@@ -74,11 +74,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "build",
|
||||
"sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0",
|
||||
"sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.2"
|
||||
"version": "2.5.4"
|
||||
},
|
||||
"build_config": {
|
||||
"dependency": "transitive",
|
||||
@@ -104,31 +104,31 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "build_resolvers",
|
||||
"sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0",
|
||||
"sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.4"
|
||||
"version": "2.5.4"
|
||||
},
|
||||
"build_runner": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "build_runner",
|
||||
"sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99",
|
||||
"sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.15"
|
||||
"version": "2.5.4"
|
||||
},
|
||||
"build_runner_core": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "build_runner_core",
|
||||
"sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021",
|
||||
"sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.0.0"
|
||||
"version": "9.1.2"
|
||||
},
|
||||
"built_collection": {
|
||||
"dependency": "transitive",
|
||||
@@ -320,6 +320,16 @@
|
||||
"source": "hosted",
|
||||
"version": "3.1.0"
|
||||
},
|
||||
"dbus": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dbus",
|
||||
"sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.11"
|
||||
},
|
||||
"dev_build": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -330,6 +340,26 @@
|
||||
"source": "hosted",
|
||||
"version": "1.1.2+11"
|
||||
},
|
||||
"dio": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "dio",
|
||||
"sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.8.0+1"
|
||||
},
|
||||
"dio_web_adapter": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dio_web_adapter",
|
||||
"sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"event_bus": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -646,11 +676,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_svg",
|
||||
"sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1",
|
||||
"sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.0"
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"flutter_switch": {
|
||||
"dependency": "direct main",
|
||||
@@ -744,6 +774,16 @@
|
||||
"source": "hosted",
|
||||
"version": "1.4.0"
|
||||
},
|
||||
"http_methods": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "http_methods",
|
||||
"sha256": "6bccce8f1ec7b5d701e7921dca35e202d425b57e317ba1a37f2638590e29e566",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.1"
|
||||
},
|
||||
"http_multi_server": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -944,6 +984,16 @@
|
||||
"source": "hosted",
|
||||
"version": "2.0.0"
|
||||
},
|
||||
"mobile_scanner": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "mobile_scanner",
|
||||
"sha256": "54005bdea7052d792d35b4fef0f84ec5ddc3a844b250ecd48dc192fb9b4ebc95",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.0.1"
|
||||
},
|
||||
"mockito": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
@@ -964,6 +1014,36 @@
|
||||
"source": "hosted",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"network_info_plus": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "network_info_plus",
|
||||
"sha256": "5bd4b86e28fed5ed4e6ac7764133c031dfb7d3f46aa2a81b46f55038aa78ecc0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.0.3"
|
||||
},
|
||||
"network_info_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "network_info_plus_platform_interface",
|
||||
"sha256": "7e7496a8a9d8136859b8881affc613c4a21304afeb6c324bcefc4bd0aff6b94b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.2"
|
||||
},
|
||||
"nm": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "nm",
|
||||
"sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.5.0"
|
||||
},
|
||||
"node_preamble": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1184,6 +1264,26 @@
|
||||
"source": "hosted",
|
||||
"version": "1.5.0"
|
||||
},
|
||||
"qr": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "qr",
|
||||
"sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.2"
|
||||
},
|
||||
"qr_flutter": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "qr_flutter",
|
||||
"sha256": "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.1.0"
|
||||
},
|
||||
"rxdart": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1355,7 +1455,7 @@
|
||||
"version": "2.4.1"
|
||||
},
|
||||
"shelf": {
|
||||
"dependency": "transitive",
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "shelf",
|
||||
"sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
|
||||
@@ -1364,6 +1464,16 @@
|
||||
"source": "hosted",
|
||||
"version": "1.4.2"
|
||||
},
|
||||
"shelf_cors_headers": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "shelf_cors_headers",
|
||||
"sha256": "a127c80f99bbef3474293db67a7608e3a0f1f0fcdb171dad77fa9bd2cd123ae4",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.1.5"
|
||||
},
|
||||
"shelf_packages_handler": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1374,6 +1484,16 @@
|
||||
"source": "hosted",
|
||||
"version": "3.0.2"
|
||||
},
|
||||
"shelf_router": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "shelf_router",
|
||||
"sha256": "f5e5d492440a7fb165fe1e2e1a623f31f734d3370900070b2b1e0d0428d59864",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.4"
|
||||
},
|
||||
"shelf_static": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "faraday";
|
||||
version = "0.2.11-alpha";
|
||||
version = "0.2.14-alpha";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightninglabs";
|
||||
repo = "faraday";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KiGj24sBeClmzW60lRrvXwgXf3My7jhHTY+VhIMMp0k=";
|
||||
hash = "sha256-7sCNHrtDDpxpcxmHTVq8reHjNMXKyxPbYM6H6Eqo+OY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ku/4VE1Gj62vuJLh9J6vKlxpyI7S0RsMDozV7U5YDe4=";
|
||||
vendorHash = "sha256-xlyZEcFphXAV+7iHmJBZiQWKKBDm1cpE2Eax2fWYd0Y=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/frcli"
|
||||
|
||||
@@ -20,19 +20,19 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "incus-ui-canonical";
|
||||
version = "0.15.4";
|
||||
version = "0.17.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zabbly";
|
||||
repo = "incus-ui-canonical";
|
||||
# only use tags prefixed by incus- they are the tested fork versions
|
||||
tag = "incus-${version}";
|
||||
hash = "sha256-kY7FMZbwP5D5EJfYH1/ptgKdCceduk05fjVdwtOgUNk=";
|
||||
hash = "sha256-dAYcput4qGLQT6G10O52UUrQ7HN9kXQFgZlm5QN4xI0=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-nZyk/ZrTAOyL+A3oMUHY52PIffVZxMG2tvh4FM/A+w0=";
|
||||
hash = "sha256-or/lPf6pamFVJnSWU9CLTss9s6amMNd9A7H8CAFJ6RU=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@@ -48,7 +48,7 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ipxe";
|
||||
version = "1.21.1-unstable-2025-06-17";
|
||||
version = "1.21.1-unstable-2025-06-26";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mtools
|
||||
@@ -65,8 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipxe";
|
||||
repo = "ipxe";
|
||||
rev = "60e167c00b138fdb162e7b2192e9cbb196ed3cbd";
|
||||
hash = "sha256-RaYu3gvqAxA+vEJdLOLMbCRtrt+PyrRd/Wqyj2hXYZU=";
|
||||
rev = "4262328c13a3ec085eac7c6c58fbed27d2466a0d";
|
||||
hash = "sha256-FvYGM+NApTloA7vV1KPpsAzIT7oZ2GK6rKw+3mosvTA=";
|
||||
};
|
||||
|
||||
# Calling syslinux on a FAT image isn't going to work on Aarch64.
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libwacom";
|
||||
version = "2.15.0";
|
||||
version = "2.16.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "linuxwacom";
|
||||
repo = "libwacom";
|
||||
rev = "libwacom-${finalAttrs.version}";
|
||||
hash = "sha256-fc7ymkyIJ5BvrPxJg7Vw1h1mBy+icr+5kVDecODxRLQ=";
|
||||
hash = "sha256-YP6z+2HyIRmIAJIdJMbVTQA0rf3EXBZvlCdM4jrmHXM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -22,13 +22,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "linux-firmware";
|
||||
version = "20250624"; # not a real tag, but the current stable tag breaks some AMD GPUs entirely
|
||||
version = "20250627";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "kernel-firmware";
|
||||
repo = "linux-firmware";
|
||||
rev = "b05fabcd6f2a16d50b5f86c389dde7a33f00bb81";
|
||||
hash = "sha256-AvSsyfKP57Uhb3qMrf6PpNHKbXhD9IvFT1kcz5J7khM=";
|
||||
tag = version;
|
||||
hash = "sha256-mNjCl+HtvvFxyLjlBFsyfyu2TAf6D/9lbRiouKC/vVY=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mbake";
|
||||
version = "1.2.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EbodShojaei";
|
||||
repo = "bake";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RzM3HC3lYq93mngpqNCohcPMISWQ4+Lwa1V88S0O0To=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
python3Packages.hatchling
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
rich
|
||||
typer
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
python3Packages.pytestCheckHook
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
pythonImportsCheck = [ "bake" ];
|
||||
|
||||
meta = {
|
||||
description = "Makefile formatter and linter";
|
||||
homepage = "https://github.com/EbodShojaei/bake";
|
||||
changelog = "https://github.com/EbodShojaei/bake/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "mbake";
|
||||
maintainers = [ lib.maintainers.amadejkastelic ];
|
||||
};
|
||||
}
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "md-tui";
|
||||
version = "0.8.7";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "henriklovhaug";
|
||||
repo = "md-tui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-O+EIhh83nIYE2GWaThkDLIVsYsg62g/6ksS+1fKm4AY=";
|
||||
hash = "sha256-K+s4p0d4b3c8Xqw8RGaEZb62zsbKo84J0yXM4j+n95I=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-h0ikwdGmyBsCJvILJTlDd9x0DXYwblfBcK2wuWHmjYA=";
|
||||
cargoHash = "sha256-AgWOjsa6n4kaXjQSCqW4lYqhhMqvdemEFlCJp99KiUg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "minijinja";
|
||||
version = "2.10.2";
|
||||
version = "2.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitsuhiko";
|
||||
repo = "minijinja";
|
||||
rev = version;
|
||||
hash = "sha256-JPR9FRMVQH7DdYyFfh75g1BYDg8R9xCnigirGe8Xx1o=";
|
||||
hash = "sha256-0qRQuYhta4RUNy8Ac+SSCad172vVshddDS6mizSqO2A=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-EInDnhUD29nZUOr2nBT4SuweMVad+RsS5eS767CvjRk=";
|
||||
cargoHash = "sha256-zE0n+vkkJ1R8eT/Tetqx6GSITB6xM/9SgrEB/9pAkqw=";
|
||||
|
||||
# The tests relies on the presence of network connection
|
||||
doCheck = false;
|
||||
|
||||
@@ -25,14 +25,14 @@ let
|
||||
# From https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/03cbf9c6cd26c75afef8a2dd68e0306aace80401/Makefile#L54
|
||||
cliVersionPackage = "github.com/NVIDIA/nvidia-container-toolkit/internal/info";
|
||||
in
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nvidia-container-toolkit";
|
||||
version = "1.17.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "nvidia-container-toolkit";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-B17cPxdrQ8qMNgFh4XcDwwKryukMrn0GV2LNPHM7kBo=";
|
||||
|
||||
};
|
||||
@@ -76,13 +76,10 @@ buildGoModule rec {
|
||||
ldflags = [
|
||||
"-extldflags=-Wl,-z,lazy" # May be redunandant, cf. `man ld`: "Lazy binding is the default".
|
||||
"-s" # "disable symbol table"
|
||||
"-w" # "disable DWARF generation"
|
||||
|
||||
# "-X name=value"
|
||||
"-X"
|
||||
"${cliVersionPackage}.version=${version}"
|
||||
"-X"
|
||||
"github.com/NVIDIA/nvidia-container-toolkit/internal/info.gitCommit=${src.rev}"
|
||||
"-X ${cliVersionPackage}.version=${finalAttrs.version}"
|
||||
"-X ${cliVersionPackage}.gitCommit=${finalAttrs.src.rev}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -98,10 +95,7 @@ buildGoModule rec {
|
||||
"TestDuplicateHook"
|
||||
];
|
||||
in
|
||||
[
|
||||
"-skip"
|
||||
"${builtins.concatStringsSep "|" skippedTests}"
|
||||
];
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
postInstall =
|
||||
''
|
||||
@@ -122,14 +116,14 @@ buildGoModule rec {
|
||||
--subst-var-by glibcbin ${lib.getBin glibc}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://gitlab.com/nvidia/container-toolkit/container-toolkit";
|
||||
description = "NVIDIA Container Toolkit";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
cpcloud
|
||||
christoph-heiss
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
appimageTools,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "polypane";
|
||||
version = "24.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
sha256 = "sha256-fFZP8RfAjlgZB/57sbEQ3pzQCNX+9Nd2jdcRUD8TJeo=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit pname src version;
|
||||
};
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname src version;
|
||||
|
||||
extraPkgs = pkgs: [ pkgs.bash ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
|
||||
install -m 444 -D ${appimageContents}/${pname}.png \
|
||||
$out/share/icons/hicolor/512x512/apps/${pname}.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Browser with unified devtools targeting responsability and accessibility";
|
||||
longDescription = ''
|
||||
The stand-alone browser for ambitious developers that want to build responsive,
|
||||
accessible and performant websites in a fraction of the time it takes with other browsers.
|
||||
'';
|
||||
homepage = "https://polypane.app/";
|
||||
maintainers = with maintainers; [ zoedsoupe ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
changelog = "https://polypane.app/docs/changelog/";
|
||||
license = licenses.unfree;
|
||||
};
|
||||
}
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "prometheus";
|
||||
version = "3.4.1";
|
||||
version = "3.4.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -45,14 +45,14 @@ buildGoModule (finalAttrs: {
|
||||
owner = "prometheus";
|
||||
repo = "prometheus";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qF4yXBNAdcndwbXEmDPIhG16agvhqKUVB9ajOsvpgrg=";
|
||||
hash = "sha256-/JeT8+I/jNE7O2YT9qfu7RF3xculPyR3rRrFQIG4YV4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-edR9vvSNexRR8EGEiSCIIYl3ndGckS8XuIWojPrq60U=";
|
||||
|
||||
webUiStatic = fetchurl {
|
||||
url = "https://github.com/prometheus/prometheus/releases/download/v${finalAttrs.version}/prometheus-web-ui-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-GBKjrmlQi+DHtbKICc3pO8IMVdu3IUXh/DTwvd/ArWE=";
|
||||
hash = "sha256-3aXP79aeA/qe99sVsJn0nNRggrzFWTmaRO3dBzOR6UU=";
|
||||
};
|
||||
|
||||
excludedPackages = [
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qownnotes";
|
||||
appname = "QOwnNotes";
|
||||
version = "25.6.4";
|
||||
version = "25.6.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-CL/jrWdyBpE27MuyjMaSO7ofzrCihXie15xbuWVjS28=";
|
||||
hash = "sha256-P53v7Zcx6TtCRyFUTea9tpYTFx6DpXL5R60uH8qcbXk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qview";
|
||||
version = "6.1";
|
||||
version = "7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jurplel";
|
||||
repo = "qView";
|
||||
rev = version;
|
||||
hash = "sha256-h1K1Smfy875NoHtgUrOvZZp0IgcQdbyuQhXU9ndM4bA=";
|
||||
hash = "sha256-kFptDhmFu9LX99P6pCfxRbu4iVhWl4br+n6LO+yrGsw=";
|
||||
};
|
||||
|
||||
qmakeFlags = lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ];
|
||||
|
||||
@@ -16,19 +16,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ruff";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "ruff";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-g3fodKPDV4UaqnRalG5tEu4acvyhuoDXUevSQeHunBY=";
|
||||
hash = "sha256-iD9avLPPT8V6ZU1qoWEqPLp8jDk/EhcaTk7FtKLRsyM=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--package=ruff" ];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-GNBQ522FX7Yly963/msRfiYKybpk+XDmn1rujfbO22A=";
|
||||
cargoHash = "sha256-GICd8yQlh3gcxLh1Rfc3xB6rZ8ZsbCAk5C577l5+ogk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -92,8 +92,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "cross-platform abstraction for GPU and display virtualization";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
platforms = platforms.darwin ++ platforms.linux;
|
||||
# error[E0432]: unresolved import `self::consts`
|
||||
badPlatforms = [ "loongarch64-linux" ];
|
||||
platforms = [
|
||||
# src/generated/virgl_debug_callback_bindings.rs
|
||||
"aarch64-darwin"
|
||||
"aarch64-linux"
|
||||
"armv5tel-linux"
|
||||
"armv6l-linux"
|
||||
"armv7a-linux"
|
||||
"armv7l-linux"
|
||||
"x86_64-darwin"
|
||||
"x86_64-linux"
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-IpRCgPxYy1El4EEvVEfzAlbxP/osQUb7pCP3/BhkecU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/breakpad.py --replace-fail "from __future__ import print_function" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
libwebsockets
|
||||
autoreconfHook
|
||||
@@ -48,7 +52,6 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
pythonPath = with python3.pkgs; [
|
||||
future
|
||||
pysearpc
|
||||
];
|
||||
|
||||
@@ -56,12 +59,12 @@ stdenv.mkDerivation rec {
|
||||
wrapPythonPrograms
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/haiwen/seafile";
|
||||
description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
schmittlauch
|
||||
];
|
||||
};
|
||||
|
||||
@@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
django
|
||||
future
|
||||
django-compressor
|
||||
django-statici18n
|
||||
django-webpack-loader
|
||||
@@ -57,6 +56,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace seahub/settings.py --replace-fail "SEAFILE_VERSION = '6.3.3'" "SEAFILE_VERSION = '${version}'"
|
||||
substituteInPlace thirdpart/constance/management/commands/constance.py --replace-fail \
|
||||
"from __future__ import unicode_literals" ""
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
@@ -74,14 +75,14 @@ python3.pkgs.buildPythonApplication rec {
|
||||
inherit seafile-server;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Web end of seafile server";
|
||||
homepage = "https://github.com/haiwen/seahub";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
schmittlauch
|
||||
melvyn2
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -18,17 +18,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "uv";
|
||||
version = "0.7.15";
|
||||
version = "0.7.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-onBeTfzT9XhhiHAWcYMYMV8GRKudfPHRpuxg+2AVJls=";
|
||||
hash = "sha256-E9tFjJwV+zDOxsFdDeX6D8DqD0zFNW8kryeY9FmA63U=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-03iQp/0HSqnXJU5PAdQNiTa+0UiKQKx5FiqvoaUeF+U=";
|
||||
cargoHash = "sha256-Eg4YVqKxjYEPS67qnc0y1Tuy6HAFEy6rCjr7/ZXF3yE=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
let
|
||||
pname = "ansible";
|
||||
version = "11.5.0";
|
||||
version = "11.7.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@@ -34,7 +34,7 @@ buildPythonPackage {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-GKP8cxIKSa3pqaZ+uPnU9QCdIQbDT/65ZjrZKLdu1Zs=";
|
||||
hash = "sha256-+d83xx1Af2W8ucXAbJkY4pfZ6nS1za9ZJsTJqp5E218=";
|
||||
};
|
||||
|
||||
# we make ansible-core depend on ansible, not the other way around,
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitarray";
|
||||
version = "3.4.1";
|
||||
version = "3.4.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5fqIcyu8+1Q37lVOGPhCqPbIa+c2VrBYDuFG/Tcxdsk=";
|
||||
hash = "sha256-3d+yvwhrZq7BwBENxGZCtxYfWHpkQc/nTanjI5dfYvA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,29 +1,29 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitLab,
|
||||
setuptools,
|
||||
django,
|
||||
psycopg,
|
||||
python-dateutil,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-postgres-partition";
|
||||
version = "0.1.1";
|
||||
version = "0.1.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "django_postgres_partition";
|
||||
hash = "sha256-KUrgnfUXWyRerW4dqtVZO9bu5jHYnHcVOIg97w695RU=";
|
||||
src = fetchFromGitLab {
|
||||
owner = "burke-software";
|
||||
repo = "django-postgres-partition";
|
||||
tag = version;
|
||||
hash = "sha256-Wk+m75gO9iClN9/vXGBl27VcmqyE6c1xpQX+X1qcKuU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"django"
|
||||
];
|
||||
pythonRelaxDeps = [ "django" ];
|
||||
|
||||
dependencies = [
|
||||
django
|
||||
@@ -31,13 +31,17 @@ buildPythonPackage rec {
|
||||
python-dateutil
|
||||
];
|
||||
|
||||
doCheck = false; # pypi version doesn't ship with tests
|
||||
# tests don't work yet, see https://gitlab.com/burke-software/django-postgres-partition/-/issues/4
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "psql_partition" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Partition support for django, based on django-postgres-extra";
|
||||
homepage = "https://gitlab.com/burke-software/django-postgres-partition";
|
||||
changelog = "https://gitlab.com/burke-software/django-postgres-partition/-/releases/${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ defelo ];
|
||||
};
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
importlib-metadata,
|
||||
|
||||
# tests
|
||||
array-api-compat,
|
||||
dill,
|
||||
flax,
|
||||
jax,
|
||||
@@ -28,11 +29,12 @@
|
||||
pygame,
|
||||
pytestCheckHook,
|
||||
scipy,
|
||||
torch,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gymnasium";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -40,7 +42,7 @@ buildPythonPackage rec {
|
||||
owner = "Farama-Foundation";
|
||||
repo = "gymnasium";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5uE6ANOxVCeV5GMDGG+0j5JY2t++jw+mZFFHGl+sTfw=";
|
||||
hash = "sha256-fQsz1Qpef9js+iqkqbfxrTQgcZT+JKjwpEiWewju2Dc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -55,6 +57,7 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "gymnasium" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
array-api-compat
|
||||
dill
|
||||
flax
|
||||
jax
|
||||
@@ -67,6 +70,7 @@ buildPythonPackage rec {
|
||||
pygame
|
||||
pytestCheckHook
|
||||
scipy
|
||||
torch
|
||||
];
|
||||
|
||||
# if `doCheck = true` on Darwin, `jaxlib` is evaluated, which is both
|
||||
@@ -94,15 +98,6 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Fails since jax 0.6.0
|
||||
# Fixed on master https://github.com/Farama-Foundation/Gymnasium/commit/94019feee1a0f945b9569cddf62780f4e1a224a5
|
||||
# TODO: un-skip at the next release
|
||||
"test_all_env_api"
|
||||
"test_env_determinism_rollout"
|
||||
"test_jax_to_numpy_wrapper"
|
||||
"test_pickle_env"
|
||||
"test_roundtripping"
|
||||
|
||||
# Succeeds for most environments but `test_render_modes[Reacher-v4]` fails because it requires
|
||||
# OpenGL access which is not possible inside the sandbox.
|
||||
"test_render_mode"
|
||||
|
||||
@@ -38,14 +38,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mcp";
|
||||
version = "1.9.3";
|
||||
version = "1.9.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "modelcontextprotocol";
|
||||
repo = "python-sdk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3r7NG2AnxxKgAAd3n+tjjPTz4WJRmc7isfh3p21hUa0=";
|
||||
hash = "sha256-VXbu/wHbXGS+cISJVUgCVEpTmZc0VfckNRoMj3GDi/A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ntc-templates";
|
||||
version = "7.8.0";
|
||||
version = "7.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "networktocode";
|
||||
repo = "ntc-templates";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-v9+d9nZiYneG3vULtQZsa/gD6FCyBrrbGxUJsv1sMYA=";
|
||||
hash = "sha256-ujWPcVqwdtMlCkTZP/PJ3oMR60F6IHrZXXhcNT7JmmM=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
+3
-3
@@ -10,8 +10,8 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.43.0";
|
||||
pname = "pycasbin";
|
||||
version = "1.45.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "casbin";
|
||||
repo = "pycasbin";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vRT8Z0XHDPOnAxy67j88vBX6W20mRWY7O/IrGLM/vuQ=";
|
||||
hash = "sha256-pErgGW9zSux2ki7WItHjkMncC2kiuxcRkcGmCtFUtCo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -25,12 +25,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyinstaller";
|
||||
version = "6.14.0";
|
||||
version = "6.14.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zFXNwhSRci10Ez41qzY6iGebN+4tdvnYCty8Cuhi1jA=";
|
||||
hash = "sha256-NdXAamaOIfASIXjb8g5A/SEBLcj2FwBCr2BQxOez7co=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "pynvim-pp";
|
||||
version = "0-unstable-2025-02-08";
|
||||
version = "0-unstable-2025-05-29";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "pynvim_pp";
|
||||
rev = "781f6beda5f5966857792af040d5e2ecff5467e4";
|
||||
hash = "sha256-ggZqlaCP9WNECO+eRwi968EvQb8zuHCic6+9Zngsd24=";
|
||||
rev = "6beffc4f479360489481705dc23a9ebd54f0c17d";
|
||||
hash = "sha256-5QDqH+oOx7mANxTseszr7+kXCdu+vUWqwTgXxE2GhnA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytapo";
|
||||
version = "3.3.44";
|
||||
version = "3.3.46";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2/Wzc54a7LpphmH5qDp0M9SnmuCVGXCmhkoy4YSAZc0=";
|
||||
hash = "sha256-AK8OFQ/cJJ9/KrpAIUaVBCY5lh3lENLkC5/Dhxx1vU0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "schema-salad";
|
||||
version = "8.8.20250205075315";
|
||||
version = "8.9.20250408123006";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "common-workflow-language";
|
||||
repo = "schema_salad";
|
||||
tag = version;
|
||||
hash = "sha256-Lev5daC3RCuXN1GJjOwplTx9PB3HTNZdNNzusn2dBaI=";
|
||||
hash = "sha256-sPPHz43zvqdQ3eruRlVxLLP1ZU/UoVdtDhtQRAo8vNg=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "mistune" ];
|
||||
@@ -85,7 +85,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Semantic Annotations for Linked Avro Data";
|
||||
homepage = "https://github.com/common-workflow-language/schema_salad";
|
||||
changelog = "https://github.com/common-workflow-language/schema_salad/releases/tag/${version}";
|
||||
changelog = "https://github.com/common-workflow-language/schema_salad/releases/tag/${src.tag}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
|
||||
@@ -32,6 +32,13 @@ buildPythonPackage rec {
|
||||
hash = "sha256-VnoQ8cKqPcZPpR9c3M6xJDdG7gnO9fxIa4v2kxd9Nzg=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
# Environment version v0 for `CliffWalking` is deprecated
|
||||
''
|
||||
substituteInPlace "tests/test_vec_normalize.py" \
|
||||
--replace-fail "CliffWalking-v0" "CliffWalking-v1"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitLab,
|
||||
setuptools,
|
||||
ply,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "webidl";
|
||||
version = "0-unstable-2025-06-15";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "verso-browser";
|
||||
repo = "verso";
|
||||
rev = "ace264e0e73da37bfb14818d92f0e54946ce9871";
|
||||
hash = "sha256-gjg7qs2ik1cJcE6OTGN4KdljqJDGokCo4JdR+KopMJw=";
|
||||
};
|
||||
|
||||
# python library is vendored inside another repo
|
||||
# and unfortunately not exposed in another repo
|
||||
# or Pypi.
|
||||
sourceRoot = "${src.name}/third_party/WebIDL";
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ ply ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"WebIDL"
|
||||
];
|
||||
|
||||
# no pytests exist
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "WebIDL parser written in Python";
|
||||
homepage = "https://gitlab.com/verso-browser/verso";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ ethancedwards8 ];
|
||||
};
|
||||
|
||||
}
|
||||
@@ -441,9 +441,6 @@ rec {
|
||||
# do not know how to test without a valid build.lua
|
||||
"ppmcheckpdf"
|
||||
|
||||
# *.inc files in source container rather than run
|
||||
"texaccents"
|
||||
|
||||
# 'Error initialising QuantumRenderer: no suitable pipeline found'
|
||||
"tlcockpit"
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin "epspdftk"; # wish shebang is a script, not a binary!
|
||||
|
||||
@@ -102,6 +102,7 @@ let
|
||||
homepage = "https://garagehq.deuxfleurs.fr";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
adamcstephens
|
||||
nickcao
|
||||
_0x4A6F
|
||||
teutat3s
|
||||
@@ -113,24 +114,12 @@ let
|
||||
};
|
||||
in
|
||||
rec {
|
||||
# Until Garage hits 1.0, 0.7.3 is equivalent to 7.3.0 for now, therefore
|
||||
# we have to keep all the numbers in the version to handle major/minor/patch level.
|
||||
# for <1.0.
|
||||
# Please add new versions to nixos/tests/garage/default.nix as well.
|
||||
|
||||
garage_0_8_7 = generic {
|
||||
version = "0.8.7";
|
||||
hash = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc=";
|
||||
cargoHash = "sha256-NmeAkm35Su4o5JEn75pZmxhVHh+VMwKwULKY0eCVlYo=";
|
||||
cargoPatches = [ ./update-time-0.8.patch ];
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
|
||||
garage_0_9_4 = generic {
|
||||
version = "0.9.4";
|
||||
hash = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk=";
|
||||
cargoHash = "sha256-ittesFz1GUGipQecsmMA+GEaVoUY+C9DtEvsO0HFNCc=";
|
||||
cargoPatches = [ ./update-time.patch ];
|
||||
eol = true;
|
||||
};
|
||||
|
||||
garage_1_2_0 = generic {
|
||||
@@ -145,14 +134,11 @@ rec {
|
||||
cargoHash = "sha256-6VM/EesrUIaQOeDGqzb0kOqMz4hW7zBJUnaRQ9C3cqc=";
|
||||
};
|
||||
|
||||
garage_0_8 = garage_0_8_7;
|
||||
|
||||
garage_0_9 = garage_0_9_4;
|
||||
|
||||
garage_1_x = garage_1_2_0;
|
||||
garage_1 = garage_1_x;
|
||||
garage_1 = garage_1_2_0;
|
||||
|
||||
garage_2 = garage_2_0_0;
|
||||
|
||||
garage = garage_1_x;
|
||||
garage = garage_1;
|
||||
}
|
||||
|
||||
@@ -135,19 +135,12 @@ let
|
||||
binPackages = lib.getAttrs (corePackages ++ coreBigPackages) tlpdb;
|
||||
|
||||
common = {
|
||||
# FIXME revert to official tarballs for TeX-Live 2025
|
||||
#src = fetchurl {
|
||||
# urls = [
|
||||
# "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0312-source.tar.xz"
|
||||
# "ftp://tug.ctan.org/pub/tex/historic/systems/texlive/${year}/texlive-${year}0312-source.tar.xz"
|
||||
# ];
|
||||
# hash = "sha256-e22HzwFmFnD6xFyTEmvtl7mEMTntUQ+XXQR+qTi2/pY=";
|
||||
#};
|
||||
src = fetchFromGitHub {
|
||||
owner = "TeX-Live";
|
||||
repo = "texlive-source";
|
||||
rev = "refs/tags/svn70897";
|
||||
hash = "sha256-ZCoZAO0qGWPWW72BJOi5P7/A/qEm+SY3PQyLbx+e3pY=";
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0308-source.tar.xz"
|
||||
"ftp://tug.ctan.org/pub/tex/historic/systems/texlive/${year}/texlive-${year}0308-source.tar.xz"
|
||||
];
|
||||
hash = "sha256-//2xo9FDwXekOYoiKaQNaojxgJjl9tz9V2SMnyQXSQ8=";
|
||||
};
|
||||
|
||||
prePatch =
|
||||
@@ -251,16 +244,6 @@ rec {
|
||||
|
||||
inherit (common) binToOutput src prePatch;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# do not create extractbb -> xdvipdfmx link
|
||||
name = "extractbb-separate-package.patch";
|
||||
url = "https://github.com/TeX-Live/texlive-source/commit/e48aafd2889281e5e9082cf2e4815a906b9a68ec.patch";
|
||||
hash = "sha256-Rh0PJeUgKUfmgZ+WXnTteM5A0vXPEajKzZBU7AoE7Vs";
|
||||
excludes = [ "texk/dvipdfm-x/ChangeLog" ];
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
@@ -406,16 +389,6 @@ rec {
|
||||
url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=1009196;filename=lua_fixed_hash.patch;msg=45";
|
||||
sha256 = "sha256-FTu1eRd3AUU7IRs2/7e7uwHuvZsrzTBPypbcEZkU7y4=";
|
||||
})
|
||||
# Fixes texluajitc crashes on aarch64, backport of the upstream fix
|
||||
# https://github.com/LuaJIT/LuaJIT/commit/e9af1abec542e6f9851ff2368e7f196b6382a44c
|
||||
# to the version vendored by texlive (2.1.0-beta3)
|
||||
(fetchpatch {
|
||||
name = "luajit-fix-aarch64-linux.patch";
|
||||
url = "https://raw.githubusercontent.com/void-linux/void-packages/30253fbfc22cd93d97ec53df323778a3aab82754/srcpkgs/LuaJIT/patches/e9af1abec542e6f9851ff2368e7f196b6382a44c.patch";
|
||||
hash = "sha256-ysSZmfpfCFMukfHmIqwofAZux1e2kEq/37lfqp7HoWo=";
|
||||
stripLen = 1;
|
||||
extraPrefix = "libs/luajit/LuaJIT-src/";
|
||||
})
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
@@ -523,11 +496,7 @@ rec {
|
||||
"tie"
|
||||
"web"
|
||||
];
|
||||
postInstall =
|
||||
common.moveBins
|
||||
+ ''
|
||||
rm "${placeholder "ptex"}"/bin/{pbibtex,pdvitype,ppltotf,ptftopl}
|
||||
'';
|
||||
postInstall = common.moveBins;
|
||||
};
|
||||
|
||||
chktex = stdenv.mkDerivation {
|
||||
@@ -555,12 +524,12 @@ rec {
|
||||
# for details see https://wiki.contextgarden.net/Building_LuaMetaTeX_for_TeX_Live
|
||||
context = stdenv.mkDerivation rec {
|
||||
pname = "luametatex";
|
||||
version = "2.11.02";
|
||||
version = "2.11.07";
|
||||
|
||||
src = fetchurl {
|
||||
name = "luametatex-${version}.tar.xz";
|
||||
url = "https://tug.org/svn/texlive/trunk/Master/source/luametatex-${version}.tar.xz?pathrev=70384&view=co";
|
||||
hash = "sha256-o7esoBBTTYEstkd7l34BWxew3fIRdVcFiGxrT1/KP1o=";
|
||||
url = "https://tug.org/svn/texlive/trunk/Master/source/luametatex-${version}.tar.xz?pathrev=75382&view=co";
|
||||
hash = "sha256-ou04WcKnyEJTkUV4HhlGwDTscdEJTflGv0cpN69qkWE=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@@ -704,7 +673,7 @@ rec {
|
||||
# so that top level updates do not break texlive
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
|
||||
hash = "sha256-egUACsP2vwYx2uvSCZ8H/jLU9f17Siz8gFWwCNSXsIQ=";
|
||||
hash = "sha256-+T0n2SX9C8Mz0Fb+vkny1x+TWETC+NN67MjfD+6Twys=";
|
||||
};
|
||||
|
||||
texContainer = texlive.pkgs.asymptote.tex;
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
makeFontsConf,
|
||||
useFixedHashes ? true,
|
||||
recurseIntoAttrs,
|
||||
nixfmt-rfc-style,
|
||||
}:
|
||||
let
|
||||
stdenv = gcc12Stdenv;
|
||||
@@ -99,13 +100,13 @@ let
|
||||
|
||||
version = {
|
||||
# day of the snapshot being taken
|
||||
year = "2024";
|
||||
month = "03";
|
||||
day = "09";
|
||||
year = "2025";
|
||||
month = "06";
|
||||
day = "03";
|
||||
# TeX Live version
|
||||
texliveYear = 2024;
|
||||
texliveYear = 2025;
|
||||
# final (historic) release or snapshot
|
||||
final = true;
|
||||
final = false;
|
||||
};
|
||||
|
||||
# The tarballs on CTAN mirrors for the current release are constantly
|
||||
@@ -140,7 +141,7 @@ let
|
||||
# use last mirror for daily snapshots as texlive.tlpdb.xz changes every day
|
||||
# TODO make this less hacky
|
||||
(if version.final then mirrors else [ (lib.last mirrors) ]);
|
||||
hash = "sha256-YLn4+Ik9WR0iDS9Pjdo/aGyqFl7+eKoMzI3sgNSHmao=";
|
||||
hash = "sha256-K8BoBuMRv5Lp5+trLF5PZOTjzW86i0ZL/jKqP6n7LwA=";
|
||||
};
|
||||
|
||||
tlpdbNix =
|
||||
@@ -150,7 +151,7 @@ let
|
||||
tl2nix = ./tl2nix.sed;
|
||||
}
|
||||
''
|
||||
xzcat "$tlpdbxz" | sed -rn -f "$tl2nix" | uniq > "$out"
|
||||
xzcat "$tlpdbxz" | sed -rn -f "$tl2nix" | uniq | ${lib.getExe nixfmt-rfc-style} > "$out"
|
||||
'';
|
||||
|
||||
# map: name -> fixed-output hash
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -24,9 +24,7 @@
|
||||
ruby,
|
||||
zip,
|
||||
}:
|
||||
|
||||
oldTlpdb:
|
||||
|
||||
let
|
||||
tlpdbVersion = tlpdb."00texlive.config";
|
||||
|
||||
@@ -54,7 +52,6 @@ let
|
||||
);
|
||||
|
||||
orig = removeFormatLinks (removeAttrs oldTlpdb [ "00texlive.config" ]);
|
||||
|
||||
in
|
||||
lib.recursiveUpdate orig rec {
|
||||
#### overrides of texlive.tlpdb
|
||||
@@ -431,22 +428,6 @@ lib.recursiveUpdate orig rec {
|
||||
sed -Ei 's/import sre/import re/; s/file\(/open(/g; s/\t/ /g; s/print +(.*)$/print(\1)/g' "$out"/bin/ebong
|
||||
'';
|
||||
|
||||
# readd functions moved to 'tools.pm' not shipped to CTAN
|
||||
eolang.postUnpack =
|
||||
let
|
||||
patch = fetchpatch {
|
||||
name = "eolang-without-tools-pm.patch";
|
||||
url = "https://github.com/objectionary/eolang.sty/commit/2c3bf97dd85e1748b2028ffa056a75c0d9432f88.patch";
|
||||
includes = [ "eolang.pl" ];
|
||||
hash = "sha256-ZQtGjqzfhX5foRWuiWQaomN8nOOEj394HdCDrb2sdzA=";
|
||||
};
|
||||
in
|
||||
''
|
||||
if [[ -d "$out"/scripts/eolang ]] ; then
|
||||
patch -d "$out/scripts/eolang" -i "${patch}"
|
||||
fi
|
||||
'';
|
||||
|
||||
# find files in script directory, not binary directory
|
||||
# add runtime dependencies to PATH
|
||||
epspdf.postFixup = ''
|
||||
@@ -475,6 +456,21 @@ lib.recursiveUpdate orig rec {
|
||||
substituteInPlace "$out"/bin/latexminted --replace-fail "__file__" "\"$scriptsFolder/latexminted.py\""
|
||||
'';
|
||||
|
||||
# find files in source container, fix incompatibilities with snobol4
|
||||
texaccents.postFixup = ''
|
||||
sed -i '1s!$! -I${tl.texaccents.texsource}/source/support/texaccents!' "$out"/bin/*
|
||||
'';
|
||||
texaccents.postUnpack = ''
|
||||
if [[ -f "$out"/source/support/texaccents/grepl.inc ]] ; then
|
||||
sed -i 's!^-include "repl.inc"!-include "repl.sno"!' "$out"/source/support/texaccents/grepl.inc
|
||||
elif [[ -f "$out"/scripts/texaccents/texaccents.sno ]] ; then
|
||||
sed -i -e 's!^-include "host.inc"!-include "host.sno"!' \
|
||||
-e 's/host(2,2)/host(2,host(3))/g' \
|
||||
-e 's/host(2,3)/host(2,host(3) + 1)/g' \
|
||||
"$out"/scripts/texaccents/texaccents.sno
|
||||
fi
|
||||
'';
|
||||
|
||||
# flag lua dependency
|
||||
texblend.scriptExts = [ "lua" ];
|
||||
|
||||
@@ -520,6 +516,10 @@ lib.recursiveUpdate orig rec {
|
||||
'';
|
||||
|
||||
#### dependency changes
|
||||
|
||||
# Since 2025 OpTeX is based on luahbtex
|
||||
optex.deps = orig.optex.deps ++ [ "luahbtex" ];
|
||||
|
||||
# it seems to need it to transform fonts
|
||||
xdvi.deps = (orig.xdvi.deps or [ ]) ++ [ "metafont" ];
|
||||
|
||||
@@ -534,6 +534,14 @@ lib.recursiveUpdate orig rec {
|
||||
|
||||
#### misc
|
||||
|
||||
# FIXME: remove when https://github.com/borisveytsman/crossrefware/pull/17 is merged and included on CTAN
|
||||
# Typo introduced in https://github.com/borisveytsman/crossrefware/commit/1e67e9773b3d3be983be156e2200478bc263dd93
|
||||
crossrefware.postUnpack = ''
|
||||
if [[ -f "$out"/scripts/crossrefware/ltx2crossrefxml.pl ]] ; then
|
||||
sed -i 's/use IO::file;/use IO::File;/' "$out"/scripts/crossrefware/ltx2crossrefxml.pl
|
||||
fi
|
||||
'';
|
||||
|
||||
# RISC-V: https://github.com/LuaJIT/LuaJIT/issues/628
|
||||
luajittex.binfiles = lib.optionals (
|
||||
!(stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) && !stdenv.hostPlatform.isRiscV
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -729,6 +729,9 @@ mapAliases {
|
||||
g4music = gapless; # Added 2024-07-26
|
||||
g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17
|
||||
gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19
|
||||
garage_0_8 = throw "'garage_0_8' has been removed as it is unmaintained upstream"; # Added 2025-06-23
|
||||
garage_0_8_7 = throw "'garage_0_8_7' has been removed as it is unmaintained upstream"; # Added 2025-06-23
|
||||
garage_1_x = lib.warnOnInstantiate "'garage_1_x' has been renamed to 'garage_1'" garage_1; # Added 2025-06-23
|
||||
gbl = throw "'gbl' has been removed because the upstream repository no longer exists"; # Added 2025-01-26
|
||||
gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10
|
||||
gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11
|
||||
@@ -1561,6 +1564,7 @@ mapAliases {
|
||||
|
||||
Note that Qt 5 versions of most KDE software will be removed in NixOS 25.11.
|
||||
''; # Added 2025-03-07
|
||||
polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
|
||||
poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03
|
||||
powerdns = pdns; # Added 2022-03-28
|
||||
presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24
|
||||
|
||||
@@ -3013,13 +3013,10 @@ with pkgs;
|
||||
|
||||
inherit (callPackages ../tools/filesystems/garage { })
|
||||
garage
|
||||
garage_0_8
|
||||
garage_0_9
|
||||
garage_0_8_7
|
||||
garage_0_9_4
|
||||
|
||||
garage_1_2_0
|
||||
garage_1_x
|
||||
garage_1
|
||||
|
||||
garage_2_0_0
|
||||
@@ -10097,8 +10094,6 @@ with pkgs;
|
||||
|
||||
### SERVERS
|
||||
|
||||
adguardhome = callPackage ../servers/adguardhome { };
|
||||
|
||||
alerta = callPackage ../servers/monitoring/alerta/client.nix { };
|
||||
|
||||
alerta-server = callPackage ../servers/monitoring/alerta { };
|
||||
|
||||
@@ -134,6 +134,7 @@ mapAliases ({
|
||||
caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20
|
||||
can = python-can; # added 2024-08-12
|
||||
carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18
|
||||
casbin = pycasbin; # added 2025-06-12
|
||||
case = throw "case has been removed, since it is an unused leaf package with a dependency on the nose test framework"; # added 2024-07-08
|
||||
cchardet = faust-cchardet; # added 2023-03-02
|
||||
cepa = throw "cepa has been removed, as onionshare switched back to stem"; # added 2024-05-07
|
||||
|
||||
@@ -2288,8 +2288,6 @@ self: super: with self; {
|
||||
}
|
||||
);
|
||||
|
||||
casbin = callPackage ../development/python-modules/casbin { };
|
||||
|
||||
case-converter = callPackage ../development/python-modules/case-converter { };
|
||||
|
||||
cashaddress = callPackage ../development/python-modules/cashaddress { };
|
||||
@@ -12314,6 +12312,8 @@ self: super: with self; {
|
||||
|
||||
pycarwings2 = callPackage ../development/python-modules/pycarwings2 { };
|
||||
|
||||
pycasbin = callPackage ../development/python-modules/pycasbin { };
|
||||
|
||||
pycatch22 = callPackage ../development/python-modules/pycatch22 { };
|
||||
|
||||
pycategories = callPackage ../development/python-modules/pycategories { };
|
||||
@@ -19305,6 +19305,8 @@ self: super: with self; {
|
||||
|
||||
webexteamssdk = callPackage ../development/python-modules/webexteamssdk { };
|
||||
|
||||
webidl = callPackage ../development/python-modules/webidl { };
|
||||
|
||||
weblate-language-data = callPackage ../development/python-modules/weblate-language-data { };
|
||||
|
||||
weblate-schemas = callPackage ../development/python-modules/weblate-schemas { };
|
||||
|
||||
Reference in New Issue
Block a user