Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-03-18 06:05:15 +00:00
committed by GitHub
46 changed files with 1671 additions and 1355 deletions

View File

@@ -238,3 +238,6 @@ e0fe216f4912dd88a021d12a44155fd2cfeb31c8
# nixos/movim: format with nixfmt-rfc-style # nixos/movim: format with nixfmt-rfc-style
43c1654cae47cbf987cb63758c06245fa95c1e3b 43c1654cae47cbf987cb63758c06245fa95c1e3b
# nixos/iso-image.nix: nixfmt
da9a092c34cef6947d7aee2b134f61df45171631

View File

@@ -1,11 +1,11 @@
# This module defines a NixOS installation CD that contains GNOME. # This module defines a NixOS installation CD that contains GNOME.
{ pkgs, ... }: { lib, pkgs, ... }:
{ {
imports = [ ./installation-cd-graphical-calamares.nix ]; imports = [ ./installation-cd-graphical-calamares.nix ];
isoImage.edition = "gnome"; isoImage.edition = lib.mkDefault "gnome";
services.xserver.desktopManager.gnome = { services.xserver.desktopManager.gnome = {
# Add Firefox and other tools useful for installation to the launcher # Add Firefox and other tools useful for installation to the launcher

View File

@@ -1,12 +1,12 @@
# This module defines a NixOS installation CD that contains X11 and # This module defines a NixOS installation CD that contains X11 and
# Plasma 5. # Plasma 5.
{ pkgs, ... }: { lib, pkgs, ... }:
{ {
imports = [ ./installation-cd-graphical-calamares.nix ]; imports = [ ./installation-cd-graphical-calamares.nix ];
isoImage.edition = "plasma5"; isoImage.edition = lib.mkDefault "plasma5";
services.xserver.desktopManager.plasma5 = { services.xserver.desktopManager.plasma5 = {
enable = true; enable = true;

View File

@@ -1,11 +1,11 @@
# This module defines a NixOS installation CD that contains Plasma 6. # This module defines a NixOS installation CD that contains Plasma 6.
{ pkgs, ... }: { lib, pkgs, ... }:
{ {
imports = [ ./installation-cd-graphical-calamares.nix ]; imports = [ ./installation-cd-graphical-calamares.nix ];
isoImage.edition = "plasma6"; isoImage.edition = lib.mkDefault "plasma6";
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;

View File

@@ -0,0 +1,52 @@
# This configuration uses a specialisation for each desired boot
# configuration, and a common parent configuration for all of them
# that's hidden. This allows users to import this module alongside
# their own and get the full array of specialisations inheriting the
# users' settings.
{ lib, ... }:
{
imports = [ ./installation-cd-base.nix ];
isoImage.edition = "graphical";
isoImage.showConfiguration = lib.mkDefault false;
specialisation = {
gnome.configuration =
{ config, ... }:
{
imports = [ ./installation-cd-graphical-calamares-gnome.nix ];
isoImage.showConfiguration = true;
isoImage.configurationName = "GNOME (Linux LTS)";
};
gnome_latest_kernel.configuration =
{ config, ... }:
{
imports = [
./installation-cd-graphical-calamares-gnome.nix
./latest-kernel.nix
];
isoImage.showConfiguration = true;
isoImage.configurationName = "GNOME (Linux ${config.boot.kernelPackages.kernel.version})";
};
plasma.configuration =
{ config, ... }:
{
imports = [ ./installation-cd-graphical-calamares-plasma6.nix ];
isoImage.showConfiguration = true;
isoImage.configurationName = "Plasma (Linux LTS)";
};
plasma_latest_kernel.configuration =
{ config, ... }:
{
imports = [
./installation-cd-graphical-calamares-plasma6.nix
./latest-kernel.nix
];
isoImage.showConfiguration = true;
isoImage.configurationName = "Plasma (Linux ${config.boot.kernelPackages.kernel.version})";
};
};
}

View File

@@ -1,11 +1,11 @@
# This module defines a NixOS installation CD that contains GNOME. # This module defines a NixOS installation CD that contains GNOME.
{ ... }: { lib, ... }:
{ {
imports = [ ./installation-cd-graphical-base.nix ]; imports = [ ./installation-cd-graphical-base.nix ];
isoImage.edition = "gnome"; isoImage.edition = lib.mkDefault "gnome";
services.xserver.desktopManager.gnome = { services.xserver.desktopManager.gnome = {
# Add Firefox and other tools useful for installation to the launcher # Add Firefox and other tools useful for installation to the launcher

View File

@@ -1,12 +1,12 @@
# This module defines a NixOS installation CD that contains X11 and # This module defines a NixOS installation CD that contains X11 and
# Plasma 5. # Plasma 5.
{ pkgs, ... }: { lib, pkgs, ... }:
{ {
imports = [ ./installation-cd-graphical-base.nix ]; imports = [ ./installation-cd-graphical-base.nix ];
isoImage.edition = "plasma5"; isoImage.edition = lib.mkDefault "plasma5";
services.xserver.desktopManager.plasma5 = { services.xserver.desktopManager.plasma5 = {
enable = true; enable = true;

View File

@@ -0,0 +1,14 @@
{ lib, ... }:
{
imports = [ ./installation-cd-minimal.nix ];
isoImage.configurationName = lib.mkDefault "(Linux LTS)";
specialisation.latest_kernel.configuration =
{ config, ... }:
{
imports = [ ./latest-kernel.nix ];
isoImage.configurationName = "(Linux ${config.boot.kernelPackages.kernel.version})";
};
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,9 @@
{ lib, pkgs, ... }:
{
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.supportedFilesystems.zfs = false;
environment.etc."nixos-generate-config.conf".text = ''
[Defaults]
Kernel=latest
'';
}

View File

@@ -13,6 +13,7 @@
.Op Fl -root Ar root .Op Fl -root Ar root
.Op Fl -dir Ar dir .Op Fl -dir Ar dir
.Op Fl -flake .Op Fl -flake
.Op Fl -kernel Ar <lts|latest>
. .
. .
. .
@@ -66,6 +67,9 @@ instead of
.Pa /etc/nixos Ns .Pa /etc/nixos Ns
\&. \&.
. .
.It Fl -kernel Ar <lts|latest>
Set the kernel in the generated configuration file.
.
.It Fl -force .It Fl -force
Overwrite Overwrite
.Pa /etc/nixos/configuration.nix .Pa /etc/nixos/configuration.nix

View File

@@ -7,6 +7,7 @@ use File::Path;
use File::Basename; use File::Basename;
use File::Slurp; use File::Slurp;
use File::stat; use File::stat;
use Config::IniFiles;
umask(0022); umask(0022);
@@ -37,6 +38,14 @@ my $force = 0;
my $noFilesystems = 0; my $noFilesystems = 0;
my $flake = 0; my $flake = 0;
my $showHardwareConfig = 0; my $showHardwareConfig = 0;
my $kernel = "lts";
if (-e "/etc/nixos-generate-config.conf") {
my $cfg = new Config::IniFiles -file => "/etc/nixos-generate-config.conf";
$outDir = $cfg->val("Defaults", "Directory") // $outDir;
$rootDir = $cfg->val("Defaults", "RootDirectory") // $rootDir;
$kernel = $cfg->val("Defaults", "Kernel") // $kernel;
}
for (my $n = 0; $n < scalar @ARGV; $n++) { for (my $n = 0; $n < scalar @ARGV; $n++) {
my $arg = $ARGV[$n]; my $arg = $ARGV[$n];
@@ -53,8 +62,6 @@ for (my $n = 0; $n < scalar @ARGV; $n++) {
$rootDir = $ARGV[$n]; $rootDir = $ARGV[$n];
die "$0: --root requires an argument\n" unless defined $rootDir; die "$0: --root requires an argument\n" unless defined $rootDir;
die "$0: no need to specify `/` with `--root`, it is the default\n" if $rootDir eq "/"; die "$0: no need to specify `/` with `--root`, it is the default\n" if $rootDir eq "/";
$rootDir =~ s/\/*$//; # remove trailing slashes
$rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path
} }
elsif ($arg eq "--force") { elsif ($arg eq "--force") {
$force = 1; $force = 1;
@@ -68,11 +75,19 @@ for (my $n = 0; $n < scalar @ARGV; $n++) {
elsif ($arg eq "--flake") { elsif ($arg eq "--flake") {
$flake = 1; $flake = 1;
} }
elsif ($arg eq "--kernel") {
$n++;
$kernel = $ARGV[$n];
die "$0: --kernel requires an argument\n" unless defined $kernel;
}
else { else {
die "$0: unrecognized argument $arg\n"; die "$0: unrecognized argument $arg\n";
} }
} }
$rootDir =~ s/\/*$//; # remove trailing slashes
$rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path
die "$0: invalid kernel: '$kernel'" unless $kernel eq "lts" || $kernel eq "latest";
my @attrs = (); my @attrs = ();
my @kernelModules = (); my @kernelModules = ();
@@ -709,6 +724,14 @@ EOF
EOF EOF
} }
if ($kernel eq "latest") {
$bootLoaderConfig .= <<EOF;
# Use latest kernel.
boot.kernelPackages = pkgs.linuxPackages_latest;
EOF
}
my $networkingDhcpConfig = generateNetworkingDhcpConfig(); my $networkingDhcpConfig = generateNetworkingDhcpConfig();
my $xserverConfig = generateXserverConfig(); my $xserverConfig = generateXserverConfig();

View File

@@ -1,25 +1,41 @@
# This module generates nixos-install, nixos-rebuild, # This module generates nixos-install, nixos-rebuild,
# nixos-generate-config, etc. # nixos-generate-config, etc.
{ config, lib, pkgs, options, ... }: {
config,
lib,
pkgs,
options,
...
}:
let let
makeProg = args: pkgs.replaceVarsWith (args // { makeProg =
dir = "bin"; args:
isExecutable = true; pkgs.replaceVarsWith (
nativeBuildInputs = [ args
pkgs.installShellFiles // {
]; dir = "bin";
postInstall = '' isExecutable = true;
installManPage ${args.manPage} nativeBuildInputs = [
''; pkgs.installShellFiles
}); ];
postInstall = ''
installManPage ${args.manPage}
'';
}
);
nixos-generate-config = makeProg { nixos-generate-config = makeProg {
name = "nixos-generate-config"; name = "nixos-generate-config";
src = ./nixos-generate-config.pl; src = ./nixos-generate-config.pl;
replacements = { replacements = {
perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl"; perl = "${
pkgs.perl.withPackages (p: [
p.FileSlurp
p.ConfigIniFiles
])
}/bin/perl";
hostPlatformSystem = pkgs.stdenv.hostPlatform.system; hostPlatformSystem = pkgs.stdenv.hostPlatform.system;
detectvirt = "${config.systemd.package}/bin/systemd-detect-virt"; detectvirt = "${config.systemd.package}/bin/systemd-detect-virt";
btrfs = "${pkgs.btrfs-progs}/bin/btrfs"; btrfs = "${pkgs.btrfs-progs}/bin/btrfs";
@@ -36,13 +52,17 @@ let
inherit (pkgs) runtimeShell; inherit (pkgs) runtimeShell;
inherit (config.system.nixos) version codeName revision; inherit (config.system.nixos) version codeName revision;
inherit (config.system) configurationRevision; inherit (config.system) configurationRevision;
json = builtins.toJSON ({ json = builtins.toJSON (
nixosVersion = config.system.nixos.version; {
} // lib.optionalAttrs (config.system.nixos.revision != null) { nixosVersion = config.system.nixos.version;
nixpkgsRevision = config.system.nixos.revision; }
} // lib.optionalAttrs (config.system.configurationRevision != null) { // lib.optionalAttrs (config.system.nixos.revision != null) {
configurationRevision = config.system.configurationRevision; nixpkgsRevision = config.system.nixos.revision;
}); }
// lib.optionalAttrs (config.system.configurationRevision != null) {
configurationRevision = config.system.configurationRevision;
}
);
}; };
manPage = ./manpages/nixos-version.8; manPage = ./manpages/nixos-version.8;
}; };
@@ -266,26 +286,46 @@ in
''; '';
}; };
imports = let imports =
mkToolModule = { name, package ? pkgs.${name} }: { config, ... }: { let
options.system.tools.${name}.enable = lib.mkEnableOption "${name} script" // { mkToolModule =
default = config.nix.enable && ! config.system.disableInstallerTools; {
defaultText = "config.nix.enable && !config.system.disableInstallerTools"; name,
}; package ? pkgs.${name},
}:
{ config, ... }:
{
options.system.tools.${name}.enable = lib.mkEnableOption "${name} script" // {
default = config.nix.enable && !config.system.disableInstallerTools;
defaultText = "config.nix.enable && !config.system.disableInstallerTools";
};
config = lib.mkIf config.system.tools.${name}.enable { config = lib.mkIf config.system.tools.${name}.enable {
environment.systemPackages = [ package ]; environment.systemPackages = [ package ];
}; };
}; };
in [ in
(mkToolModule { name = "nixos-build-vms"; }) [
(mkToolModule { name = "nixos-enter"; }) (mkToolModule { name = "nixos-build-vms"; })
(mkToolModule { name = "nixos-generate-config"; package = config.system.build.nixos-generate-config; }) (mkToolModule { name = "nixos-enter"; })
(mkToolModule { name = "nixos-install"; package = config.system.build.nixos-install; }) (mkToolModule {
(mkToolModule { name = "nixos-option"; }) name = "nixos-generate-config";
(mkToolModule { name = "nixos-rebuild"; package = config.system.build.nixos-rebuild; }) package = config.system.build.nixos-generate-config;
(mkToolModule { name = "nixos-version"; package = nixos-version; }) })
]; (mkToolModule {
name = "nixos-install";
package = config.system.build.nixos-install;
})
(mkToolModule { name = "nixos-option"; })
(mkToolModule {
name = "nixos-rebuild";
package = config.system.build.nixos-rebuild;
})
(mkToolModule {
name = "nixos-version";
package = nixos-version;
})
];
config = { config = {
documentation.man.man-db.skipPackages = [ nixos-version ]; documentation.man.man-db.skipPackages = [ nixos-version ];
@@ -293,10 +333,7 @@ in
# These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally. # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally.
system.build = { system.build = {
inherit nixos-generate-config nixos-install; inherit nixos-generate-config nixos-install;
nixos-rebuild = nixos-rebuild = if config.system.rebuild.enableNg then nixos-rebuild-ng else nixos-rebuild;
if config.system.rebuild.enableNg
then nixos-rebuild-ng
else nixos-rebuild;
nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option; nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option;
nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter; nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter;
}; };

View File

@@ -1,7 +1,12 @@
# This module defines the software packages included in the "minimal" # This module defines the software packages included in the "minimal"
# installation CD. It might be useful elsewhere. # installation CD. It might be useful elsewhere.
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
# Include some utilities that are useful for installing or repairing # Include some utilities that are useful for installing or repairing
@@ -43,9 +48,19 @@
]; ];
# Include support for various filesystems and tools to create / manipulate them. # Include support for various filesystems and tools to create / manipulate them.
boot.supportedFilesystems = boot.supportedFilesystems = lib.mkMerge [
[ "btrfs" "cifs" "f2fs" "ntfs" "vfat" "xfs" ] ++ [
lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs"; "btrfs"
"cifs"
"f2fs"
"ntfs"
"vfat"
"xfs"
]
(lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) {
zfs = lib.mkDefault true;
})
];
# Configure host id for ZFS to work # Configure host id for ZFS to work
networking.hostId = lib.mkDefault "8425e349"; networking.hostId = lib.mkDefault "8425e349";

View File

@@ -71,8 +71,7 @@ rec {
(onFullSupported "nixos.dummy") (onFullSupported "nixos.dummy")
(onAllSupported "nixos.iso_minimal") (onAllSupported "nixos.iso_minimal")
(onSystems [ "x86_64-linux" "aarch64-linux" ] "nixos.amazonImage") (onSystems [ "x86_64-linux" "aarch64-linux" ] "nixos.amazonImage")
(onFullSupported "nixos.iso_plasma6") (onFullSupported "nixos.iso_graphical")
(onFullSupported "nixos.iso_gnome")
(onFullSupported "nixos.manual") (onFullSupported "nixos.manual")
(onSystems [ "aarch64-linux" ] "nixos.sd_image") (onSystems [ "aarch64-linux" ] "nixos.sd_image")
(onFullSupported "nixos.tests.acme.http01-builtin") (onFullSupported "nixos.tests.acme.http01-builtin")

View File

@@ -164,42 +164,14 @@ in rec {
}); });
iso_minimal = forAllSystems (system: makeIso { iso_minimal = forAllSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal.nix; module = ./modules/installer/cd-dvd/installation-cd-minimal-combined.nix;
type = "minimal"; type = "minimal";
inherit system; inherit system;
}); });
iso_plasma5 = forMatchingSystems supportedSystems (system: makeIso { iso_graphical = forAllSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix; module = ./modules/installer/cd-dvd/installation-cd-graphical-combined.nix;
type = "plasma5"; type = "graphical";
inherit system;
});
iso_plasma6 = forMatchingSystems supportedSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix;
type = "plasma6";
inherit system;
});
iso_gnome = forMatchingSystems supportedSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix;
type = "gnome";
inherit system;
});
# A variant with a more recent (but possibly less stable) kernel that might support more hardware.
# This variant keeps zfs support enabled, hoping it will build and work.
iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix;
type = "minimal-new-kernel";
inherit system;
});
# A variant with a more recent (but possibly less stable) kernel that might support more hardware.
# ZFS support disabled since it is unlikely to support the latest kernel.
iso_minimal_new_kernel_no_zfs = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix;
type = "minimal-new-kernel-no-zfs";
inherit system; inherit system;
}); });

View File

@@ -13,19 +13,19 @@ let
{ {
x86_64-linux = { x86_64-linux = {
arch = "linux-x64"; arch = "linux-x64";
hash = "sha256-NdVSQQ5OeBPGSLbynUArNbfm+a2HCc/gwJMKfEDgzDM="; hash = "sha256-M3m3fFsz/LPSmghyKVuLVcMgxtUf3iNvHDLjOptfs6I=";
}; };
aarch64-linux = { aarch64-linux = {
arch = "linux-arm64"; arch = "linux-arm64";
hash = "sha256-4FjA3mUz+DVBiMUJAlGkUbpDtZuDYuUHPWA4QUiqd5w="; hash = "sha256-S3mMOtXYdVp5P8aKlzWyehVKCz7EjcNjYJqgSsNIS3g=";
}; };
x86_64-darwin = { x86_64-darwin = {
arch = "darwin-x64"; arch = "darwin-x64";
hash = "sha256-aexe9hrUxb3ZnrgJrvEXu2PZPmxOGdkk9exrfDaXA7s="; hash = "sha256-lIUM5W+lKL7OgcJVWJTJYsZNqpZ3MhSk7YnKsfWDX4U=";
}; };
aarch64-darwin = { aarch64-darwin = {
arch = "darwin-arm64"; arch = "darwin-arm64";
hash = "sha256-ijmKU+eU3R3mxeFxFr5AtVwGYVBuYWecD8W+0gHzP5w="; hash = "sha256-Lc2W1SNdn1rcxeKgv1YzKRr+DPN39C1J6O1KZBeELWc=";
}; };
} }
.${system} or (throw "Unsupported system: ${system}"); .${system} or (throw "Unsupported system: ${system}");
@@ -37,7 +37,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
# Please update the corresponding binary (typos-lsp) # Please update the corresponding binary (typos-lsp)
# when updating this extension. # when updating this extension.
# See pkgs/by-name/ty/typos-lsp/package.nix # See pkgs/by-name/ty/typos-lsp/package.nix
version = "0.1.26"; version = "0.1.35";
inherit (extInfo) hash arch; inherit (extInfo) hash arch;
}; };

View File

@@ -26,11 +26,11 @@ let
hash = hash =
{ {
x86_64-linux = "sha256-+RHzGJ5Y6j93ojnqg9hSe+Zs0sewcSSfWu8qlxJEoWQ="; x86_64-linux = "sha256-vzLyLOC/4SDlIrsbVKDXu42nx7QLgK7TWkzKC1/tSQo=";
x86_64-darwin = "sha256-Yaxb7cB/JADJ4i2PScYb9ovTKiClwd7TdQXbzg9ViSs="; x86_64-darwin = "sha256-dLCepFyTht6hzdm1jZbhFKt6yNIbCZWlpxAkSfE9Fww=";
aarch64-linux = "sha256-CK4geEBeLc1M5z4wuRS3rrqsL9nG1ra5+e3PGEOrYHA="; aarch64-linux = "sha256-Hiqrw6f7SWzdPQCV0s1d+cWwQ2u4PVDY8saL1Q+mZQg=";
aarch64-darwin = "sha256-S1XYikl1FzHvGBcudSD2xyuOH4gfsrYyEfwzL/csfSE="; aarch64-darwin = "sha256-zy+oI6MEHpxF8vOnE9EdjVm3LBAfgMas593hAJsWNz4=";
armv7l-linux = "sha256-aAgCL6clX/lXWdBmCSin/60krW5Sbn2KZZovmS16CfI="; armv7l-linux = "sha256-Z0qnKm+axJTAHq8E69wYWpZOF9FuFRkdJmap4rFhbTY=";
} }
.${system} or throwSystem; .${system} or throwSystem;
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release. # Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem. # This is important for the extension ecosystem.
version = "1.98.1.25070"; version = "1.98.2.25072";
pname = "vscodium"; pname = "vscodium";
executableName = "codium"; executableName = "codium";

View File

@@ -17,13 +17,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cri-o"; pname = "cri-o";
version = "1.32.0"; version = "1.32.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cri-o"; owner = "cri-o";
repo = "cri-o"; repo = "cri-o";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-bjZjmgIYFroyUdBeUbrRz7dD0yQOqc9TDsGxvle1PnE="; hash = "sha256-oB3X59+v4VosY5Db0BUfKt/WTMCWhhJX+mWwp/6ifVI=";
}; };
vendorHash = null; vendorHash = null;

View File

@@ -64,14 +64,14 @@ let
in in
py.pkgs.buildPythonApplication rec { py.pkgs.buildPythonApplication rec {
pname = "awscli2"; pname = "awscli2";
version = "2.24.22"; # N.B: if you change this, check if overrides are still up-to-date version = "2.24.24"; # N.B: if you change this, check if overrides are still up-to-date
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aws"; owner = "aws";
repo = "aws-cli"; repo = "aws-cli";
tag = version; tag = version;
hash = "sha256-cqDBUwc9E9TPN5E4CaCxc5sAZgCXalgl2ejGftyzV1k="; hash = "sha256-v2SdbWE+pxDFEtbwDd3sdVvLWGyeNm+9pKlTzqbgJFU=";
}; };
postPatch = '' postPatch = ''

View File

@@ -15,15 +15,15 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "buffybox"; pname = "buffybox";
version = "3.2.0-unstable-2025-02-27"; version = "3.2.0-unstable-2025-03-12";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.postmarketos.org"; domain = "gitlab.postmarketos.org";
owner = "postmarketOS"; owner = "postmarketOS";
repo = "buffybox"; repo = "buffybox";
fetchSubmodules = true; # to use its vendored lvgl fetchSubmodules = true; # to use its vendored lvgl
rev = "6bf7a8406f3a3fa79831d2d151e519b703b9e135"; rev = "3196e47d519c78b56a8d4b75ad7a280c92c91d23";
hash = "sha256-q3TNYRv5Cim+WklXw2ZTW6Ico1h8Xxs9MhTFhHZUMW0="; hash = "sha256-Zl/QmOJbY/lxoCYD6SpUHiiTTDOStUSn3+6xOuiGGBo=";
}; };
depsBuildBuild = [ depsBuildBuild = [

View File

@@ -5,15 +5,15 @@
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cfonts"; pname = "cfonts";
version = "1.1.3"; version = "1.2.0";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
hash = "sha256-ixxDlHjx5Bi6Wl/kzJ/R7d+jgTDCAti25TV1RlXRPus="; hash = "sha256-W5hN+b4R50tNfYb3WrM0z5Etm6ixa11pZWnzGC9bjSs=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-eJM3CS3I++p6Pk/K8vkD/H/RAmD+eQJ+//It/Jn5dX4="; cargoHash = "sha256-MXUUvk7R1JdjNlZ7h3ymUAPOT/A0I8TOW3saBB4C94o=";
meta = with lib; { meta = with lib; {
homepage = "https://github.com/dominikwilkowski/cfonts"; homepage = "https://github.com/dominikwilkowski/cfonts";

View File

@@ -5,13 +5,13 @@
"packages": { "packages": {
"": { "": {
"dependencies": { "dependencies": {
"@anthropic-ai/claude-code": "^0.2.41" "@anthropic-ai/claude-code": "^0.2.45"
} }
}, },
"node_modules/@anthropic-ai/claude-code": { "node_modules/@anthropic-ai/claude-code": {
"version": "0.2.41", "version": "0.2.45",
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.41.tgz", "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.45.tgz",
"integrity": "sha512-tbzmDPsD+WQ/KnA92kKpxb3/PEYk1FDbpIMvbzXFuXDONXW66o4seTl4JcpBVtb9zk5wv6srTlB7M9Nn7Tel1A==", "integrity": "sha512-r8uSA59wuNUHjlU+snwkZBHGsuv7z5+sxDFhLxI+1wz6PU9CU2/V37k26c7YpN9OFfeRmt9hk7gb3KaIlTH2ZA==",
"hasInstallScript": true, "hasInstallScript": true,
"license": "SEE LICENSE IN README.md", "license": "SEE LICENSE IN README.md",
"bin": { "bin": {

View File

@@ -6,14 +6,14 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "claude-code"; pname = "claude-code";
version = "0.2.41"; version = "0.2.45";
src = fetchzip { src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
hash = "sha256-HxPdULdggaFeNkRnrqIU2Y7HC6F8UdqRLTl8QiLV8wg="; hash = "sha256-N0ZJ+DxjT4Xtmd+zE/AXJTaj8c+RnR4umepgWUTh2XE=";
}; };
npmDepsHash = "sha256-VcB39pBEVF0PFOPDZVS6FH2UpSrIATjGueoZAxb33DA="; npmDepsHash = "sha256-agHCUnVCyqOF85x5tECPlQnV5wNmzIo5gipnVVMKnZE=";
postPatch = '' postPatch = ''
cp ${./package-lock.json} package-lock.json cp ${./package-lock.json} package-lock.json

View File

@@ -1,82 +1,108 @@
{ {
lib, lib,
stdenv, stdenv,
stdenvAdapters,
fetchFromGitHub, fetchFromGitHub,
rustPlatform, rustPlatform,
cmake, cmake,
makeBinaryWrapper,
cosmic-icons,
cosmic-randr,
just, just,
libcosmicAppHook,
pkg-config, pkg-config,
libxkbcommon, expat,
libinput, libinput,
fontconfig, fontconfig,
freetype, freetype,
wayland, pipewire,
expat, pulseaudio,
udev, udev,
util-linux, util-linux,
cosmic-randr,
xkeyboard_config,
nix-update-script,
withMoldLinker ? stdenv.targetPlatform.isLinux,
}: }:
let
rustPlatform.buildRustPackage rec { libcosmicAppHook' = (libcosmicAppHook.__spliced.buildHost or libcosmicAppHook).override {
pname = "cosmic-settings"; includeSettings = false;
version = "1.0.0-alpha.1";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings";
rev = "epoch-${version}";
hash = "sha256-gTzZvhj7oBuL23dtedqfxUCT413eMoDc0rlNeqCeZ6E=";
}; };
in
rustPlatform.buildRustPackage.override
{ stdenv = if withMoldLinker then stdenvAdapters.useMoldLinker stdenv else stdenv; }
(finalAttrs: {
pname = "cosmic-settings";
version = "1.0.0-alpha.6";
useFetchCargoVendor = true; src = fetchFromGitHub {
cargoHash = "sha256-zMHJc6ytbOoi9E47Zsg6zhbQKObsaOtVHuPnLAu36I4="; owner = "pop-os";
repo = "cosmic-settings";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-UKg3TIpyaqtynk6wLFFPpv69F74hmqfMVPra2+iFbvE=";
};
postPatch = '' useFetchCargoVendor = true;
substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" cargoHash = "sha256-mf/Cw3/RLrCYgsk7JKCU2+oPn1VPbD+4JzkUmbd47m8=";
'';
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
just just
pkg-config libcosmicAppHook'
makeBinaryWrapper pkg-config
]; rustPlatform.bindgenHook
buildInputs = [ util-linux
libxkbcommon ];
libinput
fontconfig
freetype
wayland
expat
udev
util-linux
];
dontUseJustBuild = true; buildInputs = [
expat
fontconfig
freetype
libinput
pipewire
pulseaudio
udev
];
justFlags = [ dontUseJustBuild = true;
"--set" dontUseJustCheck = true;
"prefix"
(placeholder "out")
"--set"
"bin-src"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-settings"
];
postInstall = '' justFlags = [
wrapProgram "$out/bin/cosmic-settings" \ "--set"
--prefix PATH : ${lib.makeBinPath [ cosmic-randr ]} \ "prefix"
--suffix XDG_DATA_DIRS : "$out/share:${cosmic-icons}/share" (placeholder "out")
''; "--set"
"bin-src"
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-settings"
];
meta = with lib; { env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" =
homepage = "https://github.com/pop-os/cosmic-settings"; lib.optionalString withMoldLinker "-C link-arg=-fuse-ld=mold";
description = "Settings for the COSMIC Desktop Environment";
license = licenses.gpl3Only; preFixup = ''
maintainers = with maintainers; [ nyabinary ]; libcosmicAppWrapperArgs+=(
platforms = platforms.linux; --prefix PATH : ${lib.makeBinPath [ cosmic-randr ]}
mainProgram = "cosmic-settings"; --set-default X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml
}; --set-default X11_BASE_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/extra.xml
} )
'';
passthru.updateScript = nix-update-script {
extraArgs = [
"--version"
"unstable"
"--version-regex"
"epoch-(.*)"
];
};
meta = {
description = "Settings for the COSMIC Desktop Environment";
homepage = "https://github.com/pop-os/cosmic-settings";
license = lib.licenses.gpl3Only;
mainProgram = "cosmic-settings";
maintainers = with lib.maintainers; [
nyabinary
HeitorAugustoLN
];
platforms = lib.platforms.linux;
};
})

View File

@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "httplib"; pname = "httplib";
version = "0.18.5"; version = "0.19.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yhirose"; owner = "yhirose";
repo = "cpp-httplib"; repo = "cpp-httplib";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-d5b6WsqR9oTiWq9wED+7Ts0kjURutxAJVXbm1okNg8k="; hash = "sha256-OLwD7mpwqG7BUugUca+CJpPMaabJzUMC0zYzJK9PBCg=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@@ -7,7 +7,7 @@
let let
pname = "lefthook"; pname = "lefthook";
version = "1.10.11"; version = "1.11.2";
in in
buildGoModule { buildGoModule {
inherit pname version; inherit pname version;
@@ -16,7 +16,7 @@ buildGoModule {
owner = "evilmartians"; owner = "evilmartians";
repo = "lefthook"; repo = "lefthook";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Ys9tvewWANpCgZsUtFlF8+Z+gKpH21iU3c9y61GY+NM="; hash = "sha256-kh1U3w39C+6UewKRyKQc4EBgQmBNP7Ou8V54CeG5hlQ=";
}; };
vendorHash = "sha256-uvPpkSqfe1NvO78kIMo5cYdr87YTGozudeESmI0q+1E="; vendorHash = "sha256-uvPpkSqfe1NvO78kIMo5cYdr87YTGozudeESmI0q+1E=";

View File

@@ -20,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mako"; pname = "mako";
version = "1.9.0"; version = "1.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emersion"; owner = "emersion";
repo = "mako"; repo = "mako";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-QtYtondP7E5QXLRnmcaOQlAm9fKXctfjxeUFqK6FnnE="; hash = "sha256-O93KOXonfkgIKtlIZP4YlsEgXBcupNifoC/cN+ZAYEM=";
}; };
strictDeps = true; strictDeps = true;

View File

@@ -1,37 +0,0 @@
{ lib, stdenv, fetchFromGitHub, cmake, zlib, python2 }:
stdenv.mkDerivation rec {
pname = "manta";
version = "1.6.0";
src = fetchFromGitHub {
owner = "Illumina";
repo = "manta";
rev = "v${version}";
sha256 = "1711xkcw8rpw9xv3bbm7v1aryjz4r341rkq5255192dg38sgq7w2";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ zlib python2 ];
postFixup = ''
sed -i 's|/usr/bin/env python2|${python2.interpreter}|' $out/lib/python/makeRunScript.py
sed -i 's|/usr/bin/env python|${python2.interpreter}|' $out/lib/python/pyflow/pyflow.py
sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/python/pyflow/pyflowTaskWrapper.py
'';
doInstallCheck = true;
installCheckPhase = ''
rm $out/lib/python/**/*.pyc
PYTHONPATH=$out/lib/python:$PYTHONPATH python -c 'import makeRunScript'
PYTHONPATH=$out/lib/python/pyflow:$PYTHONPATH python -c 'import pyflowTaskWrapper; import pyflow'
'';
env.NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds";
meta = with lib; {
description = "Structural variant caller";
license = licenses.gpl3;
homepage = "https://github.com/Illumina/manta";
maintainers = with maintainers; [ jbedo ];
platforms = platforms.x86_64;
};
}

View File

@@ -0,0 +1,39 @@
{
buildGoModule,
fetchFromGitHub,
lib,
nix-update-script,
versionCheckHook,
}:
buildGoModule rec {
pname = "nftrace";
version = "0.1.0";
src = fetchFromGitHub {
owner = "aojea";
repo = "nftrace";
tag = "v${version}";
hash = "sha256-MTLl3XLDIjcK5GymW7D3B8+/A6W+kQ4cz5bbrfo6fQc=";
};
vendorHash = "sha256-UrsvUMdLWGX2QRFLxBLvMW1B5vZdcWI/lpyKiNAtA2o=";
ldflags = [
"-s"
"-w"
];
nativeInstallCheckInputs = [ versionCheckHook ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Commodity tool to use nftables trace functionality";
homepage = "https://github.com/aojea/nftrace";
changelog = "https://github.com/aojea/nftrace/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.jmbaur ];
mainProgram = "nftrace";
};
}

View File

@@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "reindeer"; pname = "reindeer";
version = "2025.02.24.00"; version = "2025.03.10.00";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebookincubator"; owner = "facebookincubator";
repo = "reindeer"; repo = "reindeer";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-+uiVUEaBDO7c2QYo0NcCy9Ms+wz+09p6kD0muRAvOlo="; hash = "sha256-yE1ARmsEbuG9OskipZfPKbA0c/4VBVBFHFEiy5nzwXg=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-G+NAljFX0R73+sj30KHHkU78AfQCg7e3PM5oOB9iTbE="; cargoHash = "sha256-VU0mLaQ8pWQw/pFTB35/ZOKUnqEVEO9f1IKZ0gAmqj8=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View File

@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "stu"; pname = "stu";
version = "0.6.6"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lusingander"; owner = "lusingander";
repo = "stu"; repo = "stu";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-an/FNDwtP8EKPwuhu/Dkqj5hZym6wpySEfr66C21pvw="; hash = "sha256-gZaSSKlKTtOb/zxVwj0PFk1BqDDswyKv+fIHDn/4n3I=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-BrRy0jTDA6SEikoQOzajBMKOPwK6AQRdehlK5rBZTgw="; cargoHash = "sha256-hi3plLDMMft9jEo9whZrSBvZjLjezeWRmocQF0MlsfY=";
passthru.tests.version = testers.testVersion { package = stu; }; passthru.tests.version = testers.testVersion { package = stu; };

View File

@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "syshud"; pname = "syshud";
version = "0-unstable-2025-01-13"; version = "0-unstable-2025-03-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "System64fumo"; owner = "System64fumo";
repo = "syshud"; repo = "syshud";
rev = "ca5c05145d440c7e96a3521af327da91bb1ac539"; rev = "6a90edad20437a1d933937a44a4e3553caeb248f";
hash = "sha256-mglmmIZz1bbRT15/Xr1vrYBy+PVgIaKpjRfAAFT5OcQ="; hash = "sha256-Lmv75OaPOK+NxDe+7Xgf/NDvyms+zXn8tYThQJRxf9k=";
}; };
postPatch = '' postPatch = ''

View File

@@ -1,19 +1,23 @@
{ {
lib, lib,
buildGoModule, # Breaks with go 1.24 (see https://github.com/gruntwork-io/terragrunt/issues/4031)
# > 2025/03/17 13:30:44 internal error: package "bufio" without types was imported from "github.com/gruntwork-io/terragrunt/tf/getproviders"
# > tf/getproviders/lock.go:1: running "mockery": exit status 1
# > make: *** [Makefile:54: generate-mocks] Error 1
buildGo123Module,
fetchFromGitHub, fetchFromGitHub,
go-mockery, go-mockery,
}: }:
buildGoModule rec { buildGo123Module rec {
pname = "terragrunt"; pname = "terragrunt";
version = "0.73.15"; version = "0.75.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gruntwork-io"; owner = "gruntwork-io";
repo = pname; repo = pname;
tag = "v${version}"; tag = "v${version}";
hash = "sha256-ISo6r+mMuXiGTIALXA5+xCKNOzNTNFz8cdGtbWyQRNI="; hash = "sha256-lnp1prffufVOG+XV7UAo9Rh3ALE//b87ioPgimgZ5S0=";
}; };
nativeBuildInputs = [ go-mockery ]; nativeBuildInputs = [ go-mockery ];
@@ -22,7 +26,7 @@ buildGoModule rec {
make generate-mocks make generate-mocks
''; '';
vendorHash = "sha256-EO3zgqVqf994xB55twRmcGBQdffrNr2BejNq2jlkMSA="; vendorHash = "sha256-UhOb1Djup9Cwrv9vYeD/DZe20dwSKYRpJa4V3ZCsPwQ=";
doCheck = false; doCheck = false;

View File

@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "twilio-cli"; pname = "twilio-cli";
version = "5.22.11"; version = "5.23.0";
src = fetchzip { src = fetchzip {
url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
hash = "sha256-SeSv16lZ2Dmfngkq1TtvzlM3oIJkVPsdnkc1hRuSZU4="; hash = "sha256-LTaQFRoXRBLPLWvyqwMbQc0OOC+wT+taLm78GL2mWBQ=";
}; };
buildInputs = [ nodejs-slim ]; buildInputs = [ nodejs-slim ];

View File

@@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec {
pname = "typos-lsp"; pname = "typos-lsp";
# Please update the corresponding VSCode extension too. # Please update the corresponding VSCode extension too.
# See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
version = "0.1.34"; version = "0.1.35";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tekumara"; owner = "tekumara";
repo = "typos-lsp"; repo = "typos-lsp";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-WqICNpheCJJAmmbj5QIejFeUIW/7ghrhQRP73PLLMJ4="; hash = "sha256-5B4xWYJJ2KQLxzRQf0EKakGuB0LLOg023AIt8G3uAew=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-tmBRUoBsNQlJY0JYtDknD5xeeFnokTE9cnHzktMIiBU="; cargoHash = "sha256-Es/CdtyRtBghAeRoi5WrS0sdkm5flRlp3KXLs/nJ6UU=";
# fix for compilation on aarch64 # fix for compilation on aarch64
# see https://github.com/NixOS/nixpkgs/issues/145726 # see https://github.com/NixOS/nixpkgs/issues/145726

View File

@@ -0,0 +1,29 @@
{
lib,
stdenv,
fetchurl,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ctf-ynetd";
version = "2024.12.31";
src = fetchurl {
url = "https://hxp.io/assets/data/code/ctf-ynetd-2024.12.31.tar.xz";
hash = "sha256-hUEZZEulmaV3KfKOqE1wl7y4SRUn2/HoOjVDabk5+YA=";
};
installPhase = ''
runHook preInstall
install -Dm755 ynetd $out/bin/ynetd
runHook postInstall
'';
meta = {
description = "Fork of ynetd hardened for CTFs with isolation using PID namespaces, minimal overhead proof-of-work checking, and strict resource limits via cgroups";
homepage = "https://hxp.io/code/";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.haylin ];
mainProgram = "ynetd";
};
})

View File

@@ -2,6 +2,7 @@
lib, lib,
stdenv, stdenv,
fetchurl, fetchurl,
callPackage,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "ynetd"; pname = "ynetd";
@@ -22,6 +23,10 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall runHook postInstall
''; '';
# ctf-ynetd releases are based on the last stable ynetd version
# these should be kept in sync when possible
passthru.hardened = callPackage ./hardened.nix { };
meta = { meta = {
description = "Small server for binding programs to TCP ports"; description = "Small server for binding programs to TCP ports";
homepage = "https://yx7.cc/code/"; homepage = "https://yx7.cc/code/";

View File

@@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "firecrawl-py"; pname = "firecrawl-py";
version = "1.5.0"; version = "1.6.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mendableai"; owner = "mendableai";
repo = "firecrawl"; repo = "firecrawl";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-6reo89L/f50pNdMEm1nknEotoCyZFO/RBu3ldNUQkhk="; hash = "sha256-xr2curv7Inzav0wGOEfWwKn1XhBg8EIotJbwhXc+aBQ=";
}; };
sourceRoot = "${src.name}/apps/python-sdk"; sourceRoot = "${src.name}/apps/python-sdk";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
meta = { meta = {
description = "Turn entire websites into LLM-ready markdown or structured data. Scrape, crawl and extract with a single API"; description = "Turn entire websites into LLM-ready markdown or structured data. Scrape, crawl and extract with a single API";
homepage = "https://firecrawl.dev"; homepage = "https://firecrawl.dev";
changelog = "https://github.com/mendableai/firecrawl/releases/tag/v${version}"; changelog = "https://github.com/mendableai/firecrawl/releases/tag/${src.tag}";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ drupol ]; maintainers = with lib.maintainers; [ drupol ];
}; };

View File

@@ -7,14 +7,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "rcssmin"; pname = "rcssmin";
version = "1.2.0"; version = "1.2.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-9DaHJBLPpvBP/5kMYyIkaxOqOJ9gMjuWNYPtYQLXyEw="; hash = "sha256-s1wMic2sj8NWwrCYXz5TToXMGNGXHZAtHqx/5rT/Vmw=";
}; };
# The package does not ship tests, and the setup machinery confuses # The package does not ship tests, and the setup machinery confuses

View File

@@ -11,13 +11,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "jackett"; pname = "jackett";
version = "0.22.1447"; version = "0.22.1512";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha512-spmMAfyNZ0/RR1GExMnQCUL+ocr1Oj/NtEFc6lYmHoVkh/xMRn1QUh5ranKdsUGP5a7H3jq749MnA7w3ZrE2jA=="; hash = "sha512-gNsEDFBZPByRt2/twSCBvYZtZjXmqBMJPmBKSO4j/irxlhvWpq8SgeDgICpQ9Kf4S5eROPxcKH5V50doWBJndg==";
}; };
projectFile = "src/Jackett.Server/Jackett.Server.csproj"; projectFile = "src/Jackett.Server/Jackett.Server.csproj";

View File

@@ -10,15 +10,15 @@ let
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = { hash = {
x64-linux_hash = "sha256-D0Np9Jz7E4/1dnWkFdHQIGthklCVc6yav2AAE9pFcu0="; x64-linux_hash = "sha256-/NVosPx55kmbiUrEwqlCTFR9fyB5cbKaFZApafPDQL4=";
arm64-linux_hash = "sha256-cWQOddtAQqMvvWR8uFOs/w0iVnCSg8/nNtYuoUcEqAc="; arm64-linux_hash = "sha256-4JgtHmNoJv9zURdFzRQaO0og07HpbVVOkBf+jViuM7E=";
x64-osx_hash = "sha256-8ReX8PrP6ZL1orhx8sMDMQ4WHx1WH9cyyrx2yQKFnmc="; x64-osx_hash = "sha256-wfTGi8227Ggf0h2JyrdvM3yHG8lp5EktuHO37MprgZ4=";
arm64-osx_hash = "sha256-kH6gZ7PWIqrFnlRkqCO2KUvHX0L+xYIcR+NFuflBkFk="; arm64-osx_hash = "sha256-VQ6o1XwT5MMS95e0AW6bgba+8iWvt1jKkxfIfkKiMlM=";
}."${arch}-${os}_hash"; }."${arch}-${os}_hash";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "radarr"; pname = "radarr";
version = "5.18.4.9674"; version = "5.19.3.9730";
src = fetchurl { src = fetchurl {
url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";

View File

@@ -25,13 +25,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ibus-typing-booster"; pname = "ibus-typing-booster";
version = "2.27.27"; version = "2.27.29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mike-fabian"; owner = "mike-fabian";
repo = "ibus-typing-booster"; repo = "ibus-typing-booster";
rev = version; rev = version;
hash = "sha256-nh/dn71RFLuEHhkKWT5sZPUQxiG4pIJ8a3SXnW+A+Ts="; hash = "sha256-0dyp7kNnmuw9YcYTH/5Eln+EzIbM2HTojXXC9NCA8vE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "steampipe-plugin-aws"; pname = "steampipe-plugin-aws";
version = "1.6.0"; version = "1.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "turbot"; owner = "turbot";
repo = "steampipe-plugin-aws"; repo = "steampipe-plugin-aws";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-kKJoEzudqNdVCmZpyB2Jaqjn01ZOnqqQ516DYnC0Qng="; hash = "sha256-OpfusJAU2VzsvUjzwvd9xoUAsD4Pl/90mv3ADrVSY1A=";
}; };
vendorHash = "sha256-76mIpOWpW4NgyKDzeVd7LkmiRhcikMvFaqt8qvh16+U="; vendorHash = "sha256-eWoeC5MyU7Hs96DK53F0HOaqdT9TjfN2f8BW+oJ2pYY=";
ldflags = [ ldflags = [
"-s" "-s"

View File

@@ -939,6 +939,7 @@ mapAliases {
mariadb-client = hiPrio mariadb.client; #added 2019.07.28 mariadb-client = hiPrio mariadb.client; #added 2019.07.28
maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 20204-08-24 maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 20204-08-24
manicode = throw "manicode has been renamed to codebuff"; # Added 2024-12-10 manicode = throw "manicode has been renamed to codebuff"; # Added 2024-12-10
manta = throw "manta does not support python3, and development has been abandoned upstream"; # Added 2025-03-17
marwaita-manjaro = lib.warnOnInstantiate "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08 marwaita-manjaro = lib.warnOnInstantiate "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08
marwaita-peppermint = lib.warnOnInstantiate "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01 marwaita-peppermint = lib.warnOnInstantiate "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01
marwaita-ubuntu = lib.warnOnInstantiate "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08 marwaita-ubuntu = lib.warnOnInstantiate "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08