Commit 242d458f authored by Robert Schütz's avatar Robert Schütz
Browse files

Merge branch 'master' into staging-next

parents 462b4c75 20831fcd

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -13482,6 +13482,12 @@ 
    githubId = 38314551;

    name = "Peter Okelmann";

  };

  pokon548 = {

    email = "nix@bukn.uk";

    github = "pokon548";

    githubId = 65808665;

    name = "Bu Kun";

  };

  polarmutex = {

    email = "brian@brianryall.xyz";

    github = "polarmutex";

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -864,6 +864,7 @@ 
  ./services/networking/coturn.nix

  ./services/networking/create_ap.nix

  ./services/networking/croc.nix

  ./services/networking/dae.nix

  ./services/networking/dante.nix

  ./services/networking/dhcpcd.nix

  ./services/networking/dnscache.nix

nixos/modules/services/networking/dae.nix

0 → 100644
+41 −0
Original line number Diff line number Diff line 
{ config, pkgs, lib, ... }:

let

  cfg = config.services.dae;

in

{

  meta.maintainers = with lib.maintainers; [ pokon548 ];



  options = {

    services.dae = {

      enable = lib.options.mkEnableOption (lib.mdDoc "the dae service");

      package = lib.mkPackageOptionMD pkgs "dae" { };

    };

  };



  config = lib.mkIf config.services.dae.enable {

    networking.firewall.allowedTCPPorts = [ 12345 ];

    networking.firewall.allowedUDPPorts = [ 12345 ];



    systemd.services.dae = {

      unitConfig = {

        Description = "dae Service";

        Documentation = "https://github.com/daeuniverse/dae";

        After = [ "network.target" "systemd-sysctl.service" ];

        Wants = [ "network.target" ];

      };



      serviceConfig = {

        User = "root";

        ExecStartPre = "${lib.getExe cfg.package} validate -c /etc/dae/config.dae";

        ExecStart = "${lib.getExe cfg.package} run --disable-timestamp -c /etc/dae/config.dae";

        ExecReload = "${lib.getExe cfg.package} reload $MAINPID";

        LimitNPROC = 512;

        LimitNOFILE = 1048576;

        Restart = "on-abnormal";

        Type = "notify";

      };



      wantedBy = [ "multi-user.target" ];

    };

  };

}

pkgs/applications/misc/merkaartor/default.nix

+14 −5
Original line number Diff line number Diff line 
{ mkDerivation

, lib

{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, qmake

, qttools

, wrapQtAppsHook

, qttranslations

, gdal

, proj
@@ -15,7 +16,7 @@ 
, withZbar ? false, zbar

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "merkaartor";

  version = "0.19.0";
@@ -23,10 +24,18 @@ mkDerivation rec { 
    owner = "openstreetmap";

    repo = "merkaartor";

    rev = version;

    sha256 = "sha256-I3QNCXzwhEFa8aOdwl3UJV8MLZ9caN9wuaaVrGFRvbQ=";

    hash = "sha256-I3QNCXzwhEFa8aOdwl3UJV8MLZ9caN9wuaaVrGFRvbQ=";

  };



  nativeBuildInputs = [ qmake qttools ];

  patches = [

    (fetchpatch {

      name = "exiv2-0.28.patch";

      url = "https://github.com/openstreetmap/merkaartor/commit/1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd.patch";

      hash = "sha256-aHjJLKYvqz7V0QwUIg0SbentBe+DaCJusVqy4xRBVWo=";

    })

  ];



  nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];



  buildInputs = [ gdal proj qtsvg qtwebengine ]

    ++ lib.optional withGeoimage exiv2

pkgs/applications/terminal-emulators/gnome-console/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ 


stdenv.mkDerivation rec {

  pname = "gnome-console";

  version = "44.0";

  version = "44.4";



  src = fetchurl {

    url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";

    sha256 = "0cGv1eyNK9+Eo9sCmwSiQy7Me80kLCp0X+mYakKJiEQ=";

    sha256 = "uR9E6abAQz6W2ZfzlVhSBtq6xiRzmTo8B1Uv5YiOWo0=";

  };



  nativeBuildInputs = [