Merge remote-tracking branch 'origin/staging-next' into staging
This commit is contained in:
@@ -20,6 +20,7 @@ runs:
|
||||
PIN_BUMP_SHA: ${{ inputs.untrusted-pin-bump }}
|
||||
with:
|
||||
script: |
|
||||
const { rm, writeFile } = require('node:fs/promises')
|
||||
const { spawn } = require('node:child_process')
|
||||
const { join } = require('node:path')
|
||||
|
||||
@@ -55,10 +56,19 @@ runs:
|
||||
return pinned.pins.nixpkgs.revision
|
||||
}
|
||||
|
||||
const pin_bump_sha = process.env.PIN_BUMP_SHA
|
||||
// Getting the pin-bump diff via the API avoids issues with `git fetch`
|
||||
// thin-packs not having enough base objects to be applied locally.
|
||||
// Returns a unified diff suitable for `git apply`.
|
||||
async function getPinBumpDiff(ref) {
|
||||
const { data } = await github.rest.repos.getCommit({
|
||||
mediaType: { format: 'diff' },
|
||||
...context.repo,
|
||||
ref,
|
||||
})
|
||||
return data
|
||||
}
|
||||
|
||||
// When dealing with a pin bump commit, we need `--depth=2` to view & apply its diff
|
||||
const depth = pin_bump_sha ? 2 : 1
|
||||
const pin_bump_sha = process.env.PIN_BUMP_SHA
|
||||
|
||||
const commits = [
|
||||
{
|
||||
@@ -76,17 +86,14 @@ runs:
|
||||
{
|
||||
sha: await getPinnedSha(process.env.TARGET_SHA),
|
||||
path: 'trusted-pinned'
|
||||
},
|
||||
{
|
||||
sha: pin_bump_sha
|
||||
}
|
||||
].filter(({ sha }) => Boolean(sha))
|
||||
|
||||
console.log('Fetching the following commits:', commits)
|
||||
console.log('Checking out the following commits:', commits)
|
||||
|
||||
// Fetching all commits at once is much faster than doing multiple checkouts.
|
||||
// This would fail without --refetch, because the we had a partial clone before, but changed it above.
|
||||
await run('git', 'fetch', `--depth=${depth}`, '--refetch', 'origin', ...(commits.map(({ sha }) => sha)))
|
||||
await run('git', 'fetch', '--depth=1', '--refetch', 'origin', ...(commits.map(({ sha }) => sha)))
|
||||
|
||||
// Checking out onto tmpfs takes 1s and is faster by at least factor 10x.
|
||||
await run('mkdir', 'nixpkgs')
|
||||
@@ -101,20 +108,21 @@ runs:
|
||||
|
||||
// Create all worktrees in parallel.
|
||||
await Promise.all(
|
||||
commits
|
||||
.filter(({ path }) => Boolean(path))
|
||||
.map(async ({ sha, path }) => {
|
||||
await run('git', 'worktree', 'add', join('nixpkgs', path), sha, '--no-checkout')
|
||||
await run('git', '-C', join('nixpkgs', path), 'sparse-checkout', 'disable')
|
||||
await run('git', '-C', join('nixpkgs', path), 'checkout', '--progress')
|
||||
})
|
||||
commits.map(async ({ sha, path }) => {
|
||||
await run('git', 'worktree', 'add', join('nixpkgs', path), sha, '--no-checkout')
|
||||
await run('git', '-C', join('nixpkgs', path), 'sparse-checkout', 'disable')
|
||||
await run('git', '-C', join('nixpkgs', path), 'checkout', '--progress')
|
||||
})
|
||||
)
|
||||
|
||||
// Apply pin bump to untrusted worktree
|
||||
if (pin_bump_sha) {
|
||||
console.log('Applying untrusted ci/pinned.json bump:', pin_bump_sha)
|
||||
console.log('Fetching ci/pinned.json bump commit:', pin_bump_sha)
|
||||
await writeFile('pin-bump.patch', await getPinBumpDiff(pin_bump_sha))
|
||||
|
||||
console.log('Applying untrusted ci/pinned.json bump to ./nixpkgs/untrusted')
|
||||
try {
|
||||
await run('git', '-C', join('nixpkgs', 'untrusted'), 'cherry-pick', '--no-commit', pin_bump_sha)
|
||||
await run('git', '-C', join('nixpkgs', 'untrusted'), 'apply', '--3way', join('..', '..', 'pin-bump.patch'))
|
||||
} catch {
|
||||
core.setFailed([
|
||||
`Failed to apply ci/pinned.json bump commit ${pin_bump_sha}.`,
|
||||
@@ -122,5 +130,7 @@ runs:
|
||||
`Please rebase the PR or ensure the pin bump is standalone.`
|
||||
].join(' '))
|
||||
return
|
||||
} finally {
|
||||
await rm('pin-bump.patch')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
- all:
|
||||
- changed-files:
|
||||
- any-glob-to-any-file:
|
||||
- .github/actions/*
|
||||
- .github/actions/**/*
|
||||
- .github/workflows/*
|
||||
- .github/labeler*.yml
|
||||
- ci/**/*.*
|
||||
|
||||
@@ -25070,6 +25070,12 @@
|
||||
github = "stasjok";
|
||||
githubId = 1353637;
|
||||
};
|
||||
staslyakhov = {
|
||||
name = "Stas Lyakhov";
|
||||
email = "nix@lyakhovs.dev";
|
||||
github = "staslyakhov";
|
||||
githubId = 19846456;
|
||||
};
|
||||
staticdev = {
|
||||
email = "staticdev-support@proton.me";
|
||||
github = "staticdev";
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
|
||||
- [reaction](https://reaction.ppom.me/), a daemon that scans program outputs for repeated patterns, and takes action. A common usage is to scan ssh and webserver logs, and to ban hosts that cause multiple authentication errors. A modern alternative to fail2ban. Available as [services.reaction](#opt-services.reaction.enable).
|
||||
|
||||
- [Tailscale Serve](https://tailscale.com/kb/1552/tailscale-services), configure Tailscale Serve for exposing local services to your tailnet. Available as [services.tailscale.serve](#opt-services.tailscale.serve.enable).
|
||||
|
||||
- [qui](https://github.com/autobrr/qui), a modern alternative webUI for qBittorrent, with multi-instance support. Written in Go/React. Available as [services.qui](#opt-services.qui.enable).
|
||||
|
||||
- [LibreChat](https://www.librechat.ai/), open-source self-hostable ChatGPT clone with Agents and RAG APIs. Available as [services.librechat](#opt-services.librechat.enable).
|
||||
|
||||
@@ -9,7 +9,7 @@ let
|
||||
|
||||
makeColor = i: lib.concatMapStringsSep "," (x: "0x" + lib.substring (2 * i) 2 x);
|
||||
|
||||
isUnicode = lib.hasSuffix "UTF-8" (lib.toUpper config.i18n.defaultLocale);
|
||||
isUnicode = config.i18n.defaultCharset == "UTF-8" || cfg.useXkbConfig;
|
||||
|
||||
optimizedKeymap =
|
||||
pkgs.runCommand "keymap"
|
||||
|
||||
@@ -1391,6 +1391,7 @@
|
||||
./services/networking/syncthing.nix
|
||||
./services/networking/tailscale-auth.nix
|
||||
./services/networking/tailscale-derper.nix
|
||||
./services/networking/tailscale-serve.nix
|
||||
./services/networking/tailscale.nix
|
||||
./services/networking/tayga.nix
|
||||
./services/networking/tcpcrypt.nix
|
||||
|
||||
@@ -173,9 +173,9 @@ in
|
||||
# This is required for autorotation in Plasma 6
|
||||
qtsensors
|
||||
]
|
||||
++ lib.optionals config.services.flatpak.enable [
|
||||
++ lib.optionals (config.services.flatpak.enable || config.services.fwupd.enable) [
|
||||
# Since PackageKit Nix support is not there yet,
|
||||
# only install discover if flatpak is enabled.
|
||||
# only install discover if flatpak or fwupd is enabled.
|
||||
discover
|
||||
];
|
||||
in
|
||||
|
||||
@@ -171,7 +171,7 @@ in
|
||||
a writeable configuration, such as quota tracking, enable
|
||||
this option.
|
||||
'';
|
||||
default = lib.versionOlder config.system.stateVersion "25.11";
|
||||
default = lib.versionOlder config.system.stateVersion "26.05";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
|
||||
@@ -0,0 +1,145 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.tailscale.serve;
|
||||
settingsFormat = pkgs.formats.json { };
|
||||
|
||||
# Build the serve config structure with svc: prefix on service names
|
||||
serveConfig = {
|
||||
version = "0.0.1";
|
||||
services = lib.mapAttrs' (
|
||||
name: serviceCfg:
|
||||
lib.nameValuePair "svc:${name}" (
|
||||
{
|
||||
endpoints = serviceCfg.endpoints;
|
||||
}
|
||||
// lib.optionalAttrs (serviceCfg.advertised != null) {
|
||||
inherit (serviceCfg) advertised;
|
||||
}
|
||||
)
|
||||
) cfg.services;
|
||||
};
|
||||
|
||||
configFile =
|
||||
if cfg.configFile != null then
|
||||
cfg.configFile
|
||||
else
|
||||
settingsFormat.generate "tailscale-serve-config.json" serveConfig;
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
bouk
|
||||
];
|
||||
|
||||
options.services.tailscale.serve = {
|
||||
enable = lib.mkEnableOption "Tailscale Serve configuration";
|
||||
|
||||
configFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
description = ''
|
||||
Path to a Tailscale Serve configuration file in JSON format.
|
||||
If set, this takes precedence over {option}`services.tailscale.serve.services`.
|
||||
|
||||
See <https://tailscale.com/kb/1589/tailscale-services-configuration-file> for the configuration format.
|
||||
'';
|
||||
example = "/run/secrets/tailscale-serve.json";
|
||||
};
|
||||
|
||||
services = lib.mkOption {
|
||||
type = lib.types.attrsOf (
|
||||
lib.types.submodule {
|
||||
options = {
|
||||
endpoints = lib.mkOption {
|
||||
type = lib.types.attrsOf lib.types.str;
|
||||
description = ''
|
||||
Map of incoming traffic patterns to local targets.
|
||||
|
||||
Keys should be in the format `<protocol>:<port>` or `<protocol>:<port-range>`.
|
||||
Currently only `tcp` protocol is supported.
|
||||
|
||||
Values should be in the format `<protocol>://<host:port>` where protocol
|
||||
is `http`, `https`, or `tcp`.
|
||||
'';
|
||||
example = {
|
||||
"tcp:443" = "https://localhost:443";
|
||||
"tcp:8080" = "http://localhost:8080";
|
||||
};
|
||||
};
|
||||
|
||||
advertised = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.bool;
|
||||
default = null;
|
||||
description = ''
|
||||
Whether the service should accept new connections.
|
||||
Defaults to `true` when not specified.
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
default = { };
|
||||
description = ''
|
||||
Services to configure for Tailscale Serve.
|
||||
|
||||
Each attribute name should be the service name (without the `svc:` prefix).
|
||||
The `svc:` prefix will be added automatically.
|
||||
|
||||
See <https://tailscale.com/kb/1589/tailscale-services-configuration-file> for details.
|
||||
'';
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
web-server = {
|
||||
endpoints = {
|
||||
"tcp:443" = "https://localhost:443";
|
||||
};
|
||||
};
|
||||
api = {
|
||||
endpoints = {
|
||||
"tcp:8080" = "http://localhost:8080";
|
||||
};
|
||||
advertised = true;
|
||||
};
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = config.services.tailscale.enable;
|
||||
message = "services.tailscale.serve requires services.tailscale.enable to be true";
|
||||
}
|
||||
{
|
||||
assertion = cfg.configFile != null || cfg.services != { };
|
||||
message = "services.tailscale.serve requires either configFile or services to be set";
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services.tailscale-serve = {
|
||||
description = "Tailscale Serve Configuration";
|
||||
|
||||
after = [
|
||||
"tailscaled.service"
|
||||
"tailscaled-autoconnect.service"
|
||||
"tailscaled-set.service"
|
||||
];
|
||||
wants = [ "tailscaled.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
restartTriggers = [ configFile ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = "${lib.getExe config.services.tailscale.package} serve set-config --all ${configFile}";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -89,7 +89,7 @@ in
|
||||
|
||||
boot.initrd.network.udhcpc.enable = mkOption {
|
||||
default = config.networking.useDHCP && !config.boot.initrd.systemd.enable;
|
||||
defaultText = "networking.useDHCP";
|
||||
defaultText = lib.literalExpression "config.networking.useDHCP";
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Enables the udhcpc service during stage 1 of the boot process. This
|
||||
|
||||
@@ -291,6 +291,12 @@ def config_entry(levels: int, bootspec: BootSpec, label: str, time: str) -> str:
|
||||
entry += f'comment: {bootspec.label}, built on {time}\n'
|
||||
entry += 'kernel_path: ' + get_kernel_uri(bootspec.kernel) + '\n'
|
||||
entry += 'cmdline: ' + ' '.join(['init=' + bootspec.init] + bootspec.kernelParams).strip() + '\n'
|
||||
|
||||
# Set framebuffer resolution for Linux boot entries if configured
|
||||
resolution = config('resolution')
|
||||
if resolution is not None:
|
||||
entry += f'resolution: {resolution}\n'
|
||||
|
||||
if bootspec.initrd:
|
||||
entry += f'module_path: ' + get_kernel_uri(bootspec.initrd) + '\n'
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ let
|
||||
force = cfg.force;
|
||||
enrollConfig = cfg.enrollConfig;
|
||||
style = cfg.style;
|
||||
resolution = cfg.resolution;
|
||||
maxGenerations = if cfg.maxGenerations == null then 0 else cfg.maxGenerations;
|
||||
hostArchitecture = pkgs.stdenv.hostPlatform.parsed.cpu;
|
||||
timeout = if config.boot.loader.timeout != null then config.boot.loader.timeout else 10;
|
||||
@@ -98,6 +99,27 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
resolution = lib.mkOption {
|
||||
default = null;
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
example = "1920x1080x32";
|
||||
description = ''
|
||||
The framebuffer resolution to set when booting Linux entries.
|
||||
This controls the GOP mode that Limine sets before handing off to the kernel,
|
||||
which affects early boot graphics (e.g., simpledrm, efifb).
|
||||
|
||||
Format: `<width>x<height>` or `<width>x<height>x<bpp>`.
|
||||
If bpp is omitted, defaults to 32.
|
||||
|
||||
Note: Refresh rate is not supported because the UEFI GOP protocol only
|
||||
defines framebuffer dimensions and pixel format, not display timing.
|
||||
Refresh rate is determined later by the GPU driver based on EDID.
|
||||
|
||||
This is distinct from {option}`boot.loader.limine.style.interface.resolution`
|
||||
which only affects the Limine bootloader's own menu interface.
|
||||
'';
|
||||
};
|
||||
|
||||
additionalFiles = lib.mkOption {
|
||||
default = { };
|
||||
type = lib.types.attrsOf lib.types.path;
|
||||
|
||||
@@ -386,6 +386,7 @@ in
|
||||
collectd = runTest ./collectd.nix;
|
||||
commafeed = runTest ./commafeed.nix;
|
||||
connman = runTest ./connman.nix;
|
||||
console-xkb-and-i18n = runTest ./console-xkb-and-i18n.nix;
|
||||
consul = runTest ./consul.nix;
|
||||
consul-template = runTest ./consul-template.nix;
|
||||
containers-bridge = runTest ./containers-bridge.nix;
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "console-xkb-and-i18n";
|
||||
meta.maintainers = with lib.maintainers; [ doronbehar ];
|
||||
|
||||
nodes = {
|
||||
# Nothing to run on this node. Only verify that this configuration doesn't
|
||||
# produce the bugs described here:
|
||||
#
|
||||
# - https://github.com/NixOS/nixpkgs/issues/445666
|
||||
# - https://github.com/NixOS/nixpkgs/issues/411374
|
||||
#
|
||||
x = {
|
||||
i18n.defaultLocale = "eo";
|
||||
console.useXkbConfig = true;
|
||||
services.xserver.xkb = {
|
||||
layout = "us";
|
||||
variant = "colemak";
|
||||
};
|
||||
};
|
||||
};
|
||||
testScript = { nodes, ... }: "";
|
||||
}
|
||||
@@ -92,11 +92,7 @@ stdenv.mkDerivation rec {
|
||||
# Removing it will force it to use our version.
|
||||
rm $out/libexec/lib/bitwig-studio/libxcb-imdkit.so.1
|
||||
|
||||
substitute usr/share/applications/com.bitwig.BitwigStudio.desktop \
|
||||
$out/share/applications/com.bitwig.BitwigStudio.desktop \
|
||||
--replace-fail "Exec=bitwig-studio" "Exec=$out/bin/bitwig-studio"
|
||||
|
||||
runHook postInstall
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
alsa-lib,
|
||||
bison,
|
||||
flex,
|
||||
libsndfile,
|
||||
which,
|
||||
DarwinTools,
|
||||
xcbuild,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.5.5.5";
|
||||
pname = "chuck";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
|
||||
sha256 = "sha256-fxbTW0wcKn1q6psRhhCe6pHFJTPFfZUTCmlGr7gFoRU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flex
|
||||
bison
|
||||
which
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
DarwinTools
|
||||
xcbuild
|
||||
];
|
||||
|
||||
buildInputs = [ libsndfile ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib;
|
||||
|
||||
makeFlags = [
|
||||
"-C src"
|
||||
"DESTDIR=$(out)/bin"
|
||||
];
|
||||
buildFlags = [ (if stdenv.hostPlatform.isDarwin then "mac" else "linux-alsa") ];
|
||||
|
||||
meta = {
|
||||
description = "Programming language for real-time sound synthesis and music creation";
|
||||
homepage = "http://chuck.cs.princeton.edu";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ ftrvxmtrx ];
|
||||
mainProgram = "chuck";
|
||||
};
|
||||
}
|
||||
@@ -26,23 +26,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "elements" else "elementsd";
|
||||
version = "23.2.4";
|
||||
version = "23.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ElementsProject";
|
||||
repo = "elements";
|
||||
rev = "elements-${version}";
|
||||
sha256 = "sha256-UNjYkEZBjGuhkwBxSkNXjBBcLQqoan/afCLhoR2lOY4=";
|
||||
sha256 = "sha256-hqHKH9B6EITwZ4F+YdPJI4n3Z3EeXdPYbzRoNODlThY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# upnp: fix build with miniupnpc 2.2.8
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1";
|
||||
hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
}:
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "zig.vim";
|
||||
version = "0-unstable-2025-12-07";
|
||||
version = "0-unstable-2026-01-16";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "ziglang";
|
||||
repo = "zig.vim";
|
||||
rev = "74bdb43c9d5da8d6b715809b79f92ef8f711df8e";
|
||||
hash = "sha256-RmrRgJ6YdExMwmua6nGv6W7DPP98k2URIaJTm+O4uR8=";
|
||||
rev = "fc01f73ce0636723a03b784b63a7a89f2f9a84ae";
|
||||
hash = "sha256-bWvwb6k9jyoAqtp07UfYkyUsGo2N8Yvv7H6zq1eiwP8=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
|
||||
@@ -3840,8 +3840,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "ansible";
|
||||
publisher = "redhat";
|
||||
version = "26.1.0";
|
||||
hash = "sha256-xehZZ11C2Bjee1glpnPZaJ25DpbXSCsZONWWy4YNlRo=";
|
||||
version = "26.1.3";
|
||||
hash = "sha256-iBAlDqi7u/srkgBBLha/JCHZnpccz37BdZ7zVJVfJYY=";
|
||||
};
|
||||
meta = {
|
||||
description = "Ansible language support";
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "dosbox-pure";
|
||||
version = "0-unstable-2025-12-01";
|
||||
version = "0-unstable-2026-01-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schellingb";
|
||||
repo = "dosbox-pure";
|
||||
rev = "492d8a3996429dbaa4a13b2e90c522e7b34fc2bb";
|
||||
hash = "sha256-yNufp+HUzuLOiRhQfdP1ssKDTALwh28B8cRZ2rTJpis=";
|
||||
rev = "c69ecd250eb76cdceae1dbb962116f706e4fa661";
|
||||
hash = "sha256-cCUHTaHDNn7k5mK589RoNXiPgFvEBCxCSyp+8azUtpg=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "gambatte";
|
||||
version = "0-unstable-2025-12-19";
|
||||
version = "0-unstable-2026-01-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "gambatte-libretro";
|
||||
rev = "308255e4a3acb38a054ebb42a5e2fe5c50eebd66";
|
||||
hash = "sha256-a75F7kfrVfIVt5yvYIu+oVmpXlOdTDTs5IX1Q5NB8WU=";
|
||||
rev = "9fe223d9c4b615c55840170c6e85e6e9fa4bd1d2";
|
||||
hash = "sha256-BBFT8+TLf5qbwo36BudPjeMRPLdSj2+0m4RnfeFrlOc=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "play";
|
||||
version = "0-unstable-2026-01-14";
|
||||
version = "0-unstable-2026-01-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpd002";
|
||||
repo = "Play-";
|
||||
rev = "48ddb5671398cd0b96901f0ba7ec2543df8548eb";
|
||||
hash = "sha256-xZJG4Bjh3Nkb7IOGIBZmcRF92eFT3C/dNTSJ0RAFFTA=";
|
||||
rev = "bf245b03076b97eed14abd54c79537a59ecc2bd9";
|
||||
hash = "sha256-2Tm/CQt+LwAIEWsBRtgm/rZngSHqEohx45UlkaTCHbA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -70,13 +70,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "6.9.13-10";
|
||||
version = "6.9.13-38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick6";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-AdlJaCJOrN+NkkzzzgELtgAr5iZ9dvlVYVc7tYiM+R8=";
|
||||
sha256 = "sha256-49o1jFFs7GrQMBvkoUvTmlI5TDnS1mVycghuaOfDrIc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -813,7 +813,7 @@
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "144.0.7559.59",
|
||||
"version": "144.0.7559.96",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "2e88a3f08bd8c4a0014eae82729beca935f7f188",
|
||||
@@ -825,16 +825,16 @@
|
||||
"hash": "sha256-04h38X/hqWwMiAOVsVu4OUrt8N+S7yS/JXc5yvRGo1I="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "144.0.7559.59-1",
|
||||
"hash": "sha256-u4jg04k/HilI5i8eWS2b+MDvi9RYD1UP8KNNKNWZcfQ="
|
||||
"rev": "144.0.7559.96-1",
|
||||
"hash": "sha256-gbEKKGGi6FBhRoCEerSdJJtn5vXaFo9G74lYHDsz0Xs="
|
||||
},
|
||||
"npmHash": "sha256-13sgV/5BD7QvDLBAEmoLN5vongw+S5v5znvZcctxhWc="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "cd1d73dd77daadf4581dc29ca73482fc241e079d",
|
||||
"hash": "sha256-K/dmiy5u+XJIpS6AOTaXDLVYp5qAtfUbfSbGCpt9Cv8=",
|
||||
"rev": "d7b80622cfab91c265741194e7942eefd2d21811",
|
||||
"hash": "sha256-Cz3iDS0raJHRh+byrs7GYp6sck54mJq7yzsjLUWDWqA=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -944,8 +944,8 @@
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "a8d1e554a9bd35b0418ba7fd6b0bc005250a7703",
|
||||
"hash": "sha256-GJuT3rqNxvKkRTMvoMi8/QYda0y0RTkZLhb5v9QkwGA="
|
||||
"rev": "9e0e116de6735ab113349675d31a23c121254fe0",
|
||||
"hash": "sha256-MsUmRx5fQYWbkPJ/JvaoT//qjPYy5xxZXIa3t5LDxSY="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
@@ -1069,8 +1069,8 @@
|
||||
},
|
||||
"src/third_party/devtools-frontend/src": {
|
||||
"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
|
||||
"rev": "d5efa4236f8676254c9f39ccfef18bd633de5fd3",
|
||||
"hash": "sha256-BmwsvTjgYQayFnyT9EfFzpCfbgdTt9xZlsUba0uJelg="
|
||||
"rev": "a3064782146fc247c488d44c1ad3496b29d55ec4",
|
||||
"hash": "sha256-vLkWH/EiDHxl/dz4soKybQF1hgud/7MlnDhVPicYJGY="
|
||||
},
|
||||
"src/third_party/dom_distiller_js/dist": {
|
||||
"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
|
||||
@@ -1619,8 +1619,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "ad25f9ae50a53bee50f459bfee25fb1e6f64adc3",
|
||||
"hash": "sha256-vyOtnPA3tAeorNOGTDuAnwJ/UtpjeO8z+RSjx9RIFFc="
|
||||
"rev": "6c2c296f23a5487ccb2536cf7c90d01f35d03077",
|
||||
"hash": "sha256-gBzwGvl/tqj4Z6acdLN326I80kBLEk+Nn8oN6D193o4="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,11 +54,11 @@
|
||||
"vendorHash": "sha256-ogQLStDbsM0aRf4QIbITB8Z+L9DUtZwoAPK6T4xylXI="
|
||||
},
|
||||
"aminueza_minio": {
|
||||
"hash": "sha256-G6eQeoxIeuUJK7LF8gByOrNP27i3p0OccZNxL2DxDw0=",
|
||||
"hash": "sha256-gl1mD4Ital/xhtWZW9UbalTJqYLJ2tr8ImDFLiTyyFg=",
|
||||
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
|
||||
"owner": "aminueza",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v3.12.0",
|
||||
"rev": "v3.13.0",
|
||||
"spdx": "AGPL-3.0",
|
||||
"vendorHash": "sha256-6Tw4rCOzrvN2pK83NejdJJBjljfDfHEniIX+EdfqujA="
|
||||
},
|
||||
@@ -274,13 +274,13 @@
|
||||
"vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI="
|
||||
},
|
||||
"datadog_datadog": {
|
||||
"hash": "sha256-xBfk4Pvu4caOOW5qxNdbaEb4NAOL9/5KMgBCpBfvghU=",
|
||||
"hash": "sha256-AOffUquIVHmeYk3WbkekSwZQAC4FXY82+dQMgGQ8/H8=",
|
||||
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
|
||||
"owner": "DataDog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.84.0",
|
||||
"rev": "v3.85.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-FrMa8ah8WM/XlQwwHTvK0tPaSUnCx2ArQDWXw7ULwTk="
|
||||
"vendorHash": "sha256-0hMKqv++nheXRu8DBcGOItaVKCnr0nPv/jGtNe05cp8="
|
||||
},
|
||||
"datadrivers_nexus": {
|
||||
"hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=",
|
||||
@@ -706,13 +706,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"hetznercloud_hcloud": {
|
||||
"hash": "sha256-p0MR+e3iSEhDJwXHSqG1spJ5rt+TV6yQVm7V18spFi0=",
|
||||
"hash": "sha256-phAc3QHDtTt76ThmsEW4u4SDC5r2Dv7uh4cxD/HurAA=",
|
||||
"homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
|
||||
"owner": "hetznercloud",
|
||||
"repo": "terraform-provider-hcloud",
|
||||
"rev": "v1.58.0",
|
||||
"rev": "v1.59.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-8gBaOdoUjmeomi8+H2gMypKnJdkXGzgzu8K0ATqMfxE="
|
||||
"vendorHash": "sha256-642sABI6g4T3OoZLuOdo9YzXSxi1d35WsVkUwzxKT7I="
|
||||
},
|
||||
"huaweicloud_huaweicloud": {
|
||||
"hash": "sha256-4YCixNM2I/v8pn6CAiNQf2tXKTeNjAWpHGDF3yOwIYs=",
|
||||
@@ -751,11 +751,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"integrations_github": {
|
||||
"hash": "sha256-I9mQ3oNzU6+n7XPmyhbIgr/d80wcLy5s1s3v96fYbkU=",
|
||||
"hash": "sha256-WN8G05llSdh7IE7mJelrehTkNNtWBMG8Co/YLJUNLmk=",
|
||||
"homepage": "https://registry.terraform.io/providers/integrations/github",
|
||||
"owner": "integrations",
|
||||
"repo": "terraform-provider-github",
|
||||
"rev": "v6.9.1",
|
||||
"rev": "v6.10.2",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -1202,11 +1202,11 @@
|
||||
"vendorHash": "sha256-OJlD1P+CUEsLk2xSsQ2QQBvGewYNly1dIJh8kMi+ChE="
|
||||
},
|
||||
"siderolabs_talos": {
|
||||
"hash": "sha256-NsIFyngT6/bU744fftNWWHU43W3sXO/0yzzAKSEH9/Q=",
|
||||
"hash": "sha256-9VL2aa6wZFAfQ/rkfMKwWdDU9Vs6GwZzsvQpUfm7rME=",
|
||||
"homepage": "https://registry.terraform.io/providers/siderolabs/talos",
|
||||
"owner": "siderolabs",
|
||||
"repo": "terraform-provider-talos",
|
||||
"rev": "v0.10.0",
|
||||
"rev": "v0.10.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-i5Qi2rs1NpOlOkM80Uj0GfQRbobp9+6lAgt2iN2uEn0="
|
||||
},
|
||||
@@ -1310,11 +1310,11 @@
|
||||
"vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o="
|
||||
},
|
||||
"tencentcloudstack_tencentcloud": {
|
||||
"hash": "sha256-VgmXFRmwgCkGMwcle0zop41pr+uuj4ILlNXIcHQ9n0g=",
|
||||
"hash": "sha256-kXdu7rtGo4J9waREkVMWqFf4/Ki22fm6p/Nhtts/Ycs=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.82.54",
|
||||
"rev": "v1.82.57",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -1418,11 +1418,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"vancluever_acme": {
|
||||
"hash": "sha256-0XO19ahaRrIxg785dHb/RPBXuGWyP5y0prAN7D9w6IE=",
|
||||
"hash": "sha256-Fjn1eNqB0Ye5MRg8+YsPwMBdkvsVELTzf2wvHluFzN8=",
|
||||
"homepage": "https://registry.terraform.io/providers/vancluever/acme",
|
||||
"owner": "vancluever",
|
||||
"repo": "terraform-provider-acme",
|
||||
"rev": "v2.42.0",
|
||||
"rev": "v2.43.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-LAM2pzTIRdspYnXboDA+iGwt7uaI+/ItXPAgOJUELps="
|
||||
},
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"linux-canary": {
|
||||
"hash": "sha256-jomLXlIr+ajJspmh/seNb48alPSuCw8ybYkfc0uAziE=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.852/discord-canary-0.0.852.tar.gz",
|
||||
"version": "0.0.852"
|
||||
"hash": "sha256-HtcgQS8P5R57qV3pKYyVLcT9FCOtZ6UbFBQWFkvU8B0=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/linux/0.0.854/discord-canary-0.0.854.tar.gz",
|
||||
"version": "0.0.854"
|
||||
},
|
||||
"linux-development": {
|
||||
"hash": "sha256-EVkjWoqWl9Z+iHCLPOLu4PIUb2wC3HVcPVjOVz++IVw=",
|
||||
@@ -10,19 +10,19 @@
|
||||
"version": "0.0.94"
|
||||
},
|
||||
"linux-ptb": {
|
||||
"hash": "sha256-szmKLp+aXZjrWClTOQ+NTwenY7b5c3eONFUUmszfUSk=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.172/discord-ptb-0.0.172.tar.gz",
|
||||
"version": "0.0.172"
|
||||
"hash": "sha256-Y+e3HHXE5D9Q9qKE7ipaLijZ+E6yEr9NzEOy5c+Gk54=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/linux/0.0.173/discord-ptb-0.0.173.tar.gz",
|
||||
"version": "0.0.173"
|
||||
},
|
||||
"linux-stable": {
|
||||
"hash": "sha256-4rJ0l0zSoOz7L65sy3Gegcsb/nJGGFu6h5TGAb0fqUI=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.120/discord-0.0.120.tar.gz",
|
||||
"version": "0.0.120"
|
||||
"hash": "sha256-WR9xyw3Zn/HAZQlfiKMAXqc2TueF6wCfQzvYtnXd1yM=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/linux/0.0.121/discord-0.0.121.tar.gz",
|
||||
"version": "0.0.121"
|
||||
},
|
||||
"osx-canary": {
|
||||
"hash": "sha256-ZzqakVB2Rkcq5zME2WnSCw1CLzpD3VDM/pu4nQ7rRNs=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.956/DiscordCanary.dmg",
|
||||
"version": "0.0.956"
|
||||
"hash": "sha256-q/PAGdlOTdkQudiH/NFXSgwhz2XBL9ZwrhJXiY9Iibc=",
|
||||
"url": "https://canary.dl2.discordapp.net/apps/osx/0.0.958/DiscordCanary.dmg",
|
||||
"version": "0.0.958"
|
||||
},
|
||||
"osx-development": {
|
||||
"hash": "sha256-B1//zMlTv2+RWHfWZSaaU8ubVOwWob+EYjNdtFRwlgg=",
|
||||
@@ -30,13 +30,13 @@
|
||||
"version": "0.0.107"
|
||||
},
|
||||
"osx-ptb": {
|
||||
"hash": "sha256-tjWbvWOvSinVZDvJYFFcbmr+y7W5PmIr/alrS82ECBo=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.204/DiscordPTB.dmg",
|
||||
"version": "0.0.204"
|
||||
"hash": "sha256-QCzJsb1RH6HORk9hw9F9Xu0rE+NCFYJDTJQO9UrdBxo=",
|
||||
"url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.205/DiscordPTB.dmg",
|
||||
"version": "0.0.205"
|
||||
},
|
||||
"osx-stable": {
|
||||
"hash": "sha256-PkZU/1GxPmfxq2qP/5gGU85EFYPI1V42iHfoy9x9fKI=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.372/Discord.dmg",
|
||||
"version": "0.0.372"
|
||||
"hash": "sha256-/CEN67VbRRwK64Iy7GIhs2XFwHe47njI5X6n45j5Q/E=",
|
||||
"url": "https://stable.dl2.discordapp.net/apps/osx/0.0.373/Discord.dmg",
|
||||
"version": "0.0.373"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,14 +43,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gajim";
|
||||
version = "2.3.6";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "dev.gajim.org";
|
||||
owner = "gajim";
|
||||
repo = "gajim";
|
||||
tag = version;
|
||||
hash = "sha256-Mvi69FI2zRefcCnLsurdVNMxYaqKsUCKgeFxOh6vg/o=";
|
||||
hash = "sha256-VBo0+8lOXWbi3a9FT0qcEkyoxzVAm+QLrBtHmRjUHbg=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
@@ -112,6 +112,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
qrcode
|
||||
sqlalchemy
|
||||
emoji
|
||||
httpx
|
||||
h2
|
||||
truststore
|
||||
]
|
||||
++ lib.optionals enableE2E [
|
||||
pycrypto
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
{
|
||||
"stable": {
|
||||
"linux": {
|
||||
"version": "8.11.22",
|
||||
"version": "8.12.0",
|
||||
"sources": {
|
||||
"x86_64": {
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.22.x64.tar.gz",
|
||||
"hash": "sha256-IYwCERJyL7l5qFFvTneTciKVT2PSkoeuzQsiMfdomV8="
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.0.x64.tar.gz",
|
||||
"hash": "sha256-EiSrZHWXvBLhS+Gx519AvUmRH582P4/cF0huj+RHcMI="
|
||||
},
|
||||
"aarch64": {
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.22.arm64.tar.gz",
|
||||
"hash": "sha256-PpsKuFNRVt/eYWvlmZxo6tyMC/gUfLrIAWYPoKIntrU="
|
||||
"url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.0.arm64.tar.gz",
|
||||
"hash": "sha256-/ykSp+//5SvLFH0BsjPNwAEapoBUTqxfaRKJw4R7eis="
|
||||
}
|
||||
}
|
||||
},
|
||||
"darwin": {
|
||||
"version": "8.11.22",
|
||||
"version": "8.12.0",
|
||||
"sources": {
|
||||
"x86_64": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.11.22-x86_64.zip",
|
||||
"hash": "sha256-jyaAUZkRJ6Rl5zd9ppVZ6AkpzAXaw11KvpLdpftC6bM="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.12.0-x86_64.zip",
|
||||
"hash": "sha256-JcSNA9oEeEJk9bHxTwF08/KrJNu+UOSC5r0VJGmds+Y="
|
||||
},
|
||||
"aarch64": {
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.11.22-aarch64.zip",
|
||||
"hash": "sha256-SH3QIJrfqEgKV0GhrLCKkbLmSK9n9OyBRBaGCTm3FrI="
|
||||
"url": "https://downloads.1password.com/mac/1Password-8.12.0-aarch64.zip",
|
||||
"hash": "sha256-fpu+CZ3iLXcGevWHLh/HVa2uoS/a1w/m0s4+awBzNI0="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,23 +7,22 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "air-formatter";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "posit-dev";
|
||||
repo = "air";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LNU//dQico54GhZdehynEuukfGuU8rQvfFO4zvRsZL0=";
|
||||
hash = "sha256-+AsKwigWikAv8NOaIYVvrH3Pub7Q9qV5YOp2jYU2GkE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9HRDUTYzKLYuh9KCcnvPXB6gDKcht79TOZZ3ze9+gbg=";
|
||||
cargoHash = "sha256-ndd4ps2X/+a62p3dlv8jxhr2bbBG88rytI1XBVntk+g=";
|
||||
|
||||
useNextest = true;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/air";
|
||||
doInstallCheck = true;
|
||||
|
||||
cargoBuildFlags = [ "-p air" ];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
wrapGAppsHook3,
|
||||
cairo,
|
||||
glib,
|
||||
goocanvas3,
|
||||
goocanvas_3,
|
||||
gtk3,
|
||||
gtksourceview3,
|
||||
json-glib,
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
cairo
|
||||
glib
|
||||
goocanvas3
|
||||
goocanvas_3
|
||||
pantheon.granite
|
||||
gtk3
|
||||
gtksourceview3
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "ananicy-rules-cachyos";
|
||||
version = "0-unstable-2026-01-06";
|
||||
version = "0-unstable-2026-01-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CachyOS";
|
||||
repo = "ananicy-rules";
|
||||
rev = "c3e21cb01a909e5da2828f453ebdc375e2f514ad";
|
||||
hash = "sha256-g/fexBzHzhckCWtzfXOwXqA6LZqTULQ7Bz3OY5fcLcA=";
|
||||
rev = "e1f6574e77386282cbb917b981c968648fbab601";
|
||||
hash = "sha256-TR+c6OACVrETAVAlza62JSIKBvKMrDg/G4xBdMkJJlk=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -310,13 +310,13 @@ buildPythonPackage rec {
|
||||
# Updates yarn.lock and package.json
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts curl pcre "python3.withPackages (ps: with ps; [ pyyaml ])" yarn2nix
|
||||
#!nix-shell -i bash -p common-updater-scripts curl "python3.withPackages (ps: with ps; [ pyyaml ])" yarn2nix
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Get new version
|
||||
new_version="$(curl -s https://airflow.apache.org/docs/apache-airflow/stable/release_notes.html |
|
||||
pcregrep -o1 'Airflow ([0-9.]+).' | head -1)"
|
||||
grep -oE 'Airflow [0-9.]+' | head -1 | grep -oE '[0-9.]+')"
|
||||
update-source-version ${pname} "$new_version"
|
||||
|
||||
# Update frontend
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "apko";
|
||||
version = "1.0.2";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chainguard-dev";
|
||||
repo = "apko";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rUJ/znxHysPdy4AFujbisUrCW0L0cgh03jLt3YY/tis=";
|
||||
hash = "sha256-18i2xiVDjIRG0RD5R7t2BsyB9N+hhYOOByV6snGBCkM=";
|
||||
# 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 (finalAttrs: {
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorHash = "sha256-ol9uJq/HPdv5E2MB+KUturqwsa8s3xqULwXu9bAWjr0=";
|
||||
vendorHash = "sha256-P8/0VSx4JfWgbMUuvo1Z0BhtC1TgGITSHLMHSzigeEg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
libuuid,
|
||||
ffmpeg,
|
||||
soundtouch,
|
||||
pcre,
|
||||
portaudio, # given up fighting their portaudio.patch?
|
||||
portmidi,
|
||||
linuxHeaders,
|
||||
@@ -115,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lv2
|
||||
mpg123
|
||||
opusfile
|
||||
pcre
|
||||
portmidi
|
||||
rapidjson
|
||||
serd
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "aws-sam-cli";
|
||||
version = "1.151.0";
|
||||
version = "1.152.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-sam-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8r/sTb6LYDGuCG46Xuh+glT9LRYR6Q8ErjFL2wPTDLI=";
|
||||
hash = "sha256-N+x9ZNd6WvDJTFERhWJD5HsDE7dFyH+jOnEMzJ3IHSk=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "awstats";
|
||||
version = "7.9";
|
||||
version = "8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/awstats/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-YVF47TE9NDFfFaUi2xpdEsqcOV43hbsGKAq/+V2aBUY=";
|
||||
sha256 = "sha256-Pvdv+WxTmEd92KERNOJm5TikhwZ/aQajrIo4v9EcEeA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -27,7 +27,10 @@ perlPackages.buildPerlPackage rec {
|
||||
|
||||
propagatedBuildOutputs = [ ]; # otherwise out propagates bin -> cycle
|
||||
|
||||
buildInputs = [ ]; # plugins will need some
|
||||
buildInputs = with perlPackages; [
|
||||
JSONXS
|
||||
TryTiny
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
touch Makefile.PL
|
||||
|
||||
@@ -123,7 +123,7 @@ buildGoModule {
|
||||
homepage = "https://github.com/garethgeorge/backrest";
|
||||
changelog = "https://github.com/garethgeorge/backrest/releases/tag/v${version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
mainProgram = "backrest";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
description = "Powerful and full-featured professional HTML and text editor for macOS";
|
||||
homepage = "https://www.barebones.com/products/bbedit/";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
buildGoModule rec {
|
||||
pname = "bosh-cli";
|
||||
|
||||
version = "7.9.15";
|
||||
version = "7.9.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry";
|
||||
repo = "bosh-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+dkRPK4RFVainDa4SNiA9B14uz3vaIfAjv09T3dDGIw=";
|
||||
sha256 = "sha256-yzoqtubX2IeRP4Ee/YjzRmeAo2aqvfCiqsVkfKtzGFU=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
||||
@@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Userspace tool to configure linux bridges (deprecated in favour or iproute2)";
|
||||
mainProgram = "brctl";
|
||||
|
||||
+24
-2
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkgs,
|
||||
buildPackages,
|
||||
fixDarwinDylibNames,
|
||||
}:
|
||||
@@ -52,5 +51,28 @@ stdenv.mkDerivation rec {
|
||||
--subst-var-by isTargetDarwin '${toString stdenv.targetPlatform.isDarwin}'
|
||||
'';
|
||||
|
||||
inherit (pkgs.build2) passthru;
|
||||
passthru = {
|
||||
configSharedStatic =
|
||||
enableShared: enableStatic:
|
||||
if enableShared && enableStatic then
|
||||
"both"
|
||||
else if enableShared then
|
||||
"shared"
|
||||
else if enableStatic then
|
||||
"static"
|
||||
else
|
||||
throw "neither shared nor static libraries requested";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.build2.org/";
|
||||
description = "Bootstrap for the 'build2' package, you most likely want to use that one";
|
||||
license = lib.licenses.mit;
|
||||
changelog = "https://git.build2.org/cgit/build2/tree/NEWS";
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
hiro98
|
||||
r-burns
|
||||
];
|
||||
};
|
||||
}
|
||||
+19
-29
@@ -1,7 +1,8 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
build2,
|
||||
# Break cycle by using self-contained toolchain for bootstrapping
|
||||
build2-bootstrap,
|
||||
fetchurl,
|
||||
fixDarwinDylibNames,
|
||||
libbutl,
|
||||
@@ -11,18 +12,9 @@
|
||||
enableStatic ? !enableShared,
|
||||
}:
|
||||
let
|
||||
configSharedStatic =
|
||||
enableShared: enableStatic:
|
||||
if enableShared && enableStatic then
|
||||
"both"
|
||||
else if enableShared then
|
||||
"shared"
|
||||
else if enableStatic then
|
||||
"static"
|
||||
else
|
||||
throw "neither shared nor static libraries requested";
|
||||
inherit (build2-bootstrap.passthru) configSharedStatic;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "build2";
|
||||
version = "0.17.0";
|
||||
|
||||
@@ -33,26 +25,25 @@ stdenv.mkDerivation rec {
|
||||
"man"
|
||||
];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
setupHook = build2-bootstrap.setupHook;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pkg.cppget.org/1/alpha/build2/build2-${version}.tar.gz";
|
||||
url = "https://pkg.cppget.org/1/alpha/build2/build2-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-Kx5X/GV3GjFSbjo1mzteiHnnm4mr6+NAKIR/mEE+IdA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove any build/host config entries which refer to nix store paths
|
||||
./remove-config-store-paths.patch
|
||||
# Pick up sysdirs from NIX_LDFLAGS
|
||||
./nix-ldflags-sysdirs.patch
|
||||
];
|
||||
]
|
||||
++ build2-bootstrap.patches;
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
build2
|
||||
build2-bootstrap
|
||||
];
|
||||
disallowedReferences = [
|
||||
build2
|
||||
build2-bootstrap
|
||||
libbutl.dev
|
||||
libpkgconf.dev
|
||||
];
|
||||
@@ -94,14 +85,19 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
bootstrap = build2;
|
||||
bootstrap = build2-bootstrap;
|
||||
inherit configSharedStatic;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.build2.org/";
|
||||
inherit (build2-bootstrap.meta)
|
||||
homepage
|
||||
license
|
||||
changelog
|
||||
platforms
|
||||
maintainers
|
||||
;
|
||||
description = "Build2 build system";
|
||||
license = lib.licenses.mit;
|
||||
longDescription = ''
|
||||
build2 is an open source (MIT), cross-platform build toolchain
|
||||
that aims to approximate Rust Cargo's convenience for developing
|
||||
@@ -114,12 +110,6 @@ stdenv.mkDerivation rec {
|
||||
at C/C++ projects as well as mixed-language projects involving
|
||||
one of these languages (see bash and rust modules, for example).
|
||||
'';
|
||||
changelog = "https://git.build2.org/cgit/build2/tree/NEWS";
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
hiro98
|
||||
r-burns
|
||||
];
|
||||
mainProgram = "b";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -20,8 +20,20 @@ extraMounts:
|
||||
mountPoint: /sys/firmware/efi/efivars
|
||||
efi: true
|
||||
|
||||
# Ensure the right fmask/dmask is set on the ESP, as it will be
|
||||
# picked up by nixos-generate-config later
|
||||
# Btrfs subvolume layout for NixOS
|
||||
# Empty subvolume for / means no subvolume (top-level) for GRUB compatibility
|
||||
btrfsSubvolumes:
|
||||
- mountPoint: /
|
||||
subvolume: ""
|
||||
- mountPoint: /home
|
||||
subvolume: /home
|
||||
- mountPoint: /nix
|
||||
subvolume: /nix
|
||||
|
||||
# Mount options by filesystem type
|
||||
# nixos-generate-config picks these up for hardware-configuration.nix
|
||||
mountOptions:
|
||||
- filesystem: efi
|
||||
options: [ fmask=0077, dmask=0077 ]
|
||||
- filesystem: btrfs
|
||||
options: [ compress=zstd, noatime ]
|
||||
|
||||
@@ -12,11 +12,29 @@ userSwapChoices:
|
||||
|
||||
luksGeneration: luks2
|
||||
|
||||
defaultFileSystemType: "ext4"
|
||||
|
||||
availableFileSystemTypes:
|
||||
- ext4
|
||||
- btrfs
|
||||
- xfs
|
||||
- f2fs
|
||||
|
||||
showNotEncryptedBootMessage: false
|
||||
|
||||
bios:
|
||||
mountPoint: "/boot"
|
||||
minimumSize: 512MiB
|
||||
recommendedSize: 1GiB
|
||||
label: "BOOT"
|
||||
|
||||
partitionLayout:
|
||||
- name: "root"
|
||||
- name: "boot"
|
||||
filesystem: "ext4"
|
||||
mountPoint: "/boot"
|
||||
size: 1GiB
|
||||
- name: "root"
|
||||
filesystem: "unknown"
|
||||
noEncrypt: false
|
||||
mountPoint: "/"
|
||||
size: 100%
|
||||
|
||||
@@ -45,6 +45,15 @@ cfgbootbios = """ # Bootloader.
|
||||
|
||||
"""
|
||||
|
||||
cfgbootbiosbtrfs = """ # Bootloader.
|
||||
boot.loader.grub.enable = true;
|
||||
boot.loader.grub.device = "@@bootdev@@";
|
||||
boot.loader.grub.useOSProber = true;
|
||||
# Use provided UUIDs instead of blkid probing (required for btrfs subvolumes)
|
||||
boot.loader.grub.fsIdentifier = "provided";
|
||||
|
||||
"""
|
||||
|
||||
cfgbootnone = """ # Disable bootloader.
|
||||
boot.loader.grub.enable = false;
|
||||
|
||||
@@ -360,6 +369,46 @@ def catenate(d, key, *values):
|
||||
d[key] = "".join(values)
|
||||
|
||||
|
||||
def fix_btrfs_subvolumes(hardware_config, partitions):
|
||||
"""
|
||||
Fix btrfs subvolume configuration in hardware-configuration.nix.
|
||||
|
||||
nixos-generate-config generates incorrect subvol options for btrfs
|
||||
by setting them to mount points instead of actual subvolume names.
|
||||
This function corrects the subvol options to match what Calamares configured.
|
||||
"""
|
||||
# Map of mount points to their correct btrfs subvolume names
|
||||
# These match what is configured in mount.conf btrfsSubvolumes
|
||||
# Root uses top-level (no subvolume) for GRUB compatibility
|
||||
subvol_map = {
|
||||
"/home": "home",
|
||||
"/nix": "nix",
|
||||
}
|
||||
|
||||
# Check if root is actually btrfs
|
||||
root_is_btrfs = False
|
||||
for part in partitions:
|
||||
if part.get("mountPoint") == "/" and part.get("fs") == "btrfs":
|
||||
root_is_btrfs = True
|
||||
break
|
||||
|
||||
if not root_is_btrfs:
|
||||
return hardware_config
|
||||
|
||||
libcalamares.utils.debug("Fixing btrfs subvolume configuration")
|
||||
|
||||
# Fix subvol options for each mount point
|
||||
# nixos-generate-config may generate "subvol=/" instead of "subvol=@"
|
||||
for mount_point, correct_subvol in subvol_map.items():
|
||||
# Match any "subvol=<something>" and replace with correct subvolume
|
||||
# This handles cases like "subvol=/" or "subvol=/home"
|
||||
pattern = r'(fileSystems\."{}"[^;]*"subvol=)[^"]*"'.format(re.escape(mount_point))
|
||||
replacement = r'\g<1>{}"'.format(correct_subvol)
|
||||
hardware_config = re.sub(pattern, replacement, hardware_config, flags=re.DOTALL)
|
||||
|
||||
return hardware_config
|
||||
|
||||
|
||||
def run():
|
||||
"""NixOS Configuration."""
|
||||
|
||||
@@ -388,11 +437,22 @@ def run():
|
||||
|
||||
# Pick config parts and prepare substitution
|
||||
|
||||
# Check if root filesystem is btrfs
|
||||
root_is_btrfs = False
|
||||
for part in gs.value("partitions"):
|
||||
if part.get("mountPoint") == "/" and part.get("fs") == "btrfs":
|
||||
root_is_btrfs = True
|
||||
break
|
||||
|
||||
# Check bootloader
|
||||
if fw_type == "efi":
|
||||
cfg += cfgbootefi
|
||||
elif bootdev != "nodev":
|
||||
cfg += cfgbootbios
|
||||
# Use btrfs-specific config to avoid blkid issues with subvolumes
|
||||
if root_is_btrfs:
|
||||
cfg += cfgbootbiosbtrfs
|
||||
else:
|
||||
cfg += cfgbootbios
|
||||
catenate(variables, "bootdev", bootdev)
|
||||
else:
|
||||
cfg += cfgbootnone
|
||||
@@ -734,9 +794,20 @@ def run():
|
||||
libcalamares.utils.error(e.output.decode("utf8"))
|
||||
return (_("nixos-generate-config failed"), _(e.output.decode("utf8")))
|
||||
|
||||
# Check for unfree stuff in hardware-configuration.nix
|
||||
# Read and fix hardware-configuration.nix
|
||||
hf = open(root_mount_point + "/etc/nixos/hardware-configuration.nix", "r")
|
||||
htxt = hf.read()
|
||||
hf.close()
|
||||
|
||||
hardware_modified = False
|
||||
|
||||
# Fix btrfs subvolume configuration if needed
|
||||
htxt_fixed = fix_btrfs_subvolumes(htxt, gs.value("partitions"))
|
||||
if htxt_fixed != htxt:
|
||||
htxt = htxt_fixed
|
||||
hardware_modified = True
|
||||
|
||||
# Check for unfree stuff in hardware-configuration.nix
|
||||
search = re.search(r"boot\.extraModulePackages = \[ (.*) \];", htxt)
|
||||
|
||||
# Check if any extraModulePackages are defined, and remove if only free packages are allowed
|
||||
@@ -765,14 +836,17 @@ def run():
|
||||
)
|
||||
)
|
||||
expkgs.remove(pkg)
|
||||
hardwareout = re.sub(
|
||||
htxt = re.sub(
|
||||
r"boot\.extraModulePackages = \[ (.*) \];",
|
||||
"boot.extraModulePackages = [ {}];".format(
|
||||
"".join(map(lambda x: x + " ", expkgs))
|
||||
),
|
||||
htxt,
|
||||
)
|
||||
# Write the hardware-configuration.nix file
|
||||
hardware_modified = True
|
||||
|
||||
# Write the hardware-configuration.nix file if modified
|
||||
if hardware_modified:
|
||||
libcalamares.utils.host_env_process_output(
|
||||
[
|
||||
"cp",
|
||||
@@ -780,7 +854,7 @@ def run():
|
||||
root_mount_point + "/etc/nixos/hardware-configuration.nix",
|
||||
],
|
||||
None,
|
||||
hardwareout,
|
||||
htxt,
|
||||
)
|
||||
|
||||
# Write the configuration.nix file
|
||||
@@ -789,6 +863,14 @@ def run():
|
||||
status = _("Installing NixOS")
|
||||
libcalamares.job.setprogress(0.3)
|
||||
|
||||
try:
|
||||
subprocess.check_output(
|
||||
["pkexec", "chmod", "755", root_mount_point],
|
||||
stderr=subprocess.STDOUT,
|
||||
)
|
||||
except subprocess.CalledProcessError as e:
|
||||
libcalamares.utils.warning("Failed to set permissions on {}: {}".format(root_mount_point, e.output))
|
||||
|
||||
# build nixos-install command
|
||||
nixosInstallCmd = [ "pkexec" ]
|
||||
nixosInstallCmd.extend(generateProxyStrings())
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-codspeed";
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CodSpeedHQ";
|
||||
repo = "codspeed-rust";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ljq9d9T3Cx5hDAjP4dbhSnbCYaU1KB42aDhQvRyI7Ws=";
|
||||
hash = "sha256-aOuKz7LEQU9hqJUw0M759A4zk8+9UhiMAnO7OwBc+T0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ryKZyl5CuxFsX1dLadJnCyorssVoD2w5kueKDJP80qU=";
|
||||
cargoHash = "sha256-K1xm8Kw7TMspFmqvW4qRf4QXddarw3eUDTIuwbg1pGA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
curl
|
||||
|
||||
@@ -12,18 +12,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdk8s-cli";
|
||||
version = "2.203.16";
|
||||
version = "2.203.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdk8s-team";
|
||||
repo = "cdk8s-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-PLdB0f7CMuvArlLfY+7G9UUUTURtiy/nHcgiSZoW01c=";
|
||||
hash = "sha256-P/I8e7FWC4HgqPUe5839oh8sRrIQoCJqCvlw6+Wz/aw=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-GBkgzzkw5h2eajuIYO3gazDLoYYqc8Bx5NjWs8jVbaM=";
|
||||
hash = "sha256-IefCjyrUlHAFC8563M5/UM7d+4Sx9zvW7QMLxW5pJgQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
bison,
|
||||
flex,
|
||||
pkg-config,
|
||||
darwin,
|
||||
xcbuild,
|
||||
libsndfile,
|
||||
alsa-lib,
|
||||
libjack2,
|
||||
libpulseaudio,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.5.5.6";
|
||||
pname = "chuck";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ccrma";
|
||||
repo = "chuck";
|
||||
tag = "chuck-${finalAttrs.version}";
|
||||
hash = "sha256-KBmMpycNCjRZJPdRR3HG5nqHQhhVOENciRpiQ7buyok=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
flex
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.DarwinTools
|
||||
xcbuild
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libsndfile
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
alsa-lib
|
||||
libpulseaudio
|
||||
libjack2
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"-C src"
|
||||
"DESTDIR=$(out)/bin"
|
||||
# fix hardcoded gcc
|
||||
"CC=cc"
|
||||
"CXX=c++"
|
||||
];
|
||||
buildFlags = [ (if stdenv.hostPlatform.isDarwin then "mac" else "linux-all") ];
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=chuck-(.*)" ]; };
|
||||
|
||||
meta = {
|
||||
description = "Programming language for real-time sound synthesis and music creation";
|
||||
homepage = "http://chuck.cs.princeton.edu";
|
||||
license = with lib.licenses; [
|
||||
gpl2Plus
|
||||
# or
|
||||
mit
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ ];
|
||||
mainProgram = "chuck";
|
||||
};
|
||||
})
|
||||
@@ -11,7 +11,7 @@
|
||||
buildNpmPackage rec {
|
||||
pname = "clever-tools";
|
||||
|
||||
version = "4.5.1";
|
||||
version = "4.5.3";
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
@@ -19,10 +19,10 @@ buildNpmPackage rec {
|
||||
owner = "CleverCloud";
|
||||
repo = "clever-tools";
|
||||
rev = version;
|
||||
hash = "sha256-VzFcIcrE4pl3YZDDwlzkbd/FR1L/70fpFKg1kYjBGvo=";
|
||||
hash = "sha256-/PVVnTzRPy4AM3OEfTdrSrvdWfbPSrP/LoenzPA0d2Q=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-lduZIevR+ZvHYD4xr4K+6OtY38Mik7mcxA5iasaftv4=";
|
||||
npmDepsHash = "sha256-i9cZI+P363EqODlnggqKT6XxoDYTNVrg5rTYNWWHm8A=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cocoon";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haileyok";
|
||||
repo = "cocoon";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ztP/Nvv9kRr4bFI8oveJ6pk3LOZ9H4pqhVnBMt1kbew=";
|
||||
hash = "sha256-pQHltHAU5UAOtG7AvxQMI9tFeXApY4+C7+ipk4vG8zs=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "complgen";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adaszko";
|
||||
repo = "complgen";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GUI18RFVIBUu3DA6oVs1BWcsxGzctA68z8PamqJ5aus=";
|
||||
hash = "sha256-fHSDYrfCoLQ4tU1DbrpD3iApufBv5qAGTIFri229pyE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XbrWp1+z7VTD4ggh9+tG3fqXWOD1nYSeNzViHqmOmWg=";
|
||||
cargoHash = "sha256-a6bGE2xxv8IdKlo98X8KNeQl8e//dc9pfaBgGHhx+5M=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "corrosion";
|
||||
version = "0.5.2";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "corrosion-rs";
|
||||
repo = "corrosion";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sO2U0llrDOWYYjnfoRZE+/ofg3kb+ajFmqvaweRvT7c=";
|
||||
hash = "sha256-ppuDNObfKhneD9AlnPAvyCRHKW3BidXKglD1j/LE9CM=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
|
||||
@@ -32,12 +32,22 @@ stdenv.mkDerivation rec {
|
||||
checkPhase =
|
||||
let
|
||||
excludedTests = [
|
||||
"cbindgen_rust2cpp_build"
|
||||
"cbindgen_rust2cpp_run_cpp-exe"
|
||||
"cbindgen_install"
|
||||
"cbindgen_manual_build"
|
||||
"cbindgen_manual_run_cpp-exe"
|
||||
"cbindgen_rust2cpp_auto_build"
|
||||
"cbindgen_rust2cpp_auto_run_cpp-exe"
|
||||
"config_discovery_build"
|
||||
"config_discovery_run_cargo_clean"
|
||||
"config_discovery_run_config_discovery"
|
||||
"custom_target_build"
|
||||
"custom_target_run_rust-bin"
|
||||
"custom_target_run_test-exe"
|
||||
"hostbuild_build"
|
||||
"hostbuild_run_rust-host-program"
|
||||
"parse_target_triple_build"
|
||||
"rustup_proxy_build"
|
||||
"install_lib_build"
|
||||
"install_lib_run_main-shared"
|
||||
"install_lib_run_main-static"
|
||||
];
|
||||
excludedTestsRegex = lib.concatStringsSep "|" excludedTests;
|
||||
in
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-applets";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-applets";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-o64sXCWuEIRV1KCRvKeN6iZBZfUyDYtft5yeag4jBNc=";
|
||||
hash = "sha256-+1cqennGetcjJTgVfglq/LJ22goLQmahPCK/atdHxXU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uMMrLd3s0SqYCkSA82wWUxMfiTUzuDdsmyxy/MCYIWY=";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-applibrary";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-applibrary";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-uQaTSt0sgUQYopEFVmaeDCnejSc1gyGLHeHM2bGzStQ=";
|
||||
hash = "sha256-3vIp+Vs4prsFFiTmjrUXoYqH27y6ccVlUQcP5ICFq3g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-I6C5PrIymU8vZ7LvmnSlFFIp0cvlP1umiFMyrAyYf4A=";
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-bg";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-bg";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-tiqJ0aXXUNyoezXSsHO9klkFZ5PO+gkVv+zXd4/Lq5A=";
|
||||
hash = "sha256-LBIcQG3ZebK1bPVJ8WNHkHMLPsEcw77oZAkQRrd4j6o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-comp";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-comp";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-PBobAoXi3p1xUbs4XmmPkQ93QlMsULEYUoTDqOlJozg=";
|
||||
hash = "sha256-vhWZpn9FPoH+mTKqCf6ug73FdT7Odr6f8pWNNIDKwFs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-A0d00GdspoYI1fUic8TK9UzaQn39wbnvevD8IiPKC7w=";
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-edit";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-edit";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-ZqyaCryXNljJ00qD3ZksfKszANke3HqYgHoGNCHOUqI=";
|
||||
hash = "sha256-4+GfIAsjzo1jr+wa9JjuIUvW3P3r03avP2W5hZJYXHU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ydI/DTbGlgwc9l/XsW1SbTOfSyTdcjM0i0jXLua4+f8=";
|
||||
|
||||
@@ -12,17 +12,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-files";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-files";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-ZX7eRSrQXgc4oitjugvRicng87zVK41ecSUE80tl0Y0=";
|
||||
hash = "sha256-aHNu6IedGWag6u+uRg2IFfcb8fTu5o4XfGwBXJBOkSM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CGFBvOWu9ZA8kYDYDBVur5uWW8Cs7fT5T96UnKMkvEo=";
|
||||
cargoHash = "sha256-kzyyKzkuCYqEsaaKhAVH31ztbww4k8XZ5HyBQeYO/Nc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
just
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-greeter";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-greeter";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-G9ahiwk3/nJEGtlHSaK9dUi4/zGEH90QGKeSdpNQDLU=";
|
||||
hash = "sha256-ivFs/AOUXhzd6I9H+Zw3CS97qFQ/FeiAnlDuzRMneQI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc=";
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-icons";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-idle";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-initial-setup";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-initial-setup";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-g1FJiJSyPZTJ1G8cW8A0sxbIUeG3JcjJYo6qHp639d4=";
|
||||
hash = "sha256-xeJfS3vXYCy3R20K5jiyPmgZI+arhkzm3Vz6YQnLe9Y=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-co7fOPjNLi32XRXKdmCWC+bWhEljsdSc/scasghG4/8=";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-launcher";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-launcher";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-2LfoqXXYzNpWrnmmwm68IzrG63cX04tMFk0Ly7AJzDs=";
|
||||
hash = "sha256-uKTeNTJtsDx0FS3fmvqMbXPTezMkD1dcn5dPKXvmcp4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bmQ8Ni0sR9gfttsEhh9LNbWmTdOkW/JSMEzOf+kvN98=";
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-notifications";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-notifications";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-lvqqeY/FPv+LFTmZoBUuKWCjAGZozGj/yUCphlFuk/g=";
|
||||
hash = "sha256-BNOerRv9w0Y9Wozoc5IOouMjne7XQN/SItSy2LQrK9w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zyM4iMJs2wPIKIEdji1uJF3WYpPGihFswIK5Wyf6Mns=";
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-osd";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-osd";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-PNFwlxAdbQpFFIe54AEteWG2YRHGRgjDDUpgDwCxXns=";
|
||||
hash = "sha256-6GuLFy1DKXk//LhhRA62KX1P/X+QSsNCy5Eiwjxqk9M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DNQvmE/2swrDybjcQfCAjMRkAttjl+ibbLG0HSlcZwU=";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-panel";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-player";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-player";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-wBR8KvARINQ3XO/gs5POj32cVj5Eoa3IuWyAmxajMmY=";
|
||||
hash = "sha256-F5Phk9JgcSc3Hj+2NxVfqq1Ujz8hv3DVJqAP3aEo2Ic=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Z0+6jtvJ3z/ptcqrbvSuXgjH2liASNJwBIKiHbrVBT8=";
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-randr";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-screenshot";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-screenshot";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-lW1nryM/meZjjC9MOH0fimRejdycfq8REwzH1IeV774=";
|
||||
hash = "sha256-xNEICyR/4EYTPTMnlRTag3Ji5rM8HJl6m9MAe7FdHTk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o=";
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-session";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-settings-daemon";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -27,14 +27,14 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-settings";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-settings";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-IYuQlXkdakAbchOH2vje02eWCJMBEp7ONtls4Hm/iCo=";
|
||||
hash = "sha256-/Zzs2b51J0v9PavMr3MuNiFBprb7oJiSC+qDVvMTwEk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XY1ovI73O2jJdx1a5pUk/n6TUazklq7PA+bgva3xslo=";
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-store";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-store";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-na9eRJ9R38wFWOoQSyZj/UlDb5lwvCZrRQ/w/aOqVfY=";
|
||||
hash = "sha256-61O6TY41raQ1+EhCLrCC8Krzt6pWM/BFL61KHkxou2M=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VapIpvjtBo+oSUWtilPR0v5crjDVt0OGdHlx73Gb6Jk=";
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-term";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-term";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-SmwXRgYgFelVQhx03GaIRWHCm7x/9eXMdVxH06TLxLE=";
|
||||
hash = "sha256-RYRAJhixba8i8hKpZSZLPLza+V9XZuSaZmWknoIJ3mk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ImWHjEKgu9FQR52A3GjnAkxlPduKuzSUAOANYr0DzMA=";
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "cosmic-wallpapers";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-workspaces-epoch";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-workspaces-epoch";
|
||||
tag = "epoch-${finalAttrs.version}";
|
||||
hash = "sha256-wGhXTQujwOqDBcBesXIRkcTJdQAhs0pavsVHMH98QCw=";
|
||||
hash = "sha256-Gg4ogMf2C3rXf3p/8GPpiZ2aG02KWTtrqby47UW7B3I=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZVl09YgeH+V4X3H88rdeiBgua1IpVcfKe0y8A78wzl4=";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "credhub-cli";
|
||||
version = "2.9.52";
|
||||
version = "2.9.53";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry-incubator";
|
||||
repo = "credhub-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-qTRRk7n8f5tC/uiBJgbZpd+tsoOPK5qTgZnqfwi5YlA=";
|
||||
sha256 = "sha256-MbRk0O1WGzr7YLHSub9hLYDvJJacUcCXyg29AOqssxE=";
|
||||
};
|
||||
|
||||
# these tests require network access that we're not going to give them
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "crowdin-cli";
|
||||
version = "4.12.0";
|
||||
version = "4.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
|
||||
hash = "sha256-y6JBlZ1h/1iWr8r+323sYpQNpzM3pHtC/CzQt4HL7MQ=";
|
||||
hash = "sha256-XnRubOEtaCAH0lJHyBGi7qjLFGZA7tfOGdaaGNOsogY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ctrtool";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jakcron";
|
||||
repo = "Project_CTR";
|
||||
rev = "ctrtool-v${version}";
|
||||
sha256 = "HqqeQCEUof4EBUhuUAdTruMFgYIoXhtAN3yuWW6tD+Y=";
|
||||
sha256 = "GvEzv97DqCsaDWVqDpajQRWYe+WM8xCYmGE0D3UcSrM=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/ctrtool";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dnscontrol";
|
||||
version = "4.31.0";
|
||||
version = "4.31.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = "dnscontrol";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8Pb/njUjiyUQZA3UnZ+4INJBnmXCo+F7+BhCDt1hJGQ=";
|
||||
hash = "sha256-c0jQF6XGg0jTMqBbTwRA/ZfD/qocCHILoSujeqJ+lp4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GMzLaV3LQNa4K111P6DLG28KAAgj9AHyPua4XSih14k=";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "eask-cli";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-eask";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-GUOimlbArD1GbeBPfIgcIcGKGHx+fEp6+CMYsqHB0t8=";
|
||||
hash = "sha256-n2NL8B6hxQLB8xdRWzclVlqp3B4K7VxgdQ3zgFC1YyI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-69yGfQuIot0gKZIvLbMqJ0C3qxjqg3TnRDJl4qYHGrQ=";
|
||||
npmDepsHash = "sha256-kHi/8kPTk9hg5NI4u0b+k9OoocHLX2rY3diXt9WMlRo=";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
||||
@@ -13,19 +13,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "esphome-dashboard";
|
||||
version = "20251013.0";
|
||||
version = "20260110.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "dashboard";
|
||||
tag = version;
|
||||
hash = "sha256-PZf9YLtHqeR+5BRVv1yOMVt6NVlbJTj98ukGnO0RV0Q=";
|
||||
hash = "sha256-h8g/MRfOBkiCKNTOM4I6OimsE5ljgsIMQLl1eZLfP3U=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-wWDM4ODlZAjjDonzS4czdBPBaRS0Px2KUlE4AfsqNIQ=";
|
||||
hash = "sha256-DkK2WG7oWHvwYflNdwOMfE0OVP2ICEGAhhTH2rix9zc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -33,14 +33,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "2025.12.7";
|
||||
version = "2026.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esphome";
|
||||
repo = "esphome";
|
||||
tag = version;
|
||||
hash = "sha256-KC3LbY5mU4xig3kftIuemSz/RAnJ7wZ8eSccr9BKz9Q=";
|
||||
hash = "sha256-TDXOftuj0ls+1TF6LXoX2Q+PzicL0nJP+1SJHi6qvMA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -95,6 +95,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
pyparsing
|
||||
pyserial
|
||||
pyyaml
|
||||
resvg-py
|
||||
ruamel-yaml
|
||||
tornado
|
||||
tzdata
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.90.0";
|
||||
version = "1.90.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dDs0pwOxdwXqYm8al1TUXoZVaBL4vE/PwCcQFhSUarE=";
|
||||
sha256 = "sha256-mRHENBxxumb0eO74N0f04GItlI0jcsKnug45uLxuMdI=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -59,13 +59,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastfetch";
|
||||
version = "2.57.1";
|
||||
version = "2.58.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastfetch-cli";
|
||||
repo = "fastfetch";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-svv6JPRgiXzzjL/CjtEybo0A1B8jr1K0xRO9lCBj1J4=";
|
||||
hash = "sha256-kWMR2qtwgzpYZmbqkpNkII6MuMFb13jkBtI/1pdgSgE=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -95,13 +95,13 @@ let
|
||||
in
|
||||
llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fex";
|
||||
version = "2512";
|
||||
version = "2601";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FEX-Emu";
|
||||
repo = "FEX";
|
||||
tag = "FEX-${finalAttrs.version}";
|
||||
hash = "sha256-G61FdzNctTp8jarTcnBXd+MQpMxnPqd33hblvi9UXNo=";
|
||||
hash = "sha256-AfHOD3S3zDwe85Zr8XEMmI+LrdVEZdXJ9FWQQ+oUNik=";
|
||||
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
@@ -156,6 +156,12 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace Source/Tools/FEXConfig/main.qml \
|
||||
--replace-fail "config: \"Thunk" "config: \"UnusedThunk" \
|
||||
--replace-fail "title: qsTr(\"Library forwarding:\")" "visible: false; title: qsTr(\"Library forwarding:\")"
|
||||
|
||||
# Temporarily disable failing tests. TODO: investigate the root cause of these failures
|
||||
rm \
|
||||
unittests/ASM/Primary/Primary_63_2.asm \
|
||||
unittests/32Bit_ASM/Secondary/07_XX_04.asm \
|
||||
unittests/ASM/Secondary/07_XX_04.asm
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -3,20 +3,22 @@
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
buildNpmPackage,
|
||||
pnpm_9,
|
||||
fetchPnpmDeps,
|
||||
pnpmConfigHook,
|
||||
nodejs_24,
|
||||
pnpm_10,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.44.1";
|
||||
version = "2.55.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "filebrowser";
|
||||
repo = "filebrowser";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ln7Dst+sN99c3snPU7DrIGpwKBz/e4Lz+uOknmm6sxg=";
|
||||
hash = "sha256-1ZzTATJEVBr76+CMk8OzxdpWGqFHPPhyC7z2MgfqN+M=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage rec {
|
||||
@@ -25,9 +27,10 @@ let
|
||||
|
||||
sourceRoot = "${src.name}/frontend";
|
||||
|
||||
nativeBuildInputs = [ pnpm_9 ];
|
||||
nativeBuildInputs = [ pnpm_10 ];
|
||||
npmConfigHook = pnpmConfigHook;
|
||||
npmDeps = pnpmDeps;
|
||||
nodejs = nodejs_24;
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit
|
||||
@@ -36,9 +39,9 @@ let
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-3n44BGJLdQR6uBSF09oyUzJm35/S3/ZEyZh4Wxqlfiw=";
|
||||
fetcherVersion = 3;
|
||||
pnpm = pnpm_10;
|
||||
hash = "sha256-iv0LZoEyF5fASqBKNkTJhLMY0Xpa6x0i4csDoHmGU+g=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@@ -50,12 +53,13 @@ let
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "filebrowser";
|
||||
inherit version src;
|
||||
|
||||
vendorHash = "sha256-aVtL64Cm+nqum/qHFvplpEawgMXM2S6l8QFrJBzLVtU=";
|
||||
vendorHash = "sha256-4WDggP5eL7IPUWTxewxV2JUZZ3kV0PwewQQothz7AC8=";
|
||||
|
||||
excludedPackages = [ "tools" ];
|
||||
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.08";
|
||||
version = "2.0.09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Card-Forge";
|
||||
repo = "forge";
|
||||
rev = "forge-${version}";
|
||||
hash = "sha256-BiBvHpEgvDp0u8g87LAt4/1FTc9t8FRAtSvPEedndEg=";
|
||||
hash = "sha256-TRK6fUOLbI3lLdkSXvvuix0sGbpKLvMmYMx5ozViDRE=";
|
||||
};
|
||||
|
||||
# launch4j downloads and runs a native binary during the package phase.
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "framework-tool";
|
||||
version = "0.4.5";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FrameworkComputer";
|
||||
repo = "framework-system";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WhdKU6vyOm5R9RInw9Fj8gELztLn4m5rFGgHbnItguU=";
|
||||
hash = "sha256-wgleuZ0txkmv0+tyr31PiVTNyTSc+OPy/jJwL1Ryyu4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-A7/Q4p26W0AzqlLguL2OJtmm7dAsBU/Yb636ScYXrPs=";
|
||||
cargoHash = "sha256-W+k/PAcdwl9mvajB9D4SUH4o5VqpeD/BnK6ZEJzPpmI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ udev ];
|
||||
|
||||
@@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
homepage = "https://gnu.org/software/freedink/"; # Formerly http://www.freedink.org
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ iedame ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "freedink";
|
||||
};
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "gemini-cli-bin";
|
||||
version = "0.24.4";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js";
|
||||
hash = "sha256-xteIV43P5qPOamxsGjCXeCkd1zQmNNbMhvzSWc26DQU=";
|
||||
hash = "sha256-7Co3DPZs/ZtdLfhZnOcpdFFQPnyeLkvxTZG+tv+FbBQ=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.85.0";
|
||||
version = "2.86.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XngvPEVrUNKuNs+9/osXEagwqe0KW25xFwEjcPfMO0M=";
|
||||
hash = "sha256-+MPhDgXIVfYGp5ALI5GjRoeLRRUtNgpzUawxoqR76iE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pBHEqMgEoR3sWNbQjGBNso7WLP9Rz2gu89Bzu+7jz5c=";
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
gtksourceview3,
|
||||
gspell,
|
||||
libxml2,
|
||||
goocanvas2,
|
||||
goocanvas_2,
|
||||
libplist,
|
||||
glib,
|
||||
gst_all_1,
|
||||
@@ -126,7 +126,7 @@ stdenv.mkDerivation {
|
||||
gspell
|
||||
# webkitgtk_4_0
|
||||
libxml2
|
||||
goocanvas2
|
||||
goocanvas_2
|
||||
libplist
|
||||
ratify
|
||||
chimara
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user