nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 19:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-22.11 into staging-22.11

Browse Source
This commit is contained in:
github-actions[bot]
2023-01-15 00:15:06 +00:00
committed by GitHub
parent 78d805d662 c0889d1c1c
commit 6fb7857512
12 changed files with 131 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@@ -5995,6 +5995,12 @@
githubId = 37965;
name = "Léo Stefanesco";
};
indeednotjames = {
email = "nix@indeednotjames.com";
github = "IndeedNotJames";
githubId = 55066419;
name = "Emily Lange";
};
infinidoge = {
name = "Infinidoge";
email = "infinidoge@inx.moe";

106
nixos/modules/programs/firefox.nix
View File

@@ -5,6 +5,8 @@ with lib;
let
cfg = config.programs.firefox;
nmh = cfg.nativeMessagingHosts;
policyFormat = pkgs.formats.json { };
organisationInfo = ''
@@ -15,15 +17,15 @@ let
given control of your browser, unless of course they also control your
NixOS configuration.
'';
in {
in
{
options.programs.firefox = {
enable = mkEnableOption (mdDoc "the Firefox web browser");
package = mkOption {
description = mdDoc "Firefox package to use.";
type = types.package;
default = pkgs.firefox;
description = mdDoc "Firefox package to use.";
defaultText = literalExpression "pkgs.firefox";
relatedPackages = [
"firefox"
@@ -31,12 +33,12 @@ in {
"firefox-bin"
"firefox-devedition-bin"
"firefox-esr"
"firefox-esr-wayland"
"firefox-wayland"
];
};
policies = mkOption {
type = policyFormat.type;
default = { };
description = mdDoc ''
Group policies to install.
@@ -48,43 +50,97 @@ in {
${organisationInfo}
'';
type = policyFormat.type;
default = {};
};
preferences = mkOption {
type = with types; attrsOf (oneOf [ bool int string ]);
default = { };
description = mdDoc ''
Preferences to set from `about://config`.
Preferences to set from `about:config`.
Some of these might be able to be configured more ergonomically
using policies.
${organisationInfo}
'';
type = with types; attrsOf (oneOf [ bool int string ]);
default = {};
};
preferencesStatus = mkOption {
type = types.enum [ "default" "locked" "user" "clear" ];
default = "locked";
description = mdDoc ''
The status of `firefox.preferences`.
`status` can assume the following values:
- `"default"`: Preferences appear as default.
- `"locked"`: Preferences appear as default and can't be changed.
- `"user"`: Preferences appear as changed.
- `"clear"`: Value has no effect. Resets to factory defaults on each startup.
'';
};
autoConfig = mkOption {
type = types.lines;
default = "";
description = mdDoc ''
AutoConfig files can be used to set and lock preferences that are not covered
by the policies.json for Mac and Linux. This method can be used to automatically
change user preferences or prevent the end user from modifiying specific
preferences by locking them. More info can be found in https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig.
'';
};
nativeMessagingHosts = mapAttrs (_: v: mkEnableOption (mdDoc v)) {
browserpass = "Browserpass support";
bukubrow = "Bukubrow support";
ff2mpv = "ff2mpv support";
fxCast = "fx_cast support";
gsconnect = "GSConnect support";
jabref = "JabRef support";
passff = "PassFF support";
tridactyl = "Tridactyl support";
ugetIntegrator = "Uget Integrator support";
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
environment.systemPackages = [
(cfg.package.override {
extraPrefs = cfg.autoConfig;
extraNativeMessagingHosts = with pkgs; optionals nmh.ff2mpv [
ff2mpv
] ++ optionals nmh.gsconnect [
gnomeExtensions.gsconnect
] ++ optionals nmh.jabref [
jabref
] ++ optionals nmh.passff [
passff-host
];
})
];
environment.etc."firefox/policies/policies.json".source =
let policiesJSON =
policyFormat.generate
"firefox-policies.json"
{ inherit (cfg) policies; };
in mkIf (cfg.policies != {}) "${policiesJSON}";
nixpkgs.config.firefox = {
enableBrowserpass = nmh.browserpass;
enableBukubrow = nmh.bukubrow;
enableTridactylNative = nmh.tridactyl;
enableUgetIntegrator = nmh.ugetIntegrator;
enableFXCastBridge = nmh.fxCast;
};
environment.etc =
let
policiesJSON = policyFormat.generate "firefox-policies.json" { inherit (cfg) policies; };
in
mkIf (cfg.policies != { }) {
"firefox/policies/policies.json".source = "${policiesJSON}";
};
# Preferences are converted into a policy
programs.firefox.policies =
mkIf (cfg.preferences != {})
{
Preferences = (mapAttrs (name: value: {
Value = value;
Status = "locked";
}) cfg.preferences);
};
programs.firefox.policies = mkIf (cfg.preferences != { }) {
Preferences = (mapAttrs
(_: value: { Value = value; Status = cfg.preferencesStatus; })
cfg.preferences);
};
};
meta.maintainers = with maintainers; [ danth ];

4
pkgs/applications/graphics/graphicsmagick/default.nix
View File

@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "graphicsmagick";
version = "1.3.38";
version = "1.3.39";
src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
sha256 = "sha256-1gzZ21k1HSucsZvrRDFwrKoo8HPRPSWPZ7NidjXjJnU=";
sha256 = "sha256-4wscpY6HPQoe4gg4RyRCTbLTwzpUA04mHRTo+7j40E8=";
};
patches = [

17
pkgs/applications/graphics/openimageio/2.x.nix
View File

@@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, boost
, cmake
, giflib
@@ -16,15 +17,23 @@
stdenv.mkDerivation rec {
pname = "openimageio";
version = "2.2.17.0";
version = "2.4.6.1";
src = fetchFromGitHub {
owner = "OpenImageIO";
repo = "oiio";
rev = "Release-${version}";
sha256 = "0jqpb1zci911wdm928addsljxx8zsh0gzbhv9vbw6man4wi93h6h";
rev = "v${version}";
sha256 = "sha256-oBICukkborxXFHXyM2rIn5qSbCWECjwDQI9MUg13IRU=";
};
patches = [
(fetchpatch {
name = "arm-fix-signed-unsigned-simd-mismatch.patch";
url = "https://github.com/OpenImageIO/oiio/commit/726c51181a2888b0bd1edbef5ac8451e9cc3f893.patch";
hash = "sha256-G4vexf0OHZ/sbcRob5X92tajkmAv72ok8rcVQtIE9XE=";
})
];
outputs = [ "bin" "out" "dev" "doc" ];
nativeBuildInputs = [
@@ -58,7 +67,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "http://www.openimageio.org";
homepage = "https://openimageio.org";
description = "A library and tools for reading and writing images";
license = licenses.bsd3;
maintainers = with maintainers; [ goibhniu ];

10
pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
View File

@@ -2,19 +2,19 @@
buildGoModule rec {
pname = "drone-runner-docker";
version = "1.8.1";
version = "1.8.3";
src = fetchFromGitHub {
owner = "drone-runners";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3SbvnW+mCwaBCF77rAnDMqZRHX9wDCjXvFGq9w0E5Qw=";
rev = "refs/tags/v${version}";
sha256 = "sha256-ZoQeCuT5FRhxp/ikB0gkp3QVOQ6OS7ukkz4QanWT9G0=";
};
vendorSha256 = "sha256-E18ykjQc1eoHpviYok+NiLaeH01UMQmigl9JDwtR+zo=";
vendorHash = "sha256-KcNp3VdJ201oxzF0bLXY4xWHqHNz54ZrVSI96cfhU+k=";
meta = with lib; {
maintainers = with maintainers; [ endocrimes ];
maintainers = with maintainers; [ endocrimes indeednotjames ];
license = licenses.unfreeRedistributable;
homepage = "https://github.com/drone-runners/drone-runner-docker";
description = "Drone pipeline runner that executes builds inside Docker containers";

8
pkgs/games/mindustry/default.nix
View File

@@ -32,20 +32,20 @@
let
pname = "mindustry";
version = "140.4";
version = "141.2";
buildVersion = makeBuildVersion version;
Mindustry = fetchFromGitHub {
owner = "Anuken";
repo = "Mindustry";
rev = "v${version}";
sha256 = "0lfDISvC5dOd76BuPPniPf+8hXWQ/wtreNHN75k2jVA=";
sha256 = "sha256-7olnyjkcT8OwokipDnLFW3rMOPljF6HvsU249SDvA3U=";
};
Arc = fetchFromGitHub {
owner = "Anuken";
repo = "Arc";
rev = "v${version}";
sha256 = "lZ3ACijauUC9jVRq9I/QwX9ozFF/dw+ArEMND+RMItM=";
sha256 = "sha256-JYM2/dkrLFZz+oqOs8e+iTRG5Vv4oUcmpAavRQ7NMMM=";
};
soloud = fetchFromGitHub {
owner = "Anuken";
@@ -125,7 +125,7 @@ let
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "FbLd3kk/awFz91o8pZcwJTFozwJ7R+RlDOsMRaala5Q=";
outputHash = "sha256-Eb+LyO1d2XwhAp9awgMlxs7dfZav0ja9kH7PaUJQOCo=";
};
in

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

@@ -32,12 +32,12 @@
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.85-hardened1.patch",
"sha256": "03zjcjyiklhxhq958hx1mlhhjcz0isdrij217q8ji78bz3y40m0q",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.85-hardened1/linux-hardened-5.15.85-hardened1.patch"
"name": "linux-hardened-5.15.86-hardened1.patch",
"sha256": "04yp2qqn9axvkaqgihb1vxnkwnjs5s2q9106y5x4r1q4bf42nz2v",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.86-hardened1/linux-hardened-5.15.86-hardened1.patch"
},
"sha256": "024qhjh9mgfnanr1qd8002n6a4wpn98lajli12a0m3n9z8lsw2rc",
"version": "5.15.85"
"sha256": "1vpjnmwqsx6akph2nvbsv2jl7pp8b7xns3vmwbljsl23lkpxkz40",
"version": "5.15.86"
},
"5.4": {
"patch": {
@@ -52,11 +52,11 @@
"6.0": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.0.15-hardened1.patch",
"sha256": "0v7aqxa6ba2jkx1dd9axr9vsnn3pbq30vwfd0akc72zc8c5zll1r",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.15-hardened1/linux-hardened-6.0.15-hardened1.patch"
"name": "linux-hardened-6.0.16-hardened1.patch",
"sha256": "19rakmfdkkbvvzphsksccgad3wc2khlcynzdqx10d7spldj8nkp1",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.16-hardened1/linux-hardened-6.0.16-hardened1.patch"
},
"sha256": "08389890gq4b9vkvrb22lzkr4blkn3a5ma074ns19gl89wyyp16l",
"version": "6.0.15"
"sha256": "1r2wf3hf7yxl7lxma7plyi8pk3dmlsrpm763rf0g1h8ilsy72844",
"version": "6.0.16"
}
}

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.161";
version = "5.10.162";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0ya04njrxr4d37zkxvivmn5f0bdvcb504pyp9ahwz8nqpk8gdaks";
sha256 = "05yjgp1la5flwqji9b6j7nbdgg5fwzv2ph536v4f9pzza3y01i1f";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-6.0.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.0.16";
version = "6.0.17";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "1r2wf3hf7yxl7lxma7plyi8pk3dmlsrpm763rf0g1h8ilsy72844";
sha256 = "020xrv9449gd0jnfgi0sb69bgs2p9sd49dghmd3bnnal584r5vm7";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-6.1.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.1.2";
version = "6.1.3";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "1bni72q0jjg39vqckcif57kh7d1x4k4jir5a11pz9clryp2g6hgf";
sha256 = "05q3b32kinvbgbibb8s3x8ax3gzlgznlcwvwb4y46gjilzkrmj3d";
};
} // (args.argsOverride or { }))

6
pkgs/tools/package-management/nix-index/default.nix
View File

@@ -4,16 +4,16 @@
rustPlatform.buildRustPackage rec {
pname = "nix-index";
version = "0.1.3";
version = "0.1.4";
src = fetchFromGitHub {
owner = "bennofs";
repo = "nix-index";
rev = "v${version}";
sha256 = "sha256-UbM4041AiYUOcj8e5dJ5HmD26Db3szs6dABVCwseliU=";
sha256 = "sha256-TDGtnSgY897fRm1BWLlQZQa8v6Wu5/JIF4UH+1CZm4U=";
};
cargoSha256 = "sha256-TMfnjtUo7Kxx/kWnc0scC8qU6vi+E+TL0hE73NNIyjk=";
cargoSha256 = "sha256-z1lLpZBD4HjO6gLw96wbucfchRgZs26Q8Gl+hpUB1xo=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl curl sqlite ]

2
pkgs/top-level/all-packages.nix
View File

@@ -31054,7 +31054,7 @@ with pkgs;
boost = boost175;
};
openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { };
openimageio2 = darwin.apple_sdk_11_0.callPackage ../applications/graphics/openimageio/2.x.nix { };
openjump = callPackage ../applications/misc/openjump { };