Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2024-07-29 00:15:00 +00:00 committed by GitHub
commit c82a59bbc1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
282 changed files with 8489 additions and 8185 deletions

View File

@ -153,3 +153,6 @@ bdfde18037f8d9f9b641a4016c8ada4dc4cbf856
# nixos/ollama: format with nixfmt-rfc-style (#329561)
246d1ee533810ac1946d863bbd9de9b525818d56
# nixos/nvidia: apply nixfmt-rfc-style (#313440)
fbdcdde04a7caa007e825a8b822c75fab9adb2d6

View File

@ -4693,6 +4693,11 @@
githubId = 3179832;
name = "D. Bohdan";
};
d-brasher = {
github = "d-brasher";
githubId = 175485311;
name = "D. Brasher";
};
dbrgn = {
email = "nix@dbrgn.ch";
github = "dbrgn";
@ -14920,6 +14925,12 @@
githubId = 16027994;
name = "Nathan Viets";
};
nw = {
email = "nixpkgs@nwhirschfeld.de";
github = "nwhirschfeld";
githubId = 5047052;
name = "Niclas Hirschfeld";
};
nyadiia = {
email = "nyadiia@pm.me";
github = "nyadiia";
@ -15953,6 +15964,12 @@
githubId = 34967;
name = "Julius de Bruijn";
};
pinage404 = {
email = "pinage404+nixpkgs@gmail.com";
github = "pinage404";
githubId = 6325757;
name = "pinage404";
};
pineapplehunter = {
email = "peshogo+nixpkgs@gmail.com";
github = "pineapplehunter";

View File

@ -749,7 +749,10 @@ with lib.maintainers;
};
openstack = {
members = [ SuperSandro2000 ];
members = [
SuperSandro2000
anthonyroussel
];
scope = "Maintain the ecosystem around OpenStack";
shortName = "OpenStack";
};

View File

@ -472,7 +472,6 @@ in
hardware.graphics = {
extraPackages = [ pkgs.nvidia-vaapi-driver ];
extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ];
};
environment.systemPackages =

View File

@ -1244,6 +1244,7 @@
./services/networking/websockify.nix
./services/networking/wg-access-server.nix
./services/networking/wg-netmanager.nix
./services/networking/wvdial.nix
./services/networking/webhook.nix
./services/networking/wg-quick.nix
./services/networking/wgautomesh.nix

View File

@ -20,7 +20,7 @@ let
'';
backupDatabaseScript = db: ''
dest="${cfg.location}/${db}.gz"
if ${mariadb}/bin/mysqldump ${optionalString cfg.singleTransaction "--single-transaction"} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then
if ${mariadb}/bin/mysqldump ${optionalString cfg.singleTransaction "--single-transaction"} ${db} | ${gzip}/bin/gzip -c ${cfg.gzipOptions} > $dest.tmp; then
mv $dest.tmp $dest
echo "Backed up to $dest"
else
@ -78,6 +78,14 @@ in
Whether to create database dump in a single transaction
'';
};
gzipOptions = mkOption {
default = "--no-name --rsyncable";
type = types.str;
description = ''
Command line options to use when invoking `gzip`.
'';
};
};
};

View File

@ -0,0 +1,47 @@
# Global configuration for wvdial.
{
config,
lib,
pkgs,
...
}:
let
cfg = config.environment.wvdial;
in
{
options = {
environment.wvdial = {
dialerDefaults = lib.mkOption {
default = "";
type = lib.types.str;
example = ''Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"'';
description = ''
Contents of the "Dialer Defaults" section of
<filename>/etc/wvdial.conf</filename>.
'';
};
pppDefaults = lib.mkOption {
default = ''
noipdefault
usepeerdns
defaultroute
persist
noauth
'';
type = lib.types.str;
description = "Default ppp settings for wvdial.";
};
};
};
config = lib.mkIf (cfg.dialerDefaults != "") {
environment.etc."wvdial.conf".source = pkgs.writeText "wvdial.conf" ''
[Dialer Defaults]
PPPD PATH = ${pkgs.ppp}/sbin/pppd
${config.environment.wvdial.dialerDefaults}
'';
environment.etc."ppp/peers/wvdial".source = pkgs.writeText "wvdial" cfg.pppDefaults;
};
}

View File

@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.nongnu.org/lingot/";
license = lib.licenses.gpl2Plus;
platforms = with lib.platforms; linux;
maintainers = with lib.maintainers; [ viric ];
maintainers = [ ];
};
}

View File

@ -4,111 +4,33 @@ self:
let
inherit (self) callPackage;
in
{
lib.packagesFromDirectoryRecursive {
inherit callPackage;
directory = ./manual-packages;
}
// {
inherit (pkgs) emacspeak;
acm = callPackage ./manual-packages/acm { };
acm-terminal = callPackage ./manual-packages/acm-terminal { };
agda2-mode = callPackage ./manual-packages/agda2-mode { };
cask = callPackage ./manual-packages/cask { };
codeium = callPackage ./manual-packages/codeium {
inherit (pkgs) codeium;
};
consult-gh = callPackage ./manual-packages/consult-gh { };
control-lock = callPackage ./manual-packages/control-lock { };
copilot = callPackage ./manual-packages/copilot { };
ebuild-mode = callPackage ./manual-packages/ebuild-mode { };
el-easydraw = callPackage ./manual-packages/el-easydraw { };
elisp-ffi = callPackage ./manual-packages/elisp-ffi { };
emacs-conflict = callPackage ./manual-packages/emacs-conflict { };
evil-markdown = callPackage ./manual-packages/evil-markdown { };
font-lock-plus = callPackage ./manual-packages/font-lock-plus { };
git-undo = callPackage ./manual-packages/git-undo { };
grid = callPackage ./manual-packages/grid { };
helm-words = callPackage ./manual-packages/helm-words { };
icicles = callPackage ./manual-packages/icicles { };
idris2-mode = callPackage ./manual-packages/idris2-mode { };
isearch-plus = callPackage ./manual-packages/isearch-plus { };
isearch-prop = callPackage ./manual-packages/isearch-prop { };
jam-mode = callPackage ./manual-packages/jam-mode { };
ligo-mode = callPackage ./manual-packages/ligo-mode { };
llvm-mode = callPackage ./manual-packages/llvm-mode { };
lsp-bridge = callPackage ./manual-packages/lsp-bridge {
inherit (pkgs) basedpyright git go gopls python3;
};
lspce = callPackage ./manual-packages/lspce { };
matrix-client = callPackage ./manual-packages/matrix-client {
_map = self.map;
};
mu4e = callPackage ./manual-packages/mu4e { };
notdeft = callPackage ./manual-packages/notdeft { };
ott-mode = callPackage ./manual-packages/ott-mode { };
pod-mode = callPackage ./manual-packages/pod-mode { };
prisma-mode = callPackage ./manual-packages/prisma-mode { };
structured-haskell-mode = self.shm;
sv-kalender = callPackage ./manual-packages/sv-kalender { };
texpresso = callPackage ./manual-packages/texpresso { inherit (pkgs) texpresso; };
tree-sitter-langs = callPackage ./manual-packages/tree-sitter-langs { final = self; };
treesit-grammars = callPackage ./manual-packages/treesit-grammars { };
tsc = callPackage ./manual-packages/tsc { };
urweb-mode = callPackage ./manual-packages/urweb-mode { };
voicemacs = callPackage ./manual-packages/voicemacs { };
wat-mode = callPackage ./manual-packages/wat-mode { };
xapian-lite = callPackage ./manual-packages/xapian-lite { };
yes-no = callPackage ./manual-packages/yes-no { };
youtube-dl = callPackage ./manual-packages/youtube-dl { };
# From old emacsPackages (pre emacsPackagesNg)
cedille = callPackage ./manual-packages/cedille { inherit (pkgs) cedille; };
color-theme-solarized = callPackage ./manual-packages/color-theme-solarized { };
hsc3-mode = callPackage ./manual-packages/hsc3 { };
prolog-mode = callPackage ./manual-packages/prolog { };
rect-mark = callPackage ./manual-packages/rect-mark { };
session-management-for-emacs = callPackage ./manual-packages/session-management-for-emacs { };
sunrise-commander = callPackage ./manual-packages/sunrise-commander { };
# camelCase aliases for some of the kebab-case expressions above
colorThemeSolarized = self.color-theme-solarized;

View File

@ -3,11 +3,15 @@
fetchFromGitHub,
melpaBuild,
prop-menu,
gitUpdater,
}:
melpaBuild rec {
pname = "idris2-mode";
let
version = "1.1";
in
melpaBuild {
pname = "idris2-mode";
inherit version;
src = fetchFromGitHub {
owner = "idris-community";
@ -20,10 +24,12 @@ melpaBuild rec {
prop-menu
];
passthru.updateScript = gitUpdater { };
meta = {
homepage = "https://github.com/idris-community/idris2-mode";
description = "Emacs mode for editing Idris 2 code";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ wuyoli ];
maintainers = with lib.maintainers; [ wuyoli AndersonTorres ];
};
}

View File

@ -1099,6 +1099,23 @@ let
};
};
csharpier.csharpier-vscode = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "csharpier-vscode";
publisher = "csharpier";
version = "1.7.3";
hash = "sha256-/ZLjnlLl6xmgEazdCbnuE6UuuV1tDwAjpxz+vmBuYHE=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/csharpier.csharpier-vscode/changelog";
description = "CSharpier code formatter for Visual Studio Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=csharpier.csharpier-vscode";
homepage = "https://github.com/belav/csharpier";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.magnouvean ];
};
};
cweijan.dbclient-jdbc = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "dbclient-jdbc";
@ -1782,8 +1799,8 @@ let
mktplcRef = {
name = "dependi";
publisher = "fill-labs";
version = "0.7.4";
hash = "sha256-6nU0bVAe/vwq43ECLwypIkMAG/q5+P2bE1RPAjeTCX4=";
version = "0.7.5";
hash = "sha256-troydfNj88c8A24ZtaCToE231VWzcCiQVLTSdVPM/XE=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/fill-labs.dependi/changelog";
@ -3109,6 +3126,72 @@ let
ms-dotnettools.csdevkit = callPackage ./ms-dotnettools.csdevkit { };
ms-dotnettools.csharp = callPackage ./ms-dotnettools.csharp { };
ms-dotnettools.vscode-dotnet-runtime = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-dotnet-runtime";
publisher = "ms-dotnettools";
version = "2.1.1";
hash = "sha256-k14bjWITPDduJi79W59SnMV2TFNRCeAymhs6u1Y0vzk=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscode-dotnet-runtime/changelog";
description = "Provides a way for other Visual Studio Code extensions to install local versions of .NET SDK/Runtime";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.vscode-dotnet-runtime";
homepage = "https://github.com/dotnet/vscode-dotnet-runtime";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.magnouvean ];
};
};
ms-dotnettools.vscodeintellicode-csharp = buildVscodeMarketplaceExtension {
mktplcRef =
let
sources = {
"x86_64-linux" = {
arch = "linux-x64";
hash = "sha256-oQMwzQuW5vjxtDboRCeiEO5aytsAY6rb14JDTmK3JPg=";
};
"x86_64-darwin" = {
arch = "darwin-x64";
hash = "sha256-/9+qtLDNYUFvdoehit3BihA38p6RqJ7na5Q27xxpZk0=";
};
"aarch64-linux" = {
arch = "linux-arm64";
hash = "sha256-JqLlYMKyTXaEzuTPPxVaO8WJiuCUN+9xBzyA6+aYdSc=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
hash = "sha256-dhiUePePkO3MxRQ5UP+lOxRax503JlERe/GWJ8pPUIg=";
};
};
in
{
name = "vscodeintellicode-csharp";
publisher = "ms-dotnettools";
version = "2.1.11";
}
// sources.${stdenv.system};
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
buildInputs = [
stdenv.cc.cc.lib
zlib
];
meta = {
changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscodeintellicode-csharp/changelog";
description = "AI-assisted development features for C# in Visual Studio Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.vscodeintellicode-csharp";
homepage = "https://github.com/MicrosoftDocs/intellicode";
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.magnouvean ];
platforms = [
"x86_64-linux"
"x86_64-darwin"
"aarch64-darwin"
"aarch64-linux"
];
};
};
ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-kubernetes-tools";

View File

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
description = "Viewer of CBR and CBZ files, often used to store scanned comics";
homepage = "https://comical.sourceforge.net/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ viric wegank ];
maintainers = with lib.maintainers; [ wegank ];
platforms = with lib.platforms; unix;
mainProgram = "comical";
};

View File

@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
# released under a variant of the MIT license
# https://spdx.org/licenses/MIT-feh.html
license = licenses.mit-feh;
maintainers = with maintainers; [ gepbird globin viric willibutz ];
maintainers = with maintainers; [ gepbird globin willibutz ];
platforms = platforms.unix;
mainProgram = "feh";
};

View File

@ -95,7 +95,7 @@ mkDerivation rec {
mainProgram = "meshlab";
homepage = "https://www.meshlab.net/";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ viric ];
maintainers = [ ];
platforms = with lib.platforms; linux;
};
}

View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = "https://djvu.sourceforge.net/djview4.html";
description = "Black-and-white djvu page encoder and decoder that use interpage information";
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.viric ];
maintainers = [ ];
platforms = lib.platforms.unix;
mainProgram = "minidjvu";
};

View File

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
description = "OCR engine";
homepage = "https://github.com/tesseract-ocr/tesseract";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ viric erikarvstedt ];
maintainers = with lib.maintainers; [ erikarvstedt ];
platforms = with lib.platforms; linux ++ darwin;
mainProgram = "tesseract";
};

View File

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
description = "OCR engine";
homepage = "https://github.com/tesseract-ocr/tesseract";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ viric erikarvstedt ];
maintainers = with lib.maintainers; [ erikarvstedt ];
platforms = with lib.platforms; linux ++ darwin;
mainProgram = "tesseract";
};

View File

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.wings3d.com/";
description = "Subdivision modeler inspired by Nendo and Mirai from Izware";
license = lib.licenses.tcltk;
maintainers = with lib.maintainers; [ viric ];
maintainers = [ ];
platforms = with lib.platforms; linux;
mainProgram = "wings";
};

View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "junction";
version = "1.7";
version = "1.8";
src = fetchFromGitHub {
owner = "sonnyp";
repo = "junction";
rev = "v${version}";
hash = "sha256-qPseu2rzK6xp7eb/SrWK6fML/6xh4raP0MEreyZgqVI=";
hash = "sha256-0zY6Dp0aKHtBHSTiGbI5o6876BsARbo8/BbArl0RaMY=";
fetchSubmodules = true;
};
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
mainProgram = "re.sonny.Junction";
description = "Choose the application to open files and links";
homepage = "https://apps.gnome.org/en/app/re.sonny.Junction/";
homepage = "https://apps.gnome.org/Junction/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ hqurve ];
platforms = platforms.linux;

View File

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "kondo";
@ -13,6 +13,15 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-WF4GHj/5VYrTUh1E3t29zbpSLjJ6g7RWVpLYqg9msZg=";
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd kondo \
--bash <($out/bin/kondo --completions bash) \
--fish <($out/bin/kondo --completions fish) \
--zsh <($out/bin/kondo --completions zsh)
'';
meta = with lib; {
description = "Save disk space by cleaning unneeded files from software projects";
homepage = "https://github.com/tbillington/kondo";

View File

@ -72,7 +72,7 @@ mkDerivation rec {
description = "2D CAD package based on Qt";
homepage = "https://librecad.org";
license = licenses.gpl2Only;
maintainers = with maintainers; [ viric ];
maintainers = [ ];
platforms = platforms.linux;
};
}

View File

@ -1,34 +1,48 @@
{ fetchurl, lib, mkDerivation, pkg-config, python3, file, bc
, qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost
{
fetchurl,
lib,
mkDerivation,
pkg-config,
python3,
file,
bc,
qtbase,
qtsvg,
hunspell,
makeWrapper, # , mythes, boost
}:
mkDerivation rec {
version = "2.3.7-1";
version = "2.4.1";
pname = "lyx";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
sha256 = "sha256-Ob6IZPuGs06IMQ5w+4Dl6eKWYB8IVs8WGqCUFxcY2O0=";
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.4.x/${pname}-${version}.tar.xz";
hash = "sha256-dN4ooH7zeqlHG8mWLbGCFSolMQx9H0f2drubxj2XE8U=";
};
# Needed with GCC 12
postPatch = ''
sed '1i#include <iterator>' -i src/lyxfind.cpp
sed '1i#include <cstring>' -i src/insets/InsetListings.cpp
'';
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
nativeBuildInputs = [ pkg-config makeWrapper python3 qtbase ];
nativeBuildInputs = [
pkg-config
makeWrapper
python3
qtbase
];
buildInputs = [
qtbase qtsvg file/*for libmagic*/ bc
qtbase
qtsvg
file # for libmagic
bc
hunspell # enchant
];
configureFlags = [
"--enable-qt5"
#"--without-included-boost"
/* Boost is a huge dependency from which 1.4 MB of libs would be used.
Using internal boost stuff only increases executable by around 0.2 MB. */
/*
Boost is a huge dependency from which 1.4 MB of libs would be used.
Using internal boost stuff only increases executable by around 0.2 MB.
*/
#"--without-included-mythes" # such a small library isn't worth a separate package
];
@ -36,9 +50,7 @@ mkDerivation rec {
doCheck = true;
# python is run during runtime to do various tasks
qtWrapperArgs = [
" --prefix PATH : ${python3}/bin"
];
qtWrapperArgs = [ " --prefix PATH : ${python3}/bin" ];
meta = with lib; {
description = "WYSIWYM frontend for LaTeX, DocBook";
@ -48,4 +60,3 @@ mkDerivation rec {
platforms = platforms.linux;
};
}

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tuckr";
version = "0.8.1";
version = "0.9.0";
src = fetchFromGitHub {
owner = "RaphGL";
repo = "Tuckr";
rev = version;
hash = "sha256-oQSuR0Zt1T8YU3O2Dq/qHl4ysVDl+3EVvp9r2mD3hRA=";
hash = "sha256-cIyqka/+CrO9RuKr7tI79QvpPA0mDL/YzWWWrcwin8E=";
};
cargoHash = "sha256-ESDfUZsoqwBurXuwNIRSqxoDWnA2VpDZ9Q9GGaV8B4Y=";
cargoHash = "sha256-5Z7UpkLlNMW8prtdJO+Xr45fpacjhDBoD/RFv/H44t0=";
doCheck = false; # test result: FAILED. 5 passed; 3 failed;

View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
description = "Allows testing the fonts available in an X server";
mainProgram = "xfontsel";
license = with licenses; [ x11 smlnj mit ];
maintainers = with maintainers; [ viric ];
maintainers = [ ];
platforms = platforms.unix;
};
}

View File

@ -388,6 +388,10 @@ let
find . -type f -perm -0100 -exec sed -i -e '$a\' {} +
patchShebangs .
'' + lib.optionalString (ungoogled) ''
# Prune binaries (ungoogled only) *before* linking our own binaries:
${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors"
'' + ''
# Link to our own Node.js and Java (required during the build):
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s${lib.optionalString (chromiumVersionAtLeast "127") "f"} "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node
@ -400,7 +404,6 @@ let
substituteInPlace build/toolchain/linux/BUILD.gn \
--replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
'' + lib.optionalString ungoogled ''
${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors"
${ungoogler}/utils/patches.py . ${ungoogler}/patches
${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz .
'';

View File

@ -21,17 +21,17 @@
ungoogled-chromium = {
deps = {
gn = {
hash = "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw=";
rev = "df98b86690c83b81aedc909ded18857296406159";
hash = "sha256-vzZu/Mo4/xATSD9KgKcRuBKVg9CoRZC9i0PEajYr4UM=";
rev = "b3a0bff47dd81073bfe67a402971bad92e4f2423";
url = "https://gn.googlesource.com/gn";
version = "2024-05-13";
version = "2024-06-06";
};
ungoogled-patches = {
hash = "sha256-jDWL4gXcWF6GMlFJ/sua4dfVURs9vWYXRMjnYNqESWc=";
rev = "126.0.6478.182-1";
hash = "sha256-IBdOV+eFJWD+kCxnhSWWjiBgMbP/DxF+gUVIIpWf4rc=";
rev = "127.0.6533.72-1";
};
};
hash = "sha256-vZ7P8+vHTMCo6lXkV84ENqRZVG3/fDEwl+BTNJTGMn4=";
version = "126.0.6478.182";
hash = "sha256-m99HaGCuIihDdbVnmu6xatnC/QDxgLVby2TWY/L+RHk=";
version = "127.0.6533.72";
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "circumflex";
version = "3.6";
version = "3.7";
src = fetchFromGitHub {
owner = "bensadeh";
repo = "circumflex";
rev = version;
hash = "sha256-FzJUmF2X4Iyf83cIEa8b8EFCcWUyYEZBVyvXuhiaaWM=";
hash = "sha256-jjtjOT8lFPsk300Q9EtsX/w8Bck0pwrS/GyouoBsZ+0=";
};
vendorHash = "sha256-x/NgcodS/hirXJHxBHeUP9MgOBHq1yQWHprMrlpqsas=";
vendorHash = "sha256-Nlv8H5YqHrqACW2kEXg+mkc3bCgXVudrSNfyu+xeFBA=";
nativeBuildInputs = [ makeWrapper ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "atmos";
version = "1.83.1";
version = "1.85.0";
src = fetchFromGitHub {
owner = "cloudposse";
repo = pname;
rev = "v${version}";
sha256 = "sha256-B1s+9oLShbrziYm9P8xE5UPwxTchlGPUmjYSWGhsGjY=";
sha256 = "sha256-nIW7Wt4mThxjnHHF+rD6q9vZ7KsB//nSpkWtkiTo16Y=";
};
vendorHash = "sha256-dklmWu+PHSEeQM2MWBkYMiyw5rX9S8SI3l86nst6v9E=";
vendorHash = "sha256-swQN0WjVfLo/LjZrvjX46CnfBGnrVzLj8Cv4IP0eL7Y=";
ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];

View File

@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "edge";
version = "24.7.2";
sha256 = "1kl1ik1w0j3m0qlfbdagzjgd67kabx358xaa2rn0clg8jk43nk3n";
vendorHash = "sha256-/dYLPoPg3Oac4W1eLytJJiP7kzK4PTSjh8BRKjJAnU0=";
version = "24.7.5";
sha256 = "03hsz87vpysw4y45afsbr3amkrqnank1zcclfh6qj0yf98ymxxbn";
vendorHash = "sha256-0NKoQICbKM3UA62LNySqu5pS2bPuuEfmOEukxB/6Ges=";
}

View File

@ -5,7 +5,9 @@ set -x -eu -o pipefail
CHANNEL_NAME="${1:?Must provide a release channel, like 'stable', as the only argument}"
mkdir --parents --verbose ./${CHANNEL_NAME}
WORKDIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd -P)
mkdir --parents --verbose "${WORKDIR}/${CHANNEL_NAME}"
LATEST_TAG_NAME=$(curl --silent --fail https://update.rke2.io/v1-release/channels | \
yq eval ".data[] | select(.id == \"${CHANNEL_NAME}\").latest" - | \
@ -35,9 +37,9 @@ KUBERNETES_EOL=$(curl --silent --fail \
https://endoflife.date/api/kubernetes/${KUBERNETES_CYCLES}.json | \
yq eval ".eol" -)
FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
cat > ./${CHANNEL_NAME}/versions.nix << EOF
cat << EOF > "${WORKDIR}/${CHANNEL_NAME}/versions.nix"
{
rke2Version = "${RKE2_VERSION}";
rke2RepoSha256 = "${RKE2_REPO_SHA256}";
@ -54,15 +56,13 @@ cat > ./${CHANNEL_NAME}/versions.nix << EOF
}
EOF
NIXPKGS_ROOT=$(git rev-parse --show-toplevel)
set +e
RKE2_VENDOR_HASH=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} \
"{ sha256 }: (import ${NIXPKGS_ROOT}/. {}).rke2_${CHANNEL_NAME}.goModules.overrideAttrs (_: { vendorHash = sha256; })")
RKE2_VENDOR_HASH=$(nix-prefetch -I nixpkgs=$(git rev-parse --show-toplevel) \
"{ sha256 }: rke2_${CHANNEL_NAME}.goModules.overrideAttrs (_: { vendorHash = sha256; })")
set -e
if [ -n "${RKE2_VENDOR_HASH:-}" ]; then
sed -i "s#${FAKE_HASH}#${RKE2_VENDOR_HASH}#g" ./${CHANNEL_NAME}/versions.nix
sed -i "s#${FAKE_HASH}#${RKE2_VENDOR_HASH}#g" ${WORKDIR}/${CHANNEL_NAME}/versions.nix
else
echo "Update failed. 'RKE2_VENDOR_HASH' is empty."
exit 1
@ -70,17 +70,15 @@ fi
# Implement commit
# See: https://nixos.org/manual/nixpkgs/stable/#var-passthru-updateScript-commit
OLD_VERSION=$(nix-instantiate --eval -E \
"with import ${NIXPKGS_ROOT}/. {}; rke2.version or (builtins.parseDrvName rke2.name).version" | \
tr -d '"')
cat << EOF
[{
"attrPath": "rke2_${CHANNEL_NAME}",
"oldVersion": "${OLD_VERSION}",
"newVersion": "${RKE2_VERSION}",
"files": [
"${PWD}/${CHANNEL_NAME}/versions.nix"
]
}]
[
{
"attrPath": "rke2_${CHANNEL_NAME}",
"oldVersion": "${UPDATE_NIX_OLD_VERSION}",
"newVersion": "${RKE2_VERSION}",
"files": [
"${WORKDIR}/${CHANNEL_NAME}/versions.nix"
]
}
]
EOF

View File

@ -1,2 +1,2 @@
source "https://rubygems.org"
gem "terraspace", '~> 2.2.8'
gem "terraspace"

View File

@ -1,36 +1,45 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.0.6)
activesupport (7.1.3.4)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
aws-eventstream (1.2.0)
aws-partitions (1.785.0)
aws-sdk-core (3.177.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-eventstream (1.3.0)
aws-partitions (1.956.0)
aws-sdk-core (3.201.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.70.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.128.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sdk-kms (1.88.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.156.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.6)
aws-sigv4 (1.6.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.8.0)
aws-eventstream (~> 1, >= 1.0.2)
cli-format (0.2.2)
base64 (0.2.0)
bigdecimal (3.1.8)
cli-format (0.6.1)
activesupport
text-table
zeitwerk
concurrent-ruby (1.2.2)
concurrent-ruby (1.3.3)
connection_pool (2.4.1)
deep_merge (1.2.2)
diff-lcs (1.5.0)
dotenv (2.8.1)
dsl_evaluator (0.3.1)
diff-lcs (1.5.1)
dotenv (3.1.2)
drb (2.2.1)
dsl_evaluator (0.3.2)
activesupport
memoist
rainbow
@ -38,40 +47,42 @@ GEM
eventmachine (1.2.7)
eventmachine-tail (0.6.5)
eventmachine
graph (2.11.0)
graph (2.11.1)
hcl_parser (0.2.2)
rhcl
i18n (1.14.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jmespath (1.6.2)
memoist (0.16.2)
minitest (5.18.1)
nokogiri (1.15.3)
racc (~> 1.4)
mini_portile2 (2.8.7)
minitest (5.24.1)
mutex_m (0.2.0)
nokogiri (1.16.6)
mini_portile2 (~> 2.8.2)
racc (1.7.1)
mini_portile2 (2.8.2)
racc (~> 1.4)
racc (1.8.0)
rainbow (3.1.1)
render_me_pretty (0.9.0)
activesupport
rainbow
tilt
rexml (3.2.5)
rexml (3.3.2)
strscan
rhcl (0.1.0)
deep_merge
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.5)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
rspec-terraspace (0.3.3)
activesupport
memoist
@ -79,7 +90,8 @@ GEM
rspec
zeitwerk
rubyzip (2.3.2)
terraspace (2.2.8)
strscan (3.1.0)
terraspace (2.2.17)
activesupport
bundler
cli-format
@ -110,20 +122,20 @@ GEM
thor
zeitwerk
text-table (1.2.4)
thor (1.2.2)
tilt (2.2.0)
thor (1.3.1)
tilt (2.4.0)
tty-tree (0.4.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
zeitwerk (2.6.8)
zeitwerk (2.6.16)
zip_folder (0.1.0)
rubyzip
PLATFORMS
x86_64-linux
ruby
DEPENDENCIES
terraspace (~> 2.2.8)
terraspace
BUNDLED WITH
2.3.26
2.5.11

View File

@ -1,34 +1,34 @@
{
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk";
sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5";
type = "gem";
};
version = "7.0.6";
version = "7.1.3.4";
};
aws-eventstream = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi";
type = "gem";
};
version = "1.2.0";
version = "1.3.0";
};
aws-partitions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05m0c3h1z0jhaqiciil55fshrjvc725cf1lc0g933pf98vqflb0r";
sha256 = "03zb6x4x68y91gywsyi4a6hxy4pdyng8mnxwd858bhjfymml8kkf";
type = "gem";
};
version = "1.785.0";
version = "1.956.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09firi4bin3ay4pd59qgxspq2f1isfi1li8rabpw6lvvbhnar168";
sha256 = "1ihl7iwndl3jjy89sh427wf8mdb7ii76bsjf6fkxq9ha30nz4f3g";
type = "gem";
};
version = "3.177.0";
version = "3.201.1";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -47,10 +47,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x73qj2c39ap926by14x56cjmp2cd5jpq5gv33xynypy1idyb0fj";
sha256 = "02g3l3lcyddqncrwjxgawxl33p2p715k1gbrdlgyiv0yvy88sn0k";
type = "gem";
};
version = "1.70.0";
version = "1.88.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@ -58,10 +58,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11cxk6b3p1bsl1gg3pi93qx2ynbjrrsrsc68nnqsjm4npvaj052v";
sha256 = "0ika0xmmrkc7jiwdi5gqia5wywkcbw1nal2dhl436dkh38fxl0lk";
type = "gem";
};
version = "1.128.0";
version = "1.156.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -69,10 +69,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na";
sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4";
type = "gem";
};
version = "1.6.0";
version = "1.8.0";
};
base64 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
type = "gem";
};
version = "0.2.0";
};
bigdecimal = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
type = "gem";
};
version = "3.1.8";
};
cli-format = {
dependencies = ["activesupport" "text-table" "zeitwerk"];
@ -80,20 +100,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mr8vkw5zwb3flhhf8s923mi7r85g1ky0lmjz4q5xhwb48ji55qf";
sha256 = "0rrjck5r25dlcg1gwz6pb5f4rllx77lg6a514a5l3lajfd95shm3";
type = "gem";
};
version = "0.2.2";
version = "0.6.1";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";
type = "gem";
};
version = "1.2.2";
version = "1.3.3";
};
connection_pool = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
type = "gem";
};
version = "2.4.1";
};
deep_merge = {
groups = ["default"];
@ -110,20 +140,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7";
type = "gem";
};
version = "1.5.0";
version = "1.5.1";
};
dotenv = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565";
sha256 = "0y24jabiz4cf9ni9vi4j8sab8b5phpf2mpw3981r0r94l4m6q0q8";
type = "gem";
};
version = "2.8.1";
version = "3.1.2";
};
drb = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
type = "gem";
};
version = "2.2.1";
};
dsl_evaluator = {
dependencies = ["activesupport" "memoist" "rainbow" "zeitwerk"];
@ -131,10 +171,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mck2j0gr851kj9l7pix97jmmwwazfjq83ryamx5rpdbgv5mrh51";
sha256 = "0hd079baa5pfyyc2wc9p5h82qjp7fnx0s0shn2i19ig186cizh2x";
type = "gem";
};
version = "0.3.1";
version = "0.3.2";
};
eventmachine = {
groups = ["default"];
@ -162,10 +202,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10l1bdqc9yzdk6kqwh9vw918lyw846gpqw2z8kfcwl53zdjdzcl9";
sha256 = "1bwssjgl9nfq9jhn9bfc7pqfl2c2xi0wnpng66l029m03kmdq8k4";
type = "gem";
};
version = "2.11.0";
version = "2.11.1";
};
hcl_parser = {
dependencies = ["rhcl"];
@ -184,10 +224,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
type = "gem";
};
version = "1.14.1";
version = "1.14.5";
};
jmespath = {
groups = ["default"];
@ -214,20 +254,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6";
sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";
type = "gem";
};
version = "2.8.2";
version = "2.8.7";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb";
sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i";
type = "gem";
};
version = "5.18.1";
version = "5.24.1";
};
mutex_m = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
type = "gem";
};
version = "0.2.0";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
@ -235,20 +285,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7";
sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk";
type = "gem";
};
version = "1.15.3";
version = "1.16.6";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g";
sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";
type = "gem";
};
version = "1.7.1";
version = "1.8.0";
};
rainbow = {
groups = ["default"];
@ -272,14 +322,15 @@
version = "0.9.0";
};
rexml = {
dependencies = ["strscan"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
sha256 = "0zr5qpa8lampaqzhdcjcvyqnrqcjl7439mqjlkjz43wdhmpnh4s5";
type = "gem";
};
version = "3.2.5";
version = "3.3.2";
};
rhcl = {
dependencies = ["deep_merge"];
@ -298,10 +349,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l";
type = "gem";
};
version = "3.12.0";
version = "3.13.0";
};
rspec-core = {
dependencies = ["rspec-support"];
@ -309,10 +360,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm";
sha256 = "0k252n7s80bvjvpskgfm285a3djjjqyjcarlh3aq7a4dx2s94xsm";
type = "gem";
};
version = "3.12.2";
version = "3.13.0";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
@ -320,10 +371,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89";
sha256 = "0022nxs9gqfhx35n4klibig770n0j31pnkd8anz00yvrvkdghk41";
type = "gem";
};
version = "3.12.3";
version = "3.13.1";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
@ -331,20 +382,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2";
sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88";
type = "gem";
};
version = "3.12.5";
version = "3.13.1";
};
rspec-support = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr";
sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8";
type = "gem";
};
version = "3.12.1";
version = "3.13.1";
};
rspec-terraspace = {
dependencies = ["activesupport" "memoist" "rainbow" "rspec" "zeitwerk"];
@ -367,16 +418,26 @@
};
version = "2.3.2";
};
strscan = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
type = "gem";
};
version = "3.1.0";
};
terraspace = {
dependencies = ["activesupport" "cli-format" "deep_merge" "dotenv" "dsl_evaluator" "eventmachine-tail" "graph" "hcl_parser" "memoist" "rainbow" "render_me_pretty" "rexml" "rspec-terraspace" "terraspace-bundler" "thor" "tty-tree" "zeitwerk" "zip_folder"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zhcdaiq0sgk2gcy4krkzm4qrvcaibkf5n755qgqgcp1f1b0w6gl";
sha256 = "1zmnp71fwcj453cafmb8iicbk93flk98wh0wdk0q9xd3mgm3qh6x";
type = "gem";
};
version = "2.2.8";
version = "2.2.17";
};
terraspace-bundler = {
dependencies = ["activesupport" "aws-sdk-s3" "dsl_evaluator" "memoist" "nokogiri" "rainbow" "rubyzip" "thor" "zeitwerk"];
@ -404,20 +465,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg";
sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps";
type = "gem";
};
version = "1.2.2";
version = "1.3.1";
};
tilt = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7";
sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z";
type = "gem";
};
version = "2.2.0";
version = "2.4.0";
};
tty-tree = {
groups = ["default"];
@ -445,10 +506,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk";
sha256 = "08cfb35232p9s1r4jqv8wacv38vxh699mgbr9y03ga89gx9lipqp";
type = "gem";
};
version = "2.6.8";
version = "2.6.16";
};
zip_folder = {
dependencies = ["rubyzip"];

View File

@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop-beta";
dir = "Signal Beta";
version = "7.17.0-beta.1";
version = "7.18.0-beta.1";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
hash = "sha256-sK42Bqh+j4b8SduZk6eMhgBhRMG0q/ee5lAqFYVc4Tg=";
hash = "sha256-ZNFssB0SiNAAW7SupxNqdbEtEpemrv+IoyfdWVKu8CI=";
}

View File

@ -2,7 +2,7 @@
callPackage ./generic.nix { } rec {
pname = "signal-desktop";
dir = "Signal";
version = "7.16.0";
version = "7.17.0";
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
hash = "sha256-DfPQb3TGhVVZ7webNoMmyhjhRKKO3lWf12ZIpi7D7tc=";
hash = "sha256-4Yp81aBY01cVZ/KDSqPO3R3HglLup/+sczQ5XNtQn84=";
}

View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
description = "Secure Internet Live Conferencing server";
mainProgram = "silc";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [viric];
maintainers = [ ];
platforms = with lib.platforms; linux;
};
}

View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/falsovsky/FiSH-irssi";
license = licenses.mit;
maintainers = with maintainers; [ viric ];
maintainers = [ ];
platforms = platforms.unix;
};
}

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "iroh";
version = "0.20.0";
version = "0.21.0";
src = fetchFromGitHub {
owner = "n0-computer";
repo = pname;
rev = "v${version}";
hash = "sha256-1ke1S5IBrg8XYO67iUaH0T4dA59TkyqelsghIK+TuyM=";
hash = "sha256-g/x5lVVrm1NrJbqmhza/wryEwuXHh1tDBf+x6vL+2n0=";
};
cargoHash = "sha256-O6HHZtZes8BO2XuCMdVuuHphzYiqkS5axbYIxsGZw6k=";
cargoHash = "sha256-Sp2yMF/M3SuNB1DDQ79Lau5IxtSM1NPLJi9TnHWqnuc=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks; [

View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss";
description = "Offline RSS/Atom reader";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ viric ];
maintainers = [ ];
platforms = lib.platforms.linux;
mainProgram = "offrss";
};

View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
homepage = "http://siproxd.sourceforge.net/";
description = "Masquerading SIP Proxy Server";
mainProgram = "siproxd";
maintainers = with lib.maintainers; [viric];
maintainers = [ ];
platforms = with lib.platforms; linux;
license = lib.licenses.gpl2Plus;
};

View File

@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
description = "Easy-to-use personal finance software";
homepage = "https://www.moneymanagerex.org/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ viric ];
maintainers = [ ];
platforms = with lib.platforms; unix;
mainProgram = "mmex";
};

View File

@ -19,7 +19,7 @@ mkDerivation rec {
mainProgram = "caneda";
homepage = "http://caneda.org";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [viric];
maintainers = [ ];
platforms = with lib.platforms; linux;
};
}

View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
mainProgram = "xoscope";
homepage = "https://xoscope.sourceforge.net";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [viric];
maintainers = [ ];
platforms = with lib.platforms; linux;
};
}

View File

@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
description = "Easy to use, general purpose Computer Algebra System${lib.optionalString enableGui ", built with GUI."}";
homepage = "http://www.yacas.org/";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ viric ];
maintainers = [ ];
platforms = with lib.platforms; linux;
};
}

View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
homepage = "https://grothoff.org/christian/doodle/";
description = "Tool to quickly index and search documents on a computer";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ viric ];
maintainers = [ ];
platforms = with lib.platforms; linux;
mainProgram = "doodle";
};

View File

@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
homepage = "https://www.fossil-scm.org/";
license = licenses.bsd2;
maintainers = with maintainers; [ maggesi viric ];
maintainers = with maintainers; [ maggesi ];
platforms = platforms.all;
mainProgram = "fossil";
};

View File

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
description = "Multi-platform GUI front-end for the Subversion revision system";
homepage = "http://rapidsvn.tigris.org/";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.viric ];
maintainers = [ ];
platforms = lib.platforms.unix;
mainProgram = "rapidsvn";
};

View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
tags.
'';
license = licenses.mit;
maintainers = with maintainers; [ viric neonfuz ];
maintainers = with maintainers; [ neonfuz ];
platforms = platforms.all;
mainProgram = "dwm";
};

View File

@ -51,7 +51,7 @@ let
# list of packages which are for x86 (only multiPkgs, only for x86_64 hosts)
multiPaths = multiPkgs pkgsi686Linux;
# base packages of the chroot
# base packages of the fhsenv
# these match the host's architecture, glibc_multi is used for multilib
# builds. glibcLocales must be before glibc or glibc_multi as otherwiese
# the wrong LOCALE_ARCHIVE will be used where only C.UTF-8 is available.
@ -84,7 +84,7 @@ let
'';
etcProfile = writeText "profile" ''
export PS1='${name}-chrootenv:\u@\h:\w\$ '
export PS1='${name}-fhsenv:\u@\h:\w\$ '
export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH"
@ -123,8 +123,8 @@ let
${profile}
'';
# Compose /etc for the chroot environment
etcPkg = runCommandLocal "${name}-chrootenv-etc" { } ''
# Compose /etc for the fhs environment
etcPkg = runCommandLocal "${name}-fhs-etc" { } ''
mkdir -p $out/etc
pushd $out/etc
@ -215,7 +215,7 @@ let
then setupLibDirsTarget
else setupLibDirsMulti;
# the target profile is the actual profile that will be used for the chroot
# the target profile is the actual profile that will be used for the fhs
setupTargetProfile = ''
mkdir -m0755 usr
pushd usr

View File

@ -1,27 +1,29 @@
{ lib
, clangStdenv
, fetchFromGitLab
, fetchpatch
, cmake
, pkg-config
, spdlog
, nlohmann_json
, systemd
, libbpf
, elfutils
, bpftools
, pcre2
, zlib
{
lib,
clangStdenv,
fetchFromGitLab,
fetchpatch,
cmake,
pkg-config,
spdlog,
nlohmann_json,
systemd,
libbpf,
elfutils,
bpftools,
pcre2,
zlib,
withBpf ? true,
}:
clangStdenv.mkDerivation rec {
clangStdenv.mkDerivation (finalAttrs: {
pname = "ananicy-cpp";
version = "1.1.1";
src = fetchFromGitLab {
owner = "ananicy-cpp";
repo = "ananicy-cpp";
rev = "v${version}";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY=";
};
@ -41,6 +43,7 @@ clangStdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkg-config
] ++ lib.optionals withBpf [
bpftools
];
@ -49,23 +52,29 @@ clangStdenv.mkDerivation rec {
spdlog
nlohmann_json
systemd
zlib
] ++ lib.optionals withBpf [
libbpf
elfutils
zlib
];
# BPF A call to built-in function '__stack_chk_fail' is not supported.
hardeningDisable = [ "stackprotector" "zerocallusedregs" ];
hardeningDisable = [
"stackprotector"
"zerocallusedregs"
];
cmakeFlags = [
"-DUSE_EXTERNAL_JSON=ON"
"-DUSE_EXTERNAL_SPDLOG=ON"
"-DUSE_EXTERNAL_FMTLIB=ON"
"-DUSE_BPF_PROC_IMPL=ON"
"-DBPF_BUILD_LIBBPF=OFF"
"-DENABLE_SYSTEMD=ON"
"-DENABLE_REGEX_SUPPORT=ON"
"-DVERSION=${version}"
(lib.mapAttrsToList lib.cmakeBool {
"USE_EXTERNAL_JSON" = true;
"USE_EXTERNAL_SPDLOG" = true;
"USE_EXTERNAL_FMTLIB" = true;
"USE_BPF_PROC_IMPL" = withBpf;
"BPF_BUILD_LIBBPF" = false;
"ENABLE_SYSTEMD" = true;
"ENABLE_REGEX_SUPPORT" = true;
})
(lib.cmakeFeature "VERSION" finalAttrs.version)
];
postInstall = ''
@ -85,4 +94,4 @@ clangStdenv.mkDerivation rec {
];
mainProgram = "ananicy-cpp";
};
}
})

View File

@ -0,0 +1,27 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "bbctl";
version = "0.12.0";
src = fetchFromGitHub {
owner = "beeper";
repo = "bridge-manager";
rev = "refs/tags/v${version}";
hash = "sha256-xaBLI5Y7PxHbmlwD72AKNrgnz3D+3WVhb2GJr5cmyfs=";
};
vendorHash = "sha256-VnqihTEGfrLxRfuscrWWBbhZ/tr8BhVnCd+FKblW5gI=";
meta = {
description = "Tool for running self-hosted bridges with the Beeper Matrix server. ";
homepage = "https://github.com/beeper/bridge-manager";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.heywoodlh ];
mainProgram = "bbctl";
changelog = "https://github.com/beeper/bridge-manager/releases/tag/v{version}";
};
}

View File

@ -0,0 +1,36 @@
{
lib,
stdenv,
fetchFromGitHub,
llvmPackages,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "bsc";
version = "3.3.4";
src = fetchFromGitHub {
owner = "IlyaGrebnov";
repo = "libbsc";
rev = "refs/tags/v${finalAttrs.version}";
sha256 = "sha256-reGg5xvoZBbNFFYPPyT2P1LA7oSCUIm9NIDjXyvkP9Q=";
};
enableParallelBuilding = true;
buildInputs = lib.optional stdenv.isDarwin llvmPackages.openmp;
makeFlags = [
"CC=$(CXX)"
"PREFIX=${placeholder "out"}"
];
meta = with lib; {
description = "High performance block-sorting data compression library";
homepage = "http://libbsc.com/";
maintainers = with maintainers; [ sigmanificient ];
license = lib.licenses.asl20;
platforms = platforms.unix;
mainProgram = "bsc";
};
})

View File

@ -0,0 +1,133 @@
{
lib,
python3Packages,
fetchFromGitHub,
glibc,
SDL2,
libjpeg_turbo,
alsa-lib,
libspnav,
desktop-file-utils,
gobject-introspection,
wrapGAppsHook3,
wrapGAppsHook4,
cameractrls-gtk3,
cameractrls-gtk4,
withGtk ? null,
}:
assert lib.assertOneOf "'withGtk' in cameractrls" withGtk [
3
4
null
];
let
mainExecutable =
"cameractrls" + lib.optionalString (withGtk != null) "gtk" + lib.optionalString (withGtk == 4) "4";
modulePath = "${placeholder "out"}/${python3Packages.python.sitePackages}/CameraCtrls";
installExecutables = [
"cameractrls"
"cameractrlsd"
"cameraptzgame"
"cameraptzmidi"
"cameraptzspnav"
"cameraview"
] ++ lib.optionals (withGtk != null) [ mainExecutable ];
in
python3Packages.buildPythonApplication rec {
pname = "cameractrls";
version = "0.6.6";
pyproject = false;
src = fetchFromGitHub {
owner = "soyersoyer";
repo = "cameractrls";
rev = "v${version}";
hash = "sha256-QjjLd5L+8Slxc3ywurhsWp1pZ2E1Y7NOdnCV2ZYBlqU=";
};
postPatch = ''
substituteInPlace cameractrlsd.py \
--replace-fail "ctypes.util.find_library('c')" '"${lib.getLib glibc}/lib/libc.so.6"'
substituteInPlace cameraptzgame.py cameraview.py \
--replace-fail "ctypes.util.find_library('SDL2-2.0')" '"${lib.getLib SDL2}/lib/libSDL2-2.0.so.0"'
substituteInPlace cameraview.py \
--replace-fail "ctypes.util.find_library('turbojpeg')" '"${lib.getLib libjpeg_turbo}/lib/libturbojpeg.so"'
substituteInPlace cameraptzmidi.py \
--replace-fail "ctypes.util.find_library('asound')" '"${lib.getLib alsa-lib}/lib/libasound.so"'
substituteInPlace cameraptzspnav.py \
--replace-fail "ctypes.util.find_library('spnav')" '"${lib.getLib libspnav}/lib/libspnav.so"'
'';
nativeBuildInputs =
lib.optionals (withGtk != null) [
desktop-file-utils
gobject-introspection
]
++ lib.optionals (withGtk == 3) [ wrapGAppsHook3 ]
++ lib.optionals (withGtk == 4) [ wrapGAppsHook4 ];
# Only used when withGtk != null
dependencies = with python3Packages; [ pygobject3 ];
installPhase =
''
runHook preInstall
mkdir -p $out/bin
for file in ${lib.concatStringsSep " " installExecutables}; do
install -Dm755 $file.py -t ${modulePath}
ln -s ${modulePath}/$file.py $out/bin/$file
done
''
+ lib.optionalString (withGtk != null) ''
install -Dm644 pkg/hu.irl.cameractrls.svg -t $out/share/icons/hicolor/scalable/apps
install -Dm644 pkg/hu.irl.cameractrls.metainfo.xml -t $out/share/metainfo
mkdir -p $out/share/applications
desktop-file-install \
--dir="$out/share/applications" \
--set-key=Exec --set-value="${mainExecutable}" \
pkg/hu.irl.cameractrls.desktop
''
+ ''
runHook postInstall
'';
dontWrapGApps = true;
dontWrapPythonPrograms = true;
postFixup = lib.optionalString (withGtk != null) ''
wrapPythonPrograms
patchPythonScript ${modulePath}/${mainExecutable}.py
wrapProgram $out/bin/${mainExecutable} ''${makeWrapperArgs[@]} ''${gappsWrapperArgs[@]}
'';
passthru.tests = {
# Also build these packages in ofBorg (defined in top-level/all-packages.nix)
inherit cameractrls-gtk3 cameractrls-gtk4;
};
meta = {
description = "Camera controls for Linux";
longDescription = ''
It's a standalone Python CLI and GUI (GTK3, GTK4) and
camera Viewer (SDL) to set the camera controls in Linux.
It can set the V4L2 controls and it is extendable with
the non standard controls. Currently it has a Logitech
extension (LED mode, LED frequency, BRIO FoV, Relative
Pan/Tilt, PTZ presets), Kiyo Pro extension (HDR, HDR
mode, FoV, AF mode, Save), Preset extension (Save and
restore controls), Control Restore Daemon (to restore
presets at device connection).
'';
homepage = "https://github.com/soyersoyer/cameractrls";
license = lib.licenses.gpl3Plus;
mainProgram = mainExecutable;
maintainers = with lib.maintainers; [ aleksana ];
platforms = lib.platforms.linux;
};
}

View File

@ -15,19 +15,16 @@
}:
python3Packages.buildPythonApplication rec {
pname = "cartridges";
version = "2.8.5";
version = "2.9.3";
pyproject = false;
src = fetchFromGitHub {
owner = "kra-mo";
repo = "cartridges";
rev = "v${version}";
hash = "sha256-7T+q3T8z8SCpAn3ayodZeETOsTwL+hhVWzY2JyBEoi4=";
rev = "refs/tags/v${version}";
hash = "sha256-37i8p6KaS/G7ybw850XYaPiG83/Lffn/+21xVk5xva0=";
};
# TODO: remove this when #286814 hits master
mesonFlags = [ "-Dtiff_compression=jpeg" ];
nativeBuildInputs = [
appstream
blueprint-compiler
@ -54,6 +51,10 @@ python3Packages.buildPythonApplication rec {
dontWrapGApps = true;
makeWrapperArgs = [ ''''${gappsWrapperArgs[@]}'' ];
postFixup = ''
wrapPythonProgramsIn $out/libexec $out $pythonPath
'';
meta = {
description = "GTK4 + Libadwaita game launcher";
longDescription = ''

View File

@ -1,4 +1,11 @@
{ lib, rustPlatform, fetchFromGitLab, pkg-config, dbus }:
{
lib,
rustPlatform,
fetchFromGitLab,
pkg-config,
dbus,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "ear2ctl";
@ -17,6 +24,8 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ dbus ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Linux controller for the Nothing Ear (2)";
homepage = "https://gitlab.com/bharadwaj-raju/ear2ctl";

View File

@ -1,31 +1,33 @@
{ lib
, SDL2
, alsa-lib
, boost
, cmake
, curl
, fetchFromGitHub
, freeimage
, freetype
, libGL
, libGLU
, libvlc
, pkg-config
, rapidjson
, stdenv
{
lib,
SDL2,
alsa-lib,
boost,
callPackage,
cmake,
curl,
freeimage,
freetype,
libGL,
libGLU,
libvlc,
pkg-config,
rapidjson,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "emulationstation";
version = "2.11.2";
let
sources = callPackage ./sources.nix { };
in
stdenv.mkDerivation {
inherit (sources.emulationstation) pname version src;
src = fetchFromGitHub {
owner = "RetroPie";
repo = "EmulationStation";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-J5h/578FVe4DXJx/AvpRnCIUpqBeFtmvFhUDYH5SErQ=";
};
postUnpack = ''
pushd $sourceRoot/external/pugixml
cp --verbose --archive ${sources.pugixml.src}/* .
chmod --recursive 744 .
popd
'';
nativeBuildInputs = [
SDL2
@ -46,11 +48,9 @@ stdenv.mkDerivation (finalAttrs: {
rapidjson
];
strictDeps = true;
cmakeFlags = [ (lib.cmakeBool "GL" true) ];
cmakeFlags = [
(lib.cmakeBool "GL" true)
];
strictDeps = true;
installPhase = ''
runHook preInstall
@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
mkdir -p $out/share/emulationstation/
cp -r ../resources $out/share/emulationstation/
runHook preInstall
runHook postInstall
'';
# es-core/src/resources/ResourceManager.cpp: resources are searched at the
@ -70,12 +70,19 @@ stdenv.mkDerivation (finalAttrs: {
popd
'';
passthru = {
inherit sources;
};
meta = {
homepage = "https://github.com/RetroPie/EmulationStation";
description = "Flexible emulator front-end supporting keyboardless navigation and custom system themes (forked by RetroPie)";
license = with lib.licenses; [ mit ];
mainProgram = "emulationstation";
maintainers = with lib.maintainers; [ AndersonTorres edwtjo ];
maintainers = with lib.maintainers; [
AndersonTorres
edwtjo
];
platforms = lib.platforms.linux;
};
})
}

View File

@ -0,0 +1,35 @@
{ fetchFromGitHub }:
{
emulationstation =
let
self = {
pname = "emulationstation";
version = "2.11.2";
src = fetchFromGitHub {
owner = "RetroPie";
repo = "EmulationStation";
rev = "v${self.version}";
hash = "sha256-f2gRkp+3Pp2qnvg2RBzaHPpzhAnwx0+5x1Pe3kD90xE=";
};
};
in
self;
pugixml =
let
self = {
pname = "pugixml";
version = "1.8.1";
src = fetchFromGitHub {
owner = "zeux";
repo = "pugixml";
rev = "v${self.version}";
hash = "sha256-LbjTN1hnIbqI79C+gCdwuDG0+B/5yXf7hg0Q+cDFIf4=";
};
};
in
self;
}

Some files were not shown because too many files have changed in this diff Show More