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 release-23.05 into staging-next-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-08-20 00:12:44 +00:00
committed by GitHub
parent 064c7961b1 90677a4464
commit 398560f650
8 changed files with 97 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/editors/emacs/default.nix
View File

@@ -54,7 +54,16 @@ lib.makeScope pkgs.newScope (self:
withPgtk = true;
};
emacs-macport = callPackage (self.sources.emacs-macport) {
emacs28-macport = callPackage (self.sources.emacs28-macport) {
inherit gconf;
inherit (pkgs.darwin) sigtool;
inherit (pkgs.darwin.apple_sdk.frameworks)
AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz
QuartzCore WebKit;
};
emacs29-macport = callPackage (self.sources.emacs29-macport) {
inherit gconf;
inherit (pkgs.darwin) sigtool;

29
pkgs/applications/editors/emacs/generic.nix
View File

@@ -59,19 +59,6 @@
, webkitgtk
, wrapGAppsHook
# macOS dependencies for NS and macPort
, AppKit
, Carbon
, Cocoa
, GSS
, IOKit
, ImageCaptureCore
, ImageIO
, OSAKit
, Quartz
, QuartzCore
, WebKit
# Boolean flags
, nativeComp ? null
, withNativeCompilation ?
@@ -87,6 +74,7 @@
, withGTK2 ? false
, withGTK3 ? withPgtk && !noGui
, withGconf ? false
, withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets)
, withGpm ? stdenv.isLinux
, withImageMagick ? lib.versionOlder version "27" && (withX || withNS)
, withMotif ? false
@@ -109,6 +97,19 @@
else if withMotif then "motif"
else if withAthena then "athena"
else "lucid")
# macOS dependencies for NS and macPort
, AppKit
, Carbon
, Cocoa
, GSS
, IOKit
, ImageCaptureCore
, ImageIO
, OSAKit
, Quartz
, QuartzCore
, WebKit
}:
assert (withGTK2 && !withNS && variant != "macport") -> withX;
@@ -244,7 +245,7 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation {
gtk3-x11
] ++ lib.optionals (withX && withMotif) [
motif
] ++ lib.optionals (withX && withXwidgets) [
] ++ lib.optionals withGlibNetworking [
glib-networking
] ++ lib.optionals withNativeCompilation [
libgccjit

59
pkgs/applications/editors/emacs/sources.nix
View File

@@ -4,9 +4,13 @@
}:
let
mainlineMeta = {
homepage = "https://www.gnu.org/software/emacs/";
description = "The extensible, customizable GNU text editor";
metaFor = variant: version: rev: {
homepage = {
"mainline" = "https://www.gnu.org/software/emacs/";
"macport" = "https://bitbucket.org/mituharu/emacs-mac/";
}.${variant};
description = "The extensible, customizable GNU text editor"
+ lib.optionalString (variant == "macport") " - macport variant";
longDescription = ''
GNU Emacs is an extensible, customizable text editor—and more. At its core
is an interpreter for Emacs Lisp, a dialect of the Lisp programming
@@ -21,7 +25,15 @@ let
functionality, including a project planner, mail and news reader, debugger
interface, calendar, and more. Many of these extensions are distributed
with GNU Emacs; others are available separately.
'' + lib.optionalString (variant == "macport") ''
This release is built from Mitsuharu Yamamoto's patched source code
tailored for macOS.
'';
changelog = {
"mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}";
"macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac";
}.${variant};
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
AndersonTorres
@@ -31,7 +43,11 @@ let
lovek323
matthewbauer
];
platforms = lib.platforms.all;
platforms = {
"mainline" = lib.platforms.all;
"macport" = lib.platforms.darwin;
}.${variant};
mainProgram = "emacs";
};
in
{
@@ -45,23 +61,23 @@ in
hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
};
meta = mainlineMeta;
meta = metaFor "mainline" "28.2" "28.2";
};
emacs29 = import ./generic.nix {
pname = "emacs";
version = "29.1-rc1";
version = "29.1";
variant = "mainline";
src = fetchFromSavannah {
repo = "emacs";
rev = "29.1-rc1";
hash = "sha256-p0lBSKsHrFwYTqO5UVIF/PgiqwdhYQE4oUVcPtd+gsU=";
rev = "29.1";
hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg=";
};
meta = mainlineMeta;
meta = metaFor "mainline" "29.1" "29.1";
};
emacs-macport = import ./generic.nix {
emacs28-macport = import ./generic.nix {
pname = "emacs-mac";
version = "28.2";
variant = "macport";
@@ -72,16 +88,21 @@ in
hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";
};
meta = {
homepage = "https://bitbucket.org/mituharu/emacs-mac/";
description = mainlineMeta.description + " - with macport patches";
longDescription = mainlineMeta.longDescription + ''
meta = metaFor "macport" "28.2" "emacs-28.2-mac-9.1";
};
This release is built from Mitsuharu Yamamoto's patched source code
tailoired for MacOS X.
'';
inherit (mainlineMeta) license maintainers;
platforms = lib.platforms.darwin;
emacs29-macport = import ./generic.nix {
pname = "emacs-mac";
version = "29.1";
variant = "macport";
src = fetchFromBitbucket {
owner = "mituharu";
repo = "emacs-mac";
rev = "emacs-29.1-mac-10.0";
hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU=";
};
meta = metaFor "macport" "29.1" "emacs-29.1-mac-10.0";
};
}

12
pkgs/games/lgames/lbreakout2/default.nix
View File

@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, SDL
, SDL_mixer
, libintl
@@ -17,6 +18,12 @@ stdenv.mkDerivation rec {
sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i";
};
# Can't exit from pause without this patch
patches = [(fetchpatch {
url = "https://sources.debian.org/data/main/l/lbreakout2/2.6.5-2/debian/patches/sdl_fix_pauses.patch";
hash = "sha256-ycsuxfokpOblLky42MwtJowdEp7v5dZRMFIR4id4ZBI=";
})];
buildInputs = [
SDL
SDL_mixer
@@ -25,6 +32,11 @@ stdenv.mkDerivation rec {
zlib
];
# With fortify it crashes at runtime:
# *** buffer overflow detected ***: terminated
# Aborted (core dumped)
hardeningDisable = [ "fortify" ];
meta = with lib; {
homepage = "http://lgames.sourceforge.net/LBreakout2/";
description = "Breakout clone from the LGames series";

14
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
View File

@@ -3,14 +3,14 @@
let
# These names are how they are designated in https://xanmod.org.
ltsVariant = {
version = "6.1.45";
hash = "sha256-2UKu0ata48Rs2s+J/pI3qpgmxYRKaD8wwIZ6VulG4dg=";
version = "6.1.46";
hash = "sha256-E9DEWfhl9hUAQXOvJVYJsKBFIen0xHrmiUdTUvGeKxE=";
variant = "lts";
};
mainVariant = {
version = "6.4.10";
hash = "sha256-iRB2O0Ghh9LknqfxIf7zArS/p3iO2XEg/4R/z0QzxEQ=";
version = "6.4.11";
hash = "sha256-HZTLuxdlkVRBe8C95vr6Fk9YjlCXZEpK3gfbtzLqwLQ=";
variant = "main";
};
@@ -29,9 +29,9 @@ let
# AMD P-state driver
X86_AMD_PSTATE = lib.mkOverride 60 yes;
# Google's BBRv2 TCP congestion Control
TCP_CONG_BBR2 = yes;
DEFAULT_BBR2 = yes;
# Google's BBRv3 TCP congestion Control
TCP_CONG_BBR = yes;
DEFAULT_BBR = yes;
# FQ-PIE Packet Scheduling
NET_SCH_DEFAULT = yes;

9
pkgs/tools/security/opensc/default.nix
View File

@@ -1,5 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, zlib, readline, openssl
, libiconv, pcsclite, libassuan, libXt
, fetchpatch
, docbook_xsl, libxslt, docbook_xml_dtd_412
, Carbon, PCSC, buildPackages
, withApplePCSC ? stdenv.isDarwin
@@ -16,6 +17,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Yo8dwk7+d6q+hi7DmJ0GJM6/pmiDOiyEm/tEBSbCU8k=";
};
patches = [
(fetchpatch {
name = "CVE-2023-2977.patch";
url = "https://github.com/OpenSC/OpenSC/commit/81944d1529202bd28359bede57c0a15deb65ba8a.patch";
hash = "sha256-rCeYYKPtv3pii5zgDP5x9Kl2r98p3uxyBSCYlPJZR/s=";
})
];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [
zlib readline openssl libassuan

1
pkgs/top-level/aliases.nix
View File

@@ -444,6 +444,7 @@ mapAliases ({
emacs28NativeComp = emacs28; # Added 2022-06-08
emacs28Packages = emacs28.pkgs; # Added 2021-10-04
emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04
emacsMacport = emacs-macport; # Added 2023-08-10
emacsNativeComp = emacs28NativeComp; # Added 2022-06-08
emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22
emacsPackagesNg = emacs.pkgs; # Added 2019-08-07

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

@@ -30166,10 +30166,11 @@ with pkgs;
emacs29-gtk3
emacs29-nox
emacs29-pgtk
emacs-macport
emacs28-macport
emacs29-macport
;
emacsMacport = emacs-macport;
emacs-macport = emacs28-macport;
emacs = emacs28;
emacs-gtk = emacs28-gtk3;
emacs-nox = emacs28-nox;