3p/nixpkgs: update patches
This commit is contained in:
parent
ffc78d3539
commit
74a05b062a
3 changed files with 84 additions and 13 deletions
|
@ -1,15 +1,15 @@
|
||||||
From 22345103554d5b25740ab1a1bbdc3fa2373c98e3 Mon Sep 17 00:00:00 2001
|
From 77f45ee01f22569f69fc730674ead9e7e09f6144 Mon Sep 17 00:00:00 2001
|
||||||
From: Luke Granger-Brown <git@lukegb.com>
|
From: Luke Granger-Brown <git@lukegb.com>
|
||||||
Date: Mon, 14 Dec 2020 19:49:06 +0000
|
Date: Thu, 7 Jan 2021 10:23:04 +0000
|
||||||
Subject: [PATCH] factorio-experimental, factorio-headless-experimental: 1.1.5
|
Subject: [PATCH] factorio-experimental, factorio-headless-experimental: 1.1.5
|
||||||
-> 1.1.6
|
-> 1.1.7
|
||||||
|
|
||||||
---
|
---
|
||||||
pkgs/games/factorio/versions.json | 16 ++++++++--------
|
pkgs/games/factorio/versions.json | 16 ++++++++--------
|
||||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json
|
diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json
|
||||||
index b4c9054503559..00fe4b877d05e 100644
|
index b4c9054503559..840913550f775 100644
|
||||||
--- a/pkgs/games/factorio/versions.json
|
--- a/pkgs/games/factorio/versions.json
|
||||||
+++ b/pkgs/games/factorio/versions.json
|
+++ b/pkgs/games/factorio/versions.json
|
||||||
@@ -2,12 +2,12 @@
|
@@ -2,12 +2,12 @@
|
||||||
|
@ -17,15 +17,15 @@ index b4c9054503559..00fe4b877d05e 100644
|
||||||
"alpha": {
|
"alpha": {
|
||||||
"experimental": {
|
"experimental": {
|
||||||
- "name": "factorio_alpha_x64-1.1.5.tar.xz",
|
- "name": "factorio_alpha_x64-1.1.5.tar.xz",
|
||||||
+ "name": "factorio_alpha_x64-1.1.6.tar.xz",
|
+ "name": "factorio_alpha_x64-1.1.7.tar.xz",
|
||||||
"needsAuth": true,
|
"needsAuth": true,
|
||||||
- "sha256": "17hm62mhldms41wv0vv2bzg8zg1mg7ga61h3yzw9dfvic661khmp",
|
- "sha256": "17hm62mhldms41wv0vv2bzg8zg1mg7ga61h3yzw9dfvic661khmp",
|
||||||
+ "sha256": "1dg8dh5pivqyjfnhbn01pwwph3xsj1xzvzbv3kzxg5pvjcfx0k6z",
|
+ "sha256": "0wqrs5w5giybq47hfv5wwg7c36351kfsa5x06nvxls2znyl43qv8",
|
||||||
"tarDirectory": "x64",
|
"tarDirectory": "x64",
|
||||||
- "url": "https://factorio.com/get-download/1.1.5/alpha/linux64",
|
- "url": "https://factorio.com/get-download/1.1.5/alpha/linux64",
|
||||||
- "version": "1.1.5"
|
- "version": "1.1.5"
|
||||||
+ "url": "https://factorio.com/get-download/1.1.6/alpha/linux64",
|
+ "url": "https://factorio.com/get-download/1.1.7/alpha/linux64",
|
||||||
+ "version": "1.1.6"
|
+ "version": "1.1.7"
|
||||||
},
|
},
|
||||||
"stable": {
|
"stable": {
|
||||||
"name": "factorio_alpha_x64-1.0.0.tar.xz",
|
"name": "factorio_alpha_x64-1.0.0.tar.xz",
|
||||||
|
@ -34,15 +34,15 @@ index b4c9054503559..00fe4b877d05e 100644
|
||||||
"headless": {
|
"headless": {
|
||||||
"experimental": {
|
"experimental": {
|
||||||
- "name": "factorio_headless_x64-1.1.5.tar.xz",
|
- "name": "factorio_headless_x64-1.1.5.tar.xz",
|
||||||
+ "name": "factorio_headless_x64-1.1.6.tar.xz",
|
+ "name": "factorio_headless_x64-1.1.7.tar.xz",
|
||||||
"needsAuth": false,
|
"needsAuth": false,
|
||||||
- "sha256": "1s4ajj8kkz1q5rivv2q6c8ii73nxa11g4fs6hic3r43l52n89ml1",
|
- "sha256": "1s4ajj8kkz1q5rivv2q6c8ii73nxa11g4fs6hic3r43l52n89ml1",
|
||||||
+ "sha256": "0bgjq2i2jn07k4awiqxsbf15p2xwn0k0aj11xpdyxvjjky8npwaa",
|
+ "sha256": "1s52p6cvd2v0pmj4gppc2pf8r6bpbzkmwpw8451j3ic58fhjvypr",
|
||||||
"tarDirectory": "x64",
|
"tarDirectory": "x64",
|
||||||
- "url": "https://factorio.com/get-download/1.1.5/headless/linux64",
|
- "url": "https://factorio.com/get-download/1.1.5/headless/linux64",
|
||||||
- "version": "1.1.5"
|
- "version": "1.1.5"
|
||||||
+ "url": "https://factorio.com/get-download/1.1.6/headless/linux64",
|
+ "url": "https://factorio.com/get-download/1.1.7/headless/linux64",
|
||||||
+ "version": "1.1.6"
|
+ "version": "1.1.7"
|
||||||
},
|
},
|
||||||
"stable": {
|
"stable": {
|
||||||
"name": "factorio_headless_x64-1.0.0.tar.xz",
|
"name": "factorio_headless_x64-1.0.0.tar.xz",
|
70
third_party/nixpkgs/patches/pr108653-ovenmediaengine-bump-0.10.9-hotfix.patch
vendored
Normal file
70
third_party/nixpkgs/patches/pr108653-ovenmediaengine-bump-0.10.9-hotfix.patch
vendored
Normal file
|
@ -0,0 +1,70 @@
|
||||||
|
From 92cd26a9f39702b15b38faab470da3b2896e7570 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Luke Granger-Brown <git@lukegb.com>
|
||||||
|
Date: Thu, 7 Jan 2021 10:37:28 +0000
|
||||||
|
Subject: [PATCH] oven-media-engine: 0.10.8 -> 0.10.9-hotfix
|
||||||
|
|
||||||
|
---
|
||||||
|
.../servers/misc/oven-media-engine/default.nix | 18 ++++++++++++++----
|
||||||
|
1 file changed, 14 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix
|
||||||
|
index 7faf8a9cfeeb5..8b2ebafa84f7d 100644
|
||||||
|
--- a/pkgs/servers/misc/oven-media-engine/default.nix
|
||||||
|
+++ b/pkgs/servers/misc/oven-media-engine/default.nix
|
||||||
|
@@ -1,5 +1,6 @@
|
||||||
|
{ stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
+, fetchpatch
|
||||||
|
, srt
|
||||||
|
, ffmpeg_3_4
|
||||||
|
, bc
|
||||||
|
@@ -12,6 +13,7 @@
|
||||||
|
, libopus
|
||||||
|
, srtp
|
||||||
|
, jemalloc
|
||||||
|
+, pcre2
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
@@ -27,21 +29,29 @@ let
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "oven-media-engine";
|
||||||
|
- version = "0.10.8";
|
||||||
|
+ version = "0.10.9-hotfix";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "AirenSoft";
|
||||||
|
repo = "OvenMediaEngine";
|
||||||
|
rev = "v${version}";
|
||||||
|
- sha256 = "ec4yvS+4/rTBHGEx2OP0yoNGDtzPucFOcZJ0o0cCAHg=";
|
||||||
|
+ sha256 = "1fhria0vwqsgmsglv5gn858li33vfy2dwy1f1qdd2jwikskb53am";
|
||||||
|
};
|
||||||
|
|
||||||
|
+ patches = [
|
||||||
|
+ (fetchpatch {
|
||||||
|
+ url = "https://github.com/AirenSoft/OvenMediaEngine/commit/ad83e1d2226445d649e4b7e0c75106e31af4940d.patch";
|
||||||
|
+ sha256 = "1zk1rgi1wsjl6gdx3hdmgxlgindv6a3lsnkwcgi87ga9abw4vafw";
|
||||||
|
+ stripLen = 1;
|
||||||
|
+ })
|
||||||
|
+ ];
|
||||||
|
+
|
||||||
|
sourceRoot = "source/src";
|
||||||
|
makeFlags = "release CONFIG_LIBRARY_PATHS= CONFIG_PKG_PATHS= GLOBAL_CC=$(CC) GLOBAL_CXX=$(CXX) GLOBAL_LD=$(CXX) SHELL=${stdenv.shell}";
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
nativeBuildInputs = [ bc pkgconfig perl ];
|
||||||
|
- buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc ];
|
||||||
|
+ buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 ];
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
patchShebangs core/colorg++
|
||||||
|
@@ -62,7 +72,7 @@ stdenv.mkDerivation rec {
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "Open-source streaming video service with sub-second latency";
|
||||||
|
homepage = "https://ovenmediaengine.com";
|
||||||
|
- license = licenses.gpl2;
|
||||||
|
+ license = licenses.gpl2Only;
|
||||||
|
maintainers = with maintainers; [ lukegb ];
|
||||||
|
platforms = [ "x86_64-linux" ];
|
||||||
|
};
|
3
third_party/nixpkgs/patches/series
vendored
3
third_party/nixpkgs/patches/series
vendored
|
@ -1 +1,2 @@
|
||||||
pr106924-factorio-bump-1.1.6.patch
|
pr108650-factorio-bump-1.1.7.patch
|
||||||
|
pr108653-ovenmediaengine-bump-0.10.9-hotfix.patch
|
||||||
|
|
Loading…
Reference in a new issue