Unverified Commit 1ba92fc9 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'master' into staging-next

parents 51e24f45 ae942554

nixos/modules/services/web-servers/unit/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ in { 
        PIDFile = "/run/unit/unit.pid";

        ExecStart = ''

          ${cfg.package}/bin/unitd --control 'unix:/run/unit/control.unit.sock' --pid '/run/unit/unit.pid' \

                                   --log '${cfg.logDir}/unit.log' --state '${cfg.stateDir}' --tmp '/tmp' \

                                   --log '${cfg.logDir}/unit.log' --statedir '${cfg.stateDir}' --tmpdir '/tmp' \

                                   --user ${cfg.user} --group ${cfg.group}

        '';

        ExecStop = ''

pkgs/applications/audio/infamousPlugins/default.nix

+23 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }:

{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, pkg-config

, cairomm

, cmake

, lv2

, libpthreadstubs

, libXdmcp

, libXft

, ntk

, pcre

, fftwFloat

, zita-resampler

}:



stdenv.mkDerivation rec {

  pname = "infamousPlugins";
@@ -16,6 +31,13 @@ stdenv.mkDerivation rec { 
      url = "https://github.com/ssj71/infamousPlugins/commit/06dd967b4736ea886dc1dc07f882cb1563961582.patch";

      sha256 = "08xwh6px13y1gykaw103nhvjms7vgbgkcm0avh9f5d2d7aadq0l2";

    })



    # glibx-2.36 upstream fix: https://github.com/ssj71/infamousPlugins/pull/52

    (fetchpatch {

      name = "glibc-2.36.patch";

      url = "https://github.com/ssj71/infamousPlugins/commit/eb4fd9af25362fdd006549c471f4cf0427816dd5.patch";

      hash = "sha256-kBB2meQYVoVSTHIG77M8Fmeve87JBIUjpWCP6oiOkKI=";

    })

  ];

  nativeBuildInputs = [ pkg-config cmake ];

  buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ];

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

+13 −0
Original line number Diff line number Diff line
@@ -114,6 +114,10 @@ 
, iferr

, impl

, reftools



# hurl dependencies

, hurl



  # must be lua51Packages

, luaPackages

}:
@@ -516,6 +520,15 @@ self: super: { 
      sha256 = "W+91hnNeS6WkDiR9r1s7xPTK9JlCWiVkI/nXVYbepY0=";

    };

  });

  # https://hurl.dev/

  hurl = buildVimPluginFrom2Nix {

    pname = "hurl";

    version = hurl.version;

    # dontUnpack = true;



    src = "${hurl.src}/contrib/vim";



  };



  jedi-vim = super.jedi-vim.overrideAttrs (old: {

    # checking for python3 support in vim would be neat, too, but nobody else seems to care

pkgs/applications/emulators/yuzu/sources.nix

+7 −7
Original line number Diff line number Diff line 
# Generated by ./update.sh - do not update manually!

# Last updated: 2023-05-05

# Last updated: 2023-05-13

{

  compatList = {

    rev = "773d28cbc699427c8baa427452d7b229920eec59";

    rev = "b0dd7ed48e5544d9f458a5e832b111fba3571e26";

    hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";

  };



  mainline = {

    version = "1421";

    hash = "sha256:1ldxframs7a8rmna9ymyx20n89594q0d1266kr7ah8yvh1gp04r3";

    version = "1430";

    hash = "sha256:0q5z078gnl92rh5md8pqcikkr63scapzak2ngsqff635m6qk99lb";

  };



  ea = {

    version = "3557";

    distHash = "sha256:0bddx5d88cfaaqbzr59w9kqjjsf9xvgvdn1g0l9w3ifr9zc2vlwr";

    fullHash = "sha256:0w1ji3a8iridh4dpyal8lscgwddf9pwz1pfigksmvbn8mm9d9xwl";

    version = "3588";

    distHash = "sha256:1fi61vs3hry23d3631a39pda0wzjp7bmy57y9zmf7qrqp8appvza";

    fullHash = "sha256:0wx3p6mbfd3swiiw6f8j0yd4h23kjsa2xkd8garycbx0wsqmjg84";

  };

}

pkgs/applications/kde/angelfish.nix

+4 −13
Original line number Diff line number Diff line
@@ -21,26 +21,17 @@ 
, rustc

, srcs



# These must be updated in tandem with package updates.

, cargoShaForVersion ? "23.04.0"

, cargoSha256 ? "sha256-96Qe8zdLZdOrU/t6J+JJ6V0PXyFOnJF18qDrk4PZGsA="

# provided as callPackage input to enable easier overrides through overlays

, cargoSha256 ? "sha256-whMfpElpFB7D+dHHJrbwINFL4bVpHTlcZX+mdBfiqEE="

}:



# Guard against incomplete updates.

# Values are provided as callPackage inputs to enable easier overrides through overlays.

if cargoShaForVersion != srcs.angelfish.version

then builtins.throw ''

  angelfish package update is incomplete.

         Hash for cargo dependencies is declared for version ${cargoShaForVersion}, but we're building ${srcs.angelfish.version}.

         Update the cargoSha256 and cargoShaForVersion for angelfish.

'' else



mkDerivation rec {

  pname = "angelfish";



  cargoDeps = rustPlatform.fetchCargoTarball {

    src = srcs.angelfish.src;

    # include version in the name so we invalidate the FOD

    name = "${pname}-${srcs.angelfish.version}";

    inherit (srcs.angelfish) src;

    sha256 = cargoSha256;

  };