diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 73a33c907feb..4d52a7eb5189 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5437,6 +5437,12 @@ githubId = 4490283; name = "diadatp"; }; + diamond-deluxe = { + email = "carbon_lattice@proton.me"; + github = "diamond-deluxe"; + githubId = 112557036; + name = "Diamond"; + }; DianaOlympos = { github = "DianaOlympos"; githubId = 15774340; @@ -17670,6 +17676,12 @@ githubId = 12017109; name = "Rabindra Dhakal"; }; + qbisi = { + name = "qbisicwate"; + email = "qbisicwate@gmail.com"; + github = "qbisi"; + githubId = 84267544; + }; qbit = { name = "Aaron Bieber"; email = "aaron@bolddaemon.com"; @@ -18246,6 +18258,11 @@ githubId = 3302; name = "Renzo Carbonara"; }; + reputable2772 = { + name = "Reputable2772"; + github = "Reputable2772"; + githubId = 153411261; + }; rettetdemdativ = { email = "michael@koeppl.dev"; github = "rettetdemdativ"; diff --git a/nixos/doc/manual/configuration/customizing-packages.section.md b/nixos/doc/manual/configuration/customizing-packages.section.md index 074932b3f110..db7a6c60fade 100644 --- a/nixos/doc/manual/configuration/customizing-packages.section.md +++ b/nixos/doc/manual/configuration/customizing-packages.section.md @@ -33,8 +33,8 @@ Unfortunately, Nixpkgs currently lacks a way to query available package configur ::: {.note} For example, many packages come with extensions one might add. Examples include: -- [`passExtensions.pass-otp`](https://search.nixos.org/packages/query=passExtensions.pass-otp) -- [`python310Packages.requests`](https://search.nixos.org/packages/query=python310Packages.requests) +- [`passExtensions.pass-otp`](https://search.nixos.org/packages?query=passExtensions.pass-otp) +- [`python312Packages.requests`](https://search.nixos.org/packages?query=python312Packages.requests) You can use them like this: ```nix diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/applications/blockchains/lightning-loop/default.nix index 3dc1356c90cb..e257c581fd51 100644 --- a/pkgs/applications/blockchains/lightning-loop/default.nix +++ b/pkgs/applications/blockchains/lightning-loop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.24.1-beta"; + version = "0.28.8-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; 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" ]; diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 2ad51433e215..521a3d83a097 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -114,10 +114,10 @@ in emacs30 = import ./make-emacs.nix (mkArgs { pname = "emacs"; - version = "30.0.91"; + version = "30.0.92"; variant = "mainline"; - rev = "30.0.91"; - hash = "sha256-X5J34BUY42JgA1s76eVeGA9WNtesU2c+JyndIHFbONQ="; + rev = "30.0.92"; + hash = "sha256-V2TXLemSCIPTpg6RDChv4va7pHfVcqSMw/EWqvlRQ1o="; }); emacs28-macport = import ./make-emacs.nix (mkArgs { diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index eb0f2359cc29..fadb989bff4f 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - hash = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw="; + hash = "sha256-WOljOakh177om7tLlroFwWO4gYsarfTCeVXX6+dmZs4="; }; patches = [ ./polkit-dir.patch diff --git a/pkgs/applications/misc/dwmbar/default.nix b/pkgs/applications/misc/dwmbar/default.nix index 3f7e9c821a2e..e2fa8155edd7 100644 --- a/pkgs/applications/misc/dwmbar/default.nix +++ b/pkgs/applications/misc/dwmbar/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "dwmbar"; - version = "unstable-2021-12-22"; + version = "0-unstable-2021-12-22"; src = fetchFromGitHub { owner = "thytom"; diff --git a/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch b/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch deleted file mode 100644 index 89f0613589d4..000000000000 --- a/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch +++ /dev/null @@ -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:: - diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 6a151802fe01..9635c30947af 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -54,13 +54,12 @@ stdenv.mkDerivation rec { # fix those bugs themselves. This is for critical bugfixes, where "critical" # == "causes (transient) doctest failures / somebody complained". bugfixPatches = [ - # Sage uses mixed integer programs (MIPs) to find edge disjoint - # spanning trees. For some reason, aarch64 glpk takes much longer - # than x86_64 glpk to solve such MIPs. Since the MIP formulation - # has "numerous problems" and will be replaced by a polynomial - # algorithm soon, disable this test for now. - # https://github.com/sagemath/sage/issues/34575 - ./patches/disable-slow-glpk-test.patch + # https://github.com/sagemath/sage/pull/38851, landed in 10.5.beta8 + (fetchpatch { + name = "glpk-aarch64-hang-workaround.patch"; + url = "https://github.com/sagemath/sage/commit/ce4a78dcb4178f85273619cea076c97345977ee1.diff"; + hash = "sha256-TibTx5llkXjkEZB/MDy4hfGwKBmwtitEpWP6K/ykke0="; + }) # compile libs/gap/element.pyx with -O1 # a more conservative version of https://github.com/sagemath/sage/pull/37951 diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 1ffa016159aa..6c3347b24e9b 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -24,6 +24,16 @@ rec { , knownVulnerabilities ? [] }: let + docker-meta = { + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + offline + vdemeester + periklis + teutat3s + ]; + }; + docker-runc = runc.overrideAttrs { pname = "docker-runc"; inherit version; @@ -160,6 +170,11 @@ rec { ++ lib.optional (!withBtrfs) "exclude_graphdriver_btrfs" ++ lib.optional (!withLvm) "exclude_graphdriver_devicemapper" ++ 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 @@ -257,7 +272,7 @@ rec { tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; }; }; - meta = with lib; { + meta = docker-meta // { homepage = "https://www.docker.com/"; description = "Open source project to pack, ship and run any application as a lightweight container"; longDescription = '' @@ -265,8 +280,6 @@ rec { 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"; inherit knownVulnerabilities; }; diff --git a/pkgs/build-support/fetchsavannah/default.nix b/pkgs/build-support/fetchsavannah/default.nix index e75e25fc1e70..0849323d582c 100644 --- a/pkgs/build-support/fetchsavannah/default.nix +++ b/pkgs/build-support/fetchsavannah/default.nix @@ -8,5 +8,6 @@ lib.makeOverridable ( inherit name; url = "https://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz"; 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; } ) diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index c478742a9876..9fd9317d4640 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "fba9cce82ec1a94e002d34a6b012eadf34c759a0", - "hash": "sha256-BoNveMooYfRPKUJK5aqzeKVmY4MNyH9FwO0/EON2cZY=", - "version": "2.16.0", - "depsHash": "sha256-yr5k151jGGT3O2CfDfdKfN7s2e8tUdrS8PWA5tX1BMA=", - "clientDepsHash": "sha256-LJk+cbW3JTzUl6M0PqWj3tLWx29bGYgG+HohCiFoaME=" + "rev": "50fd659749128a321ecc3284e128d014433145a9", + "hash": "sha256-lYzzzH2heSj0doPfAEWL+pTP9wTsTzLb3+Fu0DHD1w0=", + "version": "2.16.1", + "depsHash": "sha256-7kA1AusnF7iDMACd9lQ8wbdbtjtouh9qu1J8EzzYUrQ=", + "clientDepsHash": "sha256-NwOkMdlmh+tQCWKrbKBbf9XPA3mtz7S3VrGwvpBS0Rc=" } diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index 5cd35b064342..891b423d9e7a 100644 --- a/pkgs/by-name/ca/casadi/package.nix +++ b/pkgs/by-name/ca/casadi/package.nix @@ -10,6 +10,7 @@ cplex, fatrop, fetchFromGitHub, + fetchpatch, gurobi, highs, hpipm, @@ -45,6 +46,14 @@ stdenv.mkDerivation (finalAttrs: { 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 = '' # fix case of hpipmConfig.cmake @@ -57,11 +66,6 @@ stdenv.mkDerivation (finalAttrs: { '$'{CLANG_LLVM_LIB_DIR} \ ${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 substituteInPlace casadi/core/casadi_os.cpp --replace-fail \ "std::vector search_paths;" \ diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix index e9f74898a776..1ca2fa06ed36 100644 --- a/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -4,6 +4,7 @@ immich, python3, nixosTests, + stdenv, }: let python = python3.override { @@ -58,6 +59,10 @@ python.pkgs.buildPythonApplication rec { ] ++ 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; [ httpx pytest-asyncio diff --git a/pkgs/by-name/mu/mud/package.nix b/pkgs/by-name/mu/mud/package.nix new file mode 100644 index 000000000000..6114eb39d735 --- /dev/null +++ b/pkgs/by-name/mu/mud/package.nix @@ -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"; + }; +} diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index 7d0e3e154cb4..2620d5b602b5 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -6,9 +6,55 @@ lapack, lib, metis, + parmetis, + withParmetis ? false, # default to false due to unfree license scotch, + withPtScotch ? mpiSupport, 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: { name = "mumps"; version = "5.7.3"; @@ -18,28 +64,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ZnIfAuvOBJDYqCtKGlWs0r39nG6X2lAVRuUmeIJenZw="; }; - patches = [ - # Compatibility with coin-or-mumps version - (fetchpatch { - url = "https://raw.githubusercontent.com/coin-or-tools/ThirdParty-Mumps/bd0bdf9baa3f3677bd34fb36ce63b2b32cc6cc7d/mumps_mpi.patch"; - 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" - ''; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace src/Makefile --replace-fail \ + "-Wl,\''$(SONAME),libmumps_common" \ + "-Wl,-install_name,$out/lib/libmumps_common" + ''; 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 = @@ -48,84 +86,74 @@ stdenv.mkDerivation (finalAttrs: { "LIBEXT_SHARED=.dylib" ] ++ [ - "LSCOTCHDIR=${scotch}/lib" - "ISCOTCH=-I${scotch.dev}/include" - "LMETISDIR=${metis}/lib" - "IMETIS=-I${metis}/include" + "SCALAP=-lscalapack" "allshared" ]; - installPhase = '' - mkdir $out - cp -r include lib $out + installPhase = + '' + 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 - ln -s $out/include $out/include/mumps - cp libseq/mumps_mpi.h $out/include + # Add some compatibility with coin-or-mumps + ln -s $out/include/mumps_seq/mpi.h $out/include/mumps_mpi.h + ''; + + 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 =" - ''; - build-system = [ setuptools ]; dependencies = [ - antlr4-python3-runtime + (antlr4-python3-runtime.override { antlr4 = antlr4_9; }) six ]; @@ -39,14 +35,6 @@ buildPythonPackage rec { 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; { description = "Validate patterns used to express cyber observable content in STIX Indicators"; mainProgram = "validate-patterns"; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 49402d76d745..0094bb972a91 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "urwid"; - version = "2.6.15"; + version = "2.6.16"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-bBgzhNNYxNZKaSo43I3fMoR+j6XDV6UBNrZfQyZ/f7c="; + hash = "sha256-D5NHtU7XQRh8OqkwrN5r8U/VGF87LGwdnaqGhdjN8AE="; }; postPatch = '' diff --git a/pkgs/development/tools/fnlfmt/default.nix b/pkgs/development/tools/fnlfmt/default.nix index a5f325ebdab8..052068710cf3 100644 --- a/pkgs/development/tools/fnlfmt/default.nix +++ b/pkgs/development/tools/fnlfmt/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromSourcehut, luaPackages, lua }: +{ + lib, + stdenv, + fetchFromSourcehut, + lua, + luaPackages, +}: stdenv.mkDerivation rec { pname = "fnlfmt"; @@ -15,26 +21,26 @@ stdenv.mkDerivation rec { buildInputs = [ lua ]; - buildPhase = '' - runHook preBuild + makeFlags = [ + "PREFIX=$(out)" + "FENNEL=${luaPackages.fennel}/bin/fennel" + ]; + sourceRoot = [ "${src.name}/tags/${version}" ]; - echo "#!${lua}/bin/lua" > fnlfmt - ${luaPackages.fennel}/bin/fennel --require-as-include --compile tags/${version}/cli.fnl >> fnlfmt - chmod +x fnlfmt + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck - runHook postBuild - ''; + $out/bin/fnlfmt --help > /dev/null - installPhase = '' - runHook preInstall - install -D ./fnlfmt $out/bin/fnlfmt - runHook postInstall + runHook postInstallCheck ''; meta = with lib; { description = "Formatter for Fennel"; - homepage = "https://git.sr.ht/~technomancy/fnlfmt"; - license = licenses.lgpl3Plus; + homepage = src.meta.homepage; + changelog = "${src.meta.homepage}/tree/${version}/changelog.md"; + license = licenses.mit; platforms = lua.meta.platforms; maintainers = with maintainers; [ chiroptical ]; mainProgram = "fnlfmt"; diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index dc097bfc9536..86a2255d657a 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -89,5 +89,6 @@ in lib.makeExtensible (self: { xcode_15_3 = requireXcode "15.3" "sha256-FyVA8EEPCI12Z4sJ4RQRZlMMpFmi7S8VYLcyvad3swM="; xcode_15_4 = requireXcode "15.4" "sha256-yeo+sf6bBIJy9/1sQiMuPEMPniwGXMB6/FXXL0UrI5U="; 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")}"; }) diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 784024f8754d..9414f4fb33fe 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -11,6 +11,10 @@ }: let + meta = { + maintainers = with lib.maintainers; [ peterhoeg ]; + platforms = lib.platforms.linux; + }; dep = { pname, version, hash, rev ? "v${version}", buildInputs ? [ ] }: stdenv.mkDerivation { @@ -22,6 +26,14 @@ let }; nativeBuildInputs = [ meson ninja pkg-config ]; 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. @@ -89,11 +101,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + meta = meta // { description = "Linux D-Bus Message Broker"; homepage = "https://github.com/bus1/dbus-broker/wiki"; - license = licenses.asl20; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + license = lib.licenses.asl20; }; }) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index f7e792da825a..baf99a2633b6 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { 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 # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - hash = "sha256-qYIpYBjbYgbYzPKEgKEEXEf/0bFyp1sFFl7A7mq6Nco="; + hash = "sha256-sviXuRJOpuSoOMNjGPRe11qlphk0Y1/YV/Y5M+QkWys="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index 0bfed296331a..7b8b72f1af7b 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl, nixosTests }: +{ lib, stdenvNoCC, fetchurl, imagemagick, nixosTests }: stdenvNoCC.mkDerivation rec { pname = "mediawiki"; @@ -11,6 +11,10 @@ stdenvNoCC.mkDerivation rec { postPatch = '' 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 = '' diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index b92f770018ac..85347c24418f 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -30,13 +30,17 @@ , libxcrypt , hostname , nixosTests -, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl +, withSecurityKey ? !stdenv.hostPlatform.isStatic +, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl && withSecurityKey , withPAM ? stdenv.hostPlatform.isLinux , dsaKeysSupport ? false , linkOpenssl ? true , isNixos ? stdenv.hostPlatform.isLinux }: +# FIDO support requires SK support +assert withFIDO -> withSecurityKey; + stdenv.mkDerivation (finalAttrs: { inherit pname version src; @@ -103,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeature withPAM "pam") (lib.enableFeature dsaKeysSupport "dsa-keys") ] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}" + ++ lib.optional (!withSecurityKey) "--disable-security-key" ++ lib.optional withFIDO "--with-security-key-builtin=yes" ++ lib.optional withKerberos (assert krb5 != null; "--with-kerberos5=${lib.getDev krb5}") ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-libutil" @@ -110,7 +115,9 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withLdns "--with-ldns" ++ 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" ]; diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index 6e04afae53db..fca2c6963c69 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/pkgs/tools/security/gau/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gau"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "lc"; repo = "gau"; rev = "refs/tags/v${version}"; - hash = "sha256-1sF33uat6nwtTaXbZzO8YF4jewyQJ6HvI2l/zyTrJsg="; + hash = "sha256-B2l5joHeFDjYmdb3F1FFDKjIKENZu92O2sMlkf3Sf6Y="; }; vendorHash = "sha256-nhsGhuX5AJMHg+zQUt1G1TwVgMCxnuJ2T3uBrx7bJNs="; diff --git a/pkgs/tools/security/hashrat/default.nix b/pkgs/tools/security/hashrat/default.nix index c19f683f4bea..f7ebc1179093 100644 --- a/pkgs/tools/security/hashrat/default.nix +++ b/pkgs/tools/security/hashrat/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch }: stdenv.mkDerivation rec { @@ -14,6 +15,15 @@ stdenv.mkDerivation rec { 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" ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6f496616955..e2489e806776 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -679,6 +679,8 @@ with pkgs; inherit (darwin) DarwinTools; }; + mumps_par = callPackage ../by-name/mu/mumps/package.nix { mpiSupport = true; }; + mix2nix = callPackage ../development/tools/mix2nix { }; n98-magerun = callPackage ../development/tools/misc/n98-magerun { }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index e1b9ca9de191..ab8d9c387b40 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -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_14 xcode_14_1 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; xcodeProjectCheckHook = pkgs.makeSetupHook { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 735104b61068..dcf7da0054c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10302,7 +10302,9 @@ self: super: with self; { 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 { };