Merge master into staging-next

nixos/modules/services/network-filesystems/davfs2.nix

@@ -20,14 +20,10 @@ let
  else toString value;
 
  configFile = pkgs.writeText "davfs2.conf" (
- if (cfg.settings != { }) then
- (toINIWithGlobalSection {
- mkSectionName = escapeString;
- mkKeyValue = k: v: "${k} ${formatValue v}";
- } cfg.settings)
- else
- cfg.extraConfig
- );
+ toINIWithGlobalSection {
+ mkSectionName = escapeString;
+ mkKeyValue = k: v: "${k} ${formatValue v}";
+ } cfg.settings);
 in
 {
 
@@ -53,29 +49,6 @@ in
  '';
  };
 
- extraConfig = mkOption {
- type = lines;
- default = "";
- example = ''
- proxy foo.bar:8080
- use_locks 0
-
- [/media/dav]
- use_locks 1
-
- [/home/otto/mywebspace]
- gui_optimize 1
- '';
- description = ''
- Extra lines appended to the configuration of davfs2.
- See {manpage}`davfs2.conf(5)` for available settings.
-
- **Note**: Please pass structured settings via
- {option}`settings` instead, this option
- will get deprecated in the future.
- '' ;
- };
-
  settings = mkOption {
  type = submodule {
  freeformType = let
@@ -109,21 +82,6 @@ in
 
  config = mkIf cfg.enable {
 
- assertions = [
- {
- assertion = cfg.extraConfig != "" -> cfg.settings == { };
- message = ''
- services.davfs2.extraConfig and services.davfs2.settings cannot be used together.
- Please prefer using services.davfs2.settings.
- '';
- }
- ];
-
- warnings = optional (cfg.extraConfig != "") ''
- services.davfs2.extraConfig will be deprecated in future releases;
- please use services.davfs2.settings instead.
- '';
-
  environment.systemPackages = [ pkgs.davfs2 ];
  environment.etc."davfs2/davfs2.conf".source = configFile;
 

nixos/tests/openssh.nix

@@ -120,12 +120,14 @@ in {
  { type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; }
  ];
  settings = {
- # Must not specify the OpenSSL provided algorithms.
- Ciphers = [ "[email protected]" ];
- KexAlgorithms = [
- "curve25519-sha256"
- "[email protected]"
- ];
+ # Since this test is against an OpenSSH-without-OpenSSL,
+ # we have to override NixOS's defaults ciphers (which require OpenSSL)
+ # and instead set these to null, which will mean OpenSSH uses its defaults.
+ # Expectedly, OpenSSH's defaults don't require OpenSSL when it's compiled
+ # without OpenSSL.
+ Ciphers = null;
+ KexAlgorithms = null;
+ Macs = null;
  };
  };
  users.users.root.openssh.authorizedKeys.keys = [

pkgs/applications/emulators/retroarch/default.nix

@@ -47,12 +47,12 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "retroarch-bare";
- version = "1.19.0";
+ version = "1.19.1";
 
  src = fetchFromGitHub {
  owner = "libretro";
  repo = "RetroArch";
- hash = "sha256-xn6lFknL5y9WozGZtqiZVyVzOuNheGhwxWlfFOYVFzU=";
+ hash = "sha256-NVe5dhH3w7RL1C7Z736L5fdi/+aO+Ah9Dpa4u4kn0JY=";
  rev = "v${version}";
  };
 

pkgs/applications/science/math/numworks-epsilon/default.nix

@@ -9,17 +9,18 @@
 , imagemagick
 , gcc-arm-embedded
 , pkg-config
+, python3Packages
 }:
 
 stdenv.mkDerivation rec {
  pname = "numworks-epsilon";
- version = "15.5.0";
+ version = "22.2.0";
 
  src = fetchFromGitHub {
  owner = "numworks";
  repo = "epsilon";
  rev = version;
- sha256 = "fPBO3FzZ4k5OxG+Ifc6R/au4Te974HNKAEdHz+aFdSg=";
+ hash = "sha256-E2WaXTn8+Ky9kdZxvQmEt63Ggo6Ns0fZ0Za+rQGIMSg=";
  };
 
  nativeBuildInputs = [ pkg-config ];
@@ -31,18 +32,13 @@ stdenv.mkDerivation rec {
  python3
  imagemagick
  gcc-arm-embedded
+ python3Packages.lz4
  ];
 
  makeFlags = [
  "PLATFORM=simulator"
  ];
 
- patches = [
- # Remove make rule Introduced in cba596dde7
- # which causes it to not build with nix
- ./0001-ion-linux-makerules.patch
- ];
-
  installPhase = ''
  runHook preInstall
 

pkgs/applications/science/misc/snakemake/default.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
  pname = "snakemake";
- version = "8.11.6";
+ version = "8.13.0";
  format = "setuptools";
 
  src = fetchFromGitHub {
  owner = "snakemake";
  repo = pname;
  rev = "refs/tags/v${version}";
- hash = "sha256-00Zh8NenBikdingmx34WYYH5SF+yazeAs+7h1/3UIJY=";
+ hash = "sha256-Xd8mZ8tsemJ53hAMED2biRyDlEw/gG/Hh1iZSwSB1vY=";
  # https://github.com/python-versioneer/python-versioneer/issues/217
  postFetch = ''
  sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#'

pkgs/by-name/an/ananicy-rules-cachyos/package.nix

@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
  pname = "ananicy-rules-cachyos";
- version = "0-unstable-2024-05-28";
+ version = "0-unstable-2024-06-07";
 
  src = fetchFromGitHub {
  owner = "CachyOS";
  repo = "ananicy-rules";
- rev = "5718579addbd733a4ab190fb9355a78e8b19b0b4";
- hash = "sha256-SD15wFUWryL3sRBbREr94A8oKf8KXVBaiI2bmWxbMx4=";
+ rev = "38b3e8c12801df68ba15c2d96ee96d7d2362b576";
+ hash = "sha256-yVKzkASMzJDmgzS0CxEFky2Y4Bs4vlbRJgUI+uG3muY=";
  };
 
  dontConfigure = true;

pkgs/by-name/dn/dnss/package.nix

@@ -0,0 +1,25 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule {
+ pname = "dnss";
+ version = "0-unstable-2024-03-17";
+ src = fetchFromGitHub {
+ owner = "albertito";
+ repo = "dnss";
+ rev = "da8986dd432870f5710e3e8652c92c95f34b830b";
+ hash = "sha256-YjBt+22fc9yHcORRmd//rejNVvf6eK+FAYAcT0fABuI=";
+ };
+
+ vendorHash = "sha256-d9aGSBRblkvH5Ixw3jpbgC8lMW/qEYNJfLTVeUlos7A=";
+
+ meta = with lib; {
+ description = "A daemon for using DNS over HTTPS";
+ homepage = "https://blitiri.com.ar/git/r/dnss/";
+ license = licenses.asl20;
+ mainProgram = "dnss";
+ maintainers = with maintainers; [ raspher ];
+ };
+}

pkgs/by-name/fa/fastfetch/package.nix

@@ -47,13 +47,13 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
  pname = "fastfetch";
- version = "2.14.0";
+ version = "2.15.0";
 
  src = fetchFromGitHub {
  owner = "fastfetch-cli";
  repo = "fastfetch";
  rev = finalAttrs.version;
- hash = "sha256-RJDRxH9VKNxBSfoFl1rDTeKKyLC3C09F0Z3ksJoMDRk=";
+ hash = "sha256-0kReN7FKrcRhxUuwZoArLTW2F1q40Wbp9/hRoDjKZHs=";
  };
 
  outputs = [ "out" "man" ];

pkgs/development/tools/gdtoolkit/default.nix → pkgs/by-name/gd/gdtoolkit_3/package.nix

@@ -1,7 +1,6 @@
 { lib
 , python3
 , fetchFromGitHub
-, godot3-server
 }:
 
 let
@@ -23,15 +22,15 @@ let
  };
 in
 python.pkgs.buildPythonApplication rec {
- pname = "gdtoolkit";
- version = "3.3.1";
+ pname = "gdtoolkit3";
+ version = "3.5.0";
 
  # If we try to get using fetchPypi it requires GeoIP (but the package dont has that dep!?)
  src = fetchFromGitHub {
  owner = "Scony";
  repo = "godot-gdscript-toolkit";
  rev = version;
- sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn";
+ hash = "sha256-cMGD5Xdf9ElS1NT7Q0NPB//EvUO0MI0VTtps5JRisZ4=";
  };
 
  disabled = python.pythonOlder "3.7";
@@ -48,35 +47,18 @@ python.pkgs.buildPythonApplication rec {
  nativeCheckInputs = with python.pkgs; [
  pytestCheckHook
  hypothesis
- godot3-server
  ];
 
- preCheck =
- let
- godotServerMajorVersion = lib.versions.major godot3-server.version;
- gdtoolkitMajorVersion = lib.versions.major version;
- msg = ''
- gdtoolkit major version ${gdtoolkitMajorVersion} does not match godot-server major version ${godotServerMajorVersion}!
- gdtoolkit needs a matching godot-server for its tests.
- If you see this error, you can either:
- - disable doCheck for gdtoolkit, or
- - provide a compatible godot-server version to gdtoolkit"
- '';
- in lib.throwIf (godotServerMajorVersion != gdtoolkitMajorVersion) msg ''
- # The tests want to run the installed executables
- export PATH=$out/bin:$PATH
+ preCheck = ''
+ # The tests want to run the installed executables
+ export PATH=$out/bin:$PATH
 
- # gdtoolkit tries to write cache variables to $HOME/.cache
- export HOME=$TMP
+ # gdtoolkit tries to write cache variables to $HOME/.cache
+ export HOME=$TMP
+ '';
 
- # Work around https://github.com/godotengine/godot/issues/20503
- # Without this, Godot will complain about a missing project file
- touch project.godot
-
- # Remove broken test case
- # (hard to skip via disabledTests since the test name contains an absolute path)
- rm tests/potential-godot-bugs/multiline-subscription-expression.gd
- '';
+ # The tests are not working on NixOS
+ disabledTests = [ "test_cc_on_empty_file_succeeds" "test_cc_on_file_with_single_function_succeeds" ];
 
  pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ];