Merge master into staging-next
This commit is contained in:
@@ -1321,6 +1321,12 @@
|
||||
githubId = 5892756;
|
||||
name = "Alec Snyder";
|
||||
};
|
||||
allout58 = {
|
||||
email = "jamesthollowell@gmail.com";
|
||||
github = "allout58";
|
||||
githubId = 2939703;
|
||||
name = "James Hollowell";
|
||||
};
|
||||
allusive = {
|
||||
email = "jasper@allusive.dev";
|
||||
name = "Allusive";
|
||||
@@ -7129,6 +7135,13 @@
|
||||
github = "dvcorreia";
|
||||
githubId = 20357938;
|
||||
};
|
||||
dvdznf = {
|
||||
name = "David Zanfir";
|
||||
github = "Dvd-Znf";
|
||||
githubId = 101937630;
|
||||
email = "email@dvdznf.xyz";
|
||||
matrix = "@dvdznf:gitter.im";
|
||||
};
|
||||
dvn0 = {
|
||||
email = "git@dvn.me";
|
||||
github = "dvn0";
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
{ maintainer }:
|
||||
{
|
||||
maintainer, # --argstr
|
||||
short ? false, # use --arg short true
|
||||
extra ? "", # --argstr
|
||||
}:
|
||||
let
|
||||
pkgs = import ./../../default.nix {
|
||||
config.allowAliases = false;
|
||||
@@ -30,7 +34,7 @@ let
|
||||
) set
|
||||
));
|
||||
|
||||
packages = packagesWith (
|
||||
packages = builtins.trace "evaluating list of packages for maintainer: ${maintainer}" packagesWith (
|
||||
name: pkg:
|
||||
(
|
||||
if builtins.hasAttr "meta" pkg && builtins.hasAttr "maintainers" pkg.meta then
|
||||
@@ -46,23 +50,45 @@ let
|
||||
) (name: name) "" pkgs;
|
||||
|
||||
in
|
||||
pkgs.stdenv.mkDerivation {
|
||||
name = "nixpkgs-update-script";
|
||||
pkgs.stdenvNoCC.mkDerivation {
|
||||
name = "check-hydra-by-maintainer";
|
||||
buildInputs = [ pkgs.hydra-check ];
|
||||
buildCommand = ''
|
||||
echo ""
|
||||
echo "----------------------------------------------------------------"
|
||||
echo ""
|
||||
echo "nix-shell maintainers/scripts/check-hydra-by-maintainer.nix --argstr maintainer SuperSandro2000"
|
||||
echo "nix-shell maintainers/scripts/check-hydra-by-maintainer.nix --argstr maintainer yourname"
|
||||
echo ""
|
||||
echo "nix-shell maintainers/scripts/check-hydra-by-maintainer.nix --argstr maintainer yourname --arg short true"
|
||||
echo ""
|
||||
echo "nix-shell maintainers/scripts/check-hydra-by-maintainer.nix --argstr maintainer yourname --argstr extra \"--json\""
|
||||
echo ""
|
||||
echo "----------------------------------------------------------------"
|
||||
exit 1
|
||||
'';
|
||||
shellHook = ''
|
||||
unset shellHook # do not contaminate nested shells
|
||||
echo "Please stand by"
|
||||
echo nix-shell -p hydra-check --run "hydra-check ${builtins.concatStringsSep " " packages}"
|
||||
nix-shell -p hydra-check --run "hydra-check ${builtins.concatStringsSep " " packages}"
|
||||
exit $?
|
||||
'';
|
||||
shellHook =
|
||||
let
|
||||
# trying to only add spaces as necessary for optional args
|
||||
# with optStr don't need spaces between nix templating
|
||||
optStr = cond: string: lib.optionalString cond "${string} ";
|
||||
args = [
|
||||
"hydra-check"
|
||||
]
|
||||
++ (lib.optional short "--short")
|
||||
++ (lib.optional (extra != "") extra)
|
||||
++ (map lib.escapeShellArg packages);
|
||||
command = lib.concatStringsSep " " args;
|
||||
in
|
||||
''
|
||||
# if user presses ctrl-c during run
|
||||
# pass on ctrl-c to fully quit rather than exiting to nix-shell
|
||||
function ctrl_c() {
|
||||
exit 130
|
||||
}
|
||||
trap ctrl_c INT
|
||||
echo "Please stand by"
|
||||
echo "${command}"
|
||||
${command}
|
||||
exit $?
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -194,6 +194,8 @@
|
||||
|
||||
- [nixbit](https://github.com/pbek/nixbit), a GUI application for updating your NixOS system from a Nix Flakes Git repository. Available as [programs.nixbit](#opt-programs.nixbit.enable).
|
||||
|
||||
- [ErsatzTV](https://ersatztv.org), a personal IPTV server. Available as [services.ersatztv](#opt-services.ersatztv.enable)
|
||||
|
||||
## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
@@ -833,6 +833,7 @@
|
||||
./services/misc/dwm-status.nix
|
||||
./services/misc/dysnomia.nix
|
||||
./services/misc/errbot.nix
|
||||
./services/misc/ersatztv.nix
|
||||
./services/misc/etebase-server.nix
|
||||
./services/misc/etesync-dav.nix
|
||||
./services/misc/evdevremapkeys.nix
|
||||
|
||||
@@ -265,7 +265,8 @@ in
|
||||
++ (with pkgs.pantheon; [
|
||||
elementary-files
|
||||
elementary-settings-daemon
|
||||
xdg-desktop-portal-pantheon
|
||||
# https://github.com/elementary/portals/issues/157
|
||||
# xdg-desktop-portal-pantheon
|
||||
])
|
||||
) config.environment.pantheon.excludePackages;
|
||||
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
mkIf
|
||||
getExe
|
||||
maintainers
|
||||
mkEnableOption
|
||||
mkOption
|
||||
mkPackageOption
|
||||
;
|
||||
inherit (lib.types)
|
||||
str
|
||||
path
|
||||
bool
|
||||
float
|
||||
int
|
||||
;
|
||||
cfg = config.services.ersatztv;
|
||||
defaultEnv = {
|
||||
ETV_UI_PORT = 8409;
|
||||
ETV_BASE_URL = "/";
|
||||
};
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.ersatztv = {
|
||||
enable = mkEnableOption "ErsatzTV";
|
||||
|
||||
package = mkPackageOption pkgs "ersatztv" { };
|
||||
|
||||
user = mkOption {
|
||||
type = str;
|
||||
default = "ersatztv";
|
||||
description = "User account under which ErsatzTV runs.";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = str;
|
||||
default = "ersatztv";
|
||||
description = "Group under which ErsatzTV runs.";
|
||||
};
|
||||
|
||||
environment = mkOption {
|
||||
type =
|
||||
with lib.types;
|
||||
attrsOf (oneOf [
|
||||
str
|
||||
int
|
||||
float
|
||||
bool
|
||||
]);
|
||||
default = defaultEnv;
|
||||
example = {
|
||||
ETV_UI_PORT = 8000;
|
||||
ETV_STREAMING_PORT = 8001;
|
||||
};
|
||||
description = "Environment variables to set for the ErsatzTV service.";
|
||||
};
|
||||
|
||||
baseUrl = mkOption {
|
||||
type = str;
|
||||
default = "/";
|
||||
description = ''
|
||||
Base URL to support reverse proxies that use paths (e.g. `/ersatztv`)
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Open the default ports in the firewall for the server.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.ersatztv.environment = lib.mapAttrs (_: lib.mkDefault) defaultEnv;
|
||||
|
||||
systemd = {
|
||||
services.ersatztv = {
|
||||
description = "ErsatzTV";
|
||||
after = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
DynamicUser = true;
|
||||
UMask = "0077";
|
||||
StateDirectory = "ersatztv";
|
||||
WorkingDirectory = "/var/lib/ersatztv";
|
||||
ExecStart = getExe cfg.package;
|
||||
Restart = "on-failure";
|
||||
};
|
||||
|
||||
# Set environment variables for the service, using known values for ETV_CONFIG_FOLDER and ETV_TRANSCODE_FOLDER, and allowing overrides from cfg.environment
|
||||
environment = {
|
||||
ETV_CONFIG_FOLDER = "/var/lib/ersatztv/config";
|
||||
ETV_TRANSCODE_FOLDER = "/var/lib/ersatztv/transcode";
|
||||
}
|
||||
// cfg.environment;
|
||||
};
|
||||
};
|
||||
|
||||
users.users = mkIf (cfg.user == "ersatztv") {
|
||||
ersatztv = {
|
||||
inherit (cfg) group;
|
||||
isSystemUser = true;
|
||||
};
|
||||
};
|
||||
|
||||
users.groups = mkIf (cfg.group == "ersatztv") { ersatztv = { }; };
|
||||
|
||||
networking.firewall = mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = [
|
||||
cfg.environment.ETV_UI_PORT
|
||||
];
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ allout58 ];
|
||||
}
|
||||
@@ -41,13 +41,38 @@ in
|
||||
Enable the Guacamole web application in a Tomcat webserver.
|
||||
'';
|
||||
};
|
||||
|
||||
logbackXml = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
example = "/path/to/logback.xml";
|
||||
description = ''
|
||||
Configuration file that correspond to `logback.xml`.
|
||||
'';
|
||||
};
|
||||
|
||||
userMappingXml = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
example = "/path/to/user-mapping.xml";
|
||||
description = ''
|
||||
Configuration file that correspond to `user-mapping.xml`.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
# Setup configuration files.
|
||||
environment.etc."guacamole/guacamole.properties" = lib.mkIf (cfg.settings != { }) {
|
||||
source = (settingsFormat.generate "guacamole.properties" cfg.settings);
|
||||
};
|
||||
environment.etc."guacamole/logback.xml" = lib.mkIf (cfg.logbackXml != null) {
|
||||
source = cfg.logbackXml;
|
||||
};
|
||||
environment.etc."guacamole/user-mapping.xml" = lib.mkIf (cfg.userMappingXml != null) {
|
||||
source = cfg.userMappingXml;
|
||||
};
|
||||
|
||||
services = lib.mkIf cfg.enableWebserver {
|
||||
tomcat = {
|
||||
|
||||
@@ -8,6 +8,16 @@ let
|
||||
cfg = config.services.guacamole-server;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "guacamole-server" "logbackXml" ]
|
||||
[ "services" "guacamole-client" "logbackXml" ]
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "guacamole-server" "userMappingXml" ]
|
||||
[ "services" "guacamole-client" "userMappingXml" ]
|
||||
)
|
||||
];
|
||||
options = {
|
||||
services.guacamole-server = {
|
||||
enable = lib.mkEnableOption "Apache Guacamole Server (guacd)";
|
||||
@@ -39,36 +49,10 @@ in
|
||||
'';
|
||||
type = lib.types.port;
|
||||
};
|
||||
|
||||
logbackXml = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
example = "/path/to/logback.xml";
|
||||
description = ''
|
||||
Configuration file that correspond to `logback.xml`.
|
||||
'';
|
||||
};
|
||||
|
||||
userMappingXml = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
example = "/path/to/user-mapping.xml";
|
||||
description = ''
|
||||
Configuration file that correspond to `user-mapping.xml`.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
# Setup configuration files.
|
||||
environment.etc."guacamole/logback.xml" = lib.mkIf (cfg.logbackXml != null) {
|
||||
source = cfg.logbackXml;
|
||||
};
|
||||
environment.etc."guacamole/user-mapping.xml" = lib.mkIf (cfg.userMappingXml != null) {
|
||||
source = cfg.userMappingXml;
|
||||
};
|
||||
|
||||
systemd.services.guacamole-server = {
|
||||
description = "Apache Guacamole server (guacd)";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
@@ -523,6 +523,7 @@ in
|
||||
};
|
||||
ergo = runTest ./ergo.nix;
|
||||
ergochat = runTest ./ergochat.nix;
|
||||
ersatztv = handleTest ./ersatztv.nix { };
|
||||
esphome = runTest ./esphome.nix;
|
||||
etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };
|
||||
etcd = import ./etcd/default.nix { inherit pkgs runTest; };
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
import ./make-test-python.nix (
|
||||
{ lib, ... }:
|
||||
|
||||
{
|
||||
name = "ersatztv";
|
||||
meta.maintainers = with lib.maintainers; [ allout58 ];
|
||||
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
{
|
||||
services.ersatztv.enable = true;
|
||||
};
|
||||
|
||||
# ErsatzTV doesn't really have an API to speak of currently, so just check if it responds at all
|
||||
testScript = ''
|
||||
machine.wait_for_unit("ersatztv.service")
|
||||
machine.wait_for_open_port(8409)
|
||||
machine.succeed("curl --fail http://localhost:8409/")
|
||||
'';
|
||||
}
|
||||
)
|
||||
@@ -116,6 +116,7 @@ mapAliases (
|
||||
peskcolor-vim = throw "peskcolor-vim has been removed: abandoned by upstream"; # Added 2024-08-23
|
||||
polyglot = vim-polyglot;
|
||||
prettyprint = vim-prettyprint;
|
||||
pure-lua = lib.warnOnInstantiate "Please replace 'pure-lua' with 'moonlight-nvim' as this name was an error" moonlight-nvim; # Added 2025-11-17
|
||||
quickrun = vim-quickrun;
|
||||
rainbow_parentheses = rainbow_parentheses-vim;
|
||||
repeat = vim-repeat;
|
||||
|
||||
@@ -9148,6 +9148,19 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
moonlight-nvim = buildVimPlugin {
|
||||
pname = "moonlight.nvim";
|
||||
version = "2021-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "shaunsingh";
|
||||
repo = "moonlight.nvim";
|
||||
rev = "e24e4218ec680b6396532808abf57ca0ada82e66";
|
||||
sha256 = "0m9w3fpypsqxydjd93arbjqb5576nl40iy27i4ijlrqhgdhl49y3";
|
||||
};
|
||||
meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
moonscript-vim = buildVimPlugin {
|
||||
pname = "moonscript-vim";
|
||||
version = "2016-11-22";
|
||||
@@ -13131,19 +13144,6 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
pure-lua = buildVimPlugin {
|
||||
pname = "pure-lua";
|
||||
version = "2021-05-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "shaunsingh";
|
||||
repo = "moonlight.nvim";
|
||||
rev = "e24e4218ec680b6396532808abf57ca0ada82e66";
|
||||
sha256 = "0m9w3fpypsqxydjd93arbjqb5576nl40iy27i4ijlrqhgdhl49y3";
|
||||
};
|
||||
meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
purescript-vim = buildVimPlugin {
|
||||
pname = "purescript-vim";
|
||||
version = "2023-02-06";
|
||||
|
||||
@@ -702,6 +702,7 @@ https://github.com/tomasr/molokai/,,
|
||||
https://github.com/benlubas/molten-nvim/,HEAD,
|
||||
https://github.com/jackplus-xyz/monaspace.nvim/,HEAD,
|
||||
https://github.com/loctvl842/monokai-pro.nvim/,HEAD,
|
||||
https://github.com/shaunsingh/moonlight.nvim/,,
|
||||
https://github.com/leafo/moonscript-vim/,HEAD,
|
||||
https://github.com/yegappan/mru/,,
|
||||
https://github.com/jake-stewart/multicursor.nvim/,HEAD,
|
||||
@@ -1008,7 +1009,6 @@ https://github.com/GnikDroy/projections.nvim/,HEAD,
|
||||
https://github.com/kevinhwang91/promise-async/,HEAD,
|
||||
https://github.com/frigoeu/psc-ide-vim/,,
|
||||
https://github.com/Shougo/pum.vim/,HEAD,
|
||||
https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
|
||||
https://github.com/purescript-contrib/purescript-vim/,,
|
||||
https://github.com/python-mode/python-mode/,,
|
||||
https://github.com/vim-python/python-syntax/,,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
stdenvNoCC,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pnpm,
|
||||
nodejs,
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
vsix = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
vsix = stdenv.mkDerivation (finalAttrs: {
|
||||
name = "gitlens-${finalAttrs.version}.zip";
|
||||
pname = "gitlens-vsix";
|
||||
version = "17.7.1";
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
mkDerivation,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
qttools,
|
||||
qtbase,
|
||||
@@ -18,6 +19,20 @@ mkDerivation rec {
|
||||
hash = "sha256-eKnGCYxC3b7qd/g2IMDyZveBg+jvFA9s3tWEGeTPSkU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix the build with CMake 4
|
||||
(fetchpatch {
|
||||
name = "update-Argengine.patch";
|
||||
url = "https://github.com/juzzlin/Heimer/commit/76d9e8458038d2da4171be3a58766b84334119e8.patch";
|
||||
hash = "sha256-mFzfxxhaJ1jdwfFVo36N66+jzS/scEeray1s75c+T8M=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "update-SimpleLogger.patch";
|
||||
url = "https://github.com/juzzlin/Heimer/commit/75bff37b6ebd02d9f734e70ee4d3c10ec0291e0d.patch";
|
||||
hash = "sha256-ZPj5GaM13UsGwJbc0NW0xJd07agZT+g86674i3apqWY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
@@ -264,13 +264,13 @@
|
||||
"vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI="
|
||||
},
|
||||
"datadog_datadog": {
|
||||
"hash": "sha256-bl9hs1mjzmh8ePH94/PZTXt4yGz5+Ma0YFpxI+it6eg=",
|
||||
"hash": "sha256-3McGeaYAMXJKD4C/5L9VIA0Cwt87arm3UB3ifkd6fV0=",
|
||||
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
||||
"owner": "DataDog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.79.0",
|
||||
"rev": "v3.80.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-l+eOOc+Mi3z0VQDX+7+JrNNTRKDAOr3JKFw1WJt8OIE="
|
||||
"vendorHash": "sha256-neEEhCNceYDNqo8u6sPeBhCztD6iKxl3kylKyfHbkDE="
|
||||
},
|
||||
"datadrivers_nexus": {
|
||||
"hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=",
|
||||
@@ -1372,13 +1372,13 @@
|
||||
"vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y="
|
||||
},
|
||||
"topicusonderwijs_octodns": {
|
||||
"hash": "sha256-ji1XD2CoLpTf4slPJcADwpceWmr3a8l9v7043gKOl/s=",
|
||||
"hash": "sha256-fjLJkIXW7KkxJZwpCxE8upJ5J4D9bt46rmfCVtXFcZ8=",
|
||||
"homepage": "https://registry.terraform.io/providers/topicusonderwijs/octodns",
|
||||
"owner": "topicusonderwijs",
|
||||
"repo": "terraform-provider-octodns",
|
||||
"rev": "v1.1.2",
|
||||
"rev": "v1.1.4",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Mn2K1xt2oB4F+3IuraKngB+3egGrxvzhthy1oLxGyCs="
|
||||
"vendorHash": "sha256-6QgkZp3Ay5bRLwy8dxT5904KW2rBcz5yrYqIlvQToJk="
|
||||
},
|
||||
"trozz_pocketid": {
|
||||
"hash": "sha256-rUCjvJKLZE+cSsHZdntBF9WpZDtIkVkukmLGEvGVC8s=",
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "application-title-bar";
|
||||
version = "0.8.6";
|
||||
version = "0.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antroids";
|
||||
repo = "application-title-bar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IJb2ECsFoA+YpegV0Fqk8rsNfym7KU7O79mwFdTr9gE=";
|
||||
hash = "sha256-zcxZlQCLLtY5swqPpe0OvpJMykPEWPD4jrGslW7snP8=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = with kdePackages; [ kconfig ];
|
||||
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
atlas = fetchurl {
|
||||
url = "http://astrolog.org/ftp/atlas/atlasbig.as";
|
||||
hash = "sha256-5DVfW3IaOwOguH9cv2opr1gIWo+K/Q2bLtRM35oD/EM=";
|
||||
hash = "sha256-sEiuc7azeBA5959QOIo0qllXqHo7LABGV4sB08xNWsM=";
|
||||
};
|
||||
in
|
||||
''
|
||||
|
||||
@@ -35,6 +35,6 @@ buildGoModule (finalAttrs: {
|
||||
description = "Terraform Pull Request Automation";
|
||||
mainProgram = "atlantis";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ jpotier ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -12,18 +12,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdk8s-cli";
|
||||
version = "2.203.1";
|
||||
version = "2.203.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdk8s-team";
|
||||
repo = "cdk8s-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-vp4AdAreL7qFp91l0OTwHJuqatCrBRRlXZ4cydQy2H0=";
|
||||
hash = "sha256-VgrGav7qUssp1sTEiXQCD+hBVWX/Mu2JGOIy1BhaG3M=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-0lsA4FabwKF5JoCU2JlcEcgldGeICUZtl1kAcI7sqSQ=";
|
||||
hash = "sha256-51o+GonTUES6WKNx5Iwfv5gK1h2MBfcMNukr2HcV0Gg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
openssl,
|
||||
perl,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
protobuf_32,
|
||||
python3,
|
||||
rapidjson,
|
||||
re2,
|
||||
@@ -165,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libbacktrace
|
||||
lz4
|
||||
nlohmann_json # alternative JSON parser to rapidjson
|
||||
protobuf # substrait requires protobuf
|
||||
protobuf_32 # substrait requires protobuf
|
||||
rapidjson
|
||||
re2
|
||||
snappy
|
||||
@@ -177,7 +177,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals enableFlight [
|
||||
grpc
|
||||
openssl
|
||||
protobuf
|
||||
sqlite
|
||||
]
|
||||
++ lib.optionals enableS3 [
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
}:
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "cerberus";
|
||||
version = "0-unstable-2025-11-09";
|
||||
version = "0-unstable-2025-11-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rems-project";
|
||||
repo = "cerberus";
|
||||
rev = "4a1896590a1808b6ec15967b79c544b0fcdbd76a";
|
||||
hash = "sha256-M36dz6cQxU8b0H00Uvk6U0otWlkHJMP5CPQuCrbKncc=";
|
||||
rev = "35d1ec8919c9813dd1b3770dccf53260ac5b7f73";
|
||||
hash = "sha256-OQo/w49Z7+SGyKdePsSXplglo1gSNfnxNw85lcv0nc0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cgal";
|
||||
version = "6.0.2";
|
||||
version = "6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/CGAL/cgal/releases/download/v${finalAttrs.version}/CGAL-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-8wxb58JaKj6iS8y6q1z2P6/aY8AnnzTX5/izISgh/tY=";
|
||||
sha256 = "sha256-YY2oqLP1vka08KR6Hvs8nmwD1qqw9VMdVtNV0ycB158=";
|
||||
};
|
||||
|
||||
patches = [ ./cgal_path.patch ];
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
dotnetCorePackages,
|
||||
buildDotnetModule,
|
||||
ffmpeg,
|
||||
which,
|
||||
}:
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "ersatztv";
|
||||
version = "25.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ErsatzTV";
|
||||
repo = "ErsatzTV";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FuuX/SxhzzUn7ELJDXJuILkl3ubR3V+5hQwILvZZrFg=";
|
||||
};
|
||||
|
||||
buildInputs = [ ffmpeg ];
|
||||
|
||||
projectFile = "ErsatzTV/ErsatzTV.csproj";
|
||||
executables = [
|
||||
"ErsatzTV"
|
||||
"ErsatzTV.Scanner"
|
||||
];
|
||||
nugetDeps = ./nuget-deps.json;
|
||||
dotnet-sdk = dotnetCorePackages.sdk_9_0;
|
||||
dotnet-runtime = dotnetCorePackages.aspnetcore_9_0;
|
||||
|
||||
# ETV uses `which` to find `ffmpeg` and `ffprobe`
|
||||
makeWrapperArgs = [
|
||||
"--suffix"
|
||||
"PATH"
|
||||
":"
|
||||
"${lib.makeBinPath [
|
||||
ffmpeg
|
||||
which
|
||||
]}"
|
||||
];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Stream custom live channels using your own media";
|
||||
homepage = "https://ersatztv.org/";
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ allout58 ];
|
||||
mainProgram = "ErsatzTV";
|
||||
platforms = dotnet-runtime.meta.platforms;
|
||||
};
|
||||
}
|
||||
Executable
+16
@@ -0,0 +1,16 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts gnused nix coreutils
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
latestVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/ersatztv/ersatztv/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')"
|
||||
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; ersatztv.version or (lib.getVersion ersatztv)" | tr -d '"')
|
||||
|
||||
if [[ "$currentVersion" == "$latestVersion" ]]; then
|
||||
echo "ersatztv is up-to-date: $currentVersion"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
update-source-version ersatztv "$latestVersion"
|
||||
|
||||
$(nix-build . -A ersatztv.fetch-deps --no-out-link)
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "fiddler-everywhere";
|
||||
version = "7.4.0";
|
||||
version = "7.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage";
|
||||
hash = "sha256-9YkYy+vzW88rpcYTrCsfQXXJL8W8W4D84Cf8e9zEcJg=";
|
||||
hash = "sha256-IwZ2Jt9s2kDgjCM3pm5o3iLb2xYtp596109/nLXFgvs=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "firefly-iii";
|
||||
version = "6.4.6";
|
||||
version = "6.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firefly-iii";
|
||||
repo = "firefly-iii";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BgNBhk0RrW0pmtkOfAaMt7qVA7AP+XNLnug9wqn6/XA=";
|
||||
hash = "sha256-Jk4VYGi1OYQCOiPywLOTvGeEfkbc3FuhBxSir+nTQW0=";
|
||||
};
|
||||
|
||||
buildInputs = [ php84 ];
|
||||
@@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
composerNoScripts = true;
|
||||
composerStrictValidation = true;
|
||||
strictDeps = true;
|
||||
vendorHash = "sha256-SjdKofnTkIB+gmREBit72EWfn+mQNPhjHHEIe8QYef8=";
|
||||
vendorHash = "sha256-DLWrYV7VTut2f5K8z3OeFF6O4csK9ibGbsz575YI+DA=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
hash = "sha256-jcb7yhuYTKRaDDwtPTCbwdbL2Mq8Hm1EPvDOAXo3ZTQ=";
|
||||
hash = "sha256-mOhorHUC7mWJnx6UKEl2VABlC7ZK5fA9u+B5auTLIIc=";
|
||||
};
|
||||
|
||||
preInstall = ''
|
||||
|
||||
@@ -10,11 +10,11 @@ let
|
||||
owner = "superseriousbusiness";
|
||||
repo = "gotosocial";
|
||||
|
||||
version = "0.20.1";
|
||||
version = "0.20.2";
|
||||
|
||||
web-assets = fetchurl {
|
||||
url = "https://${domain}/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz";
|
||||
hash = "sha256-0WvaPUVTMYd1tz7Rtmlp37vx/co4efhDdSWBc4gUzAU=";
|
||||
hash = "sha256-85tFn3LsuMbLoiH6FFtBK60GhclfTsSiI7K/iNLadjY=";
|
||||
};
|
||||
in
|
||||
buildGo124Module rec {
|
||||
@@ -24,7 +24,7 @@ buildGo124Module rec {
|
||||
src = fetchFromGitea {
|
||||
inherit domain owner repo;
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8z2tBiEVcof0/G41gpc0S8Dye5nynwHSJpTzo/ZseFs=";
|
||||
hash = "sha256-H5+1BZ1jIISU6EPszIuOhqowoMe9WF36BGwV7TpAqj8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
@@ -73,7 +73,10 @@ buildGo124Module rec {
|
||||
advertised to! A light-weight alternative to Mastodon
|
||||
and Pleroma, with support for clients!
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ blakesmith ];
|
||||
maintainers = with lib.maintainers; [
|
||||
blakesmith
|
||||
cherrykitten
|
||||
];
|
||||
license = lib.licenses.agpl3Only;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,10 +10,10 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gremlin-console";
|
||||
version = "3.7.4";
|
||||
version = "3.8.0";
|
||||
src = fetchzip {
|
||||
url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
|
||||
sha256 = "sha256-Z971M4W359WKs2NjLeWej5IVHnFu5LLsffxl0jraB60=";
|
||||
sha256 = "sha256-vTv2a3+Ezd87ph4BnRaypPuUz0/s8DFcHVsKaURucTY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprlang";
|
||||
version = "0.6.5";
|
||||
version = "0.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprlang";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-BRPZIWse1Ayat/FwOl52YGHoDC91oQ3HAQuirnNpwew=";
|
||||
hash = "sha256-APyQ4L05EHRbQFS1t7nXex4u+g9Sh8J70W80djOnmI4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubernetes";
|
||||
version = "1.34.1";
|
||||
version = "1.34.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-18AMfS2OnInTmdr5fLwtuKaeyGQSiAtk29BjuHl6qQA=";
|
||||
hash = "sha256-3rQyoGt9zTeF8+PIhA5p+hHY1V5O8CawvKWscf/r9RM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
Fix clang build: https://github.com/Nuand/bladeRF/pull/1045.patch
|
||||
--- a/host/utilities/bladeRF-cli/src/cmd/flash_image.c
|
||||
+++ b/host/utilities/bladeRF-cli/src/cmd/flash_image.c
|
||||
@@ -68,7 +68,7 @@ static int handle_param(const char *param, char *val,
|
||||
status = CLI_RET_INVPARAM;
|
||||
} else {
|
||||
for (i = 0; i < len && status == 0; i++) {
|
||||
- if (val[i] >= 'a' || val[i] <= 'f') {
|
||||
+ if (val[i] >= 'a' && val[i] <= 'f') {
|
||||
val[i] -= 'a' - 'A';
|
||||
} else if (!((val[i] >= '0' && val[i] <= '9') ||
|
||||
(val[i] >= 'A' && val[i] <= 'F'))) {
|
||||
@@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix clang build: https://github.com/Nuand/bladeRF/pull/1045
|
||||
./clang-fix.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libqalculate";
|
||||
version = "5.8.1";
|
||||
version = "5.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "libqalculate";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SxBO3isyxiJBwo12mVH6A/pmHxTgjfMhG6KVb7bk5B4=";
|
||||
hash = "sha256-oA4AcsnyBhH6YtyHAb5Duzf5vGhY3tJT0Su3C09xOPU=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -25,16 +25,16 @@ let
|
||||
."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
hash =
|
||||
{
|
||||
x64-linux_hash = "sha256-Cji5hYEDvatOU0ExpggDWJEWSEXZTSpMGKm7Z5d44kc=";
|
||||
arm64-linux_hash = "sha256-RWVlTnOENQ+/H6Mmkcim+Lu5tJvMBB26v/to4q61P40=";
|
||||
x64-osx_hash = "sha256-rXUqzv6L0WJAoiQVm9UcG1OwCU8B2HmkiTOerZL19W4=";
|
||||
arm64-osx_hash = "sha256-S23cPgEiqkeNW/J1kvI1QXZeYfrzb1GrD6YVFBKwm6M=";
|
||||
x64-linux_hash = "sha256-IPF1rsK5CN4q4GtyVE2uUE79212yqX6k42hm3lO8L6U=";
|
||||
arm64-linux_hash = "sha256-/1gCHUt3sDEMkEE6vU8wNs/VAxL+exkunWiNSC5MvzY=";
|
||||
x64-osx_hash = "sha256-e+AiZoLRNv2TFTTtrhQkVr5yL5e9EQJj7nAHhLgJurI=";
|
||||
arm64-osx_hash = "sha256-724Y8IBvpAeIB07HtqSkXiyQua1jHO0jD3vjWw0kZpc=";
|
||||
}
|
||||
."${arch}-${os}_hash";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lidarr";
|
||||
version = "3.0.1.4866";
|
||||
version = "3.1.0.4875";
|
||||
|
||||
src = fetchurl {
|
||||
inherit hash;
|
||||
|
||||
@@ -13,8 +13,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "ltspice";
|
||||
version = "24.1.10";
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20251028221949/https://ltspice.analog.com/software/LTspice64.msi";
|
||||
hash = "sha256-LSK84ogbBk9kP7LKg8rzCGDqq36XfsK4Kzn2Zwea8C4=";
|
||||
url = "https://web.archive.org/web/20251117140534if_/https://ltspice.analog.com/software/LTspice64.msi";
|
||||
hash = "sha256-2t/6idUniSRHLdJQ+5OuvcRNGRIs2PR0iiezpZ0ovY8=";
|
||||
};
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "models-dev";
|
||||
version = "0-unstable-2025-11-14";
|
||||
version = "0-unstable-2025-11-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sst";
|
||||
repo = "models.dev";
|
||||
rev = "83a038148a44242ab39430d41d88e862f782e796";
|
||||
hash = "sha256-dRHnDRMVObcE26MrD8DCdkdMrxhHYIBF+ZGJTfsrxNs=";
|
||||
rev = "0cb3e3498ba712bd31528926d2efdd26e925267b";
|
||||
hash = "sha256-ICMR59DaqriZZmO7260iuyMjuIRJ9AYtWlzVZY0KFXw=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "11.82";
|
||||
version = "11.84";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
|
||||
hash = "sha256-M/ndWIga0FTqOQcekFRT4sQ3gpPsQKSdOVHmx8kiQZI=";
|
||||
hash = "sha256-nngsqOfTEv+Me6OEAX2C7U2meaDZn64sF0BwDQtXKnA=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "moor";
|
||||
version = "2.8.2";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "walles";
|
||||
repo = "moor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-c2ypM5xglQbvgvU2Eq7sgMpNHSAsKEBDwQZC/Sf4GPU=";
|
||||
hash = "sha256-vnK/Lo/CK39gsX2FyXoB0Q7FpJ5+5AZrpVxCBkuupOQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ve8QT2dIUZGTFYESt9vIllGTan22ciZr8SQzfqtqQfw=";
|
||||
vendorHash = "sha256-FNkXrmNV8Gj2gAJX9a3wXiJ36/9edQFMIc6eAR9AYRU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "nodemon";
|
||||
version = "3.1.10";
|
||||
version = "3.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "remy";
|
||||
repo = "nodemon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wr/HNa+iqHhlE/Qp62d1EgcwA6hsv8CsJg9NLgEa15g=";
|
||||
hash = "sha256-nW3JTbz5fJ7nEqsB1ER7N3IiOu2GkUl5o9vZQZzkfxI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-cZHfaUWhKZYKRe4Foc2UymZ8hTPrGLzlcXe1gMsW1pU=";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "orchard";
|
||||
version = "0.42.0";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = "orchard";
|
||||
rev = version;
|
||||
hash = "sha256-EeH37j6ecgRiIGV24wL+yX0BJQE+6rGVGr14zgHaOko=";
|
||||
hash = "sha256-ALzXiH81i5P+sRxpEA3JI9oFmdbsnMCDfuOO74Sb+eA=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -25,7 +25,7 @@ buildGoModule rec {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VhDPPWj3gQdUJXqcUPg6U4ZBERstWGoKTJ7FIfe0hWs=";
|
||||
vendorHash = "sha256-hL8gtGHdANY7s3DM2zzJhDYmbhW0hCNQHvV07x3FoSI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qalculate-gtk";
|
||||
version = "5.8.1";
|
||||
version = "5.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-gtk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+vyFdenXp/lLYoD0LwVUf9v8bVw2+NH6q2HiP349Ajw=";
|
||||
hash = "sha256-jJKy3LKO2ihtXtYMSOlVvq8RAfgpcxDgE8Ud9Fzd/Qg=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qalculate-qt";
|
||||
version = "5.8.1";
|
||||
version = "5.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-qt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xrhN/xacQJ2WdrM330YadZjvnmB2T7uZvFSAWA5GO2w=";
|
||||
hash = "sha256-+5LEXc5B2Kt5UifIV2owSsp7Yd412gppMeHs2YLdGYg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with qt6; [
|
||||
|
||||
@@ -43,12 +43,12 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rabbitmq-server";
|
||||
version = "4.2.0";
|
||||
version = "4.2.1";
|
||||
|
||||
# when updating, consider bumping elixir version in all-packages.nix
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-zmPo6+z+elyjROLphqw7HxrYzCP83n3//qMzMML1fDw=";
|
||||
hash = "sha256-loZsktSiUexsQQsMxDL4WVdtVsoXp3mEllNzkwglPgM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rovium";
|
||||
version = "0.4.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rovium/rovium-beta/releases/download/v${finalAttrs.version}/rovium-${finalAttrs.version}-amd64.deb";
|
||||
hash = "sha256-JHFD82MSyvQMYRzzLBFdO8G1RHUKU5sHk5qgYyMqWVE=";
|
||||
hash = "sha256-0XYiS4B6qBLRudYRTdu5T5q1gMEVY3k/rAElMW5a4qQ=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "stackit-cli";
|
||||
version = "0.47.0";
|
||||
version = "0.48.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackitcloud";
|
||||
repo = "stackit-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6cWFUPPRQD+uCVatj7usF0ndXvqI7hdhE1KjdYDflb4=";
|
||||
hash = "sha256-W7X4pe4/Id/rxIKMI/GnhHpKtcIFHi/cbOXQ1HELHaQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9e643w+1oHp9w50PSHF8SOqlwoym7OjSIH4PWGEAvdQ=";
|
||||
vendorHash = "sha256-C2DnHpXWjoXUNbra+6NVp2h24MWp/5QK2q/9bVTix1E=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "syft";
|
||||
version = "1.37.0";
|
||||
version = "1.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "syft";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-PWwbYInv/b/wkUrugtxB67uBmXtzPaVmdE7ppV+8Htk=";
|
||||
hash = "sha256-XSwGTaR0pZXFdLqTBAWmiK2VqIkZ/7I+uckUUvDfmVQ=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -29,7 +29,7 @@ buildGoModule rec {
|
||||
# hash mismatch with darwin
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-v4tRezweLJDPetG97VpJcloCNSqbc1EHpMJbKFh4Kio=";
|
||||
vendorHash = "sha256-6n+aA5/8B89KSLnjB61kalX7Ugbtg+VwCaZ/ni2fe/w=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@ let
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "typescript-go";
|
||||
version = "0-unstable-2025-11-10";
|
||||
version = "0-unstable-2025-11-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "typescript-go";
|
||||
rev = "ea4e944bb6880df9c9ca43093e183d8035f764fc";
|
||||
hash = "sha256-RhaXF6Xiad3s5kQtFsscGWDCpXV+xtWvhXLTo8dYWRw=";
|
||||
rev = "6e4164e02794ceb83b23e2a6893b792865acb9e9";
|
||||
hash = "sha256-4UbE4vgOtTx1e9DooC9U63iVif1wWlnZSZATCtemaeY=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "visual-paradigm-ce";
|
||||
version = "17.3.20250906";
|
||||
version = "17.3.20251156";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -18,10 +18,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
suffix = lib.last splitted;
|
||||
in
|
||||
fetchurl {
|
||||
url = "https://eu8.dl.visual-paradigm.com/visual-paradigm/vpce${majorMinor}/${suffix}/Visual_Paradigm_CE_${
|
||||
url = "https://eu10-dl.visual-paradigm.com/visual-paradigm/vpce${majorMinor}/${suffix}/Visual_Paradigm_CE_${
|
||||
builtins.replaceStrings [ "." ] [ "_" ] majorMinor
|
||||
}_${suffix}_Linux64_InstallFree.tar.gz";
|
||||
hash = "sha256-9BaAJKzK8jjQ1W+eSyJFI2NfizNCwY7PpSZoje2Zd38=";
|
||||
hash = "sha256-ow5Phzw4mK/sWR/42eoqPjWX0gL9OiovzLrnqrYVGuk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -72,7 +72,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "All-in-one UML CASE tool for software development";
|
||||
homepage = "https://www.visual-paradigm.com/";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
maintainers = with lib.maintainers; [
|
||||
drupol
|
||||
dvdznf
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
binaryBytecode
|
||||
|
||||
@@ -34,13 +34,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xemu";
|
||||
version = "0.8.113";
|
||||
version = "0.8.115";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xemu-project";
|
||||
repo = "xemu";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6qUCzgH8WBL0BGIxgK0W3tQA68/rVznb7VRjqOH2Hp0=";
|
||||
hash = "sha256-RmMfS+HBZvLSCt4afKNIT8vfc3IUBCpnmF157A83iEo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-shell-extension-gsconnect";
|
||||
version = "67";
|
||||
version = "71";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "GSConnect";
|
||||
repo = "gnome-shell-extension-gsconnect";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-o+ip+2c9Aw8sfP1eh1Kn7CfI4SbwyAYMW17XrkMf/YI=";
|
||||
hash = "sha256-OgASLH/mPmRmT8RcXOAZLzDhhidLnlZNcgpAQNbO30Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "elm-test";
|
||||
version = "0.19.1-revision16";
|
||||
version = "0.19.1-revision17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtfeldman";
|
||||
repo = "node-test-runner";
|
||||
rev = version;
|
||||
hash = "sha256-5XV5AxLJ3YdtlB3Px5tmFzP8H2BP8lkq9M01iUbbmPU=";
|
||||
hash = "sha256-qmzmImTDH7CBFxEDtR+XydegnpuYiZuNF6eJ80I2fwM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-+e21gMBiRQo1uUIvlIs5fzkyWW6+zWEi2HGdDsXxgaA=";
|
||||
npmDepsHash = "sha256-Yy53mGzARXRnPDLWnUevbnSCMSch1ecsvROu5C96WBA=";
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/elm-tooling install/d' package.json
|
||||
|
||||
@@ -6,20 +6,17 @@
|
||||
llama-index-core,
|
||||
ollama,
|
||||
pytest-asyncio,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-ollama";
|
||||
version = "0.8.3";
|
||||
version = "0.8.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_embeddings_ollama";
|
||||
inherit version;
|
||||
hash = "sha256-yLPQqGDvc/FD0eYy1/iE9BuZqmXDqopvipL2Jj0Q7xU=";
|
||||
hash = "sha256-bahglDEI13W04ZFFCND2Vnht0BcKakU+CX7iuMKf6yA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "ollama" ];
|
||||
|
||||
@@ -5,20 +5,17 @@
|
||||
hatchling,
|
||||
llama-index-core,
|
||||
ollama,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-ollama";
|
||||
version = "0.7.4";
|
||||
version = "0.9.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_ollama";
|
||||
inherit version;
|
||||
hash = "sha256-AG2/QHpr9JYS0/8loXhw2QTYg9MSerFjRguJ0WUlDKI=";
|
||||
hash = "sha256-zfoWf36oB0+/1Qs+gBU9bQX6O05y5TCxjcVPd1GFA9E=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "metaflow";
|
||||
version = "2.19.6";
|
||||
version = "2.19.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Netflix";
|
||||
repo = "metaflow";
|
||||
tag = version;
|
||||
hash = "sha256-heJz9rk2nTMrHc2213J1die6QX/jkOG6ohmufGXCNso=";
|
||||
hash = "sha256-WW/YETat7ayrAx9gP+javUVbz6/EW4MfrqoB5qr8iTI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
hatchling,
|
||||
mkdocs,
|
||||
wcmatch,
|
||||
platformdirs,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-include-markdown-plugin";
|
||||
version = "7.1.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "mkdocs_include_markdown_plugin";
|
||||
inherit version;
|
||||
hash = "sha256-oHU8uCcEwQoofx54n8mEj4K2vrh0mBSySwPdn2eBZnc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
mkdocs
|
||||
wcmatch
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
cache = [
|
||||
platformdirs
|
||||
];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mkdocs_include_markdown_plugin"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Mkdocs Markdown includer plugin";
|
||||
homepage = "https://pypi.org/project/mkdocs-include-markdown-plugin/";
|
||||
license = lib.licenses.asl20;
|
||||
teams = [ lib.teams.cyberus ];
|
||||
};
|
||||
}
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "playwrightcapture";
|
||||
version = "1.34.3";
|
||||
version = "1.35.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lookyloo";
|
||||
repo = "PlaywrightCapture";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wM4GoS9XiszlOMbwQ11JBWXVexspYgRPws4EnwiZ078=";
|
||||
hash = "sha256-P2d2RY4A5Yxug1Rj5UmXBW5esEdk0M1wZyOBPKtJslA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-docker";
|
||||
version = "3.2.4";
|
||||
version = "3.2.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "avast";
|
||||
repo = "pytest-docker";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Hf9ig4FPgI4Kafu9+WeAuo6NELc8m8pQHyveUM+eC1s=";
|
||||
hash = "sha256-AkVLfCt2aQZrvSfa/5oXr95XUIR5mRqcMRz67kmuKKw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-iso639";
|
||||
version = "2025.11.11";
|
||||
version = "2025.11.16";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jacksonllee";
|
||||
repo = "iso639";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XFgtb19tL1/FwCMx9wHesBunyRVhY3cEVh2nq2jtqk4=";
|
||||
hash = "sha256-noNB0DimbdEpk/VGJw7/jsl/JLK0f9xh+b8KqwQ2gYo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-html5lib";
|
||||
version = "1.1.11.20251115";
|
||||
version = "1.1.11.20251117";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types_html5lib";
|
||||
inherit version;
|
||||
hash = "sha256-pLZmoG5JbXsqlInckgbwmiSfq3xihlrGAkzsJGKLFdM=";
|
||||
hash = "sha256-Gmo6xTlKoSv1R/rl1e/5Hc7sRrbQfENn2bOaN/QvIBo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -129,7 +129,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
preFixup = ''
|
||||
installShellCompletion \
|
||||
--bash $releaseDir/build/completions/*.bash \
|
||||
--zsh $releaseDir/build/completions/_*
|
||||
--zsh $releaseDir/build/completions/_* \
|
||||
--fish $releaseDir/build/completions/*.fish
|
||||
''
|
||||
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
# PAM and NSS need fix library names
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
grafanaPlugin {
|
||||
pname = "grafana-metricsdrilldown-app";
|
||||
version = "1.0.21";
|
||||
zipHash = "sha256-YFEGcetKsVPu61Kg7GnQCbGynRCOOAlvdyWDc1pOmkU=";
|
||||
version = "1.0.22";
|
||||
zipHash = "sha256-ymsvDpx54x41AOnfJ6tiP87b0x+5C6bqfHOUjyEiaKM=";
|
||||
meta = with lib; {
|
||||
description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries";
|
||||
license = licenses.agpl3Only;
|
||||
|
||||
@@ -99,7 +99,8 @@ let
|
||||
prev = f final;
|
||||
thisOverlay = overlay final prev;
|
||||
warnForBadVersionOverride = (
|
||||
thisOverlay ? version
|
||||
prev ? src
|
||||
&& thisOverlay ? version
|
||||
&& prev ? version
|
||||
# We could check that the version is actually distinct, but that
|
||||
# would probably just delay the inevitable, or preserve tech debt.
|
||||
|
||||
@@ -9580,6 +9580,10 @@ self: super: with self; {
|
||||
|
||||
mkdocs-graphviz = callPackage ../development/python-modules/mkdocs-graphviz { };
|
||||
|
||||
mkdocs-include-markdown-plugin =
|
||||
callPackage ../development/python-modules/mkdocs-include-markdown-plugin
|
||||
{ };
|
||||
|
||||
mkdocs-jupyter = callPackage ../development/python-modules/mkdocs-jupyter { };
|
||||
|
||||
mkdocs-linkcheck = callPackage ../development/python-modules/mkdocs-linkcheck { };
|
||||
|
||||
Reference in New Issue
Block a user