Merge branch 'staging-next' into staging
This commit is contained in:
@@ -293,11 +293,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
||||
/nixos/modules/services/backup/mysql-backup.nix @6543
|
||||
|
||||
# Hardened profile & related modules
|
||||
/nixos/modules/profiles/hardened.nix @joachifm
|
||||
/nixos/modules/security/lock-kernel-modules.nix @joachifm
|
||||
/nixos/modules/security/misc.nix @joachifm
|
||||
/nixos/tests/hardened.nix @joachifm
|
||||
/pkgs/os-specific/linux/kernel/hardened/ @fabianhjr @joachifm
|
||||
/pkgs/os-specific/linux/kernel/hardened/ @fabianhjr
|
||||
|
||||
# Home Automation
|
||||
/nixos/modules/services/home-automation/home-assistant.nix @mweinelt
|
||||
|
||||
@@ -5201,12 +5201,6 @@
|
||||
githubId = 27779510;
|
||||
keys = [ { fingerprint = "FDF5 EF67 8CC1 FE22 1845 6A22 CF7B BB5B C756 1BD3"; } ];
|
||||
};
|
||||
codyopel = {
|
||||
email = "codyopel@gmail.com";
|
||||
github = "codyopel";
|
||||
githubId = 5561189;
|
||||
name = "Cody Opel";
|
||||
};
|
||||
coffeeispower = {
|
||||
email = "tiagodinis33@proton.me";
|
||||
github = "coffeeispower";
|
||||
@@ -12616,12 +12610,6 @@
|
||||
githubId = 26695750;
|
||||
name = "Joakim Holm";
|
||||
};
|
||||
joachifm = {
|
||||
email = "joachifm@fastmail.fm";
|
||||
github = "joachifm";
|
||||
githubId = 41977;
|
||||
name = "Joachim Fasting";
|
||||
};
|
||||
joachimschmidt557 = {
|
||||
email = "joachim.schmidt557@outlook.com";
|
||||
github = "joachimschmidt557";
|
||||
@@ -24908,6 +24896,12 @@
|
||||
github = "Skyb0rg007";
|
||||
githubId = 30806179;
|
||||
};
|
||||
skyethepinkcat = {
|
||||
name = "Skye Jonke";
|
||||
email = "skye@skyenet.online";
|
||||
github = "skyethepinkcat";
|
||||
githubId = 29717600;
|
||||
};
|
||||
skykanin = {
|
||||
github = "skykanin";
|
||||
githubId = 3789764;
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
|
||||
- [PdfDing](https://www.pdfding.com/), manage, view and edit your PDFs seamlessly on all your devices wherever you are. Available as [services.pdfding](#opt-services.pdfding.enable).
|
||||
|
||||
- [mangowc](https://github.com/DreamMaoMao/mangowc), a lightweight and feature-rich Wayland compositor based on dwl. Available as [programs.mangowc](#opt-programs.mangowc.enable).
|
||||
|
||||
- [reaction](https://reaction.ppom.me/), a daemon that scans program outputs for repeated patterns, and takes action. A common usage is to scan ssh and webserver logs, and to ban hosts that cause multiple authentication errors. A modern alternative to fail2ban. Available as [services.reaction](#opt-services.reaction.enable).
|
||||
|
||||
- [rqbit](https://github.com/ikatson/rqbit), a bittorrent client written in Rust. It has HTTP API and Web UI, and can be used as a library. Available as [services.rqbit](#opt-services.rqbit.enable).
|
||||
|
||||
@@ -93,7 +93,7 @@ in
|
||||
|
||||
{
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.joachifm ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
options = {
|
||||
|
||||
@@ -349,6 +349,7 @@
|
||||
./programs/wayland/hyprland.nix
|
||||
./programs/wayland/hyprlock.nix
|
||||
./programs/wayland/labwc.nix
|
||||
./programs/wayland/mangowc.nix
|
||||
./programs/wayland/miracle-wm.nix
|
||||
./programs/wayland/niri.nix
|
||||
./programs/wayland/river.nix
|
||||
|
||||
@@ -29,7 +29,6 @@ in
|
||||
config = mkIf config.profiles.hardened {
|
||||
meta = {
|
||||
maintainers = [
|
||||
maintainers.joachifm
|
||||
maintainers.emily
|
||||
];
|
||||
};
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.joachifm ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
options = {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.joachifm ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
imports = [
|
||||
|
||||
@@ -212,6 +212,10 @@ in
|
||||
++ lib.optional config.services.pipewire.pulse.enable plasma-pa
|
||||
++ lib.optional config.powerManagement.enable powerdevil
|
||||
++ lib.optional config.services.printing.enable print-manager
|
||||
++ lib.optionals config.hardware.sane.enable [
|
||||
skanlite
|
||||
skanpage
|
||||
]
|
||||
++ lib.optional config.services.colord.enable colord-kde
|
||||
++ lib.optional config.services.hardware.bolt.enable plasma-thunderbolt
|
||||
++ lib.optional config.services.samba.enable kdenetwork-filesharing
|
||||
|
||||
@@ -724,8 +724,7 @@ in
|
||||
serviceConfig = {
|
||||
ExecStartPre = [
|
||||
(pkgs.writeShellScript "frigate-clear-cache" ''
|
||||
shopt -s extglob
|
||||
rm --recursive --force /var/cache/frigate/!(model_cache)
|
||||
${lib.getExe pkgs.findutils} /var/cache/frigate -not -path '/var/cache/frigate/model_cache/*' -type f -delete
|
||||
'')
|
||||
(pkgs.writeShellScript "frigate-create-writable-config" ''
|
||||
cp --no-preserve=mode ${configFile} /run/frigate/frigate.yml
|
||||
|
||||
@@ -4,7 +4,7 @@ let
|
||||
in
|
||||
{
|
||||
name = "dnscrypt-proxy";
|
||||
meta.maintainers = with lib.maintainers; [ joachifm ];
|
||||
meta.maintainers = [ ];
|
||||
|
||||
nodes = {
|
||||
# A client running the recommended setup: DNSCrypt proxy as a forwarder
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
name = "hardened";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ joachifm ];
|
||||
meta = {
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "tor";
|
||||
meta.maintainers = with lib.maintainers; [ joachifm ];
|
||||
meta.maintainers = [ ];
|
||||
|
||||
nodes.client =
|
||||
{ pkgs, ... }:
|
||||
|
||||
@@ -3936,6 +3936,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
d2-vim = buildVimPlugin {
|
||||
pname = "d2-vim";
|
||||
version = "0-unstable-2025-08-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "terrastruct";
|
||||
repo = "d2-vim";
|
||||
rev = "cb3eb7fcb1a2d45c4304bf2e91077d787b724a39";
|
||||
hash = "sha256-HmDQfOIoSV93wqRe7O4FPuHEmAxwoP1+Ut+sKhB62jA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/terrastruct/d2-vim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
dailies-nvim = buildVimPlugin {
|
||||
pname = "dailies.nvim";
|
||||
version = "0-unstable-2025-04-21";
|
||||
|
||||
@@ -301,6 +301,7 @@ https://github.com/ctrlpvim/ctrlp.vim/,,
|
||||
https://github.com/gbprod/cutlass.nvim/,HEAD,
|
||||
https://github.com/scottmckendry/cyberdream.nvim/,,
|
||||
https://github.com/ghillb/cybu.nvim/,,
|
||||
https://github.com/terrastruct/d2-vim/,HEAD,
|
||||
https://github.com/JachymPutta/dailies.nvim/,HEAD,
|
||||
https://github.com/Koalhack/darcubox-nvim/,HEAD,
|
||||
https://github.com/ptdewey/darkearth-nvim/,HEAD,
|
||||
|
||||
@@ -169,7 +169,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
joachifm
|
||||
np
|
||||
prusnak
|
||||
];
|
||||
|
||||
@@ -155,13 +155,13 @@
|
||||
"vendorHash": "sha256-iEQdSvQOCwvxhqh+veQ59uDVoXjCxsysxzkF4DHAf1E="
|
||||
},
|
||||
"checkly_checkly": {
|
||||
"hash": "sha256-EAYf/8mKsR18F4XSEaZCDoydq4VPH7xmDhEOHo26J70=",
|
||||
"hash": "sha256-L0S/j+Rp3hOr7zKtP8P7zUk42/igdcJSwFxvMiPfKEc=",
|
||||
"homepage": "https://registry.terraform.io/providers/checkly/checkly",
|
||||
"owner": "checkly",
|
||||
"repo": "terraform-provider-checkly",
|
||||
"rev": "v1.17.2",
|
||||
"rev": "v1.18.0",
|
||||
"spdx": null,
|
||||
"vendorHash": "sha256-QOBjpG2pv9ngzslBIac15aWh21o1ctkM6ODC36H8bXU="
|
||||
"vendorHash": "sha256-RCvHX9AVCL/dRuNeIbFL4jLKUbj8ombGBJZHvHiKdq0="
|
||||
},
|
||||
"ciscodevnet_aci": {
|
||||
"hash": "sha256-MxcHtbuU2tMJpF8seEDqmsnamm58Lugi3Hw+l9wAcOU=",
|
||||
@@ -310,11 +310,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"digitalocean_digitalocean": {
|
||||
"hash": "sha256-mC1n28i5767fdyG2g4687G+x2pT94PN+pe3xjs7pMNE=",
|
||||
"hash": "sha256-6zKZPB8W4YtY67cbeuFQRnax/5NpCq5tKNw4JFkAJjU=",
|
||||
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
|
||||
"owner": "digitalocean",
|
||||
"repo": "terraform-provider-digitalocean",
|
||||
"rev": "v2.75.0",
|
||||
"rev": "v2.76.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -517,11 +517,11 @@
|
||||
"vendorHash": "sha256-udGQHfLQ/gc73ZhbO7Wko5MUhkeFpIvSGCDgPkYAG38="
|
||||
},
|
||||
"hashicorp_azuread": {
|
||||
"hash": "sha256-ATYOrBmZP9LximrS5KpfktU/kfW08XWShxE4z+x6Sts=",
|
||||
"hash": "sha256-BkQwLkGu8Xmb4laoXOLDbSPyya5v8HBBNIya5hUBlV8=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azuread",
|
||||
"rev": "v3.7.0",
|
||||
"rev": "v3.8.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -616,13 +616,13 @@
|
||||
"vendorHash": "sha256-IDsGPzNsVPIHWEyhfIkaNaPOrhnk/4XI1UsrIPwcq/M="
|
||||
},
|
||||
"hashicorp_local": {
|
||||
"hash": "sha256-TyMNKLfw40LVIifw9iJ1ZAIZ/Ba9NI1whi/uaEIoIt4=",
|
||||
"hash": "sha256-DMYj2hPASzMDtVZNWcUyzMlGfTw1J/bp19tZUl3bjic=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/local",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-local",
|
||||
"rev": "v2.6.2",
|
||||
"rev": "v2.7.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-FHhdCM0bg61OW5+dIFLUlxC85HpPSfvHxkL2Qz/AYeY="
|
||||
"vendorHash": "sha256-UOT5dxWa3PAzEHKXKYFadh9KWJ2ZKfN5uyFB3tyvHAY="
|
||||
},
|
||||
"hashicorp_nomad": {
|
||||
"hash": "sha256-lTO1ZLB0N+WLdMDegIP1NcAC++/vsBV7EB5BDxj588I=",
|
||||
|
||||
+2
-2
@@ -18,7 +18,7 @@
|
||||
xxHash,
|
||||
ffmpeg_6,
|
||||
protobuf,
|
||||
openalSoft,
|
||||
openal-soft,
|
||||
minizip,
|
||||
range-v3,
|
||||
tl-expected,
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lz4
|
||||
xxHash
|
||||
ffmpeg_6
|
||||
openalSoft
|
||||
openal-soft
|
||||
minizip
|
||||
range-v3
|
||||
tl-expected
|
||||
|
||||
@@ -112,9 +112,9 @@
|
||||
"ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors
|
||||
];
|
||||
|
||||
# See https://download.kde.org/ls-lR.mirrorlist
|
||||
kde = [
|
||||
"https://download.kde.org/"
|
||||
"https://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/"
|
||||
];
|
||||
|
||||
# kernel.org's /pub (/pub/{linux,software}) tree
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "altdns";
|
||||
version = "1.0.2-unstable-2021-09-09";
|
||||
pyproject = true;
|
||||
@@ -18,11 +18,11 @@ python3.pkgs.buildPythonApplication {
|
||||
|
||||
pythonRemoveDeps = [ "argparse" ];
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
dependencies = with python3Packages; [
|
||||
dnspython
|
||||
termcolor
|
||||
tldextract
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "anubis";
|
||||
version = "1.24.0";
|
||||
version = "1.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TecharoHQ";
|
||||
repo = "anubis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CZpQT3Uu0TNC4ra9f+OZWfovOJ+xFyumomETc10fOGA=";
|
||||
hash = "sha256-9/XIwSMEmnS3L/Wzg6ABso7R6W3TYkJomC8aFMycxZo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9CMD8Rn4q8b+hyrph+BqqS32ijZyJRNsop6ML7z5Zuk=";
|
||||
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "anubis-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-wozZu00ir7V3mO6BLBamaxhI5fTdWgXQK+xGvr3T1gU=";
|
||||
hash = "sha256-2U91Dt+ymspjYgTtgCjahCNr6fIs85TT/k+I8M2aC9s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "asmjit";
|
||||
version = "0-unstable-2026-02-10";
|
||||
version = "0-unstable-2026-02-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asmjit";
|
||||
repo = "asmjit";
|
||||
rev = "5fe1940275d04432da841896bac0a66cc2375551";
|
||||
hash = "sha256-Oj8VP9rJXHQYP3aV8sm+XbyHXLvmC+7e+OGy5YQqFzQ=";
|
||||
rev = "64a88ed1d8abb2e2b17a938a5ce7c1b66dabb695";
|
||||
hash = "sha256-NC0V5KsYNyJ/hrgAkz6oTCwQmZ8eCWNSOUl+dyTKfJk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://augeas.net/";
|
||||
changelog = "https://github.com/hercules-team/augeas/releases/tag/release-${finalAttrs.version}";
|
||||
mainProgram = "augtool";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ skyethepinkcat ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -61,7 +61,7 @@ let
|
||||
libv4l
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit version;
|
||||
|
||||
pname = "bisq2";
|
||||
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||
export GNUPGHOME=./gnupg
|
||||
mkdir -m 700 -p $GNUPGHOME
|
||||
ln -s $downloadedFile ./Bisq-${version}.deb
|
||||
ln -s ${signature} ./signature.asc
|
||||
ln -s ${finalAttrs.signature} ./signature.asc
|
||||
gpg --import ${publicKey."E222AA02"}
|
||||
gpg --import ${publicKey."387C8307"}
|
||||
gpg --batch --verify signature.asc Bisq-${version}.deb
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.49",
|
||||
"version": "2.1.50",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@anthropic-ai/claude-code",
|
||||
"version": "2.1.49",
|
||||
"version": "2.1.50",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "claude-code";
|
||||
version = "2.1.49";
|
||||
version = "2.1.50";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-7Mjg22FlhuRothua5rj06aKjlnCScrO0jcE74HBiLLs=";
|
||||
hash = "sha256-pSPZzbLhFsE8zwlp+CHB5MqS1gT3CeIlkoAtswmxCZs=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-1xegdmwpBi4ODxfo0jsNE57XuogUPCyjTApodOq3zUA=";
|
||||
npmDepsHash = "sha256-/oQxdQjMVS8r7e1DUPEjhWOLOD/hhVCx8gjEWb3ipZQ=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
+4
-4
@@ -5,7 +5,7 @@
|
||||
cmake,
|
||||
pkg-config,
|
||||
udev,
|
||||
protobuf,
|
||||
protobuf_21,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -15,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "jketterl";
|
||||
repo = "codecserver";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-JzaVBFl3JsFNDm4gy1qOKA9uAjUjNeMiI39l5gfH0aE=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-JzaVBFl3JsFNDm4gy1qOKA9uAjUjNeMiI39l5gfH0aE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
udev
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ protobuf ];
|
||||
propagatedBuildInputs = [ protobuf_21 ];
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace "$out"/lib/pkgconfig/codecserver.pc \
|
||||
@@ -9,18 +9,18 @@
|
||||
}:
|
||||
|
||||
let
|
||||
commitHash = "be318748da098346a52133c0f7d4a4104a56efc5"; # matches tag release
|
||||
commitHash = "42a6ce343e0ae13bd2e2c1dabbefafdd362c78a3"; # matches tag release
|
||||
shortCommitHash = builtins.substring 0 7 commitHash;
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "copywrite";
|
||||
version = "0.24.0";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "copywrite";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gw5i50fHshyRrSU3/M4HWM/J82HawGXPHHg9nKIRBkQ=";
|
||||
hash = "sha256-ZIzFDQkqHNyU/ylGtuiDnenfAf1HbriEBvmxFGolH74=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-607qlAhrk+1SdrIeE9eYBW3qJKq9i7hEzObvKH66Dfk=";
|
||||
|
||||
@@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
homepage = "http://cppcheck.sourceforge.net";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ joachifm ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -41,7 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/svend/cuetools";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
codyopel
|
||||
jcumming
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dsearch";
|
||||
version = "0.1.2";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AvengeMedia";
|
||||
repo = "danksearch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mpXrzf2Dv0erDBUUeCAo+AtLQWcnqBhLfyisGopNiYo=";
|
||||
hash = "sha256-2o4oJgATtrhHUihmQlFhZBhx8qXFnxsgiXzfGairHhQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PNWwTurmpn1Vj8Q5jFQFHGOEYCEQwpgGNGxtil10um8=";
|
||||
vendorHash = "sha256-cBBfIil7IYAXlQN8OyoJwsNxyYC0pruloaJrZZGovU4=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@@ -17,16 +17,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.301.0";
|
||||
version = "0.301.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-ns6Kl0sN8GeF0Br7HrRLdVmKaGMqT3Y5REuH9UJg+Yg=";
|
||||
hash = "sha256-qs4jtqOn2Kjj6dL5qGBI5jQyt/VeZYGexYNtgV2mnCs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LGTT7WxBlWA4pCunvFDpsqDkUhTN96PohBKTLAffr0o=";
|
||||
vendorHash = "sha256-Wxu535IGvHD09/ZIn+Ky9pwsysi788+HN4WIsETMdyc=";
|
||||
|
||||
commonMeta = {
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Open source MPEG-4 and MPEG-2 AAC encoder";
|
||||
homepage = "https://github.com/knik0/faac";
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
maintainers = with lib.maintainers; [ codyopel ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Open source MPEG-4 and MPEG-2 AAC decoder";
|
||||
homepage = "https://sourceforge.net/projects/faac/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ codyopel ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "faad";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "faugus-launcher";
|
||||
version = "1.14.3";
|
||||
version = "1.15.1";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Faugus";
|
||||
repo = "faugus-launcher";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-etPG5142YMWyHhn2wd/t4fPSW2oonp8qoY7aPAim/LI=";
|
||||
hash = "sha256-bqXmYR1+Df2JXR5SUtFMSo9J3/54lQ1f40KotsJ/vuQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "High-quality implementation of the AAC codec from Android";
|
||||
homepage = "https://sourceforge.net/projects/opencore-amr/";
|
||||
license = lib.licenses.fraunhofer-fdk;
|
||||
maintainers = with lib.maintainers; [ codyopel ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
+3
-2
@@ -9,7 +9,8 @@
|
||||
libjack2,
|
||||
libsigcxx,
|
||||
libxml2,
|
||||
wxGTK,
|
||||
wxGTK32,
|
||||
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -33,7 +34,7 @@ stdenv.mkDerivation {
|
||||
libjack2
|
||||
libsigcxx
|
||||
libxml2
|
||||
wxGTK
|
||||
wxGTK32
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
@@ -0,0 +1,19 @@
|
||||
Disable the SimplifedLayerNormFusion optimization for onnxruntime embedding
|
||||
models to prevent a crash when using FP16 models (like jinna-clip-v1) with newer
|
||||
onnxruntime versions.
|
||||
|
||||
https://github.com/microsoft/onnxruntime/issues/26717#issuecomment-3800462654
|
||||
|
||||
|
||||
diff --git a/frigate/embeddings/onnx/runner.py b/frigate/embeddings/onnx/runner.py
|
||||
index c34c97a8d..dca91daae 100644
|
||||
--- a/frigate/embeddings/onnx/runner.py
|
||||
+++ b/frigate/embeddings/onnx/runner.py
|
||||
@@ -52,6 +52,7 @@ class ONNXModelRunner:
|
||||
model_path,
|
||||
providers=providers,
|
||||
provider_options=options,
|
||||
+ disabled_optimizers=["SimplifiedLayerNormFusion"],
|
||||
)
|
||||
|
||||
def get_input_names(self) -> list[str]:
|
||||
@@ -84,6 +84,7 @@ python3Packages.buildPythonApplication rec {
|
||||
hash = "sha256-1+n0n0yCtjfAHkXzsZdIF0iCVdPGmsG7l8/VTqBVEjU=";
|
||||
})
|
||||
./ffmpeg.patch
|
||||
# https://github.com/blakeblackshear/frigate/pull/21876
|
||||
./ai-edge-litert.patch
|
||||
(fetchpatch {
|
||||
# peewee-migrate 0.14.x compat
|
||||
@@ -95,6 +96,10 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
hash = "sha256-RrmwjE4SHJIUOYfqcCtMy9Pht7UXhHcoAZlFQv9aQFw=";
|
||||
})
|
||||
# https://github.com/microsoft/onnxruntime/issues/26717
|
||||
./onnxruntime-compat.patch
|
||||
# https://github.com/blakeblackshear/frigate/pull/22089
|
||||
./proc-cmdline-strip.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
Strip trailing whitespace from process commandlines. This is annoying for exact
|
||||
process matches against Prometheus labels.
|
||||
|
||||
https://github.com/blakeblackshear/frigate/pull/22089
|
||||
|
||||
diff --git a/frigate/util/services.py b/frigate/util/services.py
|
||||
index b31a7eea3..f1e8f0f5f 100644
|
||||
--- a/frigate/util/services.py
|
||||
+++ b/frigate/util/services.py
|
||||
@@ -118,7 +118,7 @@ def get_cpu_stats() -> dict[str, dict]:
|
||||
pid = str(process.info["pid"])
|
||||
try:
|
||||
cpu_percent = process.info["cpu_percent"]
|
||||
- cmdline = process.info["cmdline"]
|
||||
+ cmdline = " ".join(process.info["cmdline"]).rstrip()
|
||||
|
||||
with open(f"/proc/{pid}/stat", "r") as f:
|
||||
stats = f.readline().split()
|
||||
@@ -152,7 +152,7 @@ def get_cpu_stats() -> dict[str, dict]:
|
||||
"cpu": str(cpu_percent),
|
||||
"cpu_average": str(round(cpu_average_usage, 2)),
|
||||
"mem": f"{mem_pct}",
|
||||
- "cmdline": clean_camera_user_pass(" ".join(cmdline)),
|
||||
+ "cmdline": clean_camera_user_pass(cmdline),
|
||||
}
|
||||
except Exception:
|
||||
continue
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gh";
|
||||
version = "2.86.0";
|
||||
version = "2.87.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+MPhDgXIVfYGp5ALI5GjRoeLRRUtNgpzUawxoqR76iE=";
|
||||
hash = "sha256-QPQVsdZy17rNX5ACoKHiJG+f/2CAiBfO3B1ucton0tw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pBHEqMgEoR3sWNbQjGBNso7WLP9Rz2gu89Bzu+7jz5c=";
|
||||
vendorHash = "sha256-POrm4lHEO2Eti7dbohKBwXW+DTs22EUZX+tMNUCL3lg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -60,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
thoughtpolice
|
||||
joachifm
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
useLLD ? stdenv.hostPlatform.isArmv7,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "grafana-alloy";
|
||||
version = "1.12.2";
|
||||
src = fetchFromGitHub {
|
||||
@@ -32,10 +32,10 @@ buildGoModule (finalAttrs: rec {
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
pname = "alloy-frontend";
|
||||
inherit version src;
|
||||
inherit (finalAttrs) version src;
|
||||
|
||||
inherit npmDeps;
|
||||
sourceRoot = "${src.name}/internal/web/ui";
|
||||
inherit (finalAttrs) npmDeps;
|
||||
sourceRoot = "${finalAttrs.src.name}/internal/web/ui";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@@ -88,7 +88,7 @@ buildGoModule (finalAttrs: rec {
|
||||
|
||||
patchPhase = ''
|
||||
# Copy frontend build in
|
||||
cp -va "${frontend}/share" "internal/web/ui/dist"
|
||||
cp -va "${finalAttrs.frontend}/share" "internal/web/ui/dist"
|
||||
'';
|
||||
|
||||
subPackages = [
|
||||
@@ -135,7 +135,7 @@ buildGoModule (finalAttrs: rec {
|
||||
];
|
||||
};
|
||||
# for nix-update to be able to find and update the hash
|
||||
inherit npmDeps;
|
||||
inherit (finalAttrs) npmDeps;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -63,7 +63,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.quut.com/gsm/";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [
|
||||
codyopel
|
||||
raskin
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
curl,
|
||||
eigen,
|
||||
faust,
|
||||
fftw,
|
||||
fftwSinglePrec,
|
||||
gettext,
|
||||
glib,
|
||||
glib-networking,
|
||||
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
curl
|
||||
eigen
|
||||
faust
|
||||
fftw
|
||||
fftwSinglePrec
|
||||
glib
|
||||
glib-networking.out
|
||||
glibmm
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "haven";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitvora";
|
||||
repo = "haven";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2947XUAppZ3DLA5A4U6D/4O9pZQfCsPxjRn/4iHkrCg=";
|
||||
hash = "sha256-1rGOZVzlzijyxqjAnp2uvxy9KPr3uuRD8+48x38lQwg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kcy18MDwb4pPwtJmHi7Riw9/+Rs47VrVIIXKbfnv1DI=";
|
||||
vendorHash = "sha256-VXx6uoOUKk/BkjDS3Ykf/0Xc2mUPm8dgyRArIb2I8X4=";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/haven
|
||||
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
|
||||
mainProgram = "hugs";
|
||||
homepage = "https://www.haskell.org/hugs";
|
||||
description = "Haskell interpreter";
|
||||
maintainers = with lib.maintainers; [ joachifm ];
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
cacert,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hydra-check";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "hydra-check";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rOqLAI0r11Tfi6crKAxnj/HHBgUKcCGb4MCdxqLv4uE=";
|
||||
};
|
||||
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "hydrus";
|
||||
version = "659";
|
||||
version = "660";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mrZQnMIM6r2RA1+RRIP42J0OPS6uYzu+87J1eMjBeXM=";
|
||||
hash = "sha256-nIXzSwdf/9Pd2mQoFYzttYvmUOFhytYQSEmIkFdaKTY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -32,13 +32,13 @@
|
||||
libxcb,
|
||||
zlib,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ida-free";
|
||||
version = "9.2";
|
||||
|
||||
src = requireFile {
|
||||
name = "ida-free-pc_${lib.replaceStrings [ "." ] [ "" ] version}_x64linux.run";
|
||||
url = "https://my.hex-rays.com/dashboard/download-center/installers/release/${version}/ida-free";
|
||||
name = "ida-free-pc_${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}_x64linux.run";
|
||||
url = "https://my.hex-rays.com/dashboard/download-center/installers/release/${finalAttrs.version}/ida-free";
|
||||
hash = "sha256-CQm9phkqLXhht4UQxooKmhmiGuW3lV8RIJuDrm52aNw=";
|
||||
};
|
||||
|
||||
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: rec {
|
||||
libxcb-cursor
|
||||
zlib
|
||||
];
|
||||
buildInputs = runtimeDependencies;
|
||||
buildInputs = finalAttrs.runtimeDependencies;
|
||||
|
||||
# IDA comes with its own Qt6, some dependencies are missing in the installer.
|
||||
autoPatchelfIgnoreMissingDeps = [
|
||||
|
||||
@@ -9,15 +9,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "jsonschema-cli";
|
||||
version = "0.42.0";
|
||||
version = "0.42.1";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "jsonschema-cli";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-L8eCLNpkoLBvGhynYJ47/cG60mDpXKbk+/nbmjeYhQM=";
|
||||
hash = "sha256-tjjgj0PHb1vNe07yNgeU1vC9OiCwcjJ8dyt9k0tRZwY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-WDCNPYQDOmtltsodOZISsDfCyitxfURytUSpvWU8ehE=";
|
||||
cargoHash = "sha256-r/Yc6PX1wT2hpGxqisrIcoVF/dZmafCJ244l8KiMXT0=";
|
||||
|
||||
preCheck = ''
|
||||
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
|
||||
|
||||
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "High quality MPEG Audio Layer III (MP3) encoder";
|
||||
homepage = "http://lame.sourceforge.net";
|
||||
license = lib.licenses.lgpl2;
|
||||
maintainers = with lib.maintainers; [ codyopel ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "lame";
|
||||
};
|
||||
|
||||
@@ -54,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/libass/libass";
|
||||
license = lib.licenses.isc;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ codyopel ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libgdstk";
|
||||
version = "0.9.62";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "heitzmann";
|
||||
repo = "gdstk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NHz9PQMmOnJt09FDwLzy5t9hVbZrJ6Lf19iPYOB5B2A=";
|
||||
hash = "sha256-YDTtjHhc3mXDWj6Tg9ud1h95g2sQ9no1RLd0/cKJxEU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
|
||||
# nativeBuildInputs
|
||||
makeWrapper,
|
||||
@@ -65,8 +66,13 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
cp -r librelane/scripts $out/${python3Packages.python.sitePackages}/librelane/
|
||||
cp -r librelane/examples $out/${python3Packages.python.sitePackages}/librelane/
|
||||
# Create the site-packages subdirectory for librelane
|
||||
dest="$out/${python3Packages.python.sitePackages}/librelane"
|
||||
mkdir -p "$dest"
|
||||
|
||||
# Copy scripts and examples from the source into the installation
|
||||
cp -r librelane/scripts "$dest/"
|
||||
cp -r librelane/examples "$dest/"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
@@ -86,6 +92,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "ASIC implementation flow infrastructure";
|
||||
homepage = "https://github.com/librelane/librelane";
|
||||
|
||||
@@ -44,8 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "C/C++ implementation of a Sass compiler";
|
||||
homepage = "https://github.com/sass/libsass";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
codyopel
|
||||
maintainers = [
|
||||
];
|
||||
pkgConfigModules = [ "libsass" ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/rakshasa/libtorrent";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
codyopel
|
||||
thiagokokada
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -267,7 +267,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://www.webmproject.org/";
|
||||
changelog = "https://github.com/webmproject/libvpx/raw/v${finalAttrs.version}/CHANGELOG";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ codyopel ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -54,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Utility for viewing/manipulating the MAC address of network interfaces";
|
||||
maintainers = with lib.maintainers; [
|
||||
joachifm
|
||||
dotlambda
|
||||
];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
@@ -66,13 +66,13 @@ let
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
});
|
||||
streamvbyte = stdenv.mkDerivation (finalAttrs: rec {
|
||||
streamvbyte = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "streamvbyte";
|
||||
version = "efdd9dace81a4a8f844267631879b500c6d913cf"; # see SVB_GITHUB in columnar's cmake/GetStreamvbyte.cmake
|
||||
src = fetchFromGitHub {
|
||||
owner = "manticoresoftware";
|
||||
repo = "streamvbyte";
|
||||
rev = version;
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-a9E1aWBY/P7wI+kgHqhEiD3THctFfeFcy658RcNpHfQ=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
|
||||
+18
-8
@@ -1,32 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
cmake,
|
||||
gfortran,
|
||||
gccStdenv,
|
||||
lhapdf,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
stdenv = gccStdenv;
|
||||
lhapdf' = lhapdf.override {
|
||||
stdenv = gccStdenv;
|
||||
python3 = null;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "MCFM";
|
||||
version = "10.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mcfm.fnal.gov/downloads/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-3Dg4KoILb0XhgGkzItDh/1opCtYrrIvtbuALYqPUvE8=";
|
||||
url = "https://mcfm.fnal.gov/downloads/MCFM-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-3Dg4KoILb0XhgGkzItDh/1opCtYrrIvtbuALYqPUvE8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace 'target_link_libraries(mcfm lhapdf_lib)' \
|
||||
--replace-fail 'target_link_libraries(mcfm lhapdf_lib)' \
|
||||
'target_link_libraries(mcfm ''${lhapdf_lib})'
|
||||
|
||||
substituteInPlace qcdloop-2.0.5/CMakeLists.txt \
|
||||
--replace-fail 'cmake_minimum_required (VERSION 3.0.2)' \
|
||||
'cmake_minimum_required (VERSION 3.15)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gfortran
|
||||
];
|
||||
buildInputs = [ lhapdf ];
|
||||
buildInputs = [ lhapdf' ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-Duse_external_lhapdf=ON"
|
||||
@@ -40,4 +50,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [ veprbl ];
|
||||
platforms = lib.platforms.x86_64;
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -4,18 +4,18 @@
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
writableTmpDirAsHomeHook,
|
||||
writeTextDir,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "microhs";
|
||||
version = "0.14.21.0";
|
||||
version = "0.15.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "augustss";
|
||||
repo = "MicroHs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Tq8fjI3LCP4NWrmbMP0xyhY2fjRmsMCEvgfDQ/SB5Bo=";
|
||||
hash = "sha256-JuqdArVzziJC4/QZLfPguXbd+ZiPD3bgf1mGYghkxy0=";
|
||||
};
|
||||
|
||||
# mcabal doesn't seem to respect the make flag and fails with /homeless-shelter
|
||||
@@ -29,8 +29,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# The MicroCabal that is installed by `make install` is pregenerated, does not respect MCABAL above, and so is not useable
|
||||
postInstall = "rm $out/bin/mcabal";
|
||||
|
||||
passthru.tests = {
|
||||
hello-world = callPackage ./test-hello-world.nix { microhs = finalAttrs.finalPackage; };
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = {
|
||||
hello-world = callPackage ./test-hello-world.nix { microhs = finalAttrs.finalPackage; };
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
diff --git a/arc-core/build.gradle b/arc-core/build.gradle
|
||||
index ca6244fa..8541bf3e 100644
|
||||
--- a/Arc/arc-core/build.gradle
|
||||
+++ b/Arc/arc-core/build.gradle
|
||||
@@ -2,23 +2,12 @@ sourceSets.main.java.srcDirs = ["src"]
|
||||
sourceSets.test.java.srcDirs = ["test"]
|
||||
sourceSets.test.resources.srcDirs = ["test/resources"]
|
||||
|
||||
-configurations{
|
||||
- extraLibs
|
||||
-}
|
||||
-
|
||||
dependencies{
|
||||
testImplementation libraries.junit
|
||||
testImplementation aproj(":natives:natives-desktop")
|
||||
testImplementation files("unsafe/unsafe.jar")
|
||||
//file generated from UnsafeBuffers.java
|
||||
compileOnly files("unsafe/unsafe.jar")
|
||||
- extraLibs files("unsafe/unsafe.jar")
|
||||
-}
|
||||
-
|
||||
-jar{
|
||||
- from{
|
||||
- configurations.extraLibs.collect{ it.isDirectory() ? it : zipTree(it) }
|
||||
- }
|
||||
}
|
||||
|
||||
//now, you may ask: why don't I make this a new module? why do I include JARs in the repository? why don't I make this a separate build step?
|
||||
@@ -120,6 +109,8 @@ tasks.register('copyUnsafeStuff'){
|
||||
}
|
||||
}
|
||||
|
||||
+jar.dependsOn copyUnsafeStuff
|
||||
+
|
||||
getTasksByName("jnigen", true).each{
|
||||
it.dependsOn copyUnsafeStuff
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
From 9dbfa680db6bfd1033772dda753120fe4452e0d9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev>
|
||||
Date: Fri, 8 Jan 2021 04:49:14 +0100
|
||||
Subject: [PATCH] fix include path for SDL2 on linux
|
||||
|
||||
---
|
||||
.../src/arc/backend/sdl/jni/SDL.java | 8 --------
|
||||
1 file changed, 8 deletions(-)
|
||||
|
||||
diff --git a/backends/backend-sdl/src/arc/backend/sdl/jni/SDL.java b/backends/backend-sdl/src/arc/backend/sdl/jni/SDL.java
|
||||
index 62d9286a..2853119d 100644
|
||||
--- a/Arc/backends/backend-sdl/src/arc/backend/sdl/jni/SDL.java
|
||||
+++ b/Arc/backends/backend-sdl/src/arc/backend/sdl/jni/SDL.java
|
||||
@@ -8,16 +8,8 @@ import java.nio.*;
|
||||
public class SDL{
|
||||
/*JNI
|
||||
|
||||
- #ifdef __APPLE__
|
||||
-
|
||||
#include "SDL2/SDL.h"
|
||||
|
||||
- #else
|
||||
-
|
||||
- #include "SDL.h"
|
||||
-
|
||||
- #endif
|
||||
-
|
||||
*/
|
||||
|
||||
static{
|
||||
--
|
||||
2.29.2
|
||||
|
||||
Generated
+6
-6
@@ -17,10 +17,10 @@
|
||||
"module": "sha256-r0Hiyh4MXzQkBudNhixHcXf1QOr4GWU841ypzRa0w/g=",
|
||||
"pom": "sha256-2Zp//AsIqW7/+5ybmtConz5ykh3ZYrFBi6SzLuKTz8A="
|
||||
},
|
||||
"Anuken#rhino/73a812444ac388ac2d94013b5cadc8f70b7ea027": {
|
||||
"jar": "sha256-g2+szbtgsHvalu5F4kygVDN89kk0zvzVSw3EOcAL11I=",
|
||||
"module": "sha256-BbXoWzXoJGKhH6kA6EiluDHhfs3th9X+ojLLZuGISOg=",
|
||||
"pom": "sha256-ngLvPqdMq7ayWlDHf7qr8MGYsDh+uMK6OYcDX9y5bXk="
|
||||
"Anuken#rhino/54b75cbd1207ef1fd5cff517cbd188e763c85baa": {
|
||||
"jar": "sha256-sZ5zFOXvyOLYEbb/LAQLU2u2S4FZ41T+rFHBfrG5O/Y=",
|
||||
"module": "sha256-QqoHjAbLp9eza+7r921k2L6bbV8zqjhdkqHhCy1qIkA=",
|
||||
"pom": "sha256-5xheV+aFDLRgYUS6b7GoGW0b2KSYsA8jY7NPy+Gb+H8="
|
||||
},
|
||||
"Anuken#steamworks4j/0b86023401880bb5e586bc404bedbaae9b1f1c94": {
|
||||
"jar": "sha256-YbaPhCjWtlExwQ1dFNA6JrkiAfQYWxJ0VRV9rLnoYhY=",
|
||||
@@ -58,8 +58,8 @@
|
||||
}
|
||||
},
|
||||
"https://raw.githubusercontent.com": {
|
||||
"nothings/stb/e140649ccf40818781b7e408f6228a486f6d254b/stb_image": {
|
||||
"h": "sha256-jlsNcX38ioNMl+8gLSDnjQg9AJWG4XMcmFgX0BVdVow="
|
||||
"nothings/stb/013ac3beddff3dbffafd5177e7972067cd2b5083/stb_image": {
|
||||
"h": "sha256-WUwv411JSItDgtv67I+YNm3vyoGdkWrJW+zz519CALM="
|
||||
}
|
||||
},
|
||||
"https://repo.maven.apache.org/maven2": {
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
let
|
||||
pname = "mindustry";
|
||||
version = "153";
|
||||
version = "154.3";
|
||||
buildVersion = makeBuildVersion version;
|
||||
|
||||
jdk = jdk17;
|
||||
@@ -48,21 +48,21 @@ let
|
||||
owner = "Anuken";
|
||||
repo = "Mindustry";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-yVrOHZOCZrI5SsmMdo7Eh+zS0PXv2X67zLCdLOWcPVc=";
|
||||
hash = "sha256-PguKdpZ3yaV7eW1NKZpbsOEUiMxX6gdYZxJ4p7wkvi8=";
|
||||
};
|
||||
Arc = fetchFromGitHub {
|
||||
name = "Arc-source";
|
||||
owner = "Anuken";
|
||||
repo = "Arc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JyiFxzdZtU0ILytTCfZrhBU2oZ3gF1kzMbSdjxqvTYs=";
|
||||
hash = "sha256-RMoXtyDh9DbEYxYLAopItp6Bf8kg92Av+g5lSqKFhdU=";
|
||||
};
|
||||
soloud = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
repo = "soloud";
|
||||
# This is pinned in Arc's arc-core/build.gradle
|
||||
tag = "v0.11";
|
||||
hash = "sha256-jybIILdK3cqyZ2LIuoWDfZWocVTbKszekKCLil0WXRY=";
|
||||
tag = "2025.12.01";
|
||||
hash = "sha256-I+VZW34eRGn1RJmK8e9nVSXIFSOK/pER+xEhmXeUB4Y=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
@@ -93,13 +93,16 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./0001-fix-include-path-for-SDL2-on-linux.patch
|
||||
# Fixes a build system issue where the classes UnsafeBuffers and Java16Buffers get built
|
||||
# and copied multiple times, which causes conflicts when zipping up the final arc-core jar.
|
||||
./0001-fix-duplicate-classes.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Ensure the prebuilt shared objects don't accidentally get shipped
|
||||
rm -r Arc/natives/natives-*/libs/*
|
||||
rm -r Arc/backends/backend-*/libs/*
|
||||
rm -f Arc/arc-core/unsafe/unsafe.jar
|
||||
|
||||
cd Mindustry
|
||||
|
||||
@@ -149,6 +152,10 @@ stdenv.mkDerivation {
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pushd ../Arc
|
||||
gradle :arc-core:recompileUnsafe
|
||||
popd
|
||||
''
|
||||
+ lib.optionalString enableServer ''
|
||||
gradle server:dist
|
||||
@@ -164,7 +171,7 @@ stdenv.mkDerivation {
|
||||
--add-needed "$glewlib" \
|
||||
--add-needed "$sdllib"
|
||||
# Put the freshly-built libraries where the pre-built libraries used to be:
|
||||
cp arc-core/build/Arc/arc-core/libs/*/* natives/natives-desktop/libs/
|
||||
cp arc-core/libs/*/* natives/natives-desktop/libs/
|
||||
cp backends/backend-sdl/build/Arc/backends/backend-sdl/libs/*/* natives/natives-desktop/libs/
|
||||
# below target dirs are based on Arc upstream: Arc/extensions/../build.gradle
|
||||
cp extensions/freetype/build/Arc/extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
homepage = "https://jedisct1.github.io/minisign/";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with lib.maintainers; [ joachifm ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "minisign";
|
||||
};
|
||||
|
||||
@@ -60,9 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
isc
|
||||
unicode-dfs-2016
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
joachifm
|
||||
];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -142,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl2Only;
|
||||
mainProgram = if withGUI then "mkvtoolnix-gui" else "mkvtoolnix";
|
||||
maintainers = with lib.maintainers; [
|
||||
codyopel
|
||||
rnhmjoj
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
ninja,
|
||||
nixosTests,
|
||||
nv-codec-headers-11,
|
||||
openalSoft,
|
||||
openal-soft,
|
||||
pipewire,
|
||||
pkg-config,
|
||||
python3,
|
||||
@@ -197,7 +197,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals jackaudioSupport [ libjack2 ]
|
||||
++ lib.optionals javascriptSupport [ mujs ]
|
||||
++ lib.optionals openalSupport [ openalSoft ]
|
||||
++ lib.optionals openalSupport [ openal-soft ]
|
||||
++ lib.optionals pipewireSupport [ pipewire ]
|
||||
++ lib.optionals pulseSupport [ libpulseaudio ]
|
||||
++ lib.optionals rubberbandSupport [ rubberband ]
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mstflint";
|
||||
version = "4.34.1-3";
|
||||
version = "4.34.1-4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mellanox";
|
||||
repo = finalAttrs.pname;
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GvUCNPB8BJY8RhIT4/a5NXOG6jjFUs04NmBn7Np+lAM=";
|
||||
hash = "sha256-WOYleBpMiEbtazC6hv2Q79w/8b4eRVcb4OWGjNYjJ0E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -106,7 +106,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Small, user-friendly console text editor";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
joachifm
|
||||
sigmasquadron
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
@@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/nn";
|
||||
|
||||
# fixes:
|
||||
# triangle.c: In function 'triangulate':
|
||||
# triangle.c:15619:1: error: number of arguments doesn't match prototype
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -41,6 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://www.gnupg.org/software/ntbtls/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ joachifm ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Open-source JPEG 2000 codec written in C language";
|
||||
homepage = "https://www.openjpeg.org/";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ codyopel ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
changelog = "https://github.com/uclouvain/openjpeg/blob/v${version}/CHANGELOG.md";
|
||||
};
|
||||
|
||||
@@ -67,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
thoughtpolice
|
||||
joachifm
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -29,8 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram = "paxtest";
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [
|
||||
joachifm
|
||||
];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -2,9 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
plasma-framework,
|
||||
kwindowsystem,
|
||||
libsForQt5,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
@@ -15,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "jsmitar";
|
||||
repo = "PlayBar2";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "0iv2m4flgaz2r0k7f6l0ca8p6cw8j8j2gin1gci2pg3l5g5khbch";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kC04yyt0vCsie8HGJySSiDNzkWKAGncmyOKrRx2pYkc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
libsForQt5.extra-cmake-modules
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
plasma-framework
|
||||
kwindowsystem
|
||||
libsForQt5.plasma-framework
|
||||
libsForQt5.kwindowsystem
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
@@ -75,11 +75,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "postfix";
|
||||
version = "3.10.7";
|
||||
version = "3.10.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://de.postfix.org/ftpmirror/official/postfix-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-/NP/cIBq5/CoLntcMB4vT8+mpomi27Oz8bXlIIEVeIo=";
|
||||
url = "http://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-MdSz64CT2CO1oVH1cXGf98BGJXG8leZEDYfKUlv7CWw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,7 +11,7 @@ let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
# pyCA is incompatible with SQLAlchemy 2.0
|
||||
# pyca is incompatible with SQLAlchemy 2.0
|
||||
sqlalchemy = super.sqlalchemy_1_4;
|
||||
};
|
||||
};
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "railway";
|
||||
version = "4.27.5";
|
||||
version = "4.30.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "railwayapp";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-S6Fp6dXCLdHTmaiRrtsTh+N44GzM4vt27MGCb9lkk5k=";
|
||||
hash = "sha256-0GEEF5YNOfzycFfvl3NCcV+sNZ+mEPxWeuYQQVHjYVQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8eLrtWxOS/AXcsCYu1H6vcwDaLl4siEVwX2YSvamZ1o=";
|
||||
cargoHash = "sha256-dP4YslHIlhtla0Y42qs1j8yyOGK7Ta8tc1Yr7+xl8S0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
+3
-3
@@ -4,7 +4,7 @@
|
||||
fetchurl,
|
||||
alsa-lib-with-plugins,
|
||||
alsa-utils,
|
||||
fltk,
|
||||
fltk_1_3,
|
||||
libjack2,
|
||||
libxft,
|
||||
libxpm,
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/rakarrack/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2";
|
||||
url = "mirror://sourceforge/rakarrack/rakarrack-${finalAttrs.version}.tar.bz2";
|
||||
sha256 = "1rpf63pdn54c4yg13k7cb1w1c7zsvl97c4qxcpz41c8l91xd55kn";
|
||||
};
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
alsa-lib-with-plugins
|
||||
alsa-utils
|
||||
fltk
|
||||
fltk_1_3
|
||||
libjack2
|
||||
libxft
|
||||
libxpm
|
||||
@@ -35,14 +35,14 @@ let
|
||||
|
||||
project = "Microsoft.CodeAnalysis.LanguageServer";
|
||||
in
|
||||
buildDotnetModule (finalAttrs: rec {
|
||||
buildDotnetModule (finalAttrs: {
|
||||
inherit pname dotnet-sdk dotnet-runtime;
|
||||
|
||||
vsVersion = "2.123.34-prerelease";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dotnet";
|
||||
repo = "roslyn";
|
||||
rev = "VSCode-CSharp-${vsVersion}";
|
||||
rev = "VSCode-CSharp-${finalAttrs.vsVersion}";
|
||||
hash = "sha256-UirJNrW1qcxt61Hsyfe/dYO1N2WH8Tr1mctTEUZ5pSs=";
|
||||
};
|
||||
|
||||
@@ -139,7 +139,7 @@ buildDotnetModule (finalAttrs: rec {
|
||||
''
|
||||
HOME=$TMPDIR
|
||||
expect <<"EOF"
|
||||
spawn ${meta.mainProgram} --stdio --logLevel Information --extensionLogDirectory log
|
||||
spawn ${finalAttrs.meta.mainProgram} --stdio --logLevel Information --extensionLogDirectory log
|
||||
expect_before timeout {
|
||||
send_error "timeout!\n"
|
||||
exit 1
|
||||
@@ -167,7 +167,7 @@ buildDotnetModule (finalAttrs: rec {
|
||||
meta = {
|
||||
homepage = "https://github.com/dotnet/vscode-csharp";
|
||||
description = "Language server behind C# Dev Kit for Visual Studio Code";
|
||||
changelog = "https://github.com/dotnet/vscode-csharp/releases/tag/v${vsVersion}";
|
||||
changelog = "https://github.com/dotnet/vscode-csharp/releases/tag/v${finalAttrs.vsVersion}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ konradmalik ];
|
||||
mainProgram = "Microsoft.CodeAnalysis.LanguageServer";
|
||||
|
||||
@@ -56,6 +56,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://rtmpdump.mplayerhq.hu/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ codyopel ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -81,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "rtorrent";
|
||||
maintainers = with lib.maintainers; [
|
||||
codyopel
|
||||
thiagokokada
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
description = "UNIX init scheme with service supervision";
|
||||
license = lib.licenses.bsd3;
|
||||
homepage = "http://smarden.org/runit";
|
||||
maintainers = with lib.maintainers; [ joachifm ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -67,8 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
options. No more no less.
|
||||
'';
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
codyopel
|
||||
maintainers = [
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "sakura";
|
||||
|
||||
@@ -33,7 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "sassc";
|
||||
maintainers = with lib.maintainers; [
|
||||
codyopel
|
||||
pjones
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
libGL,
|
||||
glew,
|
||||
pkg-config,
|
||||
openalSoft,
|
||||
openal-soft,
|
||||
freealut,
|
||||
wxGTK32,
|
||||
libogg,
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libGLU
|
||||
libGL
|
||||
glew
|
||||
openalSoft
|
||||
openal-soft
|
||||
freealut
|
||||
wxGTK32
|
||||
libogg
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
|
||||
description = "Scheme shell";
|
||||
homepage = "http://www.scsh.net/";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ joachifm ];
|
||||
maintainers = [ ];
|
||||
platforms = with lib.platforms; unix;
|
||||
mainProgram = "scsh";
|
||||
};
|
||||
|
||||
@@ -13,14 +13,14 @@ in
|
||||
python.pkgs.toPythonModule (
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "searxng";
|
||||
version = "0-unstable-2026-02-16";
|
||||
version = "0-unstable-2026-02-22";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "searxng";
|
||||
repo = "searxng";
|
||||
rev = "8e824017dc88cebe5a42ee6ca04315ca9545f717";
|
||||
hash = "sha256-9B6Oel6yfiQS5uY1jjU+BHkP13HgJubCcE2g6YJiNeY=";
|
||||
rev = "5054e69844cbedfa0f5184955d662d944bcd35c1";
|
||||
hash = "sha256-JfkBDKggxJwdhLMaFBSlzYyE/6+U9j7i9e83jqGr5Tc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];
|
||||
|
||||
@@ -2,11 +2,8 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libsForQt5,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtquickcontrols2,
|
||||
SDL,
|
||||
python3,
|
||||
catch2_3,
|
||||
@@ -28,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
libsForQt5.extra-cmake-modules
|
||||
(python3.withPackages (
|
||||
pp: with pp; [
|
||||
pyyaml
|
||||
@@ -36,12 +33,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
setuptools
|
||||
]
|
||||
))
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtquickcontrols2
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtquickcontrols2
|
||||
SDL
|
||||
];
|
||||
|
||||
@@ -1,44 +1,66 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
ffmpeg,
|
||||
yt-dlp,
|
||||
libsecret,
|
||||
python3,
|
||||
nix-update-script,
|
||||
|
||||
# nativeBuildInputs
|
||||
node-gyp,
|
||||
pkg-config,
|
||||
nodejs,
|
||||
electron,
|
||||
makeWrapper,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
yarn2nix-moretea,
|
||||
fetchYarnDeps,
|
||||
|
||||
# buildInputs
|
||||
libsecret,
|
||||
ffmpeg,
|
||||
yt-dlp,
|
||||
electron,
|
||||
chromium,
|
||||
}:
|
||||
|
||||
let
|
||||
yarnLock = ./yarn.lock;
|
||||
offlineCache = fetchYarnDeps {
|
||||
inherit yarnLock;
|
||||
hash = "sha256-MRCrBvqDpPpwMg4A50RVKGp4GqRHNjNJzSpJz+14OG4=";
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "Sharedown";
|
||||
version = "5.3.6-unstable-2025-12-06";
|
||||
version = "5.3.6-unstable-2025-12-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kylon";
|
||||
repo = "Sharedown";
|
||||
rev = "c39f0c5bbf694c2cdfce4ef0b4381342fb535ecc";
|
||||
hash = "sha256-PsfE7v9yEeGC8rUzhj/klhqtKKzxCV+thwLnQlgfDxI=";
|
||||
rev = "5d0cbe2d25de6e288e35bd549f436b090d6e287a";
|
||||
hash = "sha256-yHnTS3B3lWSkAVlUNQYFuKIHM96d1ZeVWImJqXjlfMw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-YmrSIOi9WpqDPC9Tj1oTprdCFDdYj6C91kg567+/3ik=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
node-gyp
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
dontNpmBuild = true;
|
||||
|
||||
buildInputs = [
|
||||
libsecret
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
PUPPETEER_SKIP_DOWNLOAD = "1";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
install -Dm0644 build/icon.png $out/share/icons/hicolor/512x512/apps/Sharedown.png
|
||||
|
||||
# Create a launcher wrapper
|
||||
makeWrapper ${electron}/bin/electron $out/bin/sharedown \
|
||||
--add-flags $out/lib/node_modules/sharedown/app.js \
|
||||
--set PUPPETEER_EXECUTABLE_PATH ${chromium}/bin/chromium \
|
||||
--prefix PATH : ${lib.makeBinPath finalAttrs.finalPackage.passthru.wrapperPaths} \
|
||||
--add-flags "--no-sandbox" \
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
@@ -48,88 +70,25 @@ stdenvNoCC.mkDerivation rec {
|
||||
comment = "An Application to save your Sharepoint videos for offline usage.";
|
||||
desktopName = "Sharedown";
|
||||
categories = [
|
||||
"Network"
|
||||
"Archiving"
|
||||
# Based upon categories in upstream's package.json
|
||||
"AudioVideo"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase =
|
||||
let
|
||||
binPath = lib.makeBinPath [
|
||||
ffmpeg
|
||||
yt-dlp
|
||||
];
|
||||
|
||||
modules = yarn2nix-moretea.mkYarnModules rec {
|
||||
name = "Sharedown-modules-${version}";
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
offlineCache
|
||||
yarnLock
|
||||
;
|
||||
|
||||
yarnFlags = [ "--production" ];
|
||||
|
||||
pkgConfig = {
|
||||
keytar = {
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
libsecret
|
||||
];
|
||||
postInstall = ''
|
||||
yarn --offline run build
|
||||
# Remove unnecessary store path references.
|
||||
rm build/config.gypi
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
# needed for node-gyp, copied from https://nixos.org/manual/nixpkgs/unstable/#javascript-yarn2nix-pitfalls
|
||||
# permalink: https://github.com/NixOS/nixpkgs/blob/d176767c02cb2a048e766215078c3d231e666091/doc/languages-frameworks/javascript.section.md#pitfalls-javascript-yarn2nix-pitfalls
|
||||
preBuild = ''
|
||||
mkdir -p $HOME/.node-gyp/${nodejs.version}
|
||||
echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
|
||||
ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
|
||||
export npm_config_nodedir=${nodejs}
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
rm $out/node_modules/sharedown
|
||||
'';
|
||||
|
||||
packageJSON = "${src}/package.json";
|
||||
};
|
||||
in
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/bin" "$out/share/Sharedown" "$out/share/applications" "$out/share/icons/hicolor/512x512/apps"
|
||||
|
||||
# Electron app
|
||||
cp -r *.js *.json sharedownlogo.png sharedown "${modules}/node_modules" "$out/share/Sharedown"
|
||||
|
||||
# Desktop Launcher
|
||||
cp build/icon.png "$out/share/icons/hicolor/512x512/apps/Sharedown.png"
|
||||
|
||||
# Install electron wrapper script
|
||||
makeWrapper "${electron}/bin/electron" "$out/bin/Sharedown" \
|
||||
--add-flags "$out/share/Sharedown" \
|
||||
--prefix PATH : "${binPath}" \
|
||||
--set PUPPETEER_EXECUTABLE_PATH "${chromium}/bin/chromium"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit offlineCache;
|
||||
updateScript = ./update.sh;
|
||||
wrapperPaths = [
|
||||
ffmpeg
|
||||
yt-dlp
|
||||
chromium
|
||||
];
|
||||
updateScript = nix-update-script {
|
||||
# Updates are not very frequent, so we wish to track the latest git
|
||||
# commit.
|
||||
extraArgs = [
|
||||
"--version=branch"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -140,4 +99,4 @@ stdenvNoCC.mkDerivation rec {
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "Sharedown";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts curl gnugrep jq yarn yarn2nix-moretea.yarn2nix nix-update nodejs
|
||||
# See git history for the version of this script that updated to tagged versions.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
nixpkgsDir="$PWD"
|
||||
|
||||
currentRev=$(nix-instantiate --eval --expr 'with import ./. {}; sharedown.src.rev' | tr -d '"')
|
||||
nix-update --version=branch --src-only sharedown
|
||||
|
||||
latestRev=$(nix-instantiate --eval --expr 'with import ./. {}; sharedown.src.rev' | tr -d '"')
|
||||
dirname="$(realpath "$(dirname "$0")")"
|
||||
sourceDir="$(nix-build -A sharedown.src --no-out-link)"
|
||||
tempDir="$(mktemp -d)"
|
||||
trap 'chmod -R u+w $tempDir && rm -rf $tempDir' EXIT
|
||||
|
||||
if [[ "$currentRev" == "$latestRev" && "${BUMP_LOCK-}" != "1" ]]; then
|
||||
# Skip update when already on the latest version.
|
||||
exit 0
|
||||
fi
|
||||
|
||||
cp -r "$sourceDir"/* "$tempDir"
|
||||
cd "$tempDir"
|
||||
PUPPETEER_SKIP_DOWNLOAD=1 yarn install --mode update-lockfile
|
||||
cp yarn.lock "$dirname"
|
||||
cd "$nixpkgsDir"
|
||||
update-source-version sharedown --ignore-same-version --source-key=offlineCache
|
||||
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user