Unverified Commit e67e95c1 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 7676f806 9fe9de97

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -6493,6 +6493,12 @@ 
    githubId = 1713676;

    name = "Luis G. Torres";

  };

  giomf = {

    email = "giomf@mailbox.org";

    github = "giomf";

    githubId = 35076723;

    name = "Guillaume Fournier";

  };

  giorgiga = {

    email = "giorgio.gallo@bitnic.it";

    github = "giorgiga";

nixos/lib/systemd-lib.nix

+4 −1
Original line number Diff line number Diff line
@@ -20,7 +20,10 @@ in rec { 
      pkgs.runCommand "unit-${mkPathSafeName name}"

        { preferLocalBuild = true;

          allowSubstitutes = false;

          inherit (unit) text;

          # unit.text can be null. But variables that are null listed in

          # passAsFile are ignored by nix, resulting in no file being created,

          # making the mv operation fail.

          text = optionalString (unit.text != null) unit.text;

          passAsFile = [ "text" ];

        }

        ''

nixos/modules/services/home-automation/home-assistant.nix

+1 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ in { 
          "govee_ble"

          "homekit_controller"

          "inkbird"

          "improv_ble"

          "keymitt_ble"

          "led_ble"

          "medcom_ble"

pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {

  pname = "signalbackup-tools";

  version = "20231015";

  version = "20231030-1";



  src = fetchFromGitHub {

    owner = "bepaald";

    repo = pname;

    rev = version;

    hash = "sha256-P3IbCWzc7V2yX8qZIPUncJXFFq9iFl7csDj2tiTZ7AY=";

    hash = "sha256-xY5UpM1vYAL2hZUkh5O4Z6zJ5HVxXTtvDlXedlsU820=";

  };



  postPatch = ''

pkgs/by-name/nu/numbat/package.nix

0 → 100644
+37 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, rustPlatform

, darwin

}:



rustPlatform.buildRustPackage rec {

  pname = "numbat";

  version = "1.6.3";



  src = fetchFromGitHub {

    owner = "sharkdp";

    repo = "numbat";

    rev = "v${version}";

    hash = "sha256-r6uPe2NL+6r/fKjf0C/5DLdB5YP3SIo8g8EsDxKP/3g=";

  };



  cargoHash = "sha256-MPqJjCfIwgK8QigWQYfWAYlg9RNMzF4x+0SprS0raKY=";



  buildInputs = lib.optionals stdenv.isDarwin [

    darwin.apple_sdk.frameworks.Security

  ];



  meta = with lib; {

    description = "High precision scientific calculator with full support for physical units";

    longDescription = ''

      A statically typed programming language for scientific computations

      with first class support for physical dimensions and units

    '';

    homepage = "https://numbat.dev";

    changelog = "https://github.com/sharkdp/numbat/releases/tag/v${version}";

    license = with licenses; [ asl20 mit ];

    mainProgram = "numbat";

    maintainers = with maintainers; [ giomf ];

  };

}