mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
d8a7dfa41f
195 changed files with 1799 additions and 1553 deletions
|
|
@ -36,6 +36,8 @@
|
|||
|
||||
- `uhttpmock` providing 0.0 ABI was removed. `uhttpmock_1_0` providing 1.0 ABI was renamed to `uhttpmock` and `uhttpmock_1_0` was kept as an alias.
|
||||
|
||||
- `nix-serve-ng` (and `haskellPackages.nix-serve-ng`) is now built against Lix instead of CppNix, following upstream which has switched to Lix as its supported Nix implementation.
|
||||
|
||||
- Linux kernel configuration has been moved out of the `linux-kernel` field of the platform structure into the kernel builders:
|
||||
- `linux-kernel.name` has been removed.
|
||||
- `linux-kernel.target` is available as the `target` parameter and passthru attribute on the kernel builders.
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
pkgsBB ? pkgs.pkgsBuildBuild,
|
||||
nix ? pkgs-nixVersions.stable,
|
||||
nixVersions ? [
|
||||
pkgs-nixVersions.nix_2_28
|
||||
nix
|
||||
pkgs-nixVersions.latest
|
||||
],
|
||||
|
|
|
|||
|
|
@ -410,6 +410,18 @@
|
|||
},
|
||||
"name": "GNOME"
|
||||
},
|
||||
"gnome-circle": {
|
||||
"description": "Maintain GNOME Circle applications.",
|
||||
"id": 18234720,
|
||||
"maintainers": {
|
||||
"Aleksanaa": 42209822,
|
||||
"Hythera": 87016780,
|
||||
"getchoo": 48872998,
|
||||
"michaelgrahamevans": 5932424
|
||||
},
|
||||
"members": {},
|
||||
"name": "GNOME Circle"
|
||||
},
|
||||
"golang": {
|
||||
"description": "Maintain Golang compilers",
|
||||
"id": 4020424,
|
||||
|
|
@ -937,8 +949,7 @@
|
|||
"description": "Reviews changes to core packages for Nixpkgs security vulnerabilities: https://github.com/NixOS/nixpkgs/issues/494349",
|
||||
"id": 16430758,
|
||||
"maintainers": {
|
||||
"balsoft": 18467667,
|
||||
"infinisil": 20525370
|
||||
"balsoft": 18467667
|
||||
},
|
||||
"members": {
|
||||
"andir": 638836,
|
||||
|
|
|
|||
|
|
@ -14649,6 +14649,12 @@
|
|||
github = "kmicklas";
|
||||
githubId = 929096;
|
||||
};
|
||||
kmjayadeep = {
|
||||
email = "kmjayadeep@gmail.com";
|
||||
name = "Jayadeep KM";
|
||||
github = "kmjayadeep";
|
||||
githubId = 6793260;
|
||||
};
|
||||
kmogged = {
|
||||
name = "Kevin";
|
||||
github = "kmogged";
|
||||
|
|
|
|||
|
|
@ -90,3 +90,5 @@
|
|||
This option was previously removed with NixOS 25.05 due to an upstream Plausible change making declarative admin creation more difficult, but this change re-implements the admin creation directly.
|
||||
|
||||
- The `newuidmap` and `newgidmap` security wrappers are now installed with `cap_setuid`/`cap_setgid` file capabilities instead of the setuid-root bit, matching shadow's `--with-fcaps` install mode and other major distributions. Rootless containers (podman, docker-rootless, unprivileged user namespaces) are unaffected. The only behavioural change is that mapping host uid 0 via `/etc/subuid` (which NixOS never configures by default) additionally requires `cap_setfcap`; users who explicitly grant uid 0 in a subuid range can restore the previous behaviour with `security.wrappers.newuidmap.capabilities = lib.mkForce "cap_setuid,cap_setfcap+ep";`.
|
||||
|
||||
- `zoneminder` has been updated to 1.38.x release. See [upstream release note](https://github.com/ZoneMinder/zoneminder/releases/tag/1.38.0). While database migration should happen automatically, it's recommended that you make a backup of the database before upgrading your system.
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
case "$TERM" in
|
||||
foot*) : ;;
|
||||
*) return 0 ;;
|
||||
esac
|
||||
|
||||
osc7_cwd() {
|
||||
local strlen=${#PWD}
|
||||
local encoded=""
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
if ! string match -q "foot*" "$TERM"
|
||||
return 0
|
||||
end
|
||||
|
||||
function update_cwd_osc --on-variable PWD --description 'Notify terminals when $PWD changes'
|
||||
if status --is-command-substitution || set -q INSIDE_EMACS
|
||||
return
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
case "$TERM" in
|
||||
foot*) : ;;
|
||||
*) return 0 ;;
|
||||
esac
|
||||
|
||||
function osc7-pwd() {
|
||||
emulate -L zsh # also sets localoptions for us
|
||||
setopt extendedglob
|
||||
|
|
|
|||
|
|
@ -1,26 +1,24 @@
|
|||
# Lemmy {#module-services-lemmy}
|
||||
|
||||
Lemmy is a federated alternative to reddit in rust.
|
||||
Lemmy is a federated alternative to Reddit in Rust.
|
||||
|
||||
## Quickstart {#module-services-lemmy-quickstart}
|
||||
|
||||
The minimum to start lemmy is
|
||||
The minimum to start Lemmy is
|
||||
|
||||
```nix
|
||||
{
|
||||
services.lemmy = {
|
||||
enable = true;
|
||||
settings = {
|
||||
hostname = "lemmy.union.rocks";
|
||||
database.createLocally = true;
|
||||
};
|
||||
settings.hostname = "lemmy.union.rocks";
|
||||
database.createLocally = true;
|
||||
caddy.enable = true;
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
This will start the backend on port 8536 and the frontend on port 1234.
|
||||
It will expose your instance with a caddy reverse proxy to the hostname you've provided.
|
||||
It will expose your instance with a Caddy reverse proxy to the hostname you've provided.
|
||||
Postgres will be initialized on that same instance automatically.
|
||||
|
||||
## Usage {#module-services-lemmy-usage}
|
||||
|
|
@ -29,5 +27,4 @@ On first connection you will be asked to define an admin user.
|
|||
|
||||
## Missing {#module-services-lemmy-missing}
|
||||
|
||||
- Exposing with nginx is not implemented yet.
|
||||
- This has been tested using a local database with a unix socket connection. Using different database settings will likely require modifications
|
||||
- This has been tested using a local database with a Unix socket connection. Using different database settings will likely require modifications.
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
]
|
||||
++ teams.ngi.members;
|
||||
|
||||
nodes.machine = {
|
||||
containers.machine = {
|
||||
environment.systemPackages = with pkgs; [
|
||||
dep-scan
|
||||
jq
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
meta.maintainers = with lib.maintainers; [ ethancedwards8 ];
|
||||
|
||||
nodes.machine = {
|
||||
containers.machine = {
|
||||
environment.systemPackages = with pkgs; [ owi ];
|
||||
|
||||
environment.etc."owipass.rs".source = pkgs.writeText "owi.rs" ''
|
||||
|
|
|
|||
|
|
@ -3513,8 +3513,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "veriloghdl";
|
||||
publisher = "mshr-h";
|
||||
version = "1.25.0";
|
||||
hash = "sha256-7DN0lYxwLL+Z0mIKApRHGHT7HiJZ0nfDMdojQm7XGAM=";
|
||||
version = "1.27.1";
|
||||
hash = "sha256-rCUIqxhR4AYteLKUGcpPuCV/NqV+tzjYU/TrPOcECdg=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/mshr-h.VerilogHDL/changelog";
|
||||
|
|
@ -3903,8 +3903,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "redhat";
|
||||
name = "java";
|
||||
version = "1.54.0";
|
||||
hash = "sha256-G1L8fSRXj4rmyGFyvPuz7zoQ367Lc5PoyVOZnHPHcu0=";
|
||||
version = "1.55.0";
|
||||
hash = "sha256-ARY5w+40e5WRiVv8d9jPKPg2wFPQpJrkqD7+ncRzpgM=";
|
||||
};
|
||||
buildInputs = [ jdk ];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "windows-ai-studio";
|
||||
publisher = "ms-windows-ai-studio";
|
||||
version = "1.4.3";
|
||||
hash = "sha256-gJvnVxj6fdS+1O9CrILgi/R+OLjaAKwdgAPdjcxkOeA=";
|
||||
version = "1.6.1";
|
||||
hash = "sha256-9q3rK/7Q7XiaH9DZN8Yvar/WTdYdEdRXH02WK1tfk5k=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "material-icon-theme";
|
||||
publisher = "PKief";
|
||||
version = "5.35.0";
|
||||
hash = "sha256-u4c5KTSsdsR92Nm0a+eK17pnOpfHxXkgsr8RExcX6NE=";
|
||||
version = "5.36.1";
|
||||
hash = "sha256-1yxTjIsyj8o97VlvDlWqPCNIxd6XgbjpqF5qNbVtEwg=";
|
||||
};
|
||||
meta = {
|
||||
description = "Material Design Icons for Visual Studio Code";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "mednafen-saturn";
|
||||
version = "0-unstable-2026-05-28";
|
||||
version = "0-unstable-2026-06-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "beetle-saturn-libretro";
|
||||
rev = "8f0d69a4938edd84ef5b308b6013ed4b17b5b7dd";
|
||||
hash = "sha256-hDiUcmkAyFbuMdK3LCshC2vMMU4TbJQAyqzkye/Sb5U=";
|
||||
rev = "8299b65134eded90db3fe5edb6aaa98e02bd9cae";
|
||||
hash = "sha256-E83T6TUzy2envOh25xZ/y6kKb+lk67nOHp1dJXK4UK4=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
|
|
|||
|
|
@ -110,13 +110,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"bpg_proxmox": {
|
||||
"hash": "sha256-F6aSXitmu3FOVpRoFyAVPCZA7dHgRbBySda+uS1BDTY=",
|
||||
"hash": "sha256-Hi37jOpSfBO13BrBSQCrTaYhcyIuL4PAIV9ow7f4eOU=",
|
||||
"homepage": "https://registry.terraform.io/providers/bpg/proxmox",
|
||||
"owner": "bpg",
|
||||
"repo": "terraform-provider-proxmox",
|
||||
"rev": "v0.110.0",
|
||||
"rev": "v0.111.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-X4sWLYi9DKp3ex1XBwv2qiVliytOjs7Asy+rigKF/AE="
|
||||
"vendorHash": "sha256-kvHI8cd/rl9kVKKzSwjrC0+Qikz3w2P9jgLvYa+T2DE="
|
||||
},
|
||||
"brightbox_brightbox": {
|
||||
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
|
||||
|
|
@ -1184,13 +1184,13 @@
|
|||
"vendorHash": "sha256-w/AmSHydCeyp/EURgPY2c/E2LjqAXXCORI53X1hEdxY="
|
||||
},
|
||||
"scaleway_scaleway": {
|
||||
"hash": "sha256-nBx7zmNiQHL+VomJJ4/tyd0gujc2BNQfVA8zG3hT0wc=",
|
||||
"hash": "sha256-9fmNBTOG+A1X+em1nphvwmMUrM/kaR64HlI/e2QeWlA=",
|
||||
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
|
||||
"owner": "scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.76.0",
|
||||
"rev": "v2.77.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-X5OVBa1vKsPA2gfXDZWJIcncor9V4NFmWILarqbIBiw="
|
||||
"vendorHash": "sha256-nqDob9nyw21LwSj8lDrA/5kGxe4KwwnHy0+FedIJr3k="
|
||||
},
|
||||
"scottwinkler_shell": {
|
||||
"hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
extraPythonPackages ? ps: [ ],
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "gajim";
|
||||
version = "2.4.7";
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
domain = "dev.gajim.org";
|
||||
owner = "gajim";
|
||||
repo = "gajim";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-tZ1+DRVCzwaWeur9mwc/zE34H2xdqk96upqWfqNTl3g=";
|
||||
};
|
||||
|
||||
|
|
@ -141,14 +141,16 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = {
|
||||
homepage = "http://gajim.org/";
|
||||
description = "Jabber client written in PyGTK";
|
||||
changelog = "https://dev.gajim.org/gajim/gajim/-/blob/${finalAttrs.version}/ChangeLog";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
raskin
|
||||
hlad
|
||||
vbgl
|
||||
haansn08
|
||||
];
|
||||
downloadPage = "http://gajim.org/download/";
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "gajim";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -90,6 +90,7 @@ makeOverridable (
|
|||
in
|
||||
cases.${fetcher}.fetch cases.${fetcher}.arguments
|
||||
// {
|
||||
inherit tag;
|
||||
rev = rev';
|
||||
meta.homepage = "${baseUrl}";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "aiken";
|
||||
version = "1.1.22";
|
||||
version = "1.1.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aiken-lang";
|
||||
repo = "aiken";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mq/NwfSjqykYwyKq63jDs7u21uWxzAtwDKbZ9Fn3i90=";
|
||||
hash = "sha256-9CPwIqUoOih4711vSEeV3AX1T1GGQ/AeYj7HnWI5UO8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WzaprYYTFLaM6TKzUG6JadQNLBHjgoM3FwRUfMTmiHA=";
|
||||
cargoHash = "sha256-98oyeVo3z49DGikhSBMB7QSiz6+I7GkvqJIpOusuEz4=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "all-the-package-names";
|
||||
version = "2.0.2479";
|
||||
version = "2.0.2487";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nice-registry";
|
||||
repo = "all-the-package-names";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qaqqzlAV1l43CKZq3mDEwzG1MSrrvdtI8xjo+pe8cMQ=";
|
||||
hash = "sha256-PFD7xUMkKqR18VHqeAczX/05T4sgsbMleo66gRpww3w=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-QjOHebjiF1R24NVM/2u+UHEplzlyQdjzJKQbzltHTkM=";
|
||||
npmDepsHash = "sha256-PmcM88pOewKiRc4LBYitB17lltyY+PmAcT0vSt7xCbw=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
|
|
|||
|
|
@ -18,19 +18,19 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aws-cdk-cli";
|
||||
version = "2.1127.0";
|
||||
version = "2.1128.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-cdk-cli";
|
||||
tag = "cdk@v${finalAttrs.version}";
|
||||
hash = "sha256-d55JNmWi4oTNorunkDwpdfcxHE9UC2fufKDahKgoLvk=";
|
||||
hash = "sha256-F5dlS2xIwVxpgc6v+bP+vI0lP+nttvKamzWz4UEphzc=";
|
||||
};
|
||||
|
||||
missingHashes = ./missing-hashes.json;
|
||||
offlineCache = yarn-berry.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src missingHashes;
|
||||
hash = "sha256-eGj2Gx46lyypNz5e0U1AD1dVwOgJK4hkwXp03lR+6sc=";
|
||||
hash = "sha256-ykFox4QTo0f0urzh1e/65Jh0H3x0wOngmEzWFekCma8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ let
|
|||
p = python3.pkgs;
|
||||
self = p.buildPythonApplication rec {
|
||||
pname = "backgroundremover";
|
||||
version = "0.3.4";
|
||||
version = "0.4.4";
|
||||
pyproject = true;
|
||||
|
||||
build-system = [
|
||||
|
|
@ -23,7 +23,7 @@ let
|
|||
owner = "nadermx";
|
||||
repo = "backgroundremover";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7C31wlokX3M4csZ4ZbOqxowQvh8DMQJJcENKgQWNTa8=";
|
||||
hash = "sha256-S6irFkNw+5HHr3ziMRxaeg3QoXWe1qqf10CGTTHKpb4=";
|
||||
};
|
||||
|
||||
models = runCommand "background-remover-models" { } ''
|
||||
|
|
@ -51,12 +51,14 @@ let
|
|||
p.ffmpeg-python
|
||||
p.filelock
|
||||
p.filetype
|
||||
p.flask
|
||||
p.hsh
|
||||
p.idna
|
||||
p.more-itertools
|
||||
p.moviepy
|
||||
p.numpy
|
||||
p.pillow
|
||||
p.pillow-heif
|
||||
p.pymatting
|
||||
p.pysocks
|
||||
p.requests
|
||||
|
|
|
|||
|
|
@ -8,23 +8,30 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "blink1";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "todbot";
|
||||
repo = "blink1-tool";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-9kbWZ0vq+A3y8IeqvK1HnWWgxXaieu1eU8l+om5F2/w=";
|
||||
hash = "sha256-i3DtDPAKvJ53HTgNnnf2iSGmayxg/++Kk3/4cEnD+Sk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "@git submodule update --init" "true"
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail "INSTALL = install''\n" "INSTALL = install -D''\n"
|
||||
''
|
||||
# Drop the hardcoded universal-binary flags so we build a single-arch.
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail "-arch x86_64 -arch arm64" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libusb1 ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libusb1 ];
|
||||
|
||||
makeFlags = [
|
||||
"GIT_TAG_RAW=v${finalAttrs.version}"
|
||||
|
|
@ -42,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://blink1.thingm.com/";
|
||||
license = with lib.licenses; [ cc-by-sa-40 ];
|
||||
maintainers = with lib.maintainers; [ cransom ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
mainProgram = "blink1-tool";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bobgen";
|
||||
version = "0.46.0";
|
||||
version = "0.48.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stephenafamo";
|
||||
repo = "bob";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pWuX6TDwf8JcOamDImx/0knN1lx4lkovouRmEA2fTWA=";
|
||||
hash = "sha256-iD9GPYBt1s6xx4vNRlArERmv5AyBR6Q4mLLDNDWy1qY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WzSUUgfWGz5XXq3iQrtpF91yOEr0QypTWq1rOJMntGQ=";
|
||||
vendorHash = "sha256-tL6f8XkAsBL76idEVxlAAcdYyzo9Rh9fEHy6ysfZWG8=";
|
||||
|
||||
subPackages = [
|
||||
"gen/bobgen-sql"
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "buildbox";
|
||||
version = "1.4.10";
|
||||
version = "1.4.11";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "BuildGrid";
|
||||
repo = "buildbox/buildbox";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-WWvaOPOckqyZ1ehEbPLcsP8qET9cq/3PkG0ep37ypn0=";
|
||||
hash = "sha256-8Et5wgiugoDLtW2C2nsth5iPXPGQ7wkPDSc6hrBgeG8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,29 +12,25 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "calendar-cli";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pycalendar";
|
||||
repo = "calendar-cli";
|
||||
# https://github.com/pycalendar/calendar-cli/pull/113#issuecomment-3977892432
|
||||
tag = "v0.15.0";
|
||||
hash = "sha256-P6ClvX6C5VargAvudgSvBwObIUouTRg7SQ62KxhcKiE=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5qPBHwOPW/HsmO/jBMyq6ROb23JYfJ/XLWmHwgb5kPY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace calendar_cli/metadata.py \
|
||||
--replace-fail '"version": "1.0.1"' '"version": "${finalAttrs.version}"'
|
||||
|
||||
patchShebangs tests
|
||||
substituteInPlace tests/test_calendar-cli.sh \
|
||||
--replace-fail "../bin/calendar-cli.py" "$out/bin/calendar-cli" \
|
||||
--replace-fail "../bin/calendar-cli" "$out/bin/calendar-cli"
|
||||
--replace-fail "../bin/calendar-cli.py" "$out/bin/calendar-cli"
|
||||
'';
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
setuptools
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
|
|
@ -45,7 +41,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
|||
tzlocal
|
||||
click
|
||||
six
|
||||
urllib3
|
||||
vobject
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,15 +8,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "capnproto-rust";
|
||||
version = "0.25.3";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchCrate {
|
||||
crateName = "capnpc";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-jDdsGy/T41R4duclyMpPmPZeflXg+Zp7wdBxbR527ZM=";
|
||||
hash = "sha256-zMaOGwbCnczEY9V2xh3pXuDPYtr91sRblDwSjH/2f0s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-egb4Jpwzkj3PSVStqCX5ZLKgrH7nGHgZUCIleZcWIeI=";
|
||||
cargoHash = "sha256-PgMj+sEvvkkySkL25sgfKzZiKYQX+U0Pt8gJOkZwRzA=";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/include/capnp
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tauri";
|
||||
version = "2.11.3";
|
||||
version = "2.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = "tauri";
|
||||
tag = "tauri-cli-v${finalAttrs.version}";
|
||||
hash = "sha256-PPzAN+qWwtcZj6amK/TIz+OZrE3URtptvHe87NpplzA=";
|
||||
hash = "sha256-bYkooyO8msGlewK4zU8NSgGQwAKzc5xfboMakugukBc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-r/CzW2tpnjzksmuzL9EBa7dMuIYD4pvZdX2XCnNcOYE=";
|
||||
cargoHash = "sha256-S1t4GsBQ4/ktSvLitb8FufnXwZfwVc9r8z9tCLRDy8Y=";
|
||||
|
||||
nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ let
|
|||
hash = "sha256-2X2QlWo12qM7RT0wjf1Xlmh3We2wZR/kJnSxIxVst9Y=";
|
||||
};
|
||||
|
||||
pnpm-hash = "sha256-JvY7olf1OOQ+j/z7hFEcmum24WlPggrur3K8cTEgc7g=";
|
||||
pnpm-hash = "sha256-Z0ToQUPyttebDOjpdisAtjIKM026x9ZtIVPOeq4163A=";
|
||||
vendor-hash = "sha256-nF9d1OWpn3rf4EPhD4vqQbKEp/J5pc7J7XJDgAjd0DA=";
|
||||
|
||||
service = callPackage ./service.nix {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
moreutils,
|
||||
nodejs,
|
||||
pkg-config,
|
||||
pnpm_9,
|
||||
pnpm_10,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
|
||||
|
|
@ -37,8 +37,8 @@ rustPlatform.buildRustPackage {
|
|||
version
|
||||
src
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 3;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 4;
|
||||
hash = pnpm-hash;
|
||||
};
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ rustPlatform.buildRustPackage {
|
|||
nodejs
|
||||
pkg-config
|
||||
pnpmConfigHook
|
||||
pnpm_9
|
||||
pnpm_10
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "clusterctl";
|
||||
version = "1.12.2";
|
||||
version = "1.13.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-AaGJhdBTyCxUK+qm++McS6rFlgAdv/7SjQHvaNRn6YU=";
|
||||
hash = "sha256-ValaeZiYlSXydMwmcGMcBXETWweu3d4XRb+fHnangp4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3dh9Y8R4OeUayyqNyrvUcrnSi/4s9x6oMrAADXR5rnw=";
|
||||
vendorHash = "sha256-GeZUJozumnxXGIJ4moXxuLDATeJDRbTeGDdscZIvjh0=";
|
||||
|
||||
subPackages = [ "cmd/clusterctl" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cpc";
|
||||
version = "3.1.0";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "probablykasper";
|
||||
repo = "cpc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-t9dAk0hIk8P/vt5wfQ5KvLU6f2DAllPy4BfB0q7F7CA=";
|
||||
hash = "sha256-Gd2bFOyPERcwTGurJJDMNrRjFq7smtkgFMGUXxZVwaI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Zb6rnJjhYruoQ7MxCfrx9doDr+hnhCDqhq23xWtdhUY=";
|
||||
cargoHash = "sha256-visApJ3DgQ1ohaQ2IE63bzdf0RuQI4NnpQqspP8WKjg=";
|
||||
|
||||
meta = {
|
||||
mainProgram = "cpc";
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cri-o";
|
||||
version = "1.36.0";
|
||||
version = "1.36.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-I+oqb8TeI7dBX4ecmEEWNKM7EAdCfGWYv6dpz8emvuA=";
|
||||
hash = "sha256-QHI90s2LOa0Jenz+Q++nNuyOAxCx3sOcClBaTKeIUbo=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "croaring";
|
||||
version = "4.7.1";
|
||||
version = "4.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RoaringBitmap";
|
||||
repo = "CRoaring";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FZP+RTV4pcj9pzDq3G2+sWeJnkh9WnW3Atd0CC9zDCk=";
|
||||
hash = "sha256-WSEMkXkR6diE5CV3gQ3tUAodLqNsWmBmrGyXOKg4CJA=";
|
||||
};
|
||||
|
||||
# roaring.pc.in cannot handle absolute CMAKE_INSTALL_*DIRs, nor
|
||||
|
|
|
|||
|
|
@ -10,17 +10,17 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dae";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daeuniverse";
|
||||
repo = "dae";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RpbWZEoGrCq3Py0hu6YDie6ErDTLS3oabqScPzhCtm0=";
|
||||
hash = "sha256-Kc51VQuqObxKXVXGv5CnDm4/3XYqjPvrpAQSVb2vxSM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-u2DCHmX7vRNWIQ2Ir3UrxPGduggEqoUr1rnkDfwsT0I=";
|
||||
vendorHash = "sha256-juxIsZt1T33epN8CbzDc02MmlW5PtYa4pcGxuX9OpH4=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
withAi ? false,
|
||||
|
||||
# nativeBuildInputs
|
||||
cmake,
|
||||
|
|
@ -34,6 +35,7 @@
|
|||
lensfun,
|
||||
lerc,
|
||||
libaom,
|
||||
libarchive,
|
||||
libavif,
|
||||
libdatrie,
|
||||
libepoxy,
|
||||
|
|
@ -53,12 +55,14 @@
|
|||
libwebp,
|
||||
libxml2,
|
||||
lua5_4,
|
||||
onnxruntime,
|
||||
util-linux,
|
||||
openexr,
|
||||
openjpeg,
|
||||
osm-gps-map,
|
||||
pcre2,
|
||||
portmidi,
|
||||
potrace,
|
||||
pugixml,
|
||||
sqlite,
|
||||
# Linux only
|
||||
|
|
@ -81,12 +85,12 @@ let
|
|||
pugixml-shared = pugixml.override { shared = true; };
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.4.1";
|
||||
version = "5.6.0";
|
||||
pname = "darktable";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
|
||||
hash = "sha256-r9x8iKM4qM0vrDHIRQ0Hbtv3PpVuQwcmDIPrwZX4ReQ=";
|
||||
hash = "sha256-FX1tOEevivyr54lERUeG9zqIbgilBLS9YRTCBl/gBuQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -144,9 +148,14 @@ stdenv.mkDerivation rec {
|
|||
osm-gps-map
|
||||
pcre2
|
||||
portmidi
|
||||
potrace
|
||||
pugixml-shared
|
||||
sqlite
|
||||
]
|
||||
++ lib.optionals withAi [
|
||||
libarchive
|
||||
onnxruntime
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
alsa-lib
|
||||
colord
|
||||
|
|
@ -166,6 +175,10 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
"-DBUILD_USERMANUAL=False"
|
||||
]
|
||||
++ lib.optionals withAi [
|
||||
(lib.cmakeBool "USE_AI" true)
|
||||
(lib.cmakeBool "ONNXRUNTIME_OFFLINE" true)
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DUSE_COLORD=OFF"
|
||||
"-DUSE_KWALLET=OFF"
|
||||
|
|
@ -179,7 +192,9 @@ stdenv.mkDerivation rec {
|
|||
let
|
||||
libPathEnvVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
|
||||
libPathPrefix =
|
||||
"$out/lib/darktable" + lib.optionalString stdenv.hostPlatform.isLinux ":${ocl-icd}/lib";
|
||||
"$out/lib/darktable"
|
||||
+ lib.optionalString (withAi && stdenv.hostPlatform.isLinux) ":${lib.getLib onnxruntime}/lib"
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ":${ocl-icd}/lib";
|
||||
in
|
||||
''
|
||||
for f in $out/share/darktable/kernels/*.cl; do
|
||||
|
|
|
|||
|
|
@ -8,25 +8,25 @@
|
|||
|
||||
let
|
||||
pname = "dbgate";
|
||||
version = "6.6.9";
|
||||
version = "7.2.1";
|
||||
src =
|
||||
fetchurl
|
||||
{
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage";
|
||||
hash = "sha256-RS7fFP1ek59VvUv8Q7kjHSVUlH3r+ir3csotWHvyXaM=";
|
||||
hash = "sha256-OkAyKMXOYxvZomVUB5xIpPKR+b4p3+US7TDMIYeCsoo=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage";
|
||||
hash = "sha256-S+OSTa0g8//ORhRrsfrdRcIkk8EavTKjw4sYOdGXvfE=";
|
||||
hash = "sha256-QR44QZ5QNz/q9Cfp/d5EYjlG84ZmCtBFe8a4aMFEhjQ=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg";
|
||||
hash = "sha256-qu2We2ejeRP51DcG8CsMQ2GpfZZoA073dNUaBcStI90=";
|
||||
hash = "sha256-pTE8Na078B2njCrpuN0xt75PkjwepXnuhphB8Qqcsls=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg";
|
||||
hash = "sha256-fW2Cz2u9LM2KMhGjbhq7EI0Oc8ACkTxddE2hOxR8TNU=";
|
||||
hash = "sha256-luk0vWRc4x3QMYAPquTWiSW9FqTe1IsBm9qOoOeHOps=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported.");
|
||||
|
|
|
|||
|
|
@ -14,18 +14,18 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "decasify";
|
||||
version = "0.10.1";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/alerque/decasify/releases/download/v${finalAttrs.version}/decasify-${finalAttrs.version}.tar.zst";
|
||||
hash = "sha256-XPl4HfhkwhHRkfc64BTafeHgLK1lB4UHKP6loLn5Ruc=";
|
||||
hash = "sha256-JATJ8cFjtCkK65NpTTrUkYHAo4nDrqftarqyJInRTpM=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
dontConfigure = true;
|
||||
nativeBuildInputs = [ zstd ];
|
||||
hash = "sha256-rbFacCK/HU2D7QbVfMgKr9VevfutBJJtbXbKodTmkrc=";
|
||||
hash = "sha256-hXU9Yw9rGQDkNnwy63LYPIrreOO2P/f8jVaPnVOhrWI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dockerfmt";
|
||||
version = "0.5.2";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "reteps";
|
||||
repo = "dockerfmt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WfwrFe3E+CzfZ0ITSjMD8h4yrG+mnC6y0L+7OSYjMsw=";
|
||||
hash = "sha256-j6Y0L6tr7BSoC1RWPE0vzUrIND7CBg3RuGoHzuvJHXI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-r8vmbZ4oyplqIU6R/6hhcyjoR3E/mOFrB69TrfPYxRI=";
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dosage";
|
||||
version = "2.1.7";
|
||||
version = "2.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diegopvlk";
|
||||
repo = "Dosage";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Tgsab1KzdEQ9C9gkh09M5gKpocrMrgxQ16pIJ4zcKsY=";
|
||||
hash = "sha256-LqVJQkNjRafmC4OK2F3wZQwa0hofxmbMYWXQ6rPtHug=";
|
||||
};
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/318830
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildDotnetGlobalTool {
|
||||
pname = "dotnet-ef";
|
||||
version = "10.0.2";
|
||||
version = "10.0.9";
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_10_0;
|
||||
|
||||
nugetHash = "sha256-lJjGamBGb4jSuPaFGlNBEGkV7vh4uxv37rYiE7X5Hkk=";
|
||||
nugetHash = "sha256-RqYc9rMfGI88Xo/kNMYbqzbfv4iyTFTk/I/RFLIJ3XM=";
|
||||
|
||||
meta = {
|
||||
description = "Tools to help with design-time development tasks";
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dua";
|
||||
version = "2.37.0";
|
||||
version = "2.37.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Byron";
|
||||
repo = "dua-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vEc41MspD4Z8E8oFwPw52CiOguqgHQKUZ9Q8GooXPRA=";
|
||||
hash = "sha256-FVkq+iLkVcug/SzQtzmupHc1nh+orqyOnqv0xr1Dg/Q=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
postFetch = ''
|
||||
|
|
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0ZdQ9ocl62SR74HlVqTYtGxAyf3HGUFCZinPbLBPPbw=";
|
||||
cargoHash = "sha256-8lRpN3KcrK9x446buGVnHl0CcHVoLWl0slB7CAw37G8=";
|
||||
|
||||
checkFlags = [
|
||||
# Skip interactive tests
|
||||
|
|
|
|||
|
|
@ -1,4 +1,17 @@
|
|||
{
|
||||
"@ngrok/ngrok-android-arm64@npm:1.7.0": "90bd438c4a1f68d72ded57d6117989365ab2a05108ab0cea1f9d65aba9a94a8281bdd04ed1000cb28d28c5fa8e2346aefa0fd7af9aebf8cf88ac60f44d3c7601",
|
||||
"@ngrok/ngrok-darwin-arm64@npm:1.7.0": "503e467c1cab54271ecdfc4bd7e2eb49366b56cd231898b8d8c4bbd5ac50d8aa85455d98bfa66383ea3369d7294dcf3ba59d865487c12145c18c38e73da31c28",
|
||||
"@ngrok/ngrok-darwin-universal@npm:1.7.0": "9cde026e63251b406f99b6bb8189e3f51a2fef9a3d9391f7aef4fc54305d17b7404861694d8e703c9a880fe4580f7d4fcf312978337150876343fb1c25592e8f",
|
||||
"@ngrok/ngrok-darwin-x64@npm:1.7.0": "6164fbe5ac5f78a9250f9b210d8b183905c1745e5c1e7b93ee3c9748c8096b32df5c2f6b20a59ebe77d79ed95e6f8ec40b14a8e41e98bde6a54a5b72b3395069",
|
||||
"@ngrok/ngrok-freebsd-x64@npm:1.7.0": "e6ab26453b8b060a1e042a192908ba9966c1fc400b43d7cf74950824851d434a3e073613b04079acb449ce75e788b50c7696f3a821258bd5879b4a95cf9c0a9f",
|
||||
"@ngrok/ngrok-linux-arm-gnueabihf@npm:1.7.0": "9282159ab05dab3b511de8268afa709ea46bc9a2733ac155fdc9a19c2061093f180bbdfea174bfa3752c304b9af33e165dc293b25fec6d5a78aa773372c7a888",
|
||||
"@ngrok/ngrok-linux-arm64-gnu@npm:1.7.0": "3e93ae9ddd9de6029b2a840df1688795699b7f04a400fc2c7970ac5a4fee4b0bb50ba3a2da566bc2392b79c121e7b8e4aefc84ad3a6b4dcaa9f07486ca0a374f",
|
||||
"@ngrok/ngrok-linux-arm64-musl@npm:1.7.0": "b6637244d06a1bb57e2c8654b4b19eb2cfe2ebcc21f90bcdafeee53efe00c74989a658f0102e2bace6286978fa58614ee67b6f7785ec9a23f7996c887a1e0212",
|
||||
"@ngrok/ngrok-linux-x64-gnu@npm:1.7.0": "09d36e6da68e7a5fe64773c37f7bf4b0d28281ba944313b01bf8346b237615a6006847624d38280a39ae3b55b4da241502b786e46c77bd05eedcf1dc259ded0a",
|
||||
"@ngrok/ngrok-linux-x64-musl@npm:1.7.0": "95c6ab6550f297f05824cc8d935d8c28eb39c745743b3ef46e6f7216011154bde45de390ef62e49226106f32b8900bc88bc0f1adabb3b143f434f4cf8b0db66f",
|
||||
"@ngrok/ngrok-win32-arm64-msvc@npm:1.7.0": "773963f485b47c702c5a7e020238e8c17808ea591b536bf25bae5c18335ceffaacdf39b1b18eaa285ce44b1a62a9b4c32b11cd7eafe8cd8771d7c80d6e63d410",
|
||||
"@ngrok/ngrok-win32-ia32-msvc@npm:1.7.0": "456df61943a2cfa656d257fce73f9a28177ab7ce94170ccfcbb40fd44fe204113c3ba26153b9a8cb8d49b0128d4fec9fd37ba38f37fee3d0a9d27c85448763a8",
|
||||
"@ngrok/ngrok-win32-x64-msvc@npm:1.7.0": "8c73289d1c0d38c191a8ea701104d748717df5b250ce133c2e3a1cf1ac68951592a7276f3b17c0ee09c0d607bd9b0908cacefbe0bb8735027e2a2fcb612c08fb",
|
||||
"@nx/nx-darwin-arm64@npm:22.4.1": "d1faed4c0f1e45398d7819c384f52dc8070990be07f7b337e87af37b891129f5b3d7a0f08287e71ce3a20902c9881bbf53ad763ff58bd3270a6a9bfd137161bd",
|
||||
"@nx/nx-darwin-x64@npm:22.4.1": "ebe3622f46f691fcda61b4a1e4143ff9a745f044eb6c2f8d3ab8e97582e50a80ebf510bdd39770d62e49f493a46f4d41fedd75ea0c76f4e8bb7db75cf2beea0d",
|
||||
"@nx/nx-freebsd-x64@npm:22.4.1": "76f86487736fa29f88543766512d8440ddc63275670a4b1dbc4010866d9b90dee8cf10b724b551132471985b6ae47ef002985126b62213fca79e01a524738354",
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
python3,
|
||||
}:
|
||||
let
|
||||
version = "18.7.0";
|
||||
version = "20.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "expo";
|
||||
repo = "eas-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Z+PtS88Rv9Vv6FA15KxSBWCmOtwmTqO1etgCV7WaTXo=";
|
||||
hash = "sha256-EMN54PR9lhrZcGMq2iNUsdyBP3wVk4G/isjsneIGslI=";
|
||||
};
|
||||
missingHashes = ./missing-hashes.json;
|
||||
patches = [
|
||||
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
yarnOfflineCache = yarn-berry_4.fetchYarnBerryDeps {
|
||||
inherit src missingHashes patches;
|
||||
hash = "sha256-KtFLJc2bEBS0sgTqbF68574fFMxwSlaSKcR0RedVJ4k=";
|
||||
hash = "sha256-dOx4T009+FMFEvTZtlyJpAUo2UYBm1O1hIyBnSbqIgw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -64,6 +64,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
mv "$tmpfile" lerna.json
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
yarn build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
# yarnInstallHook strips out build outputs within packages/eas-cli resulting in most commands missing from eas-cli.
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ergo";
|
||||
version = "6.0.2";
|
||||
version = "6.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ergoplatform/ergo/releases/download/v${finalAttrs.version}/ergo-${finalAttrs.version}.jar";
|
||||
sha256 = "sha256-9igU/BTWMbCM4Zzd1+HrjwYMZ8Os+k/fqokxtnCSO04=";
|
||||
sha256 = "sha256-SALN41UGI+Y5pdCfRdJXki4BgVxbH+ZL2v0uvGnsZ8c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,29 +2,20 @@
|
|||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
installFonts,
|
||||
}:
|
||||
|
||||
let
|
||||
majorVersion = "0";
|
||||
minorVersion = "100";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "fa_1";
|
||||
version = "${majorVersion}.${minorVersion}";
|
||||
version = "0.100";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dotcolon.net/files/fonts/fa_1_${majorVersion}${minorVersion}.zip";
|
||||
url = "https://dotcolon.net/files/fonts/fa_1_${lib.replaceString "." "" finalAttrs.version}.zip";
|
||||
hash = "sha256-BPJ+wZMYXY/yg5oEgBc5YnswA6A7w6V0gdv+cac0qdc=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
nativeBuildInputs = [ installFonts ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://dotcolon.net/font/fa_1/";
|
||||
|
|
@ -33,4 +24,4 @@ stdenvNoCC.mkDerivation {
|
|||
maintainers = with lib.maintainers; [ minijackson ];
|
||||
license = lib.licenses.ofl;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fastly";
|
||||
version = "15.2.0";
|
||||
version = "15.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-q75cNedu+loAkntMykfPil7/gd7inrJx5RyWJPq0NE0=";
|
||||
hash = "sha256-SjRs4ZJnjRTfMgoMBoDoHImD6M6FO6QRA0Vmth1GFbI=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
|
|
@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
|
|||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-dTu+LFxKrLCXnbBH3QJ3PgbXEEtJ0NUIKfoKuCHWlgQ=";
|
||||
vendorHash = "sha256-zQ+ZJ4LXV9NR2zwcMrTTc3eWpNxrbFlik2m2CpaE3eA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -45,13 +45,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5";
|
||||
version = "5.1.19";
|
||||
version = "5.1.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ZsGRVuUpWIJnsSqcAQcerxvwWIRaGdAO2FM1k3D3g0M=";
|
||||
hash = "sha256-IR5mKOsVJ/GPL2czdztLVXGJTNk1JXnWpzmqC/UIwuw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -61,13 +61,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
kdePackages.extra-cmake-modules
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
gettext
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
kdePackages.plasma-wayland-protocols
|
||||
kdePackages.extra-cmake-modules
|
||||
expat
|
||||
isocodes
|
||||
|
|
|
|||
|
|
@ -20,25 +20,25 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "fedistar";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "h3poteto";
|
||||
repo = "fedistar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Q2IfWeMV6yvmCmKBc/iufO28DyIIlj50wp9A7LbQcIY=";
|
||||
hash = "sha256-MV2ItwIBzDEY2tKI8WrQj+rAzv6OTC2aZMiD46oLHFw=";
|
||||
};
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = "src-tauri";
|
||||
|
||||
cargoHash = "sha256-eYPvG07V0DKPQfs6g+oayDcF3Xn74Aq52ZA+psyoSnY=";
|
||||
cargoHash = "sha256-Ac7u/u0kGlUwKF5/196Ss4+pUMyPhAbGqhlmtlYI2Us=";
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-GnVBCrBCnS0Tl9jZu3poIZZJO2SRdlS8jOYUE9G+BFM=";
|
||||
hash = "sha256-JaFXAYHoSMyNgHjeNWgJXJ8ZeU9wUi47N58L3QEd0FE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "flexget";
|
||||
version = "3.19.23";
|
||||
version = "3.19.25";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Flexget";
|
||||
repo = "Flexget";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-r54vFE2FISNge84jaFKL5SGQ41LhEq1YVvoGcKOsi0I=";
|
||||
hash = "sha256-Nvf0Whoc7KkPZc+TelGHH+q8LG6BorlMXxhhpUL/ox8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flink";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz";
|
||||
sha256 = "sha256-WxL4DN/UbOIcUc7K+yNtzyCtN4D884qmEMa+hk/3EQs=";
|
||||
sha256 = "sha256-tShksMQqNjitsIlbl1QqPKggoMPe/ameum5FwvjKSWo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "flix";
|
||||
version = "0.69.1";
|
||||
version = "0.73.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
|
||||
sha256 = "sha256-UgYMaZ/v99dmfSUekU2xSOoJecrmvUoVfO5eYm9prZw=";
|
||||
sha256 = "sha256-X2kiXS4qXAKau1qJswbJfi/gsty49RMW355+yYaBGUM=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
fetchCrate,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
openssl,
|
||||
pkg-config,
|
||||
|
|
@ -11,9 +11,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
pname = "flux9s";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-a+kGFxhqeo8Na5T4IZkyhFyPqT6FvOLP3oiuJUuJIOY=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgunzy";
|
||||
repo = "flux9s";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pphw27LHz+TrU5QcUZZ7zS5k02AaFWBEEHsiV+I+05E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-M2UCpSwKVFGXACcYkxJ8TzRHYgTLqt29RBMMdRvHZv8=";
|
||||
|
|
|
|||
|
|
@ -1,47 +1,52 @@
|
|||
{
|
||||
electron,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
imagemagick,
|
||||
lib,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
nodejs,
|
||||
pnpm_10_29_2,
|
||||
pnpm_11,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
stdenv,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "folo";
|
||||
|
||||
version = "0.6.3";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RSSNext";
|
||||
repo = "Folo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-huVk5KcsepDwtdWMm9pvn31GE1felbH1pR3mGqlSWRs=";
|
||||
tag = "desktop/v${finalAttrs.version}";
|
||||
hash = "sha256-+k09Psuf6Bvjoc9Z1O0u2v44IIsaSQF1QbjJM6cWlUw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_10_29_2
|
||||
pnpm_11
|
||||
makeWrapper
|
||||
imagemagick
|
||||
];
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
version
|
||||
src
|
||||
pnpmInstallFlags
|
||||
;
|
||||
pnpm = pnpm_10_29_2;
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-EP7bpbJUcKmHm7KMlKc0Fz2u0niQ3jC7YN/9pp7vucE=";
|
||||
hash = "sha256-dF0nnBBpJaFq6MYCZVMMt4D85EWDv8zsGEbVnyhP0kE=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
|
|
@ -67,6 +72,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontCheckForBrokenSymlinks = true;
|
||||
|
||||
# Several build scripts import transitive dependencies directly (e.g.
|
||||
# ast-kit from unplugin-ast).
|
||||
pnpmInstallFlags = [ "--shamefully-hoist" ];
|
||||
|
||||
postPatch = ''
|
||||
# pnpm 11 verifies node_modules before every `pnpm run` which conflicts
|
||||
# with --shamefully-hoist
|
||||
echo 'verifyDepsBeforeRun: false' >> pnpm-workspace.yaml
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "folo";
|
||||
desktopName = "Folo";
|
||||
|
|
@ -77,7 +92,7 @@ stdenv.mkDerivation rec {
|
|||
mimeTypes = [ "x-scheme-handler/follow" ];
|
||||
};
|
||||
|
||||
icon = src + "/apps/desktop/resources/icon.png";
|
||||
icon = finalAttrs.src + "/apps/desktop/resources/icon.png";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
|
@ -86,13 +101,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Build desktop app.
|
||||
cd apps/desktop
|
||||
pnpm --offline --no-inline-css build:electron-vite
|
||||
pnpm run build:electron-vite
|
||||
cd ../..
|
||||
|
||||
# Remove dev dependencies.
|
||||
CI=true pnpm --ignore-scripts prune --prod
|
||||
# Clean up broken symlinks left behind by `pnpm prune`
|
||||
find node_modules/.bin -xtype l -delete
|
||||
[ -d node_modules/.bin ] && find node_modules/.bin -xtype l -delete
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
|
@ -109,24 +124,34 @@ stdenv.mkDerivation rec {
|
|||
--add-flags $out/share/follow/apps/desktop \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
|
||||
install -m 444 -D "${desktopItem}/share/applications/"* \
|
||||
install -m 444 -D "${finalAttrs.desktopItem}/share/applications/"* \
|
||||
-t $out/share/applications/
|
||||
|
||||
for size in 16 24 32 48 64 128 256 512; do
|
||||
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
|
||||
convert -background none -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/follow.png
|
||||
convert -background none -resize "$size"x"$size" ${finalAttrs.icon} $out/share/icons/hicolor/"$size"x"$size"/apps/follow.png
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^desktop/v([0-9]+\\.[0-9]+\\.[0-9]+)$"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Next generation information browser";
|
||||
homepage = "https://github.com/RSSNext/Folo";
|
||||
changelog = "https://github.com/RSSNext/Folo/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/RSSNext/Folo/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ iosmanthus ];
|
||||
maintainers = with lib.maintainers; [
|
||||
amadejkastelic
|
||||
iosmanthus
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "follow";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -7,21 +7,22 @@
|
|||
pkg-config,
|
||||
openssl,
|
||||
gitMinimal,
|
||||
python3,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "fresh";
|
||||
version = "0.3.10";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sinelaw";
|
||||
repo = "fresh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5gMrQOhQVyIJuv5QAPOyiTFcY4RntmQV0Mtue1x8aAs=";
|
||||
hash = "sha256-npblvNgrGcy4hScMXydDWoy6NnNVF/YIDwqKyZ6NFuc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5QHNIt7PoB2IhQU6IyL5Ljax0/CzVMHvMcNDfM9st7U=";
|
||||
cargoHash = "sha256-sYtOQYsZrrEHkW/PZqIejFu7vq/Z25otzFwJJ552j6A=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
|
@ -32,6 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
python3
|
||||
gitMinimal
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
|
@ -46,7 +48,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \
|
||||
--add-flags "--no-upgrade-check"
|
||||
--add-flags "--no-upgrade-check" \
|
||||
--prefix PATH : ${lib.makeBinPath [ python3 ]}
|
||||
rm -rf $out/bin/fresh.dSYM
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "fzf-zsh-plugin";
|
||||
version = "1.0.0-unstable-2026-05-06";
|
||||
version = "1.0.0-unstable-2026-06-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unixorn";
|
||||
repo = "fzf-zsh-plugin";
|
||||
rev = "87d14584a9fe82e316173fdade8761dd53e45a62";
|
||||
hash = "sha256-ne/xNgKcESsZKIBk/5TqiDDcOWUR/512DezCNVnAWzw=";
|
||||
rev = "70e2ac8a12c137c1b097a6ecfdc0236e5ef51d1b";
|
||||
hash = "sha256-qwqezNXBRFKTWyMp+9Ss2hEAU9Bznc/DK0XNGZOfVOE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -18,16 +18,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gelly";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fingel";
|
||||
repo = "gelly";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yAbItAKzvn2mxNPqg+iuiI5GvFAYXw1721DaVzS0axI=";
|
||||
hash = "sha256-diezT6zEI7+ljDpzmJeIZDKbmdnsMfaabSuQ1/AvkFE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nKWpawdvBdu57O/Fs+cumrfbYrPUouD3uL0YKWOZY+I=";
|
||||
cargoHash = "sha256-XYnBMBhv/8wKV+cZ06Ks8gzi/ib1FH1AM1FrWr81ghg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -13,11 +13,21 @@
|
|||
libmpc,
|
||||
gnutar,
|
||||
makeWrapper,
|
||||
backend ? "mcode",
|
||||
backend ? if stdenv.hostPlatform.isAarch64 then "llvm-jit" else "mcode",
|
||||
}:
|
||||
|
||||
assert backend == "mcode" || backend == "llvm" || backend == "gcc";
|
||||
assert lib.asserts.assertOneOf "backend" backend [
|
||||
"mcode"
|
||||
"llvm"
|
||||
"llvm-jit"
|
||||
"gcc"
|
||||
];
|
||||
|
||||
let
|
||||
backendIsLLVM = backend == "llvm";
|
||||
backendIsLLVMJit = backend == "llvm-jit";
|
||||
backendIsGCC = backend == "gcc";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ghdl-${backend}";
|
||||
version = "6.0.0";
|
||||
|
|
@ -37,17 +47,17 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [
|
||||
gnat
|
||||
]
|
||||
++ lib.optionals (backend == "llvm" || backend == "gcc") [
|
||||
++ lib.optionals (backendIsLLVM || backendIsGCC) [
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optionals (backend == "gcc") [
|
||||
++ lib.optionals backendIsGCC [
|
||||
texinfo
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
]
|
||||
++ lib.optionals (backend == "gcc") [
|
||||
++ lib.optionals backendIsGCC [
|
||||
gmp
|
||||
mpfr
|
||||
libmpc
|
||||
|
|
@ -57,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# If llvm 7.0 works, 7.x releases should work too.
|
||||
sed -i 's/check_version 7.0/check_version 7/g' configure
|
||||
''
|
||||
+ lib.optionalString (backend == "gcc") ''
|
||||
+ lib.optionalString backendIsGCC ''
|
||||
${gnutar}/bin/tar -xf ${gcc13.cc.src}
|
||||
'';
|
||||
|
||||
|
|
@ -66,14 +76,17 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"--disable-werror"
|
||||
"--enable-synth"
|
||||
]
|
||||
++ lib.optionals (backend == "llvm") [
|
||||
++ lib.optionals (backendIsLLVM || backendIsLLVMJit) [
|
||||
"--with-llvm-config=${llvm.dev}/bin/llvm-config"
|
||||
]
|
||||
++ lib.optionals (backend == "gcc") [
|
||||
++ lib.optionals backendIsLLVMJit [
|
||||
"--with-llvm-jit"
|
||||
]
|
||||
++ lib.optionals backendIsGCC [
|
||||
"--with-gcc=gcc-${gcc13.cc.version}"
|
||||
];
|
||||
|
||||
buildPhase = lib.optionalString (backend == "gcc") ''
|
||||
buildPhase = lib.optionalString backendIsGCC ''
|
||||
make copy-sources
|
||||
mkdir gcc-objs
|
||||
cd gcc-objs
|
||||
|
|
@ -93,14 +106,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
--with-mpfr-include=${mpfr.dev}/include \
|
||||
--with-mpfr-lib=${mpfr.out}/lib \
|
||||
--with-mpc=${libmpc} \
|
||||
--enable-default-pie=${if stdenv.targetPlatform.hasSharedLibraries then "yes" else "no"}
|
||||
--enable-default-pie=${lib.boolToYesNo stdenv.targetPlatform.hasSharedLibraries}
|
||||
make -j $NIX_BUILD_CORES
|
||||
make install
|
||||
cd ../
|
||||
make -j $NIX_BUILD_CORES ghdllib
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString (backend == "llvm" || backend == "gcc") ''
|
||||
postFixup = lib.optionalString (backendIsLLVM || backendIsGCC) ''
|
||||
wrapProgram $out/bin/ghdl \
|
||||
--set LIBRARY_PATH ${lib.makeLibraryPath [ zlib ]} \
|
||||
--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
|
||||
|
|
@ -108,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
hardeningDisable = [
|
||||
]
|
||||
++ lib.optionals (backend == "gcc") [
|
||||
++ lib.optionals backendIsGCC [
|
||||
# GCC compilation fails with format errors
|
||||
"format"
|
||||
];
|
||||
|
|
@ -135,7 +148,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
thoughtpolice
|
||||
sempiternal-aurora
|
||||
];
|
||||
platforms =
|
||||
lib.platforms.linux ++ lib.optionals (backend == "mcode" || backend == "llvm") [ "x86_64-darwin" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"x86_64-darwin"
|
||||
]
|
||||
++ lib.optionals (backendIsLLVM || backendIsLLVMJit || backendIsGCC) [ "aarch64-linux" ]
|
||||
++ lib.optionals (backendIsLLVM || backendIsLLVMJit) [ "aarch64-darwin" ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
ghdl-llvm,
|
||||
ghdl-llvm-jit,
|
||||
ghdl-mcode,
|
||||
ghdl-gcc,
|
||||
backend,
|
||||
|
|
@ -10,12 +11,14 @@ let
|
|||
ghdl =
|
||||
if backend == "llvm" then
|
||||
ghdl-llvm
|
||||
else if backend == "llvm-jit" then
|
||||
ghdl-llvm-jit
|
||||
else if backend == "gcc" then
|
||||
ghdl-gcc
|
||||
else
|
||||
ghdl-mcode;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "ghdl-test-simple";
|
||||
meta.timeout = 300;
|
||||
nativeBuildInputs = [ ghdl ];
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-swagger";
|
||||
version = "0.34.1";
|
||||
version = "0.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-swagger";
|
||||
repo = "go-swagger";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2kPB/E8/qr4j/2rJS6fbgH2CKTZE43L/7ERr2BzOESk=";
|
||||
hash = "sha256-+08mPU3R8IF8vooNkHDLeS2q1VakPKIce3WY+sTjDm4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FILITZAcRHcZs3sICuWVmLA53/zhegQcZTAua6m4HVI=";
|
||||
vendorHash = "sha256-K2Ca9s2FV+KYuJhO6BA/5gCXb7nXK68RO8+QwcKgpAM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "graphlan";
|
||||
version = "0-unstable-2024-08-07";
|
||||
version = "1.1.3-unstable-2024-08-07";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -27,31 +27,33 @@ diff -ruN a/src/stores/env.ts b/src/stores/env.ts
|
|||
diff -ruN a/src/stores/kernelApi.ts b/src/stores/kernelApi.ts
|
||||
--- a/src/stores/kernelApi.ts
|
||||
+++ b/src/stores/kernelApi.ts
|
||||
@@ -248,8 +248,12 @@
|
||||
const runCoreProcess = (isAlpha: boolean) => {
|
||||
return new Promise<number | void>((resolve, reject) => {
|
||||
let output: string
|
||||
+ const coreWorkingDirectory =
|
||||
+ envStore.env.os === 'linux' && envStore.env.configPath
|
||||
+ ? `${envStore.env.configPath}/${CoreWorkingDirectory}`
|
||||
+ : CoreWorkingDirectory
|
||||
const pid = ExecBackground(
|
||||
- CoreWorkingDirectory + '/' + getKernelFileName(isAlpha),
|
||||
+ coreWorkingDirectory + '/' + getKernelFileName(isAlpha),
|
||||
getKernelRuntimeArgs(isAlpha),
|
||||
(out) => {
|
||||
output = out
|
||||
@@ -263,8 +267,9 @@
|
||||
reject(output)
|
||||
},
|
||||
{
|
||||
- PidFile: CorePidFilePath,
|
||||
+ PidFile: coreWorkingDirectory + '/pid.txt',
|
||||
StopOutputKeyword: CoreStopOutputKeyword,
|
||||
+ WorkingDirectory: envStore.env.configPath || envStore.env.basePath,
|
||||
Env: getKernelRuntimeEnv(isAlpha),
|
||||
},
|
||||
).catch((e) => reject(e))
|
||||
@@ -271,19 +271,24 @@
|
||||
const runCoreProcess = async (isAlpha: boolean) => {
|
||||
let stopped = false
|
||||
+ const coreWorkingDirectory =
|
||||
+ envStore.env.os === 'linux' && envStore.env.configPath
|
||||
+ ? `${envStore.env.configPath}/${CoreWorkingDirectory}`
|
||||
+ : CoreWorkingDirectory
|
||||
const pid = await ExecBackground(
|
||||
- CoreWorkingDirectory + '/' + getKernelFileName(isAlpha),
|
||||
+ coreWorkingDirectory + '/' + getKernelFileName(isAlpha),
|
||||
getKernelRuntimeArgs(isAlpha),
|
||||
undefined,
|
||||
async (end) => {
|
||||
stopped = true
|
||||
const logs = await ReadFile(CoreLogFilePath, { Range: '-4096' }).catch((err) => String(err))
|
||||
logs.split('\n').forEach((line) => line && logsStore.recordKernelLog(line))
|
||||
end && logsStore.recordKernelLog(end)
|
||||
onCoreStopped()
|
||||
},
|
||||
{
|
||||
- PidFile: CorePidFilePath,
|
||||
LogFile: CoreLogFilePath,
|
||||
+ PidFile: coreWorkingDirectory + '/pid.txt',
|
||||
+ WorkingDirectory: envStore.env.configPath || envStore.env.basePath,
|
||||
Env: getKernelRuntimeEnv(isAlpha),
|
||||
},
|
||||
)
|
||||
diff -ruN a/src/types/app.d.ts b/src/types/app.d.ts
|
||||
--- a/src/types/app.d.ts
|
||||
+++ b/src/types/app.d.ts
|
||||
|
|
@ -63,6 +65,30 @@ diff -ruN a/src/types/app.d.ts b/src/types/app.d.ts
|
|||
appPath: string
|
||||
os: OS
|
||||
arch: string
|
||||
diff -ruN a/src/views/PluginsView/index.vue b/src/views/PluginsView/index.vue
|
||||
--- a/src/views/PluginsView/index.vue
|
||||
+++ b/src/views/PluginsView/index.vue
|
||||
@@ -37,7 +37,7 @@
|
||||
label: 'common.openFile',
|
||||
handler: async (id: string) => {
|
||||
const plugin = pluginsStore.getPluginById(id)
|
||||
- await OpenURI(envStore.env.basePath + '/' + plugin!.path)
|
||||
+ await OpenURI(`${envStore.env.configPath || envStore.env.basePath}/${plugin!.path}`)
|
||||
},
|
||||
},
|
||||
]
|
||||
diff -ruN a/src/views/RulesetsView/index.vue b/src/views/RulesetsView/index.vue
|
||||
--- a/src/views/RulesetsView/index.vue
|
||||
+++ b/src/views/RulesetsView/index.vue
|
||||
@@ -27,7 +27,7 @@
|
||||
label: 'common.openFile',
|
||||
handler: async (id: string) => {
|
||||
const ruleset = rulesetsStore.getRulesetById(id)
|
||||
- await OpenURI(envStore.env.basePath + '/' + ruleset!.path)
|
||||
+ await OpenURI(`${envStore.env.configPath || envStore.env.basePath}/${ruleset!.path}`)
|
||||
},
|
||||
},
|
||||
{
|
||||
diff -ruN a/src/utils/helper.ts b/src/utils/helper.ts
|
||||
--- a/src/utils/helper.ts
|
||||
+++ b/src/utils/helper.ts
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
let
|
||||
pname = "gui-for-singbox";
|
||||
version = "1.23.2";
|
||||
version = "1.25.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GUI-for-Cores";
|
||||
repo = "GUI.for.SingBox";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CEJ0yzF2smBlLgZ4EH5UWV4Pc4vA2ZH80TjoudUKWZM=";
|
||||
hash = "sha256-+2MdFF1iufbPJvf5XGrM9t9vaY7BNdIu/vSWgAKcbvQ=";
|
||||
};
|
||||
|
||||
metaCommon = {
|
||||
|
|
@ -58,7 +58,7 @@ let
|
|||
;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-m9Rmc9Ww4jb2aQ+RXOwF71daZ6puspdMM/xidnk/YHs=";
|
||||
hash = "sha256-BrDO9xdMuMnhXPAd9QvtU4R1W1WacnsVcGde+WFjvGA=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
|
@ -89,7 +89,7 @@ buildGo126Module {
|
|||
|
||||
patches = [ ./xdg-path-and-restart-patch.patch ];
|
||||
|
||||
vendorHash = "sha256-9uWrctbQ+vujb1Q8zT7Bv7rVyNY1rCM577c9caOKRNo=";
|
||||
vendorHash = "sha256-Xi/EgMLex25p2tmRHEldCv6hgUKIpLJTmrMpHPGLY5M=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -ruN a/bridge/bridge.go b/bridge/bridge.go
|
||||
--- a/bridge/bridge.go
|
||||
+++ b/bridge/bridge.go
|
||||
@@ -50,6 +50,7 @@
|
||||
@@ -51,6 +51,7 @@
|
||||
|
||||
Env.BasePath = filepath.ToSlash(filepath.Dir(exePath))
|
||||
Env.AppName = filepath.Base(exePath)
|
||||
|
|
@ -13,7 +13,7 @@ diff -ruN a/bridge/bridge.go b/bridge/bridge.go
|
|||
|
||||
func (a *App) RestartApp() FlagResult {
|
||||
log.Printf("RestartApp")
|
||||
- exePath := Env.BasePath + "/" + Env.AppName
|
||||
- exePath := resolvePath(Env.AppName)
|
||||
+ exePath, err := os.Executable()
|
||||
+ if err != nil {
|
||||
+ exePath = filepath.Join(Env.BasePath, Env.AppName)
|
||||
|
|
@ -29,15 +29,6 @@ diff -ruN a/bridge/bridge.go b/bridge/bridge.go
|
|||
OS: Env.OS,
|
||||
ARCH: Env.ARCH,
|
||||
IsPrivileged: Env.IsPrivileged,
|
||||
@@ -258,7 +263,7 @@
|
||||
}
|
||||
|
||||
func loadConfig() {
|
||||
- b, err := os.ReadFile(Env.BasePath + "/data/user.yaml")
|
||||
+ b, err := os.ReadFile(GetPath("data/user.yaml"))
|
||||
if err == nil {
|
||||
yaml.Unmarshal(b, &Config)
|
||||
}
|
||||
diff -ruN a/bridge/types.go b/bridge/types.go
|
||||
--- a/bridge/types.go
|
||||
+++ b/bridge/types.go
|
||||
|
|
@ -52,9 +43,8 @@ diff -ruN a/bridge/types.go b/bridge/types.go
|
|||
diff -ruN a/bridge/utils.go b/bridge/utils.go
|
||||
--- a/bridge/utils.go
|
||||
+++ b/bridge/utils.go
|
||||
@@ -13,7 +13,29 @@
|
||||
"golang.org/x/text/encoding/simplifiedchinese"
|
||||
)
|
||||
@@ -23,7 +23,29 @@
|
||||
var requestTransportCache sync.Map
|
||||
|
||||
+func GetConfigPath() string {
|
||||
+ if Env.OS == "linux" {
|
||||
|
|
@ -69,7 +59,7 @@ diff -ruN a/bridge/utils.go b/bridge/utils.go
|
|||
+ return Env.BasePath
|
||||
+}
|
||||
+
|
||||
func GetPath(path string) string {
|
||||
func resolvePath(path string) string {
|
||||
+ if Env.OS == "linux" && !filepath.IsAbs(path) {
|
||||
+ cleanPath := filepath.ToSlash(filepath.Clean(path))
|
||||
+ if cleanPath == "data" {
|
||||
|
|
@ -82,3 +72,4 @@ diff -ruN a/bridge/utils.go b/bridge/utils.go
|
|||
if !filepath.IsAbs(path) {
|
||||
path = filepath.Join(Env.BasePath, path)
|
||||
}
|
||||
return filepath.ToSlash(filepath.Clean(path))
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "honggfuzz";
|
||||
version = "2.6-unstable-2026-04-13";
|
||||
version = "2.6-unstable-2026-06-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "honggfuzz";
|
||||
rev = "48790f7b18f30ba4a95272ea290b720662ed56c9";
|
||||
hash = "sha256-RHNOZF5ttqdh3daGGVRHkvL9g2aZFDGDmmW056ohI6w=";
|
||||
rev = "cf8b66a4d09f4d4d786d96e3c46d9141fb4e98e2";
|
||||
hash = "sha256-cu7VLQvdmgYIbWhAiZjG5wkO/b5+FoBmXp/SlYmykF0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
jellyfin-web,
|
||||
sqlite,
|
||||
versionCheckHook,
|
||||
jq,
|
||||
}:
|
||||
|
||||
buildDotnetModule (finalAttrs: {
|
||||
|
|
@ -23,6 +24,10 @@ buildDotnetModule (finalAttrs: {
|
|||
hash = "sha256-HCs4ZsutVoVH+bBZANjpPeMyV8e63Yemjg9DSr0R9zg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ sqlite ];
|
||||
|
||||
projectFile = "Jellyfin.Server/Jellyfin.Server.csproj";
|
||||
|
|
@ -44,6 +49,17 @@ buildDotnetModule (finalAttrs: {
|
|||
"--webdir=${jellyfin-web}/share/jellyfin-web"
|
||||
];
|
||||
|
||||
# Impurity with time. Injects the build date into this file
|
||||
postFixup = ''
|
||||
timestamp="$(TZ=GMT date -d "@$SOURCE_DATE_EPOCH" '+%a, %d %b %Y %X GMT')"
|
||||
|
||||
cat "$out/lib/jellyfin/jellyfin.staticwebassets.endpoints.json" \
|
||||
| jq --arg timestamp "$timestamp" '.Endpoints[].ResponseHeaders[] |= if (.Name == "Last-Modified") then .Value = $timestamp else . end' \
|
||||
> jellyfin.staticwebassets.endpoints.json.new
|
||||
|
||||
mv "jellyfin.staticwebassets.endpoints.json.new" "$out/lib/jellyfin/jellyfin.staticwebassets.endpoints.json"
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ko";
|
||||
version = "0.18.1";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ko-build";
|
||||
repo = "ko";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-o/Hin6GDFki1ynZ/rDQOhcNUTtQVvXZTAApxAaerRCU=";
|
||||
hash = "sha256-bt3YjEpHE7h27rl4PeACN3AnRE2NNHd4dSJxbqPqS8U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gYDYKNLTmJT0JvQ4wi/5p/3YmaaS4Re/wFqZxRbRVpg=";
|
||||
vendorHash = "sha256-TR4k9kwLIfh9RZd4Tt1cw2Z9UpMB+pgal2OXkhtCY8I=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -24,14 +24,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "komikku";
|
||||
version = "50.4.0";
|
||||
version = "50.8.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-u/OyWZJIntpeuVoJQmLrdsva3+xvwRX28N89aVZYc2o=";
|
||||
hash = "sha256-u10O0+Ty73ad4vB8BgQPsV1W8NJYvzU3wyAhqHtW9v0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
libxml2,
|
||||
lmdb,
|
||||
lua,
|
||||
pcre,
|
||||
pcre2,
|
||||
ssdeep,
|
||||
yajl,
|
||||
|
|
@ -37,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
flex
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
geoip
|
||||
|
|
@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
libxml2
|
||||
lmdb
|
||||
lua
|
||||
pcre
|
||||
pcre2
|
||||
ssdeep
|
||||
yajl
|
||||
|
|
@ -58,34 +57,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
configureFlags = [
|
||||
"--enable-parser-generation"
|
||||
"--disable-doxygen-doc"
|
||||
"--with-curl=${curl.dev}"
|
||||
"--with-libxml=${libxml2.dev}"
|
||||
"--with-lmdb=${lmdb.out}"
|
||||
"--with-maxmind=${libmaxminddb}"
|
||||
"--with-pcre=${pcre.dev}"
|
||||
"--with-pcre2=${pcre2.out}"
|
||||
"--disable-examples"
|
||||
"--with-lmdb=${lmdb}"
|
||||
"--with-ssdeep=${ssdeep}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace build/lmdb.m4 \
|
||||
--replace "\''${path}/include/lmdb.h" "${lmdb.dev}/include/lmdb.h" \
|
||||
--replace "lmdb_inc_path=\"\''${path}/include\"" "lmdb_inc_path=\"${lmdb.dev}/include\""
|
||||
substituteInPlace build/pcre2.m4 \
|
||||
--replace "/usr/local/pcre2" "${pcre2.out}/lib" \
|
||||
--replace "\''${path}/include/pcre2.h" "${pcre2.dev}/include/pcre2.h" \
|
||||
--replace "pcre2_inc_path=\"\''${path}/include\"" "pcre2_inc_path=\"${pcre2.dev}/include\""
|
||||
substituteInPlace build/ssdeep.m4 \
|
||||
--replace "/usr/local/libfuzzy" "${ssdeep}/lib" \
|
||||
--replace "\''${path}/include/fuzzy.h" "${ssdeep}/include/fuzzy.h" \
|
||||
--replace "ssdeep_inc_path=\"\''${path}/include\"" "ssdeep_inc_path=\"${ssdeep}/include\""
|
||||
substituteInPlace modsecurity.conf-recommended \
|
||||
--replace "SecUnicodeMapFile unicode.mapping 20127" "SecUnicodeMapFile $out/share/modsecurity/unicode.mapping 20127"
|
||||
|
||||
# https://github.com/owasp-modsecurity/ModSecurity/blob/v3.0.15/build.sh#L6-L25
|
||||
cd src
|
||||
echo "noinst_HEADERS = \\" > headers.mk
|
||||
ls -1 \
|
||||
echo "noinst_HEADERS = \\" > ./src/headers.mk
|
||||
ls -1 ./src/ \
|
||||
actions/*.h \
|
||||
actions/ctl/*.h \
|
||||
actions/data/*.h \
|
||||
|
|
@ -100,8 +80,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
utils/*.h \
|
||||
variables/*.h \
|
||||
engine/*.h \
|
||||
*.h | tr "\012" " " >> headers.mk
|
||||
cd ../
|
||||
*.h | tr "\012" " " >> ./src/headers.mk
|
||||
|
||||
substituteInPlace modsecurity.conf-recommended \
|
||||
--replace-fail "SecUnicodeMapFile unicode.mapping 20127" "SecUnicodeMapFile $out/share/modsecurity/unicode.mapping 20127"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "ltex-ls-plus";
|
||||
version = "18.6.1";
|
||||
version = "18.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ltex-plus/ltex-ls-plus/releases/download/${version}/ltex-ls-plus-${version}.tar.gz";
|
||||
sha256 = "sha256-YhuT1ZKpecysA4DuMrgko77L0t0Ve9VanXWHbX8p3qo=";
|
||||
sha256 = "sha256-z15a7ilSVw43QMB4YO8qQ8mS6GkxQkaZhdMrIYh6xlg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
|
|
|||
21
pkgs/by-name/lu/lubelogger/deps.json
generated
21
pkgs/by-name/lu/lubelogger/deps.json
generated
|
|
@ -19,25 +19,30 @@
|
|||
"version": "4.17.0",
|
||||
"hash": "sha256-LGruedMrHrI0AXHcXOFxsYP2awwPbrC9Q41AeQk4+9U="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.Cryptography",
|
||||
"version": "10.0.2",
|
||||
"hash": "sha256-+OYtcWsd1qZcEXadYeA4t6+pyADg1APQCxpKUtP002M="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Abstractions",
|
||||
"version": "8.18.0",
|
||||
"hash": "sha256-mkguJA4aXIVVQvSJ9Duq9mivbGXAIkLQp3a8PKy223A="
|
||||
"version": "8.19.1",
|
||||
"hash": "sha256-7Y4j3WTI5fIXnt5h7WNygm8jCWHTK4JbREumCc3SfnM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.JsonWebTokens",
|
||||
"version": "8.18.0",
|
||||
"hash": "sha256-MdqY9CGRs+fTLb3HYYcSfuzqDFo4Dpho4McFWWferjA="
|
||||
"version": "8.19.1",
|
||||
"hash": "sha256-HQYkEF4YAqSxOBBXzSB++frSxvjwLUgpI4AuQsbFY4g="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Logging",
|
||||
"version": "8.18.0",
|
||||
"hash": "sha256-09WyYskyL8gjjVDzoZBQAGXgsPmyagWftALSBCdt4gg="
|
||||
"version": "8.19.1",
|
||||
"hash": "sha256-zp+JxFS4feqSum93vDuckx/2P8ZhxWjtSryTGWudRc8="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.IdentityModel.Tokens",
|
||||
"version": "8.18.0",
|
||||
"hash": "sha256-sFhonZW9G6H4ooQ6N/78fkZvADZ2Hf5WAS3FKd/ue1E="
|
||||
"version": "8.19.1",
|
||||
"hash": "sha256-kzZPJ0XvHCnKvxgxqhy5O4iJd2SbZPTXdA1czY/LNBc="
|
||||
},
|
||||
{
|
||||
"pname": "MimeKit",
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "lubelogger";
|
||||
version = "1.6.7";
|
||||
version = "1.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hargata";
|
||||
repo = "lubelog";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-goj9xGHZaX6XMYqlvOpabTXTT3/GcuvcRjr6GwVTFA4=";
|
||||
hash = "sha256-ePzR6TmByUBWGuOEg8WKMpvQT7qHGkZuBF8CkTwMtuY=";
|
||||
};
|
||||
|
||||
projectFile = "CarCareTracker.sln";
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "matugen";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "InioX";
|
||||
repo = "matugen";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2jcqAU8QutF8AE15LYwd8cy7KjayGxUGHxvWnqAiS5M=";
|
||||
hash = "sha256-xzwMDWb6pF3oStVoS8enNhpYptxdnB1NSIO7dUH6/qk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RlzY0eaYrEVkO7ozzgfLHxKB2jy4nSYda9Z0jrqiUVA=";
|
||||
cargoHash = "sha256-bfvlPiTlPQeedo+ikHXSI8NqdA5R5M7gCsgx7srYsMQ=";
|
||||
|
||||
meta = {
|
||||
description = "Material you color generation tool";
|
||||
|
|
|
|||
|
|
@ -1,35 +1,67 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
chafa,
|
||||
fontconfig,
|
||||
glib,
|
||||
gnumake,
|
||||
gperf,
|
||||
libiconv,
|
||||
python3,
|
||||
unzip,
|
||||
writeShellScriptBin,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mdfried";
|
||||
version = "0.22.2";
|
||||
version = "0.22.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benjajaja";
|
||||
repo = "mdfried";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HRtuqnD6erRC1Xx+3NSbaFgqRHzurj1xbOJNGykGIpU=";
|
||||
hash = "sha256-Zcn1C8mXwljJ3HtYgYBPyU9cVHvoNBUn7qjqx45wMhE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jnByeBBL13DavExG2pVN7vNRr+UXGkxRY0a4MkwzRe0=";
|
||||
cargoHash = "sha256-Nt+oBl2HX/H/7j62VjaHrY29gpd2vouevBJO0W3AYAk=";
|
||||
|
||||
buildFeatures = [ "pdf" ];
|
||||
|
||||
# Prevent updateAutotoolsGnuConfigScripts from modifying mupdf's vendored
|
||||
# autotools files — doing so invalidates cargo's fingerprint for mupdf-sys
|
||||
# and causes a rebuild that fails on read-only cargoArtifacts files.
|
||||
updateAutotoolsGnuConfigScriptsPhase = "true";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook # for mupdf-sys bindgen
|
||||
gperf # for mupdf vendored Makefile
|
||||
python3 # for mupdf vendored Makefile
|
||||
unzip # for mupdf vendored docx_template build
|
||||
# mupdf-sys cp_r copies files from the read-only Nix store, preserving
|
||||
# mode 444. make then fails to regenerate headers. Wrap make to chmod first.
|
||||
(writeShellScriptBin "make" ''
|
||||
chmod -R u+w . 2>/dev/null || true
|
||||
exec ${lib.getExe gnumake} "$@"
|
||||
'')
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
chafa
|
||||
glib
|
||||
fontconfig.dev # for font-kit (mupdf dep)
|
||||
glib.dev # for glib-2.0.pc (mupdf needs glib.dev, chafa could do with just glib)
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libiconv
|
||||
];
|
||||
|
||||
CFLAGS_aarch64_apple_darwin = lib.optionalString stdenv.hostPlatform.isDarwin "-UTARGET_OS_MAC";
|
||||
CXXFLAGS_aarch64_apple_darwin = lib.optionalString stdenv.hostPlatform.isDarwin "-UTARGET_OS_MAC";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
|
|
|||
|
|
@ -48,9 +48,7 @@ buildGoModule (finalAttrs: {
|
|||
homepage = "https://github.com/equinix/metal-cli/";
|
||||
changelog = "https://github.com/equinix/metal-cli/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
teutat3s
|
||||
];
|
||||
maintainers = [ ];
|
||||
mainProgram = "metal";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "miniflux";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miniflux";
|
||||
repo = "v2";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-cUCekYGFzvqdLql2Z0YoJ4Ug1bOYFMpvhBinD3sOaB0=";
|
||||
hash = "sha256-gfudc11dJKzRtsT2gEazzgGFoUVaZNqgzdIATuGH29U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aTRc1SspNET3nki7dji0EKIBwSbplsNkKZWud8XJTNA=";
|
||||
vendorHash = "sha256-JjZfZJyml6/ANilLNAKaounUJ35TWhj/wVWWiGEhxps=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -22,16 +22,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mise";
|
||||
version = "2026.6.11";
|
||||
version = "2026.6.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdx";
|
||||
repo = "mise";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8sC/gSgpP2A6rh8j0aZeMq8pLwbBvcSUAxhehQlTLJg=";
|
||||
hash = "sha256-/HE/2bHUz1gPpyLZnKZO5ZqT5oxOn+SZ0J4vyj67Ohs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yya9rtEki0o0MfBeWK2/Mo16/I1Mg6aCZOQOP8aWJi0=";
|
||||
cargoHash = "sha256-p7PCqwS0bI7kXvGYZm4bWpYhz1kkqILDCPGlEq32Cqo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "mist-cli";
|
||||
version = "2.2";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ninxsoft/mist-cli/releases/download/v${finalAttrs.version}/mist-cli.${finalAttrs.version}.pkg";
|
||||
hash = "sha256-d+tm37X6JC5r23D8WTsxIkL0RU4U58pJmLermwjOgCE=";
|
||||
hash = "sha256-rUIA40JTXndE7W2wQiayhAP9RPTQMeJV8d6NUy/Immk=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
fetchFromGitHub,
|
||||
writeShellScript,
|
||||
dash,
|
||||
gitMinimal,
|
||||
php,
|
||||
phpCfg ? null,
|
||||
withPostgreSQL ? true, # “strongly recommended” according to docs
|
||||
|
|
@ -44,13 +45,13 @@ let
|
|||
in
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "movim";
|
||||
version = "0.34";
|
||||
version = "0.34.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "movim";
|
||||
repo = "movim";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-E2n0YxNCaNEseGjLLhFDBdvrGg/XfzxU+T/rw/6Y/qY=";
|
||||
hash = "sha256-2RWTx/mhMAi13v7BUfJmGvkPc4iqKdVR0B5rCbD5YaQ=";
|
||||
};
|
||||
|
||||
php = php.buildEnv (
|
||||
|
|
@ -88,7 +89,26 @@ php.buildComposerProject2 (finalAttrs: {
|
|||
++ lib.optional minify.style.enable lightningcss
|
||||
++ lib.optional minify.svg.enable scour;
|
||||
|
||||
vendorHash = "sha256-Vs98gZAthDuYCdZiKSwmh+en4admfXSbDeoZXdbt8hQ=";
|
||||
# Composer ≥2.8 defaults preferred-install to
|
||||
# dist only (not auto), which prevents fallback
|
||||
# to git clone when dist downloads fail (such as
|
||||
# MS GitHub’s codeload.* in the build sandbox).
|
||||
composerVendor = php.mkComposerVendor {
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
src
|
||||
version
|
||||
vendorHash
|
||||
php
|
||||
;
|
||||
|
||||
postPatch = ''
|
||||
composer config preferred-install auto
|
||||
'';
|
||||
nativeBuildInputs = [ gitMinimal ];
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hSXi1jKilsfhe5P7ElGydxu6uxOpYNeRhHlZGzgkUXw=";
|
||||
|
||||
postPatch = ''
|
||||
# Our modules are already wrapped, removes missing *.so warnings;
|
||||
|
|
|
|||
|
|
@ -13,26 +13,14 @@
|
|||
|
||||
stdenvNoLibc.mkDerivation (finalAttrs: {
|
||||
pname = "newlib";
|
||||
version = "4.5.0.20241231";
|
||||
version = "4.6.0.20260123";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://sourceware.org/pub/newlib/newlib-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-M/EmBeAFSWWZbCXBOCs+RjsK+ReZAB9buMBjDy7IyFI=";
|
||||
sha256 = "sha256-b/J+O/AiZm9D94AiVb5oDu/3IqwYGxcl0h4ugxhgTuM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "0001-newlib-Fix-mips-libgloss-support.patch";
|
||||
url = "https://sourceware.org/git/?p=newlib-cygwin.git;a=patch;h=8a8fb570d7c5310a03a34b3dd6f9f8bb35ee9f40";
|
||||
hash = "sha256-hWS/X0jf/ZFXIR39NvNDVhkR8F81k9UWpsqDhZFxO5o=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0002-newlib-Fix-i386-libgloss-support.patch";
|
||||
url = "https://sourceware.org/git/?p=newlib-cygwin.git;a=patch;h=351842d55ee50fab672818b72f2c6bf3be1772bd;hp=4a1144dc540423b422dbec27eb433bc7dc725ae8";
|
||||
hash = "sha256-GMx9nQKJEnXbA5HFczp3xjrrU94j1oXq4lIjEf0um9Y=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals nanoizeNewlib [
|
||||
patches = lib.optionals nanoizeNewlib [
|
||||
# https://bugs.gentoo.org/723756
|
||||
(fetchpatch {
|
||||
name = "newlib-3.3.0-no-nano-cxx.patch";
|
||||
|
|
@ -114,6 +102,8 @@ stdenvNoLibc.mkDerivation (finalAttrs: {
|
|||
);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
# install: cannot create regular file '.../powerpc-none-eabi/lib/crt0.o': File exists
|
||||
enableParallelInstalling = false;
|
||||
dontDisableStatic = true;
|
||||
|
||||
# apply necessary nano changes from https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/manifest/copy_nano_libraries.sh?rev=4c50be6ccb9c4205a5262a3925317073&hash=1375A7B0A1CD0DB9B9EB0D2B574ADF66
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
];
|
||||
|
||||
buildInputs = lib.optionals enableNixImport [
|
||||
nixVersions.nix_2_28
|
||||
nixVersions.nix_2_31
|
||||
boost
|
||||
];
|
||||
|
||||
|
|
@ -70,6 +70,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
"--exclude=py-nickel"
|
||||
];
|
||||
|
||||
checkFlags = lib.optionals enableNixImport [
|
||||
# libnixmain from Nix >= 2.31 tries to create /nix/var/nix/profiles on
|
||||
# initialisation, which is rejected by the build sandbox.
|
||||
"--skip=stdin_format::evaluates_nix_from_stdin"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $nls/bin
|
||||
mv $out/bin/nls $nls/bin/nls
|
||||
|
|
|
|||
|
|
@ -3,36 +3,157 @@
|
|||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"asynctools"
|
||||
"jester"
|
||||
],
|
||||
"path": "/nix/store/ahig7j046p8mc01jgidvvvba0afccilr-source",
|
||||
"rev": "pr_fix_compilation",
|
||||
"sha256": "0lip4qzc49ffa9byx65n7pmsy020a589vhnly373xrfhk2zw9jmd",
|
||||
"path": "/nix/store/4dxbw27sjzks7j13gdbprhskmdjylscg-source",
|
||||
"ref": "v0.6.0",
|
||||
"rev": "2dfac077170c62cd6ffc73e3dcfa29d29c641dcf",
|
||||
"sha256": "0d35mbx1bgjfmrv8j1qph56law74wzjp3qvr2d0qj9x9d1cddz0p",
|
||||
"srcDir": "",
|
||||
"url": "https://github.com/timotheecour/asynctools/archive/pr_fix_compilation.tar.gz"
|
||||
"url": "https://github.com/dom96/jester/archive/2dfac077170c62cd6ffc73e3dcfa29d29c641dcf.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"dotenv"
|
||||
"karax"
|
||||
],
|
||||
"path": "/nix/store/jkf2p6sp0506crd1awpq2x98m527v4mb-source",
|
||||
"ref": "2.0.2",
|
||||
"rev": "19bb965ef04f57128f4f4ea2e690ff9f7d6a81b1",
|
||||
"sha256": "0dk0ixgpxmaz2kf12a3fvzdaknn38qnwgdhp7yag0m5fbhhz2kjc",
|
||||
"path": "/nix/store/7wwwlplx2r1pra2yci8ld4kg6s4ckyhm-source",
|
||||
"ref": "1.5.0",
|
||||
"rev": "a1eaaa87af756c21db4524c38cad4a004218f740",
|
||||
"sha256": "1xy3cq1z93x8hpf8c5xarg53vhhscgs4d7aq5x2j3c7hnlcr7kak",
|
||||
"srcDir": "",
|
||||
"url": "https://github.com/karaxnim/karax/archive/a1eaaa87af756c21db4524c38cad4a004218f740.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"sass"
|
||||
],
|
||||
"path": "/nix/store/d2yidyfsqd850ijxkf3yisp0x61a0crw-source",
|
||||
"ref": "v0.2.0",
|
||||
"rev": "70af832b6eb37b148b0dbbc51085a73163c20041",
|
||||
"sha256": "1xkjygniwpbpqzy2w5w9773jv40dklpwhcc003hbf2rn2ghpvgqw",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/euantorano/dotenv.nim/archive/19bb965ef04f57128f4f4ea2e690ff9f7d6a81b1.tar.gz"
|
||||
"url": "https://github.com/dom96/sass/archive/70af832b6eb37b148b0dbbc51085a73163c20041.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"nimcrypto"
|
||||
],
|
||||
"path": "/nix/store/f2xp1v0vnplwfjnk8nqsi7gd9pnb9gcv-source",
|
||||
"ref": "v0.7.3^{}",
|
||||
"rev": "b3dbc9c4d08e58c5b7bfad6dc7ef2ee52f2f4c08",
|
||||
"sha256": "1v4rz42lwcazs6isi3kmjylkisr84mh0kgmlqycx4i885dn3g0l4",
|
||||
"srcDir": "",
|
||||
"url": "https://github.com/cheatfate/nimcrypto/archive/b3dbc9c4d08e58c5b7bfad6dc7ef2ee52f2f4c08.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"markdown"
|
||||
],
|
||||
"path": "/nix/store/3ha9jx6zafxb338r5xi1bydxnjsjppl5-source",
|
||||
"ref": "v0.8.8",
|
||||
"rev": "5a7a7bafd1da23b25332316a7b888e6586f4177a",
|
||||
"sha256": "10b3jmq9dhyfkj3r0jwk9zigrn048jb7xwh7vkbqar5wgfgmqljr",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/soasme/nim-markdown/archive/5a7a7bafd1da23b25332316a7b888e6586f4177a.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"packedjson"
|
||||
],
|
||||
"path": "/nix/store/c6wn9azj0kyvl818a40hzqzis0im8gnb-source",
|
||||
"rev": "9e6fbb6",
|
||||
"sha256": "09yxshkfpacgl6x8f77snjcwz37r519vh7rrnqrnh5npvgk3h24j",
|
||||
"srcDir": "",
|
||||
"url": "https://github.com/Araq/packedjson/archive/9e6fbb6.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"supersnappy"
|
||||
],
|
||||
"path": "/nix/store/v2i65kqvcgcqmlqllx8gb9ipmaqvwisr-source",
|
||||
"ref": "2.1.4",
|
||||
"rev": "4fed6553d539cbbfb17ab5fea16a58b4f1916e7d",
|
||||
"sha256": "1a55c0v2zy4hgzckaj1bb1q9a5vgxrclrr7zqgbrlg78c7il5inf",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/guzba/supersnappy/archive/4fed6553d539cbbfb17ab5fea16a58b4f1916e7d.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"redpool"
|
||||
],
|
||||
"path": "/nix/store/gwh94rsq3viiy85rzk00xiyfg671ig5d-source",
|
||||
"ref": "v0.2.2",
|
||||
"rev": "fc7869f83d168e6ca1413fe97873140fd5805183",
|
||||
"sha256": "1nvcicdkxpixmzx68bf8f7abjz3n3p5rs3lzf0qh4ggr1y4w7sfm",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/zedeus/redpool/archive/fc7869f83d168e6ca1413fe97873140fd5805183.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"redis"
|
||||
],
|
||||
"path": "/nix/store/d2ccdhm958z9rzampbi2din88753sbia-source",
|
||||
"ref": "v0.4.1",
|
||||
"rev": "a533ab242510e893f75cd8a7c9fac24a6243ec3d",
|
||||
"sha256": "1d0aqfzbsl164lhh3fgk8kzmzz6sg96szzlhgqdaazmyzhg7mhz7",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/zedeus/redis/archive/a533ab242510e893f75cd8a7c9fac24a6243ec3d.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"zippy"
|
||||
],
|
||||
"path": "/nix/store/y7jw44rcmvhwbwd02qh6d6mnrg4xk00v-source",
|
||||
"ref": "0.10.19",
|
||||
"rev": "bcb8c1e1be6abb0a0e35a3c6040cdd9391cc993f",
|
||||
"sha256": "0vk10ap93jqrmzxjjnwm1w45x7fvbihxjqc92nb1ic2y9x33i5v3",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/guzba/zippy/archive/bcb8c1e1be6abb0a0e35a3c6040cdd9391cc993f.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"flatty"
|
||||
],
|
||||
"path": "/nix/store/21380smf8kyxzc4zf0qjsjx0dp5lv5rj-source",
|
||||
"rev": "e668085",
|
||||
"sha256": "0886lk20rg1pq56jsz1jjd8vrdz46lgdaxvp97az06mcawhbabbz",
|
||||
"path": "/nix/store/8lxcz0fmm6myip77ka4sn3fms3m502gd-source",
|
||||
"ref": "0.4.0",
|
||||
"rev": "c7091b096bcf275f47b666ef74bce73eda187ee3",
|
||||
"sha256": "1j56hhf4g5b2sm6190lxlr0qih0mdszk0d39ii79hpyzk787a6dy",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/treeform/flatty/archive/e668085.tar.gz"
|
||||
"url": "https://github.com/treeform/flatty/archive/c7091b096bcf275f47b666ef74bce73eda187ee3.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"jsony"
|
||||
],
|
||||
"path": "/nix/store/p34ky5dizbgjilm7g4yfqggz45pdgf2n-source",
|
||||
"ref": "1.1.6",
|
||||
"rev": "bb647e1ca21af25ffdc423bcb96feeeeae963ca2",
|
||||
"sha256": "0f7mp9hf673y14dj84ysdw5xbciqkwx0mn9c12zn105mcmn1f8mm",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/treeform/jsony/archive/bb647e1ca21af25ffdc423bcb96feeeeae963ca2.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"oauth"
|
||||
],
|
||||
"path": "/nix/store/bqfq4db6nwycmkdrql9igsbrayqsw3g2-source",
|
||||
"ref": "v0.11",
|
||||
"rev": "ec2e058fc46f04deaf3cb55eca32b3b83c614953",
|
||||
"sha256": "1wv8v4xid64z0wbb814n31gf3c6dzlqr3b83b5ls0kqby73krlsm",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/CORDEA/oauth/archive/ec2e058fc46f04deaf3cb55eca32b3b83c614953.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
|
|
@ -49,123 +170,26 @@
|
|||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"jester"
|
||||
"ws"
|
||||
],
|
||||
"path": "/nix/store/jz86cks97is931hwsq5wf35kjwfypp6x-source",
|
||||
"rev": "baca3f",
|
||||
"sha256": "0i8rxsbp5yd9dasis650vqppika43mzfsls4fc7cz8k5j8xpd6zc",
|
||||
"srcDir": "",
|
||||
"url": "https://github.com/dom96/jester/archive/baca3f.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"jsony"
|
||||
],
|
||||
"path": "/nix/store/l84av0wdc0s4r4alsvkaxcxhpd6j4bzg-source",
|
||||
"rev": "1de1f08",
|
||||
"sha256": "0rj205cs3v6g80h8ys9flbdq4wyd1csmkwdxv0lz21972zcsrcfh",
|
||||
"path": "/nix/store/h214k8m5qdw6ajh45f2wjzld856qcvc6-source",
|
||||
"ref": "0.6.0",
|
||||
"rev": "c9c0c7b51e2e83cc9305a895a0b144a297b4bea8",
|
||||
"sha256": "0x1jahhx0wcfay79v0xqddyadf5ckcilhv25cq1g6rarshcg1zvd",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/treeform/jsony/archive/1de1f08.tar.gz"
|
||||
"url": "https://github.com/treeform/ws/archive/c9c0c7b51e2e83cc9305a895a0b144a297b4bea8.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"karax"
|
||||
"dotenv"
|
||||
],
|
||||
"path": "/nix/store/5vghbi3cfpf7zvbkn0mk9chrf0rsx4yf-source",
|
||||
"rev": "5cf360c",
|
||||
"sha256": "1fh0jcjlw0vfqmr5dmhk436g569qvcpml9f981x28wmvm1511z2c",
|
||||
"srcDir": "",
|
||||
"url": "https://github.com/karaxnim/karax/archive/5cf360c.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"markdown"
|
||||
],
|
||||
"path": "/nix/store/6jpq2dp02mhjl8pkxzs0a1sjvgyg5h1r-source",
|
||||
"rev": "158efe3",
|
||||
"sha256": "1701q0i8yd9rrjraf5fzgcvilwnwgw3wyzzfwpr2drmn3x9pd8fj",
|
||||
"path": "/nix/store/jkf2p6sp0506crd1awpq2x98m527v4mb-source",
|
||||
"ref": "2.0.2",
|
||||
"rev": "19bb965ef04f57128f4f4ea2e690ff9f7d6a81b1",
|
||||
"sha256": "0dk0ixgpxmaz2kf12a3fvzdaknn38qnwgdhp7yag0m5fbhhz2kjc",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/soasme/nim-markdown/archive/158efe3.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"nimcrypto"
|
||||
],
|
||||
"path": "/nix/store/zyr8zwh7vaiycn1s4r8cxwc71f2k5l0h-source",
|
||||
"rev": "a079df9",
|
||||
"sha256": "1dmdmgb6b9m5f8dyxk781nnd61dsk3hdxqks7idk9ncnpj9fng65",
|
||||
"srcDir": "",
|
||||
"url": "https://github.com/cheatfate/nimcrypto/archive/a079df9.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"oauth"
|
||||
],
|
||||
"path": "/nix/store/bwmrrzs6xpwizmww35461x3lqpgd0942-source",
|
||||
"rev": "b8c163b",
|
||||
"sha256": "0k5slyzjngbdr6g0b0dykhqmaf8r8n2klbkg2gpid4ckm8hg62v5",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/CORDEA/oauth/archive/b8c163b.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"packedjson"
|
||||
],
|
||||
"path": "/nix/store/c6wn9azj0kyvl818a40hzqzis0im8gnb-source",
|
||||
"rev": "9e6fbb6",
|
||||
"sha256": "09yxshkfpacgl6x8f77snjcwz37r519vh7rrnqrnh5npvgk3h24j",
|
||||
"srcDir": "",
|
||||
"url": "https://github.com/Araq/packedjson/archive/9e6fbb6.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"redis"
|
||||
],
|
||||
"path": "/nix/store/x6l3kz5950fb3d0pr5hmldh0xqkqrl62-source",
|
||||
"rev": "d0a0e6f",
|
||||
"sha256": "166kzflb3wgwvqnv9flyynp8b35xby617lxmk0yas8i4m6vjl00f",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/zedeus/redis/archive/d0a0e6f.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"redis"
|
||||
],
|
||||
"path": "/nix/store/x6l3kz5950fb3d0pr5hmldh0xqkqrl62-source",
|
||||
"rev": "d0a0e6f",
|
||||
"sha256": "166kzflb3wgwvqnv9flyynp8b35xby617lxmk0yas8i4m6vjl00f",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/zedeus/redis/archive/d0a0e6f.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"redpool"
|
||||
],
|
||||
"path": "/nix/store/pkwc61k47vzvxfdhsckbyx52rrbav0gz-source",
|
||||
"rev": "8b7c1db",
|
||||
"sha256": "10xh5fhwnahnq1nf6j69vvnbi55kixa0ari630gr6cdx80arvbs6",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/zedeus/redpool/archive/8b7c1db.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"sass"
|
||||
],
|
||||
"path": "/nix/store/2nk90ab1k14px5zi8jwa30x8b8sfnbnm-source",
|
||||
"rev": "7dfdd03",
|
||||
"sha256": "19d78787k97l5cis81800hxa9qjr0yzjshlzdp727gh6pn8kc8fj",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/dom96/sass/archive/7dfdd03.tar.gz"
|
||||
"url": "https://github.com/euantorano/dotenv.nim/archive/19bb965ef04f57128f4f4ea2e690ff9f7d6a81b1.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
|
|
@ -182,36 +206,13 @@
|
|||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"supersnappy"
|
||||
"asynctools"
|
||||
],
|
||||
"path": "/nix/store/kibhdjpd3mvn9adsp67amj35a7zrnk6y-source",
|
||||
"rev": "6c94198",
|
||||
"sha256": "0gxy7ijm4d2i4dkb64wwq51gns0i2d3d3rrd9cra7fyiahaph4xi",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/guzba/supersnappy/archive/6c94198.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"ws"
|
||||
],
|
||||
"path": "/nix/store/zd51j4dphs6h1hyhdbzdv840c8813ai8-source",
|
||||
"ref": "0.5.0",
|
||||
"rev": "9536bf99ddf5948db221ccb7bb3663aa238a8e21",
|
||||
"sha256": "0j8z9jlvzb1h60v7rryvh2wx6vg99lra6i62whf3fknc53l641fz",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/treeform/ws/archive/9536bf99ddf5948db221ccb7bb3663aa238a8e21.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"zippy"
|
||||
],
|
||||
"path": "/nix/store/lhkc989wrk27wwglrxs0ahhxp2c650y5-source",
|
||||
"rev": "ca5989a",
|
||||
"sha256": "0rk31ispck48ilvzs0lxpp7z6y238a7d7dh7lmlfwi5i7hx13la6",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/guzba/zippy/archive/ca5989a.tar.gz"
|
||||
"path": "/nix/store/qdiiihi53gmbwbj06qa16p8qpks9lvw7-source",
|
||||
"rev": "0e6bdc3ed5bae8c7cc9",
|
||||
"sha256": "111dzyvqlg1r1jngcz3d9px8kfbxpcdi8phs26bxkmbxzjkwrmmv",
|
||||
"srcDir": "",
|
||||
"url": "https://github.com/cheatfate/asynctools/archive/0e6bdc3ed5bae8c7cc9.tar.gz"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
buildNimPackage (
|
||||
finalAttrs: prevAttrs: {
|
||||
pname = "nitter";
|
||||
version = "0-unstable-2026-01-29";
|
||||
version = "0-unstable-2026-06-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zedeus";
|
||||
repo = "nitter";
|
||||
rev = "a45227b8835719dfb443600052d69374db8b515c";
|
||||
hash = "sha256-e6u+CBdOoxLnxC4L1vE7XFr7YlXQ379Ow+khohSXNpg=";
|
||||
rev = "35882ed88d422b1355b66a1ff8c1144bffdc7bdf";
|
||||
hash = "sha256-U3FDhTZIcTDNKbSjrb0F9+Y5Q6GHLmGnmwXoZ5XfATc=";
|
||||
};
|
||||
|
||||
lockFile = ./lock.json;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
fetchpatch2,
|
||||
}:
|
||||
let
|
||||
nixComponents = nixVersions.nixComponents_2_30;
|
||||
nixComponents = nixVersions.nixComponents_2_31;
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluskript";
|
||||
repo = "nix-inspect";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nixVersions,
|
||||
nixComponents ? nixVersions.nixComponents_2_30,
|
||||
nixComponents ? nixVersions.nixComponents_2_31,
|
||||
cmake,
|
||||
pkg-config,
|
||||
boost,
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nng";
|
||||
version = "1.11";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nanomsg";
|
||||
repo = "nng";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-yH/iK/DuVff2qby/wk6jJ9Tsmxrl9eMrb9bOxCzvmdA=";
|
||||
hash = "sha256-czfZYx4d8El6QOcvLhpBd82UpC4cDYI/HfYS2QOUezY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ buildNpmPackage rec {
|
|||
homepage = "https://github.com/TritonDataCenter/node-manta";
|
||||
changelog = "https://github.com/TritonDataCenter/node-manta/blob/v${version}/CHANGES.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ teutat3s ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "mls";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ buildGoModule (
|
|||
ui = buildNpmPackage {
|
||||
inherit (finalAttrs) src version;
|
||||
pname = "ntfy-sh-ui";
|
||||
npmDepsHash = "sha256-ASh88vfDrR+uf4IFOjj/SK2Hb+gwSNuKQwTGYBTogXo=";
|
||||
npmDepsHash = "sha256-d+/p9ytSqZyYDBBFgnK7skM17GJbHesJsVk4sZxTcBA=";
|
||||
|
||||
prePatch = ''
|
||||
cd web/
|
||||
|
|
@ -38,16 +38,16 @@ buildGoModule (
|
|||
in
|
||||
{
|
||||
pname = "ntfy-sh";
|
||||
version = "2.24.0";
|
||||
version = "2.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "binwiederhier";
|
||||
repo = "ntfy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ca04r8kMSAqWiEN6F36n75hy46Alb21UUtQ1/mwpQcY=";
|
||||
hash = "sha256-R0trtATgI+AWXlN2UWEeChMhgX9pLdcNuRLkF4P4opM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9xrqa/eDpyzeLBMM31Q8CsRhdATB2DYkOoE/CxycgzY=";
|
||||
vendorHash = "sha256-sfMKr5IprwjVo7GwIYojcaixlRlkHOhoqec2PcK8UUU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nu_plugin_bson";
|
||||
version = "26.1100.0";
|
||||
version = "26.1130.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kissaki";
|
||||
repo = "nu_plugin_bson";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3Uu2YF5fnNvRP4+9GpLYjzZt7lg0kCbBl4bk4l5rEuY=";
|
||||
hash = "sha256-H+pgAckWFW/jPnIL6i90BBothX5zT3/hbcDhmdvdZmY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iORPlIP9kDLlJkm09SZn2lO3bWcj/Q/g+dBd2CPWiOg=";
|
||||
cargoHash = "sha256-aGUlItPfrr3Uz/t1XEXBtGM285up3A5Wva1QMKwBrg0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
llvmPackages.libclang
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nvs";
|
||||
version = "1.12.1";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "y3owk1n";
|
||||
repo = "nvs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-n0YUHNGgTpfQXGgGBur4H/VRvXbWPwUr5zKMqKCsatQ=";
|
||||
hash = "sha256-cQTcaFEu94BYfJ4vbensbbEpOFWEQXfwIbajSnp9+0A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-l2FdnXA+vKVRekcIKt1R+MxppraTsmo0b/B7RNqnxjA=";
|
||||
vendorHash = "sha256-KQVszK0LLMvi+5aWUVmTTGdUsqJrTWRLe2meb2qV2G0=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -33,13 +33,13 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "open62541";
|
||||
version = "1.4.16";
|
||||
version = "1.4.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open62541";
|
||||
repo = "open62541";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-PSY1GhaCaBkp1msjynOwHz0SzzoHliM5z5AWghG2ZU4=";
|
||||
hash = "sha256-EUQ/wXv1dON7MzOKmnyNUY0mTC64qUEF1++YzPC2xIo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "open62541pp";
|
||||
version = "0.21.1";
|
||||
version = "0.21.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open62541pp";
|
||||
repo = "open62541pp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BYRPHkRG2b/k1vVyOIRK1UH7MRxEpui5YTPfdO3Wx+Y=";
|
||||
hash = "sha256-zi707TD40XH/W5kJ7WXeFOX14aVJovo5WsHKsTQjt3w=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "operator-sdk";
|
||||
version = "1.42.2";
|
||||
version = "1.42.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "operator-framework";
|
||||
repo = "operator-sdk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jBSHrSqeUVePQ6ZOF2cooHImoplsMgxgpXdvQ/3zxrA=";
|
||||
hash = "sha256-DuNgesrqZvMoGHsi9wnVPHYvvSSEYi9FxAsSEhmlTZM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0cggdw8UC7iTgYXEgxcIp+Xyvu4FDUhg/tTGwx7kqxI=";
|
||||
vendorHash = "sha256-FbLi+HoDsPIRoslSgMTJbb8bQ3F8pGMgOAnrSr0mGLQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
77
pkgs/by-name/or/ory-talos/package.nix
Normal file
77
pkgs/by-name/or/ory-talos/package.nix
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
installShellFiles,
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "talos";
|
||||
version = "26.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ory";
|
||||
repo = "talos";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MgjKOfiwU0b3ha2rXewl5c4lGO2En7AgE2y5KtSIhPk=";
|
||||
};
|
||||
vendorHash = "sha256-uSJHR/GDdCRh8sgw7GEUYUEnkwc9UAA4Qeyc+Ww4z1Q=";
|
||||
__structuredAttrs = true;
|
||||
env = {
|
||||
CGO_ENABLED = 0;
|
||||
};
|
||||
# equivalent to `go (build|test) ./...`
|
||||
subPackages = [ "..." ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X github.com/ory/talos/internal/version.Version=${finalAttrs.src.tag}"
|
||||
"-X github.com/ory/talos/internal/version.Commit=${finalAttrs.src.rev}"
|
||||
];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
__darwinAllowLocalNetworking = true;
|
||||
checkFlags =
|
||||
let
|
||||
skippedTests = [
|
||||
# --- FAIL: TestConfigSchemaKeysMatchConstants (0.00s)
|
||||
# schema_keys_test.go:25:
|
||||
# Error Trace: github.com/ory/talos/internal/configschema/schema_keys_test.go:125
|
||||
# github.com/ory/talos/internal/configschema/schema_keys_test.go:25
|
||||
# Error: Received unexpected error:
|
||||
# open github.com/ory/talos/internal/config/keys.go: no such file or directory
|
||||
# Test: TestConfigSchemaKeysMatchConstants
|
||||
"TestConfigSchemaKeysMatchConstants"
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd talos \
|
||||
--bash <($out/bin/talos completion bash) \
|
||||
--fish <($out/bin/talos completion fish) \
|
||||
--zsh <($out/bin/talos completion zsh)
|
||||
'';
|
||||
meta = {
|
||||
description = "Server for issuing, verifying, and managing API keys";
|
||||
longDescription = ''
|
||||
It follows [cloud architecture best practices](https://www.ory.com/docs/ecosystem/software-architecture-philosophy) and focuses on:
|
||||
|
||||
- Issuing, verifying, and revoking API keys at scale
|
||||
- Importing externally-issued API keys for unified verification
|
||||
- Deriving short-lived JWT and macaroon tokens from long-lived keys
|
||||
- Side-car deployment for fast API key verification
|
||||
- Low-latency verification with caching and eventual revocation
|
||||
- Predictable operations through structured logging, metrics, and tracing
|
||||
'';
|
||||
homepage = "https://github.com/ory/talos";
|
||||
changelog = "https://github.com/ory/talos/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
sourceProvenance = [
|
||||
lib.sourceTypes.fromSource
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
debtquity
|
||||
];
|
||||
mainProgram = "talos";
|
||||
};
|
||||
})
|
||||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "oui";
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thatmattlove";
|
||||
repo = "oui";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-fNG20pryfs6bDjeexpf8UlevHatY6zdvGCHSFrfz8io=";
|
||||
hash = "sha256-lwjDFd2rxMh7kHOuwgIeA2/gnzHoNkGKTQGd/xqshZY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EOu9imj0YwYhHX7ZzE9BzhkoDitC5AHjlwoWmQs0Rj4=";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
From 366607d5e2bc8a7e067105f1c0d0e6c2c235c131 Mon Sep 17 00:00:00 2001
|
||||
From: Philip Taron <philip.taron@gmail.com>
|
||||
Date: Mon, 29 Jun 2026 10:04:36 -0700
|
||||
Subject: [PATCH] main: handle --version/--help before loading the Lua config
|
||||
|
||||
main() loads the Lua configuration before parsing arguments, and the
|
||||
loader exits when no config file exists. That makes `pkgit --version`
|
||||
and `pkgit --help` fail on a fresh install. Answer those informational
|
||||
flags first so they work without a config.
|
||||
---
|
||||
src/main.c | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index 9010d3e..4c45b8a 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -1,4 +1,5 @@
|
||||
#include <stdio.h>
|
||||
+#include <string.h>
|
||||
|
||||
#include "cla_parse.h"
|
||||
#include "lua_state.h"
|
||||
@@ -7,6 +8,18 @@
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
init_vars();
|
||||
+
|
||||
+ /* Respond to informational flags before loading the Lua config, which aborts
|
||||
+ when no config file (~/.config/pkgit/init.lua) exists. This keeps
|
||||
+ `pkgit --version` and `pkgit --help` usable on a fresh install. */
|
||||
+ for (int i = 1; i < argc; i++) {
|
||||
+ if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version") ||
|
||||
+ !strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) {
|
||||
+ cla_parse(argc, argv);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
init_lua_state();
|
||||
setup_pkgit();
|
||||
cache_repos();
|
||||
--
|
||||
2.54.0
|
||||
|
||||
66
pkgs/by-name/pk/pkgit/package.nix
Normal file
66
pkgs/by-name/pk/pkgit/package.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
pkg-config,
|
||||
luajit,
|
||||
git,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pkgit";
|
||||
version = "1.1.3";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.symlinx.net/pkgit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-xGrhkVA5H/expArfUbfJ8p1odUAeJiL/vbsPedd92EE=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
patches = [
|
||||
# main() loads the Lua config (which requires ~/.config/pkgit/init.lua)
|
||||
# before parsing arguments, so `pkgit --version` and `--help` abort without
|
||||
# a config. Answer those informational flags first so they work standalone
|
||||
# and can be used by versionCheckHook.
|
||||
./0001-main-handle-version-help-before-loading-the-Lua-config.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [ luajit ];
|
||||
|
||||
# The Makefile defaults CC to clang via `?=`; stdenv exports CC, which wins.
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# pkgit shells out to git at runtime (src/fetch_git.c execvp's "git").
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/pkgit \
|
||||
--prefix PATH : ${lib.makeBinPath [ git ]}
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Unconventional package manager that compiles and installs packages directly from Git repositories";
|
||||
homepage = "https://git.symlinx.net/pkgit";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ Ra77a3l3-jar ];
|
||||
mainProgram = "pkgit";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule {
|
||||
pname = "pkgsite";
|
||||
version = "0.2.0-unstable-2026-06-18";
|
||||
version = "0.2.0-unstable-2026-06-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "pkgsite";
|
||||
rev = "78ee7d155e76c298e91b46983873b8dff09e8bb6";
|
||||
hash = "sha256-0cPo7MrRNT8W0E6hyLy6WzB0hfv7OqDhz92UtJPLY34=";
|
||||
rev = "60f10bf3d57b68dccf4e1dfd573a72ec8db114d5";
|
||||
hash = "sha256-9jS1eXl1Mg/YwCVSZmpePHcwRKuiGXYOiDmNALRLmyY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pamVUaMpkNVGY9tWPHsIiqflthzwELFOxgn90ncor/U=";
|
||||
|
|
|
|||
|
|
@ -204,6 +204,6 @@ buildGoModule (finalAttrs: {
|
|||
license = lib.licenses.asl20;
|
||||
teams = [ lib.teams.podman ];
|
||||
mainProgram = "podman";
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
Submodule blocks contains modified content
|
||||
diff --git a/blocks/file/BinaryFileSink.cpp b/blocks/file/BinaryFileSink.cpp
|
||||
index 31c9a41..0083b0d 100644
|
||||
--- a/blocks/file/BinaryFileSink.cpp
|
||||
+++ b/blocks/file/BinaryFileSink.cpp
|
||||
@@ -13,6 +13,7 @@
|
||||
#endif //_MSC_VER
|
||||
#include <stdio.h>
|
||||
#include <cerrno>
|
||||
+#include <cstring>
|
||||
|
||||
#ifndef O_BINARY
|
||||
#define O_BINARY 0
|
||||
diff --git a/blocks/file/BinaryFileSource.cpp b/blocks/file/BinaryFileSource.cpp
|
||||
index 0151231..379d383 100644
|
||||
--- a/blocks/file/BinaryFileSource.cpp
|
||||
+++ b/blocks/file/BinaryFileSource.cpp
|
||||
@@ -13,6 +13,7 @@
|
||||
#endif //_MSC_VER
|
||||
#include <stdio.h>
|
||||
#include <cerrno>
|
||||
+#include <cstring>
|
||||
|
||||
#ifndef O_BINARY
|
||||
#define O_BINARY 0
|
||||
diff --git a/blocks/file/TextFileSink.cpp b/blocks/file/TextFileSink.cpp
|
||||
index b4b2f08..2be66e2 100644
|
||||
--- a/blocks/file/TextFileSink.cpp
|
||||
+++ b/blocks/file/TextFileSink.cpp
|
||||
@@ -6,6 +6,7 @@
|
||||
#include <complex>
|
||||
#include <fstream>
|
||||
#include <cerrno>
|
||||
+#include <cstring>
|
||||
|
||||
/***********************************************************************
|
||||
* |PothosDoc Text File Sink
|
||||
Submodule soapy contains modified content
|
||||
diff --git a/soapy/DemoController.cpp b/soapy/DemoController.cpp
|
||||
index 4ce8ead..9a4e742 100644
|
||||
--- a/soapy/DemoController.cpp
|
||||
+++ b/soapy/DemoController.cpp
|
||||
@@ -6,6 +6,7 @@
|
||||
#include <iostream>
|
||||
#include <chrono>
|
||||
#include <algorithm> //min/max
|
||||
+#include <cstring>
|
||||
|
||||
/***********************************************************************
|
||||
* |PothosDoc SDR Demo Controller
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue