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

Merge master into staging-next

parents 18b7b96b 2beb0d28

pkgs/by-name/li/libsidplayfp/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "libsidplayfp";

  version = "2.13.1";

  version = "2.14.0";



  src = fetchFromGitHub {

    owner = "libsidplayfp";

    repo = "libsidplayfp";

    rev = "v${finalAttrs.version}";

    fetchSubmodules = true;

    hash = "sha256-gUi7g+TZmF6XgacImVSNc69zpMckjCaqwfidIrrh38U=";

    hash = "sha256-q1cUv4gpzL3wfssP7pWtDfDzFO47+kzpGy4GYLzEM50=";

  };



  outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];

pkgs/by-name/mi/miniupnpc/package.nix

+11 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  cmake,

  versionCheckHook,

  nixosTests,
@@ -20,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: { 


  sourceRoot = "${finalAttrs.src.name}/miniupnpc";



  patches = [

    # fix missing include

    # remove on next release

    (fetchpatch {

      url = "https://github.com/miniupnp/miniupnp/commit/e263ab6f56c382e10fed31347ec68095d691a0e8.patch";

      hash = "sha256-PHqjruFOcsGT3rdFS/GD3wEvalCmoRY4BtIKFxCjKDw=";

      stripLen = 1;

    })

  ];



  nativeBuildInputs = [ cmake ];



  cmakeFlags = [