mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-21 16:11:22 +00:00
Compare commits
175 Commits
haskell-up
...
nixos-unst
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3d2613bc58 | ||
|
|
a2ba1adc57 | ||
|
|
9eb8d53125 | ||
|
|
30ae08fc15 | ||
|
|
2f416dd717 | ||
|
|
cef4676620 | ||
|
|
6299f15724 | ||
|
|
c3b56f4f37 | ||
|
|
81f100fcd3 | ||
|
|
5d851e5de8 | ||
|
|
3b13af4309 | ||
|
|
6264de63ff | ||
|
|
1f0e819c50 | ||
|
|
aff6e8f81b | ||
|
|
e30321b673 | ||
|
|
d5b45a7aec | ||
|
|
aea07d5467 | ||
|
|
926dff7479 | ||
|
|
618cbe142a | ||
|
|
48270463f9 | ||
|
|
b245a20653 | ||
|
|
2dfcc49541 | ||
|
|
e9d9aba5c3 | ||
|
|
47a83a674e | ||
|
|
e010041a1c | ||
|
|
7a97b46582 | ||
|
|
9a35a633b1 | ||
|
|
d1cfb1257b | ||
|
|
21768dd0d3 | ||
|
|
eae4739480 | ||
|
|
116c1e3081 | ||
|
|
35eef6e660 | ||
|
|
c4e0120b29 | ||
|
|
f554d5c185 | ||
|
|
7b4ef588e7 | ||
|
|
9c905f384f | ||
|
|
bf965e3371 | ||
|
|
de15923fd4 | ||
|
|
3035ece35c | ||
|
|
11e5ee30df | ||
|
|
4e1a6b9978 | ||
|
|
018df009f1 | ||
|
|
1ee98495a4 | ||
|
|
85d32c6e5f | ||
|
|
99f0fe13bb | ||
|
|
139a764283 | ||
|
|
d05d3a7948 | ||
|
|
76ea999e3c | ||
|
|
c2b4dd086c | ||
|
|
461934f388 | ||
|
|
94948cac48 | ||
|
|
36590f1aa5 | ||
|
|
328e46f2d5 | ||
|
|
c59c91caac | ||
|
|
5bb1c78d31 | ||
|
|
132bfa5fb1 | ||
|
|
e6f61a75be | ||
|
|
5255487a13 | ||
|
|
081ac46fd9 | ||
|
|
213657dec5 | ||
|
|
cde6a34995 | ||
|
|
3c3670487c | ||
|
|
0463cf1103 | ||
|
|
c8bef72305 | ||
|
|
9feb9be821 | ||
|
|
5f5ca071b5 | ||
|
|
41ce788712 | ||
|
|
e57770775e | ||
|
|
6d4046caad | ||
|
|
ae8e5722ef | ||
|
|
997e46362d | ||
|
|
fb54c0db70 | ||
|
|
88efee9534 | ||
|
|
5b77f3e998 | ||
|
|
f2a5b31cd0 | ||
|
|
ad27f39e23 | ||
|
|
1bcfe087bc | ||
|
|
d54330d3b7 | ||
|
|
c3d7bab8cb | ||
|
|
c89319cecd | ||
|
|
e4aec92ef4 | ||
|
|
9c4ae73223 | ||
|
|
59f7396bb3 | ||
|
|
6b05bdf9ca | ||
|
|
800db4cdb7 | ||
|
|
928e9dcf55 | ||
|
|
33762cf880 | ||
|
|
17bab8e396 | ||
|
|
9d499eb9c2 | ||
|
|
40a34c7ed4 | ||
|
|
a675a23d9d | ||
|
|
cd096fe274 | ||
|
|
2f40c64032 | ||
|
|
781b33addf | ||
|
|
a4c2cbf7ed | ||
|
|
473c88afdc | ||
|
|
0100014276 | ||
|
|
c2f643c737 | ||
|
|
adff968646 | ||
|
|
2f591b3d0c | ||
|
|
fba34cb854 | ||
|
|
5bea568ef1 | ||
|
|
450f8998ec | ||
|
|
8a3f38adfa | ||
|
|
f41c9ffaf8 | ||
|
|
9de7d23162 | ||
|
|
8ad888d312 | ||
|
|
4975a89f37 | ||
|
|
ff6b395f20 | ||
|
|
2c42d98fef | ||
|
|
7d623801dd | ||
|
|
9f53494108 | ||
|
|
e839d22527 | ||
|
|
9acc6884ec | ||
|
|
cf8fb002dc | ||
|
|
6f91d58030 | ||
|
|
3564d698b4 | ||
|
|
d885685590 | ||
|
|
eb604bb816 | ||
|
|
6df51b8841 | ||
|
|
7d257efe8e | ||
|
|
2fc6f2ca69 | ||
|
|
1331def142 | ||
|
|
0c2094806c | ||
|
|
4498c45926 | ||
|
|
83f90b1f3e | ||
|
|
9ac6af5377 | ||
|
|
96cabcae0b | ||
|
|
b484fe553e | ||
|
|
58cf1f344f | ||
|
|
04ae552b11 | ||
|
|
035c487b76 | ||
|
|
2df46f2027 | ||
|
|
4533e25c33 | ||
|
|
a963d4a090 | ||
|
|
b28f0f581c | ||
|
|
d8a385f207 | ||
|
|
d2c83d7c51 | ||
|
|
6a6c65e3cc | ||
|
|
f3ae846d2e | ||
|
|
721021f3d2 | ||
|
|
ae333564da | ||
|
|
3a82facb52 | ||
|
|
6f54217821 | ||
|
|
6b82c5bb3c | ||
|
|
ccc306cc0f | ||
|
|
c04f9788a4 | ||
|
|
0e97cfc886 | ||
|
|
1637a80ddf | ||
|
|
77710794c3 | ||
|
|
f9420fcd14 | ||
|
|
38c7d77cef | ||
|
|
25eedba608 | ||
|
|
b75c2d3c48 | ||
|
|
b19000e073 | ||
|
|
e7ff1eeaa1 | ||
|
|
1d95bdfbe7 | ||
|
|
27564cf677 | ||
|
|
423f759289 | ||
|
|
c25c3bd088 | ||
|
|
189a9e6e09 | ||
|
|
229de01b92 | ||
|
|
90d18d00f7 | ||
|
|
c0cc2fda70 | ||
|
|
b66a81ae48 | ||
|
|
73f7a6a956 | ||
|
|
f73e5587b6 | ||
|
|
06506eaf4c | ||
|
|
66eeea8723 | ||
|
|
b0daf4616b | ||
|
|
618cae2866 | ||
|
|
1a3cf0df7b | ||
|
|
c780cdde61 | ||
|
|
5b75bc36e1 | ||
|
|
6057da3eea |
26
doc/channels.chapter.md
Normal file
26
doc/channels.chapter.md
Normal file
@@ -0,0 +1,26 @@
|
||||
# How channels work {#how-channels-work}
|
||||
|
||||
nixpkgs uses the [channels feature](https://nixos.org/nix/manual/#sec-channels) of nix.
|
||||
|
||||
nixpkgs is distributed for users of Nix on non-NixOS distributions through the channel
|
||||
`nixpkgs-unstable`. Users of NixOS generally use one of the `nixos-*` channels,
|
||||
e.g. `nixos-22.11`, which includes all packages and modules for the stable NixOS
|
||||
22.11. Stable NixOS releases are generally only given
|
||||
security updates. More up to date packages and modules are available via the
|
||||
`nixos-unstable` channel.
|
||||
|
||||
Both `nixos-unstable` and `nixpkgs-unstable` follow the `master` branch of the
|
||||
nixpkgs repository, although both do lag the `master` branch by generally
|
||||
[a couple of days](https://status.nixos.org/). Updates to a channel are
|
||||
distributed as soon as all tests for that channel pass, e.g.
|
||||
[this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents)
|
||||
shows the status of tests for the `nixpkgs-unstable` channel.
|
||||
|
||||
The tests are conducted by a cluster called [Hydra](https://nixos.org/hydra/),
|
||||
which also builds binary packages from the Nix expressions in Nixpkgs for
|
||||
`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`.
|
||||
The binaries are made available via a [binary cache](https://cache.nixos.org).
|
||||
|
||||
The current Nix expressions of the channels are available in the
|
||||
[nixpkgs repository](https://github.com/NixOS/nixpkgs) in branches
|
||||
that correspond to the channel names (e.g. `nixos-22.11-small`).
|
||||
@@ -1,50 +1,14 @@
|
||||
# Preface {#preface}
|
||||
# Overview {#preface}
|
||||
|
||||
The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the
|
||||
[Nix package manager](https://nixos.org/nix/), released under a
|
||||
[permissive MIT license](https://github.com/NixOS/nixpkgs/blob/master/COPYING).
|
||||
Packages are available for several platforms, and can be used with the Nix
|
||||
package manager on most GNU/Linux distributions as well as [NixOS](https://nixos.org/nixos).
|
||||
Nixpkgs is a set of packages for the [Nix package manager](https://nixos.org/nix/), released under the [MIT license](https://github.com/NixOS/nixpkgs/blob/master/COPYING).
|
||||
|
||||
This document is the user [_reference_](https://nix.dev/contributing/documentation/diataxis#reference) manual for Nixpkgs.
|
||||
It describes the entire public interface of Nixpkgs in a concise and orderly manner, and all relevant behaviors, with examples and cross-references.
|
||||
Further documentation:
|
||||
|
||||
To discover other kinds of documentation:
|
||||
- [nix.dev](https://nix.dev/): Tutorials and guides for getting things done with Nix
|
||||
- [NixOS **Option Search**](https://search.nixos.org/options) and reference documentation
|
||||
- [Nixpkgs **Package Search**](https://search.nixos.org/packages)
|
||||
- [**NixOS** manual](https://nixos.org/manual/nixos/stable/): Reference documentation for the NixOS Linux distribution
|
||||
- [`CONTRIBUTING.md`](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md): Contributing to Nixpkgs, including this manual
|
||||
|
||||
## Overview of Nixpkgs {#overview-of-nixpkgs}
|
||||
- [NixOS Search](https://search.nixos.org)
|
||||
- [Contributing](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md): to Nixpkgs
|
||||
|
||||
Nix expressions describe how to build packages from source and are collected in
|
||||
the [Nixpkgs repository](https://github.com/NixOS/nixpkgs). Also included in the
|
||||
collection are Nix expressions for
|
||||
[NixOS modules](https://nixos.org/nixos/manual/index.html#sec-writing-modules).
|
||||
With these expressions the Nix package manager can build binary packages.
|
||||
the [nixpkgs repository](https://github.com/NixOS/nixpkgs).
|
||||
|
||||
Packages, including the Nix packages collection, are distributed through
|
||||
[channels](https://nixos.org/nix/manual/#sec-channels). The collection is
|
||||
distributed for users of Nix on non-NixOS distributions through the channel
|
||||
`nixpkgs-unstable`. Users of NixOS generally use one of the `nixos-*` channels,
|
||||
e.g., `nixos-22.11`, which includes all packages and modules for the stable NixOS
|
||||
22.11. Stable NixOS releases are generally only given
|
||||
security updates. More up-to-date packages and modules are available via the
|
||||
`nixos-unstable` channel.
|
||||
|
||||
Both `nixos-unstable` and `nixpkgs-unstable` follow the `master` branch of the
|
||||
Nixpkgs repository, although both do lag the `master` branch by generally
|
||||
[a couple of days](https://status.nixos.org/). Updates to a channel are
|
||||
distributed as soon as all tests for that channel pass, e.g.,
|
||||
[this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents)
|
||||
shows the status of tests for the `nixpkgs-unstable` channel.
|
||||
|
||||
The tests are conducted by a cluster called [Hydra](https://nixos.org/hydra/),
|
||||
which also builds binary packages from the Nix expressions in Nixpkgs for
|
||||
`x86_64-linux`, `aarch64-linux`, and `aarch64-darwin`.
|
||||
The binaries are made available via a [binary cache](https://cache.nixos.org).
|
||||
|
||||
The current Nix expressions of the channels are available in the
|
||||
[Nixpkgs repository](https://github.com/NixOS/nixpkgs) in branches
|
||||
that correspond to the channel names (e.g., `nixos-22.11-small`).
|
||||
Packages are distributed through [channels](#how-channels-work).
|
||||
|
||||
@@ -152,6 +152,9 @@
|
||||
"ghc-deprecation-policy": [
|
||||
"index.html#ghc-deprecation-policy"
|
||||
],
|
||||
"how-channels-work": [
|
||||
"index.html#how-channels-work"
|
||||
],
|
||||
"inkscape-plugins": [
|
||||
"index.html#inkscape-plugins"
|
||||
],
|
||||
@@ -395,9 +398,7 @@
|
||||
"index.html#pnpm-build-hook-honored-variables"
|
||||
],
|
||||
"preface": [
|
||||
"index.html#preface"
|
||||
],
|
||||
"overview-of-nixpkgs": [
|
||||
"index.html#preface",
|
||||
"index.html#overview-of-nixpkgs"
|
||||
],
|
||||
"part-using": [
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
# Using Nixpkgs {#part-using}
|
||||
|
||||
```{=include=} chapters
|
||||
channels.chapter.md
|
||||
using/platform-support.chapter.md
|
||||
using/configuration.chapter.md
|
||||
using/overlays.chapter.md
|
||||
|
||||
@@ -154,3 +154,5 @@
|
||||
- If [`system.stateVersion`](#opt-system.stateVersion) is >=26.05, `pkgs.nextcloud33` will be installed by default.
|
||||
- If [`system.stateVersion`](#opt-system.stateVersion) is >=25.11, `pkgs.nextcloud32` will be installed by default.
|
||||
- Please note that Nextcloud prohibits skipping major versions while upgrading. You can upgrade to specific versions by declaring `services.nextcloud.package = pkgs.nextcloud33;`.
|
||||
|
||||
- `trilium-desktop` and `trilium-server` have been updated to 0.104.0. This release includes security hardening fixes that may break functionality. [See upstream release note for details](https://github.com/TriliumNext/Trilium/releases/tag/v0.104.0).
|
||||
|
||||
@@ -16,9 +16,9 @@ let
|
||||
inherit tiling_wm;
|
||||
};
|
||||
stableVersion = {
|
||||
version = "2026.1.1.10"; # "Android Studio Quail 1 | 2026.1.1 Patch 2"
|
||||
sha256Hash = "sha256-+9PxFtEsrtck6o2g0s2ufnkRcPefKqESc+oPLSKiJNw=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.10/android-studio-quail1-patch2-linux.tar.gz";
|
||||
version = "2026.1.2.10"; # "Android Studio Quail 2 | 2026.1.2"
|
||||
sha256Hash = "sha256-ZERaVAkucFbG638aia0RbQ/uwu9flluOWU1iq9tYWQ8=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.10/android-studio-quail2-linux.tar.gz";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2026.1.3.5"; # "Android Studio Quail 3 | 2026.1.3 RC 1"
|
||||
|
||||
@@ -68,11 +68,11 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
jq
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
jq
|
||||
libkrb5
|
||||
zlib
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
|
||||
@@ -73,6 +73,9 @@ let
|
||||
# This cannot be removed, it is used by some extensions.
|
||||
installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [ unpackVsixSetupHook ] ++ nativeBuildInputs;
|
||||
|
||||
installPhase =
|
||||
|
||||
@@ -419,7 +419,11 @@ stdenv.mkDerivation (
|
||||
let
|
||||
nodeModulesPath =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
if lib.versionAtLeast vscodeVersion "1.94.0" then
|
||||
# 1.129 moved node_modules back into app.asar, shipping native
|
||||
# binaries in the asar.unpacked directory like before 1.94
|
||||
if lib.versionAtLeast vscodeVersion "1.129.0" then
|
||||
"Contents/Resources/app/node_modules.asar.unpacked"
|
||||
else if lib.versionAtLeast vscodeVersion "1.94.0" then
|
||||
"Contents/Resources/app/node_modules"
|
||||
else
|
||||
"Contents/Resources/app/node_modules.asar.unpacked"
|
||||
|
||||
@@ -435,7 +435,7 @@ let
|
||||
;;
|
||||
*)
|
||||
# Copy if the symlink resolves to a Mach-O dylib
|
||||
otool -l "$file" 2>/dev/null | grep -q 'LC_ID_DYLIB' || continue
|
||||
otool -l "$file" 2>/dev/null | grep -F 'LC_ID_DYLIB' >/dev/null || continue
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
@@ -842,13 +842,13 @@
|
||||
"vendorHash": "sha256-EAv8EeNn0PJ3BElmg6sKkd/LXNe0lFjEIjHuZRG3CoQ="
|
||||
},
|
||||
"launchdarkly_launchdarkly": {
|
||||
"hash": "sha256-PgAK0BUTSyW4CXssQkENohnhtd2O5GPuFVvSDcHWjQ8=",
|
||||
"hash": "sha256-xQhWB5gUO10v7KXXHci3gvXlI/hg7JXsn9bYxHVGJwc=",
|
||||
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
|
||||
"owner": "launchdarkly",
|
||||
"repo": "terraform-provider-launchdarkly",
|
||||
"rev": "v2.30.0",
|
||||
"rev": "v2.30.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM="
|
||||
"vendorHash": "sha256-9RisIZUblqqylMW6Bz6ehpwRUXyvTdicuhEGI+n5G3Y="
|
||||
},
|
||||
"linode_linode": {
|
||||
"hash": "sha256-N/SVZ1ajNRT53zxdYBT6Hd/wwAuKhEre0QSZUYbkwGA=",
|
||||
|
||||
@@ -105,11 +105,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "weechat";
|
||||
version = "4.9.3";
|
||||
version = "4.9.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
|
||||
hash = "sha256-XH2VOfqGyZ6nalUaiJqSusIeq3uyeQ29NGRS0AsQw3w=";
|
||||
hash = "sha256-P8UDWfOjsljJ8DFIsC87nFkZRTXRtGXEgfuFp2wu0AU=";
|
||||
};
|
||||
|
||||
# Why is this needed? https://github.com/weechat/weechat/issues/2031
|
||||
|
||||
@@ -13,13 +13,13 @@ let
|
||||
mkHyprlandPlugin,
|
||||
}:
|
||||
let
|
||||
version = "0.55.0";
|
||||
version = "0.56.0";
|
||||
|
||||
hyprland-plugins-src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprland-plugins";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WMUJ7tyw/9QbKUyRzLndEQSqX05fQLmFlRdMAmPD7tI=";
|
||||
hash = "sha256-piRpwar7VZI3YviYo0a/UMFz9+rLesfv3nRLGKxjVGg=";
|
||||
};
|
||||
in
|
||||
mkHyprlandPlugin {
|
||||
|
||||
58
pkgs/by-name/ae/aerion-creds/package.nix
Normal file
58
pkgs/by-name/ae/aerion-creds/package.nix
Normal file
@@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.3.2";
|
||||
|
||||
archMap = {
|
||||
"x86_64-linux" = "x86_64";
|
||||
"aarch64-linux" = "aarch64";
|
||||
};
|
||||
sysArch =
|
||||
archMap.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported architecture: ${stdenv.hostPlatform.system}");
|
||||
|
||||
shimHashes = {
|
||||
"x86_64" = "sha256-8WvuQgWTJNe4UpmS6uSYDYm46sIqxJbwVZ/J3CRz0OI=";
|
||||
"aarch64" = "sha256-4RvFbxJGwM70huziY2ELoCouTrtMasgoqFUncBeBFvU=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "aerion-creds";
|
||||
inherit version;
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hkdb/aerion/releases/download/v${version}/flathub-build-env-v${version}-linux-${sysArch}";
|
||||
hash = shimHashes.${sysArch};
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp $src $out/bin/aerion-creds
|
||||
chmod +x $out/bin/aerion-creds
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "OAuth credentials shim for Aerion";
|
||||
homepage = "https://github.com/hkdb/aerion";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ curious ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
103
pkgs/by-name/ae/aerion/package.nix
Normal file
103
pkgs/by-name/ae/aerion/package.nix
Normal file
@@ -0,0 +1,103 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
gtk3,
|
||||
webkitgtk_4_1,
|
||||
glib,
|
||||
|
||||
aerion-creds,
|
||||
withOAuth ? false,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hkdb";
|
||||
repo = "aerion";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-elmk4huz4mvc7t+5/ZM5AK2R4pSKrLsZM0HxWFmQldE=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
pname = "aerion-frontend";
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}/frontend";
|
||||
|
||||
npmDepsHash = "sha256-dC+xGwSqdzItIfDipAVIVnbUJHiFkmzanjV/5xFsbkc=";
|
||||
|
||||
buildPhase = ''
|
||||
npm run build
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r dist/* $out/
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "aerion";
|
||||
inherit version src;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
vendorHash = "sha256-ptsrOpJo3i+yRSCGuHynbzi+C+GD/mBmPuHqWSVV/+4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
gtk3
|
||||
webkitgtk_4_1
|
||||
glib
|
||||
];
|
||||
|
||||
tags = [
|
||||
"production"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
"desktop"
|
||||
"webkit2_41"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p frontend/dist
|
||||
cp -r ${frontend}/* frontend/dist/
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isLinux (
|
||||
''
|
||||
install -Dm644 build/linux/aerion.png $out/share/pixmaps/io.github.hkdb.Aerion.png
|
||||
install -Dm644 build/linux/aerion.desktop $out/share/applications/io.github.hkdb.Aerion.desktop
|
||||
''
|
||||
+ lib.optionalString withOAuth ''
|
||||
rm -f $out/bin/aerion-creds
|
||||
ln -s ${aerion-creds}/bin/aerion-creds $out/bin/aerion-creds
|
||||
''
|
||||
);
|
||||
|
||||
passthru = {
|
||||
inherit frontend;
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "An Open Source Lightweight E-Mail Client";
|
||||
homepage = "https://github.com/hkdb/aerion";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "aerion";
|
||||
maintainers = with lib.maintainers; [ curious ];
|
||||
};
|
||||
}
|
||||
33
pkgs/by-name/ae/aerion/update.sh
Executable file
33
pkgs/by-name/ae/aerion/update.sh
Executable file
@@ -0,0 +1,33 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix nix-update nix-prefetch-scripts common-updater-scripts
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||
aerion_creds_file="$nixpkgs/pkgs/by-name/ae/aerion-creds/package.nix"
|
||||
|
||||
version=$(list-git-tags --url=https://github.com/hkdb/aerion \
|
||||
| grep -oP '^v\d+\.\d+\.\d+$' \
|
||||
| sed 's/^v//' \
|
||||
| sort -V \
|
||||
| tail -1)
|
||||
|
||||
echo "Updating aerion and aerion-creds to v$version"
|
||||
|
||||
# Update version in creds file
|
||||
sed -i "s/version = \".*\";/version = \"$version\";/" "$aerion_creds_file"
|
||||
|
||||
# Update creds binary hashes
|
||||
for arch in x86_64 aarch64; do
|
||||
url="https://github.com/hkdb/aerion/releases/download/v$version/flathub-build-env-v$version-linux-$arch"
|
||||
echo " Fetching creds hash for $arch..."
|
||||
hash=$(nix-prefetch-url --type sha256 "$url")
|
||||
sri_hash=$(nix-hash --to-sri --type sha256 "$hash")
|
||||
sed -i "s|\"$arch\" = \"sha256-[^\"]*\";|\"$arch\" = \"$sri_hash\";|" "$aerion_creds_file"
|
||||
done
|
||||
|
||||
# Update main package (handles version, source hash, npmDepsHash, vendorHash)
|
||||
cd "$nixpkgs"
|
||||
nix-update --version="$version" --subpackage frontend aerion
|
||||
|
||||
echo "Done!"
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "android-studio-tools";
|
||||
version = "14742923";
|
||||
version = "15859902";
|
||||
|
||||
src = fetchzip {
|
||||
# The only difference between the Linux and Mac versions is a single comment at the top of all the scripts
|
||||
# Therefore, we will use the Linux version and just patch the comment
|
||||
url = "https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip";
|
||||
hash = "sha256-oimC4ToDFIa8Rlv+5RB+swl8M5PHdX4omlrMZMQEx8M=";
|
||||
url = "https://dl.google.com/android/repository/commandlinetools-linux-15859902_latest.zip";
|
||||
hash = "sha256-tCbccw7qa7ncHGyWPWjwQOpaisN3QMRYXRpK7WtyjWY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
hwdata,
|
||||
@@ -21,7 +21,7 @@
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
}:
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aquamarine";
|
||||
version = "0.13.0";
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "arftracksat";
|
||||
version = "1.0-unstable-2025-09-15";
|
||||
version = "1.0-unstable-2026-02-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arf20";
|
||||
repo = "arftracksat";
|
||||
rev = "5c9b3866b6fcd95382ff56c68cdd38f3d08c1372";
|
||||
hash = "sha256-inCgsxrJkBNGmdGPd28XnOJYCiatL35TxDcfvZjA2cY=";
|
||||
rev = "a9b86878e2ee6f332dc1df07685b7d20970c2f7e";
|
||||
hash = "sha256-guDgy4H0pnQCihYwG7HoKApOlEcDtcaRaj6fRuVdLlc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -35,11 +35,13 @@ stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
curl
|
||||
nlohmann_json
|
||||
curlpp
|
||||
glm
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
freeglut
|
||||
libGL
|
||||
libGLU
|
||||
curlpp
|
||||
glm
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -46,14 +46,14 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit-zfs";
|
||||
version = "1.2.30";
|
||||
version = "1.2.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "45Drives";
|
||||
repo = "cockpit-zfs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-G24xNoKoBnlXxxyo9IJIoQW3PrktQxsx37/cX6QYfyE=";
|
||||
hash = "sha256-3KoCp4gcWYuama+7t1oQhif3/Ii/zSlhyeNTH3mvbNg=";
|
||||
};
|
||||
|
||||
missingHashes = ./missing-hashes.json;
|
||||
|
||||
@@ -7,8 +7,6 @@
|
||||
opus,
|
||||
lib,
|
||||
stdenv,
|
||||
# TODO: Clean up on `staging`
|
||||
lld,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -33,21 +31,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
]
|
||||
# TODO: Clean up on `staging`
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
lld
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
# TODO: Clean up on `staging`
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' lld "ld64.lld"}";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dnscontrol";
|
||||
version = "4.42.0";
|
||||
version = "4.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DNSControl";
|
||||
repo = "dnscontrol";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iB2PFPvcASRwpBkFJQ3Vi2r89H3a9BBbC1moAymWDOI=";
|
||||
hash = "sha256-7t/j6vLeoYHTf7wMIZ1hns1Uo0udEqTu/0K/96C5aPQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8rL5v/0Vb+gxmbDaEB57UsQEnKCJtbZh0lFUyKYMZgs=";
|
||||
vendorHash = "sha256-NEFfYDLo/UiITlUd7XptBmWesJQexvaXH95gyMpgNqA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gotip";
|
||||
version = "0.6.4";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lusingander";
|
||||
repo = "gotip";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CgTznW4SwKrJ4Q7dIo2ebn51G13nP36tv8n2G9T+MZ0=";
|
||||
hash = "sha256-W4N6O7cAUIFytjHIqbe7qSmuPHIpyhecw7bLyIP/LRU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Sj7JzyWviGxp10O1zGONN49TXtwquXYJ1KoijIVcyj0=";
|
||||
vendorHash = "sha256-fQ/rx7gyBcQ3nE/eiCJgtjZCa50iZAuodIZjaRG/mjE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
@@ -12,7 +12,7 @@
|
||||
tomlplusplus,
|
||||
nix-update-script,
|
||||
}:
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprcursor";
|
||||
version = "0.1.13";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
cmake,
|
||||
@@ -20,7 +20,7 @@
|
||||
pixman,
|
||||
}:
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprgraphics";
|
||||
version = "0.5.1";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
cmake,
|
||||
@@ -16,7 +16,7 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hypridle";
|
||||
version = "0.1.7";
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
}:
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland-protocols";
|
||||
version = "0.7.0";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
@@ -8,7 +8,7 @@
|
||||
pkg-config,
|
||||
hyprlang,
|
||||
}:
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland-qt-support";
|
||||
version = "0.1.0";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
@@ -13,7 +13,7 @@
|
||||
let
|
||||
inherit (lib.strings) makeBinPath;
|
||||
in
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland-qtutils";
|
||||
version = "0.1.5";
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"branch": "v0.55.4-b",
|
||||
"commit_hash": "a0136d8c04687bb36eb8a28eb9d1ff92aea99704",
|
||||
"commit_message": "[gha] Nix: update inputs",
|
||||
"date": "2026-06-11",
|
||||
"tag": "v0.55.4"
|
||||
"branch": "main",
|
||||
"commit_hash": "36b2e0cfe0c6094dbc47bd42a437431315bb3087",
|
||||
"commit_message": "version: bump to 0.56.0",
|
||||
"date": "2026-07-20",
|
||||
"tag": "v0.56.0"
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
stdenvAdapters,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
@@ -22,6 +22,7 @@
|
||||
lcms2,
|
||||
libGL,
|
||||
libdrm,
|
||||
libei,
|
||||
libexecinfo,
|
||||
libgbm,
|
||||
libinput,
|
||||
@@ -34,6 +35,7 @@
|
||||
pkgconf,
|
||||
python3,
|
||||
re2,
|
||||
readline,
|
||||
systemd,
|
||||
tomlplusplus,
|
||||
uwsm,
|
||||
@@ -48,7 +50,7 @@
|
||||
xwayland,
|
||||
debug ? false,
|
||||
enableXWayland ? true,
|
||||
withSystemd ? lib.meta.availableOn gcc15Stdenv.hostPlatform systemd,
|
||||
withSystemd ? lib.meta.availableOn gcc16Stdenv.hostPlatform systemd,
|
||||
wrapRuntimeDeps ? true,
|
||||
}:
|
||||
let
|
||||
@@ -75,22 +77,22 @@ let
|
||||
# which would be controlled by the `debug` flag
|
||||
# Condition on darwin to avoid breaking eval for darwin in CI,
|
||||
# even though darwin is not supported anyway.
|
||||
adapters = lib.optionals (!gcc15Stdenv.targetPlatform.isDarwin) [
|
||||
adapters = lib.optionals (!gcc16Stdenv.targetPlatform.isDarwin) [
|
||||
stdenvAdapters.useMoldLinker
|
||||
];
|
||||
|
||||
customStdenv = foldl' (acc: adapter: adapter acc) gcc15Stdenv adapters;
|
||||
customStdenv = foldl' (acc: adapter: adapter acc) gcc16Stdenv adapters;
|
||||
in
|
||||
customStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland" + optionalString debug "-debug";
|
||||
version = "0.55.4";
|
||||
version = "0.56.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprland";
|
||||
fetchSubmodules = true;
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IuT0HnOr/0rAw+GXr+OwWx89FjA4Og1FqP7vywEwRJM=";
|
||||
hash = "sha256-TWj51lMAgmEYl5x87wsKbuyWDk6QEG5t1uchw9zdJNE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -156,6 +158,7 @@ customStdenv.mkDerivation (finalAttrs: {
|
||||
lcms2
|
||||
libGL
|
||||
libdrm
|
||||
libei
|
||||
libgbm
|
||||
libinput
|
||||
libuuid
|
||||
@@ -166,6 +169,7 @@ customStdenv.mkDerivation (finalAttrs: {
|
||||
pango
|
||||
pciutils
|
||||
re2
|
||||
readline
|
||||
tomlplusplus
|
||||
wayland
|
||||
wayland-protocols
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
hyprutils,
|
||||
}:
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprlang";
|
||||
version = "0.6.8";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
@@ -17,7 +17,7 @@
|
||||
pixman,
|
||||
}:
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprlauncher";
|
||||
version = "0.1.6";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
@@ -26,7 +26,7 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprlock";
|
||||
version = "0.9.6";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
hyprwayland-scanner,
|
||||
@@ -34,7 +34,7 @@
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprpaper";
|
||||
version = "0.8.4";
|
||||
|
||||
@@ -97,7 +97,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.bsd3;
|
||||
teams = [ lib.teams.hyprland ];
|
||||
inherit (wayland.meta) platforms;
|
||||
broken = gcc15Stdenv.hostPlatform.isDarwin;
|
||||
broken = gcc16Stdenv.hostPlatform.isDarwin;
|
||||
mainProgram = "hyprpaper";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
@@ -18,7 +18,7 @@
|
||||
libxdmcp,
|
||||
debug ? false,
|
||||
}:
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprpicker" + lib.optionalString debug "-debug";
|
||||
version = "0.4.7";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
cmake,
|
||||
pkg-config,
|
||||
fetchFromGitHub,
|
||||
@@ -10,7 +10,7 @@
|
||||
polkit,
|
||||
qt6,
|
||||
}:
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprpolkitagent";
|
||||
version = "0.1.3";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
@@ -14,7 +14,7 @@
|
||||
pixman,
|
||||
}:
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprpwcenter";
|
||||
version = "0.1.2";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
@@ -16,7 +16,7 @@
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprshutdown";
|
||||
version = "0.1.1";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
@@ -13,7 +13,7 @@
|
||||
wayland-scanner,
|
||||
nix-update-script,
|
||||
}:
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprsunset";
|
||||
version = "0.3.3";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
@@ -13,7 +13,7 @@
|
||||
let
|
||||
inherit (lib.strings) makeBinPath;
|
||||
in
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprsysteminfo";
|
||||
version = "0.1.3";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
@@ -23,7 +23,7 @@
|
||||
wayland-protocols,
|
||||
}:
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprtoolkit";
|
||||
version = "0.5.4";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
cmake,
|
||||
pkg-config,
|
||||
pixman,
|
||||
@@ -8,15 +8,15 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprutils";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprutils";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE=";
|
||||
hash = "sha256-XnAVV+H4f8Xdv0yZcSwJ5kCjLyE8fHxPeLX6a3HSrAU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
pugixml,
|
||||
nix-update-script,
|
||||
}:
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprwayland-scanner";
|
||||
version = "0.4.6";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
gcc15Stdenv,
|
||||
gcc16Stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
@@ -9,7 +9,7 @@
|
||||
pugixml,
|
||||
}:
|
||||
|
||||
gcc15Stdenv.mkDerivation (finalAttrs: {
|
||||
gcc16Stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprwire";
|
||||
version = "0.3.1";
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "inputplumber";
|
||||
version = "0.77.7";
|
||||
version = "0.78.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShadowBlip";
|
||||
repo = "InputPlumber";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LECHrL+yopymcdpuEZUFvNX1QI30Z+mOtMYP7fnMpBM=";
|
||||
hash = "sha256-wa05/gStEbXUZLvokY1N4k4f4/cPm2Kolbf+AF479lU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1g4nHBu9LUMMr0bPkD4LCEFyyIc+GdhIWu+hlyGH3IM=";
|
||||
cargoHash = "sha256-lScpMua5czwmnz/+fz+UrgZSWHwRNP7zB317xJS+6gs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
built with Rust. Features include file persistence, keyboard-driven
|
||||
navigation, multi-select capabilities, and sprint management.
|
||||
'';
|
||||
homepage = "https://kanban.yoon.se";
|
||||
homepage = "https://kanban.rs";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fulsomenko ];
|
||||
mainProgram = "kanban";
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kn";
|
||||
version = "1.22.0";
|
||||
version = "1.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knative";
|
||||
repo = "client";
|
||||
tag = "knative-v${finalAttrs.version}";
|
||||
hash = "sha256-G5kadNskSwKBxSuvs58aJUM7+lraevk2GKH/sncslTo=";
|
||||
hash = "sha256-/mQvYYMwOvrwrIt8xo3j5qXXmfwDFJByaj1quHc5ebk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+IiDWoT9E4SCkmOwPQMTM7AdrXVA6OJa0Fg9Xjq42gI=";
|
||||
vendorHash = "sha256-1CTzRMlMsF4AZHYZMq0klmNpfmk4/O6ToitHyA9eEg0=";
|
||||
|
||||
env.GOWORK = "off";
|
||||
|
||||
@@ -48,7 +48,7 @@ buildGoModule (finalAttrs: {
|
||||
description = "Create Knative resources interactively from the command line or from within scripts";
|
||||
mainProgram = "kn";
|
||||
homepage = "https://github.com/knative/client";
|
||||
changelog = "https://github.com/knative/client/releases/tag/v${finalAttrs.version}";
|
||||
changelog = "https://github.com/knative/client/releases/tag/knative-v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libdeltachat";
|
||||
version = "2.53.0";
|
||||
version = "2.55.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chatmail";
|
||||
repo = "core";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-W2Yh5+6MaJ47GqJioGKge2J3RetGGTcl+0YxPPlSdDo=";
|
||||
hash = "sha256-Iy0VeWfD0GXdQiGZbn95p9SJ4MUSYBwsYLnI5NvgUl4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "chatmail-core";
|
||||
inherit (finalAttrs) version src;
|
||||
hash = "sha256-aoPc5XvjwwuA9aOTvIOpTm15wozC9glJGqn3vPqsJF4=";
|
||||
hash = "sha256-BfvLWldH4gbnB/ehywB40Ho1IZB/Kv5szmtMTVRsvqk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -47,14 +47,14 @@ in
|
||||
# as bootloader for various platforms and corresponding binary and helper files.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "limine";
|
||||
version = "12.5.0";
|
||||
version = "12.5.1";
|
||||
|
||||
# We don't use the Git source but the release tarball, as the source has a
|
||||
# `./bootstrap` script performing network access to download resources.
|
||||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-U9XLJ3LqigBuE37i4yDYTvlP98V/iApkDReH2S55/Oc=";
|
||||
hash = "sha256-aGdx+IynrVBtI3Z5Zic/e5aVNWQeAFsxXr8xjIV1MTM=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -24,9 +24,13 @@ makeSetupHook {
|
||||
|
||||
passthru = {
|
||||
# Extract the function call used to create a binary wrapper from its embedded docstring
|
||||
extractCmd = writeShellScript "extract-binary-wrapper-cmd" ''
|
||||
${targetPackages.gnuStdenv.cc.bintools.targetPrefix}strings -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p'
|
||||
'';
|
||||
extractCmd =
|
||||
let
|
||||
bintools = targetPackages.gnuStdenv.cc.bintools;
|
||||
in
|
||||
writeShellScript "extract-binary-wrapper-cmd" ''
|
||||
${lib.getExe' bintools "${bintools.targetPrefix}strings"} -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p'
|
||||
'';
|
||||
|
||||
tests = tests.makeBinaryWrapper;
|
||||
};
|
||||
|
||||
@@ -4,13 +4,14 @@
|
||||
fetchpatch,
|
||||
callPackage,
|
||||
runCommand,
|
||||
python,
|
||||
python3,
|
||||
encryptionSupport ? true,
|
||||
sqliteSupport ? true,
|
||||
}:
|
||||
|
||||
let
|
||||
maubot = python.pkgs.buildPythonPackage (finalAttrs: {
|
||||
python = python3;
|
||||
|
||||
maubot = python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "maubot";
|
||||
version = "0.6.0";
|
||||
pyproject = true;
|
||||
@@ -56,9 +57,6 @@ let
|
||||
python-olm
|
||||
pycryptodome
|
||||
unpaddedbase64
|
||||
]
|
||||
++ lib.optionals sqliteSupport [
|
||||
sqlalchemy_1_3
|
||||
];
|
||||
|
||||
# used for plugin tests
|
||||
@@ -28,8 +28,11 @@ lib.flip builtins.mapAttrs json (
|
||||
dash = builtins.replaceStrings [ "_" ] [ "-" ] packageName;
|
||||
lowerDash = builtins.replaceStrings [ "_" ] [ "-" ] lower;
|
||||
in
|
||||
python3.pkgs.${packageName} or python3.pkgs.${lower} or python3.pkgs.${dash}
|
||||
or python3.pkgs.${lowerDash} or null
|
||||
if lower == "maubot" then
|
||||
null
|
||||
else
|
||||
python3.pkgs.${packageName} or python3.pkgs.${lower} or python3.pkgs.${dash}
|
||||
or python3.pkgs.${lowerDash} or null
|
||||
) (builtins.filter (x: x != "maubot" && x != null) deps);
|
||||
|
||||
reqDeps = resolveDeps (lib.toList (manifest.dependencies or null));
|
||||
@@ -213,8 +213,8 @@ def main():
|
||||
for plugin_name in os.listdir(directory):
|
||||
process_repo(os.path.join(directory, plugin_name), official)
|
||||
|
||||
if os.path.isdir("pkgs/development/python-modules/maubot/plugins"):
|
||||
generated = "pkgs/development/python-modules/maubot/plugins/generated.json"
|
||||
if os.path.isdir("pkgs/by-name/ma/maubot/plugins"):
|
||||
generated = "pkgs/by-name/ma/maubot/plugins/generated.json"
|
||||
else:
|
||||
script_dir = os.path.dirname(os.path.realpath(__file__))
|
||||
generated = os.path.join(script_dir, "generated.json")
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.11.0";
|
||||
version = "0.12.1";
|
||||
|
||||
# me3 creates a pipe under /tmp needed by the compat tool subprocess
|
||||
steam-run =
|
||||
@@ -22,10 +22,10 @@ let
|
||||
owner = "garyttierney";
|
||||
repo = "me3";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-XyeMVPGzNF2syipLz9HPtUg7lhxcEq434FnRH3Ax+HM=";
|
||||
sha256 = "sha256-pGK6A85Xp6NbpYRKJTgi47acv4c8dZgb+Jdmeu8F/uU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-T1HeYe9FUC5oy/SDeEd6vV4D9YIGIXMkbzf43gRNyt8=";
|
||||
cargoHash = "sha256-ss2NkDHfd5NBLGpnZ80UdvO0nn2mGueO0mnlWkog1jc=";
|
||||
|
||||
me3-cli = rustPlatform.buildRustPackage (final: {
|
||||
inherit cargoHash version src;
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
diff --git a/minigalaxy/launcher.py b/minigalaxy/launcher.py
|
||||
index aeca3e3..aeb6763 100644
|
||||
--- a/minigalaxy/launcher.py
|
||||
+++ b/minigalaxy/launcher.py
|
||||
@@ -84,6 +84,7 @@ def get_execute_command(game) -> list:
|
||||
if game.get_info("use_mangohud") is True:
|
||||
exe_cmd.insert(0, "mangohud")
|
||||
exe_cmd.insert(1, "--dlsym")
|
||||
+ exe_cmd.insert(0, "@steamrun@")
|
||||
exe_cmd = get_exe_cmd_with_var_command(game, exe_cmd)
|
||||
logger.info("Launch command for %s: %s", game.name, " ".join(exe_cmd))
|
||||
return exe_cmd
|
||||
diff --git a/tests/test_installer.py b/tests/test_installer.py
|
||||
index d459b62..dee93cb 100644
|
||||
--- a/tests/test_installer.py
|
||||
+++ b/tests/test_installer.py
|
||||
@@ -405,13 +405,13 @@ class Test(TestCase):
|
||||
mock_list_dir.return_value = ["data", "docs", "scummvm", "support", "beneath.ini", "gameinfo", "start.sh"]
|
||||
|
||||
result1 = installer.get_exec_line(game1)
|
||||
- self.assertEqual("scummvm -c beneath.ini", result1)
|
||||
+ self.assertEqual("@steamrun@ scummvm -c beneath.ini", result1)
|
||||
|
||||
game2 = Game("Blocks That Matter", install_dir="/home/test/GOG Games/Blocks That Matter", platform="linux")
|
||||
mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"]
|
||||
|
||||
result2 = installer.get_exec_line(game2)
|
||||
- self.assertEqual('"/home/test/GOG Games/Blocks That Matter/start.sh"', result2)
|
||||
+ self.assertEqual('@steamrun@ "/home/test/GOG Games/Blocks That Matter/start.sh"', result2)
|
||||
|
||||
@mock.patch('os.path.getsize')
|
||||
@mock.patch('os.listdir')
|
||||
47
pkgs/by-name/mi/minigalaxy/inject-launcher-umu-run.diff
Normal file
47
pkgs/by-name/mi/minigalaxy/inject-launcher-umu-run.diff
Normal file
@@ -0,0 +1,47 @@
|
||||
diff --git a/minigalaxy/installer.py b/minigalaxy/installer.py
|
||||
index a68c2c8..2a34680 100644
|
||||
--- a/minigalaxy/installer.py
|
||||
+++ b/minigalaxy/installer.py
|
||||
@@ -477,7 +477,7 @@ def postinstaller(game):
|
||||
postinst_script = os.path.join(game.install_dir, "support", "postinst.sh")
|
||||
if os.path.isfile(postinst_script):
|
||||
os.chmod(postinst_script, 0o775)
|
||||
- stdout, stderr, exitcode = _exe_cmd([postinst_script])
|
||||
+ stdout, stderr, exitcode = _exe_cmd(["env", "PROTONPATH=umu-sniper", "@umurun@", postinst_script])
|
||||
if exitcode not in [0]:
|
||||
err_msg = "Postinstallation script failed: {}".format(postinst_script)
|
||||
return err_msg
|
||||
diff --git a/minigalaxy/launch_command.py b/minigalaxy/launch_command.py
|
||||
index fc27c1a..cf9de5f 100644
|
||||
--- a/minigalaxy/launch_command.py
|
||||
+++ b/minigalaxy/launch_command.py
|
||||
@@ -11,11 +11,15 @@ class LaunchCommand:
|
||||
command: list[str]
|
||||
|
||||
def apply_game_launch_config(self, game: Game) -> None:
|
||||
+ if self.name == "start.sh":
|
||||
+ self.command.insert(0, "@umurun@")
|
||||
if game.get_info(InfoKey.GAMEMODE) is True:
|
||||
self.command.insert(0, "gamemoderun")
|
||||
if game.get_info(InfoKey.MANGOHUD) is True:
|
||||
self.command.insert(0, "mangohud")
|
||||
- self.command.insert(1, "--dlsym")
|
||||
+ if self.name == "start.sh":
|
||||
+ self.command.insert(0, "PROTONPATH=umu-sniper")
|
||||
+ self.command.insert(0, "env")
|
||||
|
||||
var_list = shlex.split(game.get_info(InfoKey.VARIABLES))
|
||||
command_list = shlex.split(game.get_info(InfoKey.COMMAND))
|
||||
diff --git a/tests/test_installer.py b/tests/test_installer.py
|
||||
index 4b2fe1e..fd4dfef 100644
|
||||
--- a/tests/test_installer.py
|
||||
+++ b/tests/test_installer.py
|
||||
@@ -440,7 +440,7 @@ class Test(TestCase):
|
||||
mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"]
|
||||
|
||||
result2 = installer.get_exec_line(game2)
|
||||
- self.assertEqual('"/home/test/GOG Games/Blocks That Matter/start.sh"', result2)
|
||||
+ self.assertEqual('env PROTONPATH=umu-sniper @umurun@ "/home/test/GOG Games/Blocks That Matter/start.sh"', result2)
|
||||
|
||||
@mock.patch('os.path.getsize')
|
||||
@mock.patch('os.listdir')
|
||||
@@ -1,15 +1,16 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
glibcLocales,
|
||||
glib-networking,
|
||||
glibcLocales,
|
||||
gobject-introspection,
|
||||
gtk3,
|
||||
innoextract,
|
||||
lib,
|
||||
libnotify,
|
||||
nix-update-script,
|
||||
python3Packages,
|
||||
steam-run,
|
||||
replaceVars,
|
||||
umu-launcher,
|
||||
unzip,
|
||||
webkitgtk_4_1,
|
||||
wrapGAppsHook3,
|
||||
@@ -18,25 +19,25 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "minigalaxy";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkwouter";
|
||||
repo = "minigalaxy";
|
||||
tag = version;
|
||||
hash = "sha256-YZhgVeWdVaNiTj7hvYuHbaVtoKN6EFoOANWdkrlj4dU=";
|
||||
hash = "sha256-qq5XLWmQ0x6/hK8beKxJDxHmbu//EuukuyOG+CpF9ug=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(replaceVars ./inject-launcher-steam-run.diff {
|
||||
steamrun = lib.getExe steam-run;
|
||||
(replaceVars ./inject-launcher-umu-run.diff {
|
||||
umurun = lib.getExe umu-launcher;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
gobject-introspection
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -72,6 +73,7 @@ python3Packages.buildPythonApplication rec {
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
--suffix PATH : "${
|
||||
lib.makeBinPath [
|
||||
innoextract
|
||||
unzip
|
||||
xdg-utils
|
||||
]
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
openssl,
|
||||
cmake,
|
||||
cacert,
|
||||
tzdata,
|
||||
usage,
|
||||
mise,
|
||||
testers,
|
||||
runCommand,
|
||||
jq,
|
||||
@@ -22,16 +22,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mise";
|
||||
version = "2026.7.5";
|
||||
version = "2026.7.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdx";
|
||||
repo = "mise";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oHZXd9u+FbwOs60yrmg5oSnQoHskVCi29TRgu0RKOpM=";
|
||||
hash = "sha256-klEexXMGaGM0YkcSDaHa8lD1jdwAfCcms7soRKy3r3w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JXipQn9gN5cJx6PSpDYHuxjYLNRyAwpjSaROxqSvIog=";
|
||||
cargoHash = "sha256-O32fVQGb8+ECopUPeU9Pm8xKP4Aj494MtyHYwR3wFnM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@@ -69,8 +69,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
# disable warnings as errors for aws-lc-sys in checkPhase
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
env = {
|
||||
# disable warnings as errors for aws-lc-sys in checkPhase
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
# tera date helper tests look up timezone data via TZDIR.
|
||||
TZDIR = "${tzdata}/share/zoneinfo";
|
||||
};
|
||||
|
||||
checkFlags = [
|
||||
# last_modified will always be different in nix
|
||||
@@ -113,7 +117,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
};
|
||||
tests = {
|
||||
version = (testers.testVersion { package = mise; }).overrideAttrs (old: {
|
||||
version = (testers.testVersion { package = finalAttrs.finalPackage; }).overrideAttrs (old: {
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [ cacert ];
|
||||
});
|
||||
usageCompat =
|
||||
@@ -121,7 +125,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
runCommand "mise-usage-compatibility"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
mise
|
||||
finalAttrs.finalPackage
|
||||
usage
|
||||
jq
|
||||
];
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "13.18";
|
||||
version = "13.19";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
|
||||
hash = "sha256-zNEEJSHdr89lsLGBIL2lXixSCk0Wj1kgT0GKpph5jXY=";
|
||||
hash = "sha256-i2FNQB6ZMt2ZnWjVr3UDSqxHav/MAKuDwC+h+gXW/Ik=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -375,6 +375,7 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer):
|
||||
# Without this the popover can still be closed by clicking outside of it
|
||||
# It handles auto-closing when the user clicks a href.
|
||||
close_menu_js = """
|
||||
//<![CDATA[
|
||||
document.addEventListener("DOMContentLoaded", () => {
|
||||
const nav = document.getElementById("manual-toc");
|
||||
nav?.addEventListener("click", (e) => {
|
||||
@@ -383,6 +384,7 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer):
|
||||
}
|
||||
});
|
||||
});
|
||||
//]]>
|
||||
"""
|
||||
intersection_observer_js = """
|
||||
function createObserver() {
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opengamepadui";
|
||||
version = "0.45.0";
|
||||
version = "0.45.1";
|
||||
|
||||
buildType = if withDebug then "debug" else "release";
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ShadowBlip";
|
||||
repo = "OpenGamepadUI";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-B3s9fJzOUNKqvdz1CuJQKJTcQKBUsn8cEV0F6e9Pjr0=";
|
||||
hash = "sha256-4pLorBNCKX9gq9uE7uqi05r6eBwerZJpThzbiK6FOXo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "osslsigncode";
|
||||
version = "2.13";
|
||||
version = "2.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtrojnar";
|
||||
repo = "osslsigncode";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-63SIyjG91i6ldA3NpOG5X5fT8vTRqNaXDtOE/ZStqFA=";
|
||||
sha256 = "sha256-jAiGW6B3wxasESvpMRYxh0sWIPkV7L37owpwlNNlyxs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,16 +14,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
|
||||
pname = "pgdog";
|
||||
version = "0.1.48";
|
||||
version = "0.1.49";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgdogdev";
|
||||
repo = "pgdog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0lun9HmJvpSWguckUtudDcNlBc/KgpHk/fBJnj4HSuo=";
|
||||
hash = "sha256-zfVNF/y1wzkvPjJ64HSzez0pOR/AEZHWc/S+cUYgat0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cNIjTNuxHPofkTYpEb3+8Jhqz5AMAeXj7avNAAOG5D8=";
|
||||
cargoHash = "sha256-B4jigKyK19IhCygF9ZMvO6rHDrEquLLpTVeptaFBuX0=";
|
||||
|
||||
# Hardcoded paths for C compiler and linker
|
||||
postPatch = ''
|
||||
|
||||
@@ -48,7 +48,7 @@ buildGoModule {
|
||||
substituteInPlace internal/commands/passwd.go --replace-fail '/bin/stty' "${coreutils}/bin/stty"
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-nOytOKceVuRryixDxx791my0JkdLPfyYdK6dAUG4CQc=";
|
||||
vendorHash = "sha256-mF07Lz61IIvUi4SLIMkMlKMH9zm6Zrp/KAdutl+mUzI=";
|
||||
|
||||
subPackages = [ "cmd/photoprism" ];
|
||||
|
||||
|
||||
@@ -9,21 +9,15 @@ buildNpmPackage {
|
||||
inherit src version;
|
||||
pname = "photoprism-frontend";
|
||||
|
||||
postPatch = ''
|
||||
cd frontend
|
||||
'';
|
||||
npmDepsHash = "sha256-HBzul2fyISwOqf8w92yt0friMnLhMmvKPm8yI2I3ngE=";
|
||||
|
||||
npmDepsHash = "sha256-RjPTtIm1BhyeQLUN9mWI+sXakNju4up0FbrdwZzkTS0=";
|
||||
|
||||
# Some dependencies are fetched from git repositories
|
||||
forceGitDeps = true;
|
||||
makeCacheWritable = true;
|
||||
npmWorkspace = "frontend";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cp -r ../assets $out/
|
||||
cp -r assets $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "251130-b3068414c";
|
||||
version = "260601-a7d098548";
|
||||
pname = "photoprism";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "photoprism";
|
||||
repo = "photoprism";
|
||||
rev = version;
|
||||
hash = "sha256-8yg5CtvBtSKRaOUj9f+Db7rruXIVuF2cR50vZ+WUU6A=";
|
||||
hash = "sha256-6zE9bqHFF9ifcqbvA0yjSF69+BA/M2U6ABnPta4dpl4=";
|
||||
};
|
||||
|
||||
backend = callPackage ./backend.nix { inherit src version; };
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "phpunit";
|
||||
version = "13.2.1";
|
||||
version = "13.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sebastianbergmann";
|
||||
repo = "phpunit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-bwedO6b4gL3FiddxmOnPn0czIV2UwCiV5iM1Cu7kFR0=";
|
||||
hash = "sha256-TL6KYumNXUQ2nvkw3s/0UtT3CVw1YZfAmaCn8FHznrg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-u89MpsCKwYn44/69evX+a+SJtqMctx6uCXnhKEdqhTE=";
|
||||
vendorHash = "sha256-Vlpjra9pcqhEy6fe6he6gsivQEmaHRgspy14DwCEOW4=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
}:
|
||||
let
|
||||
pname = "proton-pass";
|
||||
version = "1.38.0";
|
||||
version = "1.38.1";
|
||||
|
||||
passthru = {
|
||||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://proton.me/download/pass/linux/x64/proton-pass_${version}_amd64.deb";
|
||||
hash = "sha256-6WYiqEJquq64b1fNv8HcQcT4/VCwtEkK4YrfAXDC6nY=";
|
||||
hash = "sha256-0DQy8ITOlR88aJiR4zLCIukd5KZ2U4PVSjNBvU/A9L8=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://proton.me/download/pass/macos/ProtonPass_${version}.dmg";
|
||||
hash = "sha256-CwdiHEqKnk+ELoavs1p6ND48e2rvEFBqbXQs79ihQ4M=";
|
||||
hash = "sha256-lEc/tP84QU+WDTqLbUe5dMmYBLXaZZg8wmXSNgAOn7g=";
|
||||
};
|
||||
};
|
||||
updateScript = writeShellScript "update-proton-pass" ''
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prst";
|
||||
version = "13.3";
|
||||
version = "14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "patnashev";
|
||||
repo = "prst";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-J+45JwkA/z3HmzO9J6RVVXutUAVSzOXDMkyUR3zSh9E=";
|
||||
hash = "sha256-41yUbSpUwV2jh8jSZjGb8X9YNc+UaS3jRaKtbaEVamA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -50,21 +50,21 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
make docs
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString withPodman ''
|
||||
wrapProgram $out/bin/ramalama \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath (
|
||||
[
|
||||
llama-cpp-vulkan
|
||||
podman
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
huggingface-hub
|
||||
mlx-lm
|
||||
])
|
||||
)
|
||||
}
|
||||
'';
|
||||
postInstall =
|
||||
let
|
||||
binPackages = [
|
||||
llama-cpp-vulkan
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
huggingface-hub
|
||||
mlx-lm
|
||||
])
|
||||
++ lib.optional withPodman podman;
|
||||
in
|
||||
''
|
||||
wrapProgram $out/bin/ramalama \
|
||||
--prefix PATH : ${lib.makeBinPath binPackages}
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ramalama"
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "reframe";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlynxZhou";
|
||||
repo = "reframe";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DXWW1QXgHnfsnH6O3qnVZoioIn+UOePNy1ZPNzVK1ks=";
|
||||
hash = "sha256-WbF52bXRYKj3q4SqTrICrZgWKFg+YnJt0hXjz4S6aRo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -28,15 +28,15 @@
|
||||
}:
|
||||
|
||||
let
|
||||
buildNum = "2025-12-08-1746";
|
||||
buildNum = "2026-05-28-1806";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "rgp";
|
||||
version = "2.6.1";
|
||||
version = "2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gpuopen.com/download/RadeonDeveloperToolSuite-${buildNum}.tgz";
|
||||
hash = "sha256-rfFZPA8DzgP5axSHToEBvhRTgWAejn/z0WlLMectya0=";
|
||||
hash = "sha256-hMUAo72JVfDEv8Rp0/0YZDXX7p8ioVH40WtK/PQnRb8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "scipopt-soplex";
|
||||
version = "8.0.2";
|
||||
version = "8.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scipopt";
|
||||
repo = "soplex";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TW3OSBw8ok64kZedsXYjkO2eFqr0LH8uvrOsi3bwQC4=";
|
||||
hash = "sha256-5UTlSfnNPVCkAE2oMVukVbbs2drbSh0HfiDqXUktBHQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sentry-native";
|
||||
version = "0.15.3";
|
||||
version = "0.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-native";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9UwF8B1dd4RhboMgkZCHI3UqAm8aZAhgLo9VzjwlW/I=";
|
||||
hash = "sha256-McOb4ICd6/6CTjG63Pzei5LAvfLcnL34qnwvU0RDm1A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sgt-puzzles";
|
||||
version = "20260523.7ad37c6";
|
||||
version = "20260720.3c36322";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-Pcl8wCXrnjQ68jMpZMhWcvKiHanqk1efMbzGbjOHupc=";
|
||||
hash = "sha256-z0OuMD8IXEp7TAcR4xKXVanGiev78+pVvyc9lgIiOAY=";
|
||||
};
|
||||
|
||||
sgt-puzzles-menu = fetchurl {
|
||||
|
||||
@@ -19,20 +19,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shopify";
|
||||
version = "3.91.1";
|
||||
version = "4.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shopify";
|
||||
repo = "cli";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-cOq4LpTMr59ev04PIu0GYAAK0N0n2SrYCnz8sHfcXrs=";
|
||||
hash = "sha256-uunVTgq3njrnuKHksXpGhAcAQanOFtsLRa/Ab6adoXo=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-gwEVlvr8hxgyCsGjxjz1UkbDZYYq1iukKTPJ7JHdo2U=";
|
||||
hash = "sha256-IvPxHUdjFVkWpQnmmZz82rn8XJVljPbgNoVGpg7uU84=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
nix-update-script,
|
||||
apple-sdk_15,
|
||||
versionCheckHook,
|
||||
llvmPackages,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -22,20 +21,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-5tyc/yYzdV/3JTtujuj7le/14XkC7TlN/nZg7tOZsNg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
# TODO: Remove once #536365 reaches this branch
|
||||
llvmPackages.lld
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
apple-sdk_15
|
||||
];
|
||||
|
||||
makeFlags = [ "arm64" ];
|
||||
|
||||
# TODO: Remove once #536365 reaches this branch
|
||||
env.NIX_CFLAGS_LINK = "-fuse-ld=lld";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@@ -15,13 +15,13 @@ assert builtins.elem withStyle [
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "sleek-grub-theme";
|
||||
version = "unstable-2024-08-11";
|
||||
version = "0-unstable-2025-05-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sandesh236";
|
||||
repo = "sleek--themes";
|
||||
rev = "0c47e645ccc2d72aa165e9d994f9d09f58de9f6d";
|
||||
hash = "sha256-H4s4CSR8DaH8RT9w40hkguNNcC0U8gHKS2FLt+FApeA=";
|
||||
rev = "e103aa4cd655be6a38dbab37b1911c6ed9ef7765";
|
||||
hash = "sha256-E3DSOZlszBRy2F172L7ZSSsDlkk3n9jGXl4hRWv2WF8=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "snip";
|
||||
version = "0.20.0";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edouard-claude";
|
||||
repo = "snip";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-u6Jc9U4tb5Y/evtWR/Nw535xVh09ChcKN0Dm+l3bjvA=";
|
||||
hash = "sha256-y88ZHg29Z/QBZk8YWXp287Rel7DpPESYAlbqt5hj1nc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2MxFZqjNuLzcuu+bsLyOyHIakCxh7j0FUx8LsjZRhrY=";
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "stalwart-cli";
|
||||
version = "1.0.10";
|
||||
version = "1.0.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stalwartlabs";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9fB9qkRtXIL/8qROl3FiK0w5XUA+nDVjxi1+dhwtxJM=";
|
||||
hash = "sha256-nU9KL25zS71tRRc6Z9r6cEQDuw35RVhesfJf5hSVx4s=";
|
||||
};
|
||||
cargoHash = "sha256-91S7XMbNClc349AvXixQdBnPV5+3G1RA5fpfNUfFmwk=";
|
||||
cargoHash = "sha256-yByKWH4o43zGki8Tf9pNQATyQO6UNvzFtjj9cqzvP1I=";
|
||||
__structuredAttrs = true;
|
||||
# `Result::unwrap()` on an `Err` value: Network(reqwest::Error { kind: Builder, source: General("No CA certificates were loaded from the system") })
|
||||
nativeCheckInputs = [ cacert ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "vandelay";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stalwartlabs";
|
||||
repo = "vandelay";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ePOh2lJWJvZ5sV8KQ4n9A5pV7UhDBkN+RQ37LLoMm+o=";
|
||||
hash = "sha256-Eg4kQncwCHpFzCZBp2OK4yUsBsYXwf1pQ+USHwmU9Ro=";
|
||||
};
|
||||
cargoHash = "sha256-KlAarYv8Vzp0bpR2jhC4bG0iVyG5YPGvsa8GHRsscJg=";
|
||||
cargoHash = "sha256-+v0xgVliX/sDDDMCzWMVDnBDoJK9a2xaIkMJwEIO6ks=";
|
||||
__structuredAttrs = true;
|
||||
__darwinAllowLocalNetworking = true;
|
||||
# called `Result::unwrap()` on an `Err` value: Tls("rustls platform verifier: unexpected error: No CA certificates were loaded from the system")
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "telegraf";
|
||||
version = "1.39.1";
|
||||
version = "1.39.2";
|
||||
|
||||
subPackages = [ "cmd/telegraf" ];
|
||||
|
||||
@@ -18,10 +18,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "influxdata";
|
||||
repo = "telegraf";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-B9Xy02oYSYcU0IBOZes9tof/04TLvLybOU/nLLaFORk=";
|
||||
hash = "sha256-yWWjlCAc5xJh4IwszVRTGIM5DMXKHyfAHEa1jSVi/mk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9o0Tt6OZnoNO8iSLYmn1SMkQmZzC19uNmfHSkEqWzmA=";
|
||||
vendorHash = "sha256-j/yGDEXNOrMAq4ArMjqTxZHfvQZkjmDpZQ3LAUe8BJ0=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "temporal-ui-server";
|
||||
version = "2.52.0";
|
||||
version = "2.52.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "ui-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5WGE4igWVkWwxy5k8x+X4roDX1glaW+x67UGkoiSWwM=";
|
||||
hash = "sha256-Z6lDqzDDzyHh2ZLf1paqUT9f6+ioR0qnVhX4/QFa9D0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-E9pg16YJRDahBmiHwQY3r8kA+vBfza7KdFYqdw+qBSY=";
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
fetchurl,
|
||||
makeBinaryWrapper,
|
||||
# use specific electron since it has to load a compiled module
|
||||
electron_41,
|
||||
electron_42,
|
||||
autoPatchelfHook,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
let
|
||||
pname = "trilium-desktop";
|
||||
version = "0.103.0";
|
||||
version = "0.104.0";
|
||||
|
||||
triliumSource = os: arch: hash: {
|
||||
url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";
|
||||
@@ -26,9 +26,9 @@ let
|
||||
darwinSource = triliumSource "macos";
|
||||
|
||||
# exposed like this for update.sh
|
||||
x86_64-linux.hash = "sha256-1d6nYhj83LWzglkWoOtAj6lNPkik1qXY5lVpr1iG7No=";
|
||||
aarch64-linux.hash = "sha256-LQMNgj1Ml8gShlPS0qgD/a+Fw4SjvvHrw6XAcSLN7q4=";
|
||||
aarch64-darwin.hash = "sha256-dMlgJgDuxZH1jnvLalmgDUMVCdWQ8AviGt86aeMbGVY=";
|
||||
x86_64-linux.hash = "sha256-VVYBXjKBo5GNKrIiSjvLw3Md26NEO2Fgot2421PDr0k=";
|
||||
aarch64-linux.hash = "sha256-iHFzCiqNajETgJm4jk6NdrCybM1SG9qThBwEaGJMeqM=";
|
||||
aarch64-darwin.hash = "sha256-zVV7lJhl/DNDfvbyCCdTSeDvhyzQLF8pxfnr2QYKeas=";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = linuxSource "x64" x86_64-linux.hash;
|
||||
@@ -109,7 +109,7 @@ let
|
||||
asar pack $tmp/ $out/share/trilium/resources/app.asar
|
||||
rm -rf $tmp
|
||||
|
||||
makeWrapper ${lib.getExe electron_41} $out/bin/trilium \
|
||||
makeWrapper ${lib.getExe electron_42} $out/bin/trilium \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--add-flags $out/share/trilium/resources/app.asar
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.103.0";
|
||||
version = "0.104.0";
|
||||
|
||||
serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";
|
||||
serverSource_x64.hash = "sha256-+PmlEevacif9xP8y7KrMMCwMQ0jGmT9yVhMrQ1SYG58=";
|
||||
serverSource_x64.hash = "sha256-lrZL0c9ijvjYUQlN6BN1BhHR2KacFG6h6KzIlkIKLGk=";
|
||||
serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";
|
||||
serverSource_arm64.hash = "sha256-RjnHCvVIR/ExZ9lC8ukGr2M8X1Hnj5ZeVMmQHUvZTKY=";
|
||||
serverSource_arm64.hash = "sha256-EgqYA7IBSt9tZ12MgktIKhJ9/ww/prTCE5Z7enMUk7Q=";
|
||||
|
||||
serverSource =
|
||||
if stdenv.hostPlatform.isx86_64 then
|
||||
|
||||
@@ -49,6 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
description = "Efficient Task Space Inverse Dynamics (TSID) based on Pinocchio";
|
||||
homepage = "https://github.com/stack-of-tasks/tsid";
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
darwin,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
llvmPackages,
|
||||
nix-update-script,
|
||||
testers,
|
||||
vfkit,
|
||||
@@ -34,17 +33,12 @@ buildGoModule rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
darwin.sigtool
|
||||
# TODO: Remove this when NixOS/nixpkgs#536365 reaches master.
|
||||
llvmPackages.lld
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
apple-sdk_15
|
||||
];
|
||||
|
||||
# TODO: Remove this when NixOS/nixpkgs#536365 reaches master.
|
||||
env.NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' llvmPackages.lld "ld64.lld"}";
|
||||
|
||||
postFixup = ''
|
||||
codesign --entitlements vf.entitlements -f -s - $out/bin/vfkit
|
||||
'';
|
||||
|
||||
@@ -27,11 +27,11 @@ assert waylandSupport -> libxkbcommon != null;
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vintagestory";
|
||||
version = "1.22.3";
|
||||
version = "1.22.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-sa4Pj1DwT6W6LJCAYznmbyqPtMUTaLSNTkXS1imQp04=";
|
||||
hash = "sha256-6efnjDUXMweOzN1mnkwVyQzQjs1QlFHBss1qb62Z2o0=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -8,20 +8,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wasm-tools";
|
||||
version = "1.253.0";
|
||||
version = "1.254.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wasm-tools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-z17Y6bqsAkZ25Rkbtx7g0x2R9+tllYrpumLkgL13gjI=";
|
||||
hash = "sha256-Zy+cJdbsRmwRyy9y/nfpi3kWmklKOrgrw78DwQ/s+fs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
|
||||
auditable = false;
|
||||
|
||||
cargoHash = "sha256-mBp9QbjEpwT3v0Bmvur+HTUOncSNYkqmfoyORzEqR+k=";
|
||||
cargoHash = "sha256-RgAew00flGTwt1FvfWsmPgg/MK4CMFVG2h5dmDgCZMo=";
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"wasm-tools"
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "weaviate";
|
||||
version = "1.38.3";
|
||||
version = "1.38.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaviate";
|
||||
repo = "weaviate";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-S37l12pMPrMjHRJ8n9/1vT2lZ5Ma6riX8Q7MGAhioGk=";
|
||||
hash = "sha256-jv0/zya98kncWAZL/EYgN0oXu7R9gC+jmu0pkQhyhyo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MxCR1Owy0tOYU2GGHbxI9STfT5ZitsZGbI0ttYuFeAQ=";
|
||||
|
||||
@@ -38,11 +38,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xfstests";
|
||||
version = "2026.05.17";
|
||||
version = "2026.06.21";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/snapshot/xfstests-dev-v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-vfK4PcPdd1121lcjhjP63RyS6YdFfgZ6Nsauv02b1S8=";
|
||||
hash = "sha256-hngS9Hnsz9XKQ42yh6mcXHiTOzL+Zk9hRpai7e2tU0E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -94,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
create 30 % smaller output than gzip and 15 % smaller output than
|
||||
bzip2.
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ andrewzah ];
|
||||
license = with lib.licenses; [
|
||||
gpl2Plus
|
||||
lgpl21Plus
|
||||
@@ -1,18 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 20a4e42..921ba18 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -8,9 +8,13 @@ AC_PREREQ([2.59])
|
||||
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_SRCDIR([src])
|
||||
+AC_CONFIG_MACRO_DIRS([m4])
|
||||
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
+AM_GNU_GETTEXT_VERSION([0.25])
|
||||
+AM_GNU_GETTEXT([external])
|
||||
+
|
||||
IT_PROG_INTLTOOL([0.40.0])
|
||||
|
||||
AC_PROG_CC
|
||||
@@ -3,44 +3,53 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
intltool,
|
||||
autoreconfHook,
|
||||
wrapGAppsHook3,
|
||||
gettext,
|
||||
gspell,
|
||||
gtk3,
|
||||
hicolor-icon-theme,
|
||||
gtksourceview,
|
||||
libappindicator-gtk3,
|
||||
netpbm,
|
||||
webkitgtk_4_1,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yad";
|
||||
version = "14.1";
|
||||
version = "15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v1cont";
|
||||
repo = "yad";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-Y7bp20fkNdSgBcSV1kPEpWEP7ASwZcScVRaPauwI72M=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-z+t4eG8yXhfs4GfLFDaaOCAxrr5MIoFD6BKF8vr59IY=";
|
||||
};
|
||||
|
||||
# FIXME: remove when gettext is fixed
|
||||
patches = [ ./gettext-0.25.patch ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-icon-browser"
|
||||
"--with-gtk=gtk3"
|
||||
"--with-rgb=${placeholder "out"}/share/yad/rgb.txt"
|
||||
"--enable-html"
|
||||
"--enable-tray"
|
||||
"--enable-appindicator"
|
||||
"--enable-spell"
|
||||
"--enable-sourceview"
|
||||
"--enable-deprecated"
|
||||
"--enable-tools"
|
||||
"--enable-icon-browser"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gspell
|
||||
gtk3
|
||||
hicolor-icon-theme
|
||||
gtksourceview
|
||||
libappindicator-gtk3
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
intltool
|
||||
wrapGAppsHook3
|
||||
gettext
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -51,10 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
install -Dm644 ${netpbm.out}/share/netpbm/misc/rgb.txt $out/share/yad/rgb.txt
|
||||
'';
|
||||
|
||||
postAutoreconf = ''
|
||||
intltoolize
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/v1cont/yad";
|
||||
description = "GUI dialog tool for shell scripts";
|
||||
@@ -66,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
license = lib.licenses.gpl3;
|
||||
mainProgram = "yad";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ RoGreat ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "clipboard.yazi";
|
||||
version = "0-unstable-2026-07-14";
|
||||
version = "0-unstable-2026-07-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "XYenon";
|
||||
repo = "clipboard.yazi";
|
||||
rev = "4533c7f1b16196ad32749e35344bdc82a624871b";
|
||||
hash = "sha256-lThDO1b9iq+N6x/F9fKEWlNPpgJBTfxpY2xjyZF22mM=";
|
||||
rev = "d4d19ea45836f279c0b99e1d234fe5ce4a154e4b";
|
||||
hash = "sha256-fawprH1+WysMcERWdCtgWulSHo4Pmu3eLLHbnKwvkIM=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,22 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
python3Packages,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "zapzap";
|
||||
version = "6.5.2.5";
|
||||
version = "7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafatosta";
|
||||
repo = "zapzap";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-VybcZNB0k1DwAmluQpEMuM7cHKI8sGyG284g9E3YcP8=";
|
||||
hash = "sha256-0LrIx7k9b0+zsmezjF6CmJo4nqU7GPW1HHWAUVVnbzk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Support setting dict lookup path. Remove with next release.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rafatosta/zapzap/commit/3517079e8fbd3853fe184c393137709de68f020e.patch";
|
||||
hash = "sha256-Eqy483+mJHLHsS21B8LnJ9oIqwTRCMVKhHBO8hleBh4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user