colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source 
; Conflicts:
;	nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
;	nixos/doc/manual/release-notes/rl-2205.section.md
This commit is contained in:
Jan Tojnar 2022-01-10 19:27:28 +01:00
commit 3dba2db347
40 changed files with 673 additions and 776 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/attrsets.nix
View File

@ -378,7 +378,8 @@ rec {
zipAttrsWith (name: values: values) [{a = "x";} {a = "y"; b = "z";}]
=> { a = ["x" "y"]; b = ["z"] }
*/
zipAttrsWith = f: sets: zipAttrsWithNames (concatMap attrNames sets) f sets;
zipAttrsWith =
builtins.zipAttrsWith or (f: sets: zipAttrsWithNames (concatMap attrNames sets) f sets);
/* Like `zipAttrsWith' with `(name: values: values)' as the function.
Example:

2
lib/default.nix
View File

@ -66,7 +66,7 @@ let
stringLength sub substring tail trace;
inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor
bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max
importJSON importTOML warn warnIf throwIfNot
importJSON importTOML warn warnIf throwIfNot checkListOfEnum
info showWarnings nixpkgsVersion version
mod compare splitByAndCompare functionArgs setFunctionArgs isFunction
toHexString toBaseDigits;

15
lib/modules.nix
View File

@ -37,6 +37,7 @@ let
toList
types
warnIf
zipAttrsWith
;
inherit (lib.options)
isOption
@ -442,10 +443,11 @@ rec {
}
*/
byName = attr: f: modules:
foldl' (acc: module:
if !(builtins.isAttrs module.${attr}) then
zipAttrsWith (n: concatLists)
(map (module: let subtree = module.${attr}; in
if !(builtins.isAttrs subtree) then
throw ''
You're trying to declare a value of type `${builtins.typeOf module.${attr}}'
You're trying to declare a value of type `${builtins.typeOf subtree}'
rather than an attribute-set for the option
`${builtins.concatStringsSep "." prefix}'!
@ -454,11 +456,8 @@ rec {
this option by e.g. referring to `man 5 configuration.nix'!
''
else
acc // (mapAttrs (n: v:
(acc.${n} or []) ++ f module v
) module.${attr}
)
) {} modules;
mapAttrs (n: f module) subtree
) modules);
# an attrset 'name' => list of submodules that declare ‘name’.
declsByName = byName "options" (module: option:
[{ inherit (module) _file; options = option; }]

17
lib/trivial.nix
View File

@ -347,6 +347,23 @@ rec {
*/
throwIfNot = cond: msg: if cond then x: x else throw msg;
/* Check if the elements in a list are valid values from a enum, returning the identity function, or throwing an error message otherwise.
Example:
let colorVariants = ["bright" "dark" "black"]
in checkListOfEnum "color variants" [ "standard" "light" "dark" ] colorVariants;
=>
error: color variants: bright, black unexpected; valid ones: standard, light, dark
Type: String -> List ComparableVal -> List ComparableVal -> a -> a
*/
checkListOfEnum = msg: valid: given:
let
unexpected = lib.subtractLists valid given;
in
lib.throwIfNot (unexpected == [])
"${msg}: ${builtins.concatStringsSep ", " (builtins.map builtins.toString unexpected)} unexpected; valid ones: ${builtins.concatStringsSep ", " (builtins.map builtins.toString valid)}";
info = msg: builtins.trace "INFO: ${msg}";
showWarnings = warnings: res: lib.foldr (w: x: warn w x) res warnings;

12
maintainers/maintainer-list.nix
View File

@ -5957,6 +5957,12 @@
githubId = 11947756;
name = "Julien Dehos";
};
julienmalka = {
email = "julien.malka@me.com";
github = "JulienMalka";
githubId = 1792886;
name = "Julien Malka";
};
julm = {
email = "julm+nixpkgs@sourcephile.fr";
github = "ju1m";
@ -6610,6 +6616,12 @@
githubId = 55911173;
name = "Gwendolyn Quasebarth";
};
lammermann = {
email = "k.o.b.e.r@web.de";
github = "lammermann";
githubId = 695526;
name = "Benjamin Kober";
};
larsr = {
email = "Lars.Rasmusson@gmail.com";
github = "larsr";

13
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -265,6 +265,13 @@
replacements.
</para>
</listitem>
<listitem>
<para>
<literal>services.thelounge.private</literal> was removed in
favor of <literal>services.thelounge.public</literal>, to
follow with upstream changes.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-notable-changes">
@ -380,6 +387,12 @@
<literal>pkgs.theLoungePlugins.themes</literal>.
</para>
</listitem>
<listitem>
<para>
The <literal>firmwareLinuxNonfree</literal> package has been
renamed to <literal>linux-firmware</literal>.
</para>
</listitem>
</itemizedlist>
</section>
</section>

4
nixos/doc/manual/release-notes/rl-2205.section.md
View File

@ -89,6 +89,8 @@ In addition to numerous new and upgraded packages, this release has the followin
[upstream's release notes](https://github.com/iputils/iputils/releases/tag/20211215)
for more details and available replacements.
- `services.thelounge.private` was removed in favor of `services.thelounge.public`, to follow with upstream changes.
## Other Notable Changes {#sec-release-22.05-notable-changes}
- The option [services.redis.servers](#opt-services.redis.servers) was added
@ -138,3 +140,5 @@ In addition to numerous new and upgraded packages, this release has the followin
is set to `true`.
- The option `services.thelounge.plugins` has been added to allow installing plugins for The Lounge. Plugins can be found in `pkgs.theLoungePlugins.plugins` and `pkgs.theLoungePlugins.themes`.
- The `firmwareLinuxNonfree` package has been renamed to `linux-firmware`.

3
nixos/modules/hardware/all-firmware.nix
View File

@ -31,7 +31,6 @@ in {
type = types.bool;
description = ''
Turn on this option if you want to enable all the firmware with a license allowing redistribution.
(i.e. free firmware and <literal>firmware-linux-nonfree</literal>)
'';
};
@ -51,7 +50,7 @@ in {
config = mkMerge [
(mkIf (cfg.enableAllFirmware || cfg.enableRedistributableFirmware) {
hardware.firmware = with pkgs; [
firmwareLinuxNonfree
linux-firmware
intel2200BGFirmware
rtl8192su-firmware
rt5677-firmware

11
nixos/modules/services/networking/thelounge.nix
View File

@ -6,7 +6,7 @@ let
cfg = config.services.thelounge;
dataDir = "/var/lib/thelounge";
configJsData = "module.exports = " + builtins.toJSON (
{ private = cfg.private; port = cfg.port; } // cfg.extraConfig
{ inherit (cfg) public port; } // cfg.extraConfig
);
pluginManifest = {
dependencies = builtins.listToAttrs (builtins.map (pkg: { name = getName pkg; value = getVersion pkg; }) cfg.plugins);
@ -20,14 +20,17 @@ let
'';
in
{
imports = [ (mkRemovedOptionModule [ "services" "thelounge" "private" ] "The option was renamed to `services.thelounge.public` to follow upstream changes.") ];
options.services.thelounge = {
enable = mkEnableOption "The Lounge web IRC client";
private = mkOption {
public = mkOption {
type = types.bool;
default = false;
description = ''
Make your The Lounge instance private. You will need to configure user
Make your The Lounge instance public.
Setting this to <literal>false</literal> will require you to configure user
accounts by using the (<command>thelounge</command>) command or by adding
entries in <filename>${dataDir}/users</filename>. You might need to restart
The Lounge after making changes to the state directory.
@ -79,7 +82,9 @@ in
group = "thelounge";
isSystemUser = true;
};
users.groups.thelounge = { };
systemd.services.thelounge = {
description = "The Lounge web IRC client";
wantedBy = [ "multi-user.target" ];

6
pkgs/applications/misc/deco/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "deco";
version = "0.0.2";
version = "unstable-2019-04-03";
src = fetchFromGitHub {
owner = "ebzzry";
repo = pname;
rev = "49cded5ad123b0169f47cd0dc0f5420f4b581837";
sha256 = "19rvqhw0blwga8ck86yy8hj7j1l9hriphlld6yrfd3yip4jprjzz";
rev = "dd8ec7905bc85d085eb2ee3bddabea451054288c";
sha256 = "sha256-/3GeNvWOCRPOYTUbodXDUxR5QVDEyx6x2Jt5PxsPdvk=";
};
installPhase = ''

63
pkgs/applications/misc/tuhi/default.nix Normal file
View File

@ -0,0 +1,63 @@
{ lib
, pkg-config
, python3Packages
, meson
, ninja
, appstream-glib
, desktop-file-utils
, glib
, gtk3
, gobject-introspection
, wrapGAppsHook
, fetchFromGitHub
}:
python3Packages.buildPythonApplication rec {
name = "tuhi";
version = "0.5";
format = "other";
src = fetchFromGitHub {
owner = "tuhiproject";
repo = name;
rev = "${version}";
sha256 = "17kggm9c423vj7irxx248fjc8sxvkp9w1mgawlx1snrii817p3db";
};
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
nativeBuildInputs = [
pkg-config meson ninja
appstream-glib desktop-file-utils
wrapGAppsHook
];
buildInputs = [
gtk3 gobject-introspection
glib
];
checkInputs = with python3Packages; [ flake8 pytest ];
propagatedBuildInputs = with python3Packages; [
svgwrite pyxdg pycairo pygobject3 setuptools-scm
];
strictDeps = false;
preConfigure = ''
substituteInPlace meson_install.sh \
--replace "/usr/bin/env sh" "sh"
'';
postFixup = ''
wrapPythonProgramsIn $out/libexec "$out $pythonPath"
'';
meta = with lib; {
description = "DBus daemon to access Wacom SmartPad devices";
homepage = "https://github.com/tuhiproject/tuhi";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ lammermann ];
};
}

3
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -3,6 +3,7 @@
, libssh, nghttp2, zlib, cmake, makeWrapper
, withQt ? true, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp
, asciidoctor
}:
assert withQt -> qt5 != null;
@ -33,7 +34,7 @@ in stdenv.mkDerivation {
# Avoid referencing -dev paths because of debug assertions.
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
nativeBuildInputs = [ bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook;
nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook;
buildInputs = [
gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt

9
pkgs/applications/radio/gnuradio/3.8.nix
View File

@ -43,13 +43,13 @@
, pname ? "gnuradio"
, versionAttr ? {
major = "3.8";
minor = "4";
minor = "5";
patch = "0";
}
}:
let
sourceSha256 = "sha256-C8S3iF7vj9A8SpxriW9y7idrhXzonvenoQtVAMex+Iw=";
sourceSha256 = "sha256-p4VFjTE0GXmdA7QGhWSUzO/WxJ+8Dq3JEnOABtQtJUU=";
featuresInfo = {
# Needed always
basic = {
@ -243,11 +243,6 @@ stdenv.mkDerivation rec {
patches = [
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
./modtool-newmod-permissions.3_8.patch
(fetchpatch {
# https://github.com/gnuradio/gnuradio/pull/5226
url = "https://github.com/gnuradio/gnuradio/commit/9d7343526dd793120b6425cd9a6969416ed32503.patch";
sha256 = "sha256-usSoRDDuClUfdX4yFbQNu8wDzve6UEhZYTFj1oZbFic=";
})
# Fix compilation with boost 177
(fetchpatch {
url = "https://github.com/gnuradio/gnuradio/commit/2c767bb260a25b415e8c9c4b3ea37280b2127cec.patch";

4
pkgs/applications/radio/gnuradio/default.nix
View File

@ -46,13 +46,13 @@
, pname ? "gnuradio"
, versionAttr ? {
major = "3.9";
minor = "4";
minor = "5";
patch = "0";
}
}:
let
sourceSha256 = "sha256-O+37CyF0IVPdUB1e68HsaXD0T2VsOLPXOpLNlRYEXUk=";
sourceSha256 = "sha256-TWCXLoS+ImKNd2zkxMks4FXsQMvGKgcW5/MW8S1Y1TY=";
featuresInfo = {
# Needed always
basic = {

8
pkgs/applications/science/chemistry/cp2k/default.nix
View File

@ -11,13 +11,13 @@ let
in stdenv.mkDerivation rec {
pname = "cp2k";
version = "8.2.0";
version = "9.1.0";
src = fetchFromGitHub {
owner = "cp2k";
repo = "cp2k";
rev = "v${version}";
sha256 = "0kykq5p318hxjzd4gzqjwv9gqshbdvbg0gnjbd9bdfjx1r6jkjn3";
hash = "sha256-P9RwZmrE1E0UTQVasQxWAqa3LBLyJNGeJo8T6u5WWcw=";
fetchSubmodules = true;
};
@ -50,7 +50,9 @@ in stdenv.mkDerivation rec {
postPatch = ''
patchShebangs tools exts/dbcsr/tools/build_utils exts/dbcsr/.cp2k
substituteInPlace exts/dbcsr/.cp2k/Makefile --replace '/usr/bin/env python3' '${python3}/bin/python'
substituteInPlace exts/build_dbcsr/Makefile \
--replace '/usr/bin/env python3' '${python3}/bin/python' \
--replace 'SHELL = /bin/sh' 'SHELL = bash'
'';
configurePhase = ''

14
pkgs/development/python-modules/css-parser/default.nix
View File

@ -1,18 +1,26 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "css-parser";
version = "1.0.6";
version = "1.0.7";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "4ed448a8a5622edb1d30d616bbc4bd3d30f11be922343d7a92d7e418e324af2e";
sha256 = "25e096c63262dd249010ce36dab4cacd9595783ee09b5ed699ef12ab864ebbd1";
};
# Test suite not included in tarball yet
# See https://github.com/ebook-utils/css-parser/pull/2
doCheck = false;
pythonImportsCheck = [
"css_parser"
];
meta = with lib; {
description = "A CSS Cascading Style Sheets library for Python";
homepage = "https://github.com/ebook-utils/css-parser";

4
pkgs/development/python-modules/dnslib/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "dnslib";
version = "0.9.16";
version = "0.9.18";
src = fetchPypi {
inherit pname version;
sha256 = "2d66b43d563d60c469117c8cb615843e7d05bf8fb2e6cb00a637281d26b7ec7d";
sha256 = "71a60664e275b411e08d9807aaafd2ee897a872bed003d5c8fdf12f5818503da";
};
checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh";

4
pkgs/development/python-modules/goodwe/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "goodwe";
version = "0.2.12";
version = "0.2.13";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "marcelblijleven";
repo = pname;
rev = "v${version}";
sha256 = "153qv1x7yphfpf2nkcbd4fl6i7fjc3j5dvmyr7f59f1cm469sp10";
sha256 = "189szff4sl5pc670wv8syl6zcv3p748s33w11biig0vbd59kdr1l";
};
checkInputs = [

4
pkgs/development/python-modules/soco/default.nix
View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "soco";
version = "0.25.2";
version = "0.25.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SoCo";
repo = "SoCo";
rev = "v${version}";
sha256 = "sha256-Bu9RtzvQVDPekIzkVvcDkTs5Z+IDx6lSBCMv5zs8gNA=";
sha256 = "sha256-CoAmpcXy4oHMk0X4iJ/XMbUnI2m3ZWl8QzobH677FrI=";
};
propagatedBuildInputs = [

54
pkgs/development/tools/symfony-cli/default.nix
View File

@ -1,50 +1,24 @@
{ stdenvNoCC, fetchurl, lib }:
{ buildGoModule, fetchFromGitHub, lib }:
let
version = "4.26.9";
srcs = {
x86_64-linux = fetchurl {
url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz";
sha256 = "0ivqqrpzbpyzp60bv25scarmvisj401rp7h2s3cxa7d17prja91v";
};
i686-linux = fetchurl {
url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_386.gz";
sha256 = "0ag5w70bkvj9wgp4yzzy824shj907sa5l20sqcgivi3r5gy0p277";
};
aarch64-linux = fetchurl {
url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_arm64.gz";
sha256 = "00325xz7xl3bprj5zbg5yhn36jf4n37zlyag10m8zcmq8asa6k51";
};
x86_64-darwin = fetchurl {
url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_darwin_amd64.gz";
sha256 = "00325xz7xl3bprj5zbg5yhn36jf4n37zlyag10m8zcmq8asa6k51";
};
};
in stdenvNoCC.mkDerivation rec {
inherit version;
buildGoModule rec {
pname = "symfony-cli";
version = "5.0.7";
vendorSha256 = "sha256-aTC84iA3/z/qhZbXPtOeZwDGn6BFCefCVlkUrbEtxUI=";
src = srcs.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
src = fetchFromGitHub {
owner = "symfony-cli";
repo = "symfony-cli";
rev = "v${version}";
sha256 = "sha256-Z3AIlN/s0uPE0OAlgSxbQPRoWPTHjDq4c8RlQ3SuIk8=";
};
dontBuild = true;
unpackPhase = ''
gunzip <$src >symfony
'';
installPhase = ''
install -D -t $out/bin symfony
'';
# Tests requires network access
doCheck = false;
meta = with lib; {
description = "Symfony CLI";
homepage = "https://symfony.com/download";
license = licenses.unfree;
homepage = "https://github.com/symfony-cli/symfony-cli";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ drupol ];
platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" ];
};
}

6
pkgs/games/papermc/default.nix
View File

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, bash, jre }:
let
mcVersion = "1.17.1";
buildNum = "399";
mcVersion = "1.18.1";
buildNum = "132";
jar = fetchurl {
url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar";
sha256 = "01374201dkzrx28phy87wji7kzjwx8bpjzv85bjl6672ziskbmpd";
sha256 = "af26babef1e9134804bdf61e14eed7677d603516638f5a2ffe97e176ebd9839b";
};
in stdenv.mkDerivation {
pname = "papermc";

588
pkgs/misc/vim-plugins/generated.nix
View File

File diff suppressed because it is too large Load Diff

347
pkgs/os-specific/linux/alsa-project/alsa-firmware/cross.patch
View File

@ -1,347 +0,0 @@
--- a/hdsploader/Makefile.am 2015-02-26 20:36:03.000000000 +0800
+++ b/hdsploader/Makefile.am 2019-06-28 00:43:41.557803832 +0800
@@ -32,5 +32,14 @@
tobin.c
CLEANFILES = $(dsp_hex_files)
-$(dsp_hex_files): tobin
- ./tobin
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(tobin_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(tobin_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(tobin_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+tobin$(BUILD_EXEEXT): $(tobin_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+$(dsp_hex_files): tobin$(BUILD_EXEEXT)
+ ./$<
--- a/m4/ax_prog_cc_for_build.m4 2019-06-27 15:50:02.274134717 +0800
+++ b/m4/ax_prog_cc_for_build.m4 2019-06-28 01:32:45.088117432 +0800
@@ -0,0 +1,125 @@
+# ===========================================================================
+# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_PROG_CC_FOR_BUILD
+#
+# DESCRIPTION
+#
+# This macro searches for a C compiler that generates native executables,
+# that is a C compiler that surely is not a cross-compiler. This can be
+# useful if you have to generate source code at compile-time like for
+# example GCC does.
+#
+# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
+# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
+# The value of these variables can be overridden by the user by specifying
+# a compiler with an environment variable (like you do for standard CC).
+#
+# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
+# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
+# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
+# substituted in the Makefile.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 9
+
+AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
+AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_CPP])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+dnl Use the standard macros, but make them use other variable names
+dnl
+pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
+pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
+pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
+pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
+pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
+pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
+pushdef([ac_cv_objext], ac_cv_build_objext)dnl
+pushdef([ac_exeext], ac_build_exeext)dnl
+pushdef([ac_objext], ac_build_objext)dnl
+pushdef([CC], CC_FOR_BUILD)dnl
+pushdef([CPP], CPP_FOR_BUILD)dnl
+pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
+pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
+pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
+pushdef([host], build)dnl
+pushdef([host_alias], build_alias)dnl
+pushdef([host_cpu], build_cpu)dnl
+pushdef([host_vendor], build_vendor)dnl
+pushdef([host_os], build_os)dnl
+pushdef([ac_cv_host], ac_cv_build)dnl
+pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
+pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
+pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
+pushdef([ac_cv_host_os], ac_cv_build_os)dnl
+pushdef([ac_cpp], ac_build_cpp)dnl
+pushdef([ac_compile], ac_build_compile)dnl
+pushdef([ac_link], ac_build_link)dnl
+
+save_cross_compiling=$cross_compiling
+save_ac_tool_prefix=$ac_tool_prefix
+cross_compiling=no
+ac_tool_prefix=
+
+AC_PROG_CC
+AC_PROG_CPP
+AC_EXEEXT
+
+ac_tool_prefix=$save_ac_tool_prefix
+cross_compiling=$save_cross_compiling
+
+dnl Restore the old definitions
+dnl
+popdef([ac_link])dnl
+popdef([ac_compile])dnl
+popdef([ac_cpp])dnl
+popdef([ac_cv_host_os])dnl
+popdef([ac_cv_host_vendor])dnl
+popdef([ac_cv_host_cpu])dnl
+popdef([ac_cv_host_alias])dnl
+popdef([ac_cv_host])dnl
+popdef([host_os])dnl
+popdef([host_vendor])dnl
+popdef([host_cpu])dnl
+popdef([host_alias])dnl
+popdef([host])dnl
+popdef([LDFLAGS])dnl
+popdef([CPPFLAGS])dnl
+popdef([CFLAGS])dnl
+popdef([CPP])dnl
+popdef([CC])dnl
+popdef([ac_objext])dnl
+popdef([ac_exeext])dnl
+popdef([ac_cv_objext])dnl
+popdef([ac_cv_exeext])dnl
+popdef([ac_cv_prog_cc_g])dnl
+popdef([ac_cv_prog_cc_cross])dnl
+popdef([ac_cv_prog_cc_works])dnl
+popdef([ac_cv_prog_gcc])dnl
+popdef([ac_cv_prog_CPP])dnl
+
+dnl Finally, set Makefile variables
+dnl
+BUILD_EXEEXT=$ac_build_exeext
+BUILD_OBJEXT=$ac_build_objext
+AC_SUBST(BUILD_EXEEXT)dnl
+AC_SUBST(BUILD_OBJEXT)dnl
+AC_SUBST([CFLAGS_FOR_BUILD])dnl
+AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
+AC_SUBST([LDFLAGS_FOR_BUILD])dnl
+])
--- a/configure.ac 2019-06-27 23:58:31.045413144 +0800
+++ b/configure.ac 2019-06-28 01:45:36.511771656 +0800
@@ -1,6 +1,8 @@
AC_PREREQ(2.59)
AC_INIT(alsa-firmware, 1.0.29)
+AC_CONFIG_MACRO_DIR([m4])
AC_PROG_CC
+AC_PROG_CC_FOR_BUILD
AC_PROG_INSTALL
AC_PROG_LN_S
AC_HEADER_STDC
--- a/vxloader/Makefile.am 2015-02-26 20:36:03.000000000 +0800
+++ b/vxloader/Makefile.am 2019-06-28 01:55:19.525947146 +0800
@@ -43,5 +43,14 @@
hotplugfw_DATA =
endif
-%.xlx: %.rbt toxlx
- ./toxlx < $< > $@
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(toxlx_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(toxlx_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(toxlx_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+toxlx$(BUILD_EXEEXT): $(toxlx_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+%.xlx: %.rbt toxlx$(BUILD_EXEEXT)
+ ./toxlx$(BUILD_EXEEXT) < $< > $@
--- a/echoaudio/Makefile.am 2015-02-26 20:36:03.000000000 +0800
+++ b/echoaudio/Makefile.am 2019-06-28 02:00:00.579426080 +0800
@@ -74,33 +74,42 @@
hotplugfw_DATA =
endif
-$(firmware_files): fw_writer
- ./fw_writer DSP/LoaderDSP.c loader_dsp.fw
- ./fw_writer DSP/Darla20DSP.c darla20_dsp.fw
- ./fw_writer DSP/Gina20DSP.c gina20_dsp.fw
- ./fw_writer DSP/Layla20DSP.c layla20_dsp.fw
- ./fw_writer ASIC/LaylaASIC.c layla20_asic.fw
- ./fw_writer DSP/Darla24DSP.c darla24_dsp.fw
- ./fw_writer DSP/Gina24DSP.c gina24_301_dsp.fw
- ./fw_writer ASIC/Gina24ASIC.c gina24_301_asic.fw
- ./fw_writer DSP/Gina24_361DSP.c gina24_361_dsp.fw
- ./fw_writer ASIC/Gina24ASIC_361.c gina24_361_asic.fw
- ./fw_writer DSP/Layla24DSP.c layla24_dsp.fw
- ./fw_writer ASIC/Layla24_1ASIC.c layla24_1_asic.fw
- ./fw_writer ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw
- ./fw_writer ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw
- ./fw_writer DSP/MonaDSP.c mona_301_dsp.fw
- ./fw_writer ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw
- ./fw_writer ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw
- ./fw_writer DSP/Mona361DSP.c mona_361_dsp.fw
- ./fw_writer ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw
- ./fw_writer ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw
- ./fw_writer ASIC/Mona2ASIC.c mona_2_asic.fw
- ./fw_writer DSP/MiaDSP.c mia_dsp.fw
- ./fw_writer DSP/Echo3gDSP.c echo3g_dsp.fw
- ./fw_writer ASIC/3G_ASIC.c 3g_asic.fw
- ./fw_writer DSP/IndigoDSP.c indigo_dsp.fw
- ./fw_writer DSP/IndigoIODSP.c indigo_io_dsp.fw
- ./fw_writer DSP/IndigoIOxDSP.c indigo_iox_dsp.fw
- ./fw_writer DSP/IndigoDJDSP.c indigo_dj_dsp.fw
- ./fw_writer DSP/IndigoDJxDSP.c indigo_djx_dsp.fw
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+$(firmware_files): fw_writer$(BUILD_EXEEXT)
+ ./fw_writer$(BUILD_EXEEXT) DSP/LoaderDSP.c loader_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Darla20DSP.c darla20_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Gina20DSP.c gina20_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Layla20DSP.c layla20_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/LaylaASIC.c layla20_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Darla24DSP.c darla24_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Gina24DSP.c gina24_301_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Gina24ASIC.c gina24_301_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Gina24_361DSP.c gina24_361_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Gina24ASIC_361.c gina24_361_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Layla24DSP.c layla24_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_1ASIC.c layla24_1_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/MonaDSP.c mona_301_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Mona361DSP.c mona_361_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/Mona2ASIC.c mona_2_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/MiaDSP.c mia_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/Echo3gDSP.c echo3g_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) ASIC/3G_ASIC.c 3g_asic.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDSP.c indigo_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoIODSP.c indigo_io_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoIOxDSP.c indigo_iox_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDJDSP.c indigo_dj_dsp.fw
+ ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDJxDSP.c indigo_djx_dsp.fw
--- a/emu/Makefile.am 2015-02-26 20:36:03.000000000 +0800
+++ b/emu/Makefile.am 2019-06-28 02:01:37.856710042 +0800
@@ -22,5 +22,14 @@
hotplugfw_DATA =
endif
-$(firmware_files): fw_writer
- ./fw_writer
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+$(firmware_files): fw_writer$(BUILD_EXEEXT)
+ ./fw_writer$(BUILD_EXEEXT)
--- a/maestro3/Makefile.am 2015-02-26 20:36:03.000000000 +0800
+++ b/maestro3/Makefile.am 2019-06-28 02:03:13.704828106 +0800
@@ -17,5 +17,14 @@
hotplugfw_DATA =
endif
-$(firmware_files): fw_writer
- ./fw_writer
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+$(firmware_files): fw_writer$(BUILD_EXEEXT)
+ ./fw_writer$(BUILD_EXEEXT)
--- a/sb16/Makefile.am 2015-02-26 20:36:03.000000000 +0800
+++ b/sb16/Makefile.am 2019-06-28 02:04:37.121743871 +0800
@@ -18,5 +18,14 @@
hotplugfw_DATA =
endif
-$(firmware_files): fw_writer
- ./fw_writer
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+$(firmware_files): fw_writer$(BUILD_EXEEXT)
+ ./fw_writer$(BUILD_EXEEXT)
--- a/wavefront/Makefile.am 2019-06-28 02:07:27.003727160 +0800
+++ b/wavefront/Makefile.am 2019-06-28 02:07:46.477947626 +0800
@@ -17,5 +17,14 @@
hotplugfw_DATA =
endif
-$(firmware_files): fw_writer
- ./fw_writer
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+$(firmware_files): fw_writer$(BUILD_EXEEXT)
+ ./fw_writer$(BUILD_EXEEXT)
--- a/ymfpci/Makefile.am 2015-02-26 20:36:03.000000000 +0800
+++ b/ymfpci/Makefile.am 2019-06-28 02:09:02.487797826 +0800
@@ -17,5 +17,14 @@
hotplugfw_DATA =
endif
-$(firmware_files): fw_writer
- ./fw_writer
+LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
+
+$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
+$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
+$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+
+fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
+ $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
+
+$(firmware_files): fw_writer$(BUILD_EXEEXT)
+ ./fw_writer$(BUILD_EXEEXT)

21
pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix
View File

@ -1,20 +1,16 @@
{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }:
{ lib, buildPackages, stdenv, autoreconfHook, fetchurl }:
stdenv.mkDerivation rec {
pname = "alsa-firmware";
version = "1.2.1";
version = "1.2.4";
src = fetchurl {
url = "mirror://alsa/firmware/alsa-firmware-${version}.tar.bz2";
sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf";
sha256 = "sha256-tnttfQi8/CR+9v8KuIqZwYgwWjz1euLf0LzZpbNs1bs=";
};
patches = [ (fetchpatch {
url = "https://github.com/alsa-project/alsa-firmware/commit/a8a478485a999ff9e4a8d8098107d3b946b70288.patch";
sha256 = "0zd7vrgz00hn02va5bkv7qj2395a1rl6f8jq1mwbryxs7hiysb78";
}) ];
nativeBuildInputs = [ autoreconfHook buildPackages.stdenv.cc ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ autoreconfHook ];
configureFlags = [
"--with-hotplug-dir=$(out)/lib/firmware"
@ -32,10 +28,11 @@ stdenv.mkDerivation rec {
rm -rf $out/bin
'';
meta = {
meta = with lib; {
homepage = "http://www.alsa-project.org/";
description = "Soundcard firmwares from the alsa project";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ l-as ];
};
}

4
pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "alsa-plugins";
version = "1.2.5";
version = "1.2.6";
src = fetchurl {
url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2";
sha256 = "086z2g2f95570vfvp9d5bakib4k18fb4bszf3lgx3j6j6f2gkvj2";
sha256 = "sha256-BogYpLVdjAKdqgABXYU9RRE/VrIkt8ZOHhF5iMglsqA=";
};
nativeBuildInputs = [ pkg-config ];

8
pkgs/os-specific/linux/batman-adv/version.nix
View File

@ -1,9 +1,9 @@
{
version = "2021.1";
version = "2021.4";
sha256 = {
batman-adv = "1l1lk41h4chymrb41ihqrr3p80xdwhhp1kkksr157mzailyq8xxz";
alfred = "122y92vqrpp3g6dbjfv8hkhwjlfa3skr91lbzicr0pw8mm6wzqll";
batctl = "0xp1cqcw0g0irgw9yhkch01rbn39gzvfxv8b2yya32vbnkmqrcj4";
batman-adv = "06zbyf8s7njn6wdm1fdq3kl8kx1vx4spxkgiy7dx0pq4c3qs5xyg";
alfred = "15fbw80ix95zy8i4c6acm1631vxlz2hakjv4zv5wig74bp2bcyac";
batctl = "1ryqz90av2p5pgmmpi1afmycd18zhpwz1i4f7r0s359jis86xndn";
};
}

2
pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix → pkgs/os-specific/linux/firmware/linux-firmware/default.nix
View File

@ -1,7 +1,7 @@
{ stdenvNoCC, fetchgit, lib }:
stdenvNoCC.mkDerivation rec {
pname = "firmware-linux-nonfree";
pname = "linux-firmware";
version = "20211216";
src = fetchgit {

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

@ -304,6 +304,7 @@ let
versionAtLeast version "5.5") {
SND_SOC_INTEL_SOUNDWIRE_SOF_MACH = whenAtLeast "5.10" module;
SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES = whenAtLeast "5.10" yes; # dep of SOF_MACH
SND_SOC_SOF_INTEL_SOUNDWIRE_LINK = whenBetween "5.10" "5.11" yes; # dep of SOF_MACH
SND_SOC_SOF_TOPLEVEL = yes;
SND_SOC_SOF_ACPI = module;
SND_SOC_SOF_PCI = module;
@ -456,7 +457,8 @@ let
# Detect writes to read-only module pages
DEBUG_SET_MODULE_RONX = { optional = true; tristate = whenOlder "4.11" "y"; };
RANDOMIZE_BASE = option yes;
STRICT_DEVMEM = option yes; # Filter access to /dev/mem
STRICT_DEVMEM = yes; # Filter access to /dev/mem
IO_STRICT_DEVMEM = whenAtLeast "4.5" yes;
SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default
# Prevent processes from ptracing non-children processes
SECURITY_YAMA = option yes;

18
pkgs/os-specific/linux/kernel/linux-5.16.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
with lib;
buildLinux (args // rec {
version = "5.16";
# 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;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1fq86dbx2p124vi4j8nan68gj4zyw4xnqh4jxq9aqsdvi24pwz82";
};
} // (args.argsOverride or { }))

8
pkgs/os-specific/linux/microcode/amd.nix
View File

@ -1,9 +1,9 @@
{ lib, stdenv, firmwareLinuxNonfree, libarchive }:
{ lib, stdenv, linux-firmware, libarchive }:
stdenv.mkDerivation {
name = "amd-ucode-${firmwareLinuxNonfree.version}";
name = "amd-ucode-${linux-firmware.version}";
src = firmwareLinuxNonfree;
src = linux-firmware;
sourceRoot = ".";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
buildPhase = ''
mkdir -p kernel/x86/microcode
find ${firmwareLinuxNonfree}/lib/firmware/amd-ucode -name \*.bin \
find ${linux-firmware}/lib/firmware/amd-ucode -name \*.bin \
-exec sh -c 'cat {} >> kernel/x86/microcode/AuthenticAMD.bin' \;
'';

38
pkgs/os-specific/linux/vmm_clock/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ stdenv, lib, fetchFromGitHub, kernel }:
stdenv.mkDerivation rec {
name = "vmm_clock";
version = "0.1.0";
src = fetchFromGitHub {
owner = "voutilad";
repo = "vmm_clock";
rev = "${version}";
sha256 = "0hg7ywznh6v11fywsz6f7w298bxph0wwm046zqaqncjvr4aizla4";
};
hardeningDisable = [ "pic" "format" ];
nativeBuildInputs = kernel.moduleBuildDependencies;
extraConfig = ''
CONFIG_RTC_HCTOSYS yes
'';
makeFlags = kernel.makeFlags ++ [
"DEPMOD=echo"
"INSTALL_MOD_PATH=$(out)"
"KERNELRELEASE=${kernel.modDirVersion}"
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
meta = with lib; {
description =
"Experimental implementation of a kvmclock-derived clocksource for Linux guests under OpenBSD's hypervisor";
homepage = "https://github.com/voutilad/vmm_clock";
license = licenses.gpl2;
maintainers = with maintainers; [ qbit ];
platforms = platforms.linux;
};
enableParallelBuilding = true;
}

25
pkgs/shells/zsh/default.nix
View File

@ -1,12 +1,19 @@
{ lib, stdenv, fetchurl, fetchpatch, ncurses, pcre, buildPackages }:
{ lib
, stdenv
, fetchurl
, fetchpatch
, autoreconfHook
, yodl
, perl
, groff
, util-linux
, texinfo
, ncurses
, pcre
, buildPackages }:
let
version = "5.8";
documentation = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz";
sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv";
};
in
stdenv.mkDerivation {
@ -30,6 +37,8 @@ stdenv.mkDerivation {
})
];
nativeBuildInputs = [ autoreconfHook yodl perl groff util-linux texinfo ];
buildInputs = [ ncurses pcre ];
configureFlags = [
@ -47,9 +56,7 @@ stdenv.mkDerivation {
# XXX: think/discuss about this, also with respect to nixos vs nix-on-X
postInstall = ''
mkdir -p $out/share/info
tar xf ${documentation} -C $out/share
ln -s $out/share/zsh-*/Doc/zsh.info* $out/share/info/
make install.info install.html
mkdir -p $out/etc/
cat > $out/etc/zprofile <<EOF

73
pkgs/tools/misc/popsicle/default.nix Normal file
View File

@ -0,0 +1,73 @@
{ stdenv
, fetchFromGitHub
, rustc
, cargo
, rustPlatform
, pkg-config
, dbus
, glib
, cairo
, pango
, atk
, lib
, gdk-pixbuf
, gtk3
}:
rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
pname = "popsicle";
version = "unstable-2021-12-20";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "b02ebf5f2e6c18777453ca9a144d69689a6fa901";
sha256 = "03ilhvnr4mwy7b8bipp616h16m2ilxzxz2zjpkzy3afwvh9bz1mx";
};
cargoSha256 = "1c54wxyrfxk5chnjhxw6vaznm7ff9dkx1rxlgp417jfygiwijjs4";
nativeBuildInputs = [ gtk3 pkg-config ];
buildInputs = [
gtk3
dbus
glib
cairo
pango
atk
gdk-pixbuf
];
# Use the stdenv default phases (./configure; make) instead of the
# ones from buildRustPackage.
configurePhase = "configurePhase";
buildPhase = "buildPhase";
checkPhase = "checkPhase";
installPhase = "installPhase";
postPatch = ''
# Have to do this here instead of in preConfigure because
# cargoDepsCopy gets unset after postPatch.
configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy")
'';
makeFlags = [
"PREFIX=${placeholder "out"}"
"DESTDIR=${placeholder "out"}"
];
postInstall = ''
# install man page, icon, etc...
mv $out/usr/local/* $out
rm -rf $out/usr
'';
meta = with lib; {
description = "Multiple USB File Flasher";
homepage = "https://github.com/pop-os/popsicle";
maintainers = with maintainers; [ _13r0ck ];
license = licenses.mit;
platforms = [ "aarch64-linux" "x86_64-linux" ];
};
}

3
pkgs/tools/networking/aria2/default.nix
View File

@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-ErjFfSJDIgZq0qy0Zn5uZ9bZS2AtJq4FuBVuUuQgPTI=";
};
strictDeps = true;
nativeBuildInputs = [ pkg-config autoreconfHook sphinx ];
buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++
@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
];
prePatch = ''
patchShebangs doc/manual-src/en/mkapiref.py
patchShebangs --build doc/manual-src/en/mkapiref.py
'';
checkInputs = [ cppunit ];

19
pkgs/tools/networking/htpdate/default.nix
View File

@ -1,26 +1,25 @@
{ lib, stdenv, fetchurl }:
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "1.2.2";
version = "1.3.1";
pname = "htpdate";
src = fetchurl {
url = "http://www.vervest.org/htp/archive/c/${pname}-${version}.tar.xz";
sha256 = "0mgr350qwgzrdrwkb9kaj6z7l6hn6a2pwh7sacqvnal5fyc9a7sz";
src = fetchFromGitHub {
owner = "twekkel";
repo = pname;
rev = "v${version}";
sha256 = "JPaxbu7LlGV+Bh5qxVxeNSPnMQNqLaLYWBRbpETSpQs=";
};
makeFlags = [
"INSTALL=install"
"STRIP=${stdenv.cc.bintools.targetPrefix}strip"
"prefix=$(out)"
];
enableParallelBuilding = true;
meta = with lib; {
description = "Utility to fetch time and set the system clock over HTTP";
homepage = "http://www.vervest.org/htp/";
homepage = "https://github.com/twekkel/htpdate";
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ julienmalka ];
};
}

6
pkgs/tools/networking/lychee/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "lychee";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "lycheeverse";
repo = pname;
rev = "v${version}";
sha256 = "sha256-TjjSysG4UCXVi5ytWaJVL31TFLHC3Ro5OEB56pzbn7s=";
sha256 = "sha256-zgIFJLdYHSDsO34KFK51g4nVlSkc9/TFdXx2yPJ7kRQ=";
};
cargoSha256 = "sha256-apRXxd7RBnNjhZb0xAUr5hSTafyMbg0k1wgHT93Z66g=";
cargoSha256 = "sha256-r4a+JkaXVYsynBiWUHaleATXvfxyhRHfR/qcooD0FmI=";
nativeBuildInputs = [ pkg-config ];

4
pkgs/tools/security/duo-unix/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "duo-unix";
version = "1.11.4";
version = "1.11.5";
src = fetchurl {
url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz";
sha256 = "1hqklf6jzrxn5hgh69bbl6962hwwgf06dlrb0ry7n5iy8w8imnsg";
sha256 = "sha256-7pE4EnyV22qQ13RFKHv0ah/BQYHJE1jdTwXBeqpBFgs=";
};
buildInputs = [ pam openssl zlib ];

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

@ -262,6 +262,7 @@ mapAliases ({
firefoxWrapper = firefox; # 2015-09
firestr = throw "firestr has been removed."; # added 2019-12-08
firmwareLinuxNonfree = linux-firmware; # added 2022-01-09
fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10
flameGraph = flamegraph; # added 2018-04-25
flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
@ -507,6 +508,7 @@ mapAliases ({
linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
linuxPackages_5_16 = linuxKernel.packages.linux_5_16;
linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95;
linux_rpi1 = linuxKernel.kernels.linux_rpi1;
@ -522,6 +524,7 @@ mapAliases ({
linux_5_10 = linuxKernel.kernels.linux_5_10;
linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
linux_5_15 = linuxKernel.kernels.linux_5_15;
linux_5_16 = linuxKernel.kernels.linux_5_16;
# added 2020-04-04
linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened";

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

@ -1138,6 +1138,8 @@ with pkgs;
pikchr = callPackage ../tools/graphics/pikchr { };
popsicle = callPackage ../tools/misc/popsicle { };
roxterm = callPackage ../applications/terminal-emulators/roxterm { };
rxvt = callPackage ../applications/terminal-emulators/rxvt { };
@ -2036,7 +2038,6 @@ with pkgs;
aria2 = callPackage ../tools/networking/aria2 {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (python3Packages) sphinx;
};
aria = aria2;
@ -10374,6 +10375,8 @@ with pkgs;
ipbt = callPackage ../tools/misc/ipbt { };
tuhi = callPackage ../applications/misc/tuhi { };
tuir = callPackage ../applications/misc/tuir { };
tunnelto = callPackage ../tools/networking/tunnelto {
@ -22802,7 +22805,7 @@ with pkgs;
qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; });
firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };
linux-firmware = callPackage ../os-specific/linux/firmware/linux-firmware { };
qmk-udev-rules = callPackage ../os-specific/linux/qmk-udev-rules { };

12
pkgs/top-level/linux-kernels.nix
View File

@ -166,6 +166,13 @@ in {
];
};
linux_5_16 = callPackage ../os-specific/linux/kernel/linux-5.16.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_testing = let
testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
@ -439,6 +446,8 @@ in {
vm-tools = callPackage ../os-specific/linux/vm-tools { };
vmm_clock = callPackage ../os-specific/linux/vmm_clock { };
wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null;
x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };
@ -472,6 +481,7 @@ in {
linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);
linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
linux_5_16 = recurseIntoAttrs (packagesFor kernels.linux_5_16);
};
rtPackages = {
@ -516,7 +526,7 @@ in {
packageAliases = {
linux_default = packages.linux_5_10;
# Update this when adding the newest kernel major version!
linux_latest = packages.linux_5_15;
linux_latest = packages.linux_5_16;
linux_mptcp = packages.linux_mptcp_95;
linux_rt_default = packages.linux_rt_5_4;
linux_rt_latest = packages.linux_rt_5_10;