0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-10-03 18:05:09 +00:00 committed by GitHub
commit ae87c79207
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
81 changed files with 4786 additions and 730 deletions

View file

@ -5028,6 +5028,12 @@
github = "definfo"; github = "definfo";
githubId = 66514911; githubId = 66514911;
}; };
deftdawg = {
name = "DeftDawg";
github = "deftdawg";
email = "deftdawg@gmail.com";
githubId = 4991612;
};
deifactor = { deifactor = {
name = "Ash Zahlen"; name = "Ash Zahlen";
email = "ext0l@riseup.net"; email = "ext0l@riseup.net";

View file

@ -17,6 +17,10 @@
[2.24](https://nix.dev/manual/nix/latest/release-notes/rl-2.24). [2.24](https://nix.dev/manual/nix/latest/release-notes/rl-2.24).
Notable changes include improvements to Git fetching, documentation comment support in `nix-repl> :doc`, as well as many quality of life improvements. Notable changes include improvements to Git fetching, documentation comment support in `nix-repl> :doc`, as well as many quality of life improvements.
- This will be the last release of Nixpkgs to support versions of CUDA prior to CUDA 12.0.
These versions only work with old compiler versions that will be unsupported by the time of the Nixpkgs 25.05 release.
In future, users should expect CUDA versions to be dropped as the compiler versions they require leave upstream support windows.
- Convenience options for `amdgpu`, open source driver for Radeon cards, is now available under `hardware.amdgpu`. - Convenience options for `amdgpu`, open source driver for Radeon cards, is now available under `hardware.amdgpu`.
- [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured as `hardware.amdgpu.amdvlk` option. - [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured as `hardware.amdgpu.amdvlk` option.

View file

@ -24,25 +24,35 @@
config = { config = {
# This should not contain packages that are broken or can't build, since it
# will break this expression
#
# Currently broken packages:
# - contour
#
# can be generated with: # can be generated with:
# lib.attrNames (lib.filterAttrs # lib.attrNames (lib.filterAttrs
# (_: drv: (builtins.tryEval (lib.isDerivation drv && drv ? terminfo)).value) # (_: drv: (builtins.tryEval (lib.isDerivation drv && drv ? terminfo)).value)
# pkgs) # pkgs)
environment.systemPackages = lib.mkIf config.environment.enableAllTerminfo (map (x: x.terminfo) (with pkgs.pkgsBuildBuild; [ environment.systemPackages = lib.mkIf config.environment.enableAllTerminfo (
alacritty map (x: x.terminfo) (
contour with pkgs.pkgsBuildBuild;
foot [
kitty alacritty
mtm foot
rio kitty
rxvt-unicode-unwrapped mtm
rxvt-unicode-unwrapped-emoji rio
st rxvt-unicode-unwrapped
termite rxvt-unicode-unwrapped-emoji
tmux st
wezterm termite
yaft tmux
])); wezterm
yaft
]
)
);
environment.pathsToLink = [ environment.pathsToLink = [
"/share/terminfo" "/share/terminfo"

View file

@ -8,7 +8,7 @@ let
* to a menuentry for use in grub. * to a menuentry for use in grub.
* *
* * defaults: {name, image, params, initrd} * * defaults: {name, image, params, initrd}
* * options: [ option... ] * * options: [ option... ]
* * option: {name, params, class} * * option: {name, params, class}
*/ */
menuBuilderGrub2 = menuBuilderGrub2 =

View file

@ -344,7 +344,7 @@ let
serviceConfig = commonServiceConfig // { serviceConfig = commonServiceConfig // {
Group = data.group; Group = data.group;
# Let's Encrypt Failed Validation Limit allows 5 retries per hour, per account, hostname and hour. # Let's Encrypt Failed Validation Limit allows 5 retries per hour, per account, hostname and hour.
# This avoids eating them all up if something is misconfigured upon the first try. # This avoids eating them all up if something is misconfigured upon the first try.
RestartSec = 15 * 60; RestartSec = 15 * 60;

View file

@ -288,7 +288,7 @@ in {
path = [ ]; path = [ ];
script = '' script = ''
export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile}) export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile})
${datadogPkg}/bin/trace-agent -config /etc/datadog-agent/datadog.yaml ${datadogPkg}/bin/trace-agent --config /etc/datadog-agent/datadog.yaml
''; '';
}); });

View file

@ -1020,7 +1020,7 @@ in {
''; '';
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.User = "nextcloud"; serviceConfig.User = "nextcloud";
# On Nextcloud ≥ 26, it is not necessary to patch the database files to prevent # On Nextcloud ≥ 26, it is not necessary to patch the database files to prevent
# an automatic creation of the database user. # an automatic creation of the database user.
environment.NC_setup_create_db_user = lib.mkIf (nextcloudGreaterOrEqualThan "26") "false"; environment.NC_setup_create_db_user = lib.mkIf (nextcloudGreaterOrEqualThan "26") "false";
}; };

View file

@ -406,7 +406,7 @@ in {
# is unnecessary as it's part of the installPhase of pixelfed. # is unnecessary as it's part of the installPhase of pixelfed.
# Install Horizon # Install Horizon
# FIXME: require write access to public/ — should be done as part of install — pixelfed-manage horizon:publish # FIXME: require write access to public/ — should be done as part of install — pixelfed-manage horizon:publish
# Perform the first migration. # Perform the first migration.
[[ ! -f ${cfg.dataDir}/.initial-migration ]] && pixelfed-manage migrate --force && touch ${cfg.dataDir}/.initial-migration [[ ! -f ${cfg.dataDir}/.initial-migration ]] && pixelfed-manage migrate --force && touch ${cfg.dataDir}/.initial-migration

View file

@ -154,7 +154,7 @@ in {
with subtest("run_distributed_command"): with subtest("run_distributed_command"):
# Run `hostname` on 3 nodes of the partition (so on all the 3 nodes). # Run `hostname` on 3 nodes of the partition (so on all the 3 nodes).
# The output must contain the 3 different names # The output must contain the 3 different names
submit.succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq") submit.succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq")
with subtest("check_slurm_dbd"): with subtest("check_slurm_dbd"):

View file

@ -1,3 +1,5 @@
{ lib, ... }:
let let
certs = import ./common/acme/server/snakeoil-certs.nix; certs = import ./common/acme/server/snakeoil-certs.nix;
domain = certs.domain; domain = certs.domain;
@ -6,6 +8,8 @@ in
{ {
name = "wstunnel"; name = "wstunnel";
meta.platforms = lib.platforms.linux;
nodes = { nodes = {
server = { server = {
virtualisation.vlans = [ 1 ]; virtualisation.vlans = [ 1 ];

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "clifm"; pname = "clifm";
version = "1.20"; version = "1.21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "leo-arch"; owner = "leo-arch";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-TKQxNl+RTPQAE7mMALugm3rg8mPZq3eD/uW23DLws8I="; hash = "sha256-x7Mdt8XcTtqxaHo28jrpyYPHZ/X1g9h4aulrW3YIXGQ=";
}; };
buildInputs = [ buildInputs = [

View file

@ -20,7 +20,6 @@
, exfat , exfat
, f2fs-tools , f2fs-tools
, fatresize , fatresize
, hfsprogs
, jfsutils , jfsutils
, nilfs-utils , nilfs-utils
, ntfs3g , ntfs3g
@ -50,7 +49,7 @@ let
exfat exfat
f2fs-tools f2fs-tools
fatresize fatresize
hfsprogs # hfsprogs intentionally omitted due to being unmaintained
jfsutils jfsutils
nilfs-utils nilfs-utils
ntfs3g ntfs3g

View file

@ -99,5 +99,8 @@ stdenv.mkDerivation (final: {
maintainers = with maintainers; [ moni ]; maintainers = with maintainers; [ moni ];
platforms = platforms.unix; platforms = platforms.unix;
mainProgram = "contour"; mainProgram = "contour";
# This was caused by boxed-cpp 1.4.2 -> 1.4.3
# More details in issue #345752
broken = true;
}; };
}) })

View file

@ -7,14 +7,14 @@
}: }:
buildLua (finalAttrs: { buildLua (finalAttrs: {
pname = "modernx-zydezu"; pname = "modernx-zydezu";
version = "0.3.6.6"; version = "0.3.7";
scriptPath = "modernx.lua"; scriptPath = "modernx.lua";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zydezu"; owner = "zydezu";
repo = "ModernX"; repo = "ModernX";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-Jt3Y/4no3dUOopjvbS/dBGU0vw9Lq4o5inb4efuyYBM="; hash = "sha256-slJYbhjNrzwq5rl83HV0Uy7BUK/bbltWSyH0198kSqw=";
}; };
postInstall = '' postInstall = ''

View file

@ -0,0 +1,51 @@
{
lib,
fetchFromGitHub,
stdenv,
gcc,
python312Packages,
}:
let
version = "0.9.5-alpha";
in
stdenv.mkDerivation {
pname = "almo";
inherit version;
src = fetchFromGitHub {
owner = "abap34";
repo = "almo";
rev = "refs/tags/v${version}";
sha256 = "sha256-Cz+XDJmdp+utzwm1c7ThTNS6kfNF6r4B16tnGQSCVMc=";
};
buildInputs = [
gcc
python312Packages.pybind11
];
makeFlags = [ "all" ];
# remove darwin-only linker flag on linux
postPatch = lib.optionalString (!stdenv.isDarwin) ''
substituteInPlace scripts/pybind.sh \
--replace-fail " -undefined dynamic_lookup" ""
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/lib
cp build/almo $out/bin
cp almo.so $out/lib
runHook postInstall
'';
meta = {
description = "ALMO is markdown parser and static site generator";
license = lib.licenses.mit;
platforms = lib.platforms.all;
homepage = "https://github.com/abap34/almo";
maintainers = with lib.maintainers; [ momeemt ];
mainProgram = "almo";
};
}

View file

@ -2,19 +2,19 @@
buildGoModule rec { buildGoModule rec {
pname = "atlas"; pname = "atlas";
version = "0.27.0"; version = "0.28.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ariga"; owner = "ariga";
repo = "atlas"; repo = "atlas";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-av2WKuEzDhjvqGHIAlNR/Tt8AhqkjLhgcZIpJEKgEVA="; hash = "sha256-D6dHHTxD2eObmXwYntIOtcPsU1vP+K289n+XVoaGUVc=";
}; };
modRoot = "cmd/atlas"; modRoot = "cmd/atlas";
proxyVendor = true; proxyVendor = true;
vendorHash = "sha256-wu2WONeL5LNGjn/xaRDPtBBVcvLOxSeelj7a6xxMHTY="; vendorHash = "sha256-SFG//hc5vLQXC3SeEn4YRcc82PItYZy+TNqzq19sRnI=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -1,20 +1,26 @@
{ lib {
, stdenv lib,
, fetchFromGitHub boost,
, cmake clucene_core_2,
, docbook_xml_dtd_45 cmake,
, pkg-config docbook_xml_dtd_45,
, wrapQtAppsHook docbook_xsl_ns,
, boost fetchFromGitHub,
, clucene_core_2 perlPackages,
, docbook_xsl_ns pkg-config,
, perlPackages qt5,
, qtbase stdenv,
, qtsvg sword,
, qttools
, sword
}: }:
let
inherit (qt5)
qtbase
qtsvg
qttools
wrapQtAppsHook
;
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "bibletime"; pname = "bibletime";
version = "3.0.3"; version = "3.0.3";
@ -31,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
docbook_xml_dtd_45 docbook_xml_dtd_45
pkg-config pkg-config
wrapQtAppsHook wrapQtAppsHook
perlPackages.Po4a
]; ];
buildInputs = [ buildInputs = [
boost boost
clucene_core_2 clucene_core_2
perlPackages.Po4a
qtbase qtbase
qtsvg qtsvg
qttools qttools
@ -49,18 +55,20 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
cmakeFlags = [ cmakeFlags = [
"-DBUILD_HOWTO_PDF=OFF" (lib.cmakeBool "BUILD_HOWTO_PDF" false)
"-DBUILD_HANDBOOK_PDF=OFF" (lib.cmakeBool "BUILD_HANDBOOK_PDF" false)
"-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl" (lib.cmakeFeature "BT_DOCBOOK_XSL_HTML_CHUNK_XSL" "${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl")
"-DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl" (lib.cmakeFeature "BT_DOCBOOK_XSL_PDF_DOCBOOK_XSL" "${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl")
]; ];
meta = with lib; { strictDeps = true;
meta = {
homepage = "http://www.bibletime.info/"; homepage = "http://www.bibletime.info/";
description = "Powerful cross platform Bible study tool"; description = "Powerful cross platform Bible study tool";
license = lib.licenses.gpl2Plus;
mainProgram = "bibletime"; mainProgram = "bibletime";
license = licenses.gpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux;
platforms = platforms.linux;
}; };
}) })

View file

@ -0,0 +1,5 @@
# frozen_string_literal: true
source 'https://rubygems.org'
gemspec

View file

@ -0,0 +1,106 @@
PATH
remote: .
specs:
cfn-nag (0.8.10)
aws-sdk-s3 (~> 1.76)
cfn-model (= 0.6.6)
lightly (~> 0.3.2)
logging (~> 2.2.2)
netaddr (~> 2.0.4)
optimist (~> 3.0.0)
rexml
GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
aws-eventstream (1.3.0)
aws-partitions (1.982.0)
aws-sdk-core (3.209.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.94.0)
aws-sdk-core (~> 3, >= 3.207.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.166.0)
aws-sdk-core (~> 3, >= 3.207.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.10.0)
aws-eventstream (~> 1, >= 1.0.2)
cfn-model (0.6.6)
kwalify (= 0.7.2)
psych (~> 3)
diff-lcs (1.5.1)
docile (1.4.1)
jmespath (1.6.2)
json (2.7.2)
kwalify (0.7.2)
language_server-protocol (3.17.0.3)
lightly (0.3.3)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
multi_json (1.15.0)
netaddr (2.0.6)
optimist (3.0.1)
parallel (1.26.3)
parser (3.3.5.0)
ast (~> 2.4.1)
racc
psych (3.3.4)
racc (1.8.1)
rainbow (3.1.1)
rake (13.2.1)
regexp_parser (2.9.2)
rexml (3.3.8)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.1)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
rubocop (1.66.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.3)
parser (>= 3.3.1.0)
ruby-progressbar (1.13.0)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.13.1)
simplecov_json_formatter (0.1.4)
unicode-display_width (2.6.0)
PLATFORMS
arm64-darwin-23
ruby
DEPENDENCIES
cfn-nag!
rake
rspec (~> 3.4)
rubocop
simplecov (~> 0.21)
BUNDLED WITH
2.5.11

View file

@ -0,0 +1,536 @@
{
ast = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
type = "gem";
};
version = "2.4.2";
};
aws-eventstream = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi";
type = "gem";
};
version = "1.3.0";
};
aws-partitions = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "075y2zwfqwg7qb7w34bfvp8dkjcmiz6hx5a3rbhpqglnlkav7ir4";
type = "gem";
};
version = "1.982.0";
};
aws-sdk-core = {
dependencies = [
"aws-eventstream"
"aws-partitions"
"aws-sigv4"
"jmespath"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "06mrp7g24ndg55w85ndyrvxfx2v6hnkh5fj32w9s6w3xsc8v5kqq";
type = "gem";
};
version = "3.209.1";
};
aws-sdk-kms = {
dependencies = [
"aws-sdk-core"
"aws-sigv4"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1acx3bhqkhni3kbl7xnjdgy8raq5y7p0zyniq61bsihzkwcj7imh";
type = "gem";
};
version = "1.94.0";
};
aws-sdk-s3 = {
dependencies = [
"aws-sdk-core"
"aws-sdk-kms"
"aws-sigv4"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0zpww3lxpjg8smmznz2nbx5hrpnkzflbasllxjwprkqr56rrrjap";
type = "gem";
};
version = "1.166.0";
};
aws-sigv4 = {
dependencies = [ "aws-eventstream" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "176zh13m1vhwgys0drlqiw79ljmmx84vva036shsb7rzr4yi36qm";
type = "gem";
};
version = "1.10.0";
};
cfn-model = {
dependencies = [
"kwalify"
"psych"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1b3ix36yfnfwyxb4w9ss8a7nc6w15m1wbj3q8rarsqjrs3xj6wjs";
type = "gem";
};
version = "0.6.6";
};
cfn-nag = {
dependencies = [
"aws-sdk-s3"
"cfn-model"
"lightly"
"logging"
"netaddr"
"optimist"
"rexml"
];
groups = [ "default" ];
platforms = [ ];
source = {
path = ./.;
type = "path";
};
version = "0.8.10";
};
diff-lcs = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7";
type = "gem";
};
version = "1.5.1";
};
docile = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "07pj4z3h8wk4fgdn6s62vw1lwvhj0ac0x10vfbdkr9xzk7krn5cn";
type = "gem";
};
version = "1.4.1";
};
jmespath = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393";
type = "gem";
};
version = "1.6.2";
};
json = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q";
type = "gem";
};
version = "2.7.2";
};
kwalify = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ngxg3ysq5vip9dn3d32ajc7ly61kdin86hfycm1hkrcvkkn1vjf";
type = "gem";
};
version = "0.7.2";
};
language_server-protocol = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x";
type = "gem";
};
version = "3.17.0.3";
};
lightly = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0sgj2r6j7qxb9vqzkx5isjbphi38rplk4h8838am0cjcpq5h3jb3";
type = "gem";
};
version = "0.3.3";
};
little-plugger = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
type = "gem";
};
version = "1.1.4";
};
logging = {
dependencies = [
"little-plugger"
"multi_json"
];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
type = "gem";
};
version = "2.2.2";
};
multi_json = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
type = "gem";
};
version = "1.15.0";
};
netaddr = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1d7iccg9cjcsfl0fd0iiqfc5s7yh2602dgscbji5lrn2q879ghz7";
type = "gem";
};
version = "2.0.6";
};
optimist = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk";
type = "gem";
};
version = "3.0.1";
};
parallel = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq";
type = "gem";
};
version = "1.26.3";
};
parser = {
dependencies = [
"ast"
"racc"
];
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1cqs31cyg2zp8yx2zzm3zkih0j93q870wasbviy2w343nxqvn3pk";
type = "gem";
};
version = "3.3.5.0";
};
psych = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "186i2hc6sfvg4skhqf82kxaf4mb60g65fsif8w8vg1hc9mbyiaph";
type = "gem";
};
version = "3.3.4";
};
racc = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
type = "gem";
};
version = "1.8.1";
};
rainbow = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
type = "gem";
};
version = "3.1.1";
};
rake = {
groups = [ "development" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
type = "gem";
};
version = "13.2.1";
};
regexp_parser = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0ik40vcv7mqigsfpqpca36hpmnx0536xa825ai5qlkv3mmkyf9ss";
type = "gem";
};
version = "2.9.2";
};
rexml = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0rr145mvjgc4n28lfy0gw87aw3ab680h83bdi5i102ik8mixk3zn";
type = "gem";
};
version = "3.3.8";
};
rspec = {
dependencies = [
"rspec-core"
"rspec-expectations"
"rspec-mocks"
];
groups = [ "development" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l";
type = "gem";
};
version = "3.13.0";
};
rspec-core = {
dependencies = [ "rspec-support" ];
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0s688wfw77fjldzayvczg8bgwcgh6bh552dw7qcj1rhjk3r4zalx";
type = "gem";
};
version = "3.13.1";
};
rspec-expectations = {
dependencies = [
"diff-lcs"
"rspec-support"
];
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf";
type = "gem";
};
version = "3.13.3";
};
rspec-mocks = {
dependencies = [
"diff-lcs"
"rspec-support"
];
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88";
type = "gem";
};
version = "3.13.1";
};
rspec-support = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8";
type = "gem";
};
version = "3.13.1";
};
rubocop = {
dependencies = [
"json"
"language_server-protocol"
"parallel"
"parser"
"rainbow"
"regexp_parser"
"rubocop-ast"
"ruby-progressbar"
"unicode-display_width"
];
groups = [ "development" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1rsyxrl647bz49gpa4flh8igg6wy7qxyh2jrp01x0kqnn5iw4y86";
type = "gem";
};
version = "1.66.1";
};
rubocop-ast = {
dependencies = [ "parser" ];
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "03zywfpm4540q6hw8srhi8pzp0gg51w65ir8jkaw58vk3j31w820";
type = "gem";
};
version = "1.32.3";
};
ruby-progressbar = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40";
type = "gem";
};
version = "1.13.0";
};
simplecov = {
dependencies = [
"docile"
"simplecov-html"
"simplecov_json_formatter"
];
groups = [ "development" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py";
type = "gem";
};
version = "0.22.0";
};
simplecov-html = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx";
type = "gem";
};
version = "0.13.1";
};
simplecov_json_formatter = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j";
type = "gem";
};
version = "0.1.4";
};
unicode-display_width = {
groups = [
"default"
"development"
];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
type = "gem";
};
version = "2.6.0";
};
}

View file

@ -1,19 +1,24 @@
{ lib, bundlerEnv, bundlerUpdateScript, ruby }: {
lib,
bundlerEnv,
bundlerUpdateScript,
ruby,
}:
bundlerEnv { bundlerEnv {
pname = "cfn-nag"; pname = "cfn-nag";
version = "0.8.9"; version = "0.8.10";
inherit ruby; inherit ruby;
gemdir = ./.; gemdir = ./.;
passthru.updateScript = bundlerUpdateScript "cfn-nag"; passthru.updateScript = bundlerUpdateScript "cfn-nag";
meta = with lib; { meta = {
description = "Linting tool for CloudFormation templates"; description = "Linting tool for CloudFormation templates";
homepage = "https://github.com/stelligent/cfn_nag"; homepage = "https://github.com/stelligent/cfn_nag";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ ]; maintainers = with lib.maintainers; [ momeemt ];
platforms = platforms.unix; platforms = lib.platforms.unix;
}; };
} }

View file

@ -0,0 +1,44 @@
{
lib,
fetchFromGitHub,
perl,
perlPackages,
}:
perlPackages.buildPerlPackage {
pname = "cope";
version = "0-unstable-2024-03-27";
src = fetchFromGitHub {
owner = "deftdawg";
repo = "cope";
rev = "ad0c1ebec5684f5ec3e8becf348414292c489175";
hash = "sha256-LMAir7tUkjHtKz+KME/Raa9QHGN1g0bzr56fNxfURQY=";
};
buildInputs = with perlPackages; [
EnvPath
FileShareDir
IOPty
IOStty
ListMoreUtils
RegexpCommon
RegexpIPv6
];
postInstall = ''
mkdir -p $out/bin
mv $out/${perlPackages.perl.libPrefix}/${perlPackages.perl.version}/auto/share/dist/Cope/* $out/bin/
rm -r $out/${perlPackages.perl.libPrefix}/${perlPackages.perl.version}/auto
'';
meta = {
description = "A colourful wrapper for terminal programs";
homepage = "https://github.com/deftdawg/cope";
license = with lib.licenses; [
artistic1
gpl1Plus
];
maintainers = with lib.maintainers; [ deftdawg ];
};
}

View file

@ -12,6 +12,7 @@
, libpng , libpng
, libsForQt5 , libsForQt5
, libtiff , libtiff
, llvmPackages
, ninja , ninja
, nix-update-script , nix-update-script
, openexr , openexr
@ -79,7 +80,9 @@ stdenv.mkDerivation (finalAttrs: {
] ++ (with libsForQt5; [ ] ++ (with libsForQt5; [
qtbase qtbase
qttools qttools
]) ++ variants.${variant}.extraDeps; ]) ++ lib.optionals stdenv.cc.isClang [
llvmPackages.openmp
] ++ variants.${variant}.extraDeps;
postPatch = '' postPatch = ''
patchShebangs \ patchShebangs \

View file

@ -13,9 +13,12 @@
, gnused , gnused
, graphicsmagick , graphicsmagick
, jq , jq
, libX11
, libXext
, libjpeg , libjpeg
, libpng , libpng
, libtiff , libtiff
, llvmPackages
, ninja , ninja
, opencv , opencv
, openexr , openexr
@ -55,18 +58,24 @@ stdenv.mkDerivation (finalAttrs: {
cimg cimg
fftw fftw
graphicsmagick graphicsmagick
libX11
libXext
libjpeg libjpeg
libpng libpng
libtiff libtiff
opencv opencv
openexr openexr
zlib zlib
] ++ lib.optionals stdenv.cc.isClang [
llvmPackages.openmp
]; ];
cmakeFlags = [ cmakeFlags = [
(lib.cmakeBool "BUILD_LIB_STATIC" false) (lib.cmakeBool "BUILD_LIB_STATIC" false)
(lib.cmakeBool "ENABLE_CURL" false) (lib.cmakeBool "ENABLE_CURL" false)
(lib.cmakeBool "ENABLE_DYNAMIC_LINKING" true) (lib.cmakeBool "ENABLE_DYNAMIC_LINKING" true)
(lib.cmakeBool "ENABLE_OPENCV" true)
(lib.cmakeBool "ENABLE_XSHM" true)
(lib.cmakeBool "USE_SYSTEM_CIMG" true) (lib.cmakeBool "USE_SYSTEM_CIMG" true)
]; ];

View file

@ -105,13 +105,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "hercules"; pname = "hercules";
version = "4.6"; version = "4.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SDL-Hercules-390"; owner = "SDL-Hercules-390";
repo = "hyperion"; repo = "hyperion";
rev = "Release_${version}"; rev = "Release_${version}";
hash = "sha256-ZhMTun6tmTsmIiFPTRFudwRXzWydrih61RsLyv0p24U="; hash = "sha256-5Kvs2OWQrlsRZpmx7vet8GCky5xAISBNAqn+NHgicOM";
}; };
postPatch = '' postPatch = ''

View file

@ -2,29 +2,33 @@
lib, lib,
buildGoModule, buildGoModule,
fetchFromGitLab, fetchFromGitLab,
}: let nix-update-script,
version = "1.1"; }:
let
version = "1.2";
in in
buildGoModule { buildGoModule {
pname = "invidious-router"; pname = "invidious-router";
inherit version; inherit version;
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gaincoder"; owner = "gaincoder";
repo = "invidious-router"; repo = "invidious-router";
rev = version; rev = "refs/tags/${version}";
hash = "sha256-t8KQqMPkBbVis1odDcSu+H0uvyvoFqCmtWoHqVRxmfc="; hash = "sha256-YcMtZq4VMHr6XqHcsAAEmMF6jF1j1wb7Lq4EK42QAEo=";
}; };
vendorHash = "sha256-c03vYidm8SkoesRVQZdg/bCp9LIpdTmpXdfwInlHBKk="; vendorHash = "sha256-c03vYidm8SkoesRVQZdg/bCp9LIpdTmpXdfwInlHBKk=";
doCheck = true; passthru.updateScript = nix-update-script { };
meta = { doCheck = true;
homepage = "https://gitlab.com/gaincoder/invidious-router";
description = "Go application that routes requests to different Invidious instances based on their health status and (optional) response time"; meta = {
license = with lib.licenses; [mit]; homepage = "https://gitlab.com/gaincoder/invidious-router";
maintainers = with lib.maintainers; [sils]; description = "Go application that routes requests to different Invidious instances based on their health status and (optional) response time";
mainProgram = "invidious-router"; license = with lib.licenses; [ mit ];
}; maintainers = with lib.maintainers; [ sils ];
} mainProgram = "invidious-router";
};
}

View file

@ -1,31 +1,48 @@
{ lib, buildGoModule, fetchFromGitHub }: {
lib,
buildGo123Module,
fetchFromGitHub,
}:
buildGoModule rec { buildGo123Module rec {
pname = "kubelogin"; pname = "kubelogin";
version = "1.30.0"; version = "1.30.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "int128"; owner = "int128";
repo = pname; repo = "kubelogin";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-DHg46t0gMypK6Nj428gpOMtPuA+XcW4IJU39CHTVGPw="; hash = "sha256-aoLPT3lX+q426QlxAPsjeQyTZMnmqMGh85jJPU7lQVU=";
}; };
subPackages = ["."]; subPackages = [ "." ];
ldflags = [
"-s"
"-w"
"-X main.version=v${version}"
];
vendorHash = "sha256-gr+SsC7MiLj/MZ8kca5Hcfge+7Pm4y963TfwyKHEhBY="; vendorHash = "sha256-gr+SsC7MiLj/MZ8kca5Hcfge+7Pm4y963TfwyKHEhBY=";
# test all packages
preCheck = ''
unset subPackages
'';
# Rename the binary instead of symlinking to avoid conflict with the # Rename the binary instead of symlinking to avoid conflict with the
# Azure version of kubelogin # Azure version of kubelogin
postInstall = '' postInstall = ''
mv $out/bin/kubelogin $out/bin/kubectl-oidc_login mv $out/bin/kubelogin $out/bin/kubectl-oidc_login
''; '';
meta = with lib; { meta = {
description = "Kubernetes credential plugin implementing OpenID Connect (OIDC) authentication"; description = "Kubernetes credential plugin implementing OpenID Connect (OIDC) authentication";
mainProgram = "kubectl-oidc_login"; mainProgram = "kubectl-oidc_login";
inherit (src.meta) homepage; inherit (src.meta) homepage;
license = licenses.asl20; license = lib.licenses.asl20;
maintainers = with maintainers; [ benley ]; maintainers = with lib.maintainers; [
benley
nevivurn
];
}; };
} }

View file

@ -0,0 +1,72 @@
{
lib,
fetchurl,
libtool,
openssh,
pkg-config,
qt5,
rsync,
stdenv,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "luckybackup";
version = "0.5.0";
src = fetchurl {
url = "mirror://sourceforge/project/luckybackup/${finalAttrs.version}/source/luckybackup-${finalAttrs.version}.tar.gz";
hash = "sha256-6AGvJIPL3WK8mvji3tJSxRrbrYFILikQQvWOIcPUkls=";
};
outputs = [
"out"
"doc"
"man"
];
nativeBuildInputs = [
libtool
pkg-config
qt5.qmake
qt5.wrapQtAppsHook
];
buildInputs = [
rsync
openssh
];
strictDeps = true;
prePatch = ''
for File in \
luckybackup.pro \
menu/luckybackup-pkexec \
menu/luckybackup-su.desktop \
menu/luckybackup.desktop \
menu/net.luckybackup.su.policy \
src/functions.cpp \
src/global.cpp \
src/scheduleDialog.cpp; do
substituteInPlace $File --replace "/usr" "$out"
done
'';
meta = {
homepage = "https://luckybackup.sourceforge.net/";
description = "Powerful, fast and reliable backup & sync tool";
longDescription = ''
luckyBackup is an application for data back-up and synchronization
powered by the rsync tool.
It is simple to use, fast (transfers over only changes made and not
all data), safe (keeps your data safe by checking all declared directories
before proceeding in any data manipulation), reliable and fully
customizable.
'';
license = lib.licenses.gpl3Plus;
mainProgram = "luckybackup";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.linux;
};
})

View file

@ -12,13 +12,13 @@
}: }:
buildDotnetModule rec { buildDotnetModule rec {
pname = "lumafly"; pname = "lumafly";
version = "3.2.0.0"; version = "3.3.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TheMulhima"; owner = "TheMulhima";
repo = "lumafly"; repo = "lumafly";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-oDSM5Ev9SCjbvCgDZcpzm2bVnzG04yy/WaSwJyh0b18="; hash = "sha256-GVPMAwxbq9XlKjMKd9G5yUol42f+6lSyHukN7NMCVDA=";
}; };
projectFile = "Lumafly/Lumafly.csproj"; projectFile = "Lumafly/Lumafly.csproj";

View file

@ -0,0 +1,48 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
python3,
colors ? [ "all" ], # Default to install all available colors
additionalInstallationTweaks ? [ ], # Additional installation tweaks
}:
assert lib.assertMsg (colors != [ ]) "The `colors` list can not be empty";
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "marble-shell-theme";
version = "46.2.3";
src = fetchFromGitHub {
owner = "imarkoff";
repo = "Marble-shell-theme";
rev = "5971b15d8115c60c3a16b1d219ecffd2cfcdb323";
hash = "sha256-TX6BSS29EAi2PjL1fMvEKD12RjB9xrfqPSQsJJrUcJg=";
};
nativeBuildInputs = [ python3 ];
patchPhase = ''
runHook prePatch
substituteInPlace scripts/config.py \
--replace-fail "~/.themes" ".themes"
runHook postPatch
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes
python install.py ${
lib.escapeShellArgs (map (color: "--${color}") colors)
} ${lib.escapeShellArgs additionalInstallationTweaks}
cp -r .themes/* $out/share/themes/
runHook postInstall
'';
meta = {
description = "Shell theme for GNOME DE";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
homepage = "https://github.com/imarkoff/Marble-shell-theme";
changelog = "https://github.com/imarkoff/Marble-shell-theme/releases/tag/${finalAttrs.version}";
maintainers = with lib.maintainers; [ aucub ];
};
})

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "marwaita-red"; pname = "marwaita-red";
version = "21"; version = "22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "darkomarko42"; owner = "darkomarko42";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-VCNwWtAzMORF+gXjcLhJCsmllGD2xGgRSS3WxaVoRfU="; hash = "sha256-oUJ74MNAFbbM123v7i+b29UEFFumswPI3DmqeeahMd4=";
}; };
buildInputs = [ buildInputs = [

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "marwaita-teal"; pname = "marwaita-teal";
version = "21"; version = "22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "darkomarko42"; owner = "darkomarko42";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-9WH/mbnLLLAf8B5Fwd7PMRAX2psWVJn7gGO4C5KkLjM="; hash = "sha256-aSzeF4winpea21gADa/HT+a+FZ4Ykrpue/ePmveJU8E=";
}; };
buildInputs = [ buildInputs = [

View file

@ -1,18 +1,19 @@
{ lib {
, mkDerivation lib,
, fetchFromGitHub stdenv,
, qmake fetchFromGitHub,
libsForQt5,
}: }:
mkDerivation { stdenv.mkDerivation (finalAttrs: {
pname = "mathmod"; pname = "mathmod";
version = "11.1-unstable-2024-01-26"; version = "12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "parisolab"; owner = "parisolab";
repo = "mathmod"; repo = "mathmod";
rev = "24d03a04c17363520ae7cf077e72a7b8684eb6fd"; rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-HiqHssPGqYEVZWchZRj4rFPc+xNVZk1ryl5qvFC2BmQ="; hash = "sha256-h1iI7bheJVfE2+0m6Yk7QNCkl9Vye97tqb/WkQExVcQ=";
}; };
patches = [ ./fix-paths.patch ]; patches = [ ./fix-paths.patch ];
@ -21,9 +22,13 @@ mkDerivation {
substituteInPlace MathMod.pro --subst-var out substituteInPlace MathMod.pro --subst-var out
''; '';
nativeBuildInputs = [ qmake ]; nativeBuildInputs = with libsForQt5; [
qmake
wrapQtAppsHook
];
meta = { meta = {
changelog = "https://github.com/parisolab/mathmod/releases/tag/${finalAttrs.version}";
description = "Mathematical modelling software"; description = "Mathematical modelling software";
homepage = "https://github.com/parisolab/mathmod"; homepage = "https://github.com/parisolab/mathmod";
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
@ -31,4 +36,4 @@ mkDerivation {
maintainers = with lib.maintainers; [ tomasajt ]; maintainers = with lib.maintainers; [ tomasajt ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} })

View file

@ -38,13 +38,13 @@ let
in in
php.buildComposerProject (finalAttrs: { php.buildComposerProject (finalAttrs: {
pname = "movim"; pname = "movim";
version = "0.27.1"; version = "0.28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "movim"; owner = "movim";
repo = "movim"; repo = "movim";
rev = "refs/tags/v${finalAttrs.version}"; rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-7/8d+GU/hLaiFqo4Rl0ardhOwEpSeJ3GfJMNpGbNlnU="; hash = "sha256-mjBeBu1seH5XMls+e4ON13ayVeugKogbNTzbjp1pUjE=";
}; };
php = php.buildEnv ({ php = php.buildEnv ({
@ -67,7 +67,7 @@ php.buildComposerProject (finalAttrs: {
# pinned commonmark # pinned commonmark
composerStrictValidation = false; composerStrictValidation = false;
vendorHash = "sha256-wDnOh1CdJOovqmr4k45ksycuylYwL0Dm/UTl4EETf1k="; vendorHash = "sha256-ZfMUpkIRCAsiQf6PEVPrMpljZWjP9JXf+nEFA/LunsQ=";
postPatch = '' postPatch = ''
# Our modules are already wrapped, removes missing *.so warnings; # Our modules are already wrapped, removes missing *.so warnings;

View file

@ -1,4 +1,5 @@
{ {
_experimental-update-script-combinators,
buildGoModule, buildGoModule,
cargo, cargo,
cmake, cmake,
@ -9,6 +10,7 @@
libgcrypt, libgcrypt,
libgpg-error, libgpg-error,
libsecret, libsecret,
nix-update-script,
pkg-config, pkg-config,
python3, python3,
qt6, qt6,
@ -20,27 +22,26 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mozillavpn"; pname = "mozillavpn";
version = "2.24.0"; version = "2.24.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mozilla-mobile"; owner = "mozilla-mobile";
repo = "mozilla-vpn-client"; repo = "mozilla-vpn-client";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-iTnwx+KPZ5b8qT0fEMUCGQx1UyGVM4VCzooZqslGWtw="; hash = "sha256-X2rtHAZ9vbWjuOmD3B/uPasUQ1Q+b4SkNqk4MqGMaYo=";
}; };
patches = [ ]; patches = [ ];
netfilterGoModules = netfilter = buildGoModule {
(buildGoModule { pname = "${finalAttrs.pname}-netfilter";
inherit (finalAttrs) inherit (finalAttrs)
pname version
version src
src patches
patches ;
; modRoot = "linux/netfilter";
modRoot = "linux/netfilter"; vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8=";
vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; };
}).goModules;
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) src patches; inherit (finalAttrs) src patches;
@ -83,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace extension/CMakeLists.txt \ substituteInPlace extension/CMakeLists.txt \
--replace '/etc' "$out/etc" --replace '/etc' "$out/etc"
ln -s '${finalAttrs.netfilterGoModules}' linux/netfilter/vendor ln -s '${finalAttrs.netfilter.goModules}' linux/netfilter/vendor
''; '';
cmakeFlags = [ cmakeFlags = [
@ -100,6 +101,14 @@ stdenv.mkDerivation (finalAttrs: {
(lib.makeBinPath [ wireguard-tools ]) (lib.makeBinPath [ wireguard-tools ])
]; ];
passthru.updateScript = _experimental-update-script-combinators.sequence [
(nix-update-script { })
(nix-update-script {
attrPath = "mozillavpn.netfilter";
extraArgs = [ "--version=skip" ];
})
];
meta = { meta = {
description = "Client for the Mozilla VPN service"; description = "Client for the Mozilla VPN service";
mainProgram = "mozillavpn"; mainProgram = "mozillavpn";

View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "notcurses"; pname = "notcurses";
version = "3.0.9"; version = "3.0.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dankamongmen"; owner = "dankamongmen";
repo = "notcurses"; repo = "notcurses";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-8SJeqLcV4xp968YgGsJccsgpB5wwaJDaoWsaYxf8upM="; sha256 = "sha256-3ddiHzPZ74GN2Hu+6Oe1DaNFn6S9gegGwXSX8fbtPp8=";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View file

@ -111,7 +111,7 @@ clangStdenv.mkDerivation (finalAttrs: {
"-DSuil_INCLUDE_DIR=${suil}/include/suil-0" "-DSuil_INCLUDE_DIR=${suil}/include/suil-0"
]; ];
# Needed for libraries that get dlopen'd # Needed for libraries that get dlopen'd
env.NIX_LDFLAGS = toString [ env.NIX_LDFLAGS = toString [
"-lasound" "-lasound"
"-llilv-0" "-llilv-0"

View file

@ -8,11 +8,11 @@
}: }:
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-pass"; pname = "proton-pass";
version = "1.22.1"; version = "1.23.0";
src = fetchurl { src = fetchurl {
url = "https://proton.me/download/PassDesktop/linux/x64/ProtonPass_${finalAttrs.version}.deb"; url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
hash = "sha256-DIA54xxJ8Nhh8wb4p13yjdenqgTgenAH4Tmbqk3IXwo="; hash = "sha256-ewrPk3v1jgF87uY+7P8oQdWARcuFKdfiM1BzulMPBpg=";
}; };
dontConfigure = true; dontConfigure = true;

View file

@ -0,0 +1,143 @@
{
lib,
addDriverRunpath,
autoconf,
automake,
bison,
cmake,
fetchFromGitHub,
libXdmcp,
libglvnd,
libpthreadstubs,
makeWrapper,
nix-update-script,
pcre,
pkg-config,
python311Packages,
qt5,
stdenv,
vulkan-loader,
wayland,
# Boolean flags
waylandSupport ? true,
}:
let
custom_swig = fetchFromGitHub {
owner = "baldurk";
repo = "swig";
rev = "renderdoc-modified-7";
hash = "sha256-RsdvxBBQvwuE5wSwL8OBXg5KMSpcO6EuMS0CzWapIpc=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "renderdoc";
version = "1.35";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "v${finalAttrs.version}";
hash = "sha256-iBe3JNtG9P1IAd00s/fL2RcImMrTwruld98OFHrIhp4=";
};
outputs = [
"out"
"dev"
"doc"
];
buildInputs =
[
libXdmcp
libpthreadstubs
python311Packages.pyside2
python311Packages.pyside2-tools
python311Packages.shiboken2
qt5.qtbase
qt5.qtsvg
vulkan-loader
]
++ lib.optionals waylandSupport [
wayland
];
nativeBuildInputs = [
addDriverRunpath
autoconf
automake
bison
cmake
makeWrapper
pcre
pkg-config
python311Packages.python
qt5.qtx11extras
qt5.wrapQtAppsHook
];
cmakeFlags = [
(lib.cmakeFeature "BUILD_VERSION_HASH" finalAttrs.src.rev)
(lib.cmakeFeature "BUILD_VERSION_DIST_NAME" "NixOS")
(lib.cmakeFeature "BUILD_VERSION_DIST_VER" finalAttrs.version)
(lib.cmakeFeature "BUILD_VERSION_DIST_CONTACT" "https://github.com/NixOS/nixpkgs/")
(lib.cmakeBool "BUILD_VERSION_STABLE" true)
(lib.cmakeBool "ENABLE_WAYLAND" waylandSupport)
];
dontWrapQtApps = true;
strictDeps = true;
postUnpack = ''
cp -r ${custom_swig} swig
chmod -R +w swig
patchShebangs swig/autogen.sh
'';
# TODO: define these in the above array via placeholders, once those are
# widely supported
preConfigure = ''
cmakeFlagsArray+=(
"-DRENDERDOC_SWIG_PACKAGE=$PWD/../swig"
"-DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/"
)
'';
preFixup =
let
libPath = lib.makeLibraryPath [
libglvnd
vulkan-loader
];
in
''
wrapQtApp $out/bin/qrenderdoc \
--suffix LD_LIBRARY_PATH : "$out/lib:${libPath}"
wrapProgram $out/bin/renderdoccmd \
--suffix LD_LIBRARY_PATH : "$out/lib:${libPath}"
'';
# The only documentation for this so far is in the setup-hook.sh script from
# add-opengl-runpath
postFixup = ''
addDriverRunpath $out/lib/librenderdoc.so
'';
passthru.updateScript = nix-update-script { };
meta = {
homepage = "https://renderdoc.org/";
description = "Single-frame graphics debugger";
longDescription = ''
RenderDoc is a free MIT licensed stand-alone graphics debugger that
allows quick and easy single-frame capture and detailed introspection
of any application using Vulkan, D3D11, OpenGL or D3D12 across
Windows 7 - 10, Linux or Android.
'';
license = lib.licenses.mit;
mainProgram = "renderdoccmd";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.i686);
};
})

View file

@ -18,14 +18,14 @@
}: }:
let let
version = "0.27.2"; version = "0.27.4";
rev = "electron-v${version}-tetrio-v${tetrio-desktop.version}"; rev = "electron-v${version}-tetrio-v${tetrio-desktop.version}";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "UniQMG"; owner = "UniQMG";
repo = "tetrio-plus"; repo = "tetrio-plus";
inherit rev; inherit rev;
hash = "sha256-pcT8/YsfHeimSkeNziW9ha63hEgCg2vnvJSZAY1c7P0="; hash = "sha256-HwGFg8dxqtqghdP+PXWXr6Fi5vfgopThs+QNa3N1awk=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -41,7 +41,7 @@ let
sourceRoot = "${src.name}/tpsecore"; sourceRoot = "${src.name}/tpsecore";
cargoHash = "sha256-K9l8wQOtjf3l8gZMMdVnaNrgzVWGl62iBBcpA+ulJbw="; cargoHash = "sha256-zqeoPeGZvSz7W3c7MXnvvq73hvavg1RGzPc3iTqAjBo=";
nativeBuildInputs = [ nativeBuildInputs = [
wasm-pack wasm-pack

3231
pkgs/by-name/ws/wstunnel/Cargo.lock generated Normal file

File diff suppressed because it is too large Load diff

View file

@ -10,7 +10,7 @@
}: }:
let let
version = "10.1.1"; version = "10.1.3";
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
@ -21,10 +21,15 @@ rustPlatform.buildRustPackage {
owner = "erebe"; owner = "erebe";
repo = "wstunnel"; repo = "wstunnel";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-qEWIyQkLRrmTH40S96hj8JXFz/VJChIbg8qEQc938nI="; hash = "sha256-mrCDx9f+EeA6McRc1s9YwYL4RHKSla10fxXZc1WYPio=";
}; };
cargoHash = "sha256-3b+pX/qQuhOY1OYr+CfT5wtiJcEJ8CJJsQZ4QOcYv74="; cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"fastwebsockets-0.8.0" = "sha256-eqtCh9fMOG2uvL/GLUVXNiSB+ovYLc/Apuq9zssn8hU=";
};
};
nativeBuildInputs = [ versionCheckHook ]; nativeBuildInputs = [ versionCheckHook ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

View file

@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
Taking a strong influence from ATF's classic Spartan family, we're Taking a strong influence from ATF's classic Spartan family, we're
starting our own family out with a single strong weight. We've put a few starting our own family out with a single strong weight. We've put a few
unique touches into a beautiful, historical typeface, and made sure to unique touches into a beautiful, historical typeface, and made sure to
include an extensive characterset  currently totaling over 300 glyphs. include an extensive characterset currently totaling over 300 glyphs.
Over time, the open-source license will allow us expand League Spartan Over time, the open-source license will allow us expand League Spartan
into a full family, with multiple weights and styles, and we're starting into a full family, with multiple weights and styles, and we're starting

View file

@ -124,6 +124,12 @@ let
# jni.h expects jni_md.h to be in the header search path. # jni.h expects jni_md.h to be in the header search path.
ln -sf $out/include/linux/*_md.h $out/include/ ln -sf $out/include/linux/*_md.h $out/include/
mkdir -p $out/share
# move files in $out like LICENSE.txt
find $out/ -maxdepth 1 -type f -exec mv {} $out/share \;
# symbolic link to $out/lib/svm/LICENSE_NATIVEIMAGE.txt
rm -f $out/LICENSE_NATIVEIMAGE.txt
# copy-paste openjdk's preFixup # copy-paste openjdk's preFixup
# Set JAVA_HOME automatically. # Set JAVA_HOME automatically.
mkdir -p $out/nix-support mkdir -p $out/nix-support

View file

@ -93,9 +93,9 @@ in {
major = "3"; major = "3";
minor = "13"; minor = "13";
patch = "0"; patch = "0";
suffix = "rc2"; suffix = "rc3";
}; };
hash = "sha256-1g6LfBDeT3HS3/r3x76O+lTcHlMv6THbuE5fYlcJ4jc="; hash = "sha256-yLx5AYWvHLd7dcAcvBqmQt/c+Xo3DS0QCQvHuqcNpX4=";
inherit (darwin) configd; inherit (darwin) configd;
inherit passthruFun; inherit passthruFun;
}; };

View file

@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
# Disable any integration tests, which need to contact the internet. # Disable any integration tests, which need to contact the internet.
# Also disable the `storage_benchmark_*` tests. # Also disable the `storage_benchmark_*` tests.
# With Protobuf < 23.x they require -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=ON. # With Protobuf < 23.x they require -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=ON.
# With Protobuf >= 23.x they require They require setting -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=OFF # With Protobuf >= 23.x they require They require setting -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=OFF
ctest --label-exclude integration-test --exclude-regex storage_benchmarks_ ctest --label-exclude integration-test --exclude-regex storage_benchmarks_
runHook postInstallCheck runHook postInstallCheck

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jbigkit"; pname = "jbigkit";
@ -9,6 +9,19 @@ stdenv.mkDerivation rec {
sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy";
}; };
patches = [
# Archlinux patch: this helps users to reduce denial-of-service risks, as in CVE-2017-9937
(fetchpatch {
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0013-new-jbig.c-limit-s-maxmem-maximum-decoded-image-size.patch";
hash = "sha256-Yq5qCTF7KZTrm4oeWbpctb+QLt3shJUGEReZvd0ey9k=";
})
# Archlinux patch: fix heap overflow
(fetchpatch {
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0015-jbg_newlen-check-for-end-of-file-within-MARKER_NEWLE.patch";
hash = "sha256-F3qA/btR9D9NfzrNY76X4Z6vG6NrisI36SjCDjS+F5s=";
})
];
makeFlags = [ makeFlags = [
"CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" "AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"

View file

@ -4,6 +4,7 @@
php, php,
pcre2, pcre2,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
}: }:
let let
@ -22,6 +23,14 @@ buildPecl {
buildInputs = [ pcre2 ]; buildInputs = [ pcre2 ];
patches = [
# Allow building for PHP 8.4
(fetchpatch {
url = "https://github.com/krakjoe/pcov/commit/7d764c7c2555e8287351961d72be3ebec4d8743f.patch";
sha256 = "sha256-5wIHrrCwUXQpPdUg+3Kwyop5yvOzQQ3qc4pQXU8q2OM=";
})
];
meta = with lib; { meta = with lib; {
changelog = "https://github.com/krakjoe/pcov/releases/tag/v${version}"; changelog = "https://github.com/krakjoe/pcov/releases/tag/v${version}";
description = "Self contained php-code-coverage compatible driver for PHP"; description = "Self contained php-code-coverage compatible driver for PHP";

View file

@ -113,7 +113,7 @@ buildPythonPackage rec {
++ lib.optionals (stdenv.hostPlatform.isDarwin) [ ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
# works locally on APFS, fails on hydra with AssertionError comparing timestamps # works locally on APFS, fails on hydra with AssertionError comparing timestamps
# darwin hydra builder uses HFS+ and has only one second timestamp resolution # darwin hydra builder uses HFS+ and has only one second timestamp resolution
# this two tests however, assume nanosecond resolution # this two tests however, assume nanosecond resolution
"test_modified" "test_modified"
"test_touch" "test_touch"
# tries to access /home, ignores $HOME # tries to access /home, ignores $HOME

View file

@ -19,7 +19,8 @@
packaging, packaging,
rich, rich,
tensorflow, tensorflow,
tf-keras, pythonAtLeast,
distutils,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -52,8 +53,7 @@ buildPythonPackage rec {
packaging packaging
rich rich
tensorflow tensorflow
tf-keras ] ++ lib.optionals (pythonAtLeast "3.12") [ distutils ];
];
pythonImportsCheck = [ pythonImportsCheck = [
"keras" "keras"

View file

@ -40,7 +40,7 @@ let
torchvision torchvision
effdet effdet
]; ];
# paddledetection = [ paddlepaddle ] # paddledetection = [ paddlepaddle ]
}; };
in in
buildPythonPackage { buildPythonPackage {

View file

@ -21,9 +21,9 @@ dependencies = [
[[package]] [[package]]
name = "async-trait" name = "async-trait"
version = "0.1.82" version = "0.1.83"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -32,9 +32,9 @@ dependencies = [
[[package]] [[package]]
name = "autocfg" name = "autocfg"
version = "1.3.0" version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
@ -71,9 +71,9 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]] [[package]]
name = "dashmap" name = "dashmap"
version = "6.0.1" version = "6.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"crossbeam-utils", "crossbeam-utils",
@ -161,9 +161,9 @@ dependencies = [
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.158" version = "0.2.159"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
[[package]] [[package]]
name = "lock_api" name = "lock_api"
@ -198,15 +198,18 @@ dependencies = [
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.19.0" version = "1.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
dependencies = [
"portable-atomic",
]
[[package]] [[package]]
name = "parking" name = "parking"
version = "2.2.0" version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]] [[package]]
name = "parking_lot_core" name = "parking_lot_core"
@ -229,9 +232,9 @@ checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
[[package]] [[package]]
name = "portable-atomic" name = "portable-atomic"
version = "1.7.0" version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
@ -244,7 +247,7 @@ dependencies = [
[[package]] [[package]]
name = "pycrdt" name = "pycrdt"
version = "0.9.11" version = "0.9.15"
dependencies = [ dependencies = [
"pyo3", "pyo3",
"yrs", "yrs",
@ -252,9 +255,9 @@ dependencies = [
[[package]] [[package]]
name = "pyo3" name = "pyo3"
version = "0.22.2" version = "0.22.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" checksum = "15ee168e30649f7f234c3d49ef5a7a6cbf5134289bc46c29ff3155fa3221c225"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"indoc", "indoc",
@ -270,9 +273,9 @@ dependencies = [
[[package]] [[package]]
name = "pyo3-build-config" name = "pyo3-build-config"
version = "0.22.2" version = "0.22.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" checksum = "e61cef80755fe9e46bb8a0b8f20752ca7676dcc07a5277d8b7768c6172e529b3"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"target-lexicon", "target-lexicon",
@ -280,9 +283,9 @@ dependencies = [
[[package]] [[package]]
name = "pyo3-ffi" name = "pyo3-ffi"
version = "0.22.2" version = "0.22.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" checksum = "67ce096073ec5405f5ee2b8b31f03a68e02aa10d5d4f565eca04acc41931fa1c"
dependencies = [ dependencies = [
"libc", "libc",
"pyo3-build-config", "pyo3-build-config",
@ -290,9 +293,9 @@ dependencies = [
[[package]] [[package]]
name = "pyo3-macros" name = "pyo3-macros"
version = "0.22.2" version = "0.22.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" checksum = "2440c6d12bc8f3ae39f1e775266fa5122fd0c8891ce7520fa6048e683ad3de28"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"pyo3-macros-backend", "pyo3-macros-backend",
@ -302,9 +305,9 @@ dependencies = [
[[package]] [[package]]
name = "pyo3-macros-backend" name = "pyo3-macros-backend"
version = "0.22.2" version = "0.22.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" checksum = "1be962f0e06da8f8465729ea2cb71a416d2257dff56cbe40a70d3e62a93ae5d1"
dependencies = [ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
@ -324,9 +327,9 @@ dependencies = [
[[package]] [[package]]
name = "redox_syscall" name = "redox_syscall"
version = "0.5.3" version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
dependencies = [ dependencies = [
"bitflags", "bitflags",
] ]
@ -345,18 +348,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.209" version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.209" version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -365,9 +368,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.127" version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
dependencies = [ dependencies = [
"itoa", "itoa",
"memchr", "memchr",
@ -392,9 +395,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.77" version = "2.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -409,18 +412,18 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.63" version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
dependencies = [ dependencies = [
"thiserror-impl", "thiserror-impl",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.63" version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -429,9 +432,9 @@ dependencies = [
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"
version = "1.0.12" version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]] [[package]]
name = "unindent" name = "unindent"

View file

@ -3,27 +3,34 @@
stdenv, stdenv,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
# buildInputs
libiconv, libiconv,
# nativeBuildInputs
rustPlatform, rustPlatform,
# tests
anyio, anyio,
objsize, objsize,
pydantic, pydantic,
pytestCheckHook, pytestCheckHook,
trio, trio,
y-py, y-py,
nix-update-script, nix-update-script,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pycrdt"; pname = "pycrdt";
version = "0.9.11"; version = "0.9.15";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jupyter-server"; owner = "jupyter-server";
repo = "pycrdt"; repo = "pycrdt";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-62r3AO+x9du6UjIdtqDPmwJ30/YmQxbPcCXgOaGNtL0="; hash = "sha256-iaFpBD07l1WlC5FNzFxxF5gJS59yAyPmEn/NZg5U0AQ=";
}; };
postPatch = '' postPatch = ''

View file

@ -0,0 +1,82 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
setuptools,
# dependencies
boto3,
importlib-metadata,
jsonschema,
mock,
platformdirs,
pydantic,
pyyaml,
rich,
# optional-dependencies
black,
pandas,
pylint,
pytest,
}:
buildPythonPackage rec {
pname = "sagemaker-core";
version = "1.0.10";
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "sagemaker-core";
rev = "refs/tags/v${version}";
hash = "sha256-UloQJ5B10XXPbwsktVZzjcW7BLW8wCAw3wGmAkSl6wc=";
};
build-system = [
setuptools
];
pythonRelaxDeps = [
"importlib-metadata"
"mock"
];
dependencies = [
boto3
importlib-metadata
jsonschema
mock
platformdirs
pydantic
pyyaml
rich
];
optional-dependencies = {
codegen = [
black
pandas
pylint
pytest
];
};
pythonImportsCheck = [
"sagemaker_core"
];
# Only a single test which fails with:
# ValueError: Must setup local AWS configuration with a region supported by SageMaker.
doCheck = false;
meta = {
description = "Python SDK designed to provide an object-oriented interface for interacting with Amazon SageMaker resources";
homepage = "https://github.com/aws/sagemaker-core";
changelog = "https://github.com/aws/sagemaker-core/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
}

View file

@ -1,47 +1,51 @@
{ {
lib, lib,
buildPythonPackage, buildPythonPackage,
pythonOlder,
fetchFromGitHub, fetchFromGitHub,
fetchpatch, fetchpatch,
setuptools,
# build-system
hatchling,
# dependencies
attrs, attrs,
boto3, boto3,
cloudpickle, cloudpickle,
docker,
google-pasta, google-pasta,
numpy,
protobuf,
smdebug-rulesconfig,
importlib-metadata, importlib-metadata,
jsonschema,
numpy,
packaging, packaging,
pandas, pandas,
pathos, pathos,
schema,
pyyaml,
jsonschema,
platformdirs, platformdirs,
tblib, protobuf,
urllib3,
requests,
docker,
tqdm,
psutil, psutil,
pyyaml,
requests,
sagemaker-core,
schema,
smdebug-rulesconfig,
tblib,
tqdm,
urllib3,
# optional-dependencies
scipy, scipy,
accelerate, accelerate,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "sagemaker"; pname = "sagemaker";
version = "2.224.1"; version = "2.232.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aws"; owner = "aws";
repo = "sagemaker-python-sdk"; repo = "sagemaker-python-sdk";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Kc66sygHGFqMvSY7rACb62wJEJesnN4KDmtYZLIOsqc="; hash = "sha256-I+iZKx1CnZIGYgYuYhhs8BnY84KPyKOGw8M0He26DGU=";
}; };
patches = [ patches = [
@ -58,10 +62,11 @@ buildPythonPackage rec {
]; ];
build-system = [ build-system = [
setuptools hatchling
]; ];
pythonRelaxDeps = [ pythonRelaxDeps = [
"boto3"
"cloudpickle" "cloudpickle"
"importlib-metadata" "importlib-metadata"
]; ];
@ -70,24 +75,25 @@ buildPythonPackage rec {
attrs attrs
boto3 boto3
cloudpickle cloudpickle
docker
google-pasta google-pasta
numpy
protobuf
smdebug-rulesconfig
importlib-metadata importlib-metadata
jsonschema
numpy
packaging packaging
pandas pandas
pathos pathos
schema
pyyaml
jsonschema
platformdirs platformdirs
tblib protobuf
urllib3
requests
docker
tqdm
psutil psutil
pyyaml
requests
sagemaker-core
schema
smdebug-rulesconfig
tblib
tqdm
urllib3
]; ];
doCheck = false; # many test dependencies are not available in nixpkgs doCheck = false; # many test dependencies are not available in nixpkgs
@ -108,11 +114,11 @@ buildPythonPackage rec {
# feature-processor = [ pyspark sagemaker-feature-store-pyspark ]; # not available in nixpkgs # feature-processor = [ pyspark sagemaker-feature-store-pyspark ]; # not available in nixpkgs
}; };
meta = with lib; { meta = {
description = "Library for training and deploying machine learning models on Amazon SageMaker"; description = "Library for training and deploying machine learning models on Amazon SageMaker";
homepage = "https://github.com/aws/sagemaker-python-sdk/"; homepage = "https://github.com/aws/sagemaker-python-sdk/";
changelog = "https://github.com/aws/sagemaker-python-sdk/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/aws/sagemaker-python-sdk/blob/v${version}/CHANGELOG.md";
license = licenses.asl20; license = lib.licenses.asl20;
maintainers = with maintainers; [ nequissimus ]; maintainers = with lib.maintainers; [ nequissimus ];
}; };
} }

View file

@ -1,2 +0,0 @@
source 'https://rubygems.org'
gem 'cfn-nag'

View file

@ -1,51 +0,0 @@
GEM
remote: https://rubygems.org/
specs:
aws-eventstream (1.2.0)
aws-partitions (1.568.0)
aws-sdk-core (3.130.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.55.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.113.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.4.0)
aws-eventstream (~> 1, >= 1.0.2)
cfn-model (0.6.6)
kwalify (= 0.7.2)
psych (~> 3)
cfn-nag (0.8.9)
aws-sdk-s3 (~> 1.76)
cfn-model (= 0.6.6)
lightly (~> 0.3.2)
logging (~> 2.2.2)
netaddr (~> 2.0.4)
optimist (~> 3.0.0)
rexml
jmespath (1.6.1)
kwalify (0.7.2)
lightly (0.3.3)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
multi_json (1.15.0)
netaddr (2.0.5)
optimist (3.0.1)
psych (3.3.2)
rexml (3.2.5)
PLATFORMS
ruby
DEPENDENCIES
cfn-nag
BUNDLED WITH
2.2.28

View file

@ -1,189 +0,0 @@
{
aws-eventstream = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
type = "gem";
};
version = "1.2.0";
};
aws-partitions = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ap27g6hxcczpb5dj7v0wzxrvywfa2kf3zx69xnjz1qvxf3plw54";
type = "gem";
};
version = "1.568.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14ymvp06k46gvkpvz5zaqvbvr6wd8vdka5iq25q0wd0fzdx7aivm";
type = "gem";
};
version = "3.130.0";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi";
type = "gem";
};
version = "1.55.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax";
type = "gem";
};
version = "1.113.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";
type = "gem";
};
version = "1.4.0";
};
cfn-model = {
dependencies = ["kwalify" "psych"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1b3ix36yfnfwyxb4w9ss8a7nc6w15m1wbj3q8rarsqjrs3xj6wjs";
type = "gem";
};
version = "0.6.6";
};
cfn-nag = {
dependencies = ["aws-sdk-s3" "cfn-model" "lightly" "logging" "netaddr" "optimist" "rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14qlnflxx5chjvda9n2ka2axcfcjbmn9h00cija8k7kvpy1dgqga";
type = "gem";
};
version = "0.8.9";
};
jmespath = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
type = "gem";
};
version = "1.6.1";
};
kwalify = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ngxg3ysq5vip9dn3d32ajc7ly61kdin86hfycm1hkrcvkkn1vjf";
type = "gem";
};
version = "0.7.2";
};
lightly = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sgj2r6j7qxb9vqzkx5isjbphi38rplk4h8838am0cjcpq5h3jb3";
type = "gem";
};
version = "0.3.3";
};
little-plugger = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
type = "gem";
};
version = "1.1.4";
};
logging = {
dependencies = ["little-plugger" "multi_json"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
type = "gem";
};
version = "2.2.2";
};
multi_json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
type = "gem";
};
version = "1.15.0";
};
netaddr = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r7nln9xvrralwwhd5s1q4sghp0k9y7g9z5pinzpqkx715xcpdxm";
type = "gem";
};
version = "2.0.5";
};
optimist = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk";
type = "gem";
};
version = "3.0.1";
};
psych = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10iawnkpa44hcfrapy7yw6zmjn4g1g0y09lw244qiv424f7jasn5";
type = "gem";
};
version = "3.3.2";
};
rexml = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
type = "gem";
};
version = "3.2.5";
};
}

View file

@ -1,17 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub }: { lib, buildGo123Module, fetchFromGitHub }:
buildGoModule rec { buildGo123Module rec {
pname = "gotemplate"; pname = "gotemplate";
version = "3.7.5"; version = "3.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "coveooss"; owner = "coveooss";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-BMZyq7fa57WaE0cSkGjHWxtEnbC7vEy+kLaHDoI/KZU="; hash = "sha256-sRCyOQmj4ti+1Qdap0Q5MLoJZLwjZtw1cYjZMGksvuA=";
}; };
vendorHash = "sha256-uRB3atrJ+A1/xXvgmkyM/AKN+9VKSIDvsnPIdtsc3vc="; vendorHash = "sha256-xtvexOmzTXjP3QsGp0aL3FdJe3mdBSCnTeM6hLq/tIo=";
meta = with lib; { meta = with lib; {
description = "CLI for go text/template"; description = "CLI for go text/template";

View file

@ -12,16 +12,16 @@
buildGoModule rec { buildGoModule rec {
pname = "runme"; pname = "runme";
version = "3.0.2"; version = "3.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stateful"; owner = "stateful";
repo = "runme"; repo = "runme";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-a+7Gff3Z1V17uaywoUE+nLVeVprB50Gslarcle/NPB8="; hash = "sha256-b1HP5JCtQFA0+GIkMswb8o3k9zbD5sLrLR7yz8UivLk=";
}; };
vendorHash = "sha256-QoZzEq1aC7cjY/RVp5Z5HhSuTFf2BSYQnfg0jSaeTJU="; vendorHash = "sha256-qOM66jiSjAU5e6eGrM8kgJxWJzxwgHpLadx5pTjNFOs=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles
@ -39,17 +39,21 @@ buildGoModule rec {
ldflags = [ ldflags = [
"-s" "-s"
"-w" "-w"
"-X=github.com/stateful/runme/internal/version.BuildDate=1970-01-01T00:00:00Z" "-X=github.com/stateful/runme/v3/internal/version.BuildDate=1970-01-01T00:00:00Z"
"-X=github.com/stateful/runme/internal/version.BuildVersion=${version}" "-X=github.com/stateful/runme/v3/internal/version.BuildVersion=${version}"
"-X=github.com/stateful/runme/internal/version.Commit=${src.rev}" "-X=github.com/stateful/runme/v3/internal/version.Commit=${src.rev}"
]; ];
# checkFlags = [
# "-ldflags=-X=github.com/stateful/runme/v3/internal/version.BuildVersion=${version}"
# ];
# tests fail to access /etc/bashrc on darwin # tests fail to access /etc/bashrc on darwin
doCheck = !stdenv.hostPlatform.isDarwin; doCheck = !stdenv.hostPlatform.isDarwin;
postPatch = '' postPatch = ''
substituteInPlace testdata/{categories/basic,runall/basic,script/basic}.txtar \ substituteInPlace testdata/{categories/basic,runall/basic,script/basic}.txtar \
--replace /bin/bash "${runtimeShell}" --replace-fail /bin/bash "${runtimeShell}"
''; '';
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

View file

@ -1,99 +0,0 @@
{ lib
, fetchFromGitHub
, nix-update-script
, cmake
, pkg-config
, mkDerivation
, qtbase
, qtx11extras
, qtsvg
, makeWrapper
, vulkan-loader
, libglvnd
, xorg
, python311
, python311Packages
, bison
, pcre
, automake
, autoconf
, addDriverRunpath
, waylandSupport ? false
, wayland
}:
let
custom_swig = fetchFromGitHub {
owner = "baldurk";
repo = "swig";
rev = "renderdoc-modified-7";
sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6";
};
in
mkDerivation rec {
pname = "renderdoc";
version = "1.34";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "v${version}";
sha256 = "sha256-obRCILzMR7tCni0YoT3/oesTSADGI2sXqY3G6RS1h1o=";
};
buildInputs = [
qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python311
] ++ (with python311Packages; [
pyside2 pyside2-tools shiboken2
])
++ lib.optional waylandSupport wayland;
nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addDriverRunpath ];
postUnpack = ''
cp -r ${custom_swig} swig
chmod -R +w swig
patchShebangs swig/autogen.sh
'';
cmakeFlags = [
(lib.cmakeFeature "BUILD_VERSION_HASH" src.rev)
(lib.cmakeFeature "BUILD_VERSION_DIST_NAME" "NixOS")
(lib.cmakeFeature "BUILD_VERSION_DIST_VER" version)
(lib.cmakeFeature "BUILD_VERSION_DIST_CONTACT" "https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc")
(lib.cmakeBool "BUILD_VERSION_STABLE" true)
(lib.cmakeBool "ENABLE_WAYLAND" waylandSupport)
];
# TODO: define these in the above array via placeholders, once those are widely supported
preConfigure = ''
cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/"
cmakeFlags+=" -DRENDERDOC_SWIG_PACKAGE=$PWD/../swig"
'';
dontWrapQtApps = true;
preFixup = ''
wrapQtApp $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib:${libglvnd}/lib"
wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib:${libglvnd}/lib"
'';
# The only documentation for this so far is in pkgs/build-support/add-opengl-runpath/setup-hook.sh
postFixup = ''
addDriverRunpath $out/lib/librenderdoc.so
'';
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Single-frame graphics debugger";
homepage = "https://renderdoc.org/";
license = licenses.mit;
longDescription = ''
RenderDoc is a free MIT licensed stand-alone graphics debugger that
allows quick and easy single-frame capture and detailed introspection
of any application using Vulkan, D3D11, OpenGL or D3D12 across
Windows 7 - 10, Linux or Android.
'';
maintainers = [ ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

View file

@ -97,6 +97,9 @@ stdenv.mkDerivation rec {
xorg.libXrender xorg.libXrender
gnome2.GConf gnome2.GConf
libcap libcap
# Unity Editor 6000 specific dependencies
harfbuzz
] ++ extraLibs pkgs; ] ++ extraLibs pkgs;
}; };

View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ClassiCube"; pname = "ClassiCube";
version = "1.3.6"; version = "1.3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "UnknownShadow200"; owner = "UnknownShadow200";
repo = "ClassiCube"; repo = "ClassiCube";
rev = version; rev = version;
sha256 = "sha256-7VPn5YXNoAR3ftYMDQuQRqeMCrbyB56ir1sQWBiPWAI="; sha256 = "sha256-ZITyfxkQB4Jpm2ZsQyM+ouPLqCVmGB7UZRXDSU/BX0k=";
}; };
nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ]; nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ];

View file

@ -1,13 +1,14 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 83188ce..3439cdb 100644 index a10eb5214..70e2f720e 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -40,7 +40,7 @@ LIBS=-mwindows -lws2_32 -lwininet -lwinmm -limagehlp -lcrypt32 -ld3d9 @@ -55,7 +55,7 @@ endif
endif
ifeq ($(PLAT),linux) ifeq ($(PLAT),linux)
-LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl CFLAGS += -DCC_BUILD_ICON
+LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -lcurl -lopenal - LIBS = -lX11 -lXi -lpthread -lGL -ldl
+ LIBS = -lX11 -lXi -lpthread -lGL -ldl -lcurl -lopenal
BUILD_DIR = build-linux
endif endif
ifeq ($(PLAT),sunos)

View file

@ -15,7 +15,6 @@
exfatprogs, exfatprogs,
f2fs-tools, f2fs-tools,
fatresize, fatresize,
hfsprogs,
jfsutils, jfsutils,
nilfs-utils, nilfs-utils,
ntfs3g, ntfs3g,
@ -41,7 +40,7 @@ let
exfatprogs exfatprogs
f2fs-tools f2fs-tools
fatresize fatresize
hfsprogs # hfsprogs intentionally omitted due to being unmaintained
jfsutils jfsutils
nilfs-utils nilfs-utils
ntfs3g ntfs3g

View file

@ -565,7 +565,7 @@ let
USB_EHCI_ROOT_HUB_TT = yes; # Root Hub Transaction Translators USB_EHCI_ROOT_HUB_TT = yes; # Root Hub Transaction Translators
USB_EHCI_TT_NEWSCHED = yes; # Improved transaction translator scheduling USB_EHCI_TT_NEWSCHED = yes; # Improved transaction translator scheduling
USB_HIDDEV = yes; # USB Raw HID Devices (like monitor controls and Uninterruptable Power Supplies) USB_HIDDEV = yes; # USB Raw HID Devices (like monitor controls and Uninterruptable Power Supplies)
# default to dual role mode # default to dual role mode
USB_DWC2_DUAL_ROLE = yes; USB_DWC2_DUAL_ROLE = yes;

View file

@ -15,7 +15,7 @@
, stdenv , stdenv
}: }:
let let
version = "2.0-1455"; version = "2.0-1462";
urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -24,7 +24,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
hash = "sha256-R555u33S5jmqIKdDtRhMbfCMe5sG3x94naPX+qgrwHY="; hash = "sha256-irTDjT9oN0CdxFKAgcHbL2grJ702E6H+WtifGh0pf0E=";
}; };
dontConfigure = true; dontConfigure = true;

View file

@ -5,14 +5,14 @@
, libwbxml }: , libwbxml }:
gnustep.stdenv.mkDerivation rec { gnustep.stdenv.mkDerivation rec {
pname = "sogo"; pname = "sogo";
version = "5.10.0"; version = "5.11.0";
# always update the sope package as well, when updating sogo # always update the sope package as well, when updating sogo
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Alinto"; owner = "Alinto";
repo = pname; repo = pname;
rev = "SOGo-${version}"; rev = "SOGo-${version}";
hash = "sha256-ZmpOI1zk/TkRNFmwTXugVb9IvxYSP4LgNrApSytdI7s="; hash = "sha256-2/0OaCAQkdnDPGOVERZs2Oz+bCpQN3MTLzp2pz0WB08=";
}; };
nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ]; nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ];
@ -77,7 +77,7 @@ gnustep.stdenv.mkDerivation rec {
license = with licenses; [ gpl2Only lgpl21Only ]; license = with licenses; [ gpl2Only lgpl21Only ];
homepage = "https://sogo.nu/"; homepage = "https://sogo.nu/";
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ ]; maintainers = with maintainers; [ jceb ];
}; };
} }

View file

@ -2,13 +2,13 @@
buildFishPlugin rec { buildFishPlugin rec {
pname = "forgit"; pname = "forgit";
version = "24.09.0"; version = "24.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wfxr"; owner = "wfxr";
repo = "forgit"; repo = "forgit";
rev = version; rev = version;
hash = "sha256-8QgnEu41BHeX6heP2slQT+X+Dti+7Ij+J2zqmU4dm3I="; hash = "sha256-g1uedR9BLG0DuGdM/9xqFv6yhBHHnqjQMt1n0z9I29I=";
}; };
postInstall = '' postInstall = ''

View file

@ -1,44 +0,0 @@
{ mkDerivation, lib, fetchurl
, pkg-config, libtool, qmake
, rsync, ssh
}:
mkDerivation rec {
pname = "luckybackup";
version = "0.5.0";
src = fetchurl {
url = "mirror://sourceforge/project/luckybackup/${version}/source/${pname}-${version}.tar.gz";
sha256 = "0nwjsk1j33pm8882jbj8h6nxn6n5ab9dxqpqkay65pfbhcjay0g8";
};
buildInputs = [ rsync ssh ];
nativeBuildInputs = [ pkg-config libtool qmake ];
prePatch = ''
for File in luckybackup.pro menu/luckybackup-pkexec \
menu/luckybackup-su.desktop menu/luckybackup.desktop \
menu/net.luckybackup.su.policy src/functions.cpp \
src/global.cpp src/scheduleDialog.cpp; do
substituteInPlace $File --replace "/usr" "$out"
done
'';
meta = with lib; {
description = "Powerful, fast and reliable backup & sync tool";
longDescription = ''
luckyBackup is an application for data back-up and synchronization
powered by the rsync tool.
It is simple to use, fast (transfers over only changes made and not
all data), safe (keeps your data safe by checking all declared directories
before proceeding in any data manipulation), reliable and fully
customizable.
'';
homepage = "https://luckybackup.sourceforge.net/";
license = licenses.gpl3;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
};
}

View file

@ -1,53 +1,35 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, openssl, libbsd }: {
lib,
let stdenv,
version = "332.25"; fetchFromGitHub,
libbsd,
apple_src = fetchFromGitHub { libuuid,
owner = "apple-oss-distributions"; openssl,
repo = "diskdev_cmds"; }:
rev = "diskdev_cmds-${version}";
hash = "sha256-cycPGPx2Gbjn4FKGKuQKJkh+dWGbJfy6C+LTz8rrs0A=";
name = "diskdev_cmds-${version}";
};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "hfsprogs"; pname = "hfsprogs";
inherit version; version = "627.40.1-linux";
srcs = [ src = fetchFromGitHub {
(fetchurl { owner = "glaubitz";
url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/hfsprogs_${version}-11.debian.tar.gz"; repo = "hfs";
sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c"; rev = "a9496556b0a5fa805139ea20b44081d48aae912a";
}) hash = "sha256-i6fXPWHU03ErUN2irP2cLJbpqi1OrTtcQE+ohAz+Eio=";
apple_src };
buildInputs = [
libbsd
libuuid
openssl
]; ];
postPatch = ''
sed -ie '/sys\/sysctl.h/d' newfs_hfs.tproj/makehfs.c
'';
sourceRoot = apple_src.name;
patches = [ "../debian/patches/*.patch" ];
buildInputs = [ openssl libbsd ];
makefile = "Makefile.lnx";
# Inspired by PKGBUILD of https://www.archlinux.org/packages/community/x86_64/hfsprogs/
installPhase = '' installPhase = ''
# Create required package directories
install -m 755 -d "$out/bin"
install -m 755 -d "$out/share/hfsprogs"
install -m 755 -d "$out/share/man/man8/"
# Copy executables # Copy executables
install -m 755 "newfs_hfs.tproj/newfs_hfs" "$out/bin/mkfs.hfsplus" install -Dm 555 "newfs_hfs/newfs_hfs" "$out/bin/mkfs.hfsplus"
install -m 755 "fsck_hfs.tproj/fsck_hfs" "$out/bin/fsck.hfsplus" install -Dm 555 "fsck_hfs/fsck_hfs" "$out/bin/fsck.hfsplus"
# Copy shared data
install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "$out/share/hfsprogs/hfsbootdata"
# Copy man pages # Copy man pages
install -m 644 "newfs_hfs.tproj/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8" install -Dm 444 "newfs_hfs/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8"
install -m 644 "fsck_hfs.tproj/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8" install -Dm 444 "fsck_hfs/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8"
''; '';
meta = { meta = {

View file

@ -1,13 +1,14 @@
{ lib {
, buildDotnetModule lib,
, fetchFromGitHub buildDotnetModule,
, glibc fetchFromGitHub,
, zlib glibc,
, gtk3 zlib,
, copyDesktopItems gtk3,
, icoutils copyDesktopItems,
, wrapGAppsHook3 icoutils,
, makeDesktopItem wrapGAppsHook3,
makeDesktopItem,
}: }:
buildDotnetModule rec { buildDotnetModule rec {
@ -22,7 +23,8 @@ buildDotnetModule rec {
}; };
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;
projectFile = "Scarab.sln"; projectFile = "Scarab/Scarab.csproj";
testProjectFile = "Scarab.Tests/Scarab.Tests.csproj";
executables = [ "Scarab" ]; executables = [ "Scarab" ];
preConfigureNuGet = '' preConfigureNuGet = ''
@ -47,6 +49,8 @@ buildDotnetModule rec {
wrapGAppsHook3 wrapGAppsHook3
]; ];
doCheck = true;
postFixup = '' postFixup = ''
# Icons for the desktop file # Icons for the desktop file
icotool -x $src/Scarab/Assets/omegamaggotprime.ico icotool -x $src/Scarab/Assets/omegamaggotprime.ico
@ -58,26 +62,28 @@ buildDotnetModule rec {
done done
''; '';
desktopItems = [(makeDesktopItem { desktopItems = [
desktopName = "Scarab"; (makeDesktopItem {
name = "scarab"; desktopName = "Scarab";
exec = "Scarab"; name = "scarab";
icon = "scarab"; exec = "Scarab";
comment = meta.description; icon = "scarab";
type = "Application"; comment = meta.description;
categories = [ "Game" ]; type = "Application";
})]; categories = [ "Game" ];
})
];
passthru.updateScript = ./update.sh; passthru.updateScript = ./update.sh;
meta = with lib; { meta = {
description = "Hollow Knight mod installer and manager"; description = "Hollow Knight mod installer and manager";
homepage = "https://github.com/fifty-six/Scarab"; homepage = "https://github.com/fifty-six/Scarab";
downloadPage = "https://github.com/fifty-six/Scarab/releases"; downloadPage = "https://github.com/fifty-six/Scarab/releases";
changelog = "https://github.com/fifty-six/Scarab/releases/tag/v${version}"; changelog = "https://github.com/fifty-six/Scarab/releases/tag/v${version}";
license = licenses.gpl3Only; license = lib.licenses.gpl3Only;
maintainers = with maintainers; [ huantian ]; maintainers = with lib.maintainers; [ huantian ];
mainProgram = "Scarab"; mainProgram = "Scarab";
platforms = platforms.linux; platforms = lib.platforms.linux;
}; };
} }

View file

@ -1,14 +1,14 @@
{ stdenv, lib, buildGoModule, fetchFromGitHub, libX11, darwin }: { stdenv, lib, buildGo123Module, fetchFromGitHub, libX11, darwin }:
buildGoModule rec { buildGo123Module rec {
pname = "certinfo"; pname = "certinfo";
version = "1.0.23"; version = "1.0.24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pete911"; owner = "pete911";
repo = "certinfo"; repo = "certinfo";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-el7qL2d8z50S+0vyy8zH1W1uNix9PXmDGS5y8P9fIVA="; sha256 = "sha256-BI5gYWKGMU0wLvnArG41bLWj+9ipe/GARKRX0fwz4ag=";
}; };
# clipboard functionality not working on Darwin # clipboard functionality not working on Darwin

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exploitdb"; pname = "exploitdb";
version = "2024-08-29"; version = "2024-10-02";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "exploit-database"; owner = "exploit-database";
repo = "exploitdb"; repo = "exploitdb";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-QZO7wJiqVVt9vpocC2X4Vrj8s02kh/E3j96JKbYoJJo="; hash = "sha256-uNFBMZ6pk/xT6OZMb8EKax141lc+uumQl3xbihFMYAI=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -258,7 +258,6 @@ mapAliases {
CoinMP = coinmp; # Added 2024-06-12 CoinMP = coinmp; # Added 2024-06-12
collada-dom = opencollada; # added 2024-02-21 collada-dom = opencollada; # added 2024-02-21
composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08
cope = throw "'cope' has been removed, as it is broken in nixpkgs since it was added, and fixing it is not trivial"; # Added 2024-04-12
coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01 corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01
cosmic-tasks = tasks; # Added 2024-07-04 cosmic-tasks = tasks; # Added 2024-07-04
@ -1571,7 +1570,7 @@ mapAliases {
invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05
timescale-prometheus = promscale; # Added 2020-09-29 timescale-prometheus = promscale; # Added 2020-09-29
tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25 tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25
tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22 tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22
tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17 tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17
tkcvs = tkrev; # Added 2022-03-07 tkcvs = tkrev; # Added 2022-03-07
toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22 toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22

View file

@ -351,8 +351,6 @@ with pkgs;
cbfmt = callPackage ../development/tools/cbfmt { }; cbfmt = callPackage ../development/tools/cbfmt { };
cfn-nag = callPackage ../development/tools/cfn-nag { };
circumflex = callPackage ../applications/networking/circumflex { }; circumflex = callPackage ../applications/networking/circumflex { };
citron = callPackage ../tools/misc/citron { }; citron = callPackage ../tools/misc/citron { };
@ -7166,10 +7164,6 @@ with pkgs;
evtx = callPackage ../tools/security/evtx { }; evtx = callPackage ../tools/security/evtx { };
luckybackup = libsForQt5.callPackage ../tools/backup/luckybackup {
ssh = openssh;
};
kics = callPackage ../tools/admin/kics { }; kics = callPackage ../tools/admin/kics { };
kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { };
@ -11823,8 +11817,6 @@ with pkgs;
renameutils = callPackage ../tools/misc/renameutils { }; renameutils = callPackage ../tools/misc/renameutils { };
renderdoc = libsForQt5.callPackage ../development/tools/renderdoc { };
repgrep = callPackage ../tools/text/repgrep { }; repgrep = callPackage ../tools/text/repgrep { };
replace = callPackage ../tools/text/replace { }; replace = callPackage ../tools/text/replace { };
@ -28469,8 +28461,6 @@ with pkgs;
bfcal = libsForQt5.callPackage ../applications/misc/bfcal { }; bfcal = libsForQt5.callPackage ../applications/misc/bfcal { };
bibletime = libsForQt5.callPackage ../applications/misc/bibletime { };
bino3d = qt6Packages.callPackage ../applications/video/bino3d { }; bino3d = qt6Packages.callPackage ../applications/video/bino3d { };
bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
@ -30725,8 +30715,6 @@ with pkgs;
kubelogin = callPackage ../applications/networking/cluster/kubelogin { }; kubelogin = callPackage ../applications/networking/cluster/kubelogin { };
kubelogin-oidc = callPackage ../applications/networking/cluster/kubelogin-oidc { };
kubevpn = callPackage ../applications/networking/cluster/kubevpn { }; kubevpn = callPackage ../applications/networking/cluster/kubevpn { };
k8sgpt = callPackage ../applications/networking/cluster/k8sgpt { }; k8sgpt = callPackage ../applications/networking/cluster/k8sgpt { };
@ -36395,8 +36383,6 @@ with pkgs;
cudaSupport = true; cudaSupport = true;
}; };
mathmod = libsForQt5.callPackage ../applications/science/math/mathmod { };
metis = callPackage ../development/libraries/science/math/metis { }; metis = callPackage ../development/libraries/science/math/metis { };
nauty = callPackage ../applications/science/math/nauty { }; nauty = callPackage ../applications/science/math/nauty { };

View file

@ -164,4 +164,10 @@ let
fixedPoints.extends composedExtension passthruFunction fixedPoints.extends composedExtension passthruFunction
); );
in in
cudaPackages # We want to warn users about the upcoming deprecation of old CUDA
# versions, without breaking Nixpkgs CI with evaluation warnings. This
# gross hack ensures that the warning only triggers if aliases are
# enabled, which is true by default, but not for ofborg.
lib.warnIf (cudaPackages.cudaOlder "12.0" && config.allowAliases)
"CUDA versions older than 12.0 will be removed in Nixpkgs 25.05; see the 24.11 release notes for more information"
cudaPackages

View file

@ -18787,7 +18787,7 @@ with self; {
buildInputs = [ TestNoWarnings ]; buildInputs = [ TestNoWarnings ];
perlPreHook = "export LD=$CC"; perlPreHook = "export LD=$CC";
meta = { meta = {
description = "Internationalizing Domain Names in Applications (UTS #46)"; description = "Internationalizing Domain Names in Applications (UTS #46)";
homepage = "https://metacpan.org/release/Net-IDN-Encode"; homepage = "https://metacpan.org/release/Net-IDN-Encode";
license = with lib.licenses; [ artistic1 gpl1Plus ]; license = with lib.licenses; [ artistic1 gpl1Plus ];
}; };

View file

@ -1,6 +1,6 @@
# cd nixpkgs # cd nixpkgs
# nix-build -A tests.pkg-config # nix-build -A tests.pkg-config
{ lib, stdenv, ... }: { lib, config, stdenv, ... }:
let let
# defaultPkgConfigPackages test needs a Nixpkgs with allowUnsupportedPlatform # defaultPkgConfigPackages test needs a Nixpkgs with allowUnsupportedPlatform
@ -10,7 +10,7 @@ let
allPkgs = import ../default.nix { allPkgs = import ../default.nix {
system = stdenv.hostPlatform.system; system = stdenv.hostPlatform.system;
localSystem = stdenv.buildPlatform.system; localSystem = stdenv.buildPlatform.system;
config = { config = config // {
allowUnsupportedSystem = true; allowUnsupportedSystem = true;
}; };
overlays = []; overlays = [];

View file

@ -13908,6 +13908,8 @@ self: super: with self; {
sagemaker = callPackage ../development/python-modules/sagemaker { }; sagemaker = callPackage ../development/python-modules/sagemaker { };
sagemaker-core = callPackage ../development/python-modules/sagemaker-core { };
salib = callPackage ../development/python-modules/salib { }; salib = callPackage ../development/python-modules/salib { };
salmon-mail = callPackage ../development/python-modules/salmon-mail { }; salmon-mail = callPackage ../development/python-modules/salmon-mail { };