Unverified Commit 06d0499d authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 7047ffb0 a2ba6472

nixos/tests/certmgr.nix

+29 −1
Original line number Diff line number Diff line 
{ runTest, pkgs, ... }:



let

  authKey = pkgs.writeText "auth-key" "1234ABCD";

  cfsslConfig = pkgs.writeText "config.json" (

    builtins.toJSON {

      # also see `cfssl print-defaults config`

      auth_keys = {

        my_key = {

          type = "standard";

          key = "file:${authKey}";

        };

      };

      signing = {

        default = {

          expiry = "168h";

          auth_key = "my_key";

          usages = [

            "digital signature"

          ];

        };

      };

    }

  );

  mkSpec =

    {

      host,
@@ -18,6 +39,7 @@ let 
        label = "www_ca";

        profile = "three-month";

        remote = "localhost:8888";

        auth_key_file = toString authKey;

      };

      certificate = {

        group = "nginx";
@@ -75,7 +97,10 @@ let 
            ];

            networking.extraHosts = "127.0.0.1 imp.example.org decl.example.org";



            services.cfssl.enable = true;

            services.cfssl = {

              enable = true;

              configFile = toString cfsslConfig;

            };

            systemd.services.cfssl.after = [

              "cfssl-init.service"

              "networking.target"
@@ -90,6 +115,9 @@ let 
                User = "cfssl";

                Type = "oneshot";

                WorkingDirectory = config.services.cfssl.dataDir;

                # matches systemd.services.cfssl to run setup transparently

                StateDirectory = baseNameOf config.services.cfssl.dataDir;

                StateDirectoryMode = 700;

              };

              script = ''

                ${pkgs.cfssl}/bin/cfssl genkey -initca ${

pkgs/applications/graphics/xournalpp/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -84,7 +84,10 @@ stdenv.mkDerivation rec { 
    homepage = "https://xournalpp.github.io/";

    changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md";

    license = lib.licenses.gpl2Plus;

    maintainers = with lib.maintainers; [ sikmir ];

    maintainers = with lib.maintainers; [

      sikmir

      iedame

    ];

    platforms = lib.platforms.unix;

    mainProgram = "xournalpp";

  };

pkgs/applications/science/electronics/fritzing/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ stdenv.mkDerivation { 
    maintainers = with lib.maintainers; [

      robberer

      muscaln

      iedame

    ];

    platforms = lib.platforms.unix;

    mainProgram = "Fritzing";

pkgs/by-name/ar/arduino-ide/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ appimageTools.wrapType2 { 
    changelog = "https://github.com/arduino/arduino-ide/releases/tag/${version}";

    license = lib.licenses.agpl3Only;

    mainProgram = "arduino-ide";

    maintainers = with lib.maintainers; [ clerie ];

    maintainers = with lib.maintainers; [

      clerie

      iedame

    ];

    platforms = [ "x86_64-linux" ];

  };

}

pkgs/by-name/bl/bloodspilot-client/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -41,7 +41,10 @@ stdenv.mkDerivation (finalAttrs: { 
    mainProgram = "bloodspilot-client-sdl";

    homepage = "http://bloodspilot.sf.net/";

    license = lib.licenses.gpl2Plus;

    maintainers = with lib.maintainers; [ raskin ];

    maintainers = with lib.maintainers; [

      raskin

      iedame

    ];

    platforms = lib.platforms.linux;

  };

})