BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-01-14 00:02:26 +00:00 committed by GitHub
commit 4712ed9439
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 661 additions and 304 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -16293,4 +16293,10 @@
github = "Detegr";
githubId = 724433;
};
RossComputerGuy = {
name = "Tristan Ross";
email = "tristan.ross@midstall.com";
github = "RossComputerGuy";
githubId = 19699320;
};
}

17
nixos/modules/virtualisation/qemu-vm.nix
View file

@ -528,6 +528,20 @@ in
'';
};
virtualisation.restrictNetwork =
mkOption {
type = types.bool;
default = false;
example = true;
description =
lib.mdDoc ''
If this option is enabled, the guest will be isolated, i.e. it will
not be able to contact the host and no guest IP packets will be
routed over the host to the outside. This option does not affect
any explicitly set forwarding rules.
'';
};
virtualisation.vlans =
mkOption {
type = types.listOf types.ints.unsigned;
@ -936,10 +950,11 @@ in
else "'guestfwd=${proto}:${guest.address}:${toString guest.port}-" +
"cmd:${pkgs.netcat}/bin/nc ${host.address} ${toString host.port}',"
);
restrictNetworkOption = lib.optionalString cfg.restrictNetwork "restrict=on,";
in
[
"-net nic,netdev=user.0,model=virtio"
"-netdev user,id=user.0,${forwardingOptions}\"$QEMU_NET_OPTS\""
"-netdev user,id=user.0,${forwardingOptions}${restrictNetworkOption}\"$QEMU_NET_OPTS\""
];
# FIXME: Consolidate this one day.

1
nixos/tests/all-tests.nix
View file

@ -559,6 +559,7 @@ in {
public-inbox = handleTest ./public-inbox.nix {};
pulseaudio = discoverTests (import ./pulseaudio.nix);
qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {};
qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix {};
quorum = handleTest ./quorum.nix {};
quake3 = handleTest ./quake3.nix {};
rabbitmq = handleTest ./rabbitmq.nix {};

36
nixos/tests/qemu-vm-restrictnetwork.nix Normal file
View file

@ -0,0 +1,36 @@
import ./make-test-python.nix ({
name = "qemu-vm-restrictnetwork";
nodes = {
unrestricted = { config, pkgs, ... }: {
virtualisation.restrictNetwork = false;
};
restricted = { config, pkgs, ... }: {
virtualisation.restrictNetwork = true;
};
};
testScript = ''
import os
if os.fork() == 0:
# Start some HTTP server on the qemu host to test guest isolation.
from http.server import HTTPServer, BaseHTTPRequestHandler
HTTPServer(("", 8000), BaseHTTPRequestHandler).serve_forever()
else:
start_all()
unrestricted.wait_for_unit("network-online.target")
restricted.wait_for_unit("network-online.target")
# Guests should be able to reach each other on the same VLAN.
unrestricted.succeed("ping -c1 restricted")
restricted.succeed("ping -c1 unrestricted")
# Only the unrestricted guest should be able to reach host services.
# 10.0.2.2 is the gateway mapping to the host's loopback interface.
unrestricted.succeed("curl -s http://10.0.2.2:8000")
restricted.fail("curl -s http://10.0.2.2:8000")
'';
})

404
pkgs/applications/editors/vim/plugins/generated.nix
View file

File diff suppressed because it is too large Load diff

54
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View file

@ -115,12 +115,12 @@
};
c_sharp = buildGrammar {
language = "c_sharp";
version = "f076a8e";
version = "3b661ce";
source = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c-sharp";
rev = "f076a8efe30a0b8c249eeb61383f6d914376114c";
hash = "sha256-CFqVngYaGe+ZFwpMaQI5HKAioJPmciBDhHxfO3yjKuE=";
rev = "3b661ced8d510aa424e2f68314520c281dd8c113";
hash = "sha256-Z+ueKX2CAtWTCMipElZUl97hrUEb8Dv1po8xSLI3iJA=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
};
@ -338,12 +338,12 @@
};
embedded_template = buildGrammar {
language = "embedded_template";
version = "91fc5ae";
version = "a130858";
source = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-embedded-template";
rev = "91fc5ae1140d5c9d922312431f7d251a48d7b8ce";
hash = "sha256-WAMCwKS+gOvBVC9h0qKHLgNedCRQwbJV+++SDqHhK5g=";
rev = "a13085849cf69e2401ec44e38cffc3d73f22f3df";
hash = "sha256-JNyLOW/na8J0WEsLDv3BuC+UXxGpYMYvAlywq4z6Wzo=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template";
};
@ -758,12 +758,12 @@
};
julia = buildGrammar {
language = "julia";
version = "1cd300b";
version = "0412178";
source = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-julia";
rev = "1cd300bda52e680872053cd55a228c1809cb0c3a";
hash = "sha256-qdKC1yk2CQGQlVWI/0XHrsTF81rRFUlmKSNJ3RoZcdI=";
rev = "041217800bf423099015e1654c9a4fdd75310bb1";
hash = "sha256-DwRU4yqnMFqMIh4mAo9a57SRXhOLTnWKjO6zSaczUNU=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
};
@ -914,12 +914,12 @@
};
nickel = buildGrammar {
language = "nickel";
version = "9d83db4";
version = "7867780";
source = fetchFromGitHub {
owner = "nickel-lang";
repo = "tree-sitter-nickel";
rev = "9d83db400b6c11260b9106f131f93ddda8131933";
hash = "sha256-Jv7GMm6TpJE8+0pG045rFWkW/9rkv1Pn/6ko2a0bpmY=";
rev = "7867780e52ebeda0daa4a55acb870100e070d274";
hash = "sha256-SXM15LbQ4bGKx+2QY7jMHq4G4ATtak2Umnb3SHFUqM0=";
};
meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel";
};
@ -1214,12 +1214,12 @@
};
ruby = buildGrammar {
language = "ruby";
version = "c919603";
version = "7a1921b";
source = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ruby";
rev = "c91960320d0f337bdd48308a8ad5500bd2616979";
hash = "sha256-zUNs7s7SLGLU4h08FHLUA3YhbhRotMQVqk+zG9bmtjE=";
rev = "7a1921bcfd90e3a04c1ad011059087aaf0168dd4";
hash = "sha256-niL8gqKv1Nq1z8y4c49amqkDo+FoIP3XEJz+dV2UmWo=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby";
};
@ -1236,12 +1236,12 @@
};
scala = buildGrammar {
language = "scala";
version = "c4c7d2e";
version = "fd05f09";
source = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-scala";
rev = "c4c7d2e454014659be7383a582bd84456688bb1c";
hash = "sha256-weAn9/X63M0ZOYv2eCgDblR5b9fUvdIFQ8sWcnrApGw=";
rev = "fd05f09043051c82fba695aa95cee9c534fbc533";
hash = "sha256-/o9TsnKGeukIGgfOjwNDjdxPkr5zyIPh1bZsvr2FX90=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
};
@ -1313,12 +1313,12 @@
};
sql = buildGrammar {
language = "sql";
version = "8635357";
version = "3647b9f";
source = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
rev = "8635357363f8b01931ce6abbe0c937aa73e47bf8";
hash = "sha256-p3R8uGIHyzYnRnKYWpeqMAcuk1xjKlPvB5vllPqUvrs=";
rev = "3647b9f5b937269f43ac6e4b6ebcb6f52e033c17";
hash = "sha256-flZtgmMflDlWggMisUfVOA7ikGpkYwAGxzlc4jYzrrQ=";
};
generate = true;
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
@ -1574,23 +1574,23 @@
};
wgsl = buildGrammar {
language = "wgsl";
version = "4c03f73";
version = "40259f3";
source = fetchFromGitHub {
owner = "szebniok";
repo = "tree-sitter-wgsl";
rev = "4c03f73822c72130c63c385a112e44ad5a69f3e9";
hash = "sha256-YqGrjtWmBHthV6c9WvCUT2Q13vQJGpvWPR6DTwHMEr4=";
rev = "40259f3c77ea856841a4e0c4c807705f3e4a2b65";
hash = "sha256-voLkcJ/062hzipb3Ak/mgQvFbrLUJdnXq1IupzjMJXA=";
};
meta.homepage = "https://github.com/szebniok/tree-sitter-wgsl";
};
wgsl_bevy = buildGrammar {
language = "wgsl_bevy";
version = "2475727";
version = "7cd38d6";
source = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-wgsl-bevy";
rev = "24757275fa01e813ebfdb6acab85862ced9405d7";
hash = "sha256-Zevra1HCnQWyx5zZ2m9P/qEGnmpptTnwXyttNiciKCA=";
rev = "7cd38d6895060b023353e04f7af099ec64add5d1";
hash = "sha256-QzfeFzGhWJGD+l+MeKyedRpdZsH+dGKE7UxRmh2uMH0=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy";
};

2
pkgs/applications/editors/vim/plugins/overrides.nix
View file

@ -1052,7 +1052,7 @@ self: super: {
libiconv
];
cargoSha256 = "sha256-5hez6snn0neQEE3W8PbwUoGeSj8Bvu23Ftxz5T0iPAw=";
cargoSha256 = "sha256-ls4WZQees78SNJilXoL3CSXAaILxX1/WUMCyO7+14IM=";
};
in
''

2
pkgs/applications/editors/vim/plugins/vim-plugin-names
View file

@ -541,7 +541,7 @@ https://github.com/nvim-treesitter/nvim-treesitter-refactor/,,
https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,,
https://github.com/windwp/nvim-ts-autotag/,,
https://github.com/joosepalviste/nvim-ts-context-commentstring/,,
https://github.com/p00f/nvim-ts-rainbow/,,
https://github.com/mrjones2014/nvim-ts-rainbow/,,
https://gitlab.com/HiPhish/nvim-ts-rainbow2,HEAD,
https://github.com/kyazdani42/nvim-web-devicons/,,
https://github.com/AckslD/nvim-whichkey-setup.lua/,,

4
pkgs/applications/misc/mupdf/default.nix
View file

@ -47,12 +47,12 @@ let
in
stdenv.mkDerivation rec {
version = "1.20.3";
version = "1.21.1";
pname = "mupdf";
src = fetchurl {
url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
sha256 = "sha256-a2AHD27sIOjYfStc0iz0kCAxGjzxXuEJmOPl9fmEses=";
sha256 = "sha256-sk3b4SUGzILeCNXNSUYUugg0b4F12x2YvPk4/5SSWlQ=";
};
patches = [ ./0001-Use-command-v-in-favor-of-which.patch

5
pkgs/applications/misc/sc-im/default.nix
View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "sc-im";
version = "0.8.2";
version = "0.8.3";
src = fetchFromGitHub {
owner = "andmarti1424";
repo = "sc-im";
rev = "v${version}";
sha256 = "sha256-H+GQUpouiXc/w6GWdkSVvTXZ/Dtb7sUmBLGcpxG3Mts=";
sha256 = "sha256-QlnxMe0WsRX9J2xzpf2Udcf9+N3MvQWqmYl2YKsGpYM=";
};
sourceRoot = "${src.name}/src";
@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
changelog = "https://github.com/andmarti1424/sc-im/blob/${src.rev}/CHANGES";
homepage = "https://github.com/andmarti1424/sc-im";
description = "An ncurses spreadsheet program for terminal";
license = licenses.bsdOriginal;

15
pkgs/applications/networking/cluster/lens/default.nix
View file

@ -1,14 +1,14 @@
{ lib, fetchurl, appimageTools, wrapGAppsHook }:
{ lib, fetchurl, appimageTools, wrapGAppsHook, makeWrapper }:
let
pname = "lens";
version = "5.5.3";
build = "${version}-latest.20220602.2";
version = "6.3.0";
build = "2022.12.221341-latest";
name = "${pname}-${version}";
src = fetchurl {
url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage";
sha256 = "sha256-lwiwyXoO+7KgDnQ2Ly0QK0oEVHR73nsMZMGOd2j48dg=";
sha256 = "sha256-IJkm2Woz362jydFph9ek+5Jh2jtDH8kKvWoLQhTZPvc=";
name = "${pname}.AppImage";
};
@ -23,11 +23,12 @@ appimageTools.wrapType2 {
extraInstallCommands =
''
mv $out/bin/${name} $out/bin/${pname}
source "${makeWrapper}/nix-support/setup-hook"
wrapProgram $out/bin/${pname} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
install -m 444 -D ${appimageContents}/lens.desktop $out/share/applications/${pname}.desktop
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/lens.png \
$out/share/icons/hicolor/512x512/apps/${pname}.png
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Icon=lens' 'Icon=${pname}' \
--replace 'Exec=AppRun' 'Exec=${pname}'
@ -37,7 +38,7 @@ appimageTools.wrapType2 {
description = "The Kubernetes IDE";
homepage = "https://k8slens.dev/";
license = licenses.mit;
maintainers = with maintainers; [ dbirks ];
maintainers = with maintainers; [ dbirks RossComputerGuy ];
platforms = [ "x86_64-linux" ];
};
}

12
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
View file

@ -21,17 +21,17 @@
let
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
version = "1.104.0";
version = "1.106.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
hash = "sha256-+FQ6XE+CtvSNSgpEr8h0mcr9DCC6TvGgLrYGdw0Ve2o=";
hash = "sha256-S53ghVFb1qDI7MVNbc2ZlHqDN4VRBFQJCJg2J+w0erc=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${old.pname}-${version}";
hash = "sha256-c3tt+nYZksI/VhJk4bNHu9ZXeDTaA2aLAQo1BmuF+2g=";
hash = "sha256-k4j814Ao7FAyd0w1nH2fuX1cJKjBkhPw0CVZqNU7Hqs=";
};
});
esbuild' = esbuild.override {
@ -48,16 +48,16 @@ let
};
in buildNpmPackage rec {
pname = "deltachat-desktop";
version = "1.34.1";
version = "1.34.2";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
rev = "v${version}";
hash = "sha256-/F1fU54eTM9mUaQe/Ex9DnTDb+fzl/1HNyYvLWE2BBU=";
hash = "sha256-XOGfKa0eGVZKKKC0Pm2kw48XWWcrxCyDdYzCSKp+wco=";
};
npmDepsHash = "sha256-3wzN7G27IGTlFZUE9RzQXfApVfaTc92Sbb+jjH/zeoc=";
npmDepsHash = "sha256-ZMXXBDVT5rHTzHOrKAUAezL/1UTMdzbBllG69kxg55M=";
nativeBuildInputs = [
makeWrapper

2
pkgs/applications/office/libreoffice/default.nix
View file

@ -96,7 +96,7 @@
, gpgme
, libwebp
, abseil-cpp
, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ]
, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ]
, withHelp ? true
, kdeIntegration ? false
, mkDerivation ? null

6
pkgs/applications/version-management/srvc/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "srvc";
version = "0.9.0";
version = "0.10.1";
src = fetchFromGitHub {
owner = "insilica";
repo = "rs-srvc";
rev = "v${version}";
sha256 = "sha256-XslMwA1DhztK9DPNCucUpzjCQXz6PN8ml8JBvKtJeqg=";
sha256 = "sha256-yeyAorVMHFl9wm57gmK6ZAI1w5daN2xl29Gqq0DsTtc=";
};
cargoSha256 = "sha256-KxwBF5t8lcaH8ZD4SorIBiq7p6r9LGHfEOyNXtB9HJw=";
cargoHash = "sha256-/1TL0lWb4I9h6nGV7exx7U6ACrieN0EULTWg7Weexeg=";
buildInputs = lib.optionals stdenv.isDarwin [
Security

54
pkgs/build-support/deterministic-uname/default.nix Normal file
View file

@ -0,0 +1,54 @@
# expr and script based on our lsb_release
{ stdenv
, lib
, substituteAll
, coreutils
, getopt
, modDirVersion ? ""
}:
substituteAll {
name = "uname";
src = ./deterministic-uname.sh;
dir = "bin";
isExecutable = true;
inherit coreutils getopt;
uSystem = if stdenv.buildPlatform.uname.system != null then stdenv.buildPlatform.uname.system else "unknown";
inherit (stdenv.buildPlatform.uname) processor;
# uname -o
# maybe add to lib/systems/default.nix uname attrset
# https://github.com/coreutils/coreutils/blob/7fc84d1c0f6b35231b0b4577b70aaa26bf548a7c/src/uname.c#L373-L374
# https://stackoverflow.com/questions/61711186/where-does-host-operating-system-in-uname-c-comes-from
# https://github.com/coreutils/gnulib/blob/master/m4/host-os.m4
operatingSystem =
if stdenv.buildPlatform.isLinux
then "GNU/Linux"
else if stdenv.buildPlatform.isDarwin
then "Darwin" # darwin isn't in host-os.m4 so where does this come from?
else "unknown";
# in os-specific/linux module packages
# --replace '$(shell uname -r)' "${kernel.modDirVersion}" \
# is a common thing to do.
modDirVersion = if modDirVersion != "" then modDirVersion else "unknown";
meta = with lib; {
description = "Print certain system information (hardcoded with <nixpkgs/lib/system> values)";
longDescription = ''
This package provides a replacement for `uname` whose output depends only
on `stdenv.buildPlatform`. It is meant to be used from within derivations.
Many packages' build processes run `uname` at compile time and embed its
output into the result of the build. Since `uname` calls into the kernel,
and the Nix sandbox currently does not intercept these calls, builds made
on different kernels will produce different results.
'';
license = [ licenses.mit ];
maintainers = with maintainers; [ artturin ];
platforms = platforms.all;
};
}

175
pkgs/build-support/deterministic-uname/deterministic-uname.sh Normal file
View file

@ -0,0 +1,175 @@
#! @shell@
set -o errexit
set -o nounset
show_help() {
@coreutils@/bin/cat << EOF
Usage: uname [OPTION]...
Print certain system information. With no OPTION, same as -s.
-a, --all print all information, in the following order,
except omit -p and -i if unknown:
-s, --kernel-name print the kernel name
-n, --nodename print the network node hostname
-r, --kernel-release print the kernel release
-v, --kernel-version print the kernel version
-m, --machine print the machine hardware name
-p, --processor print the processor type (non-portable)
-i, --hardware-platform print the hardware platform (non-portable)
-o, --operating-system print the operating system
--help display this help and exit
--version output version information and exit
EOF
exit 0
}
# Potential command-line options.
version=0
all=0
kernel_name=0
nodename=0
kernel_release=0
kernel_version=0
machine=0
processor=0
hardware_platform=0
operating_system=0
@getopt@/bin/getopt --test > /dev/null && rc=$? || rc=$?
if [[ $rc -ne 4 ]]; then
# This shouldn't happen.
echo "Warning: Enhanced getopt not supported, please open an issue in nixpkgs." >&2
else
# Define all short and long options.
SHORT=hvsnrvmpioa
LONG=help,version,kernel-name,nodename,kernel-release,kernel-version,machine,processor,hardware-platform,operating-system,all
# Parse all options.
PARSED=`@getopt@/bin/getopt --options $SHORT --longoptions $LONG --name "$0" -- "$@"`
eval set -- "$PARSED"
fi
# With no OPTION, same as -s.
if [[ $# -eq 0 ]]; then
kernel_name=1
fi
# Process each argument, and set the appropriate flag if we recognize it.
while [[ $# -ge 1 ]]; do
case "$1" in
--version)
version=1
;;
-s|--kernel-name)
kernel_name=1
;;
-n|--nodename)
nodename=1
;;
-r|--kernel-release)
kernel_release=1
;;
-v|--kernel-version)
kernel_version=1
;;
-m|--machine)
machine=1
;;
-p|--processor)
processor=1
;;
-i|--hardware-platform)
hardware_platform=1
;;
-o|--operating-system)
operating_system=1
;;
-a|--all)
all=1
;;
--help)
show_help
;;
--)
shift
break
;;
*)
echo "uname: unrecognized option '$1'"
echo "Type 'uname --help' for a list of available options."
exit 1
;;
esac
shift
done
KERNEL_NAME_VAL=@uSystem@
NODENAME_VAL=nixpkgs
KERNEL_RELEASE_VAL=@modDirVersion@
# #1-NixOS SMP PREEMPT_DYNAMIC Wed Dec 14 10:41:06 UTC 2022
KERNEL_VERSION_VAL="#1-NixOS Tue Jan 1 00:00:00 UTC 1980"
MACHINE_VAL=@processor@
PROCESSOR_VAL=unknown
HARDWARE_PLATFORM_VAL=unknown
OPERATING_SYSTEM_VAL=@operatingSystem@
if [[ "$version" = "1" ]]; then
# in case some script greps for GNU coreutils.
echo "uname (GNU coreutils) 9.1"
echo "Nixpkgs deterministic-uname"
exit
fi
# output of the real uname from GNU coreutils
# Darwin:
# Darwin *nodename* 22.1.0 Darwin Kernel Version 22.1.0: Sun Oct 9 20:14:30 PDT 2022; root:xnu-8792.41.9~2/RELEASE_ARM64_T8103 arm64 arm Darwin
# NixOS:
# Linux *nodename* 6.0.13 #1-NixOS SMP PREEMPT_DYNAMIC Wed Dec 14 10:41:06 UTC 2022 x86_64 GNU/Linux
if [[ "$all" = "1" ]]; then
echo -n "$KERNEL_NAME_VAL $NODENAME_VAL $KERNEL_RELEASE_VAL $KERNEL_VERSION_VAL $MACHINE_VAL"
# in help: except omit -p and -i if unknown.
#echo -n "$PROCESSOR_VAL $HARDWARE_PLATFORM_VAL\n"
echo -n "$OPERATING_SYSTEM_VAL"
fi
if [[ "$kernel_name" = "1" ]]; then
echo -n "$KERNEL_NAME_VAL"
fi
if [[ "$nodename" = "1" ]]; then
echo -n "$NODENAME_VAL"
fi
if [[ "$kernel_release" = "1" ]]; then
echo -n "$KERNEL_RELEASE_VAL"
fi
if [[ "$kernel_version" = "1" ]]; then
echo -n "$KERNEL_VERSION_VAL"
fi
if [[ "$machine" = "1" ]]; then
echo -n "$MACHINE_VAL"
fi
if [[ "$processor" = "1" ]]; then
echo -n "$PROCESSOR_VAL"
fi
if [[ "$hardware_platform" = "1" ]]; then
echo -n "$HARDWARE_PLATFORM_VAL"
fi
if [[ "$operating_system" = "1" ]]; then
echo -n "$OPERATING_SYSTEM_VAL"
fi
# for newline.
echo

7
pkgs/development/libraries/glibc/common.nix
View file

@ -37,7 +37,6 @@
, profilingLibraries ? false
, withGd ? false
, withLibcrypt ? false
, meta
, extraBuildInputs ? []
, extraNativeBuildInputs ? []
, ...
@ -262,9 +261,5 @@ stdenv.mkDerivation ({
maintainers = with maintainers; [ eelco ma27 ];
platforms = platforms.linux;
} // meta;
}
// lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
preInstall = null; # clobber the native hook
} // (args.meta or {});
})

18
pkgs/development/libraries/glibc/default.nix
View file

@ -14,16 +14,17 @@ let
];
in
callPackage ./common.nix { inherit stdenv; } {
pname = "glibc" + lib.optionalString withGd "-gd";
inherit withLinuxHeaders profilingLibraries withGd withLibcrypt;
(callPackage ./common.nix { inherit stdenv; } {
inherit withLinuxHeaders withGd profilingLibraries withLibcrypt;
pname = "glibc" + lib.optionalString withGd "-gd";
}).overrideAttrs(previousAttrs: {
# Note:
# Things you write here override, and do not add to,
# the values in `common.nix`.
# (For example, if you define `patches = [...]` here, it will
# override the patches in `common.nix`.)
# override the patches in `common.nix` -- so instead you should
# write `patches = (previousAttrs.patches or []) ++ [ ... ]`.
NIX_NO_SELF_RPATH = true;
@ -74,7 +75,7 @@ callPackage ./common.nix { inherit stdenv; } {
# - dejagnu: during linux bootstrap tcl SIGSEGVs
# - clang-wrapper in cross-compilation
# Last attempt: https://github.com/NixOS/nixpkgs/pull/36948
preInstall = ''
preInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then
mkdir -p $out/lib
cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1
@ -153,5 +154,6 @@ callPackage ./common.nix { inherit stdenv; } {
separateDebugInfo = true;
meta.description = "The GNU C Library";
}
meta = (previousAttrs.meta or {}) // { description = "The GNU C Library"; };
})

3
pkgs/development/libraries/libgtop/default.nix
View file

@ -7,6 +7,7 @@
, gobject-introspection
, gnome
, gtk-doc
, deterministic-uname
}:
stdenv.mkDerivation rec {
@ -21,6 +22,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
# uname output embedded in https://gitlab.gnome.org/GNOME/libgtop/-/blob/master/src/daemon/Makefile.am
deterministic-uname
pkg-config
gtk-doc
perl

4
pkgs/development/libraries/libxc/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libxc";
version = "6.0.0";
version = "6.1.0";
src = fetchFromGitLab {
owner = "libxc";
repo = "libxc";
rev = version;
hash = "sha256-g1BjqzSVauDrzxIqqU2kLl6RFs6/oe2VthtndbnJQCc=";
hash = "sha256-PqKqZbL9Y7lKu7tKo+DfAhoEeFSsYWEcwiFX41VhRIs=";
};
nativeBuildInputs = [ perl cmake gfortran ];

40
pkgs/development/python-modules/aiohttp-oauthlib/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, oauthlib
, aiohttp
, setuptools-scm
}:
buildPythonPackage rec {
pname = "aiohttp-oauthlib";
version = "0.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-iTzRpZ3dDC5OmA46VE+XELfE/7nie0zQOLUf4dcDk7c=";
};
propagatedBuildInputs = [
oauthlib
aiohttp
];
nativeBuildInputs = [
setuptools-scm
];
# Package has no tests.
doCheck = false;
meta = with lib; {
homepage = "https://git.sr.ht/~whynothugo/aiohttp-oauthlib";
description = "oauthlib integration for aiohttp clients";
license = licenses.isc;
maintainers = with maintainers; [ sumnerevans ];
};
}

9
pkgs/development/python-modules/bite-parser/default.nix
View file

@ -10,15 +10,16 @@
buildPythonPackage rec {
pname = "bite-parser";
version = "0.1.3";
version = "0.2.1";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "0f246e98a5556d6ed9a33fda1e94c3ab906305729feb30d25e35344b3e1c1fd9";
pname = "bite_parser";
inherit version;
hash = "sha256-PmZCCQzxCfCq6Mr1qn03tj/7/0we9Bfk5fj4K+wMhsk=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-datatransfer";
version = "3.9.0";
version = "3.10.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-AH6Xq5jMIo1arGQazoPWgWnKefEavHnas6FIy+LFNP8=";
hash = "sha256-R6CIL1CA3UR81kUeIlFGJaxDGO33GBKOzT4Qo2LWlQk=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-iot/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-iot";
version = "2.7.0";
version = "2.8.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-vV5emuGcFwUctnPNRW1NSFej599Lc6rFSKAlaaCatZw=";
hash = "sha256-YckGLp3A4rngs/KXOg3/AE4RyboUIoy0NGf44unn/ns=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-vision/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-vision";
version = "3.2.0";
version = "3.3.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-SZQxkx57cY+8q4Mg880jT8TlYcfwLz4KEpHiyOb2Ujc=";
hash = "sha256-Rj6yR/8V65wOILVSlLEi6+IRgNk3t/t7grVaHc8sRJY=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "google-cloud-websecurityscanner";
version = "1.10.0";
version = "1.11.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-93ijizxgVFxXzj8IzxrgzzXTQKl7UH3egvL41HVk5is=";
hash = "sha256-1XuY1Xf4QwJqEWCv0m2seSpoteDJxWep38lyP2Okk1Q=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/identify/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "identify";
version = "2.5.12";
version = "2.5.13";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8hfO2gmgSdhrECsXgG2i+REBIV+OqsQeAabvqKJOU1c=";
sha256 = "sha256-8QkDAVHjVEqicntSMb98JitmR5toOTGhgEk7cH3xSFI=";
};
checkInputs = [

4
pkgs/development/python-modules/python-ecobee-api/default.nix
View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "python-ecobee-api";
version = "0.2.15";
version = "0.2.16";
src = fetchPypi {
inherit pname version;
sha256 = "91929b0dda6acc2af6661d0fb539eb6375323d7529d3d64b67915efb1dc1a6ca";
hash = "sha256-wzL1WylQAFLxWu3lDFqQtLxJbQjse4OX/fbzaaEuvGQ=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/sfrbox-api/default.nix
View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "sfrbox-api";
version = "0.0.2";
version = "0.0.4";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "hacf-fr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-kXM+Y7ZKKczVdKTXqmbgSxlFfHx3hAvT9nkF3Ex7ChY=";
hash = "sha256-mdE7H17vbKwQS7JloYasap8qAjaacdLuDPvIPxJSUXI=";
};
postPatch = ''

2
pkgs/development/python-modules/vdirsyncer/default.nix
View file

@ -13,6 +13,7 @@
, pytest-subtesthack
, setuptools-scm
, aiostream
, aiohttp-oauthlib
, aiohttp
, pytest-asyncio
, trustme
@ -49,6 +50,7 @@ buildPythonPackage rec {
requests-toolbelt
aiostream
aiohttp
aiohttp-oauthlib
];
nativeBuildInputs = [

4
pkgs/development/python-modules/xlsx2csv/default.nix
View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "xlsx2csv";
version = "0.8.0";
version = "0.8.1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-LCaOUJt3ZspKJPLzYwLpGHBcXq0vzeP0vV8cphUvfiw=";
sha256 = "sha256-fs1tK8JCby5DL0/awSIR4ZdtPLtl+QM+Htpl7dogReM=";
};
nativeBuildInputs = [

13
pkgs/development/tools/bazel-watcher/default.nix
View file

@ -10,6 +10,7 @@
let
patches = [
./use-go-in-path.patch
./fix-rules-go-3408.patch
];
# Patch the protoc alias so that it always builds from source.
@ -29,13 +30,13 @@ let
in
buildBazelPackage rec {
pname = "bazel-watcher";
version = "0.17.0";
version = "0.21.2";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = "bazel-watcher";
rev = "v${version}";
sha256 = "sha256-aK18Q2nYxYajk9f/EEmtV7YJ8cYqbamR7vh3BTgu53Q=";
sha256 = "sha256-wigrE9u1VuFnqLWyVJK3M7xsjyme2dDG6YTcD9whKnw=";
};
nativeBuildInputs = [ go git python3 ];
@ -44,7 +45,7 @@ buildBazelPackage rec {
bazel = bazel_5;
bazelFlags = [ "--override_repository=rules_proto=${rulesProto}" ];
bazelBuildFlags = lib.optionals stdenv.cc.isClang [ "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++" ];
bazelTarget = "//ibazel";
bazelTarget = "//cmd/ibazel";
fetchConfigured = false; # we want to fetch all dependencies, regardless of the current system
fetchAttrs = {
@ -81,7 +82,7 @@ buildBazelPackage rec {
rm -rf $bazelOut/external/com_google_protobuf
'';
sha256 = "sha256-tRtlwv38bExvtHaCbRUp1kLgxvZSNaYCpFG/wwrkFrk=";
sha256 = "sha256-le8IepS+IGVX45Gj1aicPjYOkuUA+VVUy/PEeKLNYss=";
};
buildAttrs = {
@ -90,12 +91,12 @@ buildBazelPackage rec {
preBuild = ''
patchShebangs .
substituteInPlace ibazel/BUILD --replace '{STABLE_GIT_VERSION}' ${version}
substituteInPlace cmd/ibazel/BUILD.bazel --replace '{STABLE_GIT_VERSION}' ${version}
echo ${bazel_5.version} > .bazelversion
'';
installPhase = ''
install -Dm755 bazel-bin/ibazel/ibazel_/ibazel $out/bin/ibazel
install -Dm755 bazel-bin/cmd/ibazel/ibazel_/ibazel $out/bin/ibazel
'';
};

18
pkgs/development/tools/bazel-watcher/fix-rules-go-3408.patch Normal file
View file

@ -0,0 +1,18 @@
diff --git a/WORKSPACE b/WORKSPACE
index 555ab93..9f3b8a0 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -46,10 +46,11 @@ rules_proto_toolchains()
# gazelle:repository go_repository name=com_github_bazelbuild_rules_go importpath=github.com/bazelbuild/rules_go
http_archive(
name = "io_bazel_rules_go",
- sha256 = "56d8c5a5c91e1af73eca71a6fab2ced959b67c86d12ba37feedb0a2dfea441a6",
+ sha256 = "7fd912837cc971b708037ab1d0d721b892c62dadbfdcfae5066e8e90d25876e9",
+ strip_prefix = "rules_go-8d309d5af15814b4096d80b60f80fa86128c43f2",
urls = [
- "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.37.0/rules_go-v0.37.0.zip",
- "https://github.com/bazelbuild/rules_go/releases/download/v0.37.0/rules_go-v0.37.0.zip",
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_go/archive/8d309d5af15814b4096d80b60f80fa86128c43f2.zip",
+ "https://github.com/bazelbuild/rules_go/archive/8d309d5af15814b4096d80b60f80fa86128c43f2.zip",
],
)

4
pkgs/development/tools/bazel-watcher/use-go-in-path.patch
View file

@ -6,8 +6,8 @@ index 51273b6..fcf9ffb 100644
go_rules_dependencies()
-go_register_toolchains(version = "1.17.6")
-go_register_toolchains(version = "1.19.4")
+go_register_toolchains(go_version = "host")
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")

9
pkgs/games/cutemaze/default.nix
View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "cutemaze";
version = "1.3.1";
version = "1.3.2";
src = fetchurl {
url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2";
sha256 = "6944931cd39e9ef202c11483b7b2b7409a068c52fa5fd4419ff938b1158c72ab";
url = "https://gottcode.org/cutemaze/${pname}-${version}.tar.bz2";
hash = "sha256-hjDlY18O+VDJR68vwrIZwsQAa40xU+V3bCAA4GFHJEQ=";
};
nativeBuildInputs = [
@ -36,8 +36,9 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "https://gottcode.org/cutemaze/";
changelog = "https://github.com/gottcode/cutemaze/blob/v${version}/ChangeLog";
description = "Simple, top-down game in which mazes are randomly generated";
homepage = "https://gottcode.org/cutemaze/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ];
platforms = platforms.unix;

2
pkgs/os-specific/linux/lsb-release/lsb_release.sh
View file

@ -32,7 +32,7 @@ short=0
@getopt@/bin/getopt --test > /dev/null && rc=$? || rc=$?
if [[ $rc -ne 4 ]]; then
# This shouldn't happen.
echo "Warning: Enhanced getopt not supported, please open an issue." >&2
echo "Warning: Enhanced getopt not supported, please open an issue in nixpkgs." >&2
else
# Define all short and long options.
SHORT=hvidrcas

1
pkgs/os-specific/linux/systemd/default.nix
View file

@ -93,6 +93,7 @@
, withHwdb ? true
, withImportd ? !stdenv.hostPlatform.isMusl
, withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0"
&& !stdenv.hostPlatform.isMips64 # see https://github.com/NixOS/nixpkgs/pull/194149#issuecomment-1266642211
, withLocaled ? true
, withLogind ? true
, withMachined ? true

4
pkgs/tools/misc/nb/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nb";
version = "7.2.1";
version = "7.3.0";
src = fetchFromGitHub {
owner = "xwmx";
repo = "nb";
rev = version;
sha256 = "sha256-JBWZsMs1FijV1gWw2+K8DturOSEosGRfYmeHDPCwIs8=";
sha256 = "sha256-R5B49648X9UP2al4VRRAl/T9clgvCztYxpbDHwQmDM8=";
};
nativeBuildInputs = [ installShellFiles ];

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

@ -2994,6 +2994,8 @@ with pkgs;
detect-secrets = with python3Packages; toPythonApplication detect-secrets;
deterministic-uname = callPackage ../build-support/deterministic-uname { };
dfmt = callPackage ../tools/text/dfmt { };
diopser = callPackage ../applications/audio/diopser { stdenv = gcc10StdenvCompat; };

2
pkgs/top-level/python-packages.nix
View file

@ -198,6 +198,8 @@ self: super: with self; {
aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };
aiohttp-oauthlib = callPackage ../development/python-modules/aiohttp-oauthlib { };
aiohttp-openmetrics = callPackage ../development/python-modules/aiohttp-openmetrics { };
aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { };