mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-08-26 10:14:48 +00:00
Merge release-26.05 into staging-next-26.05
This commit is contained in:
nixpkgs-ci[bot]
3
.github/workflows/bot.yml
vendored
3
.github/workflows/bot.yml
vendored
@@ -49,7 +49,8 @@ jobs:
|
||||
ci/github-script
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm install @actions/artifact@6.2.1 bottleneck@2.19.5
|
||||
run: npm ci --package-lock-only=false @actions/artifact bottleneck
|
||||
working-directory: ci/github-script
|
||||
|
||||
# Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour.
|
||||
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
|
||||
|
||||
3
.github/workflows/check.yml
vendored
3
.github/workflows/check.yml
vendored
@@ -51,7 +51,8 @@ jobs:
|
||||
ci/github-script
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm install bottleneck@2.19.5
|
||||
run: npm ci --package-lock-only=false bottleneck
|
||||
working-directory: trusted/ci/github-script
|
||||
|
||||
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
|
||||
if: github.event_name != 'pull_request' && vars.NIXPKGS_COMMIT_CHECK_CLIENT_ID
|
||||
|
||||
3
.github/workflows/teams.yml
vendored
3
.github/workflows/teams.yml
vendored
@@ -38,7 +38,8 @@ jobs:
|
||||
maintainers/github-teams.json
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm install bottleneck@2.19.5
|
||||
run: npm ci --package-lock-only=false bottleneck
|
||||
working-directory: ci/github-script
|
||||
|
||||
- name: Synchronise teams
|
||||
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
||||
|
||||
1
ci/github-script/package-lock.json
generated
1
ci/github-script/package-lock.json
generated
@@ -4,7 +4,6 @@
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "github-script",
|
||||
"dependencies": {
|
||||
"@actions/artifact": "6.2.1",
|
||||
"@actions/core": "1.10.1",
|
||||
|
||||
@@ -2,9 +2,7 @@
|
||||
"private": true,
|
||||
"//": [
|
||||
"Keep `@actions/core` and `@actions/github` in sync with",
|
||||
"https://github.com/actions/github-script/blob/main/package.json.",
|
||||
"Keep `@actions/artifact` and `bottleneck` in sync with",
|
||||
"`.github/workflows/bot.yml`."
|
||||
"https://github.com/actions/github-script/blob/main/package.json."
|
||||
],
|
||||
"dependencies": {
|
||||
"@actions/artifact": "6.2.1",
|
||||
|
||||
@@ -9,9 +9,22 @@
|
||||
},
|
||||
"branch": "nixpkgs-unstable",
|
||||
"submodules": false,
|
||||
"revision": "6edbf1a6a03e75886a6609c088801a0856449e88",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/6edbf1a6a03e75886a6609c088801a0856449e88.tar.gz",
|
||||
"hash": "sha256-0lkauQbtrljJqwtzTCILPAiHAJyMvn6XDo264moDv30="
|
||||
"revision": "7525d999cd850b9a488817abc89c75dc733acf17",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/7525d999cd850b9a488817abc89c75dc733acf17.tar.gz",
|
||||
"hash": "sha256-4IHyyLgLBdKefkljdKod4IMn023pQiDXAWJA187cmdY="
|
||||
},
|
||||
"nixpkgs-26.05-darwin": {
|
||||
"type": "Git",
|
||||
"repository": {
|
||||
"type": "GitHub",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs"
|
||||
},
|
||||
"branch": "nixpkgs-26.05-darwin",
|
||||
"submodules": false,
|
||||
"revision": "51fe96f9107566e6b8eeb7fc4ba696c01e548b04",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/51fe96f9107566e6b8eeb7fc4ba696c01e548b04.tar.gz",
|
||||
"hash": "sha256-yj0LPLnsmYoLmA3FGANjeTEwej0/DHjZBXWnDQDUuIs="
|
||||
}
|
||||
},
|
||||
"version": 8
|
||||
|
||||
@@ -199,7 +199,8 @@
|
||||
&& system != "riscv64-linux"
|
||||
# Exclude x86_64-freebsd because "Package ‘go-1.22.12-freebsd-amd64-bootstrap’ in /nix/store/0yw40qnrar3lvc5hax5n49abl57apjbn-source/pkgs/development/compilers/go/binary.nix:50 is not available on the requested hostPlatform"
|
||||
&& system != "x86_64-freebsd"
|
||||
) (forAllSystems (system: (import ./ci { inherit system; }).fmt.pkg));
|
||||
# TODO: revert to importing fmt.pkg directly from ./ci when support for 26.05 ends
|
||||
) (forAllSystems (system: (import ./shell.nix { inherit system; }).formatter));
|
||||
|
||||
/**
|
||||
A nested structure of [packages](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) and other values.
|
||||
|
||||
@@ -5139,6 +5139,12 @@
|
||||
githubId = 1448923;
|
||||
name = "Christian Kauhaus";
|
||||
};
|
||||
ckgxrg = {
|
||||
email = "ckgxrg@ckgxrg.io";
|
||||
github = "ckgxrg-salt";
|
||||
githubId = 165614491;
|
||||
name = "ckgxrg";
|
||||
};
|
||||
cko = {
|
||||
email = "christine.koppelt@gmail.com";
|
||||
github = "cko";
|
||||
|
||||
@@ -15,14 +15,13 @@ in
|
||||
description = ''
|
||||
Enable ReGreet, a clean and customizable greeter for greetd.
|
||||
|
||||
To use ReGreet, {option}`services.greetd` has to be enabled and
|
||||
{option}`services.greetd.settings.default_session` should contain the
|
||||
appropriate configuration to launch
|
||||
{option}`config.programs.regreet.package`. For examples, see the
|
||||
[ReGreet Readme](https://github.com/rharish101/ReGreet#set-as-default-session).
|
||||
By default enables {option}`services.greetd` and configures a
|
||||
{command}`default_session` to launch ReGreet using the
|
||||
{command}`cage` compositor.
|
||||
|
||||
A minimal configuration that launches ReGreet in {command}`cage` is
|
||||
enabled by this module by default.
|
||||
See the
|
||||
[ReGreet Readme](https://github.com/rharish101/ReGreet#set-as-default-session)
|
||||
for other examples.
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -48,8 +47,8 @@ in
|
||||
[ "-s" "-d" "-m" "last" ]
|
||||
'';
|
||||
description = ''
|
||||
Additional arguments to be passed to
|
||||
[cage](https://github.com/cage-kiosk/cage).
|
||||
Arguments to be passed to [cage](https://github.com/cage-kiosk/cage)
|
||||
when using it as the default compositor.
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@@ -91,6 +91,9 @@ let
|
||||
|
||||
click_when_unobstructed((By.XPATH, "//a[contains(., 'Skip to web app')]"))
|
||||
|
||||
# Skip the tour on first login
|
||||
click_when_unobstructed((By.XPATH, "//button[contains(., 'Skip')]"))
|
||||
|
||||
click_when_unobstructed((By.XPATH, "//button[contains(., 'New item')]"))
|
||||
|
||||
driver.find_element(By.XPATH, '//input[@formcontrolname="name"]').send_keys(
|
||||
|
||||
@@ -13,20 +13,20 @@ let
|
||||
# update-script-start: urls
|
||||
urls = {
|
||||
x86_64-linux = {
|
||||
url = "https://download.jetbrains.com/python/pycharm-2026.1.2.tar.gz";
|
||||
hash = "sha256-kcd1vhb7CFn5sY69RW2I4THK3zN7DOn52O0YeIZWGWY=";
|
||||
url = "https://download.jetbrains.com/python/pycharm-2026.1.4.tar.gz";
|
||||
hash = "sha256-RIufgZhg/n+D1uEdcDyYRjTDfh8Jicyz4h0B1kTbVXs=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://download.jetbrains.com/python/pycharm-2026.1.2-aarch64.tar.gz";
|
||||
hash = "sha256-5rTyUmevreBL5nZPa7FuodFhWcrjSQ+7T1jMFo7P/uM=";
|
||||
url = "https://download.jetbrains.com/python/pycharm-2026.1.4-aarch64.tar.gz";
|
||||
hash = "sha256-71FbYpN0seJ5k/yZA7aoXgU4W/N1BhjtKl7W7Hic9UE=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.jetbrains.com/python/pycharm-2026.1.2.dmg";
|
||||
hash = "sha256-Fej8KylKSFKVxCMrBAcUIDwb0v5B5r1RysMAvcBVgh8=";
|
||||
url = "https://download.jetbrains.com/python/pycharm-2026.1.4.dmg";
|
||||
hash = "sha256-Q5hTcYoNUzmAxwcsXJNS4medQjFKWc/Sgkybt4PQPfg=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://download.jetbrains.com/python/pycharm-2026.1.2-aarch64.dmg";
|
||||
hash = "sha256-oau/wa9spYnn7XE07NGsINyqof3Mu9t9WQLuPAQ4TDc=";
|
||||
url = "https://download.jetbrains.com/python/pycharm-2026.1.4-aarch64.dmg";
|
||||
hash = "sha256-qxSgp8r4S0KXjCCTIoAiEZFCn3uBE/0pWLLA6td0Fq0=";
|
||||
};
|
||||
};
|
||||
# update-script-end: urls
|
||||
@@ -40,8 +40,8 @@ in
|
||||
product = "PyCharm";
|
||||
|
||||
# update-script-start: version
|
||||
version = "2026.1.2";
|
||||
buildNumber = "261.24374.152";
|
||||
version = "2026.1.4";
|
||||
buildNumber = "261.26222.68";
|
||||
# update-script-end: version
|
||||
|
||||
src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
|
||||
|
||||
@@ -77,8 +77,8 @@ rec {
|
||||
thunderbird = thunderbird-latest;
|
||||
|
||||
thunderbird-latest = common {
|
||||
version = "152.0.1";
|
||||
sha512 = "f66c87de4dd73c3c45e420a55d76c3cb6ac091a61794ccf58ba59d1a40cf8001dee19a6a7f4c6bef7d36ea94ed4e4f677449d3006b2004abbd3fab42ad1c9228";
|
||||
version = "153.0";
|
||||
sha512 = "f77bde3dd0933dd35870a889386c41d55ff0cbe276ec3373b27e9885f7db7e35529e7ecc2fc149ae4f8c5ae53eddb3ad444e7499a850a59a82b8940c7a4c7747";
|
||||
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbirdPackages.thunderbird-latest";
|
||||
@@ -88,11 +88,24 @@ rec {
|
||||
# Eventually, switch to an updateScript without versionPrefix hardcoded...
|
||||
thunderbird-esr = thunderbird-140;
|
||||
|
||||
thunderbird-153 = common {
|
||||
applicationName = "Thunderbird ESR";
|
||||
|
||||
version = "153.0.1esr";
|
||||
sha512 = "3773b49b69341aea108a627faa0dd5b7cfb52cdb4c37e625fbb8cbaef7f9166f925ecbc199173302d5bef7994e6bff3b56cd56a3a4c38a9d702cc3e5aeafcf7c";
|
||||
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbirdPackages.thunderbird-153";
|
||||
versionPrefix = "153";
|
||||
versionSuffix = "esr";
|
||||
};
|
||||
};
|
||||
|
||||
thunderbird-140 = common {
|
||||
applicationName = "Thunderbird ESR";
|
||||
|
||||
version = "140.12.1esr";
|
||||
sha512 = "24e795483ba7bc112c0debe1becdaf79cc2de95703b9ee726d0216bfc1db7b33c169503f83ac867e5998a8d1d0284a6ef12c7d35d98b10d6432497c2db237477";
|
||||
version = "140.13.0esr";
|
||||
sha512 = "778d2fc2837ba367e90c4336f3873da5a0823c182e2f50aa9373cd1ee9ee2b5310372ad9d33e1e11978791b67de4a6952d3036ff7d57b257a06f49c8cd4a830e";
|
||||
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbirdPackages.thunderbird-140";
|
||||
|
||||
@@ -143,6 +143,27 @@ let
|
||||
hash = mobyHash;
|
||||
};
|
||||
|
||||
extraMobyPath = lib.optionals stdenv.hostPlatform.isLinux (
|
||||
lib.makeBinPath [
|
||||
iproute2
|
||||
iptables
|
||||
e2fsprogs
|
||||
xz
|
||||
xfsprogs
|
||||
procps
|
||||
util-linuxMinimal
|
||||
gitMinimal
|
||||
]
|
||||
);
|
||||
|
||||
extraMobyUserPath = lib.optionals (stdenv.hostPlatform.isLinux && !clientOnly) (
|
||||
lib.makeBinPath [
|
||||
rootlesskit
|
||||
slirp4netns
|
||||
fuse-overlayfs
|
||||
]
|
||||
);
|
||||
|
||||
moby = buildGoModule (
|
||||
lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
pname = "moby";
|
||||
@@ -170,27 +191,6 @@ let
|
||||
++ lib.optionals withSystemd [ systemd ]
|
||||
++ lib.optionals withSeccomp [ libseccomp ];
|
||||
|
||||
extraPath = lib.optionals stdenv.hostPlatform.isLinux (
|
||||
lib.makeBinPath [
|
||||
iproute2
|
||||
iptables
|
||||
e2fsprogs
|
||||
xz
|
||||
xfsprogs
|
||||
procps
|
||||
util-linuxMinimal
|
||||
gitMinimal
|
||||
]
|
||||
);
|
||||
|
||||
extraUserPath = lib.optionals (stdenv.hostPlatform.isLinux && !clientOnly) (
|
||||
lib.makeBinPath [
|
||||
rootlesskit
|
||||
slirp4netns
|
||||
fuse-overlayfs
|
||||
]
|
||||
);
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs hack/make.sh hack/make/
|
||||
''
|
||||
@@ -218,7 +218,9 @@ let
|
||||
install -Dm755 ./bundles/dynbinary-daemon/docker-proxy $out/libexec/docker/docker-proxy
|
||||
|
||||
makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
|
||||
--prefix PATH : "$out/libexec/docker:$extraPath"
|
||||
--prefix PATH : "$out/libexec/docker${
|
||||
lib.optionalString (extraMobyPath != "") ":${extraMobyPath}"
|
||||
}"
|
||||
|
||||
ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd
|
||||
ln -s ${docker-containerd}/bin/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") "-runc-v2"} $out/libexec/docker/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") "-runc-v2"}
|
||||
@@ -233,7 +235,9 @@ let
|
||||
# rootless Docker
|
||||
install -Dm755 ./contrib/dockerd-rootless.sh $out/libexec/docker/dockerd-rootless.sh
|
||||
makeWrapper $out/libexec/docker/dockerd-rootless.sh $out/bin/dockerd-rootless \
|
||||
--prefix PATH : "$out/libexec/docker:$extraPath:$extraUserPath"
|
||||
--prefix PATH : "$out/libexec/docker${
|
||||
lib.optionalString (extraMobyPath != "") ":${extraMobyPath}"
|
||||
}${lib.optionalString (extraMobyUserPath != "") ":${extraMobyUserPath}"}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@@ -335,7 +339,7 @@ let
|
||||
install -Dm755 ./build/docker $out/libexec/docker/docker
|
||||
|
||||
makeWrapper $out/libexec/docker/docker $out/bin/docker \
|
||||
--prefix PATH : "$out/libexec/docker:$extraPath" \
|
||||
--prefix PATH : "$out/libexec/docker" \
|
||||
--prefix DOCKER_CLI_PLUGIN_DIRS : "${dockerCliPluginsDirs}"
|
||||
''
|
||||
+ lib.optionalString (!clientOnly) ''
|
||||
|
||||
@@ -31,8 +31,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
python3
|
||||
wrapGAppsNoGuiHook
|
||||
];
|
||||
|
||||
@@ -86,6 +88,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
description = "Markup language for GTK user interface files";
|
||||
mainProgram = "blueprint-compiler";
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "buildbox";
|
||||
version = "1.4.6";
|
||||
version = "1.4.13";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "BuildGrid";
|
||||
repo = "buildbox/buildbox";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-zNZMk9C/KsiqqGZOzc6B1WjL4wemWmdrr0a+CMA2BlQ=";
|
||||
hash = "sha256-W/QV65A7zm2vUdvJRrR+bxe8O3Zogzrx86RmqFVCY84=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-shear";
|
||||
version = "1.13.2";
|
||||
version = "1.13.3";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "cargo-shear";
|
||||
version = finalAttrs.version;
|
||||
hash = "sha256-69OwhT4vc4xwvuVxZ0C7F/Us01TsuYJnnTKT6PHsOF8=";
|
||||
hash = "sha256-Qaq3nBZZR0biG5kVL15zhI8GwLEWBNzgeD3rHeZZOeU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-x0lZ8E/P9IaPSdzUo2O3t5qR2I3959So9uaAm4PBM4E=";
|
||||
cargoHash = "sha256-3YMdOCCK+rVx0XZfBqiMAw+aep1TBU5Ok6//c433h4o=";
|
||||
|
||||
env = {
|
||||
# https://github.com/Boshen/cargo-shear/blob/v1.6.2/src/lib.rs#L51-L54
|
||||
|
||||
111
pkgs/by-name/co/commet-chat/fix-hardcoded-flutter-cmd.patch
Normal file
111
pkgs/by-name/co/commet-chat/fix-hardcoded-flutter-cmd.patch
Normal file
@@ -0,0 +1,111 @@
|
||||
--- a/scripts/codegen.dart
|
||||
+++ b/scripts/codegen.dart
|
||||
@@ -2,38 +2,7 @@
|
||||
|
||||
import 'dart:io';
|
||||
|
||||
-Future<ProcessResult> getDependencies() async {
|
||||
- var process = Process.runSync(
|
||||
- "flutter",
|
||||
- [
|
||||
- "pub",
|
||||
- "get",
|
||||
- ],
|
||||
- runInShell: true,
|
||||
- );
|
||||
-
|
||||
- print(process.stdout);
|
||||
- print(process.stderr);
|
||||
- return process;
|
||||
-}
|
||||
-
|
||||
-Future<ProcessResult> intlUtilsGenerate() async {
|
||||
- var process = await Process.run(
|
||||
- "flutter",
|
||||
- [
|
||||
- "pub",
|
||||
- "run",
|
||||
- "intl_utils:generate",
|
||||
- ],
|
||||
- runInShell: true,
|
||||
- );
|
||||
-
|
||||
- print(process.stdout);
|
||||
- print(process.stderr);
|
||||
- return process;
|
||||
-}
|
||||
-
|
||||
-Future<List<File>> generateFileLists() async {
|
||||
+void main() async {
|
||||
var dir = Directory("lib/generated/l10n");
|
||||
if (!dir.existsSync()) {
|
||||
dir.create(recursive: true);
|
||||
@@ -82,68 +51,4 @@
|
||||
|
||||
await arbFile.create(recursive: true);
|
||||
arbFile.writeAsStringSync(fileList);
|
||||
-
|
||||
- return [sourcesFile, arbFile];
|
||||
-}
|
||||
-
|
||||
-Future<ProcessResult> generateFromArb(List<File> files) async {
|
||||
- var process = await Process.run(
|
||||
- "flutter",
|
||||
- [
|
||||
- "pub",
|
||||
- "run",
|
||||
- "intl_translation:generate_from_arb",
|
||||
- "--sources-list-file",
|
||||
- files[0].absolute.path,
|
||||
- "--translations-list-file",
|
||||
- files[1].absolute.path,
|
||||
- "--output-dir=lib/generated/l10n"
|
||||
- ],
|
||||
- runInShell: true,
|
||||
- );
|
||||
-
|
||||
- print(process.stdout);
|
||||
- print(process.stderr);
|
||||
- return process;
|
||||
-}
|
||||
-
|
||||
-Future<ProcessResult> buildRunner() async {
|
||||
- var process = await Process.run(
|
||||
- "flutter",
|
||||
- [
|
||||
- "pub",
|
||||
- "run",
|
||||
- "build_runner",
|
||||
- "build",
|
||||
- "--delete-conflicting-outputs",
|
||||
- ],
|
||||
- runInShell: true,
|
||||
- );
|
||||
-
|
||||
- print(process.stdout);
|
||||
- print(process.stderr);
|
||||
- return process;
|
||||
-}
|
||||
-
|
||||
-void main() async {
|
||||
- var result = await getDependencies();
|
||||
- if (result.exitCode != 0) {
|
||||
- exit(result.exitCode);
|
||||
- }
|
||||
-
|
||||
- result = await intlUtilsGenerate();
|
||||
- if (result.exitCode != 0) {
|
||||
- exit(result.exitCode);
|
||||
- }
|
||||
-
|
||||
- var files = await generateFileLists();
|
||||
- result = await generateFromArb(files);
|
||||
- if (result.exitCode != 0) {
|
||||
- exit(result.exitCode);
|
||||
- }
|
||||
-
|
||||
- result = await buildRunner();
|
||||
- if (result.exitCode != 0) {
|
||||
- exit(result.exitCode);
|
||||
- }
|
||||
}
|
||||
164
pkgs/by-name/co/commet-chat/package.nix
Normal file
164
pkgs/by-name/co/commet-chat/package.nix
Normal file
@@ -0,0 +1,164 @@
|
||||
{
|
||||
lib,
|
||||
flutter341,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
|
||||
webkitgtk_4_1,
|
||||
mimalloc,
|
||||
keybinder3,
|
||||
|
||||
mpv-unwrapped,
|
||||
libdovi,
|
||||
libdvdcss,
|
||||
libunwind,
|
||||
|
||||
libgbm,
|
||||
libdrm,
|
||||
}:
|
||||
|
||||
let
|
||||
libwebrtcRpath = lib.makeLibraryPath [
|
||||
libgbm
|
||||
libdrm
|
||||
];
|
||||
libwebrtc = fetchzip {
|
||||
url = "https://github.com/flutter-webrtc/flutter-webrtc/releases/download/v1.2.0/libwebrtc.zip";
|
||||
hash = "sha256-i4LRG44f//SDIOl072yZavkYoTZdiydPZndeOm6/fBM=";
|
||||
};
|
||||
in
|
||||
flutter341.buildFlutterApplication (finalAttrs: {
|
||||
pname = "commet-chat";
|
||||
version = "0.4.2+hotfix.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "commetchat";
|
||||
repo = "commet";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Pf+JeVuTPxpufcx/whn8RVcYp1e69CJBFzyZaQ8I5RQ=";
|
||||
fetchSubmodules = true;
|
||||
leaveDotGit = true;
|
||||
|
||||
# For the git hash property in about page
|
||||
postFetch = ''
|
||||
cd $out
|
||||
git rev-parse HEAD | head -c 7 > $out/GIT_HASH
|
||||
find $out -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
strictDeps = true;
|
||||
sourceRoot = "${finalAttrs.src.name}/commet";
|
||||
|
||||
pubspecLockFilePath = "../pubspec.lock";
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
gitHashes = {
|
||||
calendar_view = "sha256-tGAMK89VsgqfKQy+t8x5zl6dbQEf5h4HxSUR8crB1oM=";
|
||||
desktop_webview_window = "sha256-EOh5QoOuAxiYn0IcdxY7taN2Twu8GshY9zAoGCztPnA=";
|
||||
dynamic_color = "sha256-4zSTiXplkBjtPtzssj3VaHTVo9YlYKNTMLgBIM5MMe4=";
|
||||
flutter_highlighter = "sha256-Y84Besir3gu1RnQt9YoE0GyIJLLZ6H0Kki/Wf6z6QMg=";
|
||||
flutter_html = "sha256-576KYoYB4sZeavcAS8V5rjDG9hezYlN2Q4zlyvBOouw=";
|
||||
flutter_local_notifications = "sha256-AgvvFoJgos/gsTwcLGX/CxbHauWiH3OHksqtF0Dauuw=";
|
||||
flutter_local_notifications_linux = "sha256-AgvvFoJgos/gsTwcLGX/CxbHauWiH3OHksqtF0Dauuw=";
|
||||
markdown = "sha256-2rEMNJM9Vy7LrFLt30/Z3pyqERTYJei9D3mgOAAvVPg=";
|
||||
matrix = "sha256-PB7xjulxmV2jE0WGVG116T50BrT3G5LsdLreR1cJTPI=";
|
||||
matrix_dart_sdk_drift_db = "sha256-2sSN2TcPAPVdEm3NXpZyWlPvArNn2CWnPph5Vz48KQ8=";
|
||||
receive_intent = "sha256-wGIOZRH4O3a44I8zG5Q1hCwn4SMuTWB7i9wtGSLZWeQ=";
|
||||
signal_sticker_api = "sha256-VdEE3Bt8gpfUpxxYSz5319YEL49Eh+loO+ZipI1DoyA=";
|
||||
starfield = "sha256-ebVRyVkyLfHCC6EBmx5evXL1U71S3tgCMo1yLWlIcw4=";
|
||||
launcher_entry = "sha256-T/zQRvY6jOKroMrhVwBtsoSm2xCFjOd5jsJC0PA4cpc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
webkitgtk_4_1
|
||||
mimalloc
|
||||
keybinder3
|
||||
|
||||
mpv-unwrapped
|
||||
libdovi
|
||||
libdvdcss
|
||||
libunwind
|
||||
]
|
||||
++ mpv-unwrapped.buildInputs;
|
||||
|
||||
env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}";
|
||||
env.COMMET_PROD = 1;
|
||||
|
||||
targetFlutterPlatform = "linux";
|
||||
|
||||
customSourceBuilders = {
|
||||
flutter_webrtc =
|
||||
{ version, src, ... }:
|
||||
stdenv.mkDerivation {
|
||||
pname = "flutter_webrtc";
|
||||
inherit version src;
|
||||
inherit (src) passthru;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace third_party/CMakeLists.txt \
|
||||
--replace-fail "\''${CMAKE_CURRENT_LIST_DIR}/downloads/libwebrtc.zip" ${libwebrtc}
|
||||
ln -s ${libwebrtc} third_party/libwebrtc
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cp -r ./* $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
# The original codegen.dart hardcodes flutter calls inside, so the patch basically rewrites the codegen script forcing nix.
|
||||
patches = [
|
||||
./fix-hardcoded-flutter-cmd.patch
|
||||
];
|
||||
|
||||
flutterBuildFlags = [
|
||||
"--dart-define=BUILD_MODE=release"
|
||||
"--dart-define=PLATFORM=linux"
|
||||
"--dart-define=VERSION_TAG=v${finalAttrs.version}"
|
||||
"--dart-define=BUILD_DETAIL=${stdenv.hostPlatform.system}"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export flutterBuildFlags="$flutterBuildFlags --dart-define=GIT_HASH=$(cat ../GIT_HASH)"
|
||||
|
||||
packageRun intl_utils -e generate
|
||||
dart run --packages=.dart_tool/package_config.json scripts/codegen.dart
|
||||
packageRun intl_translation -e generate_from_arb \
|
||||
--sources-list-file /build/source/commet/lib/generated/l10n/sources_list_file.txt \
|
||||
--translations-list-file /build/source/commet/lib/generated/l10n/arb_list_file.txt \
|
||||
--output-dir=lib/generated/l10n
|
||||
packageRun build_runner build --delete-conflicting-outputs
|
||||
'';
|
||||
|
||||
extraWrapProgramArgs = "--suffix LD_LIBRARY_PATH : $out/app/commet-chat/lib";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
install -Dm644 \
|
||||
linux/debian/usr/share/applications/chat.commet.commetapp.desktop \
|
||||
$out/share/applications/
|
||||
substituteInPlace $out/share/applications/chat.commet.commetapp.desktop \
|
||||
--replace-fail "/usr/lib/chat.commet.commetapp/commet" "commet"
|
||||
|
||||
mkdir -p $out/share/icons
|
||||
cp -r linux/debian/usr/share/icons/hicolor $out/share/icons/hicolor
|
||||
|
||||
patchelf --add-rpath ${libwebrtcRpath} $out/app/commet-chat/lib/libwebrtc.so
|
||||
'';
|
||||
|
||||
__structuredAttrs = true;
|
||||
meta = {
|
||||
homepage = "https://commet.chat";
|
||||
description = "Client for Matrix focused on providing a feature rich experience while maintaining a simple interface";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ ckgxrg ];
|
||||
mainProgram = "commet";
|
||||
};
|
||||
})
|
||||
3058
pkgs/by-name/co/commet-chat/pubspec.lock.json
Normal file
3058
pkgs/by-name/co/commet-chat/pubspec.lock.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -38,13 +38,13 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gale";
|
||||
version = "1.13.4";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kesomannen";
|
||||
repo = "gale";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ZCHknOp6ll9q6OBW/5/mNcu0d0zZj1rkCjPiumjMVzk=";
|
||||
hash = "sha256-VufV/Z1XODQKwbEpMrw0xNMdMl8D1t3bPIfdwRhQI9I=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-bCGiYVmoWjpwneTQUwetna7u29BMIv48qWgZ2gd93hQ=";
|
||||
hash = "sha256-/IR+34cdnCt9WpYdMaT92YIC/2JjEe/mZdeQewdWTek=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -70,7 +70,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
cargoHash = "sha256-kAPTiGHWO/eBapPcH8xItOFeZYC0URzLYdl2GMQ50Ls=";
|
||||
cargoHash = "sha256-4WSWvMQIYPzfxjDyuQI37ymxJhMVGxmxYDVSoknIzmg=";
|
||||
|
||||
checkFlags = [
|
||||
"--skip=config::bepinex::tests::check_from_string" # Fails a left == right check, even with left and right data being identical
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
@@ -1,13 +1,25 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGo125Module,
|
||||
fetchFromCodeberg,
|
||||
fetchYarnDeps,
|
||||
nodejs,
|
||||
yarn,
|
||||
yarnConfigHook,
|
||||
makeBinaryWrapper,
|
||||
ffmpeg,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
# Wazero (the WASM runtime GoToSocial uses to bundle ffmpeg/ffprobe/sqlite3)
|
||||
# only has a fast "compiler" backend for amd64 and arm64. On every other
|
||||
# architecture (riscv64, 32-bit ARM, ppc64le, ...) it falls back to a WASM
|
||||
# interpreter that is far too slow for real-world media processing.
|
||||
# Upstream exposes the explicitly unsupported/experimental "nowasm" build
|
||||
# tag for this situation: it drops the embedded WASM ffmpeg/ffprobe/sqlite3
|
||||
# and instead shells out to ffmpeg/ffprobe binaries found on $PATH.
|
||||
# See: https://docs.gotosocial.org/en/latest/advanced/builds/nowasm/
|
||||
withWasm ? stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch64,
|
||||
}:
|
||||
buildGo125Module (finalAttrs: {
|
||||
pname = "gotosocial";
|
||||
@@ -30,13 +42,15 @@ buildGo125Module (finalAttrs: {
|
||||
|
||||
tags = [
|
||||
"kvformat"
|
||||
];
|
||||
]
|
||||
++ lib.optionals (!withWasm) [ "nowasm" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
yarn
|
||||
yarnConfigHook
|
||||
];
|
||||
]
|
||||
++ lib.optionals (!withWasm) [ makeBinaryWrapper ];
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/web/source/yarn.lock";
|
||||
@@ -65,6 +79,12 @@ buildGo125Module (finalAttrs: {
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/gotosocial/web
|
||||
mv web/{assets,template} $out/share/gotosocial/web
|
||||
''
|
||||
+ lib.optionalString (!withWasm) ''
|
||||
# nowasm builds need ffmpeg/ffprobe available on $PATH at runtime,
|
||||
# since the embedded WASM copies have been compiled out.
|
||||
wrapProgram $out/bin/gotosocial \
|
||||
--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
|
||||
'';
|
||||
|
||||
# tests are working only on x86_64-linux
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hedgedoc";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hedgedoc";
|
||||
repo = "hedgedoc";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-L27Rmd85+UbAbJYY2vxsWLbY+9nsWFmnEE4o3fK0UZU=";
|
||||
hash = "sha256-Xvz2kU1+DVp+BRa4zHM9e/xHjy41br7gZtBOpoaun0o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src missingHashes patches;
|
||||
hash = "sha256-Vj1s8aA+L0GwJ6qr/5IXpYM5ZAY7qIiPn9BKadcO52E=";
|
||||
hash = "sha256-SkUWghEBq8WyKuSDyM7OZBVSyXxqKpxIaoFMsaY10A4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kamailio";
|
||||
version = "6.0.5";
|
||||
version = "6.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kamailio.org/pub/kamailio/${finalAttrs.version}/src/kamailio-${finalAttrs.version}_src.tar.gz";
|
||||
hash = "sha256-LEpl8MTkNULs0EJCO2/IKe4Vqwmlauf0QbdCfWvOGzA=";
|
||||
hash = "sha256-49s9IWb0TY892Q2wkGP3C1W77M4pWr1/McNNi53XlyE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,24 +1,73 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
chafa,
|
||||
fontconfig,
|
||||
glib,
|
||||
gnumake,
|
||||
gperf,
|
||||
libiconv,
|
||||
python3,
|
||||
unzip,
|
||||
writeShellScriptBin,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mdfried";
|
||||
version = "0.15.0";
|
||||
version = "0.22.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benjajaja";
|
||||
repo = "mdfried";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-V++xkJBnTlqzcsw6BDkrqScIV+phzxyDqQXcV34L4ps=";
|
||||
hash = "sha256-Zcn1C8mXwljJ3HtYgYBPyU9cVHvoNBUn7qjqx45wMhE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qnsJkwAmBcakYcoqGdYRqfN6e46PG5IH6SAXLvy3mM8=";
|
||||
cargoHash = "sha256-Nt+oBl2HX/H/7j62VjaHrY29gpd2vouevBJO0W3AYAk=";
|
||||
|
||||
buildFeatures = [ "pdf" ];
|
||||
|
||||
# Prevent updateAutotoolsGnuConfigScripts from modifying mupdf's vendored
|
||||
# autotools files — doing so invalidates cargo's fingerprint for mupdf-sys
|
||||
# and causes a rebuild that fails on read-only cargoArtifacts files.
|
||||
updateAutotoolsGnuConfigScriptsPhase = "true";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook # for mupdf-sys bindgen
|
||||
gperf # for mupdf vendored Makefile
|
||||
python3 # for mupdf vendored Makefile
|
||||
unzip # for mupdf vendored docx_template build
|
||||
# mupdf-sys cp_r copies files from the read-only Nix store, preserving
|
||||
# mode 444. make then fails to regenerate headers. Wrap make to chmod first.
|
||||
(writeShellScriptBin "make" ''
|
||||
chmod -R u+w . 2>/dev/null || true
|
||||
exec ${lib.getExe gnumake} "$@"
|
||||
'')
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
chafa
|
||||
fontconfig.dev # for font-kit (mupdf dep)
|
||||
glib.dev # for glib-2.0.pc (mupdf needs glib.dev, chafa could do with just glib)
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libiconv
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
CFLAGS_aarch64_apple_darwin = "-UTARGET_OS_MAC";
|
||||
CXXFLAGS_aarch64_apple_darwin = "-UTARGET_OS_MAC";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Markdown viewer TUI for the terminal, with big text and image rendering";
|
||||
homepage = "https://github.com/benjajaja/mdfried";
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
makeBinaryWrapper,
|
||||
stdenv,
|
||||
addDriverRunpath,
|
||||
nix-update-script,
|
||||
|
||||
cmake,
|
||||
gitMinimal,
|
||||
@@ -95,7 +94,7 @@ let
|
||||
|
||||
cudaToolkit = buildEnv {
|
||||
# ollama hardcodes the major version in the Makefile to support different variants.
|
||||
# - https://github.com/ollama/ollama/blob/v0.21.1/CMakePresets.json#L21-L47
|
||||
# - https://github.com/ollama/ollama/blob/v0.31.1/CMakePresets.json#L21-L47
|
||||
name = "cuda-merged-${cudaMajorVersion}";
|
||||
paths = map lib.getLib cudaLibs ++ [
|
||||
(lib.getOutput "static" cudaPackages.cuda_cudart)
|
||||
@@ -112,11 +111,12 @@ let
|
||||
# vendored in-tree. Pre-stage the pin (tracks upstream's
|
||||
# `LLAMA_CPP_VERSION` file) so the FetchContent step uses our copy
|
||||
# instead of trying to clone over the network in the sandbox.
|
||||
llamaCppVersion = "b10091";
|
||||
llamaCppSrc = fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b9509";
|
||||
hash = "sha256-bO1ucb/+vidj/EYzNCssotjte9NlVLdjC794jToNNeM=";
|
||||
tag = llamaCppVersion;
|
||||
hash = "sha256-ZHQ9hBnE9GayZRt0jgO4svzaAUfhRUg6cFu5dSe8J1w=";
|
||||
};
|
||||
|
||||
wrapperOptions = [
|
||||
@@ -152,16 +152,16 @@ let
|
||||
in
|
||||
goBuild (finalAttrs: {
|
||||
pname = "ollama";
|
||||
version = "0.30.6";
|
||||
version = "0.32.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qO+Tsjg64QekGHNNiNy5YGSDoToGSnqiN5hN+0LCp4Q=";
|
||||
hash = "sha256-TGbNdLYRzty6IQJptatQqAUAAp6cfh+OFbO6BdxC6H0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lZdGzGb9xRjTm1Rm7/wHjqM490gLznLEndmb4mNbCX0=";
|
||||
vendorHash = "sha256-HMwoaFBMbpoy8f0I+O+i7kIa9BslLu3FcVWeaIOkpvs=";
|
||||
proxyVendor = true;
|
||||
|
||||
env =
|
||||
@@ -302,6 +302,7 @@ goBuild (finalAttrs: {
|
||||
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
|
||||
-DFETCHCONTENT_SOURCE_DIR_LLAMA_CPP="$TMPDIR/llama-cpp-src" \
|
||||
-DOLLAMA_MLX_BACKENDS="" \
|
||||
$cmakeFlags \
|
||||
${cmakeFlagsCudaArchitectures} \
|
||||
${cmakeFlagsRocmTargets} \
|
||||
${cmakeFlagsBackend}
|
||||
@@ -322,7 +323,7 @@ goBuild (finalAttrs: {
|
||||
'';
|
||||
|
||||
# ollama looks for acceleration libs in ../lib/ollama/ (now also for CPU-only with arch specific optimizations)
|
||||
# https://github.com/ollama/ollama/blob/v0.21.1/docs/development.md#library-detection
|
||||
# https://github.com/ollama/ollama/blob/v0.31.1/docs/development.md#library-detection
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib
|
||||
cp -r build/lib/ollama $out/lib/
|
||||
@@ -365,6 +366,7 @@ goBuild (finalAttrs: {
|
||||
versionCheckKeepEnvironment = "HOME";
|
||||
|
||||
passthru = {
|
||||
inherit llamaCppSrc llamaCppVersion;
|
||||
tests = {
|
||||
inherit ollama;
|
||||
}
|
||||
@@ -376,7 +378,7 @@ goBuild (finalAttrs: {
|
||||
service-vulkan = nixosTests.ollama-vulkan;
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs (!enableRocm && !enableCuda) { updateScript = nix-update-script { }; };
|
||||
// lib.optionalAttrs (!enableRocm && !enableCuda && !enableVulkan) { updateScript = ./update.sh; };
|
||||
|
||||
meta = {
|
||||
description =
|
||||
@@ -393,5 +395,7 @@ goBuild (finalAttrs: {
|
||||
maintainers = with maintainers; [
|
||||
prusnak
|
||||
];
|
||||
# install TARGETS RUNTIME_DEPENDENCIES is not supported when cross-compiling.
|
||||
broken = stdenv.buildPlatform != stdenv.hostPlatform;
|
||||
};
|
||||
})
|
||||
|
||||
21
pkgs/by-name/ol/ollama/update.sh
Executable file
21
pkgs/by-name/ol/ollama/update.sh
Executable file
@@ -0,0 +1,21 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts nix-update
|
||||
# shellcheck shell=bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
nix-update ollama --src-only
|
||||
|
||||
ollama_src=$(nix-build --no-out-link -A ollama.src)
|
||||
llama_cpp_version=$(<"$ollama_src/LLAMA_CPP_VERSION")
|
||||
|
||||
if [[ -z "$llama_cpp_version" ]]; then
|
||||
echo "LLAMA_CPP_VERSION is empty" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
update-source-version ollama "$llama_cpp_version" \
|
||||
--source-key=llamaCppSrc \
|
||||
--version-key=llamaCppVersion
|
||||
|
||||
nix-update ollama --version=skip
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "openasar";
|
||||
version = "0-unstable-2026-05-08";
|
||||
version = "0-unstable-2026-07-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GooseMod";
|
||||
repo = "OpenAsar";
|
||||
rev = "4b47bb79f45e2c50fbeb5d86e4846c1a41ef0bef";
|
||||
hash = "sha256-5LJ6Fm27tV2A+oqve3UJSA/rICpHhgHf79PZBJriyg0=";
|
||||
rev = "5a44615cad9db23ae57573c498b26bae4e6e255b";
|
||||
hash = "sha256-aKyhFsecE1nRYYQVSYPUm5MY69dfEv2MnmiyVxfrwhk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -21,17 +21,17 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pdns-recursor";
|
||||
version = "5.4.3";
|
||||
version = "5.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-opICnFQ6xFOMpXYouBQsntypsoOjqAyzk+2UfgWE8A8=";
|
||||
hash = "sha256-Tut86kxxvTuABQWitPyFSd1vRnW36eFkC/8bNDpJwzo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "pdns-recursor-${finalAttrs.version}/rec-rust-lib/rust";
|
||||
hash = "sha256-eAiXdsHWZca0wx5FONGfa7JDcpDHyCABJOUROhwAsZo=";
|
||||
hash = "sha256-0/HLB9wMVQALga7ZJcPSDczjcBinMwQz2vTPep+x8p8=";
|
||||
};
|
||||
|
||||
cargoRoot = "rec-rust-lib/rust";
|
||||
|
||||
1786
pkgs/by-name/qu/quarkdown/deps.json
generated
Normal file
1786
pkgs/by-name/qu/quarkdown/deps.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
117
pkgs/by-name/qu/quarkdown/package.nix
Normal file
117
pkgs/by-name/qu/quarkdown/package.nix
Normal file
@@ -0,0 +1,117 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
gradle_8,
|
||||
jre,
|
||||
dart-sass,
|
||||
libarchive,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
let
|
||||
gradle = gradle_8;
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "quarkdown";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iamgio";
|
||||
repo = "quarkdown";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rCHpsCjPJRAh4a6GSwLqTIhAShTMLdED2LeE+Jxd/1Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Skip downloadSass from and "download" it ourselves
|
||||
# due to https://github.com/EtienneMiret/sass-gradle-plugin
|
||||
SASS_INSTALL_DIR=".gradle/sass/quarkdown-html/${dart-sass.version}/dart-sass"
|
||||
mkdir -p "$SASS_INSTALL_DIR"
|
||||
ln -s ${lib.getExe dart-sass} "$SASS_INSTALL_DIR/sass"
|
||||
|
||||
cat <<EOF >> quarkdown-html/build.gradle.kts
|
||||
|
||||
sass {
|
||||
version = "${dart-sass.version}"
|
||||
}
|
||||
|
||||
afterEvaluate {
|
||||
tasks.findByName("downloadSass")?.onlyIf { false }
|
||||
tasks.findByName("installSass")?.onlyIf { false }
|
||||
}
|
||||
EOF
|
||||
|
||||
# Enable missing dependencies
|
||||
cat <<EOF >> build.gradle.kts
|
||||
|
||||
dependencies {
|
||||
dokkaPlugin("org.jetbrains.dokka:all-modules-page-plugin:2.0.0")
|
||||
}
|
||||
EOF
|
||||
|
||||
# Skip failing ktlintKotlinScriptCheck
|
||||
cat <<EOF >> build.gradle.kts
|
||||
|
||||
afterEvaluate {
|
||||
tasks.findByName("ktlintKotlinScriptCheck")?.onlyIf { false }
|
||||
}
|
||||
EOF
|
||||
'';
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
gradle
|
||||
dart-sass
|
||||
libarchive
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = [ jre ];
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
pkg = finalAttrs.finalPackage;
|
||||
data = ./deps.json;
|
||||
};
|
||||
__darwinAllowLocalNetworking = true;
|
||||
gradleFlags = [
|
||||
# According to the nixpkgs gradle docs
|
||||
"-Dfile.encoding=utf-8"
|
||||
# Display useful messages for troubleshooting
|
||||
"--stacktrace"
|
||||
"--info"
|
||||
];
|
||||
|
||||
# TODO(@Pandapip1): Too many tests depend on networking and no clear way to disable those specific tests
|
||||
doCheck = false;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
bsdtar -xf build/distributions/quarkdown.zip --strip-components 1 -C "$out"
|
||||
|
||||
# Remove windows scripts
|
||||
rm $out/bin/*.bat
|
||||
|
||||
for script in $out/bin/*; do
|
||||
wrapProgram $script --set-default JAVA_HOME "${jre.home}"
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Modern Markdown-based typesetting system";
|
||||
homepage = "https://github.com/iamgio/quarkdown";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ pandapip1 ];
|
||||
# Build broken on Darwin (seems to try to do non-local networking)
|
||||
# I'm assuming this means the BSDs are also broken
|
||||
platforms = lib.platforms.linux;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # gradle mitmCache
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "sops";
|
||||
version = "3.13.2";
|
||||
version = "3.13.3";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -20,10 +20,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "getsops";
|
||||
repo = finalAttrs.pname;
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-en4MsPwqLRi8jlwuzWHgJ+ns42cBXuCzGbnZyGK9Vhk=";
|
||||
hash = "sha256-TLThUgoJKcqqzQBIPzXLK+4VznMEf1wEkDUbz2pijiE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qBtVnRJK/E545yTUwYXauVFBcpV8mUSxmush5vQMMrs=";
|
||||
vendorHash = "sha256-LHMmSO6IDZA0hbattv3jM+9xLd57VrulVxOn+uYG4n0=";
|
||||
|
||||
subPackages = [ "cmd/sops" ];
|
||||
|
||||
|
||||
@@ -211,17 +211,22 @@ fn die() -> ! {
|
||||
std::process::exit(code);
|
||||
}
|
||||
|
||||
/// Parses the key-value pairs of `/etc/os-release`.
|
||||
/// Absence or emptiness of the file become the empty map.
|
||||
/// Failure to read returns an error Result.
|
||||
fn parse_os_release() -> Result<HashMap<String, String>> {
|
||||
Ok(std::fs::read_to_string("/etc/os-release")
|
||||
.context("Failed to read /etc/os-release")?
|
||||
.lines()
|
||||
.fold(HashMap::new(), |mut acc, line| {
|
||||
if let Some((k, v)) = line.split_once('=') {
|
||||
acc.insert(k.to_string(), v.to_string());
|
||||
}
|
||||
let contents = match std::fs::read_to_string("/etc/os-release") {
|
||||
Ok(contents) => contents,
|
||||
Err(err) if err.kind() == std::io::ErrorKind::NotFound => String::new(),
|
||||
Err(err) => return Err(err).context("Failed to read /etc/os-release"),
|
||||
};
|
||||
Ok(contents.lines().fold(HashMap::new(), |mut acc, line| {
|
||||
if let Some((k, v)) = line.split_once('=') {
|
||||
acc.insert(k.to_string(), v.to_string());
|
||||
}
|
||||
|
||||
acc
|
||||
}))
|
||||
acc
|
||||
}))
|
||||
}
|
||||
|
||||
fn do_pre_switch_check(command: &str, toplevel: &Path, action: &Action) -> Result<()> {
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tailscale";
|
||||
version = "1.98.5";
|
||||
version = "1.98.9";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JaVCmMdZMaP/8RaNRmYpQOj+y/NfHuXdqp8qyWNYEqM=";
|
||||
hash = "sha256-K8eQU/f5s6azGoOwN/0efmkP184t25aHBm5uZZNjIFg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mbxLXR2TBgiwyVGfLmMR5xWk+0f66mPDas95Wla70Lk=";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "telegram-bot-api";
|
||||
version = "9.2";
|
||||
version = "10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdlib";
|
||||
repo = "telegram-bot-api";
|
||||
# https://github.com/tdlib/telegram-bot-api/issues/783
|
||||
rev = "3b6a0b769c4a7fbe064087a4ad9fe6b1dbda498f";
|
||||
hash = "sha256-EpDO1ulIT/RIUjc06BtGRpqdQIMpma5+DRy7i8YVhiU=";
|
||||
rev = "0a9e5696ba149c99bedf972f040d2e28776a8a4f";
|
||||
hash = "sha256-F3TYYB5sI8nadiHUaxW5BOC1XMnEfsrZQX2dLJXA5Mg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
fetchzip,
|
||||
buildGo125Module,
|
||||
buildGo126Module,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGo125Module (finalAttrs: {
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "traefik";
|
||||
version = "3.7.6";
|
||||
version = "3.7.8";
|
||||
|
||||
# Archive with static assets for webui
|
||||
src = fetchzip {
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-7osOcFQIqsMQ0ZiGQMy6Joet/Tlou9BYlzmtyytaMh8=";
|
||||
hash = "sha256-nFc3Mcy0kbeEvyrKfrF9AR60RZOEIMMwsUmefUAi84Y=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lMGuyp3GdcMUdzxu/e3c3ZV1/XWnsqVho2uj230GXzw=";
|
||||
vendorHash = "sha256-z+Ku6GOecoiZ8eJVHUiD/GxV2blSIfLOs+Yr4B8coI8=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -20,16 +20,16 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "vaultwarden";
|
||||
version = "1.36.0";
|
||||
version = "1.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dani-garcia";
|
||||
repo = "vaultwarden";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jc2f7Ia2c+U1cQBXmyzfQAgFMFoAPexLejs6/FKaN9I=";
|
||||
hash = "sha256-7l9tIBCfk8DeQDtIoENnjGUzVWJM3aZxw6eA+YaktlM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sjWBM9SsI/7AQ8SuFiTR19l8kqp3rhy64Uh/1TatH6A=";
|
||||
cargoHash = "sha256-sza4ZQz2+QJJJ03Upt6sGXAv+1VPImN2qZHXaTSALFQ=";
|
||||
|
||||
# used for "Server Installed" version in admin panel
|
||||
env.VW_VERSION = finalAttrs.version;
|
||||
|
||||
@@ -10,25 +10,17 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "vaultwarden-webvault";
|
||||
version = "2026.4.1+0";
|
||||
version = "2026.6.4+0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vaultwarden";
|
||||
repo = "vw_web_builds";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CIKhdCQwx1zS8rkOtZoG9WDxtweSmrCNL6HfZXi+mM8=";
|
||||
hash = "sha256-Uz0wPdhTVy2yOlKWAy5phr+30NmFaIPQQh5bsiWCDLA=";
|
||||
};
|
||||
|
||||
# Upstream lockfile is out of sync for @napi-rs/cli (spec 3.5.1, resolved
|
||||
# 3.2.0), which makes offline `npm ci` hit the registry. The desktop
|
||||
# workspace is unused here. https://github.com/bitwarden/clients/pull/20480
|
||||
postPatch = ''
|
||||
substituteInPlace package-lock.json \
|
||||
--replace-fail '"@napi-rs/cli": "3.5.1"' '"@napi-rs/cli": "3.2.0"'
|
||||
'';
|
||||
|
||||
npmDepsFetcherVersion = 2;
|
||||
npmDepsHash = "sha256-NBhII5HySIkv0bCeWjH6MknX5NMp11Gwno7RnfCKgjc=";
|
||||
npmDepsFetcherVersion = 3;
|
||||
npmDepsHash = "sha256-PaDxqVsq00QIKDmhDhsEbKdM4QXfXn28PgpOyZjB60k=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wayle";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -30,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "wayle-rs";
|
||||
repo = "wayle";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AOHehdowgxEV1b+CwrAhJsUqxQnARIGZPWMRcdH0h+U=";
|
||||
hash = "sha256-3JtLRuXXhOTf8mAcNZipYgBi9h+mncyKoz7MqdfnT2U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4PUXJwUP5h/ggZQbY78BdqMh5oZes1XCeWuT2/S94Z4=";
|
||||
cargoHash = "sha256-RuRoLOGdbbsExsQSnpFS82f7UP0fryORkBmRZfrJ6vk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
||||
@@ -3,24 +3,36 @@
|
||||
zellij-unwrapped,
|
||||
makeBinaryWrapper,
|
||||
stdenvNoCC,
|
||||
symlinkJoin,
|
||||
|
||||
extraPackages ? [ ],
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit (zellij-unwrapped) version meta;
|
||||
pname = "zellij";
|
||||
if extraPackages == [ ] then
|
||||
symlinkJoin {
|
||||
inherit (zellij-unwrapped) version meta;
|
||||
pname = "zellij";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = zellij-unwrapped;
|
||||
dontUnpack = true;
|
||||
paths = [ zellij-unwrapped ];
|
||||
}
|
||||
else
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit (zellij-unwrapped) version meta;
|
||||
pname = "zellij";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
buildPhase = ''
|
||||
cp -rs --no-preserve=mode "$src" "$out"
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
wrapProgram "$out/bin/zellij" \
|
||||
--prefix PATH : '${lib.makeBinPath extraPackages}'
|
||||
'';
|
||||
}
|
||||
src = zellij-unwrapped;
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
buildPhase = ''
|
||||
cp -rs --no-preserve=mode "$src" "$out"
|
||||
|
||||
wrapProgram "$out/bin/zellij" \
|
||||
--prefix PATH : '${lib.makeBinPath extraPackages}'
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "gdown";
|
||||
version = "5.2.1";
|
||||
version = "5.2.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-JHwq0fV521tmtUwE5qhxmV/I/XAhcIuVC4unsyz5AyM=";
|
||||
hash = "sha256-pLr7qmJ9Z72qaNJ06elXEnuoELS89FBeK1fqRaoKoeY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycapnp";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "capnproto";
|
||||
repo = "pycapnp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oRgO/FuNxNMSUla+jIypD/dAvFi27TkEfCHbqovhq9I=";
|
||||
hash = "sha256-WM0DR1lTlgsKpTU8QlquL0RhrqPU/cUQav6p8EP7x9o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -53,8 +53,8 @@ let
|
||||
hash = "sha256-WOFDJYhx31FYm2UcBiBdq+xIdmpdu6PCWZm2m1C+WY4=";
|
||||
};
|
||||
"11" = {
|
||||
version = "11.15.0";
|
||||
hash = "sha256-dy+OAPcZr7viJQJxfPl0V4gEYw0C51frPeu8CKD4+Do=";
|
||||
version = "11.17.0";
|
||||
hash = "sha256-ZE61B5ZU6H2uWaB+YtfwmBYrnOWPBgdzKLXd78ochUE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -12,13 +12,13 @@ let
|
||||
# override options if they need using lib.mkForce (that has 50 priority)
|
||||
mkKernelOverride = lib.mkOverride 90;
|
||||
|
||||
suffix = "zen2";
|
||||
suffix = "zen1";
|
||||
in
|
||||
|
||||
buildLinux (
|
||||
args
|
||||
// rec {
|
||||
version = "7.1.3";
|
||||
version = "7.1.4";
|
||||
pname = "linux-zen";
|
||||
modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
|
||||
isZen = true;
|
||||
@@ -27,7 +27,7 @@ buildLinux (
|
||||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${version}-${suffix}";
|
||||
sha256 = "0af939wq8gfgwrb4s3jjbkqh2pn3zkgk1w48m0hf5fc0qi8ify8x";
|
||||
sha256 = "1k27xhzd390krk60kay6cabl0jlpb26m6cwvdh3r8izbwgx1r0ig";
|
||||
};
|
||||
|
||||
# This is based on the following source:
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"serverVersion": "0.19.18",
|
||||
"uiVersion": "0.19.18",
|
||||
"serverHash": "sha256-NUr96dsH3Gd+1ouOAgPheU0hnDI37a87EN642u482Sg=",
|
||||
"serverCargoHash": "sha256-oI8o+29kqjkAP2DIoSopPMQb5YlZNja1hV1bVmfMIvU=",
|
||||
"uiHash": "sha256-7WcPujev7VrkoX5vvGUvS0hUVJnCZjsceO5zK36jPbw=",
|
||||
"uiPNPMDepsHash": "sha256-dRUD/R7Qtlfy2saX7grfdi5qBDP8gc3L3+C2m7ro1CU="
|
||||
"serverVersion": "0.19.19",
|
||||
"uiVersion": "0.19.19",
|
||||
"serverHash": "sha256-JcJV1dEWlFsbv9eH2yQMGYEZEFB/Pe1xtL1UNtKI6c4=",
|
||||
"serverCargoHash": "sha256-cwmz8Gf7T1IsCRyxo3ap+byX+Aj7+iCTHmZ/IeMN2no=",
|
||||
"uiHash": "sha256-67OMwzOGl+dMX5YNPPBG/QwKOVerkSa7ICbrQl4YBp4=",
|
||||
"uiPNPMDepsHash": "sha256-50IUUymGyaCAeMnWbYJlBytcULr9lvuY9kLVSEqHGL0="
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenvNoCC,
|
||||
libsass,
|
||||
nodejs,
|
||||
pnpm_9,
|
||||
pnpm_11,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
fetchFromGitHub,
|
||||
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_9
|
||||
pnpm_11
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -42,8 +42,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
extraBuildInputs = [ libsass ];
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 3;
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
hash = pinData.uiPNPMDepsHash;
|
||||
};
|
||||
|
||||
|
||||
@@ -9915,6 +9915,9 @@ with pkgs;
|
||||
thunderbird-esr-unwrapped = thunderbirdPackages.thunderbird-esr;
|
||||
thunderbird-esr = wrapThunderbird thunderbird-esr-unwrapped { };
|
||||
|
||||
thunderbird-153-unwrapped = thunderbirdPackages.thunderbird-153;
|
||||
thunderbird-153 = wrapThunderbird thunderbirdPackages.thunderbird-153 { };
|
||||
|
||||
thunderbird-140-unwrapped = thunderbirdPackages.thunderbird-140;
|
||||
thunderbird-140 = wrapThunderbird thunderbirdPackages.thunderbird-140 { };
|
||||
|
||||
|
||||
42
shell.nix
42
shell.nix
@@ -16,7 +16,44 @@
|
||||
nixpkgs ? null,
|
||||
}:
|
||||
let
|
||||
inherit (import ./ci { inherit nixpkgs system; }) pkgs fmt;
|
||||
version = builtins.readFile ./.version;
|
||||
|
||||
# On 26.05 we need a CI-pinned Nixpkgs revision that supports x86_64-darwin.
|
||||
# TODO: remove after 26.05 support ends.
|
||||
nixpkgs' =
|
||||
if nixpkgs == null && system == "x86_64-darwin" && version == "26.05" then
|
||||
let
|
||||
pinned = (builtins.fromJSON (builtins.readFile ./ci/pinned.json)).pins;
|
||||
warn = builtins.warn or (import ./lib).warn;
|
||||
|
||||
inherit (pinned."nixpkgs-26.05-darwin")
|
||||
url
|
||||
hash
|
||||
revision
|
||||
branch
|
||||
;
|
||||
|
||||
withWarning = warn (toString [
|
||||
"The currently pinned Nixpkgs (${pinned.nixpkgs.revision}) does not support ${system},"
|
||||
"using revision (${revision}) from ${branch}."
|
||||
"You may experience some differences to CI."
|
||||
]);
|
||||
in
|
||||
withWarning fetchTarball {
|
||||
inherit url;
|
||||
sha256 = hash;
|
||||
}
|
||||
else
|
||||
nixpkgs;
|
||||
|
||||
inherit
|
||||
(import ./ci {
|
||||
inherit system;
|
||||
nixpkgs = nixpkgs';
|
||||
})
|
||||
pkgs
|
||||
fmt
|
||||
;
|
||||
|
||||
# For `nix-shell -A hello`
|
||||
curPkgs = removeAttrs (import ./. { inherit system; }) [
|
||||
@@ -39,3 +76,6 @@ curPkgs
|
||||
fmt.pkg
|
||||
];
|
||||
}
|
||||
// {
|
||||
formatter = fmt.pkg;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user