nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 10:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-23.05 into staging-next-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-07-31 00:13:47 +00:00
committed by GitHub
parent bc1d46d012 b529c5d8a2
commit 142a682efe
7 changed files with 57 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@@ -115,11 +115,11 @@
firefox-esr-115 = buildMozillaMach rec {
pname = "firefox-esr-115";
version = "115.0.2esr";
version = "115.0.3esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "f145d0e0e63032367af4198d4ca046589689b5852cb2451efbdcabeae37dfeda88dd0a2c317120ae5785228a6d7df21aa2d18c18ed7bf4b180823af37326a458";
sha512 = "416ee56bd4a602c543391faaa8de31808f267ef2167f7d913195de45d3628de08d0582dbaa8905c847e1431bccd9d1d5d73ad9e7e5ea75be39e4d908a8b40376";
};
meta = {

4
pkgs/applications/video/frigate/default.nix
View File

@@ -92,11 +92,11 @@ python.pkgs.buildPythonApplication rec {
substituteInPlace frigate/const.py \
--replace "/media/frigate" "/var/lib/frigate" \
--replace "/tmp/cache" "/var/cache/frigate"
--replace "/tmp/cache" "/var/cache/frigate/"
substituteInPlace frigate/http.py \
--replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}" \
--replace "/tmp/cache/" "/var/cache/frigate"
--replace "/tmp/cache/" "/var/cache/frigate/"
substituteInPlace frigate/output.py \
--replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}"

6
pkgs/applications/video/multiviewer-for-f1/default.nix
View File

@@ -24,15 +24,15 @@
}:
let
id = "117980724";
id = "118976581";
in
stdenvNoCC.mkDerivation rec {
pname = "multiviewer-for-f1";
version = "1.24.1";
version = "1.24.2";
src = fetchurl {
url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb";
sha256 = "sha256-uEcxDIWolouIUJ8Xuva3rtW51gfCddAwTGqOBnucmmY=";
sha256 = "sha256-zll639fQFdrNvIj/4ECqEGxQw4VgfERGlti7opSmSi0=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/nss/latest.nix
View File

@@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.91";
hash = "sha256-hL1GN23xcRjFX21z0w/ZOgryEpbGbnaQRxVH5YmPxLM=";
version = "3.92";
hash = "sha256-PbGS1uiCA5rwKufq8yF+0RS7etg0FMZGdyq4Ah4kolQ=";
}

60
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@@ -12,52 +12,52 @@
"4.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.288-hardened1.patch",
"sha256": "0iw70vp9m7ldq85jfycfaihq2974giwi1d9fdd1yrhljlwzf9y6p",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.288-hardened1/linux-hardened-4.19.288-hardened1.patch"
"name": "linux-hardened-4.19.289-hardened1.patch",
"sha256": "1bi0cf15nqbk5hkhy76cd1xbb3fsnrgz705lry19v467hn3c0fx3",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.289-hardened1/linux-hardened-4.19.289-hardened1.patch"
},
"sha256": "1sz3jp6kx0axdwp0wsq903q1090rbav9d12m5128335m8p2d1srk",
"version": "4.19.288"
"sha256": "1cx33aa9v2071gixvp68pqpp4vxcx61dqg04rf6xns1qg48p93qi",
"version": "4.19.289"
},
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.186-hardened1.patch",
"sha256": "0k6f2sxk2gy601w0132i5glznhi35wbdpxkqsfgxlr2gi2w021wr",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.186-hardened1/linux-hardened-5.10.186-hardened1.patch"
"name": "linux-hardened-5.10.187-hardened1.patch",
"sha256": "17m8v9xs300cd4jblvqxgmpsi0i15r57sl8xfc0vnl3b0ikip1rk",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.187-hardened1/linux-hardened-5.10.187-hardened1.patch"
},
"sha256": "1qqv91r13akgik1q4jybf8czskxxizk6lpv4rsvjn9sx2dm2jq0y",
"version": "5.10.186"
"sha256": "1fwbz5xg3jxfzji9jlxqwf5rz9acgn4sm2inp3l017iy1chm957n",
"version": "5.10.187"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.120-hardened1.patch",
"sha256": "0wqnwjww062ykh1y2yrbsy75b0fz8xlkazijgvj3rl14wvccf39x",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.120-hardened1/linux-hardened-5.15.120-hardened1.patch"
"name": "linux-hardened-5.15.122-hardened1.patch",
"sha256": "0845jjvs2wf81vp43f62gsbkdi1l96ajpv6n7pnc1bi02hqgb6az",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.122-hardened1/linux-hardened-5.15.122-hardened1.patch"
},
"sha256": "1xl3nrykbxdwv5a9rk0xnb7l61dsyjvkm1ryrdii09vbmsg0i6b4",
"version": "5.15.120"
"sha256": "0b9ljdi9vgwzw4wa8gx1ia5fmb1pm8lnslx0q2l2kqhwrl0mhx9q",
"version": "5.15.122"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.249-hardened1.patch",
"sha256": "11rwyr68wrhjl0cdkvbgcpxwz4bwx3hii9k6xmai7hpds6rb3nsx",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.249-hardened1/linux-hardened-5.4.249-hardened1.patch"
"name": "linux-hardened-5.4.250-hardened1.patch",
"sha256": "0l4a0wwv2ipwic24igvy48b114p55bx6zjbsj8j1jja6xpn8psk5",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.250-hardened1/linux-hardened-5.4.250-hardened1.patch"
},
"sha256": "079mylc5j7hk5xn59q3z2xydyh88pq7yipn67x3y7nvf5i35hm6w",
"version": "5.4.249"
"sha256": "1ywil04x3mw62n53pkrkxrhkg1xyi3g9ssvg6igbyqk0a9v8hnqg",
"version": "5.4.250"
},
"6.1": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.1.39-hardened1.patch",
"sha256": "0j4sgcs6m2mq9dn1v525bymhdhha3x8ivrpfrhqm553q4vdnmbg7",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.39-hardened1/linux-hardened-6.1.39-hardened1.patch"
"name": "linux-hardened-6.1.41-hardened1.patch",
"sha256": "084lwlynwsm76vnmp02q80vbv4bi993swz3vvwsj3na8160c1w2y",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.41-hardened1/linux-hardened-6.1.41-hardened1.patch"
},
"sha256": "1f45j3ch1ljbacjlg8q45iva9lvwys938rdg0s516mznzlifxpac",
"version": "6.1.39"
"sha256": "1dqbawgcpwxszqqnf7a66db8xlldxnr4f3sqlq42l1gaiskhja1i",
"version": "6.1.41"
},
"6.3": {
"patch": {
@@ -72,11 +72,11 @@
"6.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.4.4-hardened1.patch",
"sha256": "0yy02hn190wvl24z1j9kjmnyxrlp6s9fhkyvqgcm8i56d7d69zhb",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.4-hardened1/linux-hardened-6.4.4-hardened1.patch"
"name": "linux-hardened-6.4.6-hardened1.patch",
"sha256": "1364ilh3vfvajx2ahd1mkwv13lnbfzmg0cwa9apghqfzqdn1c77x",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.6-hardened1/linux-hardened-6.4.6-hardened1.patch"
},
"sha256": "0apzfnn04w6jda9yw5cbgj8784frvqrryb1iw5ad390lwwmlmg4w",
"version": "6.4.4"
"sha256": "192ya79h3lw781ka22ibgbvdcx6maa74nyk0lqjsz2n4xybc9v71",
"version": "6.4.6"
}
}

44
pkgs/servers/owncast/default.nix
View File

@@ -1,43 +1,31 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests, bash, which, ffmpeg, makeWrapper, coreutils, ... }:
{ lib
, buildGoModule
, fetchFromGitHub
, nixosTests
, ffmpeg
, makeBinaryWrapper
}:
buildGoModule rec {
let
version = "0.1.1";
in buildGoModule {
pname = "owncast";
version = "0.0.13";
inherit version;
src = fetchFromGitHub {
owner = "owncast";
repo = "owncast";
rev = "v${version}";
sha256 = "sha256-hbZtdJbCB+67KXtApSRAO7Srye+UO0FbilKftQH6ESE=";
hash = "sha256-nBTuvVVnFlC75p8bRCN+lNl9fExBZrsLEesvXWwNlAQ=";
};
vendorSha256 = "sha256-sQRNf+eT9JUbYne/3E9LoY0K+c7MlxtIbGmTa3VkHvI=";
vendorHash = "sha256-yjy5bDJjWk7UotBVqvVFiGx8mpfhpqMTxoQm/eWHcw4=";
propagatedBuildInputs = [ ffmpeg ];
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeBinaryWrapper ];
preInstall = ''
mkdir -p $out
cp -r $src/{static,webroot} $out
'';
postInstall = let
setupScript = ''
[ ! -d "$PWD/webroot" ] && (
${coreutils}/bin/cp --no-preserve=mode -r "${placeholder "out"}/webroot" "$PWD"
)
[ ! -d "$PWD/static" ] && (
[ -L "$PWD/static" ] && ${coreutils}/bin/rm "$PWD/static"
${coreutils}/bin/ln -s "${placeholder "out"}/static" "$PWD"
)
'';
in ''
postInstall = ''
wrapProgram $out/bin/owncast \
--run '${setupScript}' \
--prefix PATH : ${lib.makeBinPath [ bash which ffmpeg ]}
--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
'';
installCheckPhase = ''

3
pkgs/tools/security/solo2-cli/default.nix
View File

@@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
install -D 70-solo2.rules $out/lib/udev/rules.d/70-solo2.rules
installShellCompletion target/*/release/solo2.{bash,fish,zsh}
installShellCompletion target/*/release/solo2.{bash,fish}
installShellCompletion --zsh target/*/release/_solo2
'';
doCheck = true;