Merge master into staging-next
This commit is contained in:
@@ -153,8 +153,8 @@ jobs:
|
||||
MATRIX_SYSTEM: ${{ matrix.system }}
|
||||
run: |
|
||||
nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A eval.diff \
|
||||
--arg beforeDir "$(readlink ./target)" \
|
||||
--arg afterDir "$(readlink ./merged)" \
|
||||
--arg beforeDir ./target \
|
||||
--arg afterDir ./merged \
|
||||
--argstr evalSystem "$MATRIX_SYSTEM" \
|
||||
--out-link diff
|
||||
|
||||
@@ -207,7 +207,7 @@ jobs:
|
||||
|
||||
# Use the target branch to get accurate maintainer info
|
||||
nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.compare \
|
||||
--arg combinedDir "$(realpath ./combined)" \
|
||||
--arg combinedDir ./combined \
|
||||
--arg touchedFilesJson ./touched-files.json \
|
||||
--argstr githubAuthorId "$AUTHOR_ID" \
|
||||
--out-link comparison
|
||||
|
||||
+2
-2
@@ -33,13 +33,13 @@ Note that 16GB memory is the recommended minimum, while with less than 8GB memor
|
||||
To compare two commits locally, first run the following on the baseline commit:
|
||||
|
||||
```
|
||||
BASELINE=$(nix-build ci -A eval.baseline --no-out-link)
|
||||
nix-build ci -A eval.baseline --out-link baseline
|
||||
```
|
||||
|
||||
Then, on the commit with your changes:
|
||||
|
||||
```
|
||||
nix-build ci -A eval.full --arg baseline $BASELINE
|
||||
nix-build ci -A eval.full --arg baseline ./baseline
|
||||
```
|
||||
|
||||
Keep in mind to otherwise pass the same set of arguments for both commands (`evalSystems`, `quickTest`, `chunkSize`).
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
byName ? false,
|
||||
}:
|
||||
let
|
||||
combined = builtins.storePath combinedDir;
|
||||
|
||||
/*
|
||||
Derivation that computes which packages are affected (added, changed or removed) between two revisions of nixpkgs.
|
||||
Note: "platforms" are "x86_64-linux", "aarch64-darwin", ...
|
||||
@@ -75,7 +77,7 @@ let
|
||||
# Attrs
|
||||
# - keys: "added", "changed", "removed" and "rebuilds"
|
||||
# - values: lists of `packagePlatformPath`s
|
||||
diffAttrs = builtins.fromJSON (builtins.readFile "${combinedDir}/combined-diff.json");
|
||||
diffAttrs = builtins.fromJSON (builtins.readFile "${combined}/combined-diff.json");
|
||||
|
||||
changedPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.changed;
|
||||
rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.rebuilds;
|
||||
@@ -139,8 +141,8 @@ runCommand "compare"
|
||||
maintainers = builtins.toJSON maintainers;
|
||||
passAsFile = [ "maintainers" ];
|
||||
env = {
|
||||
BEFORE_DIR = "${combinedDir}/before";
|
||||
AFTER_DIR = "${combinedDir}/after";
|
||||
BEFORE_DIR = "${combined}/before";
|
||||
AFTER_DIR = "${combined}/after";
|
||||
};
|
||||
}
|
||||
''
|
||||
|
||||
+7
-4
@@ -11,6 +11,9 @@
|
||||
}:
|
||||
|
||||
let
|
||||
before = builtins.storePath beforeDir;
|
||||
after = builtins.storePath afterDir;
|
||||
|
||||
/*
|
||||
Computes the key difference between two attrs
|
||||
|
||||
@@ -64,15 +67,15 @@ let
|
||||
in
|
||||
builtins.fromJSON data;
|
||||
|
||||
beforeAttrs = getAttrs beforeDir;
|
||||
afterAttrs = getAttrs afterDir;
|
||||
beforeAttrs = getAttrs before;
|
||||
afterAttrs = getAttrs after;
|
||||
diffAttrs = diff beforeAttrs afterAttrs;
|
||||
diffJson = writeText "diff.json" (builtins.toJSON diffAttrs);
|
||||
in
|
||||
runCommand "diff" { } ''
|
||||
mkdir -p $out/${evalSystem}
|
||||
|
||||
cp -r ${beforeDir} $out/before
|
||||
cp -r ${afterDir} $out/after
|
||||
cp -r ${before} $out/before
|
||||
cp -r ${after} $out/after
|
||||
cp ${diffJson} $out/${evalSystem}/diff.json
|
||||
''
|
||||
|
||||
@@ -54,6 +54,8 @@
|
||||
|
||||
- `spidermonkey_91` has been removed, as it has been EOL since September 2022.
|
||||
|
||||
- `hiawata` has been removed, due to lack of active development upstream, lack of maintainership downstream and upcoming security issues.
|
||||
|
||||
- `cudaPackages.cudatoolkit-legacy-runfile` has been removed.
|
||||
|
||||
- `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible.
|
||||
|
||||
@@ -12713,6 +12713,12 @@
|
||||
githubId = 954536;
|
||||
name = "Jean-Pierre PRUNARET";
|
||||
};
|
||||
jpinz = {
|
||||
email = "nix@jpinzer.me";
|
||||
github = "jpinz";
|
||||
githubId = 8357054;
|
||||
name = "Julian Pinzer";
|
||||
};
|
||||
jpotier = {
|
||||
email = "jpo.contributes.to.nixos@marvid.fr";
|
||||
github = "jpotier";
|
||||
|
||||
@@ -150,6 +150,8 @@
|
||||
- The zookeeper project changed their logging tool to logback, therefore `services.zookeeper.logging` option has been updated to expect a logback compatible string.
|
||||
- The `dovecot` systemd service was renamed from `dovecot2` to `dovecot`. The former is now just an alias. Update any overrides on the systemd unit to the new name.
|
||||
|
||||
- Configurations with `boot.initrd.systend.enable && !boot.initrd.enable` will have their `init` script at `$toplevel/init` instead of `$toplevel/prepare-root`. This is because it does not make sense for systemd stage 1 to affect the `init` script when stage 1 is entirely disabled (e.g. containers).
|
||||
|
||||
- `Prosody` has been updated to major release 13 which removed some obsoleted modules and brought a couple of major and breaking changes:
|
||||
- The `http_files` module is now disabled by default because it now requires `http_files_dir` to be configured.
|
||||
- The `vcard_muc` module has been removed and got replaced by the inbuilt `muc_vcard` module.
|
||||
|
||||
@@ -274,5 +274,5 @@ in
|
||||
})
|
||||
];
|
||||
|
||||
meta.maintainers = [ maintainers.jnsgruk ];
|
||||
meta.maintainers = [ ];
|
||||
}
|
||||
|
||||
@@ -144,7 +144,9 @@ in
|
||||
{
|
||||
|
||||
meta = {
|
||||
maintainers = teams.freedesktop.members;
|
||||
maintainers = teams.freedesktop.members ++ [
|
||||
lib.maintainers.frontear
|
||||
];
|
||||
};
|
||||
|
||||
###### interface
|
||||
@@ -684,13 +686,7 @@ in
|
||||
networkmanager.connectionConfig = {
|
||||
"ethernet.cloned-mac-address" = cfg.ethernet.macAddress;
|
||||
"wifi.cloned-mac-address" = cfg.wifi.macAddress;
|
||||
"wifi.powersave" =
|
||||
if cfg.wifi.powersave == null then
|
||||
null
|
||||
else if cfg.wifi.powersave then
|
||||
3
|
||||
else
|
||||
2;
|
||||
"wifi.powersave" = lib.mkIf (cfg.wifi.powersave != null) (if cfg.wifi.powersave then 3 else 2);
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
@@ -12,7 +12,7 @@ let
|
||||
mkdir $out
|
||||
|
||||
${
|
||||
if config.boot.initrd.systemd.enable then
|
||||
if config.boot.initrd.enable && config.boot.initrd.systemd.enable then
|
||||
''
|
||||
cp ${config.system.build.bootStage2} $out/prepare-root
|
||||
substituteInPlace $out/prepare-root --subst-var-by systemConfig $out
|
||||
|
||||
@@ -28,9 +28,7 @@
|
||||
options = { };
|
||||
|
||||
config =
|
||||
let
|
||||
initScript = if config.boot.initrd.systemd.enable then "prepare-root" else "init";
|
||||
in
|
||||
|
||||
{
|
||||
boot.isContainer = true;
|
||||
boot.postBootCommands = ''
|
||||
@@ -79,7 +77,7 @@
|
||||
|
||||
contents = [
|
||||
{
|
||||
source = config.system.build.toplevel + "/${initScript}";
|
||||
source = config.system.build.toplevel + "/init";
|
||||
target = "/sbin/init";
|
||||
}
|
||||
# Technically this is not required for lxc, but having also make this configuration work with systemd-nspawn.
|
||||
@@ -104,7 +102,7 @@
|
||||
|
||||
pseudoFiles = [
|
||||
"/sbin d 0755 0 0"
|
||||
"/sbin/init s 0555 0 0 ${config.system.build.toplevel}/${initScript}"
|
||||
"/sbin/init s 0555 0 0 ${config.system.build.toplevel}/init"
|
||||
"/dev d 0755 0 0"
|
||||
"/proc d 0555 0 0"
|
||||
"/sys d 0555 0 0"
|
||||
@@ -113,7 +111,7 @@
|
||||
|
||||
system.build.installBootLoader = pkgs.writeScript "install-lxc-sbin-init.sh" ''
|
||||
#!${pkgs.runtimeShell}
|
||||
${pkgs.coreutils}/bin/ln -fs "$1/${initScript}" /sbin/init
|
||||
${pkgs.coreutils}/bin/ln -fs "$1/init" /sbin/init
|
||||
'';
|
||||
|
||||
# networkd depends on this, but systemd module disables this for containers
|
||||
@@ -122,7 +120,7 @@
|
||||
systemd.packages = [ pkgs.distrobuilder.generator ];
|
||||
|
||||
system.activationScripts.installInitScript = lib.mkForce ''
|
||||
ln -fs $systemConfig/${initScript} /sbin/init
|
||||
ln -fs $systemConfig/init /sbin/init
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "homepage-dashboard";
|
||||
meta.maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
meta.maintainers = with lib.maintainers; [ ];
|
||||
|
||||
nodes.machine = _: {
|
||||
services.homepage-dashboard = {
|
||||
|
||||
@@ -12,7 +12,7 @@ in
|
||||
{
|
||||
name = "multipass";
|
||||
|
||||
meta.maintainers = [ lib.maintainers.jnsgruk ];
|
||||
meta.maintainers = [ ];
|
||||
|
||||
nodes.machine =
|
||||
{ lib, ... }:
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
{
|
||||
name = "scrutiny";
|
||||
meta.maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
meta.maintainers = with lib.maintainers; [ ];
|
||||
|
||||
nodes = {
|
||||
machine =
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"chromium": {
|
||||
"version": "140.0.7339.80",
|
||||
"version": "140.0.7339.127",
|
||||
"chromedriver": {
|
||||
"version": "140.0.7339.81",
|
||||
"hash_darwin": "sha256-T5VUbwBMWhZLMNp2KYzG6CxApgVXAWphxpG5Uexrz3s=",
|
||||
"hash_darwin_aarch64": "sha256-44c01JbXgl55VpQDy9Ke+p9yj3FJ5MwTdYgDcBI20Ms="
|
||||
"version": "140.0.7339.133",
|
||||
"hash_darwin": "sha256-Xf2f4AyowRkG7FTd8p3l3CMF3YCpjyprMD0pM+yPOhA=",
|
||||
"hash_darwin_aarch64": "sha256-HgANL/mEXhIndbmzB1oevem0T9HkLko/HNOi5Y9EzKc="
|
||||
},
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
@@ -21,8 +21,8 @@
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "670b6f192f4668d2ac2c06bd77ec3e4eeda7d648",
|
||||
"hash": "sha256-tAiE11g/zymsOOjb64ZIA0GCGDV+6X5qlXUiU9vED/c=",
|
||||
"rev": "9412745860d8c3dfed9cf38f5daa943b163f8c69",
|
||||
"hash": "sha256-rAyS5AhWHL9+6N4+2PFYKPJjzErj8LfIm5ptcsTTV8E=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -92,8 +92,8 @@
|
||||
},
|
||||
"src/third_party/angle": {
|
||||
"url": "https://chromium.googlesource.com/angle/angle.git",
|
||||
"rev": "cbc4153da8d5796b0fbb3cf288e97bee19436191",
|
||||
"hash": "sha256-lexJRf3EZexLgSuk8ziA+OUW+jTYlkXUPKHU/E6aUcY="
|
||||
"rev": "a8c8a6febe630c6239a5e207530e9fac651ae373",
|
||||
"hash": "sha256-GxWTdzSf7/9WIqrECdAEkibXve/ZpKpxJcNS+KnfNc0="
|
||||
},
|
||||
"src/third_party/angle/third_party/glmark2/src": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
|
||||
@@ -252,8 +252,8 @@
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||
"rev": "ab96665ae2cfcc054e0243461cfcb56bb016f71a",
|
||||
"hash": "sha256-8G9OCH5xapLf83bXrKwygCrzwF8C9H2NfnIrDbL+uCc="
|
||||
"rev": "5dbb6f71a9bd613c0403242c7c021652fbf155fd",
|
||||
"hash": "sha256-tA+6iKBfJVrlT+1UH55vqa5JCONweZeD/zWfNHHD+Kw="
|
||||
},
|
||||
"src/third_party/dom_distiller_js/dist": {
|
||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||
@@ -762,8 +762,8 @@
|
||||
},
|
||||
"src/third_party/webrtc": {
|
||||
"url": "https://webrtc.googlesource.com/src.git",
|
||||
"rev": "847fe7905954f3ae883de2936415ff567aa9039b",
|
||||
"hash": "sha256-kcK1kJdPCkXbEFuS+b6wKUBaKLXmkAEwVKp4/YWDv8s="
|
||||
"rev": "36ea4535a500ac137dbf1f577ce40dc1aaa774ef",
|
||||
"hash": "sha256-/3V/V0IrhOKcMAgs/C1qraqq+1pfopW8HKvGRmqLE0Q="
|
||||
},
|
||||
"src/third_party/wuffs/src": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
nspr,
|
||||
nss,
|
||||
pango,
|
||||
systemd,
|
||||
systemdLibs,
|
||||
libappindicator-gtk3,
|
||||
libdbusmenu,
|
||||
writeScript,
|
||||
@@ -99,7 +99,7 @@ in
|
||||
assert lib.assertMsg (
|
||||
enabledDiscordModsCount <= 1
|
||||
) "discord: Only one of Vencord, Equicord or Moonlight can be enabled at the same time";
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
@@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
|
||||
libPath = lib.makeLibraryPath (
|
||||
[
|
||||
libcxx
|
||||
systemd
|
||||
systemdLibs
|
||||
libpulseaudio
|
||||
libdrm
|
||||
libgbm
|
||||
@@ -170,7 +170,7 @@ stdenv.mkDerivation rec {
|
||||
libdbusmenu
|
||||
wayland
|
||||
]
|
||||
++ lib.optional withTTS speechd-minimal
|
||||
++ lib.optionals withTTS [ speechd-minimal ]
|
||||
);
|
||||
|
||||
installPhase = ''
|
||||
@@ -192,7 +192,7 @@ stdenv.mkDerivation rec {
|
||||
''} \
|
||||
${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \
|
||||
--prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName} \
|
||||
${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"} \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
@@ -257,4 +257,4 @@ stdenv.mkDerivation rec {
|
||||
update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch}
|
||||
'';
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -11,9 +11,9 @@ in
|
||||
} { };
|
||||
|
||||
sublime-merge-dev = common {
|
||||
buildVersion = "2109";
|
||||
buildVersion = "2111";
|
||||
dev = true;
|
||||
aarch64sha256 = "kkXt+CdmU2C6VJHKvp5M4VzzxhhgSqeFVyORWMQnVTc=";
|
||||
x64sha256 = "O1pY4M98mfBY8VaOYYOTRCNTNeUQYmHlB0h1A0GTpe8=";
|
||||
aarch64sha256 = "ZDERtZ1NbYdc/rZYfiFPkjwSQVMvacVElRAW/PBrgCg=";
|
||||
x64sha256 = "NgHRF8Wh3ktr0Z+efL2FTwFAdF3c0yaXNFEwcvefSy0=";
|
||||
} { };
|
||||
}
|
||||
|
||||
@@ -10,17 +10,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "anytype-heart";
|
||||
# Use only versions specified in anytype-ts middleware.version file:
|
||||
# https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
|
||||
version = "0.43.0-rc02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
repo = "anytype-heart";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-hqDwzW1Tl44ipL1EAwlXUoKaQ0Wvfa2rtZMQy4pgQ8k=";
|
||||
};
|
||||
|
||||
arch =
|
||||
{
|
||||
# https://github.com/anyproto/anytype-heart/blob/f33a6b09e9e4e597f8ddf845fc4d6fe2ef335622/pkg/lib/localstore/ftsearch/ftsearchtantivy.go#L3
|
||||
@@ -31,10 +20,20 @@ let
|
||||
}
|
||||
.${stdenv.hostPlatform.system}
|
||||
or (throw "anytype-heart not supported on ${stdenv.hostPlatform.system}");
|
||||
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version src;
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "anytype-heart";
|
||||
|
||||
# Use only versions specified in anytype-ts middleware.version file:
|
||||
# https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
|
||||
version = "0.43.0-rc02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
repo = "anytype-heart";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-hqDwzW1Tl44ipL1EAwlXUoKaQ0Wvfa2rtZMQy4pgQ8k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Rs+CusvMksyXUplGk09J4CiFgl/D4KtsI9C15dSCjOI=";
|
||||
|
||||
@@ -83,10 +82,12 @@ buildGoModule {
|
||||
meta = {
|
||||
description = "Shared library for Anytype clients";
|
||||
homepage = "https://anytype.io/";
|
||||
changelog = "https://github.com/anyproto/anytype-heart/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
maintainers = with lib.maintainers; [
|
||||
autrimpo
|
||||
adda
|
||||
kira-bruneau
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
@@ -95,4 +96,4 @@ buildGoModule {
|
||||
"aarch64-darwin"
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -12,17 +12,16 @@
|
||||
commandLineArgs ? "",
|
||||
}:
|
||||
|
||||
let
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "anytype";
|
||||
version = "0.49.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
repo = "anytype-ts";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8+x2FmyR5x9Zrm3t71RSyxAKcJCvnR98+fqHXjBE7aU=";
|
||||
};
|
||||
description = "P2P note-taking tool";
|
||||
|
||||
locales = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
@@ -30,9 +29,6 @@ let
|
||||
rev = "873b42df7320ebbbc80d7e2477914dac70363ef7";
|
||||
hash = "sha256-Mr0KfXn9NO86QqgBhVjSs2przN/GtjuhJHJ9djo8Feg=";
|
||||
};
|
||||
in
|
||||
buildNpmPackage {
|
||||
inherit pname version src;
|
||||
|
||||
npmDepsHash = "sha256-fuNTSZl+4DG/YL34f/+bYK26ruRFAc1hyHVAm256LiE=";
|
||||
|
||||
@@ -62,7 +58,7 @@ buildNpmPackage {
|
||||
cp -r ${anytype-heart}/lib dist/
|
||||
cp -r ${anytype-heart}/bin/anytypeHelper dist/
|
||||
|
||||
for lang in ${locales}/locales/*; do
|
||||
for lang in ${finalAttrs.locales}/locales/*; do
|
||||
cp "$lang" "dist/lib/json/lang/$(basename $lang)"
|
||||
done
|
||||
|
||||
@@ -106,7 +102,7 @@ buildNpmPackage {
|
||||
exec = "anytype %U";
|
||||
icon = "anytype";
|
||||
desktopName = "Anytype";
|
||||
comment = description;
|
||||
comment = finalAttrs.meta.description;
|
||||
mimeTypes = [ "x-scheme-handler/anytype" ];
|
||||
categories = [
|
||||
"Utility"
|
||||
@@ -118,14 +114,20 @@ buildNpmPackage {
|
||||
})
|
||||
];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
inherit description;
|
||||
description = "P2P note-taking tool";
|
||||
homepage = "https://anytype.io/";
|
||||
changelog = "https://community.anytype.io/t/anytype-desktop-${
|
||||
builtins.replaceStrings [ "." ] [ "-" ] (lib.versions.majorMinor finalAttrs.version)
|
||||
}-0-released";
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
mainProgram = "anytype";
|
||||
maintainers = with lib.maintainers; [
|
||||
autrimpo
|
||||
adda
|
||||
kira-bruneau
|
||||
];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
@@ -135,4 +137,4 @@ buildNpmPackage {
|
||||
];
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Executable
+61
@@ -0,0 +1,61 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts coreutils curl jq nix-update
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
anytype_version=null
|
||||
release_page=1
|
||||
|
||||
# Anytype often has many pre-releases between releases, which can span multiple pages
|
||||
while [ "$anytype_version" = 'null' ]; do
|
||||
readarray -t release < <(
|
||||
curl "https://api.github.com/repos/anyproto/anytype-ts/releases?page=$release_page" \
|
||||
${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} \
|
||||
--silent \
|
||||
| jq --raw-output '
|
||||
map(select(
|
||||
(.prerelease == false) and
|
||||
(.tag_name | test("alpha|beta") | not)
|
||||
)) | .[0] | .tag_name, .created_at
|
||||
'
|
||||
)
|
||||
anytype_version=${release[0]//v}
|
||||
anytype_release_date=${release[1]}
|
||||
release_page=$((release_page+1))
|
||||
done
|
||||
|
||||
if [ "$UPDATE_NIX_OLD_VERSION" = "$anytype_version" ]; then
|
||||
echo "Already up to date!"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# https://github.com/anyproto/anytype-ts/blob/v0.49.2/electron/hook/locale.js
|
||||
locales_rev=$(
|
||||
curl "https://api.github.com/repos/anyproto/l10n-anytype-ts/commits?until=$anytype_release_date&per_page=1" \
|
||||
${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} \
|
||||
--silent \
|
||||
| jq --raw-output '.[0].sha'
|
||||
)
|
||||
|
||||
# https://github.com/anyproto/anytype-ts/blob/v0.49.2/update.sh
|
||||
middleware_version=$(
|
||||
curl "https://raw.githubusercontent.com/anyproto/anytype-ts/refs/tags/v$anytype_version/middleware.version" \
|
||||
${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} \
|
||||
--silent
|
||||
)
|
||||
|
||||
# https://github.com/anyproto/anytype-heart/blob/v0.42.4/makefiles/vars.mk#L8
|
||||
tantivy_go_version=$(
|
||||
curl "https://raw.githubusercontent.com/anyproto/anytype-heart/refs/tags/v$middleware_version/go.mod" \
|
||||
${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} \
|
||||
--silent \
|
||||
| grep github.com/anyproto/tantivy-go \
|
||||
| cut --delimiter=' ' --field=2
|
||||
)
|
||||
|
||||
tantivy_go_version=${tantivy_go_version//v}
|
||||
|
||||
nix-update tantivy-go --version "$tantivy_go_version" --generate-lockfile
|
||||
nix-update anytype-heart --version "$middleware_version"
|
||||
update-source-version anytype --ignore-same-version --source-key=locales --rev="$locales_rev"
|
||||
nix-update anytype --version "$anytype_version"
|
||||
@@ -12,10 +12,12 @@
|
||||
buildPackages,
|
||||
|
||||
# apparmor deps
|
||||
libapparmor,
|
||||
apparmor-parser,
|
||||
apparmor-teardown,
|
||||
}:
|
||||
let
|
||||
inherit (python3Packages) libapparmor;
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "apparmor-utils";
|
||||
inherit (libapparmor) version src;
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "armadillo";
|
||||
version = "15.0.1";
|
||||
version = "15.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
|
||||
hash = "sha256-9SCg1Qu6/M17nnkzIc1//tN0aVwuOLvf1CiEF0XgTDc=";
|
||||
hash = "sha256-mQq0zLfv8bbXBAnpqn+kEZh3rF9dELohnphGCrPk1us=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -83,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
Glib
|
||||
GlibObjectIntrospection
|
||||
Gtk3
|
||||
HashMerge
|
||||
LocaleGettext
|
||||
OpenOfficeOODoc
|
||||
PerlMagick
|
||||
|
||||
@@ -142,6 +142,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
+ (lib.optionalString hipSupport ''
|
||||
substituteInPlace extern/hipew/src/hipew.c --replace-fail '"/opt/rocm/hip/lib/libamdhip64.so.${lib.versions.major rocmPackages.clr.version}"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
|
||||
substituteInPlace extern/hipew/src/hipew.c --replace-fail '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
|
||||
substituteInPlace extern/hipew/src/hiprtew.cc --replace-fail '"/opt/rocm/lib/libhiprt64.so"' '"${rocmPackages.hiprt}/lib/libhiprt64.so"'
|
||||
'');
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}";
|
||||
@@ -160,6 +161,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
"-DWITH_CODEC_FFMPEG=ON"
|
||||
"-DWITH_CODEC_SNDFILE=ON"
|
||||
"-DWITH_CPU_CHECK=OFF"
|
||||
"-DWITH_CYCLES_DEVICE_HIP=${if hipSupport then "ON" else "OFF"}"
|
||||
"-DWITH_CYCLES_DEVICE_OPTIX=${if cudaSupport then "ON" else "OFF"}"
|
||||
"-DWITH_CYCLES_EMBREE=${if embreeSupport then "ON" else "OFF"}"
|
||||
"-DWITH_CYCLES_OSL=OFF"
|
||||
@@ -189,20 +191,25 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
"-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include"
|
||||
"-DALEMBIC_LIBRARY=${lib.getLib alembic}/lib/libAlembic${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
"-DOPTIX_ROOT_DIR=${optix}"
|
||||
"-DWITH_CYCLES_CUDA_BINARIES=ON"
|
||||
]
|
||||
++ lib.optionals hipSupport [
|
||||
"-DHIPRT_INCLUDE_DIR=${rocmPackages.hiprt}/include"
|
||||
"-DWITH_CYCLES_DEVICE_HIPRT=ON"
|
||||
"-DWITH_CYCLES_HIP_BINARIES=ON"
|
||||
]
|
||||
++ lib.optionals waylandSupport [
|
||||
"-DWITH_GHOST_WAYLAND=ON"
|
||||
"-DWITH_GHOST_WAYLAND_DBUS=ON"
|
||||
"-DWITH_GHOST_WAYLAND_DYNLOAD=OFF"
|
||||
"-DWITH_GHOST_WAYLAND_LIBDECOR=ON"
|
||||
]
|
||||
++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic"
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DLIBDIR=/does-not-exist"
|
||||
"-DSSE2NEON_INCLUDE_DIR=${sse2neon}/lib"
|
||||
]
|
||||
++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic"
|
||||
++ lib.optionals cudaSupport [
|
||||
"-DOPTIX_ROOT_DIR=${optix}"
|
||||
"-DWITH_CYCLES_CUDA_BINARIES=ON"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
@@ -267,6 +274,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
zstd
|
||||
]
|
||||
++ lib.optional embreeSupport embree
|
||||
++ lib.optional hipSupport rocmPackages.clr
|
||||
++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport tbb; })
|
||||
++ (
|
||||
if (!stdenv.hostPlatform.isDarwin) then
|
||||
@@ -350,7 +358,6 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
postFixup =
|
||||
lib.optionalString cudaSupport ''
|
||||
for program in $out/bin/blender $out/bin/.blender-wrapped; do
|
||||
isELF "$program" || continue
|
||||
addDriverRunpath "$program"
|
||||
done
|
||||
''
|
||||
|
||||
Generated
+8
-28
@@ -36,8 +36,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "BIP78.Sender",
|
||||
"version": "0.2.4",
|
||||
"hash": "sha256-4D1894cwcj+Wf7tm+u5cC/H3JdxDSxLz4hHr7ygkqLo="
|
||||
"version": "0.2.5",
|
||||
"hash": "sha256-4NoELK+s5nklvsKYYI23fC/h7CaaKiomWl9kSRCyNlE="
|
||||
},
|
||||
{
|
||||
"pname": "BouncyCastle.Cryptography",
|
||||
@@ -99,16 +99,6 @@
|
||||
"version": "1.5.8",
|
||||
"hash": "sha256-pISNuSZW/B0MZ5VkW8nHAENTOUoFI+YfvrubD/vh74w="
|
||||
},
|
||||
{
|
||||
"pname": "BTCPayServer.NETCore.Plugins",
|
||||
"version": "1.4.4",
|
||||
"hash": "sha256-1LQGTEK/5NrUIAuWimKJofDth8dsjOZKlGkUsGq+YGY="
|
||||
},
|
||||
{
|
||||
"pname": "BTCPayServer.NETCore.Plugins.Mvc",
|
||||
"version": "1.4.4",
|
||||
"hash": "sha256-VEcPjbwrApQOIqtjbewGjNx7ZFiB4ztVYDwQfWqRtc4="
|
||||
},
|
||||
{
|
||||
"pname": "BTCPayServer.NTag424",
|
||||
"version": "1.0.25",
|
||||
@@ -706,23 +696,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "NBitcoin",
|
||||
"version": "7.0.50",
|
||||
"hash": "sha256-l3H70u5OAbd2hevX/yeVBdQyee/dUn5mp4iGvTnTcjk="
|
||||
},
|
||||
{
|
||||
"pname": "NBitcoin",
|
||||
"version": "8.0.13",
|
||||
"hash": "sha256-x7vMEgk5JXfGGNWfoclCwAbnx1mtlgbxl0HC0B/iV2E="
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-FLqOA3Axa2Xyz7MRgXPnbIQHwMcuKqduTJrUt87/W8Q="
|
||||
},
|
||||
{
|
||||
"pname": "NBitcoin.Altcoins",
|
||||
"version": "3.0.33",
|
||||
"hash": "sha256-0RYmRKcluGwfTEcOEmoREC/9CgECEi7piQZetMXHOxI="
|
||||
},
|
||||
{
|
||||
"pname": "NBitcoin.Altcoins",
|
||||
"version": "4.0.8",
|
||||
"hash": "sha256-n1e0BUhXl3D/fn1DbCdbelYfys2fc7+ZABazhUWxzo4="
|
||||
"version": "5.0.0",
|
||||
"hash": "sha256-3dPvHLcVvM26NW1MHcZeHkoIFm/ypcpiv+W948ff1ys="
|
||||
},
|
||||
{
|
||||
"pname": "NBitpayClient",
|
||||
@@ -731,8 +711,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "NBXplorer.Client",
|
||||
"version": "4.3.9",
|
||||
"hash": "sha256-PSQfKk2kW0O0PB+JyjCaDx/aijNcfdmfj9dzb/fdxl8="
|
||||
"version": "5.0.5",
|
||||
"hash": "sha256-vUP1bGd5iw3roNcvG525JV3SnL/6eXIqjvJKxdy+7dY="
|
||||
},
|
||||
{
|
||||
"pname": "NETStandard.Library",
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "btcpayserver";
|
||||
version = "2.1.6";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "btcpayserver";
|
||||
repo = "btcpayserver";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zMCjG8baQeXYLgiSr1jqHxvyeeVDiOZXOq/8MQiggCI=";
|
||||
hash = "sha256-W6344r+Doz2aiYebeY3+UkFW7dq4aH/GUGqYyxnK4II=";
|
||||
};
|
||||
|
||||
projectFile = "BTCPayServer/BTCPayServer.csproj";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ceph-csi";
|
||||
version = "3.14.1";
|
||||
version = "3.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ceph";
|
||||
repo = "ceph-csi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WyWs5zrgU9//b2CeIKvgcE4jQDsfYQjo4UwYjpHyEeY=";
|
||||
hash = "sha256-F9sVFW0KY7PCjeK1RPdvLyO2RMlyROLfpQ49QThrWLY=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
flutter332.buildFlutterApplication rec {
|
||||
pname = "chatmcp";
|
||||
version = "0.0.74";
|
||||
version = "0.0.76";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daodao97";
|
||||
repo = "chatmcp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ITqTPP1w4M/yXrtU/5Pcpx5xQxAZkCsAFL4s0vJiQ9U=";
|
||||
hash = "sha256-MU2AFiIvc3Y27/nX/OqYs/VKkw50cqznMY2zUdys8ts=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
@@ -281,7 +281,7 @@
|
||||
"version": "0.3.4+2"
|
||||
},
|
||||
"crypto": {
|
||||
"dependency": "transitive",
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "crypto",
|
||||
"sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ciel";
|
||||
version = "3.9.6";
|
||||
version = "3.9.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AOSC-Dev";
|
||||
repo = "ciel-rs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-J6mXNJuLkKVNzE5lRRQEOt0yb2ow5EctXkr22eqOfII=";
|
||||
hash = "sha256-GLgCepIZf08m4xywU0Erh5QWCSAcvGoE7/AOrBwCEWQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-n9VCy3nlZ+WDm9krlc3XO/YgdrbEMJuODBvYRkznUgU=";
|
||||
cargoHash = "sha256-SWI7K/fi3DkbvEZ1nS5GfVkjvdwjd2oZbJFaELge34A=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnquery";
|
||||
version = "11.69.1";
|
||||
version = "12.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnquery";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Iq44LRKPQq5TWfkoXbqOxUquMdImNU8Jz4ojvmCI310=";
|
||||
hash = "sha256-XP2knKGKrhZMWJ4eoLC6Z0Qtu+7tOOUIy7r6+oRiTnA=";
|
||||
};
|
||||
|
||||
subPackages = [ "apps/cnquery" ];
|
||||
|
||||
vendorHash = "sha256-b+E8thljWxRwbBca2TdTINQERnOvfQncSEJ0+Nxuk8M=";
|
||||
vendorHash = "sha256-wtJKHQ2MI7Jm6gWlIKraieRsf+C6uTelEXgp539IGAY=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@@ -40,13 +40,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crun";
|
||||
version = "1.23.1";
|
||||
version = "1.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "crun";
|
||||
rev = version;
|
||||
hash = "sha256-jGRL/P4pR3nNikTYZxxqFvOK63pepClVhwBmeCF/dNU=";
|
||||
hash = "sha256-Sdp6ZxUzK8T7zfrgevrLxhMh7SQfO+6mABBiFMLbgh0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -37,6 +37,12 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-zZc2+0oskptpWZE4fyVcR4QHxqzpj71GXMXNXMK4an0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace delfin/meson.build --replace-fail \
|
||||
"'delfin' / rust_target / meson.project_name()" \
|
||||
"'delfin' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
@@ -62,6 +68,9 @@ stdenv.mkDerivation rec {
|
||||
(lib.mesonOption "profile" "release")
|
||||
];
|
||||
|
||||
# For https://codeberg.org/avery42/delfin/src/commit/820b466bfd47f71c12e9b2cabb698e8f78942f41/delfin/meson.build#L47-L48
|
||||
env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
@@ -28,13 +28,13 @@ assert blas.isILP64 == scalapack.isILP64;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elpa";
|
||||
version = "2025.01.002";
|
||||
version = "2025.06.001";
|
||||
|
||||
passthru = { inherit (blas) isILP64; };
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz";
|
||||
sha256 = "sha256-j+vkCMWQuptEvYvOBGBf0bfalkr82P1fHOnt7LPQtl0=";
|
||||
sha256 = "sha256-/usf6hq0qGcLjTJAdl7wragoBi737JtzXuy6KEhRXJQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -34,14 +34,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2025.8.3";
|
||||
version = "2025.8.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "esphome";
|
||||
tag = version;
|
||||
hash = "sha256-8R6jm+gnFA/MTXhe3J9I6Ar1B18dFgABtfo91/qlmSY=";
|
||||
hash = "sha256-L3CKfZGPEaMv9nmKX0S9qRXtZrfleQqgN3KHJjIEZew=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "firecracker";
|
||||
version = "1.12.1";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firecracker-microvm";
|
||||
repo = "firecracker";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-95SvakhepL4P+3SqbPkjAKaehBkDyn/psMfFASbv8Gg=";
|
||||
hash = "sha256-ZrIvz5hmP0d8ADF723Z+lOP9hi5nYbi6WUtV4wTp73U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0ycF+uoz4ZK4xJJL+qOpxBn7yUW1k5RdnvEhOhawxcI=";
|
||||
cargoHash = "sha256-BjaNUYZRPKJKjiQWMUyoBIdD2zsNqZX37CPzdwb+lCE=";
|
||||
|
||||
# For aws-lc-sys@0.22.0: use external bindgen.
|
||||
AWS_LC_SYS_EXTERNAL_BINDGEN = "true";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ft2-clone";
|
||||
version = "1.97";
|
||||
version = "1.98";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DaI5mlnl63i8+8JrSQkZ9NTIdB2W4WnFJ60wnglIpWg=";
|
||||
hash = "sha256-QF3BmQBmzEba9MLimwLBV9Z0XNZ6FEOidk5JE2DvGdM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "18.3.1";
|
||||
version = "18.3.2";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
@@ -21,7 +21,7 @@ let
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qZ/0SGkDj98CqqX6XTbbZEkhnTF/Sjzd7p2muBuP+xE=";
|
||||
hash = "sha256-R/35xYOCq/dlwLQ/in6u+DLifxsGpqBx58flX+FrVCo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JFGzGwYi4owq0oVLucm7UGuq8PE4FH9Gp8HyBRoE6cs=";
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "18.3.1";
|
||||
version = "18.3.2";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-phK8lhk6XHypdUrNOdpdhwo4uIrN+VapkxUujEffZtk=";
|
||||
hash = "sha256-UrO7RIMr6+u8zfbw/AkUOOydt8Yozbu1ypZ5BNF3as0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WCdpccNeVCEvo158uSyDlsGxneU72zKiV7J7JPhtPBw=";
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-shell";
|
||||
version = "14.44.0";
|
||||
version = "14.45.2";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-shell";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-y3CTfYN2QCWm2n534Bb8uS0Bzn4BsBuMtxAyuU3f+oI=";
|
||||
hash = "sha256-FxtqTRCa1sYSeTR+V2UKEsb480llU6cHWVwNiNFtUmE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -27,7 +27,7 @@ buildGoModule rec {
|
||||
./remove-hardcoded-locations.patch
|
||||
];
|
||||
|
||||
vendorHash = "sha256-flLt2LdcSDIuoUr4mwfv6LOV9GPewf+o0rb8kyBsgSk=";
|
||||
vendorHash = "sha256-Q3U0uuO+w+0GpDc7zEoiwUYsCIpXG+LOP822KNWR9Ww=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/gitlab-shell"
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{
|
||||
"version": "18.3.1",
|
||||
"repo_hash": "1csg5q3f0fp145905idqkhsshs8rdbmfgc0nx2ihvxkdmzvd0p3d",
|
||||
"version": "18.3.2",
|
||||
"repo_hash": "0n234gk7w75n4vmfdgwjksbksfcnj69f1wczydcylinaxv2jm50n",
|
||||
"yarn_hash": "0g1iafhfdgshy7d6p27qy042j8xyf6gj4rws9wrzdh51fmv4p3bj",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v18.3.1-ee",
|
||||
"rev": "v18.3.2-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "18.3.1",
|
||||
"GITLAB_PAGES_VERSION": "18.3.1",
|
||||
"GITLAB_SHELL_VERSION": "14.44.0",
|
||||
"GITALY_SERVER_VERSION": "18.3.2",
|
||||
"GITLAB_PAGES_VERSION": "18.3.2",
|
||||
"GITLAB_SHELL_VERSION": "14.45.2",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "18.3.1"
|
||||
"GITLAB_WORKHORSE_VERSION": "18.3.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ in
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "18.3.1";
|
||||
version = "18.3.2";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
||||
@@ -1737,7 +1737,7 @@ GEM
|
||||
ruby-magic (0.6.0)
|
||||
mini_portile2 (~> 2.8)
|
||||
ruby-progressbar (1.11.0)
|
||||
ruby-saml (1.18.0)
|
||||
ruby-saml (1.18.1)
|
||||
nokogiri (>= 1.13.10)
|
||||
rexml
|
||||
ruby-statistics (4.1.0)
|
||||
|
||||
@@ -8164,10 +8164,10 @@ src: {
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0vgsvdaglz1spx9gxrr6xh7qqhi4qd8jd06h2ihwxmazj9ajld6y";
|
||||
sha256 = "01wi1csw4kjmlxmd1igx5hj2wrwkslay1xamg4cv8l7imr27l3hv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.18.0";
|
||||
version = "1.18.1";
|
||||
};
|
||||
ruby-statistics = {
|
||||
groups = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "glab";
|
||||
version = "1.67.0";
|
||||
version = "1.68.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-d0pElHlfElqnlXbbAaIGzLtWpuAdIOVfdmTD6+2nNX4=";
|
||||
hash = "sha256-KSjgnoUwzHtRZtSUdWSDathmQgJdrtGhb7JR200NYIk=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/nFdlC1gg08vEGuiq9qoUar8EGuYddxvTvFuGxQKnYA=";
|
||||
vendorHash = "sha256-rt7HATHyaHufAPJ3fcrukrKOvFBeqpTCq7j+qKlHFbo=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
callPackage,
|
||||
|
||||
cmake,
|
||||
ninja,
|
||||
mbedtls,
|
||||
libxcrypt,
|
||||
zlib,
|
||||
|
||||
enableCache ? true, # Internal cache support.
|
||||
enableIpV6 ? true,
|
||||
enableTls ? true,
|
||||
enableMonitor ? false, # Support for the Hiawatha Monitor.
|
||||
enableRproxy ? true, # Reverse proxy support.
|
||||
enableTomahawk ? false, # Tomahawk, the Hiawatha command shell.
|
||||
enableXslt ? true,
|
||||
libxml2 ? null,
|
||||
libxslt ? null,
|
||||
enableToolkit ? true, # The URL Toolkit.
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hiawatha";
|
||||
version = "11.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "hsleisink";
|
||||
repo = "hiawatha";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Vr7rpYyUgB2NI/PJgh/nQa7gY1XJ4AfUDAHEOVblD1g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
buildInputs = [
|
||||
mbedtls
|
||||
libxcrypt
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals enableXslt [
|
||||
libxslt
|
||||
libxml2
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace SETUID ""
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_SYSTEM_MBEDTLS=on" # Policy to use Nix deps, and Nix uses up to date deps
|
||||
(if enableCache then "-DENABLE_CACHE=on" else "-DENABLE_CACHE=off")
|
||||
(if enableIpV6 then "-DENABLE_IPV6=on" else "-DENABLE_IPV6=off")
|
||||
(if enableTls then "-DENABLE_TLS=on" else "-DENABLE_TLS=off")
|
||||
(if enableMonitor then "-DENABLE_MONITOR=on" else "-DENABLE_MONITOR=off")
|
||||
(if enableRproxy then "-DENABLE_RPROXY=on" else "-DENABLE_RPROXY=off")
|
||||
(if enableTomahawk then "-DENABLE_TOMAHAWK=on" else "-DENABLE_TOMAHAWK=off")
|
||||
(if enableXslt then "-DENABLE_XSLT=on" else "-DENABLE_XSLT=off")
|
||||
(if enableToolkit then "-DENABLE_TOOLKIT=on" else "-DENABLE_TOOLKIT=off")
|
||||
];
|
||||
|
||||
passthru.tests.serve-static-files = callPackage ./test.nix {
|
||||
hiawatha = finalAttrs.finalPackage;
|
||||
inherit enableTls;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://hiawatha.leisink.net/";
|
||||
description = "Advanced and secure webserver";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.unix; # "Hiawatha runs perfectly on Linux, BSD and MacOS X"
|
||||
mainProgram = "hiawatha";
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
})
|
||||
@@ -1,86 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
hiawatha,
|
||||
curl,
|
||||
mbedtls,
|
||||
enableTls,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "hiawatha-test";
|
||||
|
||||
nativeBuildInputs = [
|
||||
hiawatha
|
||||
curl
|
||||
]
|
||||
++ lib.optional enableTls mbedtls;
|
||||
|
||||
env = {
|
||||
inherit enableTls;
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
cp -r --no-preserve=mode ${hiawatha}/etc/hiawatha config
|
||||
sed "1i set TEST_DIR = $(pwd)" $serverConfigPath > config/hiawatha.conf
|
||||
|
||||
mkdir www
|
||||
echo "it works" > www/index.html
|
||||
|
||||
if [ -n "$enableTls" ]; then
|
||||
echo "Generating self-signed certificate"
|
||||
gen_key type=ec filename=server.key
|
||||
cert_write selfsign=1 issuer_key=server.key output_file=server.crt
|
||||
cat server.crt server.key > config/server.crt
|
||||
fi
|
||||
|
||||
echo "Checking server configuration"
|
||||
hiawatha -c ./config -k
|
||||
|
||||
echo "Starting server"
|
||||
hiawatha -c ./config
|
||||
|
||||
testUrl() {
|
||||
echo "Testing $1"
|
||||
curl --verbose --insecure --fail "$1" | tee response
|
||||
grep -q "it works" response
|
||||
}
|
||||
|
||||
testUrl http://127.0.0.1:8000
|
||||
if [ -n "$enableTls" ]; then
|
||||
testUrl https://127.0.0.1:8443
|
||||
fi
|
||||
|
||||
touch $out
|
||||
'';
|
||||
|
||||
serverConfig = ''
|
||||
# By default the server uses read-only directories like /var/lib and /etc
|
||||
WorkDirectory = TEST_DIR
|
||||
PIDfile = TEST_DIR/hiawatha.pid
|
||||
SystemLogfile = TEST_DIR/system.log
|
||||
GarbageLogfile = TEST_DIR/garbage.log
|
||||
ExploitLogfile = TEST_DIR/exploit.log
|
||||
AccessLogfile = TEST_DIR/access.log
|
||||
ErrorLogfile = TEST_DIR/error.log
|
||||
|
||||
Binding {
|
||||
Interface = 127.0.0.1
|
||||
Port = 8000
|
||||
}
|
||||
|
||||
${lib.optionalString enableTls ''
|
||||
Binding {
|
||||
Interface = 127.0.0.1
|
||||
Port = 8443
|
||||
TLScertFile = TEST_DIR/config/server.crt
|
||||
}
|
||||
''}
|
||||
|
||||
Hostname = 127.0.0.1
|
||||
WebsiteRoot = TEST_DIR/www
|
||||
StartFile = index.html
|
||||
'';
|
||||
|
||||
passAsFile = [ "serverConfig" ];
|
||||
}
|
||||
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "homepage";
|
||||
homepage = "https://gethomepage.dev";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -14,13 +14,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland-qtutils";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprland-qtutils";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=";
|
||||
hash = "sha256-bTYedtQFqqVBAh42scgX7+S3O6XKLnT6FTC6rpmyCCc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -86,7 +86,6 @@ python3Packages.buildPythonApplication rec {
|
||||
mainProgram = "icloudpd";
|
||||
maintainers = with maintainers; [
|
||||
anpin
|
||||
jnsgruk
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
cairo,
|
||||
pixman,
|
||||
libsecret,
|
||||
electron,
|
||||
electron_35,
|
||||
xcbuild,
|
||||
buildPackages,
|
||||
callPackage,
|
||||
@@ -22,6 +22,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_35;
|
||||
yarn-berry = yarn-berry_4;
|
||||
|
||||
releaseData = lib.importJSON ./release-data.json;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"version": "3.4.10",
|
||||
"hash": "sha256-BN+6Db4I4Rumr4V6scjpnfiYlJ6fkaI3tiqU2fWoZJQ=",
|
||||
"version": "3.4.12",
|
||||
"hash": "sha256-p9MY7E0qa7LcXBpGs/DmX2A2jXQoOPYiRo/nEzkkQd0=",
|
||||
"plugins": {
|
||||
"io.github.jackgruber.backup": {
|
||||
"name": "joplin-plugin-backup",
|
||||
|
||||
@@ -20,13 +20,13 @@ with python3Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "kupfer";
|
||||
version = "327";
|
||||
version = "328";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz";
|
||||
sha256 = "sha256-F5ScSfD/LwpSOAAqTN0WX5yFhoz23DYfeCC+KuvixYM=";
|
||||
sha256 = "sha256-1oPvcho54uXCvov4eTZTjObL0EecimfxVOxl+bOU6do=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnss_nis";
|
||||
version = "3.2";
|
||||
version = "3.4";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "thkukuk";
|
||||
repo = "libnss_nis";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dt5wL+v98Heg6395BOwNssXLXmoOKFnRXGqlOknYYPs=";
|
||||
hash = "sha256-FWAyf4soSUpNrYzSefNWthEMfQEopfYX9pMDf1rNK6c=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
@@ -6,6 +6,11 @@
|
||||
nix-prefetch-scripts,
|
||||
luarocks-nix,
|
||||
pluginupdate,
|
||||
lua5_1,
|
||||
lua5_2,
|
||||
lua5_3,
|
||||
lua5_4,
|
||||
luajit,
|
||||
}:
|
||||
let
|
||||
|
||||
@@ -13,6 +18,11 @@ let
|
||||
nix
|
||||
nix-prefetch-scripts
|
||||
luarocks-nix
|
||||
lua5_1
|
||||
lua5_2
|
||||
lua5_3
|
||||
lua5_4
|
||||
luajit
|
||||
];
|
||||
|
||||
attrs = builtins.fromTOML (builtins.readFile ./pyproject.toml);
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "marge-bot";
|
||||
version = "0.16.1";
|
||||
version = "0.17.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "marge-org";
|
||||
repo = "marge-bot";
|
||||
rev = version;
|
||||
hash = "sha256-I1yQwTqHFynEbjF0BpGBHek6qgtTzZztDAqdl+2j2U0=";
|
||||
hash = "sha256-Sz/jr5q5A0NikJPaU9r0+BYNJojLvZS3vDPte/nUIf8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "minikube";
|
||||
version = "1.36.0";
|
||||
version = "1.37.0";
|
||||
|
||||
vendorHash = "sha256-ro4QwvTf1O6/iffxEKi6pAenX8E3fPu4omqbLcigsTk=";
|
||||
vendorHash = "sha256-xPTJMxKnEwZKKCc6QZxeL+03qM0oldOIKY4sPjSw3Ak=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -25,7 +25,7 @@ buildGoModule rec {
|
||||
owner = "kubernetes";
|
||||
repo = "minikube";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-We5EyEWvrQ/k27920kE1XMijQWSYvLle7N3KUOsTfbc=";
|
||||
sha256 = "sha256-qyeGBL952YIloB/69W+QWosXxwIrazE0OMdVO6LshPk=";
|
||||
};
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
let
|
||||
version = "1.2.9";
|
||||
version = "1.2.12";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "mktxp";
|
||||
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication {
|
||||
owner = "akpw";
|
||||
repo = "mktxp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LPCx5UJuL22aRbRYD+GkDAQ/0RCi+WJwvsF86ZQ01JY=";
|
||||
hash = "sha256-2aSRnfhOROFJWzqvltYaN2FLXrRjICV56SOOHf4wKtg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -22,7 +22,7 @@ let
|
||||
commonMeta = {
|
||||
homepage = "https://multipass.run";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
|
||||
Generated
+4
-4
@@ -166,13 +166,13 @@
|
||||
},
|
||||
{
|
||||
"pname": "NBitcoin",
|
||||
"version": "8.0.18",
|
||||
"hash": "sha256-5SKx6SluWXNHNz5FxxFPCkyJ3SSDACAVx3G1q9h38VU="
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-FLqOA3Axa2Xyz7MRgXPnbIQHwMcuKqduTJrUt87/W8Q="
|
||||
},
|
||||
{
|
||||
"pname": "NBitcoin.Altcoins",
|
||||
"version": "4.0.8",
|
||||
"hash": "sha256-n1e0BUhXl3D/fn1DbCdbelYfys2fc7+ZABazhUWxzo4="
|
||||
"version": "5.0.0",
|
||||
"hash": "sha256-3dPvHLcVvM26NW1MHcZeHkoIFm/ypcpiv+W948ff1ys="
|
||||
},
|
||||
{
|
||||
"pname": "NETStandard.Library",
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "nbxplorer";
|
||||
version = "2.5.27";
|
||||
version = "2.5.30-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgarage";
|
||||
repo = "NBXplorer";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WCrxAomVU1hPRtI91ppmDKdLZEmNZYH9C0o069/dIMk=";
|
||||
hash = "sha256-FVSoFvWwMpuMbH7xFE5aSkLPzROaufbPZL09OWabbus=";
|
||||
};
|
||||
|
||||
projectFile = "NBXplorer/NBXplorer.csproj";
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
let
|
||||
bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32";
|
||||
version = "0.102.1";
|
||||
version = "0.103.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "nwjs-ffmpeg-prebuilt";
|
||||
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
|
||||
src =
|
||||
let
|
||||
hashes = {
|
||||
"x64" = "sha256-n+HvcOg3QieUu/2Ezc+rk80XceionHjIE+xAH/MkoAc=";
|
||||
"ia32" = "sha256-n+HvcOg3QieUu/2Ezc+rk80XceionHjIE+xAH/MkoAc=";
|
||||
"x64" = "sha256-A5jzp9f5C5Zj4r/GMrQEv9gYyZOiKjytH07mIoB79V4=";
|
||||
"ia32" = "sha256-A5jzp9f5C5Zj4r/GMrQEv9gYyZOiKjytH07mIoB79V4=";
|
||||
};
|
||||
in
|
||||
fetchurl {
|
||||
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"DEVEL_LIBDIR=$(out)/lib"
|
||||
"INCLUDEDIR=$(out)/include"
|
||||
"LOCALEDIR=$(out)/share/locale"
|
||||
"MANDIR=$(man)/man"
|
||||
"MANDIR=$(man)/share/man"
|
||||
"PKGCONFIGDIR=$(out)/lib/pkgconfig"
|
||||
"SECUREDIR=$(out)/lib/security"
|
||||
"SECUREDIR_DARWIN=$(out)/lib/security"
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgmoneta";
|
||||
version = "0.18.0";
|
||||
version = "0.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgmoneta";
|
||||
repo = "pgmoneta";
|
||||
rev = version;
|
||||
hash = "sha256-FAW3WmFnJ4Dql1tbVqWIie5nH7XlBKu0efMQrRuPSJc=";
|
||||
hash = "sha256-qsKjUFCuxKSc7klB/S2N3TG+jqnS4NW0RZC6e9JQXtA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pixelflasher";
|
||||
version = "8.4.0.1";
|
||||
version = "8.5.1.0";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "badabing2005";
|
||||
repo = "PixelFlasher";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9WQXkJ902PHgfwyWY0zd1fBVsEoxyeg5Eq2H0lUxY2Q=";
|
||||
hash = "sha256-IAetTEycuOhjZEgfqen+Za4hjgCzYQuEduElWuhZybE=";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "pkgsite";
|
||||
version = "0-unstable-2025-08-14";
|
||||
version = "0-unstable-2025-09-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "pkgsite";
|
||||
rev = "ed9d06afb3a5d788c2bd4d6eef1b2a667cff4782";
|
||||
hash = "sha256-HROCrvfpHiRmZSE+P9uL5mwqkcI9uwxFEI7fSjzOHiI=";
|
||||
rev = "f655b297736ff88a3f37c952fb49266ab92fa130";
|
||||
hash = "sha256-R+LXpmTw/sP5Vb4IaTt7x1vxpPePW8/3Broz3J1d1So=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MUd0AGYDLx6o1uItjk3UVHBIXfPjN6AjjhYQCz5BIeQ=";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pt2-clone";
|
||||
version = "1.76";
|
||||
version = "1.77";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "pt2-clone";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-oiOkUPvw0wY8HsRRKN4wdF3m2dFCdzYEBhx6JU2nqyQ=";
|
||||
sha256 = "sha256-B7LskOLtqUkrCWUQ5L9hIEpUqpsrupz+DNRRQliOo00=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -27,18 +27,18 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rnote";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flxzt";
|
||||
repo = "rnote";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YA2iqHqeh1uZsXSwyn4EWYAUXUgXvshNqSo6MS8U6ZQ=";
|
||||
hash = "sha256-EMxA5QqmIae/d3nUpwKjgURo0nOyaNbma8poB5mcQW0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-p5GrvzECinqCryvMNfSI8QZTXHnytI7jJqolkX76lOo=";
|
||||
hash = "sha256-fr1bDTzTKx7TLBqw94CyaB0/Jo2x1BzZcM6dcen1PHc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -49,7 +49,7 @@ buildGoModule rec {
|
||||
description = "Hard disk metrics collector for Scrutiny";
|
||||
homepage = "https://github.com/AnalogJ/scrutiny";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "scrutiny-collector-metrics";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -67,7 +67,7 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/AnalogJ/scrutiny";
|
||||
changelog = "https://github.com/AnalogJ/scrutiny/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "scrutiny";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shader-slang";
|
||||
version = "2025.16";
|
||||
version = "2025.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shader-slang";
|
||||
repo = "slang";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ovGrwngcnKN8FJ1PummXHxnGtPatV2Unb6t2Q1f144I=";
|
||||
hash = "sha256-9kCqE/jwnQrwbKXdcY3rp8YoPju+/ZupH1HBc5qu53o=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sof-firmware";
|
||||
version = "2025.05";
|
||||
version = "2025.05.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/thesofproject/sof-bin/releases/download/v${finalAttrs.version}/sof-bin-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-4vJgOw04x8vbFnKQGGP7+EtNtJIfQFlSojaRXLioa8w=";
|
||||
hash = "sha256-YNVOrjJpQzKiEgt8ROSvQDoU/h/fTFjXKYEQKxkdJZw=";
|
||||
};
|
||||
|
||||
dontFixup = true; # binaries must not be stripped or patchelfed
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "stackit-cli";
|
||||
version = "0.40.1";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackitcloud";
|
||||
repo = "stackit-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-a2EVUCLmIAgXmQeDLPIgEKqFFebwpu/p94OkwOuiBuc=";
|
||||
hash = "sha256-eBnuarXh8F4P7RdKo6GA1vFhTTRMwI+1Sbb4gGOKDeA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-C5BsCfekQGhPtVKTgZVSHbkyeH4i5QrfXxN6KRutNpo=";
|
||||
vendorHash = "sha256-LZXIAQqRTGbSKWQ2csLK/7Q80jRhKk1bw8dSoZaFetk=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
stdenv,
|
||||
undmg,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
let
|
||||
snapshot = "20250820185748";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "suspicious-package";
|
||||
version = "4.6";
|
||||
|
||||
src = fetchurl {
|
||||
# Use externally archived download URL because
|
||||
# upstream does not provide stable URLs for versioned releases
|
||||
url = "https://web.archive.org/web/${snapshot}/https://www.mothersruin.com/software/downloads/SuspiciousPackage.dmg";
|
||||
hash = "sha256-SJcXqQR/di3T8K3uNKv00QkLsmDGJNU9NQEIpDSqYJM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
sourceRoot = "Suspicious Package.app";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/Applications/Suspicious Package.app" $out/bin
|
||||
cp -R . "$out/Applications/Suspicious Package.app"
|
||||
ln -s "../Applications/Suspicious Package.app/Contents/SharedSupport/spkg" $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Toolkit for analysing macOS packages";
|
||||
homepage = "https://www.mothersruin.com/software/SuspiciousPackage/";
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
maintainers = with lib.maintainers; [ andre4ik3 ];
|
||||
mainProgram = "spkg";
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
Generated
+1908
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -4,33 +4,42 @@
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tantivy-go";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
repo = "tantivy-go";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ksHw+62JwQrzxLuXwYfTLOkC22Miz1Rpl5XX8+vPBcM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GKbQFWXKEgYmoTyFCQ/SAgFB7UJpYN2SWwZEiUxd260=";
|
||||
sourceRoot = "${finalAttrs.src.name}/rust";
|
||||
|
||||
cargoPatches = [
|
||||
./add-Cargo.lock.patch
|
||||
];
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"rust-stemmers-1.2.0" = "sha256-GJYFQf025U42rJEoI9eIi3xDdK6enptAr3jphuKJdiw=";
|
||||
"tantivy-0.23.0" = "sha256-e2ffM2gRC5eww3xv9izLqukGUgduCt2u7jsqTDX5l8k=";
|
||||
"tantivy-jieba-0.11.0" = "sha256-BDz6+EVksgLkOj/8XXxPMVshI0X1+oLt6alDLMpnLZc=";
|
||||
};
|
||||
};
|
||||
|
||||
cargoRoot = "rust";
|
||||
buildAndTestSubdir = cargoRoot;
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
chmod +w ../bindings.h
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Tantivy go bindings";
|
||||
homepage = "https://github.com/anyproto/tantivy-go";
|
||||
changelog = "https://github.com/anyproto/tantivy-go/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
autrimpo
|
||||
adda
|
||||
kira-bruneau
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -3,20 +3,25 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
unzip,
|
||||
writeShellScript,
|
||||
jq,
|
||||
ast-grep,
|
||||
common-updater-scripts,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tidgi";
|
||||
version = "0.12.1";
|
||||
version = "0.12.4";
|
||||
|
||||
src =
|
||||
{
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${version}-update/TidGi-darwin-x64-${version}.zip";
|
||||
hash = "sha256-XZraotf6ewsrb2LBbZTTRMrT+B52NNWsZY/Qxju8hNw=";
|
||||
url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${finalAttrs.version}/TidGi-darwin-x64-${finalAttrs.version}.zip";
|
||||
hash = "sha256-nxfnPz2oxsYUsT2Q9ADDxVq5xcJvkNDQTBX8EkGUF4g=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${version}-update/TidGi-darwin-arm64-${version}.zip";
|
||||
hash = "sha256-/fcMCS7k2LT0ELcrFPpiQ/WNJtxaJoYOLLhROHTgIdY=";
|
||||
url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${finalAttrs.version}/TidGi-darwin-arm64-${finalAttrs.version}.zip";
|
||||
hash = "sha256-bSJFM67+KVECUqjwu1HYipn+zOps1ahNzM721yZL52c=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
@@ -36,8 +41,29 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeShellScript "update-tidgi" ''
|
||||
version=$(nix eval --raw --file . tidgi.version)
|
||||
latestVersion=$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --fail --silent https://api.github.com/repos/tiddly-gittly/TidGi-Desktop/releases/latest | ${lib.getExe jq} --raw-output .tag_name | sed 's/^v//')
|
||||
if [[ "$latestVersion" == "$version" ]]; then
|
||||
exit 0
|
||||
fi
|
||||
${lib.getExe ast-grep} scan --inline-rules "
|
||||
id: update-version
|
||||
language: nix
|
||||
rule:
|
||||
kind: binding
|
||||
regex: '^\s*version\s*='
|
||||
fix: 'version = \"$latestVersion\";'
|
||||
" --update-all $(env EDITOR=echo nix edit --file . tidgi)
|
||||
systems=$(nix eval --json -f . tidgi.meta.platforms | ${lib.getExe jq} --raw-output '.[]')
|
||||
for system in $systems; do
|
||||
hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw --file . tidgi.src.url --system "$system")))
|
||||
${lib.getExe' common-updater-scripts "update-source-version"} tidgi $latestVersion $hash --system=$system --ignore-same-version --ignore-same-hash
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/tag/v${version}";
|
||||
changelog = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/tag/v${finalAttrs.version}";
|
||||
description = "Customizable personal knowledge-base and blogging platform with git as backup manager";
|
||||
homepage = "https://github.com/tiddly-gittly/TidGi-Desktop";
|
||||
license = lib.licenses.mpl20;
|
||||
@@ -48,4 +74,4 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -12,13 +12,13 @@ assert cudaSupport -> cudaPackages != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "umpire";
|
||||
version = "2025.03.1";
|
||||
version = "2025.09.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LLNL";
|
||||
repo = "umpire";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MHvJRXAMV64GxGgCJjQPlaNyxVjBvyQXogbla9UMFL8=";
|
||||
hash = "sha256-1lJty4HdjwExBih7Bl3E34LpmDlDlhb0zl9N7MyFj5w=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -45,11 +45,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "verifast";
|
||||
version = "25.07";
|
||||
version = "25.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/verifast/verifast/releases/download/${version}/${pname}-${version}-linux.tar.gz";
|
||||
sha256 = "sha256-SNLFO0puS6a/A71jA9vZKgK/uJYlPAYmaylznHi60js=";
|
||||
sha256 = "sha256-HkABnWrdkb9yFByG9AB/L+Hu9n9FPLf7jx9at9MdUJ8=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vpl-gpu-rt";
|
||||
version = "25.3.1";
|
||||
version = "25.3.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "intel";
|
||||
repo = "vpl-gpu-rt";
|
||||
rev = "intel-onevpl-${version}";
|
||||
hash = "sha256-BjGoBPWsw8wCDAw1z+imegzbvgRrMNUHdXkUHULC/Vs=";
|
||||
hash = "sha256-Xgochq1cVw9iOEmbosvo5qgiYWE7ljhffS0n5rHoi8Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,20 +6,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasm-tools";
|
||||
version = "1.238.1";
|
||||
version = "1.239.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wasm-tools";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-iQeb3MnOIKpYvEGIrEYiBoLuM4LLwKCDw7ub/dPQTxg=";
|
||||
hash = "sha256-XxP0T3nwhByG4wGknLVUCv38sUyFtEM7jrmVJlujohY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
|
||||
auditable = false;
|
||||
|
||||
cargoHash = "sha256-GzdxpO+QvN2QDEBZkdvDbvG+y+mEYHWzdDhH+LH3TFM=";
|
||||
cargoHash = "sha256-xIfTYJMVP47timzquEYEb9M8BHsj83NjgD44lbzgd+Y=";
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"wasm-tools"
|
||||
|
||||
@@ -1,13 +1,17 @@
|
||||
# generated by zon2nix (https://github.com/nix-community/zon2nix)
|
||||
|
||||
{ linkFarm, fetchzip }:
|
||||
{
|
||||
linkFarm,
|
||||
fetchzip,
|
||||
fetchgit,
|
||||
}:
|
||||
|
||||
linkFarm "zig-packages" [
|
||||
{
|
||||
name = "wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl";
|
||||
name = "wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27";
|
||||
path = fetchzip {
|
||||
url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz";
|
||||
hash = "sha256-ydEavD9z20wRwn9ZVX56ZI2T5i1tnm3LupVxfa30o84=";
|
||||
url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.4.0.tar.gz";
|
||||
hash = "sha256-ulIII5iJpM/W/VJB0HcdktEO2eb9T9J0ln2A1Z94dU4=";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
||||
@@ -10,23 +10,23 @@
|
||||
wayland,
|
||||
wayland-scanner,
|
||||
wayland-protocols,
|
||||
zig_0_14,
|
||||
zig_0_15,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "waylock";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "ifreund";
|
||||
repo = "waylock";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lshXVqSn50AujTjIJIcbyhe5GeLLMdmF+Vh3/QvZt00=";
|
||||
hash = "sha256-TSCE6HSGUkXh76epNuJ+AuG/ZCgR0O8EWRDxz9YDuq8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace build.zig --replace-fail "1.4.0-dev" "1.4.0"
|
||||
substituteInPlace build.zig --replace-fail "1.4.0-dev" "${finalAttrs.version}"
|
||||
'';
|
||||
|
||||
deps = callPackage ./build.zig.zon.nix { };
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
scdoc
|
||||
wayland-scanner
|
||||
zig_0_14.hook
|
||||
zig_0_15.hook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p bash common-updater-scripts gnused zon2nix
|
||||
|
||||
set -e
|
||||
|
||||
latest_tag=$(list-git-tags --url=https://codeberg.org/ifreund/waylock | sed 's/^v//' | tail -n 1)
|
||||
|
||||
update-source-version waylock "$latest_tag"
|
||||
|
||||
wget "https://codeberg.org/ifreund/waylock/raw/tag/v${latest_tag}/build.zig.zon"
|
||||
nix --extra-experimental-features 'nix-command flakes' run github:nix-community/zon2nix# -- build.zig.zon >pkgs/by-name/wa/waylock/build.zig.zon.nix
|
||||
# strip file protocol
|
||||
sed -i '\|file = unpackZigArtifact { inherit name; artifact = /. + path; };|d' pkgs/by-name/wa/waylock/build.zig.zon.nix
|
||||
zon2nix build.zig.zon >pkgs/by-name/wa/waylock/build.zig.zon.nix
|
||||
nixfmt pkgs/by-name/wa/waylock/build.zig.zon.nix
|
||||
|
||||
rm -f build.zig.zon build.zig.zon2json-lock
|
||||
|
||||
@@ -1,28 +1,48 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
R,
|
||||
readline,
|
||||
gmp,
|
||||
zlib,
|
||||
librdf_raptor2,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.3.3";
|
||||
stdenv.mkDerivation {
|
||||
pname = "yap";
|
||||
version = "7.6.0-unstable-2025-05-23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.dcc.fc.up.pt/~vsc/Yap/${pname}-${version}.tar.gz";
|
||||
sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vscosta";
|
||||
repo = "yap";
|
||||
rev = "010bb5e48d2f4fbdc0c47ae9faa830a179b3c31b";
|
||||
hash = "sha256-ojhporq7vCEtdwCIRHwzjpc6dbFFXAgF+p6M7eL3JIE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
R
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
readline
|
||||
gmp
|
||||
zlib
|
||||
librdf_raptor2
|
||||
];
|
||||
|
||||
configureFlags = [ "--enable-tabling=yes" ];
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "WITH_READLINE" true)
|
||||
(lib.cmakeBool "WITH_R" true)
|
||||
(lib.cmakeBool "WITH_Raptor2" true)
|
||||
(lib.cmakeBool "WITH_CUDD" false)
|
||||
(lib.cmakeBool "WITH_Gecode" false)
|
||||
];
|
||||
|
||||
# -fcommon: workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
@@ -30,14 +50,15 @@ stdenv.mkDerivation rec {
|
||||
# libYap.a(pl-buffer.o):/build/yap-6.3.3/H/pl-yap.h:230: first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-fpermissive -fcommon";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
meta = {
|
||||
# the linux 32 bit build fails.
|
||||
# linux 32 bit build fails.
|
||||
broken =
|
||||
(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || !stdenv.hostPlatform.is64bit;
|
||||
homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/";
|
||||
homepage = "https://github.com/vscosta/yap";
|
||||
description = "ISO-compatible high-performance Prolog compiler";
|
||||
license = lib.licenses.artistic2;
|
||||
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
|
||||
libiconv ? null,
|
||||
ncurses,
|
||||
glibcLocales ? null,
|
||||
|
||||
# GHC can be built with system libffi or a bundled one.
|
||||
libffi ? null,
|
||||
@@ -549,8 +548,8 @@ stdenv.mkDerivation (
|
||||
"${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
|
||||
}"
|
||||
''
|
||||
+ lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") ''
|
||||
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
|
||||
+ lib.optionalString (stdenv.buildPlatform.libc == "glibc") ''
|
||||
export LOCALE_ARCHIVE="${buildPackages.glibcLocales}/lib/locale/locale-archive"
|
||||
''
|
||||
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
|
||||
libiconv ? null,
|
||||
ncurses,
|
||||
glibcLocales ? null,
|
||||
|
||||
# GHC can be built with system libffi or a bundled one.
|
||||
libffi ? null,
|
||||
@@ -436,8 +435,8 @@ stdenv.mkDerivation (
|
||||
echo -n "${buildMK}" > mk/build.mk
|
||||
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
|
||||
''
|
||||
+ lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") ''
|
||||
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
|
||||
+ lib.optionalString (stdenv.buildPlatform.libc == "glibc") ''
|
||||
export LOCALE_ARCHIVE="${buildPackages.glibcLocales}/lib/locale/locale-archive"
|
||||
''
|
||||
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
|
||||
|
||||
@@ -377,8 +377,8 @@ let
|
||||
# Python packages don't have a checkPhase, only an installCheckPhase
|
||||
doCheck = false;
|
||||
doInstallCheck = attrs.doCheck or true;
|
||||
nativeInstallCheckInputs = nativeCheckInputs;
|
||||
installCheckInputs = checkInputs;
|
||||
nativeInstallCheckInputs = nativeCheckInputs ++ attrs.nativeInstallCheckInputs or [ ];
|
||||
installCheckInputs = checkInputs ++ attrs.installCheckInputs or [ ];
|
||||
|
||||
inherit dontWrapPythonPrograms;
|
||||
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
mkDerivation,
|
||||
extra-cmake-modules,
|
||||
wayland-scanner,
|
||||
@@ -13,10 +15,14 @@ mkDerivation {
|
||||
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
wayland-scanner
|
||||
];
|
||||
buildInputs = [
|
||||
qtx11extras
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
wayland
|
||||
plasma-wayland-protocols
|
||||
];
|
||||
|
||||
@@ -814,15 +814,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "fzf-lua";
|
||||
version = "0.0.2111-1";
|
||||
version = "0.0.2185-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/fzf-lua-0.0.2111-1.rockspec";
|
||||
sha256 = "1ga202jkvzw9cq80ryfmjfs6v4l83h6ajlbipdd8xsk9yqrzi2dm";
|
||||
url = "mirror://luarocks/fzf-lua-0.0.2185-1.rockspec";
|
||||
sha256 = "1cq3gmdr2nnsj2hrlxk22v42dvk1hzjzpsw9h55inp5kqabd5dcg";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/bebc84e7ffc8fd86103f6ed6c590df72d524d342.zip";
|
||||
sha256 = "0vykm7dlb38qib6gxy048dhacqaswi23g0l6lgnrz1ifwnpgi7x5";
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/ce5a5fa2902933e7b4563ca78210254169463cb6.zip";
|
||||
sha256 = "009fp63ab5qjlkqmkzkk7nn9isld2izwk25g19ynv7akkypclf8q";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -880,8 +880,8 @@ final: prev: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "8bdaccdb897945a3c99c1ad8df94db0ddf5c8790";
|
||||
hash = "sha256-WYHetMwxyzcAuF8m0jhueWWRrPScaED4Oezo6blt3VE=";
|
||||
rev = "6e3c66548035e50db7bd8e360a29aec6620c3641";
|
||||
hash = "sha256-zBUrqL+00Y8j4eVNAgI0nYn2i35zhQo2BVl4mL1cgfs=";
|
||||
};
|
||||
|
||||
disabled = lua.luaversion != "5.1";
|
||||
@@ -903,15 +903,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "grug-far.nvim";
|
||||
version = "1.6.45-1";
|
||||
version = "1.6.46-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/grug-far.nvim-1.6.45-1.rockspec";
|
||||
sha256 = "05hwis664cvchk8g8bgqf4va32i58fihad8dgr7qca4m6f38a7qv";
|
||||
url = "mirror://luarocks/grug-far.nvim-1.6.46-1.rockspec";
|
||||
sha256 = "1vj1li4d3bwj95fizzvzlfcmzaxjjarbw5453d498ccgyvg81zq5";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/MagicDuck/grug-far.nvim/archive/385d1949dc21d0c39e7a74b4f4a25da18817bc86.zip";
|
||||
sha256 = "1dx3xzbkrnyd0wnh136j74i9bl194yxg33sf4ddrgs0i7ylxxk6p";
|
||||
url = "https://github.com/MagicDuck/grug-far.nvim/archive/c5b629399c0f2e436c00df381e44852a13b7313a.zip";
|
||||
sha256 = "1iklplr66dx18mvxim4qy2kh2lw0cj307wcj56z873sg78fap90g";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -2012,17 +2012,17 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lua-resty-openssl";
|
||||
version = "1.6.1-1";
|
||||
version = "1.6.4-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/lua-resty-openssl-1.6.1-1.rockspec";
|
||||
sha256 = "179rc1n1zn0995zfdcl6a97v7ld95p55cppvj20lssrjkq93rk9z";
|
||||
url = "mirror://luarocks/lua-resty-openssl-1.6.4-1.rockspec";
|
||||
sha256 = "1i8hj91kj2wmpqxk9ahjfhdx6bbkv35f7d2f71nklgvg7wychn6x";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "fffonion";
|
||||
repo = "lua-resty-openssl";
|
||||
rev = "1.6.1";
|
||||
hash = "sha256-8LxembMadP+I4jvjNBLn+OHxhzB+R8qSCHxk+mFL4WE=";
|
||||
rev = "1.6.4";
|
||||
hash = "sha256-MO8opf8CgiB6/iESRugrg2OMAyERWJ4Sf5ccgWKJyKs=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -3479,8 +3479,8 @@ final: prev: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "rktjmp";
|
||||
repo = "lush.nvim";
|
||||
rev = "1be16d9002f8b2e8973a19ceac199ad394dea76a";
|
||||
hash = "sha256-qiN1gh3tNRwawc/H/zWC0FSH39zV66RTQcAjIPKinBw=";
|
||||
rev = "9c60ec2279d62487d942ce095e49006af28eed6e";
|
||||
hash = "sha256-ZDC2oirfDe/GqNx6+hivvNqdLutAxlBnSk51lf1yKqM=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1" || luaAtLeast "5.4";
|
||||
@@ -3596,15 +3596,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "lze";
|
||||
version = "0.11.5-1";
|
||||
version = "0.11.7-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/lze-0.11.5-1.rockspec";
|
||||
sha256 = "09am4f3gg4yxj9851aali33dxws46s7fa3479fc2m5kcj5d30lly";
|
||||
url = "mirror://luarocks/lze-0.11.7-1.rockspec";
|
||||
sha256 = "18jj2g81i6b56a9kyg3q1qsrkgvhcz3kgcp419s4bvza8inkzqcq";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/BirdeeHub/lze/archive/v0.11.5.zip";
|
||||
sha256 = "1ga2x9pcd3b5mal13kc70qsqjqba9vm3vvknj75qqd3va7jhpr5l";
|
||||
url = "https://github.com/BirdeeHub/lze/archive/v0.11.7.zip";
|
||||
sha256 = "0zr8pzib9xg8ngvlx536603ji99xwzgjcggxn7f6fl1b2zm4dj6n";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -3981,15 +3981,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "neotest";
|
||||
version = "5.11.0-1";
|
||||
version = "5.11.1-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/neotest-5.11.0-1.rockspec";
|
||||
sha256 = "09zij8y0514syna8wayra4fk8imz8j31qc3qy2rra74lkycvi26n";
|
||||
url = "mirror://luarocks/neotest-5.11.1-1.rockspec";
|
||||
sha256 = "18pj612zpzhl3yv6p5l8ix4j0xr44ff9vwals54szc1sx5784v7l";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nvim-neotest/neotest/archive/35a59c1f59dbb954d92b74ab64a966a668cea495.zip";
|
||||
sha256 = "1arc0yprfbz9cfh9icm827s52nzkkz13zxlg3jbkmg95nqbp68lg";
|
||||
url = "https://github.com/nvim-neotest/neotest/archive/2cf3544fb55cdd428a9a1b7154aea9c9823426e8.zip";
|
||||
sha256 = "1zz376wb3vyw984zjszg8hda4rzskaq7q93ajwdy63ssx8sc9vy4";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -4198,15 +4198,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "orgmode";
|
||||
version = "0.6.0-1";
|
||||
version = "0.7.1-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/orgmode-0.6.0-1.rockspec";
|
||||
sha256 = "1mdk1hy5zbv0js1bp4sb6rijdvjywzhyz16709sd66fw8sn451ak";
|
||||
url = "mirror://luarocks/orgmode-0.7.1-1.rockspec";
|
||||
sha256 = "19xdq0ym9136irbj2634g5flf067vwn8c10r5rzjyd6h8z0xqvg4";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nvim-orgmode/orgmode/archive/0.6.0.zip";
|
||||
sha256 = "18pmiyinhqmkycf4aa9h9ljsvmb2a0ns87dxdqmgizmd2dl72dyc";
|
||||
url = "https://github.com/nvim-orgmode/orgmode/archive/0.7.1.zip";
|
||||
sha256 = "09hcmljhwfs14308hmaxajmcjhi9a0cl0bw1x1hsbrkbg37h99ka";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -4428,15 +4428,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "rest.nvim";
|
||||
version = "3.12.0-1";
|
||||
version = "3.13.0-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/rest.nvim-3.12.0-1.rockspec";
|
||||
sha256 = "1i16gr471v9v6jdwrqizagznpjdr58ijx0cs9yjnd8b6b9cwmxi9";
|
||||
url = "mirror://luarocks/rest.nvim-3.13.0-1.rockspec";
|
||||
sha256 = "1ig9589pb0y59jvlw97nxgcmij9kcjbc7l1aag99m40v823kncil";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/rest-nvim/rest.nvim/archive/v3.12.0.zip";
|
||||
sha256 = "1494r144idrq09da8ra4q0yk7giqh4hxs05397ja7hpxyz0yabdr";
|
||||
url = "https://github.com/rest-nvim/rest.nvim/archive/v3.13.0.zip";
|
||||
sha256 = "18mmif73l13hbzhfvnvdky78jlv2j059cqyvxkb6bcqwcyqx7jaj";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -4651,15 +4651,15 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "rustaceanvim";
|
||||
version = "6.9.1-1";
|
||||
version = "6.9.2-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/rustaceanvim-6.9.1-1.rockspec";
|
||||
sha256 = "1ah0f2n8dkdy50spsbly2pfzz1x0ld1ghgnrh3l6vr4fjbjwyk8d";
|
||||
url = "mirror://luarocks/rustaceanvim-6.9.2-1.rockspec";
|
||||
sha256 = "0smfa296h60xd88fv9xbhb9l6wxf4vmz3299spiac59r02kalkmr";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.9.1.zip";
|
||||
sha256 = "09rwfr8k4k4kivkq828q14l7shpispqwzrbmnvglzdhd3ziy4189";
|
||||
url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.9.2.zip";
|
||||
sha256 = "1bkg713a0y9mg86ra3wrn7j3h4wfgk54zzhb2sc6y0km66p136a2";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -5002,7 +5002,7 @@ final: prev: {
|
||||
version = "scm-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "https://loadk.com/luarocks/telescope.nvim-scm-1.rockspec";
|
||||
url = "mirror://luarocks/telescope.nvim-scm-1.rockspec";
|
||||
sha256 = "07mjkv1nv9b3ifxk2bbpbhvp0awblyklyz6aaqw418x4gm4q1g35";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
@@ -5033,17 +5033,17 @@ final: prev: {
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "tiktoken_core";
|
||||
version = "0.2.4-1";
|
||||
version = "0.2.5-1";
|
||||
knownRockspec =
|
||||
(fetchurl {
|
||||
url = "mirror://luarocks/tiktoken_core-0.2.4-1.rockspec";
|
||||
sha256 = "028zmsgad88hnq7h2r8r2c364dsayh0ga1wpbv9dfqx2l3k0wqvd";
|
||||
url = "mirror://luarocks/tiktoken_core-0.2.5-1.rockspec";
|
||||
sha256 = "17bii1zxxkff0wwsgap4ni1k6ypbrbq5vfs7l34m0n78imx7c2l1";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "gptlang";
|
||||
repo = "lua-tiktoken";
|
||||
rev = "v0.2.4";
|
||||
hash = "sha256-B2oGoMOab80SJbYqs8gVCQxiLZ+5GIZ9fMgMN/sl1CA=";
|
||||
rev = "v0.2.5";
|
||||
hash = "sha256-V3dpFS590QkJQRIAeEgxakvoOGrilolWHutKn9zlOsg=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
|
||||
@@ -183,7 +183,8 @@ in
|
||||
|
||||
# TODO: Figure out why 2 files extra
|
||||
substituteInPlace tests/screenshots/tests-files_spec.lua---files---executable---1-+-args-{-\'fd\'-} \
|
||||
--replace-fail "96" "98"
|
||||
--replace-fail " 98" "100" \
|
||||
--replace-fail "98" "100"
|
||||
|
||||
make test
|
||||
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "bitv";
|
||||
version = "2.0";
|
||||
version = "2.1";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "backtracking";
|
||||
repo = "bitv";
|
||||
tag = version;
|
||||
hash = "sha256-llfbdrvxrz6323G2LBAtKaXOrHQriFzaz3ulvFVhH6s=";
|
||||
hash = "sha256-jlpVMqYOiKxoU6wuVeYlOC5wRtF4aakljKpop6dfu8w=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
pname = "ansible-core";
|
||||
# IMPORTANT: When bumping the minor version (2.XX.0 - the XX), please update pinned package in pkgs/top-level/all-packages.nix
|
||||
# There are pinned packages called ansible_2_XX, create a new one with the previous minor version and then update the version here
|
||||
version = "2.19.1";
|
||||
version = "2.19.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -42,7 +42,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "ansible_core";
|
||||
inherit version;
|
||||
hash = "sha256-r/0zs40ytXz8LNba86r8s4QpcDnkxWABlqLumqAnt10=";
|
||||
hash = "sha256-h/y7xJLtFutq2wN5uuCtv2nzzoioRA5+iODc76n4pUw=";
|
||||
};
|
||||
|
||||
# ansible_connection is already wrapped, so don't pass it through
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bluemaestro-ble";
|
||||
version = "0.4.1";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = "bluemaestro-ble";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-44HUcp8CKQMcaIMKsi3AXdCJlIUGvRrVd2JxGeh1498=";
|
||||
hash = "sha256-H7VAidnClMA/Qmc4ahzrmSaqkWj50zMjfakRD0wX8xM=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "copier";
|
||||
version = "9.10.1";
|
||||
version = "9.10.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -39,7 +39,7 @@ buildPythonPackage rec {
|
||||
postFetch = ''
|
||||
rm $out/tests/demo/doc/ma*ana.txt
|
||||
'';
|
||||
hash = "sha256-fpBUYQiYVJaFgAetZE60fjF40877k1u5ksFOTLRmc44=";
|
||||
hash = "sha256-vO807Jzl04DkiHPBhu3cGK0bhn2Cd2dT1nKznQKP/p0=";
|
||||
};
|
||||
|
||||
POETRY_DYNAMIC_VERSIONING_BYPASS = version;
|
||||
|
||||
@@ -92,6 +92,11 @@ buildPythonPackage rec {
|
||||
"test_get_build_packages"
|
||||
# Relies upon certain paths being present that don't make sense on Nix.
|
||||
"test_java_plugin_jre_not_17"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isAarch64 [
|
||||
# This test is flaky on arm64, I think due to a mock library misbehaving
|
||||
# on arm64.
|
||||
"test_get_build_commands_is_reentrant"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dtschema";
|
||||
version = "2024.02";
|
||||
version = "2025.08";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "devicetree-org";
|
||||
repo = "dt-schema";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-UJU8b9BzuuUSHRjnA6hOd1bMPNOlk4LNtrQV5aZmGhI=";
|
||||
sha256 = "sha256-SW2WAVB7ZSgKRjIyFdMqe8tRIuM97ZVBg4d0BJC6SBI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-genai";
|
||||
version = "1.32.0";
|
||||
version = "1.35.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "python-genai";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vUYv5nsiG6/bNUQvzPfn+dWaeyelQvgd12d/DdkdqKs=";
|
||||
hash = "sha256-KJtnaL2XhTeAXmdIU2O7JkkN3LvOGA/aT3M3Wx9RapM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpclib";
|
||||
version = "0.4.7";
|
||||
version = "0.4.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "vmagamedov";
|
||||
repo = "grpclib";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5221hVjD0TynCsTdruiUZkTsb7uOi49tZ8M/YqdWreE=";
|
||||
hash = "sha256-Z+DMwGMUxNTQ7ABd4q/FgMHEZ/NCOtst+6QfQJm3jVU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user