Merge master into staging-next
This commit is contained in:
@@ -3601,6 +3601,12 @@
|
||||
githubId = 37768199;
|
||||
name = "Christian Bergschneider";
|
||||
};
|
||||
blokyk = {
|
||||
email = "pro@zoeee.net";
|
||||
github = "blokyk";
|
||||
githubId = 32983140;
|
||||
name = "Zoë Courvoisier";
|
||||
};
|
||||
bloominstrong = {
|
||||
email = "github@mail.bloominstrong.net";
|
||||
github = "bloominstrong";
|
||||
|
||||
@@ -34,6 +34,8 @@
|
||||
|
||||
- [nohang](https://github.com/hakavlad/nohang), a daemon for Linux that prevents out of memory (OOM) situations from affecting system responsiveness. Available as [services.nohang](#opt-services.nohang.enable)
|
||||
|
||||
- [bentopdf](https://github.com/alam00000/bentopdf), a privacy-first PDF toolkit running completely in-browser. Available as [services.bentopdf](#opt-services.bentopdf.enable).
|
||||
|
||||
- [DankMaterialShell](https://danklinux.com), a complete desktop shell for Wayland compositors built with Quickshell. Available as [programs.dms-shell](#opt-programs.dms-shell.enable).
|
||||
|
||||
- [dms-greeter](https://danklinux.com), a modern display manager greeter for DankMaterialShell that works with greetd and supports multiple Wayland compositors. Available as [services.displayManager.dms-greeter](#opt-services.displayManager.dms-greeter.enable).
|
||||
|
||||
@@ -1591,6 +1591,7 @@
|
||||
./services/web-apps/artalk.nix
|
||||
./services/web-apps/audiobookshelf.nix
|
||||
./services/web-apps/baikal.nix
|
||||
./services/web-apps/bentopdf.nix
|
||||
./services/web-apps/bluemap.nix
|
||||
./services/web-apps/bluesky-pds.nix
|
||||
./services/web-apps/bookstack.nix
|
||||
|
||||
@@ -109,6 +109,11 @@ in
|
||||
consider using `programs.pay-respects` instead.
|
||||
'')
|
||||
(mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [
|
||||
"programs"
|
||||
"unity3d"
|
||||
"enable"
|
||||
] "The corresponding package was removed from nixpkgs in 2022.")
|
||||
(mkRemovedOptionModule [ "programs" "way-cooler" ] (
|
||||
"way-cooler is abandoned by its author: "
|
||||
+ "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"
|
||||
|
||||
@@ -9,13 +9,6 @@ let
|
||||
sandbox = pkgs.chromium.sandbox;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "programs" "unity3d" "enable" ]
|
||||
[ "security" "chromiumSuidSandbox" "enable" ]
|
||||
)
|
||||
];
|
||||
|
||||
options.security.chromiumSuidSandbox.enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
|
||||
@@ -206,16 +206,17 @@ let
|
||||
original,
|
||||
name,
|
||||
set ? { },
|
||||
extraArgs ? null,
|
||||
}:
|
||||
pkgs.runCommand "${name}-wrapper"
|
||||
{
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
}
|
||||
|
||||
''
|
||||
makeWrapper "${original}" "$out/bin/${name}" \
|
||||
${lib.concatStringsSep " \\\n " (
|
||||
lib.mapAttrsToList (name: value: ''--set ${name} "${value}"'') set
|
||||
(lib.mapAttrsToList (name: value: ''--set ${name} "${value}"'') set)
|
||||
++ (lib.optional (extraArgs != null) ''--add-flags "${extraArgs}"'')
|
||||
)}
|
||||
'';
|
||||
|
||||
@@ -230,6 +231,7 @@ let
|
||||
}
|
||||
// (mkPassEnv cfg)
|
||||
// cfg.environment;
|
||||
extraArgs = cfg.extraArgs or null;
|
||||
});
|
||||
|
||||
# Paths listed in ReadWritePaths must exist before service is started
|
||||
@@ -778,6 +780,9 @@ in
|
||||
description = ''
|
||||
Additional arguments for all {command}`borg` calls the
|
||||
service has. Handle with care.
|
||||
|
||||
These extra arguments also get included in the wrapper
|
||||
script for this job.
|
||||
'';
|
||||
default = [ ];
|
||||
example = [ "--remote-path=/path/to/borg" ];
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.bentopdf;
|
||||
in
|
||||
{
|
||||
options.services.bentopdf = {
|
||||
enable = lib.mkEnableOption "bentopdf Privacy First PDF Toolkit";
|
||||
|
||||
package = lib.mkPackageOption pkgs "bentopdf" {
|
||||
extraDescription = ''
|
||||
To use the "normal mode" variant of bentopdf, which includes all socials, marketing and explanatory texts, set this option to `pkgs.bentopdf.override { simpleMode = false; }`.
|
||||
'';
|
||||
};
|
||||
|
||||
domain = lib.mkOption {
|
||||
description = "Domain to use for the virtual host.";
|
||||
type = lib.types.str;
|
||||
};
|
||||
|
||||
nginx = {
|
||||
enable = lib.mkEnableOption "a virtualhost to serve bentopdf through nginx";
|
||||
|
||||
virtualHost = lib.mkOption {
|
||||
type = lib.types.submodule (import ../web-servers/nginx/vhost-options.nix { inherit config lib; });
|
||||
default = { };
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
serverAliases = [ "bentopdf.''${config.networking.domain}" ];
|
||||
}
|
||||
'';
|
||||
description = "Extra configuration for the nginx virtual host of bentopdf.";
|
||||
};
|
||||
};
|
||||
|
||||
caddy = {
|
||||
enable = lib.mkEnableOption "a virtualhost to serve bentopdf through caddy";
|
||||
|
||||
virtualHost = lib.mkOption {
|
||||
type = lib.types.submodule (
|
||||
import ../web-servers/caddy/vhost-options.nix { cfg = config.services.caddy; }
|
||||
);
|
||||
default = { };
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
serverAliases = [ "bentopdf.''${config.networking.domain}" ];
|
||||
}
|
||||
'';
|
||||
description = "Extra configuration for the caddy virtual host of bentopdf.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.nginx = lib.mkIf cfg.nginx.enable {
|
||||
enable = lib.mkDefault true;
|
||||
virtualHosts."${cfg.domain}" = lib.mkMerge [
|
||||
cfg.nginx.virtualHost
|
||||
{
|
||||
root = lib.mkForce "${cfg.package}";
|
||||
|
||||
locations."/" = {
|
||||
index = "index.html";
|
||||
extraConfig = ''
|
||||
try_files $uri $uri/ /index.html;
|
||||
'';
|
||||
};
|
||||
|
||||
locations."~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$".extraConfig = ''
|
||||
expires 1y;
|
||||
add_header Cache-Control "public, immutable";
|
||||
'';
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
services.caddy = lib.mkIf cfg.caddy.enable {
|
||||
enable = lib.mkDefault true;
|
||||
virtualHosts."${cfg.domain}" = lib.mkMerge [
|
||||
cfg.caddy.virtualHost
|
||||
{
|
||||
hostName = lib.mkForce cfg.domain;
|
||||
extraConfig = ''
|
||||
root * ${cfg.package}
|
||||
try_files {path} /index.html
|
||||
file_server
|
||||
|
||||
@static {
|
||||
path_regexp static \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$
|
||||
}
|
||||
handle @static {
|
||||
header {
|
||||
Cache-Control "public, immutable"
|
||||
}
|
||||
header Cache-Control max-age=31536000
|
||||
}
|
||||
'';
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
charludo
|
||||
stunkymonkey
|
||||
];
|
||||
}
|
||||
@@ -275,6 +275,7 @@ in
|
||||
beanstalkd = runTest ./beanstalkd.nix;
|
||||
bees = runTest ./bees.nix;
|
||||
benchexec = runTest ./benchexec.nix;
|
||||
bentopdf = handleTest ./bentopdf { };
|
||||
beszel = runTest ./beszel.nix;
|
||||
binary-cache = runTest {
|
||||
imports = [ ./binary-cache.nix ];
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
import ../make-test-python.nix (
|
||||
{ lib, ... }:
|
||||
|
||||
{
|
||||
name = "bentopdf-caddy";
|
||||
meta.maintainers = with lib.maintainers; [ stunkymonkey ];
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.bentopdf = {
|
||||
enable = true;
|
||||
domain = "localhost:80";
|
||||
caddy.enable = true;
|
||||
caddy.virtualHost.extraConfig = "tls internal";
|
||||
};
|
||||
# disable letsencrypt cert fetching
|
||||
services.caddy.globalConfig = "auto_https disable_certs";
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("caddy.service")
|
||||
machine.wait_for_open_port(80)
|
||||
machine.succeed("curl -vvv --fail --show-error --silent --location --insecure http://localhost/")
|
||||
assert "<title>BentoPDF - The Privacy First PDF Toolkit</title>" in machine.succeed("curl --fail --show-error --silent --location --insecure http://localhost/")
|
||||
'';
|
||||
}
|
||||
)
|
||||
@@ -0,0 +1,6 @@
|
||||
{ system, pkgs, ... }:
|
||||
|
||||
{
|
||||
caddy = import ./caddy.nix { inherit system pkgs; };
|
||||
nginx = import ./nginx.nix { inherit system pkgs; };
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
import ../make-test-python.nix (
|
||||
{ lib, ... }:
|
||||
|
||||
{
|
||||
name = "bentopdf-nginx";
|
||||
meta.maintainers = with lib.maintainers; [ stunkymonkey ];
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.bentopdf = {
|
||||
enable = true;
|
||||
domain = "localhost";
|
||||
nginx.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("nginx.service")
|
||||
machine.wait_for_open_port(80)
|
||||
assert "<title>BentoPDF - The Privacy First PDF Toolkit</title>" in machine.succeed("curl --fail --show-error --silent --location --insecure http://localhost:80/")
|
||||
'';
|
||||
}
|
||||
)
|
||||
@@ -131,7 +131,8 @@ in
|
||||
repo = remoteRepo;
|
||||
encryption.mode = "none";
|
||||
startAt = [ ];
|
||||
environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519";
|
||||
# This uses extraArgs instead of BORG_RSH to test propagation of these args
|
||||
extraArgs = [ "--rsh=ssh -oStrictHostKeyChecking=no -i /root/id_ed25519" ];
|
||||
};
|
||||
|
||||
commandFail = {
|
||||
|
||||
@@ -2615,8 +2615,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "language-julia";
|
||||
publisher = "julialang";
|
||||
version = "1.182.2";
|
||||
hash = "sha256-PIhaYlGxOGycuE9YKyJ0xD7QEjKgmtHX7l4x/xs0GjU=";
|
||||
version = "1.187.2";
|
||||
hash = "sha256-LYpcccJy+asBicetU6WD4yIvMDQTbg4b9GY20+TYsnc=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/julialang.language-julia/changelog";
|
||||
@@ -3301,8 +3301,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "cpptools-extension-pack";
|
||||
publisher = "ms-vscode";
|
||||
version = "1.3.1";
|
||||
hash = "sha256-HbI0UdN8uwHS2MPH1SGZhxNaN18cWzjMyWYcgVE7FjY=";
|
||||
version = "1.5.1";
|
||||
hash = "sha256-5jmv/CnuAMwG8asvW2iW8j837ldnLZ3rJSQbNsNvN0M=";
|
||||
};
|
||||
meta = {
|
||||
description = "Popular extensions for C++ development in Visual Studio Code";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mednafen-vb";
|
||||
version = "0-unstable-2024-10-21";
|
||||
version = "0-unstable-2026-02-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "beetle-vb-libretro";
|
||||
rev = "8f837ebc077afdd6652efb2827fd8308a07113ca";
|
||||
hash = "sha256-eAnBubNhj78G4r8OHVqwFXGOSA9wEYI6ZwNyiwDW8W8=";
|
||||
rev = "65debc7c4c7b85e2fd988d2be53496c2cf0b5f44";
|
||||
hash = "sha256-9LIGNbF0TuWm07TkTsRX8i7cBtJrOfSgBa8swKHddPQ=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "stella";
|
||||
version = "0-unstable-2026-02-13";
|
||||
version = "0-unstable-2026-02-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stella-emu";
|
||||
repo = "stella";
|
||||
rev = "9d7d1d2d6cc571821a8aa2459b9c1c914947cbd6";
|
||||
hash = "sha256-YE+LTuGUJN1mGEyK+aJgivYkMEjI+1ISwmWYDypm/a0=";
|
||||
rev = "30b15892eec8aac36075e07b2f719bf7ff494344";
|
||||
hash = "sha256-mgu7JmZ9veng6WauFEUW5nON9vlrnXsgmLU7wzTZhTY=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -400,13 +400,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"fastly_fastly": {
|
||||
"hash": "sha256-FZNwWjgxdJ/g3ByjbsD5isMan7e7QUX2w5ZHR4qHJKw=",
|
||||
"hash": "sha256-KPEgLMxKyiepNb5A9uJmcOEDDbE+L0k6Cz3hAVg0H08=",
|
||||
"homepage": "https://registry.terraform.io/providers/fastly/fastly",
|
||||
"owner": "fastly",
|
||||
"repo": "terraform-provider-fastly",
|
||||
"rev": "v8.6.0",
|
||||
"rev": "v8.7.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-YgmjUSKq9wAkixq9oL5dXwNY2Yt/QRdOLj75M8UWj1w="
|
||||
"vendorHash": "sha256-xgIAmxi9VvPsWqBtQHchv5UvwALkayxmoMsUp0aYJVs="
|
||||
},
|
||||
"flexibleenginecloud_flexibleengine": {
|
||||
"hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=",
|
||||
@@ -1301,11 +1301,11 @@
|
||||
"vendorHash": "sha256-Hzq97ElAjs7Y4tmJ2x7+g4j74MEdEvI2bD8pkvi5ZXg="
|
||||
},
|
||||
"temporalio_temporalcloud": {
|
||||
"hash": "sha256-bqUANWb+8XyY6iRGudSHKOHsErg40TY9SoaJArFqWNM=",
|
||||
"hash": "sha256-ZoDn6s4YlgoMrrAeUVmKx0rASEDoZVbcV4eFjZxaFQA=",
|
||||
"homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud",
|
||||
"owner": "temporalio",
|
||||
"repo": "terraform-provider-temporalcloud",
|
||||
"rev": "v1.2.0",
|
||||
"rev": "v1.2.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o="
|
||||
},
|
||||
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=incompatible-pointer-types -DPROTOTYPES=1";
|
||||
}
|
||||
# https://github.com/ygrek/mldonkey/issues/117
|
||||
// lib.optionalAttrs stdenv.cc.isClang {
|
||||
|
||||
+16
-21
@@ -2,14 +2,9 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
libsForQt5,
|
||||
pkg-config,
|
||||
qtbase,
|
||||
qtquickcontrols2,
|
||||
qtwebsockets,
|
||||
qtmultimedia,
|
||||
gst_all_1,
|
||||
wrapQtAppsHook,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
|
||||
@@ -19,18 +14,18 @@
|
||||
mpv-unwrapped,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "anilibria-winmaclinux";
|
||||
version = "2.2.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anilibria";
|
||||
repo = "anilibria-winmaclinux";
|
||||
rev = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-58NFlB6viWXG13J+RBzMj6LlYFClpWpGQ/aCNxJ5wKQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
||||
qmakeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
@@ -64,17 +59,17 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
libsForQt5.qmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtquickcontrols2
|
||||
qtwebsockets
|
||||
qtmultimedia
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtquickcontrols2
|
||||
libsForQt5.qtwebsockets
|
||||
libsForQt5.qtmultimedia
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gst-plugins-bad
|
||||
@@ -87,11 +82,11 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals withMPV [ mpv-unwrapped.dev ];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem rec {
|
||||
(makeDesktopItem {
|
||||
name = "AniLibria";
|
||||
desktopName = name;
|
||||
desktopName = "AniLibria";
|
||||
icon = "anilibria";
|
||||
comment = meta.description;
|
||||
comment = finalAttrs.meta.description;
|
||||
genericName = "AniLibria desktop client";
|
||||
categories = [
|
||||
"Qt"
|
||||
@@ -99,7 +94,7 @@ stdenv.mkDerivation rec {
|
||||
"Player"
|
||||
];
|
||||
keywords = [ "anime" ];
|
||||
exec = name;
|
||||
exec = "AniLibria";
|
||||
terminal = false;
|
||||
})
|
||||
];
|
||||
@@ -109,7 +104,7 @@ stdenv.mkDerivation rec {
|
||||
description = "AniLibria cross platform desktop client";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ];
|
||||
inherit (qtbase.meta) platforms;
|
||||
inherit (libsForQt5.qtbase.meta) platforms;
|
||||
mainProgram = "AniLibria";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "argocd";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FvN4JCG/5SxpnmdEH9X1sMX5dNlp/x0ALNysv+LWroU=";
|
||||
hash = "sha256-tk8R1StNqYWNadGKrhUXmjoCxb0bwdMyWjokHFtFWEc=";
|
||||
};
|
||||
|
||||
ui = stdenv.mkDerivation {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
stdenvNoCC,
|
||||
nix-update-script,
|
||||
nodejs,
|
||||
pnpm_9,
|
||||
pnpm_10,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
typescript,
|
||||
@@ -15,12 +15,12 @@
|
||||
|
||||
let
|
||||
pname = "autobrr";
|
||||
version = "1.71.0";
|
||||
version = "1.73.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "autobrr";
|
||||
repo = "autobrr";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JAWnH0S7gDBwmQXpogiTCIWWfQkrI5wOjWkV6+ANcnc=";
|
||||
hash = "sha256-wBD44lkh+OX0x6eZmPMAMJDpKOzrdheXo8Ar+iyTXOw=";
|
||||
};
|
||||
|
||||
autobrr-web = stdenvNoCC.mkDerivation {
|
||||
@@ -30,7 +30,7 @@ let
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_9
|
||||
pnpm_10
|
||||
typescript
|
||||
];
|
||||
|
||||
@@ -43,9 +43,9 @@ let
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-LOY8fLGsX966MyH4w+pa9tm/5HS6LnGwd51cj8TG6Mk=";
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-2medzt9mraxB+ZmyHL3cSyFEQh3k2NnMookHqE1S51o=";
|
||||
};
|
||||
|
||||
postBuild = ''
|
||||
@@ -65,7 +65,7 @@ buildGoModule (finalAttrs: {
|
||||
src
|
||||
;
|
||||
|
||||
vendorHash = "sha256-avgMRD5WSjXVVJ8r0Rq0IhfwPvxc/Sq9JxzX0rQimWI=";
|
||||
vendorHash = "sha256-ENxUQz2Pn7dgRzZc86AUNkm9Gvi0+CJKxYNI4j6xPxg=";
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${autobrr-web}/* web/dist
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
simpleMode ? true,
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "bentopdf";
|
||||
# We intentionally don't update the version, due to:
|
||||
# https://github.com/NixOS/nixpkgs/issues/484067
|
||||
# nixpkgs-update: no auto update
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alam00000";
|
||||
repo = "bentopdf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-br4My0Q4zoA+ZIrXM4o4oQjZ7IpSdwg+iKiAUdc2B/s=";
|
||||
};
|
||||
npmDepsHash = "sha256-UNNNYO7e7qdumI0/ka2ieFZzKURPl1V3981vHCPcVfY=";
|
||||
|
||||
npmBuildFlags = [
|
||||
"--"
|
||||
"--mode"
|
||||
"production"
|
||||
];
|
||||
|
||||
env.SIMPLE_MODE = lib.boolToString simpleMode;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -r dist/* $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests.bentopdf) caddy nginx;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Privacy-first PDF toolkit";
|
||||
homepage = "https://bentopdf.com";
|
||||
changelog = "https://github.com/alam00000/bentopdf/releases";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
charludo
|
||||
stunkymonkey
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -55,6 +55,7 @@ flutter329.buildFlutterApplication rec {
|
||||
sed -i 's#Icon=.*/bluebubbles.png#Icon=bluebubbles#g' snap/gui/bluebubbles.desktop
|
||||
install -Dm0644 snap/gui/bluebubbles.desktop $out/share/applications/bluebubbles.desktop
|
||||
install -Dm0644 snap/gui/bluebubbles.png -t $out/share/icons/hicolor/1024x1024/apps
|
||||
install -Dm0644 flatpak/icon/128x128.png $out/share/icons/hicolor/128x128/apps/bluebubbles.png
|
||||
'';
|
||||
|
||||
extraWrapProgramArgs = ''
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit-files";
|
||||
version = "35";
|
||||
version = "36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit-files";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ziFtsWZPdzkqc3UEaoIfwsIe8q/H0lyLtEropA2w+pc=";
|
||||
hash = "sha256-JuGYEF+XIxHP2ACfujAglFk/rocEc7HL3Tjl3txPLjA=";
|
||||
|
||||
fetchSubmodules = true;
|
||||
postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit-podman";
|
||||
version = "120";
|
||||
version = "121";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit-podman";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-1PXz+zHuj5fjzDe194+sgBlLhQnS9jzv9FbM9RfNIVc=";
|
||||
hash = "sha256-xjBt+4WbbLYOUJwjKhQMayXfLOqS1xw6klo99WH/0vM=";
|
||||
|
||||
fetchSubmodules = true;
|
||||
postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "collada-dom";
|
||||
version = "2.5.2";
|
||||
version = "2.5.3";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "Gepetto";
|
||||
repo = "collada-dom";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-53Gf6OLwrflZcrWKPuNPS0k+jlj5yTzCkI/QYQFta48=";
|
||||
hash = "sha256-vkbQvgY1ISOhbDeEmLuOWRfwQsOZRffUi3tpT/G33KY=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
pkg-config,
|
||||
diffutils,
|
||||
versionCheckHook,
|
||||
glibc ? !stdenv.hostPlatform.isDarwin,
|
||||
glibc,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -91,10 +91,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# which makes some tests fail.
|
||||
sed -i '/opts normalize/a AT_SKIP_IF([true])' src/at/chdir.at
|
||||
''
|
||||
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
substituteInPlace src/main/help.c \
|
||||
--replace-fail '"ldconfig"' \"${glibc.bin}/bin/ldconfig\"
|
||||
'';
|
||||
+
|
||||
lib.optionalString
|
||||
(
|
||||
stdenv.hostPlatform.libc == "glibc"
|
||||
|| stdenv.hostPlatform.libc == "uclibc"
|
||||
|| stdenv.hostPlatform.isFreeBSD
|
||||
|| stdenv.hostPlatform.isOpenBSD
|
||||
|| stdenv.hostPlatform.isNetBSD
|
||||
)
|
||||
''
|
||||
# See <https://github.com/guillemj/dpkg/blob/1.22.21/src/main/help.c#L93>
|
||||
substituteInPlace src/main/help.c \
|
||||
--replace-fail '"ldconfig"' \"${glibc.bin}/bin/ldconfig\"
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
perl
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go2tv" + lib.optionalString (!withGui) "-lite";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexballas";
|
||||
repo = "go2tv";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oyd6H3U799el9xcte3mOJo0m2YQTZ/vZjFdM2F7Cha8=";
|
||||
hash = "sha256-nAvfWRXPYX5AcJ0S3QXlcOtEEIUQK0FZqSSBNxDtGu4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2eEB6yfWFD7X3+qQenRoMiyzHH9i/gDg0IuOo/gUBFw=";
|
||||
vendorHash = "sha256-vxWvv7PE3VlU2Z9WEAvKiUgJCrK0a6QerMA3Vw+CLZo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -6,16 +6,15 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "gogdl";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Heroic-Games-Launcher";
|
||||
repo = "heroic-gogdl";
|
||||
# two commits after the v1.2.0 tag, because the release messed up submodule fetching
|
||||
rev = "9759dfb1f50e0c68854f938e9568d84cab59652c";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-yjiPHEiZjs9TnBRaKzm1TpLcPK0tfIrzM30DX66m+1Y=";
|
||||
hash = "sha256-qYarDcwrVrTpLHQYdWQvXL5+V1wMyL06+n5t6LXKBHI=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
Generated
+2
-37
@@ -4,11 +4,6 @@
|
||||
"version": "3.1.2",
|
||||
"hash": "sha256-v7ZoEFZyhF8VcRZj1uim4HNiRsG+XdJ4x/dwPBIWUz8="
|
||||
},
|
||||
{
|
||||
"pname": "coverlet.collector",
|
||||
"version": "6.0.0",
|
||||
"hash": "sha256-IEmweTMapcPhFHpmJsPXfmMhravYOrWupgjeOvMmQ4o="
|
||||
},
|
||||
{
|
||||
"pname": "Dapper",
|
||||
"version": "2.1.28",
|
||||
@@ -16,8 +11,8 @@
|
||||
},
|
||||
{
|
||||
"pname": "FCastSenderSDKDotnet",
|
||||
"version": "0.0.5",
|
||||
"hash": "sha256-UTCgJ1M0n7PcVoU/7slh5sFitJ+t7ZdgkdUDZ5CVvGk="
|
||||
"version": "0.0.7",
|
||||
"hash": "sha256-/eHsYJd+7cqDVMW+XiKBPBrjR+eVLUpYazb96Bh3fac="
|
||||
},
|
||||
{
|
||||
"pname": "Fizzler",
|
||||
@@ -94,11 +89,6 @@
|
||||
"version": "17.3.2",
|
||||
"hash": "sha256-APxmbKMNQKWuFQMJjkVr2zIqv/bLUTMm5NRGVLegBbg="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeCoverage",
|
||||
"version": "17.6.0",
|
||||
"hash": "sha256-sYk+9Gj1M1HI6yEB8ZJQ4fiqGjYos+orebV8blFDSQs="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CSharp",
|
||||
"version": "4.0.1",
|
||||
@@ -124,11 +114,6 @@
|
||||
"version": "17.3.2",
|
||||
"hash": "sha256-1fZ/rrSbuyYUfvwyA3otFQdL0Y/H48goAVyhiLs1oF4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NET.Test.Sdk",
|
||||
"version": "17.6.0",
|
||||
"hash": "sha256-pogseJyMGIikTZORsDXKwyAhRPTkxiOAAV+ceR6/3K4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
"version": "1.1.0",
|
||||
@@ -144,21 +129,11 @@
|
||||
"version": "17.3.2",
|
||||
"hash": "sha256-wdLQSEjvFjApEKU82Ev+y1kHVxeIlrjkuj3wNktGQy8="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.TestPlatform.ObjectModel",
|
||||
"version": "17.6.0",
|
||||
"hash": "sha256-weQPisiWSuM5VEeZco4S0QHEXd2bZZwlbyHoaCET4uc="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.TestPlatform.TestHost",
|
||||
"version": "17.3.2",
|
||||
"hash": "sha256-ySBqawHGZ/Dwoj2UnAzk1Ezxt4qR1AuEY73U/buqNiE="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.TestPlatform.TestHost",
|
||||
"version": "17.6.0",
|
||||
"hash": "sha256-Ee2SKz5/571l1aYP0b/Gfamsz+v6cjzyu2sKTC6Ld5s="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Win32.Primitives",
|
||||
"version": "4.3.0",
|
||||
@@ -169,21 +144,11 @@
|
||||
"version": "2.2.10",
|
||||
"hash": "sha256-xpt9NDMDkoV/SzTWLgpKbqMOnhbUKZlBrdFwMGwpzHA="
|
||||
},
|
||||
{
|
||||
"pname": "MSTest.TestAdapter",
|
||||
"version": "3.0.4",
|
||||
"hash": "sha256-cxynZ6I681YIclJeGtv1OiAxMOdx7FDyVIzNOg10Tgo="
|
||||
},
|
||||
{
|
||||
"pname": "MSTest.TestFramework",
|
||||
"version": "2.2.10",
|
||||
"hash": "sha256-PEoY4N5F+xhQa6wXiX8SaVHAxw9C7fN+zSNfoModt0g="
|
||||
},
|
||||
{
|
||||
"pname": "MSTest.TestFramework",
|
||||
"version": "3.0.4",
|
||||
"hash": "sha256-aJqGvGfM2fl2dG05PFgPth/1qMhVpDRBMWuNu4yt4Dc="
|
||||
},
|
||||
{
|
||||
"pname": "NETStandard.Library",
|
||||
"version": "1.6.1",
|
||||
|
||||
@@ -41,13 +41,13 @@
|
||||
_experimental-update-script-combinators,
|
||||
}:
|
||||
let
|
||||
version = "13";
|
||||
version = "16";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.futo.org";
|
||||
owner = "videostreaming";
|
||||
repo = "Grayjay.Desktop";
|
||||
tag = version;
|
||||
hash = "sha256-cnOhyaeoDXPaeRJnJpx1HcegWitcfMJe/vezxZ/zpFQ=";
|
||||
hash = "sha256-2PCa9nP98htK9p5N6QPPZT6aYqaoAEBmag9JGnoujso=";
|
||||
fetchSubmodules = true;
|
||||
fetchLFS = true;
|
||||
};
|
||||
@@ -58,7 +58,7 @@ let
|
||||
sourceRoot = "source/Grayjay.Desktop.Web";
|
||||
|
||||
npmBuildScript = "build";
|
||||
npmDepsHash = "sha256-3nPzQcDWhPCdLrPvwGY+K0t1OSxWrVwQ3hH7i0eynRU=";
|
||||
npmDepsHash = "sha256-3yJIPkuEvkFL9Wb4y/r0yEULQbXx/wHqicFBLzOPj68=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@@ -114,7 +114,6 @@ buildDotnetModule (finalAttrs: {
|
||||
];
|
||||
|
||||
testProjectFile = [
|
||||
"Grayjay.Desktop.Tests/Grayjay.Desktop.Tests.csproj"
|
||||
"Grayjay.Engine/Grayjay.Engine.Tests/Grayjay.Engine.Tests.csproj"
|
||||
];
|
||||
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "legendary-heroic";
|
||||
version = "0.20.39";
|
||||
version = "0.20.41";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Heroic-Games-Launcher";
|
||||
repo = "legendary";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-2+9MRbwugBlBdZQQo6BUcLmwCqVdTAv9CZ+sPu5VAxY=";
|
||||
hash = "sha256-zX5Lyj8IDHETFyEpUaFnGaYZVs1hDy9rtwab1+rNlrw=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -30,13 +30,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "heroic-unwrapped";
|
||||
version = "2.19.1";
|
||||
version = "2.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Heroic-Games-Launcher";
|
||||
repo = "HeroicGamesLauncher";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-e+/FRvG9u6ZQsMGD5hqY+yLPjsbLSrjC9Wp0xdxVk6w=";
|
||||
hash = "sha256-gjQPQ/PwpDlBUfNF1JAlWUDGJa+7hwoQtouihdSCDqI=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-uwJYOm+2wGNRHAiIw1UjCBLBW6kjtj6AFLWihCqtL28=";
|
||||
hash = "sha256-JLUiPNxcOpwkYaabl2kP73fgr+WFyXQW8y6qDIb5gt4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+21
-27
@@ -1,19 +1,10 @@
|
||||
{
|
||||
stdenv,
|
||||
buildPythonApplication,
|
||||
colorclass,
|
||||
fetchPypi,
|
||||
fetchurl,
|
||||
installShellFiles,
|
||||
lib,
|
||||
linode-metadata,
|
||||
openapi3,
|
||||
packaging,
|
||||
pyyaml,
|
||||
requests,
|
||||
rich,
|
||||
setuptools,
|
||||
terminaltables,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -28,48 +19,51 @@ let
|
||||
|
||||
in
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "linode-cli";
|
||||
version = "5.56.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "linode_cli";
|
||||
inherit version;
|
||||
inherit (finalAttrs) version;
|
||||
hash = hash;
|
||||
};
|
||||
|
||||
build-system = [
|
||||
python3Packages.setuptools
|
||||
];
|
||||
|
||||
patches = [ ./remove-update-check.patch ];
|
||||
|
||||
# remove need for git history
|
||||
prePatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "version = get_version()" "version='${version}',"
|
||||
--replace "version = get_version()" "version='${finalAttrs.version}',"
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
python3 -m linodecli bake ${spec} --skip-config
|
||||
cp data-3 linodecli/
|
||||
echo "${version}" > baked_version
|
||||
echo "${finalAttrs.version}" > baked_version
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorclass
|
||||
linode-metadata
|
||||
pyyaml
|
||||
requests
|
||||
setuptools
|
||||
terminaltables
|
||||
rich
|
||||
openapi3
|
||||
packaging
|
||||
dependencies = [
|
||||
python3Packages.colorclass
|
||||
python3Packages.linode-metadata
|
||||
python3Packages.pyyaml
|
||||
python3Packages.requests
|
||||
python3Packages.terminaltables
|
||||
python3Packages.rich
|
||||
python3Packages.openapi3
|
||||
python3Packages.packaging
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
$out/bin/linode-cli --skip-config --version | grep ${version} > /dev/null
|
||||
$out/bin/linode-cli --skip-config --version | grep ${finalAttrs.version} > /dev/null
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
@@ -83,7 +77,7 @@ buildPythonApplication rec {
|
||||
|
||||
meta = {
|
||||
description = "Linode Command Line Interface";
|
||||
changelog = "https://github.com/linode/linode-cli/releases/tag/v${version}";
|
||||
changelog = "https://github.com/linode/linode-cli/releases/tag/v${finalAttrs.version}";
|
||||
downloadPage = "https://pypi.org/project/linode-cli";
|
||||
homepage = "https://github.com/linode/linode-cli";
|
||||
license = lib.licenses.bsd3;
|
||||
@@ -93,4 +87,4 @@ buildPythonApplication rec {
|
||||
];
|
||||
mainProgram = "linode-cli";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "lunar";
|
||||
version = "6.9.5";
|
||||
version = "6.9.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/alin23/Lunar/releases/download/v${finalAttrs.version}/Lunar-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-1Y0SFfGliGf1zf4k9iolotMzoAbBH27R0ablMmfeyDM=";
|
||||
hash = "sha256-CqxhLUL/Vnt665xcZFaXg/MWywca6j/pr03oLoyofYQ=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
}:
|
||||
let
|
||||
pname = "models-dev";
|
||||
version = "0-unstable-2026-02-14";
|
||||
version = "0-unstable-2026-02-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "models.dev";
|
||||
rev = "5a008354709f3331f1070cb2c70c184ac8845996";
|
||||
hash = "sha256-XMblZXkqrtZSHa0d96sbPtcMQCJfnHZdnQEpaZqc0O0=";
|
||||
rev = "c36b8e94339b004bddc0d84f816bcac14babe1ba";
|
||||
hash = "sha256-z8yswVNWuf/aDbwirp99nCw4VCfzCVIOB4+5s5CKo3I=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
diff --git a/src/nnn.c b/src/nnn.c
|
||||
index b3c0f986..c74e1ec9 100644
|
||||
index 108e2995..eb5a440d 100644
|
||||
--- a/src/nnn.c
|
||||
+++ b/src/nnn.c
|
||||
@@ -508,9 +508,7 @@ alignas(max_align_t) static char g_pipepath[TMP_LEN_MAX];
|
||||
@@ -572,9 +572,7 @@ alignas(max_align_t) static char g_pipepath[TMP_LEN_MAX];
|
||||
static runstate g_state;
|
||||
|
||||
/* Options to identify file MIME */
|
||||
-#if defined(__APPLE__)
|
||||
-#ifdef __APPLE__
|
||||
-#define FILE_MIME_OPTS "-bIL"
|
||||
-#elif !defined(__sun) /* no MIME option for 'file' */
|
||||
+#if !defined(__sun) /* no MIME option for 'file' */
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
readline,
|
||||
which,
|
||||
musl-fts,
|
||||
pcre,
|
||||
pcre2,
|
||||
gnused,
|
||||
# options
|
||||
conf ? null,
|
||||
@@ -28,13 +28,13 @@ assert withEmojis -> (!withIcons && !withNerdIcons);
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nnn";
|
||||
version = "5.1";
|
||||
version = "5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
repo = "nnn";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+2lFFBtaqRPBkEspCFtKl9fllbSR5MBB+4ks3Xh7vp4=";
|
||||
hash = "sha256-u+88aDHfOZ6bSkg6ahS6eNZWj2QCwJXKW+8nHR99kic=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ncurses
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isMusl musl-fts
|
||||
++ lib.optional withPcre pcre;
|
||||
++ lib.optional withPcre pcre2;
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isMusl {
|
||||
NIX_CFLAGS_COMPILE = "-I${musl-fts}/include";
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals withIcons [ "O_ICONS=1" ]
|
||||
++ lib.optionals withNerdIcons [ "O_NERD=1" ]
|
||||
++ lib.optionals withEmojis [ "O_EMOJI=1" ]
|
||||
++ lib.optionals withPcre [ "O_PCRE=1" ]
|
||||
++ lib.optionals withPcre [ "O_PCRE2=1" ]
|
||||
++ extraMakeFlags;
|
||||
|
||||
binPath = lib.makeBinPath [
|
||||
@@ -101,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/jarun/nnn/blob/v${finalAttrs.version}/CHANGELOG";
|
||||
license = lib.licenses.bsd2;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
mainProgram = "nnn";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
bison,
|
||||
boost,
|
||||
cairo,
|
||||
catch2_3,
|
||||
cgal,
|
||||
clipper2,
|
||||
double-conversion,
|
||||
@@ -56,12 +57,13 @@ let
|
||||
in
|
||||
clangStdenv.mkDerivation rec {
|
||||
pname = "openscad-unstable";
|
||||
version = "2021.01-unstable-2025-10-27";
|
||||
unstable_date = "2026-02-18";
|
||||
version = "2021.01-unstable-${unstable_date}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "openscad";
|
||||
repo = "openscad";
|
||||
rev = "aa785fe4ab3d52450a5e51eb73585ac9bbcc8798";
|
||||
hash = "sha256-TngfItArYtm8243DdYkQlkfc/MBTZGYrf08hfloWRWk=";
|
||||
rev = "231f4f8d5e3a0697825455cccbd2edb2fb9491cd";
|
||||
hash = "sha256-YAKXU3z4ZBviGnt0LFgrS6yeEMm3REdkhyfJ4bZ4Vo8=";
|
||||
fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD and manifold
|
||||
};
|
||||
|
||||
@@ -80,6 +82,7 @@ clangStdenv.mkDerivation rec {
|
||||
with libsForQt5;
|
||||
with qt5;
|
||||
[
|
||||
catch2_3
|
||||
clipper2
|
||||
glm
|
||||
onetbb
|
||||
@@ -121,7 +124,8 @@ clangStdenv.mkDerivation rec {
|
||||
"-DUSE_BUILTIN_OPENCSG=OFF"
|
||||
"-DUSE_BUILTIN_MANIFOLD=OFF"
|
||||
"-DUSE_BUILTIN_CLIPPER2=OFF"
|
||||
"-DOPENSCAD_VERSION=\"${builtins.replaceStrings [ "-" ] [ "." ] (lib.strings.getVersion version)}\""
|
||||
# Derive version from our unstable date
|
||||
"-DOPENSCAD_VERSION='${builtins.replaceStrings [ "-" ] [ "." ] unstable_date}-unstable'"
|
||||
"-DCMAKE_UNITY_BUILD=OFF" # broken compile with unity
|
||||
# IPO
|
||||
"-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld"
|
||||
@@ -148,6 +152,8 @@ clangStdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs scripts/
|
||||
|
||||
# Take Python3 executable as passed
|
||||
sed -e '/set(VENV_DIR /d' -i tests/cmake/ImageCompare.cmake
|
||||
sed -e '/find_path(VENV_BIN_PATH /d' -i tests/cmake/ImageCompare.cmake
|
||||
@@ -193,6 +199,7 @@ clangStdenv.mkDerivation rec {
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
hzeller
|
||||
pca006132
|
||||
raskin
|
||||
];
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
litestream,
|
||||
litestreamSupport ? false,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "picoshare";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtlynch";
|
||||
repo = "picoshare";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-8mgrwnY0Y1CggAtc7BrAqC32+Wu82FQNhoK0ijM1RKw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Wf0qKs/9XKnO2nx2KmTGPdqI0iFih30AGvOi94RPEjw=";
|
||||
|
||||
ldflags = [
|
||||
# make sure build time is always set to 0 to make the build reproducible
|
||||
"-X github.com/mtlynch/picoshare/v2/build.unixTime=0"
|
||||
# the app displays the version in the "system > information" menu
|
||||
"-X github.com/mtlynch/picoshare/v2/build.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
buildInputs = lib.optional litestreamSupport litestream;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Minimalist, easy-to-host service for sharing images and other files";
|
||||
homepage = "https://github.com/mtlynch/picoshare";
|
||||
license = lib.licenses.agpl3Only;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
mainProgram = "picoshare";
|
||||
maintainers = with lib.maintainers; [
|
||||
blokyk
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "plasma-plugin-blurredwallpaper";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bouteillerAlan";
|
||||
repo = "blurredwallpaper";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-xnO1C3jPkrooD7WUcclDrQp+iRXgOS4BRLB1tAdJRYk=";
|
||||
hash = "sha256-T0fE0Jqw3lIbGCK6kteU1pv1clzU8mMmrJr/UN5e0hg=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -99,6 +99,20 @@ stdenv.mkDerivation rec {
|
||||
--replace-fail "https://github.com/google/googletest/releases/download/v$googletestRev/googletest-$googletestRev.tar.gz" "$NIX_BUILD_TOP/deps/googletest-$googletestRev.tar"
|
||||
'';
|
||||
|
||||
# We do not concern ourselves with darwin as the ponyc compiler
|
||||
# has logic which overrides this environmental variable in this
|
||||
# case.
|
||||
env.arch =
|
||||
if stdenv.hostPlatform.isx86_64 then
|
||||
"x86-64"
|
||||
else if stdenv.hostPlatform.isAarch64 then
|
||||
"armv8-a"
|
||||
else
|
||||
lib.warn ''
|
||||
architecture '${stdenv.hostPlatform.system}' compiles with native optimizations,
|
||||
this may result in crashes on incompatible CPUs!
|
||||
'' "native";
|
||||
|
||||
preBuild = ''
|
||||
extraFlags=(build_flags=-j$NIX_BUILD_CORES)
|
||||
''
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ buildGoModule rec {
|
||||
|
||||
vendorHash = "sha256-iNV4VrdQONq7LXwAc6AaUROHy8TmmloUAL8EmuPtF/o=";
|
||||
|
||||
patches = [ ./idrac-exporter/config-from-environment.patch ];
|
||||
patches = [ ./config-from-environment.patch ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user