Commit db13b6d4 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

Merge remote-tracking branch 'origin/staging-next' into staging 

Conflicts:
- pkgs/development/python-modules/mlflow/default.nix
- pkgs/development/python-modules/napari/default.nix
parents bb02d6c3 d44298d6

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -11710,6 +11710,13 @@ 
    githubId = 168301;

    name = "Victor Engmark";

  };

  l33tname = {

    name = "l33tname";

    email = "hi@l33t.name";













    github = "Fliiiix";













    githubId = 1682954;













  };















  l3af = {















    email = "L3afMeAlon3@gmail.com";















    matrix = "@L3afMe:matrix.org";

































nixos/tests/endlessh-go.nix



+6
−2






























Original line number
Diff line number
Diff line








@@ -44,15 +44,19 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:













        server.wait_for_unit("endlessh-go.service")















        server.wait_for_open_port(2222)















        server.wait_for_open_port(9229)













        server.fail("curl -sSf server:9229/metrics | grep -q endlessh_client_closed_count_total")















        client.succeed("nc -dvW5 server 2222")













        client.succeed("curl -kv server:9229/metrics")













        server.succeed("curl -sSf server:9229/metrics | grep -q endlessh_client_closed_count_total")













        client.fail("curl -sSfm 5 server:9229/metrics")































    with subtest("Privileged"):















        activate_specialisation("privileged")















        server.wait_for_unit("endlessh-go.service")















        server.wait_for_open_port(22)















        server.wait_for_open_port(92)













        server.fail("curl -sSf server:92/metrics | grep -q endlessh_client_closed_count_total")















        client.succeed("nc -dvW5 server 22")













        client.succeed("curl -kv server:92/metrics")













        server.succeed("curl -sSf server:92/metrics | grep -q endlessh_client_closed_count_total")













        client.fail("curl -sSfm 5 server:92/metrics")















  '';















})
























pkgs/applications/audio/strawberry/default.nix



+2
−2






























Original line number
Diff line number
Diff line








@@ -44,13 +44,13 @@ let













in















stdenv.mkDerivation rec {















  pname = "strawberry";













  version = "1.1.2";













  version = "1.1.3";































  src = fetchFromGitHub {















    owner = "jonaski";















    repo = pname;















    rev = version;













    hash = "sha256-86AMmp8R9/NibTsMFTTFcMeIqZ5x8din9RcBvhGO9xg=";













    hash = "sha256-yca1BJWhSUVamqSKfvEzU3xbzdR+kwfSs0pyS08oUR0=";















    fetchSubmodules = true;















  };

















































pkgs/applications/editors/vim/plugins/generated.nix



+12
−0






























Original line number
Diff line number
Diff line








@@ -18624,5 +18624,17 @@ final: prev:













    meta.homepage = "https://github.com/jhradilek/vim-snippets/";















  };



























  cmp-nixpkgs-maintainers = buildVimPlugin {













    pname = "cmp-nixpkgs-maintainers";













    version = "2024-10-12";













    src = fetchFromGitHub {













      owner = "GaetanLepage";













      repo = "cmp-nixpkgs-maintainers";













      rev = "da6a5050bc6be7a55c333d0009ae87d909e30b3f";













      sha256 = "sha256-z/k7lC2tZvll+BlXoj5N7EwOGN3f3Lu4gT6YWocCL8c=";













    };













    meta.homepage = "https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/";













  };









































}

























pkgs/applications/editors/vim/plugins/overrides.nix



+5
−0






























Original line number
Diff line number
Diff line








@@ -370,6 +370,11 @@ in













    nvimRequireCheck = "cmp_neosnippet";















  };





























  cmp-nixpkgs-maintainers = super.cmp-nixpkgs-maintainers.overrideAttrs {













    dependencies = with self; [ nvim-cmp ];













    nvimRequireCheck = "cmp_nixpkgs_maintainers";













  };





























  cmp-npm = super.cmp-npm.overrideAttrs {















    dependencies = with self; [















      nvim-cmp