Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-10-29 18:04:56 +00:00 committed by GitHub
commit 683f8efd0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
48 changed files with 1197 additions and 234 deletions

View File

@ -5437,6 +5437,12 @@
githubId = 4490283; githubId = 4490283;
name = "diadatp"; name = "diadatp";
}; };
diamond-deluxe = {
email = "carbon_lattice@proton.me";
github = "diamond-deluxe";
githubId = 112557036;
name = "Diamond";
};
DianaOlympos = { DianaOlympos = {
github = "DianaOlympos"; github = "DianaOlympos";
githubId = 15774340; githubId = 15774340;
@ -17670,6 +17676,12 @@
githubId = 12017109; githubId = 12017109;
name = "Rabindra Dhakal"; name = "Rabindra Dhakal";
}; };
qbisi = {
name = "qbisicwate";
email = "qbisicwate@gmail.com";
github = "qbisi";
githubId = 84267544;
};
qbit = { qbit = {
name = "Aaron Bieber"; name = "Aaron Bieber";
email = "aaron@bolddaemon.com"; email = "aaron@bolddaemon.com";
@ -18246,6 +18258,11 @@
githubId = 3302; githubId = 3302;
name = "Renzo Carbonara"; name = "Renzo Carbonara";
}; };
reputable2772 = {
name = "Reputable2772";
github = "Reputable2772";
githubId = 153411261;
};
rettetdemdativ = { rettetdemdativ = {
email = "michael@koeppl.dev"; email = "michael@koeppl.dev";
github = "rettetdemdativ"; github = "rettetdemdativ";

View File

@ -33,8 +33,8 @@ Unfortunately, Nixpkgs currently lacks a way to query available package configur
::: {.note} ::: {.note}
For example, many packages come with extensions one might add. For example, many packages come with extensions one might add.
Examples include: Examples include:
- [`passExtensions.pass-otp`](https://search.nixos.org/packages/query=passExtensions.pass-otp) - [`passExtensions.pass-otp`](https://search.nixos.org/packages?query=passExtensions.pass-otp)
- [`python310Packages.requests`](https://search.nixos.org/packages/query=python310Packages.requests) - [`python312Packages.requests`](https://search.nixos.org/packages?query=python312Packages.requests)
You can use them like this: You can use them like this:
```nix ```nix

View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "lightning-loop"; pname = "lightning-loop";
version = "0.24.1-beta"; version = "0.28.8-beta";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lightninglabs"; owner = "lightninglabs";
repo = "loop"; repo = "loop";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-gPWiKSwXS1eSuHss+hkiqqxqonGYSGmSh3/jL+NlqEg="; hash = "sha256-zgKKYHDRYXPslPHay/V2DAL1jQfeX5qPWUQQtuvp1M0=";
}; };
vendorHash = "sha256-6bRg6is1g/eRCr82tHMXTWVFv2S0d2h/J3w1gpentjo="; vendorHash = "sha256-v7zSvCp63z+xZIuXbqHueamEBN/jZBr2Kysvq03e8L0=";
subPackages = [ "cmd/loop" "cmd/loopd" ]; subPackages = [ "cmd/loop" "cmd/loopd" ];

View File

@ -114,10 +114,10 @@ in
emacs30 = import ./make-emacs.nix (mkArgs { emacs30 = import ./make-emacs.nix (mkArgs {
pname = "emacs"; pname = "emacs";
version = "30.0.91"; version = "30.0.92";
variant = "mainline"; variant = "mainline";
rev = "30.0.91"; rev = "30.0.92";
hash = "sha256-X5J34BUY42JgA1s76eVeGA9WNtesU2c+JyndIHFbONQ="; hash = "sha256-V2TXLemSCIPTpg6RDChv4va7pHfVcqSMw/EWqvlRQ1o=";
}); });
emacs28-macport = import ./make-emacs.nix (mkArgs { emacs28-macport = import ./make-emacs.nix (mkArgs {

View File

@ -25,13 +25,13 @@
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
pname = "corectrl"; pname = "corectrl";
version = "1.4.1"; version = "1.4.2";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "corectrl"; owner = "corectrl";
repo = "corectrl"; repo = "corectrl";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw="; hash = "sha256-WOljOakh177om7tLlroFwWO4gYsarfTCeVXX6+dmZs4=";
}; };
patches = [ patches = [
./polkit-dir.patch ./polkit-dir.patch

View File

@ -5,7 +5,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "dwmbar"; pname = "dwmbar";
version = "unstable-2021-12-22"; version = "0-unstable-2021-12-22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "thytom"; owner = "thytom";

View File

@ -1,17 +0,0 @@
diff --git a/src/sage/graphs/generic_graph.py b/src/sage/graphs/generic_graph.py
index 2deb533f7f..663ff2cd13 100644
--- a/src/sage/graphs/generic_graph.py
+++ b/src/sage/graphs/generic_graph.py
@@ -6953,12 +6953,6 @@ class GenericGraph(GenericGraph_pyx):
sage: G = DiGraph(d6, format='dig6')
sage: G.edge_connectivity()
5
- sage: G.edge_disjoint_spanning_trees(5) # long time # needs sage.numerical.mip
- [Digraph on 28 vertices,
- Digraph on 28 vertices,
- Digraph on 28 vertices,
- Digraph on 28 vertices,
- Digraph on 28 vertices]
Small cases::

View File

@ -54,13 +54,12 @@ stdenv.mkDerivation rec {
# fix those bugs themselves. This is for critical bugfixes, where "critical" # fix those bugs themselves. This is for critical bugfixes, where "critical"
# == "causes (transient) doctest failures / somebody complained". # == "causes (transient) doctest failures / somebody complained".
bugfixPatches = [ bugfixPatches = [
# Sage uses mixed integer programs (MIPs) to find edge disjoint # https://github.com/sagemath/sage/pull/38851, landed in 10.5.beta8
# spanning trees. For some reason, aarch64 glpk takes much longer (fetchpatch {
# than x86_64 glpk to solve such MIPs. Since the MIP formulation name = "glpk-aarch64-hang-workaround.patch";
# has "numerous problems" and will be replaced by a polynomial url = "https://github.com/sagemath/sage/commit/ce4a78dcb4178f85273619cea076c97345977ee1.diff";
# algorithm soon, disable this test for now. hash = "sha256-TibTx5llkXjkEZB/MDy4hfGwKBmwtitEpWP6K/ykke0=";
# https://github.com/sagemath/sage/issues/34575 })
./patches/disable-slow-glpk-test.patch
# compile libs/gap/element.pyx with -O1 # compile libs/gap/element.pyx with -O1
# a more conservative version of https://github.com/sagemath/sage/pull/37951 # a more conservative version of https://github.com/sagemath/sage/pull/37951

View File

@ -24,6 +24,16 @@ rec {
, knownVulnerabilities ? [] , knownVulnerabilities ? []
}: }:
let let
docker-meta = {
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [
offline
vdemeester
periklis
teutat3s
];
};
docker-runc = runc.overrideAttrs { docker-runc = runc.overrideAttrs {
pname = "docker-runc"; pname = "docker-runc";
inherit version; inherit version;
@ -160,6 +170,11 @@ rec {
++ lib.optional (!withBtrfs) "exclude_graphdriver_btrfs" ++ lib.optional (!withBtrfs) "exclude_graphdriver_btrfs"
++ lib.optional (!withLvm) "exclude_graphdriver_devicemapper" ++ lib.optional (!withLvm) "exclude_graphdriver_devicemapper"
++ lib.optional withSeccomp "seccomp"; ++ lib.optional withSeccomp "seccomp";
meta = docker-meta // {
homepage = "https://mobyproject.org/";
description = "A collaborative project for the container ecosystem to assemble container-based systems.";
};
}); });
plugins = lib.optional buildxSupport docker-buildx plugins = lib.optional buildxSupport docker-buildx
@ -257,7 +272,7 @@ rec {
tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; }; tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; };
}; };
meta = with lib; { meta = docker-meta // {
homepage = "https://www.docker.com/"; homepage = "https://www.docker.com/";
description = "Open source project to pack, ship and run any application as a lightweight container"; description = "Open source project to pack, ship and run any application as a lightweight container";
longDescription = '' longDescription = ''
@ -265,8 +280,6 @@ rec {
To enable the docker daemon on NixOS, set the `virtualisation.docker.enable` option to `true`. To enable the docker daemon on NixOS, set the `virtualisation.docker.enable` option to `true`.
''; '';
license = licenses.asl20;
maintainers = with maintainers; [ offline vdemeester periklis teutat3s ];
mainProgram = "docker"; mainProgram = "docker";
inherit knownVulnerabilities; inherit knownVulnerabilities;
}; };

View File

@ -8,5 +8,6 @@ lib.makeOverridable (
inherit name; inherit name;
url = "https://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz"; url = "https://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz";
meta.homepage = "https://git.savannah.gnu.org/cgit/${repo}.git/"; meta.homepage = "https://git.savannah.gnu.org/cgit/${repo}.git/";
passthru.gitRepoUrl = "https://git.savannah.gnu.org/git/${repo}.git";
} // removeAttrs args [ "repo" "rev" ]) // { inherit rev; } } // removeAttrs args [ "repo" "rev" ]) // { inherit rev; }
) )

View File

@ -1,9 +1,9 @@
{ {
"owner": "advplyr", "owner": "advplyr",
"repo": "audiobookshelf", "repo": "audiobookshelf",
"rev": "fba9cce82ec1a94e002d34a6b012eadf34c759a0", "rev": "50fd659749128a321ecc3284e128d014433145a9",
"hash": "sha256-BoNveMooYfRPKUJK5aqzeKVmY4MNyH9FwO0/EON2cZY=", "hash": "sha256-lYzzzH2heSj0doPfAEWL+pTP9wTsTzLb3+Fu0DHD1w0=",
"version": "2.16.0", "version": "2.16.1",
"depsHash": "sha256-yr5k151jGGT3O2CfDfdKfN7s2e8tUdrS8PWA5tX1BMA=", "depsHash": "sha256-7kA1AusnF7iDMACd9lQ8wbdbtjtouh9qu1J8EzzYUrQ=",
"clientDepsHash": "sha256-LJk+cbW3JTzUl6M0PqWj3tLWx29bGYgG+HohCiFoaME=" "clientDepsHash": "sha256-NwOkMdlmh+tQCWKrbKBbf9XPA3mtz7S3VrGwvpBS0Rc="
} }

View File

@ -10,6 +10,7 @@
cplex, cplex,
fatrop, fatrop,
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
gurobi, gurobi,
highs, highs,
hpipm, hpipm,
@ -45,6 +46,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-Mft0qhjdAbU82RgjYuKue5p7EqbTbt3ii5yXSsCFHrQ="; hash = "sha256-Mft0qhjdAbU82RgjYuKue5p7EqbTbt3ii5yXSsCFHrQ=";
}; };
patches = [
(fetchpatch {
name = "fix-FindMUMPS.cmake.patch";
url = "https://github.com/casadi/casadi/pull/3899/commits/274f4b23f73e60c5302bec0479fe1e92682b63d2.patch";
hash = "sha256-3GWEWlN8dKLD6htpnOQLChldcT3hE09JWLeuCfAhY+4=";
})
];
postPatch = postPatch =
'' ''
# fix case of hpipmConfig.cmake # fix case of hpipmConfig.cmake
@ -57,11 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
'$'{CLANG_LLVM_LIB_DIR} \ '$'{CLANG_LLVM_LIB_DIR} \
${llvmPackages_17.libclang.lib}/lib ${llvmPackages_17.libclang.lib}/lib
# fix mumps lib name. No idea where this comes from.
substituteInPlace cmake/FindMUMPS.cmake --replace-fail \
"mumps_seq" \
"mumps"
# help casadi find its own libs # help casadi find its own libs
substituteInPlace casadi/core/casadi_os.cpp --replace-fail \ substituteInPlace casadi/core/casadi_os.cpp --replace-fail \
"std::vector<std::string> search_paths;" \ "std::vector<std::string> search_paths;" \

View File

@ -4,6 +4,7 @@
immich, immich,
python3, python3,
nixosTests, nixosTests,
stdenv,
}: }:
let let
python = python3.override { python = python3.override {
@ -58,6 +59,10 @@ python.pkgs.buildPythonApplication rec {
] ]
++ uvicorn.optional-dependencies.standard; ++ uvicorn.optional-dependencies.standard;
# aarch64-linux tries to get cpu information from /sys, which isn't available
# inside the nix build sandbox.
doCheck = stdenv.buildPlatform.system != "aarch64-linux";
nativeCheckInputs = with python.pkgs; [ nativeCheckInputs = with python.pkgs; [
httpx httpx
pytest-asyncio pytest-asyncio

View File

@ -0,0 +1,48 @@
{
lib,
stdenv,
fetchFromGitHub,
python3Packages,
versionCheckHook,
}:
python3Packages.buildPythonApplication rec {
pname = "mud";
version = "1.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "jasursadikov";
repo = "mud";
rev = "refs/tags/v${version}";
hash = "sha256-pW4B4+RN7hKtG2enJ33OHBeGsLj8w20ylvjcOL6owAk=";
};
build-system = with python3Packages; [
hatchling
];
dependencies = with python3Packages; [
prettytable
];
pythonImportsCheck = [ "mud" ];
# Version checking fails on darwin with:
# PermissionError: [Errno 1] Operation not permitted: '/var/empty/.mudsettings'
# despite adding `export HOME=$(mktemp -d)` in the `preVersionCheck` phase.
# The tool
nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
meta = {
description = "multi-directory git runner which allows you to run git commands in a multiple repositories";
homepage = "https://github.com/jasursadikov/mud";
license = lib.licenses.mit;
changelog = "https://github.com/jasursadikov/mud/releases/tag/v${version}";
maintainers = with lib.maintainers; [ genga898 ];
mainProgram = "mud";
};
}

View File

@ -6,9 +6,55 @@
lapack, lapack,
lib, lib,
metis, metis,
parmetis,
withParmetis ? false, # default to false due to unfree license
scotch, scotch,
withPtScotch ? mpiSupport,
stdenv, stdenv,
fixDarwinDylibNames,
mpi,
mpiSupport ? false,
mpiCheckPhaseHook,
scalapack,
}: }:
assert withParmetis -> mpiSupport;
assert withPtScotch -> mpiSupport;
let
profile = if mpiSupport then "debian.PAR" else "debian.SEQ";
metisFlags =
if withParmetis then
''
IMETIS="-I${parmetis}/include -I${metis}/include" \
LMETIS="-L${parmetis}/lib -lparmetis -L${metis}/lib -lmetis"
''
else
''
IMETIS=-I${metis}/include \
LMETIS="-L${metis}/lib -lmetis"
'';
scotchFlags =
if withPtScotch then
''
ISCOTCH=-I${scotch.dev}/include \
LSCOTCH="-L${scotch}/lib -lptscotch -lptesmumps -lptscotcherr"
''
else
''
ISCOTCH=-I${scotch.dev}/include \
LSCOTCH="-L${scotch}/lib -lesmumps -lscotch -lscotcherr"
'';
macroFlags =
"-Dmetis -Dpord -Dscotch"
+ lib.optionalString withParmetis " -Dparmetis"
+ lib.optionalString withPtScotch " -Dptscotch";
# Optimized options
# Disable -fopenmp in lines below to benefit from OpenMP
optFlags = ''
OPTF="-O3 -fallow-argument-mismatch" \
OPTL="-O3" \
OPTC="-O3"
'';
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
name = "mumps"; name = "mumps";
version = "5.7.3"; version = "5.7.3";
@ -18,28 +64,20 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-ZnIfAuvOBJDYqCtKGlWs0r39nG6X2lAVRuUmeIJenZw="; hash = "sha256-ZnIfAuvOBJDYqCtKGlWs0r39nG6X2lAVRuUmeIJenZw=";
}; };
patches = [ postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
# Compatibility with coin-or-mumps version substituteInPlace src/Makefile --replace-fail \
(fetchpatch { "-Wl,\''$(SONAME),libmumps_common" \
url = "https://raw.githubusercontent.com/coin-or-tools/ThirdParty-Mumps/bd0bdf9baa3f3677bd34fb36ce63b2b32cc6cc7d/mumps_mpi.patch"; "-Wl,-install_name,$out/lib/libmumps_common"
hash = "sha256-70qZUKBVBpJOSRxYxng5Y6ct1fdCUQUGur3chDhGabQ="; '';
})
];
postPatch =
''
# Compatibility with coin-or-mumps version
# https://github.com/coin-or-tools/ThirdParty-Mumps/blob/stable/3.0/get.Mumps#L66
cp libseq/mpi.h libseq/mumps_mpi.h
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace src/Makefile --replace-fail \
"-Wl,\''$(SONAME),libmumps_common" \
"-Wl,-install_name,$out/lib/libmumps_common"
'';
configurePhase = '' configurePhase = ''
cp Make.inc/Makefile.debian.SEQ ./Makefile.inc cp Make.inc/Makefile.${profile} ./Makefile.inc
'';
enableParallelBuilding = true;
preBuild = ''
makeFlagsArray+=(${metisFlags} ${scotchFlags} ORDERINGSF="${macroFlags}" ${optFlags})
''; '';
makeFlags = makeFlags =
@ -48,84 +86,74 @@ stdenv.mkDerivation (finalAttrs: {
"LIBEXT_SHARED=.dylib" "LIBEXT_SHARED=.dylib"
] ]
++ [ ++ [
"LSCOTCHDIR=${scotch}/lib" "SCALAP=-lscalapack"
"ISCOTCH=-I${scotch.dev}/include"
"LMETISDIR=${metis}/lib"
"IMETIS=-I${metis}/include"
"allshared" "allshared"
]; ];
installPhase = '' installPhase =
mkdir $out ''
cp -r include lib $out mkdir $out
cp -r include lib $out
''
+ lib.optionalString (!mpiSupport) ''
# Install mumps_seq headers
install -Dm 444 -t $out/include/mumps_seq libseq/*.h
# Add some compatibility with coin-or-mumps # Add some compatibility with coin-or-mumps
ln -s $out/include $out/include/mumps ln -s $out/include/mumps_seq/mpi.h $out/include/mumps_mpi.h
cp libseq/mumps_mpi.h $out/include '';
nativeBuildInputs = [
gfortran
] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ++ lib.optional mpiSupport mpi;
# Parmetis should be placed before scotch to avoid conflict of header file "parmetis.h"
buildInputs =
lib.optional withParmetis parmetis
++ lib.optional mpiSupport scalapack
++ [
blas
lapack
metis
scotch
];
doInstallCheck = true;
nativeInstallCheckInputs = lib.optional mpiSupport mpiCheckPhaseHook;
installCheckPhase = ''
runHook preInstallCheck
${lib.optionalString stdenv.hostPlatform.isDarwin "export DYLD_LIBRARY_PATH=$out/lib\n"}
${lib.optionalString mpiSupport "export MPIRUN='mpirun -n 2'\n"}
cd examples
make all
$MPIRUN ./ssimpletest <input_simpletest_real
$MPIRUN ./dsimpletest <input_simpletest_real
$MPIRUN ./csimpletest <input_simpletest_cmplx
$MPIRUN ./zsimpletest <input_simpletest_cmplx
$MPIRUN ./c_example
$MPIRUN ./multiple_arithmetics_example
$MPIRUN ./ssimpletest_save_restore <input_simpletest_real
$MPIRUN ./dsimpletest_save_restore <input_simpletest_real
$MPIRUN ./csimpletest_save_restore <input_simpletest_cmplx
$MPIRUN ./zsimpletest_save_restore <input_simpletest_cmplx
$MPIRUN ./c_example_save_restore
runHook postInstallCheck
''; '';
nativeBuildInputs = [ gfortran ]; passthru = {
inherit withParmetis withPtScotch mpiSupport;
buildInputs = [ };
blas
lapack
metis
scotch
];
preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
install_name_tool \
-change libmpiseq.dylib \
$out/lib/libmpiseq.dylib \
-change libpord.dylib \
$out/lib/libpord.dylib \
$out/lib/libmumps_common.dylib
install_name_tool \
-change libmpiseq.dylib \
$out/lib/libmpiseq.dylib \
-change libpord.dylib \
$out/lib/libpord.dylib \
-id \
$out/lib/libcmumps.dylib \
$out/lib/libcmumps.dylib
install_name_tool \
-change libmpiseq.dylib \
$out/lib/libmpiseq.dylib \
-change libpord.dylib \
$out/lib/libpord.dylib \
-id \
$out/lib/libdmumps.dylib \
$out/lib/libdmumps.dylib
install_name_tool \
-change libmpiseq.dylib \
$out/lib/libmpiseq.dylib \
-change libpord.dylib \
$out/lib/libpord.dylib \
-id \
$out/lib/libsmumps.dylib \
$out/lib/libsmumps.dylib
install_name_tool \
-change libmpiseq.dylib \
$out/lib/libmpiseq.dylib \
-change libpord.dylib \
$out/lib/libpord.dylib \
-id \
$out/lib/libzmumps.dylib \
$out/lib/libzmumps.dylib
install_name_tool \
-id \
$out/lib/libmpiseq.dylib \
$out/lib/libmpiseq.dylib
install_name_tool \
-id \
$out/lib/libpord.dylib \
$out/lib/libpord.dylib
'';
meta = { meta = {
description = "MUltifrontal Massively Parallel sparse direct Solver"; description = "MUltifrontal Massively Parallel sparse direct Solver";
homepage = "http://mumps-solver.org/"; homepage = "http://mumps-solver.org/";
license = lib.licenses.cecill-c; license = lib.licenses.cecill-c;
maintainers = with lib.maintainers; [ nim65s ]; maintainers = with lib.maintainers; [
nim65s
qbisi
];
platforms = lib.platforms.unix;
# Dependency of scalapack for mpiSupport is broken on darwin platform
broken = mpiSupport && stdenv.hostPlatform.isDarwin;
}; };
}) })

View File

@ -12,13 +12,13 @@ in
beamPackages.mixRelease rec { beamPackages.mixRelease rec {
pname = "next-ls"; pname = "next-ls";
version = "0.23.1"; version = "0.23.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elixir-tools"; owner = "elixir-tools";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-jI7/BcS9CimCQskXd7Cq3EGPuc9l4L7Gre8hor58ags="; hash = "sha256-2KzBOzrfoQQIqjEtYufvhT9bBibfEjNDiC+d3l5eaUc=";
}; };
mixFodDeps = beamPackages.fetchMixDeps { mixFodDeps = beamPackages.fetchMixDeps {

View File

@ -3,6 +3,8 @@
, fetchFromGitHub , fetchFromGitHub
, testers , testers
, otel-desktop-viewer , otel-desktop-viewer
, stdenv
, apple-sdk_12
}: }:
buildGoModule rec { buildGoModule rec {
@ -25,6 +27,8 @@ buildGoModule rec {
ldflags = [ "-s" "-w" ]; ldflags = [ "-s" "-w" ];
buildInputs = lib.optional stdenv.isDarwin apple-sdk_12;
passthru.tests.version = testers.testVersion { passthru.tests.version = testers.testVersion {
inherit version; inherit version;
package = otel-desktop-viewer; package = otel-desktop-viewer;

View File

@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "prometheus-borgmatic-exporter"; pname = "prometheus-borgmatic-exporter";
version = "0.2.5"; version = "0.2.7";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "maxim-mityutko"; owner = "maxim-mityutko";
repo = "borgmatic-exporter"; repo = "borgmatic-exporter";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-SgP1utu4Eqs9214pYOT9wP0Ms7AUQH1A3czQF8+qBRo="; hash = "sha256-ZZdCuIavJrIHO/ayMnirNRYyqovKQaW5jTRRrSOhofQ=";
}; };
pythonRelaxDeps = [ "prometheus-client" ]; pythonRelaxDeps = [ "prometheus-client" ];

View File

@ -0,0 +1,60 @@
{
lib,
fetchurl,
appimageTools,
makeWrapper,
writeScript,
}:
let
pname = "redact";
version = "0.18.0";
src = fetchurl {
url = "https://update-desktop.redact.dev/build/Redact-${version}.AppImage";
hash = "sha256-qqqf8BAwXEKgZwl6vsPw/0S+qItz5ZqB59DJkW9q1xc=";
};
appimageContents = appimageTools.extractType2 { inherit pname src version; };
in
appimageTools.wrapType2 {
inherit pname version src;
nativeBuildInputs = [ makeWrapper ];
extraInstallCommands = ''
wrapProgram $out/bin/${pname} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"
install -Dm444 ${appimageContents}/redact.desktop -t $out/share/applications
install -Dm444 ${appimageContents}/redact.png -t $out/share/icons/hicolor/512x512/apps/redact.png
substituteInPlace $out/share/applications/redact.desktop \
--replace-fail 'Exec=AppRun' 'Exec=${pname}'
'';
passthru.updateScript =
writeScript "update.sh"
/**
Scraping the Windows URL for version is intentional, since
the download link for Linux on redact.dev points to an older version,
even though the Cloudflare bucket contains the latest Linux version.
*/
''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl coreutils gnused common-updater-scripts
set -eu -o pipefail
url="$(curl -ILs -w %{url_effective} -o /dev/null https://download.redact.dev/windows)"
version="$(echo $url | sed -n 's/.*Redact-Setup-\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p')"
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; redact.version or (lib.getVersion redact)" | tr -d '"')
if [[ "$version" != "$currentVersion" ]]; then
hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$url")")
update-source-version redact "$version" "$hash" --print-changes
fi
'';
meta = {
description = "The only platform that allows you to automatically clean up your old posts from services like Twitter, Reddit, Facebook, Discord, and more, all in one place.";
homepage = "https://redact.dev/";
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ reputable2772 ];
mainProgram = "redact";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
passthru.updateScript = nix-update-script { }; passthru.updateScript = nix-update-script { };
meta = { meta = {
description = "A terminal theater for playing VT100 art and animations"; description = "Terminal theater for playing VT100 art and animations";
homepage = "https://github.com/orhun/theattyr"; homepage = "https://github.com/orhun/theattyr";
changelog = "https://github.com/orhun/theattyr/blob/${src.rev}/CHANGELOG.md"; changelog = "https://github.com/orhun/theattyr/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.mit; license = lib.licenses.mit;

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub }: { lib, stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tomlcpp"; pname = "tomlcpp";
@ -11,17 +11,26 @@ stdenv.mkDerivation rec {
hash = "sha256-PM3gURXhyTZr59BWuLHvltjKOlKUSBT9/rqTeX5V//k="; hash = "sha256-PM3gURXhyTZr59BWuLHvltjKOlKUSBT9/rqTeX5V//k=";
}; };
patches = [
(fetchpatch {
# Use implicit $AR variable in Makefile
# https://github.com/cktan/tomlcpp/pull/6
url = "https://github.com/cktan/tomlcpp/commit/abdb4e0db8b27f719434f5a0d6ec0b1a6b086ded.patch";
hash = "sha256-SurUKdAZNWqBC7ss5nv5mDnJyC3DqxG/Q/FweTrkLnk=";
})
];
dontConfigure = true; dontConfigure = true;
installFlags = [ installFlags = [
"prefix=${placeholder "out"}" "prefix=${placeholder "out"}"
]; ];
meta = with lib;{ meta = {
homepage = "https://github.com/cktan/tomlcpp"; homepage = "https://github.com/cktan/tomlcpp";
description = "No fanfare TOML C++ Library"; description = "No fanfare TOML C++ Library";
license = licenses.mit; license = lib.licenses.mit;
maintainers = with maintainers; [ AndersonTorres ]; maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = with platforms; unix; platforms = with lib.platforms; unix;
}; };
} }

696
pkgs/by-name/ya/yafc-ce/deps.nix generated Normal file
View File

@ -0,0 +1,696 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }:
[
(fetchNuGet {
pname = "Google.OrTools";
version = "9.10.4067";
hash = "sha256-3iWcH1uKVOxrD6bL27TMVVNj5JX1fjdZ89d3Ddy8Fg0=";
})
(fetchNuGet {
pname = "Google.OrTools.runtime.linux-arm64";
version = "9.10.4067";
hash = "sha256-6OE7+DFbLUqBKmw1t2wli//Y+EAy6o67jFtW2lhS0Hw=";
})
(fetchNuGet {
pname = "Google.OrTools.runtime.linux-x64";
version = "9.10.4067";
hash = "sha256-vd5XqXkOlO8nik5od56x4tncUVJmqamU0CC2DVbEEvY=";
})
(fetchNuGet {
pname = "Google.OrTools.runtime.osx-arm64";
version = "9.10.4067";
hash = "sha256-2eJVMi51PVat/CrQiW5BailiJQsvKk+ivpAu46S4lHE=";
})
(fetchNuGet {
pname = "Google.OrTools.runtime.osx-x64";
version = "9.10.4067";
hash = "sha256-3o0Feg/t70gUmH5lAZzt+dClJkjzuz1e2Q/m8kjAhUo=";
})
(fetchNuGet {
pname = "Google.OrTools.runtime.win-x64";
version = "9.10.4067";
hash = "sha256-7uLHbUEHu9BsC14FXikiApnruLZnMavyFPD+jSAU3XY=";
})
(fetchNuGet {
pname = "Google.Protobuf";
version = "3.26.1";
hash = "sha256-1tHxDuJwwvJWZ3H9ooPFAKuaJIthSdTDlmjHlxH/euc=";
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
version = "8.0.10";
hash = "sha256-GL7OjLalZPKLsoheVJAmVStJFpJ7zTDJtikCP7fB3jU=";
})
(fetchNuGet {
pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
version = "8.0.10";
hash = "sha256-u6/4q54irXtyKSSi1bH6HYrvcod7yfs5YdYD0NXeYbs=";
})
(fetchNuGet {
pname = "Microsoft.CodeCoverage";
version = "17.4.0";
hash = "sha256-YDALPHtbD+zMN+Llm0aKSG1rp5adKZl7R14h8vdLlZ4=";
})
(fetchNuGet {
pname = "Microsoft.NET.Test.Sdk";
version = "17.4.0";
hash = "sha256-jXKJwOZBy4NJtWwPRjw5wLmNGJD6Wr+YYCokIOIXONA=";
})
(fetchNuGet {
pname = "Microsoft.NETCore.App.Host.osx-arm64";
version = "8.0.10";
hash = "sha256-IZ59kjeU/mGHBVXtOO5AFK0ocxwFAkFqwtn99N+l0zw=";
})
(fetchNuGet {
pname = "Microsoft.NETCore.App.Host.osx-x64";
version = "8.0.10";
hash = "sha256-B4aqUvMpyewAwquTRVh+bs2RG875ZsveYQU89+4VFxw=";
})
(fetchNuGet {
pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
version = "8.0.10";
hash = "sha256-0fH2KlzVL5ydblrVtBtAoHa5kNYY92Wzv8FCVqav3Mw=";
})
(fetchNuGet {
pname = "Microsoft.NETCore.App.Runtime.osx-x64";
version = "8.0.10";
hash = "sha256-XKUQ0DDWWbZNtgGPKhdI7ufpd9Ki1EcOcK9ojiaWEVM=";
})
(fetchNuGet {
pname = "Microsoft.NETCore.Platforms";
version = "1.1.0";
hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=";
})
(fetchNuGet {
pname = "Microsoft.NETCore.Targets";
version = "1.1.0";
hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=";
})
(fetchNuGet {
pname = "Microsoft.TestPlatform.ObjectModel";
version = "17.4.0";
hash = "sha256-SyCFW5vyzm4/YSKogIhmYYUvWdS2pPRur17JMxMOiDY=";
})
(fetchNuGet {
pname = "Microsoft.TestPlatform.TestHost";
version = "17.4.0";
hash = "sha256-xPsmpE7pSfZonzvtMaJtVMCeszBqUPGzTWWSYpt65sY=";
})
(fetchNuGet {
pname = "Microsoft.Win32.Primitives";
version = "4.3.0";
hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=";
})
(fetchNuGet {
pname = "NETStandard.Library";
version = "1.6.1";
hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=";
})
(fetchNuGet {
pname = "Newtonsoft.Json";
version = "13.0.1";
hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=";
})
(fetchNuGet {
pname = "Newtonsoft.Json";
version = "13.0.3";
hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=";
})
(fetchNuGet {
pname = "NuGet.Frameworks";
version = "5.11.0";
hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM=";
})
(fetchNuGet {
pname = "runtime.any.System.Collections";
version = "4.3.0";
hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=";
})
(fetchNuGet {
pname = "runtime.any.System.Diagnostics.Tools";
version = "4.3.0";
hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=";
})
(fetchNuGet {
pname = "runtime.any.System.Diagnostics.Tracing";
version = "4.3.0";
hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=";
})
(fetchNuGet {
pname = "runtime.any.System.Globalization";
version = "4.3.0";
hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=";
})
(fetchNuGet {
pname = "runtime.any.System.Globalization.Calendars";
version = "4.3.0";
hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=";
})
(fetchNuGet {
pname = "runtime.any.System.IO";
version = "4.3.0";
hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=";
})
(fetchNuGet {
pname = "runtime.any.System.Reflection";
version = "4.3.0";
hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=";
})
(fetchNuGet {
pname = "runtime.any.System.Reflection.Extensions";
version = "4.3.0";
hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=";
})
(fetchNuGet {
pname = "runtime.any.System.Reflection.Primitives";
version = "4.3.0";
hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=";
})
(fetchNuGet {
pname = "runtime.any.System.Resources.ResourceManager";
version = "4.3.0";
hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=";
})
(fetchNuGet {
pname = "runtime.any.System.Runtime";
version = "4.3.0";
hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=";
})
(fetchNuGet {
pname = "runtime.any.System.Runtime.Handles";
version = "4.3.0";
hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=";
})
(fetchNuGet {
pname = "runtime.any.System.Runtime.InteropServices";
version = "4.3.0";
hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=";
})
(fetchNuGet {
pname = "runtime.any.System.Text.Encoding";
version = "4.3.0";
hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=";
})
(fetchNuGet {
pname = "runtime.any.System.Text.Encoding.Extensions";
version = "4.3.0";
hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=";
})
(fetchNuGet {
pname = "runtime.any.System.Threading.Tasks";
version = "4.3.0";
hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=";
})
(fetchNuGet {
pname = "runtime.any.System.Threading.Timer";
version = "4.3.0";
hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=";
})
(fetchNuGet {
pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=";
})
(fetchNuGet {
pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=";
})
(fetchNuGet {
pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=";
})
(fetchNuGet {
pname = "runtime.native.System";
version = "4.3.0";
hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=";
})
(fetchNuGet {
pname = "runtime.native.System.IO.Compression";
version = "4.3.0";
hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=";
})
(fetchNuGet {
pname = "runtime.native.System.Net.Http";
version = "4.3.0";
hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=";
})
(fetchNuGet {
pname = "runtime.native.System.Security.Cryptography.Apple";
version = "4.3.0";
hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=";
})
(fetchNuGet {
pname = "runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=";
})
(fetchNuGet {
pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=";
})
(fetchNuGet {
pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=";
})
(fetchNuGet {
pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple";
version = "4.3.0";
hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=";
})
(fetchNuGet {
pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=";
})
(fetchNuGet {
pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=";
})
(fetchNuGet {
pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=";
})
(fetchNuGet {
pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=";
})
(fetchNuGet {
pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=";
})
(fetchNuGet {
pname = "runtime.unix.Microsoft.Win32.Primitives";
version = "4.3.0";
hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=";
})
(fetchNuGet {
pname = "runtime.unix.System.Console";
version = "4.3.0";
hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=";
})
(fetchNuGet {
pname = "runtime.unix.System.Diagnostics.Debug";
version = "4.3.0";
hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=";
})
(fetchNuGet {
pname = "runtime.unix.System.IO.FileSystem";
version = "4.3.0";
hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=";
})
(fetchNuGet {
pname = "runtime.unix.System.Net.Primitives";
version = "4.3.0";
hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=";
})
(fetchNuGet {
pname = "runtime.unix.System.Net.Sockets";
version = "4.3.0";
hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=";
})
(fetchNuGet {
pname = "runtime.unix.System.Private.Uri";
version = "4.3.0";
hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=";
})
(fetchNuGet {
pname = "runtime.unix.System.Runtime.Extensions";
version = "4.3.0";
hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=";
})
(fetchNuGet {
pname = "SDL2-CS.NetCore";
version = "2.0.8";
hash = "sha256-8uz6Y2G9fLQkjs+7t7QPdUJFXs9bKAYeoGP+174OE/k=";
})
(fetchNuGet {
pname = "Serilog";
version = "4.0.0";
hash = "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw=";
})
(fetchNuGet {
pname = "Serilog.Enrichers.Thread";
version = "4.0.0";
hash = "sha256-lo+3ohNHKe/hTq9vGbk29p/OWcNlcyJToGL6EpCJQm8=";
})
(fetchNuGet {
pname = "Serilog.Sinks.Console";
version = "6.0.0";
hash = "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro=";
})
(fetchNuGet {
pname = "Serilog.Sinks.File";
version = "6.0.0";
hash = "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow=";
})
(fetchNuGet {
pname = "System.AppContext";
version = "4.3.0";
hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=";
})
(fetchNuGet {
pname = "System.Buffers";
version = "4.3.0";
hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=";
})
(fetchNuGet {
pname = "System.Collections";
version = "4.3.0";
hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=";
})
(fetchNuGet {
pname = "System.Collections.Concurrent";
version = "4.3.0";
hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=";
})
(fetchNuGet {
pname = "System.Console";
version = "4.3.0";
hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=";
})
(fetchNuGet {
pname = "System.Diagnostics.Debug";
version = "4.3.0";
hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=";
})
(fetchNuGet {
pname = "System.Diagnostics.DiagnosticSource";
version = "4.3.0";
hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=";
})
(fetchNuGet {
pname = "System.Diagnostics.Tools";
version = "4.3.0";
hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=";
})
(fetchNuGet {
pname = "System.Diagnostics.Tracing";
version = "4.3.0";
hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=";
})
(fetchNuGet {
pname = "System.Globalization";
version = "4.3.0";
hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=";
})
(fetchNuGet {
pname = "System.Globalization.Calendars";
version = "4.3.0";
hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=";
})
(fetchNuGet {
pname = "System.Globalization.Extensions";
version = "4.3.0";
hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=";
})
(fetchNuGet {
pname = "System.IO";
version = "4.3.0";
hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=";
})
(fetchNuGet {
pname = "System.IO.Compression";
version = "4.3.0";
hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=";
})
(fetchNuGet {
pname = "System.IO.Compression.ZipFile";
version = "4.3.0";
hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=";
})
(fetchNuGet {
pname = "System.IO.FileSystem";
version = "4.3.0";
hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=";
})
(fetchNuGet {
pname = "System.IO.FileSystem.Primitives";
version = "4.3.0";
hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=";
})
(fetchNuGet {
pname = "System.Linq";
version = "4.3.0";
hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=";
})
(fetchNuGet {
pname = "System.Linq.Expressions";
version = "4.3.0";
hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=";
})
(fetchNuGet {
pname = "System.Net.Http";
version = "4.3.0";
hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=";
})
(fetchNuGet {
pname = "System.Net.NameResolution";
version = "4.3.0";
hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=";
})
(fetchNuGet {
pname = "System.Net.Primitives";
version = "4.3.0";
hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=";
})
(fetchNuGet {
pname = "System.Net.Sockets";
version = "4.3.0";
hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=";
})
(fetchNuGet {
pname = "System.ObjectModel";
version = "4.3.0";
hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=";
})
(fetchNuGet {
pname = "System.Private.Uri";
version = "4.3.0";
hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=";
})
(fetchNuGet {
pname = "System.Reflection";
version = "4.3.0";
hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=";
})
(fetchNuGet {
pname = "System.Reflection.Emit";
version = "4.3.0";
hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=";
})
(fetchNuGet {
pname = "System.Reflection.Emit.ILGeneration";
version = "4.3.0";
hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=";
})
(fetchNuGet {
pname = "System.Reflection.Emit.Lightweight";
version = "4.3.0";
hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=";
})
(fetchNuGet {
pname = "System.Reflection.Extensions";
version = "4.3.0";
hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=";
})
(fetchNuGet {
pname = "System.Reflection.Metadata";
version = "1.6.0";
hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=";
})
(fetchNuGet {
pname = "System.Reflection.Primitives";
version = "4.3.0";
hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=";
})
(fetchNuGet {
pname = "System.Reflection.TypeExtensions";
version = "4.3.0";
hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=";
})
(fetchNuGet {
pname = "System.Resources.ResourceManager";
version = "4.3.0";
hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=";
})
(fetchNuGet {
pname = "System.Runtime";
version = "4.3.0";
hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=";
})
(fetchNuGet {
pname = "System.Runtime.Extensions";
version = "4.3.0";
hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=";
})
(fetchNuGet {
pname = "System.Runtime.Handles";
version = "4.3.0";
hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=";
})
(fetchNuGet {
pname = "System.Runtime.InteropServices";
version = "4.3.0";
hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=";
})
(fetchNuGet {
pname = "System.Runtime.InteropServices.RuntimeInformation";
version = "4.3.0";
hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=";
})
(fetchNuGet {
pname = "System.Runtime.Numerics";
version = "4.3.0";
hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=";
})
(fetchNuGet {
pname = "System.Security.Claims";
version = "4.3.0";
hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.Algorithms";
version = "4.3.0";
hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.Cng";
version = "4.3.0";
hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.Csp";
version = "4.3.0";
hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.Encoding";
version = "4.3.0";
hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.OpenSsl";
version = "4.3.0";
hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.Primitives";
version = "4.3.0";
hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=";
})
(fetchNuGet {
pname = "System.Security.Cryptography.X509Certificates";
version = "4.3.0";
hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=";
})
(fetchNuGet {
pname = "System.Security.Principal";
version = "4.3.0";
hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=";
})
(fetchNuGet {
pname = "System.Security.Principal.Windows";
version = "4.3.0";
hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=";
})
(fetchNuGet {
pname = "System.Text.Encoding";
version = "4.3.0";
hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=";
})
(fetchNuGet {
pname = "System.Text.Encoding.Extensions";
version = "4.3.0";
hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=";
})
(fetchNuGet {
pname = "System.Text.RegularExpressions";
version = "4.3.0";
hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=";
})
(fetchNuGet {
pname = "System.Threading";
version = "4.3.0";
hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=";
})
(fetchNuGet {
pname = "System.Threading.Tasks";
version = "4.3.0";
hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=";
})
(fetchNuGet {
pname = "System.Threading.Tasks.Extensions";
version = "4.3.0";
hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=";
})
(fetchNuGet {
pname = "System.Threading.ThreadPool";
version = "4.3.0";
hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=";
})
(fetchNuGet {
pname = "System.Threading.Timer";
version = "4.3.0";
hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=";
})
(fetchNuGet {
pname = "System.Xml.ReaderWriter";
version = "4.3.0";
hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=";
})
(fetchNuGet {
pname = "System.Xml.XDocument";
version = "4.3.0";
hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=";
})
(fetchNuGet {
pname = "xunit";
version = "2.4.2";
hash = "sha256-tePXTtlRgTAhfnUzc13Y9MwowU/cKttl1qlzHLqhWS0=";
})
(fetchNuGet {
pname = "xunit.abstractions";
version = "2.0.3";
hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM=";
})
(fetchNuGet {
pname = "xunit.analyzers";
version = "1.0.0";
hash = "sha256-hZEaTaJN0bWw9q8tha5RziGlZ/lkDrj2S+QLQxgRjlw=";
})
(fetchNuGet {
pname = "xunit.assert";
version = "2.4.2";
hash = "sha256-wMyRXZzDn9Se4c0Pzzn0U4YuKRiUtu6o4MoPjJPPzUU=";
})
(fetchNuGet {
pname = "xunit.core";
version = "2.4.2";
hash = "sha256-jRFoW8LSuqDINuJlno3xT3VfdkHFVEbDKctU/mISIMc=";
})
(fetchNuGet {
pname = "xunit.extensibility.core";
version = "2.4.2";
hash = "sha256-wlTMUOQg5NaAPEsWkNSr8QSPbbCNSicpFajp1rowCsA=";
})
(fetchNuGet {
pname = "xunit.extensibility.execution";
version = "2.4.2";
hash = "sha256-l5Q60IBYWE5tYJCdFEEQnO5rIlXcNEM5S4Ut8vFnL2U=";
})
(fetchNuGet {
pname = "xunit.runner.visualstudio";
version = "2.4.5";
hash = "sha256-Gv7U1VPKfNb7IOWrwUGUKAeurKtE3AtQmegDFNkYHHk=";
})
]

View File

@ -0,0 +1,58 @@
{
buildDotnetModule,
lib,
fetchFromGitHub,
dotnetCorePackages,
SDL2,
SDL2_image,
SDL2_ttf,
}:
let
dotnet = dotnetCorePackages.dotnet_8;
in
buildDotnetModule (finalAttrs: {
pname = "yafc-ce";
version = "2.0.1";
src = fetchFromGitHub {
owner = "shpaass";
repo = "yafc-ce";
rev = finalAttrs.version;
hash = "sha256-qJOEdP2jRqK0E9Q4n7YgO5jyHxztb8aVOTlLDq1VvMk=";
};
projectFile = [ "Yafc/Yafc.csproj" ];
testProjectFile = [ "Yafc.Model.Tests/Yafc.Model.Tests.csproj" ];
nugetDeps = ./deps.nix;
dotnet-sdk = dotnet.sdk;
dotnet-runtime = dotnet.runtime;
executables = [ "Yafc" ];
runtimeDeps = [
SDL2
SDL2_ttf
SDL2_image
];
meta = {
description = "Powerful Factorio calculator/analyser that works with mods, Community Edition";
longDescription = ''
Yet Another Factorio Calculator or YAFC is a planner and analyzer.
The main goal of YAFC is to help with heavily modded Factorio games.
YAFC Community Edition is an updated and actively-maintained version of the original YAFC.
'';
homepage = "https://github.com/shpaass/yafc-ce";
downloadPage = "https://github.com/shpaass/yafc-ce/releases/tag/${finalAttrs.version}";
changelog = "https://github.com/shpaass/yafc-ce/releases/tag/${finalAttrs.version}";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [
diamond-deluxe
TheColorman
];
platforms = with lib.platforms; x86_64 ++ darwin;
mainProgram = "Yafc";
};
})

View File

@ -62,6 +62,7 @@ let
mathcomp_ = package: let mathcomp_ = package: let
classical-deps = [ mathcomp.algebra mathcomp-finmap ]; classical-deps = [ mathcomp.algebra mathcomp-finmap ];
altreals-deps = [ mathcomp-bigenough ];
analysis-deps = [ mathcomp.field mathcomp-bigenough ]; analysis-deps = [ mathcomp.field mathcomp-bigenough ];
intra-deps = lib.optionals (package != "single") (map mathcomp_ packages.${package}); intra-deps = lib.optionals (package != "single") (map mathcomp_ packages.${package});
pkgpath = lib.switch package [ pkgpath = lib.switch package [
@ -80,6 +81,7 @@ let
propagatedBuildInputs = propagatedBuildInputs =
intra-deps intra-deps
++ lib.optionals (lib.elem package [ "classical" "single" ]) classical-deps ++ lib.optionals (lib.elem package [ "classical" "single" ]) classical-deps
++ lib.optionals (lib.elem package [ "altreals" "single" ]) altreals-deps
++ lib.optionals (lib.elem package [ "analysis" "single" ]) analysis-deps; ++ lib.optionals (lib.elem package [ "analysis" "single" ]) analysis-deps;
preBuild = '' preBuild = ''

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "tdlib"; pname = "tdlib";
version = "1.8.37"; version = "1.8.38";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tdlib"; owner = "tdlib";
@ -11,8 +11,8 @@ stdenv.mkDerivation {
# The tdlib authors do not set tags for minor versions, but # The tdlib authors do not set tags for minor versions, but
# external programs depending on tdlib constrain the minor # external programs depending on tdlib constrain the minor
# version, hence we set a specific commit with a known version. # version, hence we set a specific commit with a known version.
rev = "21e5ce0e977fe012e0cee4e6fcfe704b47b00774"; rev = "d321984b75fccdb76239529e8aadcf7f80b0e35a";
hash = "sha256-gQFsdc/FXjuA1WdZ6iF7KxLQX/7+r1I5FcdEAyJSaqU="; hash = "sha256-5QNcpwW0viWUtsW7b5oSq6X0tRyup6V5CT/BNhdv6lw=";
}; };
buildInputs = [ gperf openssl readline zlib ]; buildInputs = [ gperf openssl readline zlib ];

View File

@ -21,14 +21,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cohere"; pname = "cohere";
version = "5.11.1"; version = "5.11.2";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cohere-ai"; owner = "cohere-ai";
repo = "cohere-python"; repo = "cohere-python";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-3fYc0jOfmQ8wnKb5JZY+fXoN+8dXhJi5bj2TJHJaOEo="; hash = "sha256-QwloUY22Zy+gu8ggpLReXHXw11sZ/P0/Ao75a85MKN4=";
}; };
build-system = [ poetry-core ]; build-system = [ poetry-core ];

View File

@ -4,18 +4,19 @@
fetchFromGitHub, fetchFromGitHub,
django-guardian, django-guardian,
djangorestframework, djangorestframework,
setuptools,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "djangorestframework-guardian2"; pname = "djangorestframework-guardian2";
version = "0.5.0"; version = "0.7.0";
format = "setuptools"; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "johnthagen"; owner = "johnthagen";
repo = "django-rest-framework-guardian2"; repo = "django-rest-framework-guardian2";
rev = "v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-aW20xEmVTAgwayWMJsabmyKNW65NftJyQANtT6JV74U="; hash = "sha256-LrIhOoBWC3HttjAGbul4zof++OW35pGMyFGZzUpG1Tk=";
}; };
postPatch = '' postPatch = ''
@ -23,7 +24,9 @@ buildPythonPackage rec {
patchShebangs manage.py patchShebangs manage.py
''; '';
propagatedBuildInputs = [ build-system = [ setuptools ];
dependencies = [
django-guardian django-guardian
djangorestframework djangorestframework
]; ];

View File

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "flask-session-captcha"; pname = "flask-session-captcha";
version = "1.4.2"; version = "1.5.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Tethik"; owner = "Tethik";
repo = "flask-session-captcha"; repo = "flask-session-captcha";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-hf6ifTrsWvgvUHFAPdS8ns8aKN02zquLGCq5ouQF0ck="; hash = "sha256-2JPJx8yQIl0bbcbshONJtja7BnSiieHzHi64A6jLpc0=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View File

@ -18,14 +18,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "huggingface-hub"; pname = "huggingface-hub";
version = "0.26.1"; version = "0.26.2";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "huggingface"; owner = "huggingface";
repo = "huggingface_hub"; repo = "huggingface_hub";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-tro4Cvjyjc1vfAvYnfeKjh8ej83Z8l4cKe8SqIBVLXg="; hash = "sha256-F2E8P0Hq3Ee+RXUEN4t2JtfBtK36aMsHQCnid9VWdLk=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View File

@ -58,20 +58,26 @@ buildPythonPackage rec {
tqdm tqdm
]; ];
# aarch64-linux tries to get cpu information from /sys, which isn't available
# inside the nix build sandbox.
dontUsePythonImportsCheck = stdenv.buildPlatform.system == "aarch64-linux";
passthru.tests = lib.optionalAttrs (stdenv.buildPlatform.system != "aarch64-linux") {
version = testers.testVersion {
package = insightface;
command = "insightface-cli --help";
# Doesn't support --version but we still want to make sure the cli is executable
# and returns the help output
version = "help";
};
};
pythonImportsCheck = [ pythonImportsCheck = [
"insightface" "insightface"
"insightface.app" "insightface.app"
"insightface.data" "insightface.data"
]; ];
passthru.tests.version = testers.testVersion {
package = insightface;
command = "insightface-cli --help";
# Doesn't support --version but we still want to make sure the cli is executable
# and returns the help output
version = "help";
};
doCheck = false; # Upstream has no tests doCheck = false; # Upstream has no tests
meta = { meta = {
@ -80,7 +86,5 @@ buildPythonPackage rec {
homepage = "https://github.com/deepinsight/insightface"; homepage = "https://github.com/deepinsight/insightface";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ oddlama ]; maintainers = with lib.maintainers; [ oddlama ];
# terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException'
broken = stdenv.system == "aarch64-linux";
}; };
} }

View File

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "meilisearch"; pname = "meilisearch";
version = "0.31.5"; version = "0.31.6";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "meilisearch"; owner = "meilisearch";
repo = "meilisearch-python"; repo = "meilisearch-python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-br+FnUnwDt64dvZAMEK/oqESCWZuOUt9Lp9HGcIPqxc="; hash = "sha256-YMKspKryhcxecIDLg3PiKHJoRtQBsIi8N//ZtAMBvMg=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View File

@ -1,7 +1,6 @@
{ {
lib, lib,
buildPythonPackage, buildPythonPackage,
pythonOlder,
fetchFromGitHub, fetchFromGitHub,
# build-system # build-system
@ -13,22 +12,20 @@
pandas, pandas,
scipy, scipy,
# checks # tests
pytestCheckHook, pytestCheckHook,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "mizani"; pname = "mizani";
version = "0.12.2"; version = "0.13.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "has2k1"; owner = "has2k1";
repo = "mizani"; repo = "mizani";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-aTc8LC/2zLrrTfOXABWs049m752PctpvlguA6qhyhp8="; hash = "sha256-UzedAhYGgGLOMUyZe3ew4a2gh1UgYHaLsIe9k85rOkg=";
}; };
build-system = [ setuptools-scm ]; build-system = [ setuptools-scm ];

View File

@ -17,7 +17,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "peewee"; pname = "peewee";
version = "3.17.6"; version = "3.17.7";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "coleifer"; owner = "coleifer";
repo = "peewee"; repo = "peewee";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-HluoCXblqwaOb+gtAhvaYshTj9CtHoegn0QUaq0V+eA="; hash = "sha256-j10c3mnrHISk04l65ieUB11jt3a3iiQsroTt/L0tKaw=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View File

@ -2,31 +2,34 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
geopandas,
# build-system
setuptools-scm,
# dependencies
matplotlib, matplotlib,
mizani, mizani,
pandas, pandas,
patsy, patsy,
pytestCheckHook,
pythonOlder,
scikit-misc,
scipy, scipy,
setuptools-scm,
statsmodels, statsmodels,
# tests
geopandas,
pytestCheckHook,
scikit-misc,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "plotnine"; pname = "plotnine";
version = "0.13.6"; version = "0.14.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "has2k1"; owner = "has2k1";
repo = "plotnine"; repo = "plotnine";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-/yxRYK3ZTrYj+l3TQhFllyICnJjCZPd4ebNurCLZAYg="; hash = "sha256-4x7euxf+G/HaqC3LVD7TCQEVcihdb/FSMqRvMWAqhgo=";
}; };
postPatch = '' postPatch = ''
@ -36,8 +39,6 @@ buildPythonPackage rec {
build-system = [ setuptools-scm ]; build-system = [ setuptools-scm ];
pythonRelaxDeps = [ "mizani" ];
dependencies = [ dependencies = [
matplotlib matplotlib
mizani mizani

View File

@ -55,6 +55,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
protobuf # for protoc
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
]; ];

View File

@ -1,5 +1,6 @@
{ {
lib, lib,
antlr4_9,
antlr4-python3-runtime, antlr4-python3-runtime,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
@ -23,15 +24,10 @@ buildPythonPackage rec {
hash = "sha256-lFgnvI5a7U7/Qj4Pqjr3mx4TNDnC2/Ru7tVG7VggR7Y="; hash = "sha256-lFgnvI5a7U7/Qj4Pqjr3mx4TNDnC2/Ru7tVG7VggR7Y=";
}; };
postPatch = ''
substituteInPlace setup.py \
--replace-fail "antlr4-python3-runtime~=" "antlr4-python3-runtime>="
'';
build-system = [ setuptools ]; build-system = [ setuptools ];
dependencies = [ dependencies = [
antlr4-python3-runtime (antlr4-python3-runtime.override { antlr4 = antlr4_9; })
six six
]; ];
@ -39,14 +35,6 @@ buildPythonPackage rec {
pythonImportsCheck = [ "stix2patterns" ]; pythonImportsCheck = [ "stix2patterns" ];
disabledTestPaths = [
# Exception: Could not deserialize ATN with version (expected 4)
"stix2patterns/test/v20/test_inspector.py"
"stix2patterns/test/v21/test_inspector.py"
"stix2patterns/test/v20/test_validator.py"
"stix2patterns/test/v21/test_validator.py"
];
meta = with lib; { meta = with lib; {
description = "Validate patterns used to express cyber observable content in STIX Indicators"; description = "Validate patterns used to express cyber observable content in STIX Indicators";
mainProgram = "validate-patterns"; mainProgram = "validate-patterns";

View File

@ -20,7 +20,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "urwid"; pname = "urwid";
version = "2.6.15"; version = "2.6.16";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "urwid"; owner = "urwid";
repo = "urwid"; repo = "urwid";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-bBgzhNNYxNZKaSo43I3fMoR+j6XDV6UBNrZfQyZ/f7c="; hash = "sha256-D5NHtU7XQRh8OqkwrN5r8U/VGF87LGwdnaqGhdjN8AE=";
}; };
postPatch = '' postPatch = ''

View File

@ -1,4 +1,10 @@
{ lib, stdenv, fetchFromSourcehut, luaPackages, lua }: {
lib,
stdenv,
fetchFromSourcehut,
lua,
luaPackages,
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fnlfmt"; pname = "fnlfmt";
@ -15,26 +21,26 @@ stdenv.mkDerivation rec {
buildInputs = [ lua ]; buildInputs = [ lua ];
buildPhase = '' makeFlags = [
runHook preBuild "PREFIX=$(out)"
"FENNEL=${luaPackages.fennel}/bin/fennel"
];
sourceRoot = [ "${src.name}/tags/${version}" ];
echo "#!${lua}/bin/lua" > fnlfmt doInstallCheck = true;
${luaPackages.fennel}/bin/fennel --require-as-include --compile tags/${version}/cli.fnl >> fnlfmt installCheckPhase = ''
chmod +x fnlfmt runHook preInstallCheck
runHook postBuild $out/bin/fnlfmt --help > /dev/null
'';
installPhase = '' runHook postInstallCheck
runHook preInstall
install -D ./fnlfmt $out/bin/fnlfmt
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {
description = "Formatter for Fennel"; description = "Formatter for Fennel";
homepage = "https://git.sr.ht/~technomancy/fnlfmt"; homepage = src.meta.homepage;
license = licenses.lgpl3Plus; changelog = "${src.meta.homepage}/tree/${version}/changelog.md";
license = licenses.mit;
platforms = lua.meta.platforms; platforms = lua.meta.platforms;
maintainers = with maintainers; [ chiroptical ]; maintainers = with maintainers; [ chiroptical ];
mainProgram = "fnlfmt"; mainProgram = "fnlfmt";

View File

@ -89,5 +89,6 @@ in lib.makeExtensible (self: {
xcode_15_3 = requireXcode "15.3" "sha256-FyVA8EEPCI12Z4sJ4RQRZlMMpFmi7S8VYLcyvad3swM="; xcode_15_3 = requireXcode "15.3" "sha256-FyVA8EEPCI12Z4sJ4RQRZlMMpFmi7S8VYLcyvad3swM=";
xcode_15_4 = requireXcode "15.4" "sha256-yeo+sf6bBIJy9/1sQiMuPEMPniwGXMB6/FXXL0UrI5U="; xcode_15_4 = requireXcode "15.4" "sha256-yeo+sf6bBIJy9/1sQiMuPEMPniwGXMB6/FXXL0UrI5U=";
xcode_16 = requireXcode "16" "sha256-i/MMcEi5wCpe5+nGo6gUTsFFCoorORydAn7D/GClEdo="; xcode_16 = requireXcode "16" "sha256-i/MMcEi5wCpe5+nGo6gUTsFFCoorORydAn7D/GClEdo=";
xcode_16_1 = requireXcode "16.1" "sha256-yYg6NRRnYM/5X3hhVMfcXcdoiOV36fIongJNQ5nviD8=";
xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}"; xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}";
}) })

View File

@ -11,6 +11,10 @@
}: }:
let let
meta = {
maintainers = with lib.maintainers; [ peterhoeg ];
platforms = lib.platforms.linux;
};
dep = { pname, version, hash, rev ? "v${version}", buildInputs ? [ ] }: dep = { pname, version, hash, rev ? "v${version}", buildInputs ? [ ] }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -22,6 +26,14 @@ let
}; };
nativeBuildInputs = [ meson ninja pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config ];
inherit buildInputs; inherit buildInputs;
meta = meta // {
description = "The C-Util Project is a collection of utility libraries for the C11 language.";
homepage = "https://c-util.github.io/";
license = [
lib.licenses.asl20
lib.licenses.lgpl21Plus
];
};
}; };
# These libraries are not used outside of dbus-broker. # These libraries are not used outside of dbus-broker.
@ -89,11 +101,9 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true; doCheck = true;
meta = with lib; { meta = meta // {
description = "Linux D-Bus Message Broker"; description = "Linux D-Bus Message Broker";
homepage = "https://github.com/bus1/dbus-broker/wiki"; homepage = "https://github.com/bus1/dbus-broker/wiki";
license = licenses.asl20; license = lib.licenses.asl20;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
}; };
}) })

View File

@ -14,7 +14,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "slurm"; pname = "slurm";
version = "24.05.3.1"; version = "24.05.4.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases. # because the latter does not keep older releases.
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
repo = "slurm"; repo = "slurm";
# The release tags use - instead of . # The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
hash = "sha256-qYIpYBjbYgbYzPKEgKEEXEf/0bFyp1sFFl7A7mq6Nco="; hash = "sha256-sviXuRJOpuSoOMNjGPRe11qlphk0Y1/YV/Y5M+QkWys=";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

View File

@ -1,4 +1,4 @@
{ lib, stdenvNoCC, fetchurl, nixosTests }: { lib, stdenvNoCC, fetchurl, imagemagick, nixosTests }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "mediawiki"; pname = "mediawiki";
@ -11,6 +11,10 @@ stdenvNoCC.mkDerivation rec {
postPatch = '' postPatch = ''
sed -i 's|$vars = Installer::getExistingLocalSettings();|$vars = null;|' includes/installer/CliInstaller.php sed -i 's|$vars = Installer::getExistingLocalSettings();|$vars = null;|' includes/installer/CliInstaller.php
# fix generating previews for SVGs
substituteInPlace includes/config-schema.php \
--replace-fail "\$path/convert" "${imagemagick}/bin/convert"
''; '';
installPhase = '' installPhase = ''

View File

@ -30,13 +30,17 @@
, libxcrypt , libxcrypt
, hostname , hostname
, nixosTests , nixosTests
, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl , withSecurityKey ? !stdenv.hostPlatform.isStatic
, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl && withSecurityKey
, withPAM ? stdenv.hostPlatform.isLinux , withPAM ? stdenv.hostPlatform.isLinux
, dsaKeysSupport ? false , dsaKeysSupport ? false
, linkOpenssl ? true , linkOpenssl ? true
, isNixos ? stdenv.hostPlatform.isLinux , isNixos ? stdenv.hostPlatform.isLinux
}: }:
# FIDO support requires SK support
assert withFIDO -> withSecurityKey;
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
inherit pname version src; inherit pname version src;
@ -96,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.withFeature withPAM "pam") (lib.withFeature withPAM "pam")
(lib.enableFeature dsaKeysSupport "dsa-keys") (lib.enableFeature dsaKeysSupport "dsa-keys")
] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}" ] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}"
++ lib.optional (!withSecurityKey) "--disable-security-key"
++ lib.optional withFIDO "--with-security-key-builtin=yes" ++ lib.optional withFIDO "--with-security-key-builtin=yes"
++ lib.optional withKerberos (assert krb5 != null; "--with-kerberos5=${lib.getDev krb5}") ++ lib.optional withKerberos (assert krb5 != null; "--with-kerberos5=${lib.getDev krb5}")
++ lib.optional stdenv.hostPlatform.isDarwin "--disable-libutil" ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-libutil"
@ -103,7 +108,9 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional withLdns "--with-ldns" ++ lib.optional withLdns "--with-ldns"
++ extraConfigureFlags; ++ extraConfigureFlags;
${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null}= [ "-laudit" ] ++ lib.optionals withKerberos [ "-lkeyutils" ]; ${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null} = [ "-laudit" ]
++ lib.optional withKerberos "-lkeyutils"
++ lib.optional withLdns "-lcrypto";
buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ]; buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ];

View File

@ -6,13 +6,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gau"; pname = "gau";
version = "2.2.3"; version = "2.2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lc"; owner = "lc";
repo = "gau"; repo = "gau";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-1sF33uat6nwtTaXbZzO8YF4jewyQJ6HvI2l/zyTrJsg="; hash = "sha256-B2l5joHeFDjYmdb3F1FFDKjIKENZu92O2sMlkf3Sf6Y=";
}; };
vendorHash = "sha256-nhsGhuX5AJMHg+zQUt1G1TwVgMCxnuJ2T3uBrx7bJNs="; vendorHash = "sha256-nhsGhuX5AJMHg+zQUt1G1TwVgMCxnuJ2T3uBrx7bJNs=";

View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,6 +15,15 @@ stdenv.mkDerivation rec {
hash = "sha256-mjjK315OUUFVdUY+zcCvm7yeo7XxourR1sghWbeFT7c="; hash = "sha256-mjjK315OUUFVdUY+zcCvm7yeo7XxourR1sghWbeFT7c=";
}; };
patches = [
# fix cross compilation by replacing hardcoded ar with AC_PROG_AR
# https://github.com/ColumPaget/Hashrat/pull/27
(fetchpatch {
url = "https://github.com/ColumPaget/Hashrat/commit/a82615e02021245850a1703e613055da2520c8fd.patch";
hash = "sha256-tjyhM2ahZBRoRP8WjyQhrI3l20oaqMtfYmOeAZVEZqU=";
})
];
configureFlags = [ "--enable-xattr" ]; configureFlags = [ "--enable-xattr" ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

View File

@ -679,6 +679,8 @@ with pkgs;
inherit (darwin) DarwinTools; inherit (darwin) DarwinTools;
}; };
mumps_par = callPackage ../by-name/mu/mumps/package.nix { mpiSupport = true; };
mix2nix = callPackage ../development/tools/mix2nix { }; mix2nix = callPackage ../development/tools/mix2nix { };
n98-magerun = callPackage ../development/tools/misc/n98-magerun { }; n98-magerun = callPackage ../development/tools/misc/n98-magerun { };

View File

@ -223,7 +223,7 @@ impure-cmds // apple-source-packages // apple-source-headers // stubs // {
xcode_13 xcode_13_1 xcode_13_2 xcode_13_3 xcode_13_3_1 xcode_13_4 xcode_13_4_1 xcode_13 xcode_13_1 xcode_13_2 xcode_13_3 xcode_13_3_1 xcode_13_4 xcode_13_4_1
xcode_14 xcode_14_1 xcode_14 xcode_14_1
xcode_15 xcode_15_0_1 xcode_15_1 xcode_15_2 xcode_15_3 xcode_15_4 xcode_15 xcode_15_0_1 xcode_15_1 xcode_15_2 xcode_15_3 xcode_15_4
xcode_16 xcode_16 xcode_16_1
xcode; xcode;
xcodeProjectCheckHook = pkgs.makeSetupHook { xcodeProjectCheckHook = pkgs.makeSetupHook {

View File

@ -10307,7 +10307,9 @@ self: super: with self; {
pykrakenapi = callPackage ../development/python-modules/pykrakenapi { }; pykrakenapi = callPackage ../development/python-modules/pykrakenapi { };
pylance = callPackage ../development/python-modules/pylance { }; pylance = callPackage ../development/python-modules/pylance {
inherit (pkgs) protobuf;
};
pylddwrap = callPackage ../development/python-modules/pylddwrap { }; pylddwrap = callPackage ../development/python-modules/pylddwrap { };