Merge staging-next into staging
This commit is contained in:
@@ -54,7 +54,8 @@ stdenvNoCC.mkDerivation (
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "nixpkgs-manual";
|
||||
inherit (lib.trivial) version;
|
||||
pname = "nixpkgs-manual";
|
||||
|
||||
nativeBuildInputs = [ nixos-render-docs ];
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ to your Nixpkgs configuration (`~/.config/nixpkgs/config.nix`) and install it by
|
||||
$ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description
|
||||
```
|
||||
|
||||
If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ name, src }` as argument, where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available, then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument `{ name, srcFeature, srcPlugin }` where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively.
|
||||
If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ src }` and either `pname` or `name` + `version` as arguments, where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available, then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes `{ srcFeature, srcPlugin }` and either `pname` or `name` + `version` as arguments, where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively.
|
||||
|
||||
Expanding the previous example with two plugins using the above functions, we have:
|
||||
|
||||
@@ -47,7 +47,8 @@ Expanding the previous example with two plugins using the above functions, we ha
|
||||
plugins = [
|
||||
plugins.color-theme
|
||||
(plugins.buildEclipsePlugin {
|
||||
name = "myplugin1-1.0";
|
||||
pname = "myplugin1";
|
||||
version = "1.0";
|
||||
srcFeature = fetchurl {
|
||||
url = "http://…/features/myplugin1.jar";
|
||||
hash = "sha256-123…";
|
||||
@@ -58,7 +59,8 @@ Expanding the previous example with two plugins using the above functions, we ha
|
||||
};
|
||||
})
|
||||
(plugins.buildEclipseUpdateSite {
|
||||
name = "myplugin2-1.0";
|
||||
pname = "myplugin2";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
stripRoot = false;
|
||||
url = "http://…/myplugin2.zip";
|
||||
|
||||
@@ -862,7 +862,7 @@ in
|
||||
# but removing a subdirectory using file set functions
|
||||
difference
|
||||
(fromSource (lib.sources.sourceByRegex ./. [
|
||||
"^README\.md$"
|
||||
"^README\\.md$"
|
||||
# This regex includes everything in ./doc
|
||||
"^doc(/.*)?$"
|
||||
])
|
||||
|
||||
+1
-1
@@ -200,7 +200,7 @@ let
|
||||
## `sourceByRegex` usage example
|
||||
|
||||
```nix
|
||||
src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]
|
||||
src = sourceByRegex ./my-subproject [".*\\.py$" "^database\\.sql$"]
|
||||
```
|
||||
|
||||
:::
|
||||
|
||||
@@ -1403,14 +1403,6 @@
|
||||
githubId = 60479013;
|
||||
name = "Alma Cemerlic";
|
||||
};
|
||||
alois31 = {
|
||||
name = "Alois Wohlschlager";
|
||||
email = "alois1@gmx-topmail.de";
|
||||
matrix = "@aloisw:kde.org";
|
||||
github = "alois31";
|
||||
githubId = 36605164;
|
||||
keys = [ { fingerprint = "CA97 A822 FF24 25D4 74AF 3E4B E0F5 9EA5 E521 6914"; } ];
|
||||
};
|
||||
Alper-Celik = {
|
||||
email = "alper@alper-celik.dev";
|
||||
name = "Alper Çelik";
|
||||
@@ -1755,12 +1747,6 @@
|
||||
matrix = "@andrew:kvalhe.im";
|
||||
name = "Andrew Kvalheim";
|
||||
};
|
||||
andrewrk = {
|
||||
email = "superjoe30@gmail.com";
|
||||
github = "andrewrk";
|
||||
githubId = 106511;
|
||||
name = "Andrew Kelley";
|
||||
};
|
||||
andrewzah = {
|
||||
name = "Andrew Zah";
|
||||
github = "andrewzah";
|
||||
@@ -12790,7 +12776,7 @@
|
||||
email = "jokatzke@fastmail.com";
|
||||
github = "jokatzke";
|
||||
githubId = 46931073;
|
||||
name = "Jonas Katzke";
|
||||
name = "Josefine Katzke";
|
||||
};
|
||||
joko = {
|
||||
email = "ioannis.koutras@gmail.com";
|
||||
@@ -13850,12 +13836,6 @@
|
||||
githubId = 20063;
|
||||
name = "Pascal Hertleif";
|
||||
};
|
||||
kiloreux = {
|
||||
email = "kiloreux@gmail.com";
|
||||
github = "kiloreux";
|
||||
githubId = 6282557;
|
||||
name = "Kiloreux Emperex";
|
||||
};
|
||||
kim0 = {
|
||||
email = "email.ahmedkamal@googlemail.com";
|
||||
github = "kim0";
|
||||
@@ -27065,6 +27045,12 @@
|
||||
githubId = 67477750;
|
||||
name = "Tomkoid";
|
||||
};
|
||||
TomMD = {
|
||||
name = "Thomas M. DuBuisson";
|
||||
email = "thomas.dubuisson@gmail.com";
|
||||
github = "TomMD";
|
||||
githubId = 137806;
|
||||
};
|
||||
Tommimon = {
|
||||
name = "Tommaso Montanari";
|
||||
email = "sefymw7q8@mozmail.com";
|
||||
@@ -27091,6 +27077,12 @@
|
||||
githubId = 27378358;
|
||||
name = "tony";
|
||||
};
|
||||
tonybutt = {
|
||||
email = "anthony@abutt.io";
|
||||
github = "tonybutt";
|
||||
githubId = 38566841;
|
||||
name = "Anthony Butt";
|
||||
};
|
||||
toonn = {
|
||||
email = "nixpkgs@toonn.io";
|
||||
matrix = "@toonn:matrix.org";
|
||||
@@ -27993,8 +27985,9 @@
|
||||
};
|
||||
vinetos = {
|
||||
name = "vinetos";
|
||||
email = "vinetosdev@gmail.com";
|
||||
email = "contact+git@vinetos.fr";
|
||||
github = "vinetos";
|
||||
matrix = "@vinetos:matrix.org";
|
||||
githubId = 10145351;
|
||||
};
|
||||
vinnymeller = {
|
||||
|
||||
@@ -386,7 +386,6 @@ with lib.maintainers;
|
||||
members = [
|
||||
leona
|
||||
theCapypara
|
||||
thiagokokada
|
||||
jamesward
|
||||
];
|
||||
shortName = "Jetbrains";
|
||||
|
||||
@@ -74,7 +74,6 @@ in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
romildo
|
||||
thiagokokada
|
||||
];
|
||||
|
||||
imports = [
|
||||
|
||||
@@ -49,5 +49,7 @@ in
|
||||
]
|
||||
);
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ mrcjkb ];
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
xaverdh
|
||||
];
|
||||
}
|
||||
|
||||
@@ -95,11 +95,11 @@ in
|
||||
database = {
|
||||
engine = mkOption {
|
||||
type = types.enum [
|
||||
"sqlite3"
|
||||
"sqlite"
|
||||
"postgres"
|
||||
];
|
||||
description = "Database engine to use.";
|
||||
default = "sqlite3";
|
||||
default = "sqlite";
|
||||
};
|
||||
connection = mkOption {
|
||||
type = types.str;
|
||||
|
||||
@@ -573,7 +573,7 @@ in
|
||||
"${cfg.package.util-linux}/bin/sulogin"
|
||||
|
||||
# Resolving sysroot symlinks without code exec
|
||||
"${config.system.nixos-init.package}/bin/chroot-realpath"
|
||||
"${config.system.nixos-init.package}/bin/resolve-in-root"
|
||||
# Find the etc paths
|
||||
"${config.system.nixos-init.package}/bin/find-etc"
|
||||
]
|
||||
@@ -664,7 +664,7 @@ in
|
||||
|
||||
# Resolve symlinks in the init parameter. We need this for some boot loaders
|
||||
# (e.g. boot.loader.generationsDir).
|
||||
closure="$(chroot-realpath /sysroot "$closure")"
|
||||
closure="$(resolve-in-root /sysroot "$closure")"
|
||||
|
||||
# Assume the directory containing the init script is the closure.
|
||||
closure="$(dirname "$closure")"
|
||||
|
||||
@@ -33,12 +33,18 @@
|
||||
|
||||
with subtest("ensure we can open a tty"):
|
||||
machine.wait_for_text("machine login:")
|
||||
|
||||
machine.send_chars("alice\n")
|
||||
machine.wait_for_text("Password:")
|
||||
|
||||
machine.send_chars("foobar\n")
|
||||
machine.wait_for_text("alice@machine")
|
||||
machine.send_chars("echo $TERM\n")
|
||||
machine.wait_for_text("xterm-256color")
|
||||
|
||||
machine.send_chars("echo $TERM | tee /tmp/term.txt\n")
|
||||
machine.wait_until_succeeds("test -s /tmp/term.txt")
|
||||
term = machine.succeed("cat /tmp/term.txt").strip()
|
||||
assert term == "xterm-256color", f"Unexpected TERM value: {term!r}"
|
||||
|
||||
machine.screenshot("tty.png")
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ import ../make-test-python.nix (
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "replace-dependencies";
|
||||
meta.maintainers = with pkgs.lib.maintainers; [ alois31 ];
|
||||
meta.maintainers = [ ];
|
||||
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
||||
vmTools.debClosureGenerator {
|
||||
name = "x32edit-dependencies";
|
||||
inherit (distro) urlPrefix;
|
||||
packagesLists = [ distro.packagesList ];
|
||||
packagesLists = [ distro.packagesLists ];
|
||||
packages = [
|
||||
"libstdc++6"
|
||||
"libcurl4"
|
||||
|
||||
@@ -13,7 +13,7 @@ rec {
|
||||
# to be used when building more advanced builders.
|
||||
buildEclipsePluginBase =
|
||||
{
|
||||
name,
|
||||
name ? "eclipse-plugin-${attrs.pname}-${attrs.version}",
|
||||
buildInputs ? [ ],
|
||||
passthru ? { },
|
||||
...
|
||||
@@ -21,7 +21,7 @@ rec {
|
||||
stdenv.mkDerivation (
|
||||
attrs
|
||||
// {
|
||||
name = "eclipse-plugin-" + name;
|
||||
inherit name;
|
||||
|
||||
buildInputs = buildInputs ++ [ unzip ];
|
||||
|
||||
@@ -36,7 +36,7 @@ rec {
|
||||
# plugin JARs.
|
||||
buildEclipsePlugin =
|
||||
{
|
||||
name,
|
||||
name ? "eclipse-plugin-${attrs.pname}-${attrs.version}",
|
||||
srcFeature,
|
||||
srcPlugin ? null,
|
||||
srcPlugins ? [ ],
|
||||
@@ -75,7 +75,10 @@ rec {
|
||||
# `features` and `plugins`. All features and plugins inside these
|
||||
# directories will be installed.
|
||||
buildEclipseUpdateSite =
|
||||
{ name, ... }@attrs:
|
||||
{
|
||||
name ? "eclipse-plugin-${attrs.pname}-${attrs.version}",
|
||||
...
|
||||
}@attrs:
|
||||
buildEclipsePluginBase (
|
||||
attrs
|
||||
// {
|
||||
@@ -119,7 +122,7 @@ rec {
|
||||
);
|
||||
|
||||
acejump = buildEclipsePlugin rec {
|
||||
name = "acejump-${version}";
|
||||
pname = "acejump";
|
||||
version = "1.0.0.201610261941";
|
||||
|
||||
srcFeature = fetchurl {
|
||||
@@ -142,7 +145,7 @@ rec {
|
||||
};
|
||||
|
||||
ansi-econsole = buildEclipsePlugin rec {
|
||||
name = "ansi-econsole-${version}";
|
||||
pname = "ansi-econsole";
|
||||
version = "1.3.5.201612301822";
|
||||
|
||||
srcFeature = fetchurl {
|
||||
@@ -165,17 +168,18 @@ rec {
|
||||
};
|
||||
|
||||
antlr-runtime_4_5 = buildEclipsePluginBase rec {
|
||||
name = "antlr-runtime-4.5.3";
|
||||
pname = "antlr-runtime";
|
||||
version = "4.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.antlr.org/download/${name}.jar";
|
||||
url = "https://www.antlr.org/download/${pname}-${version}.jar";
|
||||
sha256 = "0lm78i2annlczlc2cg5xvby0g1dyl0sh1y5xc2pymjlmr67a1g4k";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
dropinDir="$out/eclipse/dropins/"
|
||||
mkdir -p $dropinDir
|
||||
cp -v $src $dropinDir/${name}.jar
|
||||
cp -v $src $dropinDir/${pname}-${version}.jar
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@@ -188,17 +192,18 @@ rec {
|
||||
};
|
||||
|
||||
antlr-runtime_4_7 = buildEclipsePluginBase rec {
|
||||
name = "antlr-runtime-4.7.1";
|
||||
pname = "antlr-runtime";
|
||||
version = "4.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.antlr.org/download/${name}.jar";
|
||||
url = "https://www.antlr.org/download/${pname}-${version}.jar";
|
||||
sha256 = "07f91mjclacrvkl8a307w2abq5wcqp0gcsnh0jg90ddfpqcnsla3";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
dropinDir="$out/eclipse/dropins/"
|
||||
mkdir -p $dropinDir
|
||||
cp -v $src $dropinDir/${name}.jar
|
||||
cp -v $src $dropinDir/${pname}-${version}.jar
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@@ -211,7 +216,7 @@ rec {
|
||||
};
|
||||
|
||||
anyedittools = buildEclipsePlugin rec {
|
||||
name = "anyedit-${version}";
|
||||
pname = "anyedit";
|
||||
version = "2.7.3.202502241151";
|
||||
|
||||
srcFeature = fetchurl {
|
||||
@@ -234,7 +239,7 @@ rec {
|
||||
};
|
||||
|
||||
autodetect-encoding = buildEclipsePlugin rec {
|
||||
name = "autodetect-encoding-${version}";
|
||||
pname = "autodetect-encoding";
|
||||
version = "1.8.5.201801191359";
|
||||
|
||||
srcFeature = fetchurl {
|
||||
@@ -257,13 +262,13 @@ rec {
|
||||
};
|
||||
|
||||
cdt = buildEclipseUpdateSite rec {
|
||||
name = "cdt-${version}";
|
||||
pname = "cdt";
|
||||
# find current version at https://github.com/eclipse-cdt/cdt/releases
|
||||
version = "11.4.0";
|
||||
|
||||
src = fetchzip {
|
||||
stripRoot = false;
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip";
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${pname}-${version}/${pname}-${version}.zip";
|
||||
hash = "sha256-39AoB5cKRQMFpRaOlrTEsyEKZYVqdTp1tMtlaDjjZ84=";
|
||||
};
|
||||
|
||||
@@ -278,7 +283,7 @@ rec {
|
||||
};
|
||||
|
||||
checkstyle = buildEclipseUpdateSite rec {
|
||||
name = "checkstyle-${version}";
|
||||
pname = "checkstyle";
|
||||
version = "8.7.0.201801131309";
|
||||
|
||||
src = fetchzip {
|
||||
@@ -298,7 +303,7 @@ rec {
|
||||
};
|
||||
|
||||
color-theme = buildEclipsePlugin rec {
|
||||
name = "color-theme-${version}";
|
||||
pname = "color-theme";
|
||||
version = "1.0.0.201410260308";
|
||||
|
||||
srcFeature = fetchurl {
|
||||
@@ -321,7 +326,7 @@ rec {
|
||||
};
|
||||
|
||||
cup = buildEclipsePlugin rec {
|
||||
name = "cup-${version}";
|
||||
pname = "cup";
|
||||
version = "1.1.0.201604221613";
|
||||
version_ = "1.0.0.201604221613";
|
||||
|
||||
@@ -354,7 +359,7 @@ rec {
|
||||
};
|
||||
|
||||
drools = buildEclipseUpdateSite rec {
|
||||
name = "drools-${version}";
|
||||
pname = "drools";
|
||||
version = "7.17.0.Final";
|
||||
|
||||
src = fetchzip {
|
||||
@@ -378,8 +383,8 @@ rec {
|
||||
};
|
||||
};
|
||||
|
||||
eclemma = buildEclipseUpdateSite rec {
|
||||
name = "eclemma-${version}";
|
||||
eclemma = buildEclipseUpdateSite {
|
||||
pname = "eclemma";
|
||||
version = "2.3.2.201409141915";
|
||||
|
||||
src = fetchzip {
|
||||
@@ -398,7 +403,7 @@ rec {
|
||||
};
|
||||
|
||||
findbugs = buildEclipsePlugin rec {
|
||||
name = "findbugs-${version}";
|
||||
pname = "findbugs";
|
||||
version = "3.0.1.20150306-5afe4d1";
|
||||
|
||||
srcFeature = fetchurl {
|
||||
@@ -421,7 +426,7 @@ rec {
|
||||
};
|
||||
|
||||
freemarker = buildEclipseUpdateSite rec {
|
||||
name = "freemarker-${version}";
|
||||
pname = "freemarker";
|
||||
version = "1.5.305";
|
||||
|
||||
src = fetchzip {
|
||||
@@ -438,7 +443,7 @@ rec {
|
||||
};
|
||||
|
||||
embed-cdt = buildEclipseUpdateSite rec {
|
||||
name = "embed-cdt-${version}";
|
||||
pname = "embed-cdt";
|
||||
version = "6.3.1";
|
||||
|
||||
src = fetchzip {
|
||||
@@ -459,7 +464,7 @@ rec {
|
||||
gnuarmeclipse = embed-cdt; # backward compat alias, added 2022-11-04
|
||||
|
||||
jsonedit = buildEclipsePlugin rec {
|
||||
name = "jsonedit-${version}";
|
||||
pname = "jsonedit";
|
||||
version = "1.1.1";
|
||||
|
||||
srcFeature = fetchurl {
|
||||
@@ -519,7 +524,7 @@ rec {
|
||||
};
|
||||
|
||||
jdt-codemining = buildEclipsePlugin rec {
|
||||
name = "jdt-codemining-${version}";
|
||||
pname = "jdt-codemining";
|
||||
version = "1.0.0.201806221018";
|
||||
|
||||
srcFeature = fetchurl {
|
||||
@@ -542,7 +547,7 @@ rec {
|
||||
};
|
||||
|
||||
rustdt = buildEclipseUpdateSite rec {
|
||||
name = "rustdt-${version}";
|
||||
pname = "rustdt";
|
||||
version = "0.6.2";
|
||||
owner = "RustDT";
|
||||
repo = "rustdt.github.io";
|
||||
@@ -567,7 +572,7 @@ rec {
|
||||
};
|
||||
|
||||
spotbugs = buildEclipseUpdateSite rec {
|
||||
name = "spotbugs-${version}";
|
||||
pname = "spotbugs";
|
||||
version = "3.1.11";
|
||||
|
||||
src = fetchzip {
|
||||
@@ -586,7 +591,7 @@ rec {
|
||||
};
|
||||
|
||||
testng = buildEclipsePlugin rec {
|
||||
name = "testng-${version}";
|
||||
pname = "testng";
|
||||
version = "6.9.13.201609291640";
|
||||
|
||||
srcFeature = fetchurl {
|
||||
@@ -609,7 +614,7 @@ rec {
|
||||
};
|
||||
|
||||
vrapper = buildEclipseUpdateSite rec {
|
||||
name = "vrapper-${version}";
|
||||
pname = "vrapper";
|
||||
version = "0.72.0";
|
||||
owner = "vrapper";
|
||||
repo = "vrapper";
|
||||
@@ -632,7 +637,7 @@ rec {
|
||||
};
|
||||
|
||||
yedit = buildEclipsePlugin rec {
|
||||
name = "yedit-${version}";
|
||||
pname = "yedit";
|
||||
version = "1.0.20.201509041456";
|
||||
|
||||
srcFeature = fetchurl {
|
||||
@@ -655,11 +660,11 @@ rec {
|
||||
};
|
||||
|
||||
zest = buildEclipseUpdateSite rec {
|
||||
name = "zest-${version}";
|
||||
pname = "zest";
|
||||
version = "3.9.101";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://archive.eclipse.org/tools/gef/downloads/drops/${version}/R201408150207/GEF-${name}.zip";
|
||||
url = "http://archive.eclipse.org/tools/gef/downloads/drops/${version}/R201408150207/GEF-${pname}-${version}.zip";
|
||||
sha256 = "01scn7cmcrjcp387spjm8ifgwrwwi77ypildandbisfvhj3qqs7m";
|
||||
};
|
||||
|
||||
|
||||
@@ -6790,6 +6790,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
im-select-nvim = buildVimPlugin {
|
||||
pname = "im-select.nvim";
|
||||
version = "0-unstable-2025-07-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "keaising";
|
||||
repo = "im-select.nvim";
|
||||
rev = "113a6905a1c95d2990269f96abcbad9718209557";
|
||||
hash = "sha256-rtbqJjih9yy2svMIro7FbdH9DqGTumAmfcRICfqT8tQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/keaising/im-select.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
img-clip-nvim = buildVimPlugin {
|
||||
pname = "img-clip.nvim";
|
||||
version = "0.6.0-unstable-2025-12-19";
|
||||
@@ -8547,6 +8560,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
mcphub-nvim = buildVimPlugin {
|
||||
pname = "mcphub.nvim";
|
||||
version = "6.2.0-unstable-2026-01-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ravitemer";
|
||||
repo = "mcphub.nvim";
|
||||
rev = "7cd5db330f41b7bae02b2d6202218a061c3ebc1f";
|
||||
hash = "sha256-g9tPvjThz6EUk7zcY7lL+YH4lrT4x3FJ6jrNMHA8PAE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ravitemer/mcphub.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
mediawiki-vim = buildVimPlugin {
|
||||
pname = "mediawiki.vim";
|
||||
version = "0.2-unstable-2015-11-15";
|
||||
@@ -23128,6 +23154,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
y9nika-nvim = buildVimPlugin {
|
||||
pname = "y9nika.nvim";
|
||||
version = "0-unstable-2026-01-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "y9san9";
|
||||
repo = "y9nika.nvim";
|
||||
rev = "f7174b7812e60379953a4102d6be20e47995b924";
|
||||
hash = "sha256-bF9tFXLIYzjrMFVyB4FhsuC8eKiEutk7VjFHB+laAt4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/y9san9/y9nika.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
yaml-companion-nvim = buildVimPlugin {
|
||||
pname = "yaml-companion.nvim";
|
||||
version = "0.1.3-unstable-2024-07-14";
|
||||
|
||||
@@ -209,6 +209,6 @@ in
|
||||
|
||||
meta = super.nvim-treesitter.meta or { } // {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2021,6 +2021,19 @@ assertNoAdditions {
|
||||
checkInputs = [ self.lualine-nvim ];
|
||||
};
|
||||
|
||||
mcphub-nvim = super.mcphub-nvim.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
checkInputs = [
|
||||
# Required by mcphub.extensions.luali
|
||||
self.lualine-nvim
|
||||
];
|
||||
|
||||
nvimSkipModules = [
|
||||
# ENOENT: no such file or directory (cmd): 'npm'
|
||||
"bundled_build"
|
||||
];
|
||||
};
|
||||
|
||||
mind-nvim = super.mind-nvim.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
@@ -520,6 +520,7 @@ https://github.com/cocopon/iceberg.vim/,,
|
||||
https://github.com/idris-hackers/idris-vim/,,
|
||||
https://github.com/idris-community/idris2-nvim/,,
|
||||
https://github.com/edwinb/idris2-vim/,,
|
||||
https://github.com/keaising/im-select.nvim/,HEAD,
|
||||
https://github.com/HakonHarnes/img-clip.nvim/,HEAD,
|
||||
https://github.com/lewis6991/impatient.nvim/,,
|
||||
https://github.com/backdround/improved-search.nvim/,HEAD,
|
||||
@@ -656,6 +657,7 @@ https://github.com/marko-cerovac/material.nvim/,,
|
||||
https://github.com/kaicataldo/material.vim/,HEAD,
|
||||
https://github.com/mattn/calendar-vim/,,mattn-calendar-vim
|
||||
https://github.com/vim-scripts/mayansmoke/,,
|
||||
https://github.com/ravitemer/mcphub.nvim/,HEAD,
|
||||
https://github.com/chikamichi/mediawiki.vim/,HEAD,
|
||||
https://github.com/savq/melange-nvim/,,
|
||||
https://github.com/lsig/messenger.nvim/,HEAD,
|
||||
@@ -1776,6 +1778,7 @@ https://github.com/kyza0d/xeno.nvim/,HEAD,
|
||||
https://github.com/Mythos-404/xmake.nvim/,HEAD,
|
||||
https://github.com/drmingdrmer/xptemplate/,,
|
||||
https://github.com/guns/xterm-color-table.vim/,,
|
||||
https://github.com/y9san9/y9nika.nvim/,HEAD,
|
||||
https://github.com/someone-stole-my-name/yaml-companion.nvim/,HEAD,
|
||||
https://github.com/cwrau/yaml-schema-detect.nvim/,HEAD,
|
||||
https://github.com/gbprod/yanky.nvim/,HEAD,
|
||||
|
||||
@@ -1328,8 +1328,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "discloud";
|
||||
name = "discloud";
|
||||
version = "2.27.12";
|
||||
hash = "sha256-Id7TpEqF/pFVbZBVRFrlXdN3kBL0BC/nX3Vg2PYgVJU=";
|
||||
version = "2.27.15";
|
||||
hash = "sha256-LFZR0AxMC0TKUOKU/Ftz1AkLRazqUptkZQ11NIvv7Hs=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "lean4";
|
||||
publisher = "leanprover";
|
||||
version = "0.0.221";
|
||||
hash = "sha256-OoDM9PuhQBRln41OHdVbI8EcXaqIQPArnqgFt+63aJg=";
|
||||
version = "0.0.223";
|
||||
hash = "sha256-afdbAEQSWt4WeCISdtsuGN8GMjSSSpCuED6L/Oluso0=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,68 +0,0 @@
|
||||
{ fetchurl }:
|
||||
let
|
||||
fetchTestInput =
|
||||
{ res, sha256 }:
|
||||
fetchurl {
|
||||
inherit sha256;
|
||||
url = "https://www.mkgmap.org.uk/testinput/${res}";
|
||||
name = builtins.replaceStrings [ "/" ] [ "__" ] res;
|
||||
};
|
||||
in
|
||||
[
|
||||
(fetchTestInput {
|
||||
res = "osm/lon1.osm.gz";
|
||||
sha256 = "1r8sl67hayjgybxy9crqwp7f1w0ljxvxh0apqcvr888yhsbb8drv";
|
||||
})
|
||||
(fetchTestInput {
|
||||
res = "osm/uk-test-1.osm.gz";
|
||||
sha256 = "0jdngkjn22jvi8q7hrzpqb9mnjlz82h1dwdmc4qrb64kkhzm4dfk";
|
||||
})
|
||||
(fetchTestInput {
|
||||
res = "osm/uk-test-2.osm.gz";
|
||||
sha256 = "05mw0qcdgki151ldmxayry0gqlb72jm5wrvxq3dkwq5i7jb21qs4";
|
||||
})
|
||||
(fetchTestInput {
|
||||
res = "osm/is-in-samples.osm";
|
||||
sha256 = "18vqfbq25ys59bj6dl6dq3q4m2ri3ki2xazim14fm94k1pbyhbh3";
|
||||
})
|
||||
(fetchTestInput {
|
||||
res = "mp/test1.mp";
|
||||
sha256 = "1dykr0z84c3fqgm9kdp2dzvxc3galjbx0dn9zxjw8cfk7mvnspj2";
|
||||
})
|
||||
(fetchTestInput {
|
||||
res = "img/63240001.img";
|
||||
sha256 = "1wmqgy940q1svazw85z8di20xyjm3vpaiaj9hizr47b549klw74q";
|
||||
})
|
||||
(fetchTestInput {
|
||||
res = "img/63240002.img";
|
||||
sha256 = "12ivywkiw6lrglyk0clnx5ff2wqj4z0c3f5yqjsqlsaawbmxqa1f";
|
||||
})
|
||||
(fetchTestInput {
|
||||
res = "img/63240003.img";
|
||||
sha256 = "19mgxqv6kqk8ahs8s819sj7cc79id67373ckwfsq7vvqyfrbasz1";
|
||||
})
|
||||
(fetchTestInput {
|
||||
res = "hgt/N00W090.hgt.zip";
|
||||
sha256 = "16hb06bgf47sz2mfbbx3xqmrh1nmm04wj4ngm512sng4rjhksxgn";
|
||||
})
|
||||
(fetchTestInput {
|
||||
res = "hgt/N00W091.hgt.zip";
|
||||
sha256 = "153j4wj7170qj81nr7sr6dp9zar62gnrkh6ww62bygpfqqyzdr1x";
|
||||
})
|
||||
(fetchTestInput {
|
||||
res = "hgt/S01W090.hgt.zip";
|
||||
sha256 = "0czgs9rhp7bnzmzm7907vprj3nhm2lj6q1piafk8dm9rcqkfg8sj";
|
||||
})
|
||||
(fetchTestInput {
|
||||
res = "hgt/S01W091.hgt.zip";
|
||||
sha256 = "0z58q3ai499mflxfjqhqv9i1di3fmp05pkv39886k1na107g3wbn";
|
||||
})
|
||||
(fetchTestInput {
|
||||
res = "hgt/S02W090.hgt.zip";
|
||||
sha256 = "0q7817gdxk2vq73ci6ffks288zqywc21f5ns73b6p5ds2lrxhf5n";
|
||||
})
|
||||
(fetchTestInput {
|
||||
res = "hgt/S02W091.hgt.zip";
|
||||
sha256 = "1mwpgd85v9n99gmx2bn8md7d312wvhq86w3c9k92y8ayrs20lmdr";
|
||||
})
|
||||
]
|
||||
@@ -679,13 +679,13 @@
|
||||
"vendorHash": "sha256-OvotUEh+P2b3ngaD/8lVbemnM3lrtwqduPXPjF/bqVA="
|
||||
},
|
||||
"hashicorp_vault": {
|
||||
"hash": "sha256-7vcggk2Sh4z/6CCyeL8XAzk82K5jaFjiDGBEG+5ftEg=",
|
||||
"hash": "sha256-Rg18X+VFDA9p3Dx/fA/C982X4XEvSRPU0+Zkq8HWqas=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-vault",
|
||||
"rev": "v5.6.0",
|
||||
"rev": "v5.7.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-4ak7PkjQi6Nq/Xv8j3iKV8qB9tEfl1YxDbwlzTs8xBY="
|
||||
"vendorHash": "sha256-XnyEPnB0995S7LzGAlkB/O3VKWXAm1rp9NQcDvIhRVw="
|
||||
},
|
||||
"hashicorp_vsphere": {
|
||||
"hash": "sha256-vRO6vxzi4d0hNc0MmQLhN7roONnsjxPBtFt0fyvxWd8=",
|
||||
@@ -1148,13 +1148,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"sacloud_sakuracloud": {
|
||||
"hash": "sha256-hEE1bnkXutlQL0b51uTGZs4tzys4RBloadK1yYRK46M=",
|
||||
"hash": "sha256-gcl4ClYxmZbACn8rmcZzn/XeYMeLAuhAr2IVuQRqXoQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud",
|
||||
"owner": "sacloud",
|
||||
"repo": "terraform-provider-sakuracloud",
|
||||
"rev": "v2.34.1",
|
||||
"rev": "v2.34.2",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-X2CQf1/KGZZv1R0WzA6+IEDggmuttm/MeFMqxBm8PVk="
|
||||
"vendorHash": "sha256-LQAEOSSqpR8ipYkL6dcJvJvgs17VOYRolYn7Qt4Oer4="
|
||||
},
|
||||
"sap-cloud-infrastructure_sci": {
|
||||
"hash": "sha256-m3degJZruqRkA/lSnNQrLfJIlpl5k8qCpbyIcsyV5/U=",
|
||||
|
||||
@@ -75,7 +75,7 @@ let
|
||||
"9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk=";
|
||||
"9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
|
||||
"9.1.1".sha256 = "sha256-aFsGsFzexyDnOVarHPKs35HjiV8uUCpeOKSl15wXZ4s=";
|
||||
"9.2+rc1".sha256 = "sha256-zKVhnBid5LOcd7uHWFGmUdHpyNLxIyB7RNNz5btz0mI=";
|
||||
"9.2+rc2".sha256 = "sha256-L6V9Vyv8Q0IWpGfXqL/YKcpx/gLBa7k9rnPvRGvAO+M=";
|
||||
};
|
||||
releaseRev = v: "V${v}";
|
||||
fetched =
|
||||
|
||||
@@ -9,15 +9,15 @@
|
||||
python3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "easycrypt";
|
||||
version = "2025.11";
|
||||
version = "2026.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "easycrypt";
|
||||
repo = "easycrypt";
|
||||
tag = "r${version}";
|
||||
hash = "sha256-BLyC8AB075Nyhb5heIKVkxnWWt4Zn8Doo10ShsACJ4g=";
|
||||
tag = "r${finalAttrs.version}";
|
||||
hash = "sha256-ii/msqNUPZ7jQXG2fEkEpsGXc4sw6DcyaTIw21lrl7M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
|
||||
batteries
|
||||
dune-build-info
|
||||
dune-site
|
||||
markdown
|
||||
pcre2
|
||||
why3
|
||||
yojson
|
||||
@@ -46,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
strictDeps = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace dune-project --replace-fail '(name easycrypt)' '(name easycrypt)(version ${version})'
|
||||
substituteInPlace dune-project --replace-fail '(name easycrypt)' '(name easycrypt)(version ${finalAttrs.version})'
|
||||
'';
|
||||
|
||||
pythonPath = with python3.pkgs; [ pyyaml ];
|
||||
@@ -67,4 +68,4 @@ stdenv.mkDerivation rec {
|
||||
description = "Computer-Aided Cryptographic Proofs";
|
||||
mainProgram = "easycrypt";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -28,7 +28,7 @@ let
|
||||
"9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk=";
|
||||
"9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
|
||||
"9.1.1".sha256 = "sha256-aFsGsFzexyDnOVarHPKs35HjiV8uUCpeOKSl15wXZ4s=";
|
||||
"9.2+rc1".sha256 = "sha256-zKVhnBid5LOcd7uHWFGmUdHpyNLxIyB7RNNz5btz0mI=";
|
||||
"9.2+rc2".sha256 = "sha256-L6V9Vyv8Q0IWpGfXqL/YKcpx/gLBa7k9rnPvRGvAO+M=";
|
||||
};
|
||||
releaseRev = v: "V${v}";
|
||||
fetched =
|
||||
|
||||
@@ -76,9 +76,9 @@ let
|
||||
virtualboxSubVersion = "";
|
||||
virtualboxSha256 = "c58443a0e6fcc7fc7e84c1011a10823b3540c6a2b8f2e27c4d8971272baf09f7";
|
||||
|
||||
kvmPatchVboxVersion = "7.2.4";
|
||||
kvmPatchVersion = "20251103";
|
||||
kvmPatchHash = "sha256-VhSuRYiZLg8hIGatf27u/nBBBtB1zz4ePxtiRYy84Hw=";
|
||||
kvmPatchVboxVersion = "7.2.6";
|
||||
kvmPatchVersion = "20260201";
|
||||
kvmPatchHash = "sha256-pq4DPLwHRRAMJjmfXympDxJK9+d+LwTOxBqxAm0pl3o=";
|
||||
|
||||
# The KVM build is not compatible to VirtualBox's kernel modules. So don't export
|
||||
# modsrc at all.
|
||||
|
||||
@@ -3,12 +3,11 @@
|
||||
lib,
|
||||
virtualbox,
|
||||
}:
|
||||
let
|
||||
virtualboxExtPackVersion = "7.2.6";
|
||||
in
|
||||
fetchurl rec {
|
||||
name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack";
|
||||
url = "https://download.virtualbox.org/virtualbox/${virtualboxExtPackVersion}/${name}";
|
||||
pname = "virtualbox-extpack";
|
||||
version = "7.2.6";
|
||||
name = "Oracle_VirtualBox_Extension_Pack-${version}.vbox-extpack";
|
||||
url = "https://download.virtualbox.org/virtualbox/${version}/${name}";
|
||||
sha256 =
|
||||
# Manually sha256sum the extensionPack file, must be hex!
|
||||
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
|
||||
|
||||
@@ -39,7 +39,7 @@ if [ ! "$oldVersion" = "$latestVersion" ]; then
|
||||
-e "s/virtualboxSha256 = \".*\";/virtualboxSha256 = \"$virtualBoxShaSum\";/g" \
|
||||
-i "$virtualboxNixFile"
|
||||
sed -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' \
|
||||
-e "s/virtualboxExtPackVersion = \".*\";/virtualboxExtPackVersion = \"$latestVersion\";/g" \
|
||||
-e "s/version = \".*\";/version = \"$latestVersion\";/g" \
|
||||
-i $extpackNixFile
|
||||
sed -e "s/sha256 = \".*\";/sha256 = \"$guestAdditionsIsoShaSum\";/g" \
|
||||
-i "$guestAdditionsIsoNixFile"
|
||||
|
||||
@@ -8,25 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "acme-dns";
|
||||
# Unstable version to allow building with toolchains later than EOL Go 1.22,
|
||||
# see https://github.com/joohoi/acme-dns/issues/365
|
||||
version = "1.1-unstable-2024-12-15";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joohoi";
|
||||
owner = "acme-dns";
|
||||
repo = "acme-dns";
|
||||
rev = "b7a0a8a7bcef39f6158dd596fe716594a170d362";
|
||||
hash = "sha256-UApFNcU6a6nzpwbIJv1LLmXVTGLzY0HQBlRATq2s9x8=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tjVI+CaQTN1SB/RkTg0CJ1o9azb2ULwR1uKK5fJZ8fw=";
|
||||
};
|
||||
|
||||
# Fetching of goModules fails with 'go: updates to go.mod needed'
|
||||
postPatch = ''
|
||||
substituteInPlace go.mod \
|
||||
--replace-fail 'go 1.22' 'go 1.22.0' \
|
||||
--replace-fail 'toolchain go1.22.0' 'toolchain go1.24.1'
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-pKEOmMF1lvm/CU1n3ykh6YvtRNH/2i+0AvOJzq8eets=";
|
||||
vendorHash = "sha256-n3icQQkdA0nCkvthsFsUTrYg0B3t8hROL4QXgBQRbSg=";
|
||||
|
||||
postInstall = ''
|
||||
install -D -m0444 -t $out/lib/systemd/system ./acme-dns.service
|
||||
@@ -37,8 +28,8 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Limited DNS server to handle ACME DNS challenges easily and securely";
|
||||
homepage = "https://github.com/joohoi/acme-dns";
|
||||
changelog = "https://github.com/joohoi/acme-dns/releases/tag/${finalAttrs.src.rev}";
|
||||
homepage = "https://github.com/acme-dns/acme-dns";
|
||||
changelog = "https://github.com/acme-dns/acme-dns/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ emilylange ];
|
||||
mainProgram = "acme-dns";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "auth0-cli";
|
||||
version = "1.26.0";
|
||||
version = "1.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "auth0";
|
||||
repo = "auth0-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ng+eIM8C557HY9kfAaidhwb/oT875qcPC7zTpXFn0c8=";
|
||||
hash = "sha256-DrQCbuVFfbhobF3lppQg/a0J/ZSMuP+wbLrMsLcKSRE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fEoDvnHNQWwk++3n/4R1Q3YKwraxP8OBFLU0hZLcouc=";
|
||||
vendorHash = "sha256-Us6NJiSfOK1BBRyrYil26HGaZAgum6k3B5LdV60rCeA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
withVpx ? true,
|
||||
withSvtAv1 ? true,
|
||||
withCuda ? false,
|
||||
withVpl ? stdenv.hostPlatform.isLinux,
|
||||
|
||||
ffmpeg-full,
|
||||
yt-dlp,
|
||||
@@ -29,13 +30,13 @@
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "auto-editor";
|
||||
version = "29.6.1";
|
||||
version = "29.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WyattBlue";
|
||||
repo = "auto-editor";
|
||||
tag = version;
|
||||
hash = "sha256-7/ey7nZdy1SnGdW5LjX7dtxyqqvrTuIvtJXMXYVYB6k=";
|
||||
hash = "sha256-R1GnvFjC/nq/gIiX6rUxP7qR3IfpGfc4Ci28AIk4CfQ=";
|
||||
};
|
||||
|
||||
lockFile = ./lock.json;
|
||||
@@ -51,14 +52,15 @@ buildNimPackage rec {
|
||||
++ lib.optionals withWhisper [ whisper-cpp ]
|
||||
++ lib.optionals withVpx [ libvpx ]
|
||||
++ lib.optionals withSvtAv1 [ svt-av1 ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ libvpl ];
|
||||
++ lib.optionals withVpl [ libvpl ];
|
||||
|
||||
nimFlags =
|
||||
lib.optionals withHEVC [ "-d:enable_hevc" ]
|
||||
++ lib.optionals withWhisper [ "-d:enable_whisper" ]
|
||||
++ lib.optionals withVpx [ "-d:enable_vpx" ]
|
||||
++ lib.optionals withSvtAv1 [ "-d:enable_svtav1" ]
|
||||
++ lib.optionals withCuda [ "-d:enable_cuda" ];
|
||||
++ lib.optionals withCuda [ "-d:enable_cuda" ]
|
||||
++ lib.optionals withVpl [ "-d:enable_vpl" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/log.nim \
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "aws-vault";
|
||||
version = "7.9.3";
|
||||
version = "7.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ByteNess";
|
||||
repo = "aws-vault";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-oQI1VjK4nQAErXgtUumdTwVB0maCfEv4WRF+buaHnKM=";
|
||||
hash = "sha256-Tdi2kGoJ0ZwEnBvjkjZuoTTIdmsJjdMi75gwBmy+5N4=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-KXJSggr0kOTduv3yhDJbDNdSrfXS+d2UOFFn9UK519M=";
|
||||
vendorHash = "sha256-rY7UbAgv+dLnZBLFptPp7D+gYBsCj7QYM4VvH/HBdq4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "azurehound";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpecterOps";
|
||||
repo = "AzureHound";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-E2TMIajzxydNFHhVnOpFVTd2L5gDK9VcIZetcgh0edg=";
|
||||
hash = "sha256-/ene4POMlqpSFixbD7uzubmOmI/IOPgJbzEQV2dq1gU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+iNFWKFNON4HX2mf4O29zAdElEkIGIx55Wi9MRtg1dg=";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bazel-buildtools";
|
||||
version = "8.2.1";
|
||||
version = "8.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "buildtools";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-YkxEc+hcfOH2zzdHngoJmuCqGD4FWSkFd2cVqIrpHD4=";
|
||||
hash = "sha256-ykfdajj9KpP9+j0uePYCRf7TDpb1GbGAiR6bI++jslg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sYZ7ogQY0dWOwJMvLljOjaKeYGYdLrF5AnetregdlYY=";
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "bcc";
|
||||
version = "0.36.0";
|
||||
version = "0.36.1";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iovisor";
|
||||
repo = "bcc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-J00GRIM9AemLkKHoyKqLR2U2aEBwNy/a5hbGjLRrO8w=";
|
||||
hash = "sha256-+XBFENCAKP8Z+5dviBervDXHOM2qY3lfDFsDKVjzMbM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bee";
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethersphere";
|
||||
repo = "bee";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Yz23iVYGZ4PS1jbV5zFaCEsQOoAbHBpePml0zp5GSkQ=";
|
||||
hash = "sha256-SteqSo2mfb3Mr5Zn1fZauhQbQ8iE3VgoDfLVj/IDhvs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0czsloD2EhSWKQbj7NJ4IqGgKM9+Vp8gSIhOKWg/onA=";
|
||||
vendorHash = "sha256-6yX2WnWH2K7/2Ou82mw7/LJfu5MEZp/MN61Z2N5pgPc=";
|
||||
|
||||
subPackages = [ "cmd/bee" ];
|
||||
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "brogue-ce";
|
||||
version = "1.14.1";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmewett";
|
||||
repo = "BrogueCE";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-habmfq1jZa70eggLOgsPT6j1OGmmQ6qmWcCwRN2G4Fo=";
|
||||
hash = "sha256-NZp40tPNyO85J6pduV/X79cfUYAAUH7wySlg1IgT4f4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "btcpayserver";
|
||||
version = "2.3.2";
|
||||
version = "2.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "btcpayserver";
|
||||
repo = "btcpayserver";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0R39jyQaHiei8jXS8gPmkpolC2EcLusLPIMj6Q5iycE=";
|
||||
hash = "sha256-u4VNDKLOb6bEkdhRTmnGxyM+2a6mcdWwV1T4+HFK/14=";
|
||||
};
|
||||
|
||||
projectFile = "BTCPayServer/BTCPayServer.csproj";
|
||||
|
||||
@@ -37,6 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
oxalica
|
||||
matthiasbeyer
|
||||
figsoda
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -49,6 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
matthiasbeyer
|
||||
chrjabs
|
||||
figsoda
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -4,8 +4,10 @@
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
makeWrapper,
|
||||
openssl,
|
||||
xz,
|
||||
python3,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -21,18 +23,16 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "chameleon-cli";
|
||||
version = "2.1.0-unstable-2025-10-13";
|
||||
version = "2.1.0-unstable-2026-02-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RfidResearchGroup";
|
||||
repo = "ChameleonUltra";
|
||||
rev = "97dfe5b9a41a6ea5535c6842afbe420098c4844b";
|
||||
sparseCheckout = [ "software" ];
|
||||
hash = "sha256-zFExh0vhzNcf02izgO4P4cWq3LoQpEHb4ZW7hsHZqNA=";
|
||||
rev = "2c7c3eeb4df8eee7451aff7c5ddae5d10cd0c34d";
|
||||
rootDir = "software";
|
||||
hash = "sha256-5QlJGmUjJKWc7e53zMXNoNXTBhwpepThKn9xMKpF16s=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/software";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace-fail "liblzma" "lzma" \
|
||||
@@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
xz
|
||||
];
|
||||
|
||||
@@ -67,7 +68,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version=branch"
|
||||
"--version-regex=v(.*)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Command line interface for Chameleon Ultra";
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p coreutils nix-update
|
||||
|
||||
# This update script exists, because nix-update is unable to ignore `dev`
|
||||
# tags that exist on the upstream repo.
|
||||
#
|
||||
# Once https://github.com/Mic92/nix-update/issues/322 is resolved it can be
|
||||
# removed.
|
||||
|
||||
set -exuo pipefail
|
||||
|
||||
cd "$(git rev-parse --show-toplevel)"
|
||||
|
||||
nix-update --version=branch chameleon-cli
|
||||
|
||||
tag=$(git ls-remote --tags --refs --sort='-version:refname' https://github.com/RfidResearchGroup/ChameleonUltra.git 'v*' | head -n 1 | cut --delimiter=/ --field=3-)
|
||||
tag="${tag#v}"
|
||||
sed -i -e 's|version = "[^-]*-unstable-|version = "'"${tag}"'-unstable-|' pkgs/by-name/ch/chameleon-cli/package.nix
|
||||
@@ -1,37 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "charis-sil";
|
||||
version = "6.200";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://software.sil.org/downloads/r/charis/CharisSIL-${version}.zip";
|
||||
hash = "sha256-q451lec/l13Uanmr8K/C55Cr3avRvqQUkPK/ZZ1kgHo=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 *.ttf -t $out/share/fonts/truetype
|
||||
install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://software.sil.org/charis";
|
||||
description = "Family of highly readable fonts for broad multilingual use";
|
||||
longDescription = ''
|
||||
This Charis SIL font is essentially the same design as the SIL Charis font first released by SIL in 1997. Charis is similar to Bitstream Charter, one of the first fonts designed specifically for laser printers. It is highly readable and holds up well in less-than-ideal reproduction environments. It also has a full set of styles – regular, italic, bold, bold italic. Charis is a serif, proportionally-spaced font optimized for readability in long printed documents.
|
||||
|
||||
The goal for this product was to provide a single Unicode-based font family that would contain a comprehensive inventory of glyphs needed for almost any Roman- or Cyrillic-based writing system, whether used for phonetic or orthographic needs. In addition, there is provision for other characters and symbols useful to linguists. This font makes use of state-of-the-art font technologies to support complex typographic issues, such as the need to position arbitrary combinations of base glyphs and diacritics optimally.
|
||||
'';
|
||||
license = lib.licenses.ofl;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.f--t ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "charis";
|
||||
version = "7.000";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://software.sil.org/downloads/r/charis/Charis-${finalAttrs.version}.zip";
|
||||
hash = "sha256-cVz0U2PAIl8FqT/HhvDNoWg3SCwKQ1e7rdk+dkP1Cc8=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D --mode 444 --target-directory $out/share/fonts/truetype *.ttf
|
||||
install -D --mode 444 --target-directory $out/share/doc/charis-${finalAttrs.version} \
|
||||
OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://software.sil.org/charis";
|
||||
description = "Family of highly readable fonts for broad multilingual use";
|
||||
longDescription = ''
|
||||
This Charis font is essentially the same design as the SIL Charis font
|
||||
first released by SIL in 1997. Charis is similar to Bitstream Charter,
|
||||
one of the first fonts designed specifically for laser printers. It is
|
||||
highly readable and holds up well in less-than-ideal reproduction
|
||||
environments. It also has a full set of styles – regular, italic, bold,
|
||||
bold italic. Charis is a serif, proportionally-spaced font optimized for
|
||||
readability in long printed documents.
|
||||
|
||||
The goal for this product was to provide a single Unicode-based font
|
||||
family that would contain a comprehensive inventory of glyphs needed for
|
||||
almost any Roman- or Cyrillic-based writing system, whether used for
|
||||
phonetic or orthographic needs. In addition, there is provision for other
|
||||
characters and symbols useful to linguists. This font makes use of
|
||||
state-of-the-art font technologies to support complex typographic issues,
|
||||
such as the need to position arbitrary combinations of base glyphs and
|
||||
diacritics optimally.
|
||||
'';
|
||||
license = lib.licenses.ofl;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.f--t ];
|
||||
};
|
||||
})
|
||||
@@ -7,12 +7,12 @@
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
version = "13.1.0";
|
||||
version = "13.2.0";
|
||||
pname = "checkstyle";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
|
||||
sha256 = "sha256-o00i6bi9qNABypHRKLfniqYMxeWmiYx/eOy6Q3oh3UA=";
|
||||
sha256 = "sha256-rAPNT/zbMXX1s4upQlZD6QnNFliNPlVBzbUjxcTL3PU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
@@ -39,13 +39,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cinnamon-session";
|
||||
version = "6.6.1";
|
||||
version = "6.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-session";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-zPfyPBKN9Qqs2UndW0vYzBqmeFla3ytvdcv/X2dv1zs=";
|
||||
hash = "sha256-5Cbx0SNBcTovRvxwPSqR4SM/FBLXrfkS5RZGXeU1ULY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -74,13 +74,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cinnamon";
|
||||
version = "6.6.6";
|
||||
version = "6.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-yOgDajTZFC566uhf9pvenAIMdDTU1JOF+ahtgPp6kTY=";
|
||||
hash = "sha256-UP/8FIgTCdQrE+kvG0nLo+oqYo8x/lm3RPKOXnTFJaE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cirrus-cli";
|
||||
version = "0.162.0";
|
||||
version = "0.163.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = "cirrus-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-2YIStmYuJK4k7TUyMTHx8IozoqxQlcp/QvzYq2dOrBw=";
|
||||
hash = "sha256-x/SwCCgW3wZnQ0VwVUinfPXiBexKdfvFGMFiBdmApFI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YIDWRKbnXOWrQdjXz/GYzTIduSGQBaeCo21gp469VHc=";
|
||||
vendorHash = "sha256-7xjt1TP+Wei+iEiCJMn7XyzW4RV2GNf+xX5O3tnXFvc=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${finalAttrs.version}"
|
||||
|
||||
@@ -0,0 +1,197 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
SDL2,
|
||||
boost,
|
||||
catch2_3,
|
||||
cmake,
|
||||
ninja,
|
||||
fetchFromGitea,
|
||||
cpp-jwt,
|
||||
cubeb,
|
||||
gamemode,
|
||||
discord-rpc,
|
||||
enet,
|
||||
fetchzip,
|
||||
ffmpeg-headless,
|
||||
fmt,
|
||||
glslang,
|
||||
openal,
|
||||
libopus,
|
||||
libusb1,
|
||||
libva,
|
||||
lz4,
|
||||
python3,
|
||||
wrapGAppsHook3,
|
||||
nlohmann_json,
|
||||
rapidjson,
|
||||
openssl,
|
||||
pkg-config,
|
||||
qt6,
|
||||
spirv-tools,
|
||||
spirv-headers,
|
||||
vulkan-utility-libraries,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
simpleini,
|
||||
zlib,
|
||||
vulkan-memory-allocator,
|
||||
zstd,
|
||||
withDiscordPresence ? true,
|
||||
withOptimisation ? false,
|
||||
}:
|
||||
let
|
||||
nx_tzdbVersion = "221202";
|
||||
nx_tzdb = fetchzip {
|
||||
url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${nx_tzdbVersion}/${nx_tzdbVersion}.zip";
|
||||
hash = "sha256-YOIElcKTiclem05trZsA3YJReozu/ex7jJAKD6nAMwc=";
|
||||
stripRoot = false;
|
||||
};
|
||||
inherit (qt6)
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qttools
|
||||
qtwayland
|
||||
qtwebengine
|
||||
wrapQtAppsHook
|
||||
;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "citron-emu";
|
||||
version = "0.12.25";
|
||||
src = fetchFromGitea {
|
||||
fetchSubmodules = true;
|
||||
domain = "git.citron-emu.org";
|
||||
owner = "Citron";
|
||||
repo = "Emulator";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Su+SvCb6KDF9/ilb6Y/RZTOq/ffaMTWiJZy8nmGZ3n4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
glslang
|
||||
pkg-config
|
||||
python3
|
||||
qttools
|
||||
wrapGAppsHook3
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
vulkan-headers
|
||||
boost
|
||||
catch2_3
|
||||
cpp-jwt
|
||||
cubeb
|
||||
enet
|
||||
ffmpeg-headless
|
||||
fmt
|
||||
openal
|
||||
libopus
|
||||
libusb1
|
||||
libva
|
||||
lz4
|
||||
nlohmann_json
|
||||
rapidjson
|
||||
openssl
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtwayland
|
||||
qtwebengine
|
||||
gamemode
|
||||
SDL2
|
||||
simpleini
|
||||
spirv-tools
|
||||
spirv-headers
|
||||
vulkan-loader
|
||||
vulkan-memory-allocator
|
||||
vulkan-utility-libraries
|
||||
zlib
|
||||
zstd
|
||||
]
|
||||
++ lib.optionals withDiscordPresence [
|
||||
discord-rpc
|
||||
];
|
||||
|
||||
__structuredAttrs = true;
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
|
||||
(lib.cmakeBool "CITRON_ENABLE_LTO" true)
|
||||
(lib.cmakeBool "CITRON_TESTS" false)
|
||||
(lib.cmakeBool "ENABLE_QT" true)
|
||||
(lib.cmakeBool "USE_SYSTEM_QT" true)
|
||||
(lib.cmakeBool "ENABLE_QT_TRANSLATION" true)
|
||||
(lib.cmakeBool "CITRON_USE_EXTERNAL_SDL2" false)
|
||||
(lib.cmakeBool "CITRON_USE_EXTERNAL_VULKAN_HEADERS" false)
|
||||
(lib.cmakeBool "CITRON_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES" false)
|
||||
(lib.cmakeBool "CITRON_USE_EXTERNAL_VULKAN_SPIRV_TOOLS" false)
|
||||
(lib.cmakeBool "CITRON_DOWNLOAD_TIME_ZONE_DATA" false)
|
||||
(lib.cmakeBool "CITRON_CHECK_SUBMODULES" false)
|
||||
(lib.cmakeBool "CITRON_USE_QT_WEB_ENGINE" true)
|
||||
(lib.cmakeBool "CITRON_USE_QT_MULTIMEDIA" true)
|
||||
(lib.cmakeBool "USE_DISCORD_PRESENCE" withDiscordPresence)
|
||||
(lib.cmakeBool "CITRON_ENABLE_COMPATIBILITY_REPORTING" false)
|
||||
(lib.cmakeBool "CITRON_USE_AUTO_UPDATER" false)
|
||||
(lib.cmakeFeature "TITLE_BAR_FORMAT_IDLE" "${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}")
|
||||
(lib.cmakeFeature "TITLE_BAR_FORMAT_RUNNING" "${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) | {}")
|
||||
]
|
||||
++ lib.optionals withOptimisation [
|
||||
(lib.cmakeFeature "CMAKE_C_FLAGS" "-march=x86-64-v3")
|
||||
(lib.cmakeFeature "CMAKE_CXX_FLAGS" "-march=x86-64-v3")
|
||||
];
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse4.1";
|
||||
};
|
||||
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
# provide pre-downloaded tz data
|
||||
mkdir -p build/externals/nx_tzdb
|
||||
ln -s ${nx_tzdb} build/externals/nx_tzdb/nx_tzdb
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# --- Qt 6.10: use GuiPrivate so qpa/qplatformnativeinterface.h is found ---
|
||||
|
||||
# Add GuiPrivate to the Qt6 components
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent)" \
|
||||
"find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent GuiPrivate)"
|
||||
|
||||
# Link Qt6::GuiPrivate into the GUI target so its private headers are on the include path
|
||||
substituteInPlace src/citron/CMakeLists.txt \
|
||||
--replace-fail "target_link_libraries(citron PRIVATE Boost::headers" \
|
||||
"target_link_libraries(citron PRIVATE Boost::headers Qt6::GuiPrivate"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 $src/dist/72-citron-input.rules $out/lib/udev/rules.d/72-citron-input.rules
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit nx_tzdb;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://citron-emu.org";
|
||||
changelog = "https://git.citron-emu.org/Citron/Emulator/releases/tag/${finalAttrs.version}";
|
||||
description = "Nintendo Switch emulator for PC";
|
||||
mainProgram = "citron";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = with lib.licenses; [
|
||||
gpl3Plus
|
||||
# Icons
|
||||
asl20
|
||||
mit
|
||||
cc0
|
||||
];
|
||||
maintainers = with lib.maintainers; [ samemrecebi ];
|
||||
};
|
||||
})
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cloudlist";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "cloudlist";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Tm2gqRZxfeu5gOndVeeFU9HCePpXyx/G73VzVuJRRzY=";
|
||||
hash = "sha256-SxrCkaHhlf/+rYcYjuE7UecQWoAhgVy+keRbc0py36k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LkjJrxrK1N+6v6ilMT68lu21B3NemxdquMIA5e8r1a0=";
|
||||
vendorHash = "sha256-V+2ByID1/2yaxuy7OL21ZBzYgZchszMOblL0bNglcEY=";
|
||||
|
||||
subPackages = [ "cmd/cloudlist/" ];
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cloudlog";
|
||||
version = "2.8.6";
|
||||
version = "2.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicbug";
|
||||
repo = "Cloudlog";
|
||||
rev = version;
|
||||
hash = "sha256-k+/KajRRKsfEFk8ApEJ154pT4cR54ZnavSrk8U4Azso=";
|
||||
hash = "sha256-/zMZbM9TvFMZTUkAN4wqutZ+YQA9sVtdXZwEGISm6NA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnquery";
|
||||
version = "12.20.1";
|
||||
version = "12.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnquery";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zsmu/PKsmqpG1TwK8VKY7F4YFQ89bmzFSNvI54Gy/gA=";
|
||||
hash = "sha256-RauEf78cTRPHSmisDus/5XoROZp5VpZL0mKPXbRoPCw=";
|
||||
};
|
||||
|
||||
subPackages = [ "apps/cnquery" ];
|
||||
|
||||
vendorHash = "sha256-cJCd8cXZa5JgY91D4+RnLOONZM/lj2Fbb3bU5pCbbbs=";
|
||||
vendorHash = "sha256-Hh6dsxelPuuU7ISa2E396iUUrYdttG2HdxnBxYlXcis=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex-acp";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zed-industries";
|
||||
repo = "codex-acp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QQye6H5XCHDsqypXK5ROQ27PYk/W0Cip61sjECZDQo4=";
|
||||
hash = "sha256-UtfvuejBnciksytIkTE2yFLTTy5gIB/kbOg7abTBGqQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pHJhzPSLX9lKa9FXuauF0brwgFSQgPIHOVo6l+PqnnI=";
|
||||
cargoHash = "sha256-pCHmYa+5xkON2BoAh7RRe5lQeUqSNgqemt0stHQly6c=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cog";
|
||||
version = "0.0.51";
|
||||
version = "0.0.52";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "cog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Z6UegaM4+OXOo6sjfLN1tGVbeYCN9nYKRqDlOpz4NPU=";
|
||||
hash = "sha256-BebTJZo9bL6xQY0njfLzyeElTgnnJsizGY2G7D9ClXI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-AcBsXkXwXCtmJ5k+YBnQnmFZCrfarhuOygmqFJQ1CZk=";
|
||||
vendorHash = "sha256-S0P65rjIMcDWcJxGyk9aR46bsVXdvVWSt+MLJ4tLdqc=";
|
||||
|
||||
subPackages = [ "cmd/cli" ];
|
||||
|
||||
|
||||
@@ -68,13 +68,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "collectl";
|
||||
version = "4.3.20.1";
|
||||
version = "4.3.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkcz";
|
||||
repo = "collectl";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-OJGCuxWvoId1cQ5Ugiav5/T/NzddwhM+gG3s0BnYYz0=";
|
||||
hash = "sha256-xIfimx7IbC5WHLCLPXGAhL9gkC4F+/JHDFYb0wwAK3I=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "color-lsp";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huacnlee";
|
||||
repo = "color-lsp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U0pTzW2PCgMxVsa1QX9MC249PXXL2KvRSN1Em2WvIeI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-etK+9fcKS+y+0C36vJrMkQ0yyVSpCW/DLKg4nTw3LrE=";
|
||||
|
||||
# Only build the color-lsp binary, not the zed extension
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
"color-lsp"
|
||||
];
|
||||
cargoTestFlags = [
|
||||
"-p"
|
||||
"color-lsp"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A document color language server supporting HEX, RGB, HSL, and named colors";
|
||||
homepage = "https://github.com/huacnlee/color-lsp";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
tonybutt
|
||||
matthiasbeyer
|
||||
];
|
||||
mainProgram = "color-lsp";
|
||||
};
|
||||
}
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "coroot-node-agent";
|
||||
version = "1.28.1";
|
||||
version = "1.28.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coroot";
|
||||
repo = "coroot-node-agent";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-g2qvfK+H1+pK6vBlC0nOwenfYF3/KFHZPiO3OZkOUyg=";
|
||||
hash = "sha256-1jwj6saABm1RFmqO0c5ViFTveRmlsmrNZ5D7P6HtWMc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-sjdUjnBMzEfGCVOwuL9Zw/5Lup3yUf5LoBajLOCNteA=";
|
||||
vendorHash = "sha256-OOd3OctfklHzpMVDCnnb8HYPYqWQgBe+8HfbSm7dXzg=";
|
||||
|
||||
buildInputs = [ systemdLibs ];
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "crush";
|
||||
version = "0.39.3";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "crush";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XzshO11AgukJBhdfAVRn90TViyuI9cJftVfIOGqRyeM=";
|
||||
hash = "sha256-CfYBAGuny+v7wvJBDCeZVxG+M9LE+eBaq5REjJA2yyw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y7QterJ5Mmjg/kMqFGbeSvd+3UwG8uGFTrdIBET5yRI=";
|
||||
vendorHash = "sha256-2rEerdtwNAhQbdqabyyetw30DSpbmIxoiU2YPTWbEcg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
buildDotnetGlobalTool {
|
||||
pname = "csharpier";
|
||||
version = "1.2.5";
|
||||
version = "1.2.6";
|
||||
executables = "csharpier";
|
||||
|
||||
nugetHash = "sha256-VevPiNTtfRJvmK/eYlJtJEJkYkiSvRoP7nTq7q9Bs9I=";
|
||||
nugetHash = "sha256-SaBHGaaeg/1c4okHN1Pn8caGZgfLJ/KsGRqgUiAqKlQ=";
|
||||
|
||||
meta = {
|
||||
description = "Opinionated code formatter for C#";
|
||||
|
||||
@@ -21,7 +21,7 @@ let
|
||||
categories = [ "Development" ];
|
||||
}
|
||||
);
|
||||
version = "10.19.4";
|
||||
version = "10.21.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "cyberchef";
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip";
|
||||
hash = "sha256-eOMo7kdxC5HfmMrKUhGZU3vnBXibO2Fz1ftIS9RAbjY=";
|
||||
hash = "sha256-5w5Bl8LAmpx3dHAwfq4ALKKoS6zRBsh1X7p7ek4dy/s=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -27,19 +27,19 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "deadlock-mod-manager";
|
||||
version = "0.13.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deadlock-mod-manager";
|
||||
repo = "deadlock-mod-manager";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ja7B48UVpwj1gCZfrFWZjtTTaUh1QLTAE88oXwDt18Y=";
|
||||
hash = "sha256-A7RsgPi3NlcLSBkLg7/pWcSduaZyCspz19sjGjzEkqM=";
|
||||
};
|
||||
|
||||
cargoRoot = "apps/desktop";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
cargoHash = "sha256-PeY59bvL/JGl8KyE0X+nPY3XC4TNa15lGcG2i///bCI=";
|
||||
cargoHash = "sha256-L4orWiK1s1hfC2QDJ8G4hI1iqrdPHBaVTVHoW0hdlGo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.cargoSetupHook
|
||||
@@ -79,7 +79,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 2;
|
||||
sourceRoot = "source";
|
||||
hash = "sha256-dS9s5oy8GtRek7OwiGDwv7280zZuyjxIhiA6BqH8C1w=";
|
||||
hash = "sha256-KhBWFujjo3FW3intvGA2Y7eLIdJ1B/4P5xIRPvzygT8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dnscontrol";
|
||||
version = "4.33.1";
|
||||
version = "4.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = "dnscontrol";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FshKD5ERC0DyPcgF65usYhNbobarwVFkk0oUh6MsxdQ=";
|
||||
hash = "sha256-Qi/xg7yo/3r9AyY7r+bx7M95zWF+qjWlVrxix1pYfjM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-G8TEJwzPJ1WAEXmAdMhq2jSY5FADYMqhhUj7KUYc/gA=";
|
||||
vendorHash = "sha256-lYi8rWFEAYQx9muy+JAknoCgEL2xVGSJ6npCTU+hdr8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
Generated
+422
@@ -0,0 +1,422 @@
|
||||
[
|
||||
{
|
||||
"pname": "Avalonia",
|
||||
"version": "11.3.6",
|
||||
"hash": "sha256-dSq6RshqnvbHBPkSvp4rTOgtWmVUPVvaGZadPI2TK9g="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Angle.Windows.Natives",
|
||||
"version": "2.1.25547.20250602",
|
||||
"hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.BuildServices",
|
||||
"version": "0.0.31",
|
||||
"hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.ColorPicker",
|
||||
"version": "11.3.6",
|
||||
"hash": "sha256-oiaEB3gLyafsRyY8YZ/f//Wne4vAhd73jCF5XOZDIkw="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Controls.DataGrid",
|
||||
"version": "11.3.6",
|
||||
"hash": "sha256-Hk1EOnd1E+ZrQTavmQtBZ4NvHiyFhzIMcT7UQPuU2Sw="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Desktop",
|
||||
"version": "11.3.6",
|
||||
"hash": "sha256-n54YrP1SviFQH9VEXfw0O3o6K86rhGBbVw4vXhWUFOE="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Diagnostics",
|
||||
"version": "11.3.6",
|
||||
"hash": "sha256-uFKSZLA5qvta/ZSVr+vvKT8l9asBT56iF6Lgxcawsgk="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.FreeDesktop",
|
||||
"version": "11.3.6",
|
||||
"hash": "sha256-KnnXq7iFyS94PbHfbk3ks/DHEQVKxkHD+Nhe0pTPZnc="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Markup.Xaml.Loader",
|
||||
"version": "11.0.7",
|
||||
"hash": "sha256-JlvRAu+8RA+Q6sU9GAL5UA9ckNvrFSiWFHPhKSF3v8w="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Native",
|
||||
"version": "11.3.6",
|
||||
"hash": "sha256-uVFziTCL3J2DvrjNl7O3aIKCChsm4tO7INDh+3hrlJw="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Remote.Protocol",
|
||||
"version": "11.3.6",
|
||||
"hash": "sha256-Nxg+jt3Eit9amUZPPicmXy+5/2nqEu6rTLRk7ccH+qE="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Skia",
|
||||
"version": "11.3.6",
|
||||
"hash": "sha256-PqoGzraRMb4SAl0FAeROcTmPXUm5SHn6KCCdexIBgLM="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Themes.Simple",
|
||||
"version": "11.3.6",
|
||||
"hash": "sha256-omvYccZgdrkD5KnPKQlafz7lMFL46KMQrTJVxF9AV0E="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.Win32",
|
||||
"version": "11.3.6",
|
||||
"hash": "sha256-zlYoHQMyvirc73hEnpjZbhz5BUss/jAlq6Jwb+8Fucc="
|
||||
},
|
||||
{
|
||||
"pname": "Avalonia.X11",
|
||||
"version": "11.3.6",
|
||||
"hash": "sha256-nXHgvgp2cOjwchgkN1E0N47JWyYEkYTZ69FyEtCATf8="
|
||||
},
|
||||
{
|
||||
"pname": "Downloader",
|
||||
"version": "3.3.4",
|
||||
"hash": "sha256-QbbWlP3IzDzPWuZcQCfqpKQZMPSMETL/+6AXlhcjVc8="
|
||||
},
|
||||
{
|
||||
"pname": "DryIoc.dll",
|
||||
"version": "4.8.0",
|
||||
"hash": "sha256-RcQour05/6Sk6m287U0xzeLtn3j8lYfi0vybR+0558c="
|
||||
},
|
||||
{
|
||||
"pname": "FFMpegCore",
|
||||
"version": "5.1.0",
|
||||
"hash": "sha256-k6AOQjAAWiZI0g7wr32z+0kb48gfcQ1n2XhK4TL53xA="
|
||||
},
|
||||
{
|
||||
"pname": "FreeSql",
|
||||
"version": "3.5.212",
|
||||
"hash": "sha256-VwgsUXriNR09s19t3WxHFEmU49BF3fppo9Jormq/3VA="
|
||||
},
|
||||
{
|
||||
"pname": "FreeSql.DbContext",
|
||||
"version": "3.5.212",
|
||||
"hash": "sha256-pXfIFJoHcRZFaDnXSiCvr6j9oTNDCL81YL50Mf+fL6I="
|
||||
},
|
||||
{
|
||||
"pname": "FreeSql.Provider.SqliteCore",
|
||||
"version": "3.5.212",
|
||||
"hash": "sha256-6MGO6qZgiOXyYLRKvDUwFBP2B/SeAdlZPx+pkAJ3hfo="
|
||||
},
|
||||
{
|
||||
"pname": "Google.Protobuf",
|
||||
"version": "3.25.1",
|
||||
"hash": "sha256-UfP/iIcARptUcTVptj/5JQ9Jz9AG3aj+iKotsetOnH0="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.Linux",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.macOS",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw="
|
||||
},
|
||||
{
|
||||
"pname": "HarfBuzzSharp.NativeAssets.Win32",
|
||||
"version": "8.3.1.1",
|
||||
"hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
|
||||
},
|
||||
{
|
||||
"pname": "Instances",
|
||||
"version": "3.0.0",
|
||||
"hash": "sha256-tqIbgABsgi8JgT5h+WkCehANUmCzK5/p0UZH5xjOy2Y="
|
||||
},
|
||||
{
|
||||
"pname": "MicroCom.Runtime",
|
||||
"version": "0.11.0",
|
||||
"hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Data.Sqlite.Core",
|
||||
"version": "9.0.5",
|
||||
"hash": "sha256-LmIKIg6oTKjrLmbJgETn9vFmhVYFazUW2W7VfzPgQSM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "8.0.1",
|
||||
"hash": "sha256-lzTYLpRDAi3wW9uRrkTNJtMmaYdtGJJHdBLbUKu60PM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "8.0.1",
|
||||
"hash": "sha256-TYce3qvMr92JbAZ62ATBsocaH0joJzw0px0tYGZ9N0U="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
"version": "3.1.0",
|
||||
"hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Targets",
|
||||
"version": "1.1.0",
|
||||
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Win32.SystemEvents",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4="
|
||||
},
|
||||
{
|
||||
"pname": "Newtonsoft.Json",
|
||||
"version": "13.0.3",
|
||||
"hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
|
||||
},
|
||||
{
|
||||
"pname": "Prism.Avalonia",
|
||||
"version": "8.1.97.11073",
|
||||
"hash": "sha256-iZTropXsrrgv4CjjFQRqjRbhBPeP21zEofiN81454wA="
|
||||
},
|
||||
{
|
||||
"pname": "Prism.Core",
|
||||
"version": "8.1.97",
|
||||
"hash": "sha256-hAU7OpnhTZ6gKkict2BDlb3B0G1rnadDiTHoaCU9Nfc="
|
||||
},
|
||||
{
|
||||
"pname": "Prism.DryIoc.Avalonia",
|
||||
"version": "8.1.97.11073",
|
||||
"hash": "sha256-4mEQe3H/bnf2eazOeeL+pfJbwnGTQd0LB8t5cgaOhHo="
|
||||
},
|
||||
{
|
||||
"pname": "QRCoder",
|
||||
"version": "1.6.0",
|
||||
"hash": "sha256-2Ev/6d7PH6K4dVYQQHlZ+ZggkCnDtrlaGygs65mDo28="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.IO",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Reflection",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Reflection.Primitives",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Runtime",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Text.Encoding",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.any.System.Threading.Tasks",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.native.System",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
|
||||
},
|
||||
{
|
||||
"pname": "runtime.unix.System.Private.Uri",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.Linux",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.macOS",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.WebAssembly",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
|
||||
},
|
||||
{
|
||||
"pname": "SkiaSharp.NativeAssets.Win32",
|
||||
"version": "2.88.9",
|
||||
"hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
|
||||
},
|
||||
{
|
||||
"pname": "SQLitePCLRaw.bundle_e_sqlcipher",
|
||||
"version": "2.1.11",
|
||||
"hash": "sha256-wHveswfPGD1t70PcHOvB9o4devEiGRJfnA/f0GC9wHg="
|
||||
},
|
||||
{
|
||||
"pname": "SQLitePCLRaw.core",
|
||||
"version": "2.1.11",
|
||||
"hash": "sha256-s/fxEoYlNf9c2C4HZueMzPCBvpiViDVlSpg7epB0GXY="
|
||||
},
|
||||
{
|
||||
"pname": "SQLitePCLRaw.lib.e_sqlcipher",
|
||||
"version": "2.1.11",
|
||||
"hash": "sha256-Rh713RQnhLRLImYvhT3V3notKOnJjgFl8mcz2Bo1VpY="
|
||||
},
|
||||
{
|
||||
"pname": "SQLitePCLRaw.provider.e_sqlcipher",
|
||||
"version": "2.1.11",
|
||||
"hash": "sha256-PpUqjhd17HGN2eKpod2OZ8Er8G4OtlThXWu4t2nE2FY="
|
||||
},
|
||||
{
|
||||
"pname": "System.Collections.Immutable",
|
||||
"version": "9.0.5",
|
||||
"hash": "sha256-gkdeCPvmRWtUQqW3LOTGdmf2DzY0D9OKeW1jvd3EbSM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Configuration.ConfigurationManager",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-rYjp/UmagI4ZULU1ocia/AiXxLNL8uhMV8LBF4QFW10="
|
||||
},
|
||||
{
|
||||
"pname": "System.Drawing.Common",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk="
|
||||
},
|
||||
{
|
||||
"pname": "System.Formats.Nrbf",
|
||||
"version": "9.0.5",
|
||||
"hash": "sha256-i8XH8fQWFFKhHJX6IEw5N/RDBNjONj7+gT80xE/zUvY="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Pipelines",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory",
|
||||
"version": "4.5.3",
|
||||
"hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
|
||||
},
|
||||
{
|
||||
"pname": "System.Private.Uri",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Emit",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Emit.ILGeneration",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Emit.Lightweight",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Metadata",
|
||||
"version": "9.0.5",
|
||||
"hash": "sha256-HhI7ENFGiQXOQmc+BORqFzGtW/989pmm+W4exAWw/8Q="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Primitives",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.AccessControl",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.ProtectedData",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-dZfs5q3Ij1W1eJCfYjxI2o+41aSiFpaAugpoECaCOug="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Permissions",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40="
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Principal.Windows",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encoding",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encodings.Web",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "7.0.2",
|
||||
"hash": "sha256-bkfxuc3XPxtYcOJTGRMc/AkJiyIU+fTLK7PxtbuN3sQ="
|
||||
},
|
||||
{
|
||||
"pname": "System.Threading.Tasks",
|
||||
"version": "4.3.0",
|
||||
"hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
|
||||
},
|
||||
{
|
||||
"pname": "System.Windows.Extensions",
|
||||
"version": "4.7.0",
|
||||
"hash": "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU="
|
||||
},
|
||||
{
|
||||
"pname": "Tmds.DBus.Protocol",
|
||||
"version": "0.21.2",
|
||||
"hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
|
||||
},
|
||||
{
|
||||
"pname": "Xaml.Behaviors",
|
||||
"version": "11.3.0",
|
||||
"hash": "sha256-n8s/zTSzovI9HYvTzBQHUi6e/zo//6thM2w73O9T+iY="
|
||||
}
|
||||
]
|
||||
@@ -0,0 +1,141 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildDotnetModule,
|
||||
dotnetCorePackages,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
autoPatchelfHook,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
icoutils,
|
||||
aria2,
|
||||
ffmpeg,
|
||||
fontconfig,
|
||||
freetype,
|
||||
icu,
|
||||
krb5,
|
||||
openssl,
|
||||
zlib,
|
||||
lttng-ust_2_12,
|
||||
libx11,
|
||||
libxcursor,
|
||||
libxext,
|
||||
libxi,
|
||||
libxrandr,
|
||||
libice,
|
||||
libsm,
|
||||
}:
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
pname = "downkyicore";
|
||||
version = "1.0.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yaobiao131";
|
||||
repo = "downkyicore";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1APolFe2eq7aIZdg3Sl4DI/6lnvaAgX/GDcHx3M+o/I=";
|
||||
};
|
||||
|
||||
projectFile = "DownKyi/DownKyi.csproj";
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_8_0;
|
||||
executables = [ "DownKyi" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
autoPatchelfHook
|
||||
icoutils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
aria2
|
||||
ffmpeg
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
fontconfig
|
||||
freetype
|
||||
icu
|
||||
krb5
|
||||
openssl
|
||||
zlib
|
||||
lttng-ust_2_12
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
];
|
||||
|
||||
runtimeDeps = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libx11
|
||||
libxcursor
|
||||
libxext
|
||||
libxi
|
||||
libxrandr
|
||||
libice
|
||||
libsm
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace DownKyi/DownKyi.csproj DownKyi.Core/DownKyi.Core.csproj \
|
||||
--replace-fail net6.0 net8.0
|
||||
'';
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--chdir"
|
||||
"${placeholder "out"}/lib/downkyicore"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
# Provide system ffmpeg/aria2 binaries and license texts where the app expects them.
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib/downkyicore/{aria2,ffmpeg}
|
||||
|
||||
ln -s ${lib.getExe aria2} $out/lib/downkyicore/aria2/aria2c
|
||||
ln -s ${lib.getExe' ffmpeg "ffmpeg"} $out/lib/downkyicore/ffmpeg/ffmpeg
|
||||
ln -s ${lib.getExe' ffmpeg "ffprobe"} $out/lib/downkyicore/ffmpeg/ffprobe
|
||||
|
||||
printf 'See https://github.com/aria2/aria2/blob/master/COPYING for aria2 licensing information.\n' > $out/lib/downkyicore/aria2_COPYING.txt
|
||||
printf 'See https://ffmpeg.org/legal.html for FFmpeg licensing information.\n' > $out/lib/downkyicore/FFmpeg_LICENSE.txt
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
icotool -x DownKyi/Resources/favicon.ico
|
||||
install -Dm444 \
|
||||
favicon_*_128x128x32.png \
|
||||
$out/share/icons/hicolor/128x128/apps/downkyicore.png
|
||||
'';
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
app="$out/Applications/DownKyi.app"
|
||||
mkdir -p "$app/Contents/MacOS" "$app/Contents/Resources"
|
||||
|
||||
cp $src/script/macos/Info.plist "$app/Contents/Info.plist"
|
||||
makeWrapper "$out/bin/DownKyi" "$app/Contents/MacOS/DownKyi"
|
||||
cp $src/script/macos/logo.icns "$app/Contents/Resources/logo.icns"
|
||||
'';
|
||||
|
||||
desktopItems = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
(makeDesktopItem {
|
||||
name = "downkyicore";
|
||||
desktopName = "DownKyi";
|
||||
comment = "Cross-platform Bilibili downloader";
|
||||
exec = "DownKyi";
|
||||
icon = "downkyicore";
|
||||
categories = [
|
||||
"Network"
|
||||
"AudioVideo"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Cross-platform Bilibili downloader built with Avalonia";
|
||||
homepage = "https://github.com/yaobiao131/downkyicore";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ mio ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
mainProgram = "DownKyi";
|
||||
};
|
||||
})
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "drupal";
|
||||
version = "11.3.2";
|
||||
version = "11.3.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "git.drupalcode.org";
|
||||
owner = "project";
|
||||
repo = "drupal";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-RrBnVDjB6aKW6btmX604saXfPKo18oRka+SdlNmFqUo=";
|
||||
hash = "sha256-QD/vk19OLrI8whxZ9dJROL/v90U4QuCfeONs0OX4qS4=";
|
||||
};
|
||||
|
||||
composerNoPlugins = false;
|
||||
vendorHash = "sha256-c3pqPnyeuSqpMhh1an1NAnDC+IyeRVUT+dCN19/nrMQ=";
|
||||
vendorHash = "sha256-YsNg5l72htLoJgBhQ+RYxWYK5nB5Nq7Js6tf8L+BE7E=";
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
|
||||
@@ -26,6 +26,7 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "Typeface used in Edward Tufte’s books";
|
||||
homepage = "https://edwardtufte.github.io/et-book/";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ jethro ];
|
||||
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
||||
asl20 # or
|
||||
mit
|
||||
];
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ figsoda ];
|
||||
mainProgram = "faketty";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "fcitx5-pinyin-moegirl";
|
||||
version = "20260109";
|
||||
version = "20260209";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict";
|
||||
hash = "sha256-xGZ7sxELPlPo27oSCoDXQrligkmcw/fDexIFt/S0rqc=";
|
||||
hash = "sha256-ZpuAcS6KgVRL8ru+U///Zi7jiXLGIbSx6dPF0KWLvwQ=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ffmpeg-normalize";
|
||||
version = "1.36.1";
|
||||
version = "1.37.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "ffmpeg_normalize";
|
||||
hash = "sha256-HcGdP/XvLHxAQMC9infjVTMXd+/DHNBd5m5XDzBXZKk=";
|
||||
hash = "sha256-mN4vmiST+LV5Bv/QZ9Pvo3qzhTaeD3MpDa8sLNqjeW0=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ uv-build ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "focuswriter";
|
||||
version = "1.8.13";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gottcode";
|
||||
repo = "focuswriter";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-lKhgfFPEcipQcW1S2+ntglVacH6dEcGpnNHvwgeVIzI=";
|
||||
hash = "sha256-wGm+0bB4dxH6PA6993pDZopSMDNVoIHPcQXkdllcjHU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,8 +6,8 @@ index 38b3b262..3be9bfee 100644
|
||||
TARGET FreeDV
|
||||
POST_BUILD
|
||||
COMMAND rm -rf dist_tmp FreeDV.dmg || true
|
||||
- COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${Python3_ROOT_DIR}:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s ${Python3_ROOT_DIR} -s `dirname ${CLANG_SANITIZER_FILE}`
|
||||
+ COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s `dirname ${CLANG_SANITIZER_FILE}`
|
||||
- COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${Python3_ROOT_DIR}/../..:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s ${Python3_ROOT_DIR}/../.. -s `dirname ${CLANG_SANITIZER_FILE}` -ns
|
||||
+ COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s `dirname ${CLANG_SANITIZER_FILE}` -ns
|
||||
COMMAND cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/freedv.icns FreeDV.app/Contents/Resources
|
||||
COMMAND rm ARGS -rf FreeDV.app/Contents/Frameworks
|
||||
COMMAND mkdir ARGS FreeDV.app/Contents/Frameworks
|
||||
@@ -21,7 +21,7 @@ index 38b3b262..3be9bfee 100644
|
||||
- COMMAND cd FreeDV.app/Contents/Resources && ../Frameworks/Python.framework/Versions/Current/bin/python3 -c "import radae_txe\; import radae_rxe\;" && cd ../../..
|
||||
-
|
||||
# Codesign binary so that it can execute
|
||||
- COMMAND codesign --force --options runtime --timestamp --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/entitlements.plist --sign ${MACOS_CODESIGN_IDENTITY} ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app -name '*.so' -o -name '*.dylib'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/bin -name 'Python' -o -name 'python3.12*'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/ -name 'Python'` ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/MacOS/FreeDV ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/lib/python3.12/site-packages/torch/bin/* ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/Python
|
||||
- COMMAND codesign --force --options runtime --timestamp --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/entitlements.plist --sign ${MACOS_CODESIGN_IDENTITY} ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app -name '*.so' -o -name '*.dylib'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/Current/bin -name 'Python' -o -name 'python3.*'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/ -name 'Python'` ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/MacOS/FreeDV ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/Current/lib/python3.*/site-packages/torch/bin/* ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.*/Frameworks/Tcl.framework/Versions/*/*.a ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.*/Frameworks/Tk.framework/Versions/*/*.a ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.*/Frameworks/Tk.framework/Versions/*/Tk ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.*/Frameworks/Tcl.framework/Versions/*/Tcl ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/*/Python
|
||||
+ COMMAND codesign --force --options runtime --timestamp --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/entitlements.plist --sign ${MACOS_CODESIGN_IDENTITY} ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app -name '*.so' -o -name '*.dylib'`
|
||||
)
|
||||
|
||||
|
||||
@@ -34,12 +34,6 @@ let
|
||||
rev = "v1.2.6";
|
||||
hash = "sha256-UKO2k+kKH/dwt2xfaYMrH/GXjEkIrnxh1kGG/3P5d3Y=";
|
||||
};
|
||||
mimallocSrc = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "mimalloc";
|
||||
tag = "v2.2.4";
|
||||
hash = "sha256-+8xZT+mVEqlqabQc+1buVH/X6FZxvCd0rWMyjPu9i4o=";
|
||||
};
|
||||
opusSrc = fetchFromGitHub {
|
||||
owner = "xiph";
|
||||
repo = "opus";
|
||||
@@ -57,19 +51,27 @@ let
|
||||
radaeSrc = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "radae";
|
||||
rev = "0f26661b26d02e6963353dce7ad1bbe3f4791ab2";
|
||||
hash = "sha256-0pCH+oyVChWdOL5o6Uhb9DDSw4AqCfcsEKw2SZs3K4w=";
|
||||
rev = "5d640a028ab2b8e4ff23ed7136caee396cdcb844";
|
||||
# upstream repository archive fetching is broken
|
||||
forceFetchGit = true;
|
||||
hash = "sha256-+Sd+FWycEJabT3RN/zyKXS2Xzr060/ekYdzg6s1gQcM=";
|
||||
};
|
||||
radeInteg = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "radae";
|
||||
rev = "7bd3ae2401fcba58e314755576a2940085835312";
|
||||
hash = "sha256-WVYKvttiNh6uEzw0b27winyDfzzGkEEhYq7DIwfZW74=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freedv";
|
||||
version = "2.1.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "freedv-gui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3nLO0UHoIjPN5liz3XJ7r9/Qo+a64ewqvzWPZuFG2SY=";
|
||||
hash = "sha256-7SOGz2+MzAkXd5JDKasSJcKVXcnuYk+C0S9N/NPRfOM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -78,19 +80,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
cp -R ${ebur128Src} ebur128
|
||||
cp -R ${mimallocSrc} mimalloc
|
||||
cp -R ${radaeSrc} radae
|
||||
chmod -R u+w ebur128 mimalloc radae
|
||||
cp -R ${radeInteg} rade_integ
|
||||
chmod -R u+w ebur128 radae rade_integ
|
||||
substituteInPlace cmake/BuildEbur128.cmake \
|
||||
--replace-fail "GIT_REPOSITORY https://github.com/jiixyj/libebur128.git" "URL $(realpath ebur128)" \
|
||||
--replace-fail 'GIT_TAG "v''${EBUR128_VERSION}"' "" \
|
||||
--replace-fail "git apply" "patch -p1 <"
|
||||
substituteInPlace cmake/BuildMimalloc.cmake \
|
||||
--replace-fail "GIT_REPOSITORY https://github.com/microsoft/mimalloc.git" "URL $(realpath mimalloc)" \
|
||||
--replace-fail "GIT_TAG v2.2.4" ""
|
||||
substituteInPlace cmake/BuildRADE.cmake \
|
||||
--replace-fail "https://github.com/xiph/opus/archive/940d4e5af64351ca8ba8390df3f555484c567fbb.zip" "${opusSrc}" \
|
||||
--replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath radae)" \
|
||||
--replace-fail "GIT_TAG main" ""
|
||||
substituteInPlace cmake/BuildRADEForIntegrations.cmake \
|
||||
--replace-fail "https://github.com/xiph/opus/archive/940d4e5af64351ca8ba8390df3f555484c567fbb.zip" "${opusSrc}" \
|
||||
--replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath rade_integ)" \
|
||||
--replace-fail "GIT_TAG ms-disable-python-gc" ""
|
||||
patchShebangs test/test_*.sh
|
||||
substituteInPlace cmake/CheckGit.cmake \
|
||||
|
||||
@@ -80,7 +80,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryNativeCode # librusty_v8.a
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -83,13 +83,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
|
||||
version = "3.12.1";
|
||||
version = "3.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "gdal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vs9qun9Z8o4KPxWjKOV9Lp/GgAsYW7gseYv4G7+liso=";
|
||||
hash = "sha256-W9MSZP+qmG7r2SzjOXbeYebY5vx8z8cpySv/sGyj42Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -39,14 +39,13 @@ stdenv.mkDerivation {
|
||||
./build-use-optional-freetype-with-pkg-config.patch
|
||||
];
|
||||
|
||||
postPatch = [
|
||||
(lib.optionalString withExtensions ''
|
||||
postPatch =
|
||||
lib.optionalString withExtensions ''
|
||||
cp ./extensions_v5/extensions.cpp .
|
||||
'')
|
||||
(lib.optionalString (pluginsFile != null) ''
|
||||
''
|
||||
+ lib.optionalString (pluginsFile != null) ''
|
||||
cp ${pluginsFile} ./plugins.cpp
|
||||
'')
|
||||
];
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs build.sh
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ghw";
|
||||
version = "0.21.2";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaypipes";
|
||||
repo = "ghw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WZGEhrgHmJ/4puvDPYLq3iU+Ddf1PnptRj0ehcDbjZQ=";
|
||||
hash = "sha256-W3a6hKX8vsWe02uLUx9zIOmJiivIOa4Ja++iXVd8J3E=";
|
||||
};
|
||||
vendorHash = "sha256-lItNgi65HQASNQufUdhvEoNtrltkW+0hBHUlFZjfneE=";
|
||||
vendorHash = "sha256-REgtByhTlYQ3XyYleWAcrCymIWtWmltjx21tr2mtF7k=";
|
||||
|
||||
subPackages = [ "cmd/..." ];
|
||||
doCheck = false; # wants to read from /sys and other places not allowed
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "google-java-format";
|
||||
version = "1.34.0";
|
||||
version = "1.34.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
|
||||
sha256 = "sha256-S7/IwMJ6Eux420pXJQTPeDab3aztUOGZxPmfBW/DLUE=";
|
||||
sha256 = "sha256-eeHLXIvWmMVywK5QTQeBYSm4/AYgT7SVUL7IO9XqCqg=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -28,16 +28,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "goose-cli";
|
||||
version = "1.19.1";
|
||||
version = "1.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "block";
|
||||
repo = "goose";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BgY3YDe6x46XvHyE0Ia6SxNGTyU0MegkYz5TbOZVrrQ=";
|
||||
hash = "sha256-Zwb3y9XhtmKxJG6XOIHl49YVZMBsYtOPePM7heJfEvE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2jjAqIBLd7awzLcowYKADHyluclrH+iELUSMvACRj30=";
|
||||
cargoHash = "sha256-G6Jok2OfSlOVlkF62gxivrKM0VlGqWFNdR0pQh79A0Q=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--bin"
|
||||
@@ -113,6 +113,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"--skip=recipes::extract_from_cli::tests::test_extract_recipe_info_from_cli_basic"
|
||||
"--skip=recipes::extract_from_cli::tests::test_extract_recipe_info_from_cli_with_additional_sub_recipes"
|
||||
"--skip=recipes::recipe::tests::load_recipe::test_load_recipe_success"
|
||||
"--skip=test_session_id_matches_across_calls"
|
||||
"--skip=test_session_id_propagation_to_llm"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -35,7 +35,7 @@ buildNpmPackage rec {
|
||||
description = "AI agent CLI powered by Grok";
|
||||
homepage = "https://github.com/superagent-ai/grok-cli";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib; [ maintainers.madebydamo ];
|
||||
maintainers = with lib.maintainers; [ madebydamo ];
|
||||
mainProgram = "grok";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
@@ -4,21 +4,21 @@
|
||||
fetchzip,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "gyre-fonts";
|
||||
version = "2.005";
|
||||
version = "2.501";
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${version}otf.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-+6IufuFf+IoLXoZEPlfHUNgRhKrQNBEZ1OwPD9/uOjg=";
|
||||
url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg${
|
||||
lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version
|
||||
}otf.zip";
|
||||
hash = "sha256-mRPI/rDsx1vDVItG7h29I7VNPYqgSPqChXS6/gVgfNc=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
cp *.otf $out/share/fonts/truetype
|
||||
install -D --mode=444 --target-directory=$out/share/fonts/opentype *.otf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@@ -37,4 +37,4 @@ stdenvNoCC.mkDerivation rec {
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ bergey ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,27 +8,28 @@
|
||||
python3,
|
||||
cacert,
|
||||
versionCheckHook,
|
||||
nodejs_22,
|
||||
}:
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
buildNpmPackage.override { nodejs = nodejs_22; } (finalAttrs: {
|
||||
pname = "homebridge-config-ui-x";
|
||||
version = "5.14.0";
|
||||
version = "5.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "homebridge";
|
||||
repo = "homebridge-config-ui-x";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CAdzkFuVuJtHoUUDBIRRzxRJiOtGUJFzS/lczYXTfRw=";
|
||||
hash = "sha256-LXOfpOmYEeHDL0uMvRSG4q51k00tyKBEU6XP6UFm/RY=";
|
||||
};
|
||||
|
||||
# Deps hash for the root package
|
||||
npmDepsHash = "sha256-73Xt2R3COL0WPgtqn3ZwGTmOHrNqHONrX3hQCU/v5y0=";
|
||||
npmDepsHash = "sha256-MUfDMHxnwEBjv76NoJ6CYP3YJ+us0Nn/MUFcR1NFQAE=";
|
||||
|
||||
# Deps src and hash for ui subdirectory
|
||||
npmDeps_ui = fetchNpmDeps {
|
||||
name = "npm-deps-ui";
|
||||
src = "${finalAttrs.src}/ui";
|
||||
hash = "sha256-xtXAeTBryQt4FMvK3oXHJ3DdB/3umrSrmqZ3IIDgq2s=";
|
||||
hash = "sha256-GB17rJ2D1yXl/lxM8pQl2e2xnakgA8JLX7sbbdk3P5M=";
|
||||
};
|
||||
|
||||
# Need to also run npm ci in the ui subdirectory
|
||||
@@ -59,6 +60,8 @@ buildNpmPackage (finalAttrs: {
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
description = "Configure Homebridge, monitor and backup from a browser";
|
||||
homepage = "https://github.com/homebridge/homebridge-config-ui-x";
|
||||
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl jq gnugrep gnused git nix
|
||||
# shellcheck shell=bash
|
||||
set -euo pipefail
|
||||
|
||||
nixpkgs="$(pwd)"
|
||||
cd "$(readlink -e "$(dirname "${BASH_SOURCE[0]}")")"
|
||||
|
||||
pkg="(import $nixpkgs/default.nix {}).homebridge-config-ui-x"
|
||||
|
||||
nix_eval() {
|
||||
nix eval --json --impure --expr "$pkg.$1" | jq -r
|
||||
}
|
||||
|
||||
# Build a fixed-output derivation with an empty hash to get the correct one
|
||||
nix_prefetch() {
|
||||
local attr="$1"
|
||||
local expr="let src = $pkg.$attr; in (src.overrideAttrs or (f: src // f src)) (_: { outputHash = \"\"; outputHashAlgo = \"sha256\"; })"
|
||||
nix-build --impure --no-out-link --expr "$expr" 2>&1 | tr -s ' ' | grep -oP 'got:\s+\K\S+' || true
|
||||
}
|
||||
|
||||
update_src_hash() {
|
||||
echo "Updating source hash..."
|
||||
local old_hash new_hash
|
||||
old_hash=$(nix_eval "src.outputHash")
|
||||
new_hash=$(nix_prefetch "src")
|
||||
if [ -z "$new_hash" ]; then
|
||||
echo "ERROR: Failed to determine new source hash"
|
||||
exit 1
|
||||
fi
|
||||
sed -i "s|$old_hash|$new_hash|g" package.nix
|
||||
}
|
||||
|
||||
update_npm_deps_hash() {
|
||||
echo "Updating npm dependencies hash..."
|
||||
local old_hash new_hash
|
||||
old_hash=$(nix_eval "npmDeps.outputHash")
|
||||
new_hash=$(nix_prefetch "npmDeps")
|
||||
if [ -z "$new_hash" ]; then
|
||||
echo "ERROR: Failed to determine new npm deps hash"
|
||||
exit 1
|
||||
fi
|
||||
sed -i "s|$old_hash|$new_hash|g" package.nix
|
||||
}
|
||||
|
||||
update_npm_deps_ui_hash() {
|
||||
echo "Updating ui npm dependencies hash..."
|
||||
local old_hash new_hash
|
||||
old_hash=$(nix_eval "npmDeps_ui.outputHash")
|
||||
new_hash=$(nix_prefetch "npmDeps_ui")
|
||||
if [ -z "$new_hash" ]; then
|
||||
echo "ERROR: Failed to determine new npm deps ui hash"
|
||||
exit 1
|
||||
fi
|
||||
sed -i "s|$old_hash|$new_hash|g" package.nix
|
||||
}
|
||||
|
||||
LATEST_VERSION=$(curl -fsSL ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/homebridge/homebridge-config-ui-x/releases/latest" \
|
||||
| jq -r '.tag_name' \
|
||||
| sed 's/^v//')
|
||||
|
||||
CURRENT_VERSION=$(nix_eval "version")
|
||||
|
||||
if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; then
|
||||
echo "homebridge-config-ui-x is already up to date at version $CURRENT_VERSION"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "Updating homebridge-config-ui-x from $CURRENT_VERSION to $LATEST_VERSION"
|
||||
|
||||
sed -i "s/version = \"$CURRENT_VERSION\"/version = \"$LATEST_VERSION\"/" package.nix
|
||||
|
||||
update_src_hash
|
||||
update_npm_deps_hash
|
||||
update_npm_deps_ui_hash
|
||||
|
||||
echo "Successfully updated homebridge-config-ui-x from $CURRENT_VERSION to $LATEST_VERSION"
|
||||
@@ -115,26 +115,24 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "immich";
|
||||
version = "2.5.5";
|
||||
version = "2.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "immich-app";
|
||||
repo = "immich";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wAZcgAazfEy5dJhlut4cHGOj+qWrvF9vD6sxAswuhVU=";
|
||||
hash = "sha256-F6lF0wQ2acq0MEoFNnKU68LH5cq1WwRKvsCJB+pEirE=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-kJBX0hoDijs5IjS37oUDVv61t4vXTF6e3lmZIy/lQ/o=";
|
||||
hash = "sha256-VzlcVHCJCD1Ree0Sy2PFKZSjHBowLoIRqpUKdF2Ph+c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# pg_dumpall fails without database root access
|
||||
# see https://github.com/immich-app/immich/issues/13971
|
||||
substituteInPlace server/src/utils/database-backups.ts \
|
||||
substituteInPlace server/src/services/database-backup.service.ts \
|
||||
--replace-fail '`/usr/lib/postgresql/''${databaseMajorVersion}/bin/''${bin}`' '`''${bin}`'
|
||||
'';
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "infrastructure-agent";
|
||||
version = "1.72.1";
|
||||
version = "1.72.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "newrelic";
|
||||
repo = "infrastructure-agent";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-2kRayrMisv/poIx/OGqS01D/yLt/w4u2X+cJYN8QHA8=";
|
||||
hash = "sha256-GcQ/UUznuWdAtOyCC4qLQfItm81zwryV2gDDlYKFONI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-H41FxeJLrlaL/KbcBAS1WuMfVn6d+4So3egXb6E46/o=";
|
||||
|
||||
@@ -85,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
homepage = "https://github.com/Inlyne-Project/inlyne";
|
||||
changelog = "https://github.com/Inlyne-Project/inlyne/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ figsoda ];
|
||||
mainProgram = "inlyne";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -48,7 +48,7 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ipxe";
|
||||
version = "1.21.1-unstable-2026-01-10";
|
||||
version = "1.21.1-unstable-2026-01-30";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mtools
|
||||
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipxe";
|
||||
repo = "ipxe";
|
||||
rev = "9c01c5a5dacb54167132d9a27259b23acdf091d6";
|
||||
hash = "sha256-7Gsczc6jcUT0jDHNrgYWycqTs2/x3eqzbFwEwz8Z8kU=";
|
||||
rev = "74e0551ac2f66760430e69407a4f7ed0dfe9feab";
|
||||
hash = "sha256-7Guts4js1pM/Vse58XCjr7K8qHbJU5oiFFuqojwXTC4=";
|
||||
};
|
||||
|
||||
# Calling syslinux on a FAT image isn't going to work on Aarch64.
|
||||
|
||||
@@ -91,6 +91,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
maintainers = with lib.maintainers; [
|
||||
atila
|
||||
rafaelrc
|
||||
];
|
||||
mainProgram = "irpf";
|
||||
};
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "just-lsp";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terror";
|
||||
repo = "just-lsp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-wcUDzrI8jR8fedwu1Z9eY1NLJytDgZsdVK3ay2q6IbM=";
|
||||
hash = "sha256-gY7SJmRv9KmJ+2OhHbQLqjXs6Zcelm9eW6kxGshQ+Ks=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ajZUTE/J0I0jEQebLRw/4lstOQNxe+Nh7HTINN0g5K8=";
|
||||
cargoHash = "sha256-RMUKW1jT+g9xEFa3WrSLQgXM73yFvT58nH++hWOJ9v4=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "k6";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "k6";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-kgdJAmjk92xXBYJrfprYztBnTK4cqIpk9iwKULDVRl8=";
|
||||
hash = "sha256-rfurCWplI21vEYEArxp4wrAn6oOWenMkGetFDy5WCAY=";
|
||||
};
|
||||
|
||||
subPackages = [ "./" ];
|
||||
|
||||
@@ -24,11 +24,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "keycloak";
|
||||
version = "26.5.2";
|
||||
version = "26.5.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
|
||||
hash = "sha256-SXoHnwk/hepSV5BIsmZvCXOPn5UfVKwbNZ4D9zSlaz0=";
|
||||
hash = "sha256-OMx2E4Q1Pob73iqWo/sfYI14+IMW0cp/22wMUKcqQvg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "komikku";
|
||||
version = "1.101.0";
|
||||
version = "1.102.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sDhnG6d77erHO9HS0fL4Fl5qHbeyuLz2TFeic5zLJIE=";
|
||||
hash = "sha256-wxGDy/cM9IBpgPNdun/P9f4447hJaaibBgIgLVaOirY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,6 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"ENABLE_ARCH_DETECTION=0"
|
||||
"HAS_AVX512=0"
|
||||
"HAS_AVX2=0"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubevirt";
|
||||
version = "1.6.3";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubevirt";
|
||||
repo = "kubevirt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-PWy8RqAuu3VRryzwEcsk8Z/uPSfsil+lzbU8oay4Lig=";
|
||||
hash = "sha256-0dfZbhcFSIU9TFxQ3UT8Sz+tgeiqVke+RxVwlxw49Hk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "legcord";
|
||||
version = "1.1.6";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Legcord";
|
||||
repo = "Legcord";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AHqaC0N+5grBDixP+wXAzKdOTgohgwP4HbAPEZEVXKQ=";
|
||||
hash = "sha256-196AE244jEZNfhkC+vouNq9M7DOd3kk/1JLW1XRLOHA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-D+GPJn3qpIax+YNcLqLX71bobDdfQXyGiJ6b5PiJqC4=";
|
||||
hash = "sha256-ksClxW8dIV72Hky5RFJ6cpPAteL29Cx8Me0aG5V/Y4k=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -125,7 +125,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://aomedia.org/av1-features/get-started/";
|
||||
changelog = "https://aomedia.googlesource.com/aom/+/refs/tags/v${finalAttrs.version}/CHANGELOG";
|
||||
maintainers = with lib.maintainers; [
|
||||
kiloreux
|
||||
dandellion
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Implementation of the EBU R128 loudness standard";
|
||||
homepage = "https://github.com/jiixyj/libebur128";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.andrewrk ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libjpeg";
|
||||
version = "9f";
|
||||
version = "10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ijg.org/files/jpegsrc.v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-BHBcEQyyRpyqeftx+6PXv4NJFHBulkGkWJSFwfgyVls=";
|
||||
hash = "sha256-i56qEyQmkOvQPhcoqx7fl6gaeO1ug2JNSTZV8xrJWrU=";
|
||||
};
|
||||
|
||||
configureFlags = lib.optional static "--enable-static --disable-shared";
|
||||
|
||||
@@ -29,6 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
maintainers = [ lib.maintainers.andrewrk ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -45,6 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "http://libsound.io/";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.andrewrk ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lighthouse";
|
||||
version = "7.1.0";
|
||||
version = "8.1.0";
|
||||
|
||||
# lighthouse/common/deposit_contract/build.rs, `TAG`
|
||||
depositContractSpecVersion = "0.12.1";
|
||||
@@ -28,17 +28,16 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "sigp";
|
||||
repo = "lighthouse";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+tLAuuinSaVIwO5wi1Cf+86pWj83Jj0p1ajnDdpHsyI=";
|
||||
hash = "sha256-+MF3KbyKbaEBsrNHQOOolfhl4uJ1laOL1eGtcWEoaLE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./use-system-sqlite.patch
|
||||
];
|
||||
|
||||
cargoHash = "sha256-pb44m+iWArlIim2tqbaH+pwCSqIdqzfVZJ9yj/ne1LY=";
|
||||
cargoHash = "sha256-6C0rDVsF0wIcApc2YL3qC/Xa9qby9GDbQYGiaaJuH0k=";
|
||||
|
||||
buildFeatures = [
|
||||
"modern"
|
||||
"gnosis"
|
||||
];
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user