Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -1,4 +1,4 @@
|
||||
{ busybox, stdenv}:
|
||||
{ busybox}:
|
||||
|
||||
# Minimal shell for use as basic /bin/sh in sandbox builds
|
||||
busybox.override {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pythonPackages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, dbus
|
||||
, dbus_cplusplus
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchzip }:
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
pname = "zd1211-firmware";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub, gnum4, pam, fscrypt-experimental }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, gnum4, pam, fscrypt-experimental }:
|
||||
|
||||
# Don't use this for anything important yet!
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, python3Packages, fetchpatch }:
|
||||
{ lib, fetchurl, python3Packages, fetchpatch }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "iotop-0.6";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, iproute, fetchFromGitHub }:
|
||||
{ lib, iproute, fetchFromGitHub }:
|
||||
|
||||
iproute.overrideAttrs (oa: rec {
|
||||
pname = "iproute_mptcp";
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#
|
||||
# See also <nixos/modules/profiles/hardened.nix>
|
||||
|
||||
{ lib, stdenv, version }:
|
||||
{ lib, version }:
|
||||
|
||||
with lib;
|
||||
with lib.kernel;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
|
||||
{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
|
||||
|
||||
with lib;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
|
||||
{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
|
||||
|
||||
with lib;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.253";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.253";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
|
||||
{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
|
||||
|
||||
with lib;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
|
||||
{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
|
||||
|
||||
with lib;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args:
|
||||
{ buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.165-172";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
|
||||
{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.9";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args:
|
||||
{ lib, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args:
|
||||
let
|
||||
mptcpVersion = "0.95";
|
||||
modDirVersion = "4.19.55";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
|
||||
{ lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // {
|
||||
version = "5.9.0-2020.11.20";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
|
||||
{ lib, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
|
||||
|
||||
with lib;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args:
|
||||
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.9";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, nettools, fetchFromGitHub }:
|
||||
{ lib, nettools, fetchFromGitHub }:
|
||||
|
||||
nettools.overrideAttrs(oa: rec {
|
||||
name = "net-tools-mptcp";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, go-md2man
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
common = import ../../../development/python-modules/openrazer/common.nix { inherit lib stdenv fetchFromGitHub; };
|
||||
common = import ../../../development/python-modules/openrazer/common.nix { inherit lib fetchFromGitHub; };
|
||||
in
|
||||
stdenv.mkDerivation (common // {
|
||||
name = "openrazer-${common.version}-${kernel.version}";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3
|
||||
{ lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3
|
||||
, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3
|
||||
, gobject-introspection }:
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, skawarePackages }:
|
||||
{ lib, skawarePackages }:
|
||||
|
||||
with skawarePackages;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, skawarePackages }:
|
||||
{ lib, skawarePackages }:
|
||||
|
||||
with skawarePackages;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitLab, rustPlatform, pkg-config, dbus }:
|
||||
{ lib, fetchFromGitLab, rustPlatform, pkg-config, dbus }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sd-switch";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, python3
|
||||
{ lib, fetchFromGitHub, python3
|
||||
, libsepol, libselinux, checkpolicy
|
||||
, withGraphics ? false
|
||||
}:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, python3, fetchFromGitHub }:
|
||||
{ lib, python3, fetchFromGitHub }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "targetcli";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }:
|
||||
{ lib, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }:
|
||||
mkDerivation {
|
||||
pname = "kernelshark";
|
||||
version = "1.1.0";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, python3Packages }:
|
||||
{ lib, fetchFromGitHub, python3Packages }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
version = "0.3.0";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
|
||||
{ lib, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
|
||||
|
||||
mkDerivation {
|
||||
name = "wpa_gui-${wpa_supplicant.version}";
|
||||
|
||||
Reference in New Issue
Block a user