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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-01-19 12:01:24 +00:00 committed by GitHub
commit 28abf69ffd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 283 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/installer/netboot/netboot.nix
View File

@ -94,7 +94,9 @@ with lib;
system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" ''
#!ipxe
kernel ${pkgs.stdenv.hostPlatform.linux-kernel.target} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams}
# Use the cmdline variable to allow the user to specify custom kernel params
# when chainloading this script from other iPXE scripts like netboot.xyz
kernel ${pkgs.stdenv.hostPlatform.linux-kernel.target} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams} ''${cmdline}
initrd initrd
boot
'';

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

@ -104,6 +104,7 @@ in
discourse = handleTest ./discourse.nix {};
dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {};
dnscrypt-wrapper = handleTestOn ["x86_64-linux"] ./dnscrypt-wrapper {};
dnsdist = handleTest ./dnsdist.nix {};
doas = handleTest ./doas.nix {};
docker = handleTestOn ["x86_64-linux"] ./docker.nix {};
docker-rootless = handleTestOn ["x86_64-linux"] ./docker-rootless.nix {};

48
nixos/tests/dnsdist.nix Normal file
View File

@ -0,0 +1,48 @@
import ./make-test-python.nix (
{ pkgs, ... }: {
name = "dnsdist";
meta = with pkgs.lib; {
maintainers = with maintainers; [ jojosch ];
};
machine = { pkgs, lib, ... }: {
services.bind = {
enable = true;
extraOptions = "empty-zones-enable no;";
zones = lib.singleton {
name = ".";
master = true;
file = pkgs.writeText "root.zone" ''
$TTL 3600
. IN SOA ns.example.org. admin.example.org. ( 1 3h 1h 1w 1d )
. IN NS ns.example.org.
ns.example.org. IN A 192.168.0.1
ns.example.org. IN AAAA abcd::1
1.0.168.192.in-addr.arpa IN PTR ns.example.org.
'';
};
};
services.dnsdist = {
enable = true;
listenPort = 5353;
extraConfig = ''
newServer({address="127.0.0.1:53", name="local-bind"})
'';
};
environment.systemPackages = with pkgs; [ dig ];
};
testScript = ''
machine.wait_for_unit("bind.service")
machine.wait_for_open_port(53)
machine.succeed("dig @127.0.0.1 +short -x 192.168.0.1 | grep -qF ns.example.org")
machine.wait_for_unit("dnsdist.service")
machine.wait_for_open_port(5353)
machine.succeed("dig @127.0.0.1 -p 5353 +short -x 192.168.0.1 | grep -qF ns.example.org")
'';
}
)

2
pkgs/applications/audio/pifi/Gemfile
View File

@ -1,2 +0,0 @@
source 'https://rubygems.org'
gem 'pifi'

39
pkgs/applications/audio/pifi/Gemfile.lock
View File

@ -1,39 +0,0 @@
GEM
remote: https://rubygems.org/
specs:
daemons (1.3.1)
eventmachine (1.2.7)
json (2.5.1)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
optimist (3.0.1)
pifi (0.4.11)
json (~> 2.2)
optimist (~> 3.0)
ruby-mpd (~> 0.3)
sinatra (~> 2.0)
thin (~> 1.7)
rack (2.2.3)
rack-protection (2.1.0)
rack
ruby-mpd (0.3.3)
ruby2_keywords (0.0.4)
sinatra (2.1.0)
mustermann (~> 1.0)
rack (~> 2.2)
rack-protection (= 2.1.0)
tilt (~> 2.0)
thin (1.8.0)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
tilt (2.0.10)
PLATFORMS
ruby
DEPENDENCIES
pifi
BUNDLED WITH
2.1.4

18
pkgs/applications/audio/pifi/default.nix
View File

@ -1,18 +0,0 @@
{ lib, bundlerEnv, ruby }:
bundlerEnv rec {
pname = "pifi";
version = (import ./gemset.nix).pifi.version;
inherit ruby;
# expects Gemfile, Gemfile.lock and gemset.nix in the same directory
gemdir = ./.;
meta = with lib; {
description = "MPD web client to listen to radio, written in React and Sinatra";
homepage = "https://github.com/rccavalcanti/pifi-radio";
license = with licenses; gpl3Only;
maintainers = with maintainers; [ kmein ];
platforms = platforms.unix;
};
}

137
pkgs/applications/audio/pifi/gemset.nix
View File

@ -1,137 +0,0 @@
{
daemons = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w";
type = "gem";
};
version = "1.3.1";
};
eventmachine = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
type = "gem";
};
version = "1.2.7";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
type = "gem";
};
version = "2.5.1";
};
mustermann = {
dependencies = ["ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a";
type = "gem";
};
version = "1.1.1";
};
optimist = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk";
type = "gem";
};
version = "3.0.1";
};
pifi = {
dependencies = ["json" "optimist" "ruby-mpd" "sinatra" "thin"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xwjaql852m0p7himc3pak1ibc8lfxi29bbgic153wp713xc2cga";
type = "gem";
};
version = "0.4.11";
};
rack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
type = "gem";
};
version = "2.2.3";
};
rack-protection = {
dependencies = ["rack"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz";
type = "gem";
};
version = "2.1.0";
};
ruby-mpd = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l80gbnma009pfcqgz4azbngkr5jn9nm46fflx5p7c4vz4kwshpc";
type = "gem";
};
version = "0.3.3";
};
ruby2_keywords = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
type = "gem";
};
version = "0.0.4";
};
sinatra = {
dependencies = ["mustermann" "rack" "rack-protection" "tilt"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk";
type = "gem";
};
version = "2.1.0";
};
thin = {
dependencies = ["daemons" "eventmachine" "rack"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5";
type = "gem";
};
version = "1.8.0";
};
tilt = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
type = "gem";
};
version = "2.0.10";
};
}

79
pkgs/applications/misc/airtame/default.nix
View File

@ -1,79 +0,0 @@
{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
, alsa-lib, atk, cairo, cups, curl, dbus, expat, ffmpeg_3, fontconfig, freetype
, gdk-pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite
, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender
, libXtst, libopus, libpulseaudio, libxcb, nspr, nss, pango, udev, x264
}:
let libPath = lib.makeLibraryPath [
alsa-lib atk cairo cups curl dbus expat ffmpeg_3 fontconfig freetype gdk-pixbuf
glib glibc gnome2.GConf gtk2 libopus nspr nss pango stdenv.cc.cc udev x264
libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes
libXi libXrandr libXrender libXtst libpulseaudio libxcb
];
in stdenv.mkDerivation rec {
pname = "airtame";
version = "3.3.0";
longName = "${pname}-application";
src = fetchurl {
url = "https://downloads.airtame.com/application/ga/lin_x64/releases/${longName}-${version}.tar.gz";
sha256 = "16ca1vcxpka26jcrfbxpq74kcizgrm138j94bby6kzqp2swhrl76";
};
nativeBuildInputs = [ makeWrapper ];
desktopItem = makeDesktopItem rec {
name = "airtame";
exec = longName;
comment = "Airtame Streaming Client";
desktopName = "Airtame";
icon = name;
genericName = comment;
categories = "Network;";
};
installPhase = ''
opt="$out/opt/airtame"
mkdir -p "$opt"
cp -R . "$opt"
mkdir -p "$out/bin"
ln -s "$opt/${longName}" "$out/bin/"
mkdir -p "$out/share"
cp -r "${desktopItem}/share/applications" "$out/share/"
mkdir -p "$out/share/icons"
ln -s "$opt/icon.png" "$out/share/icons/airtame.png"
# Flags and rpath are copied from launch-airtame.sh.
vendorlib="\
$opt/resources/app.asar.unpacked/modules/streamer/dist/deps/airtame-modules:\
$opt/resources/app.asar.unpacked/encryption/out/lib:\
$opt/resources/deps/airtame-core/lib:\
$opt/resources/deps/airtame-encryption/lib"
echo $vendorlib
rpath="${libPath}:$opt:$vendorlib"
find "$opt" \( -type f -executable -o -name "*.so" -o -name "*.so.*" \) \
-exec patchelf --set-rpath "$rpath" {} \;
# The main binary also needs libudev which was removed by --shrink-rpath.
interp="$(< $NIX_CC/nix-support/dynamic-linker)"
patchelf --set-interpreter "$interp" $opt/${longName}
wrapProgram $opt/${longName} \
--prefix LD_LIBRARY_PATH=$rpath \
--add-flags "--disable-gpu --enable-transparent-visuals"
'';
dontPatchELF = true;
meta = with lib; {
homepage = "https://airtame.com/download";
description = "Wireless streaming client for Airtame devices";
license = licenses.unfree;
maintainers = with maintainers; [ thanegill ];
platforms = platforms.linux;
};
}

24
pkgs/applications/misc/octoprint/plugins.nix
View File

@ -420,6 +420,30 @@ in
};
};
octolapse = buildPlugin rec {
pname = "Octolapse";
version = "0.4.1";
src = fetchFromGitHub {
owner = "FormerLurker";
repo = pname;
rev = "v${version}";
sha256 = "13q20g7brabplc198jh67lk65rn140r8217iak9b2jy3in8fggv4";
};
# Test fails due to code executed on import, see #136513
#pythonImportsCheck = [ "octoprint_octolapse" ];
propagatedBuildInputs = with super; [ awesome-slugify setuptools pillow sarge six psutil file-read-backwards ];
meta = with lib; {
description = "Stabilized timelapses for Octoprint";
homepage = "https://github.com/FormerLurker/OctoLapse";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ illustris j0hax ];
};
};
octoprint-dashboard = buildPlugin rec {
pname = "OctoPrint-Dashboard";
version = "1.18.3";

6
pkgs/data/misc/v2ray-geoip/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "v2ray-geoip";
version = "202201060033";
version = "202201130034";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "57f0e64ece0582314958c027198b8e50daa353d2";
sha256 = "sha256-RG7sLp9u8k1U5XVFcwAF57UcvwhF3pFKCFLLJ2x7q00=";
rev = "68254f88c97e6ac1ec587bcf6491902ccf29a447";
sha256 = "sha256-fpwJpXampcHiP68ABcEW5HawPuLwbcmNOY0aiFSzwcs=";
};
installPhase = ''

69
pkgs/development/compilers/inklecate/default.nix
View File

@ -1,54 +1,43 @@
{ lib, stdenv, fetchurl, unzip, makeWrapper }:
{ lib
, stdenv
, autoPatchelfHook
, buildDotnetModule
, dotnetCorePackages
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
buildDotnetModule rec {
pname = "inklecate";
version = "1.0.0";
src =
if stdenv.isLinux then
fetchurl {
url = "https://github.com/inkle/ink/releases/download/v${version}/inklecate_linux.zip";
sha256 = "6e17db766222998ba0ae5a5da9857e34896e683b9ec42fad528c3f8bea7398ea";
name = "${pname}-${version}";
}
else if stdenv.isDarwin then
fetchurl {
url = "https://github.com/inkle/ink/releases/download/v${version}/inklecate_mac.zip";
sha256 = "b6f4dd1f95c180637ce193dbb5fa6d59aeafe49a2121a05b7822e6cbbaa6931f";
name = "${pname}-${version}";
}
else throw "Not supported on ${stdenv.hostPlatform.system}.";
src = fetchFromGitHub {
owner = "inkle";
repo = "ink";
rev = "v${version}";
sha256 = "00lagmwsbxap5mgnw4gndpavmv3xsgincdaq1zvw7fkc3vn3pxqc";
};
# Work around the "unpacker appears to have produced no directories"
# case that happens when the archive doesn't have a subdirectory.
setSourceRoot = "sourceRoot=$(pwd)";
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [ stdenv.cc.cc.lib ];
nativeBuildInputs = [ unzip makeWrapper ];
unpackPhase = ''
unzip -qq -j $src -d $pname-$version
rm $pname-$version/ink-engine-runtime.dll
rm $pname-$version/ink_compiler.dll
'';
installPhase = ''
mkdir -p $out/bin/
cp $pname-$version/inklecate $out/bin/inklecate
'';
projectFile = "inklecate/inklecate.csproj";
nugetDeps = if stdenv.isDarwin then ./deps-darwin.nix else ./deps-linux.nix;
executables = [ "inklecate" ];
dotnet-runtime = dotnetCorePackages.runtime_3_1;
dotnet-sdk = dotnetCorePackages.sdk_6_0;
meta = with lib; {
description = "Compiler for ink, inkle's scripting language";
description = "Compiler for ink, inkle's scripting language";
longDescription = ''
Inklecate is a command-line compiler for ink, inkle's open source
scripting language for writing interactive narrative
'';
homepage = "https://www.inklestudios.com/ink/";
downloadPage = "https://github.com/inkle/ink/releases";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ shreerammodi ];
'';
homepage = "https://www.inklestudios.com/ink/";
downloadPage = "https://github.com/inkle/ink/";
license = licenses.mit;
platforms = platforms.unix;
badPlatforms = platforms.aarch64;
maintainers = with maintainers; [ shreerammodi ];
};
}

31
pkgs/development/compilers/inklecate/deps-darwin.nix Normal file
View File

@ -0,0 +1,31 @@
{ fetchNuGet }: [
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.21"; sha256 = "1s5g9gk0hvs268q2zpc32m0my2m2ivlmsmza86797a9vkxr6pzw6"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; })
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; })
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
(fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; })
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; })
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; })
]

31
pkgs/development/compilers/inklecate/deps-linux.nix Normal file
View File

@ -0,0 +1,31 @@
{ fetchNuGet }: [
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.21"; sha256 = "01kbhi29lhv6mg1zfsyakz3z8hfbxnc0kxy0fczl8xqviik9svx7"; })
(fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; })
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
(fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; })
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
(fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; })
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; })
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; })
]

2
pkgs/development/libraries/accountsservice/default.nix
View File

@ -41,12 +41,14 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
polkit
systemd
];
mesonFlags = [
"-Dadmin_group=wheel"
"-Dlocalstatedir=/var"
"-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"-Dsystemd=true"
];
postPatch = ''

22
pkgs/development/python-modules/file-read-backwards/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, buildPythonPackage, fetchPypi, mock }:
buildPythonPackage rec {
pname = "file-read-backwards";
version = "2.0.0";
src = fetchPypi {
pname = "file_read_backwards";
inherit version;
sha256 = "fd50d9089b412147ea3c6027e2ad905f977002db2918cf315d64eed23d6d6eb8";
};
checkInputs = [ mock ];
pythonImportsCheck = [ "file_read_backwards" ];
meta = with lib; {
homepage = "https://github.com/RobinNil/file_read_backwards";
description = "Memory efficient way of reading files line-by-line from the end of file";
license = licenses.mit;
maintainers = with maintainers; [ j0hax ];
};
}

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

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "torchinfo";
version = "1.6.2";
version = "1.6.3";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-vf3TADqIX4RtCU3dN/lBK4aRg3wud/KkK9u5XGnBbO4=";
sha256 = "sha256-g1xhtdwygzPTTswP8iZ364ynBQE7D+aAsZ3d9EpyvIA=";
};
propagatedBuildInputs = [

1
pkgs/development/python-modules/types-freezegun/default.nix
View File

@ -6,6 +6,7 @@
buildPythonPackage rec {
pname = "types-freezegun";
version = "1.1.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;

6
pkgs/development/python-modules/types-tabulate/default.nix
View File

@ -9,12 +9,16 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "sha256-A/KDvzhOoSG3tqWK+zj03vl/MHBPyhOg2mhpNrDzkqw=";
hash = "sha256-A/KDvzhOoSG3tqWK+zj03vl/MHBPyhOg2mhpNrDzkqw=";
};
# Module doesn't have tests
doCheck = false;
pythonImportsCheck = [
"tabulate-stubs"
];
meta = with lib; {
description = "Typing stubs for tabulate";
homepage = "https://github.com/python/typeshed";

4
pkgs/development/web/nodejs/v17.nix
View File

@ -7,8 +7,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "17.3.1";
sha256 = "070xy8rk5z6jmxiay95sjw0jld6pp2ymig7ryypday5aaiw8y26g";
version = "17.4.0";
sha256 = "1ch1hc5qc13qbk7gmpw729wb7s9kmda6sjlhzdw53iq6fzq7336g";
patches = [
./disable-darwin-v8-system-instrumentation.patch
# Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL.

4
pkgs/games/vassal/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "VASSAL";
version = "3.5.8";
version = "3.6.1";
src = fetchzip {
url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2";
sha256 = "sha256-IJ3p7+0fs/2dCbE1BOb2580upR9W/1R2/e3xmkAsJ+M=";
sha256 = "sha256-elcSwm7KvDpGVBF7Gs6GFreQPyVwWBxYN0NO1N6JWDM=";
};
nativeBuildInputs = [ makeWrapper ];

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

@ -462,6 +462,9 @@ let
SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default
# Prevent processes from ptracing non-children processes
SECURITY_YAMA = option yes;
# The goal of Landlock is to enable to restrict ambient rights (e.g. global filesystem access) for a set of processes.
# This does not have any effect if a program does not support it
SECURITY_LANDLOCK = whenAtLeast "5.13" yes;
DEVKMEM = whenOlder "5.13" no; # Disable /dev/kmem
USER_NS = yes; # Support for user namespaces

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

@ -22,31 +22,31 @@
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.91-hardened1.patch",
"sha256": "0sswrl880155vphcfm3nb0smjgcgprqmr1baabhwfn62iz5sv29q",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.91-hardened1/linux-hardened-5.10.91-hardened1.patch"
"name": "linux-hardened-5.10.92-hardened1.patch",
"sha256": "08vhk7vzwd9r76mphyphc5n718kdpg3l2i0smrr92w5mx19pvs8g",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.92-hardened1/linux-hardened-5.10.92-hardened1.patch"
},
"sha256": "1lcmhp6njj4ypwkq471mdjapbqvcn6jfqx7z422h8fn6q62gpkk2",
"version": "5.10.91"
"sha256": "0lmvdskxk1r18p6rn2dhw23wj8g3a8blar6xn5x1sgqxln006xfm",
"version": "5.10.92"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.14-hardened1.patch",
"sha256": "1vxcdzrnnsgrxk5a9qinqffmgrm1rdd4m68d9kqjrmxg7cnabj65",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.14-hardened1/linux-hardened-5.15.14-hardened1.patch"
"name": "linux-hardened-5.15.15-hardened1.patch",
"sha256": "0js9fz2xx8gshxb5dc6ycmgycmcfqpxdkbpbmx92d397qdnj0460",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.15-hardened1/linux-hardened-5.15.15-hardened1.patch"
},
"sha256": "0kbayz4k72hx9b0l9yz2mbgb2xpnpm13snms06r2absv3gkv9wid",
"version": "5.15.14"
"sha256": "0nisr3i9sxpp0s25wg6sb45287l0v9vmsgnz6d4igbvih37mfg0x",
"version": "5.15.15"
},
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.171-hardened1.patch",
"sha256": "1wq9r5bs42zyc06zac59rfl1987lwrwm4vi7wnmgvd4ygmvibc8k",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.171-hardened1/linux-hardened-5.4.171-hardened1.patch"
"name": "linux-hardened-5.4.172-hardened1.patch",
"sha256": "124l2b3km1278dc4lgm35f50jfxnbdia1127j27w3b3dhs37baw9",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.172-hardened1/linux-hardened-5.4.172-hardened1.patch"
},
"sha256": "0n29bd1kv4rk3ji05vkvxkrzyzq50dxk0zsnk7r5lj45gpnwig5g",
"version": "5.4.171"
"sha256": "1r3ci123dmijk0n3z91xqri89rbvnk51hd9d4q430ag8cw5qk7mi",
"version": "5.4.172"
}
}

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

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

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

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

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

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

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

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

19
pkgs/servers/dns/dnsdist/default.nix
View File

@ -1,19 +1,26 @@
{ lib, stdenv, fetchurl, pkg-config, systemd
, boost, libsodium, libedit, re2
, net-snmp, lua, protobuf, openssl, zlib, h2o
, nghttp2, nixosTests
}:
stdenv.mkDerivation rec {
pname = "dnsdist";
version = "1.5.2";
version = "1.7.0";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2";
sha256 = "sha256-K9e1M9Lae7RWY8amLkftDS8Zigd/WNxzDEY7eXNjZ0k=";
sha256 = "sha256-eMxyywzPf7Xz8vrgnHntplpSVjdNoJu1Qbc16mho/GQ=";
};
patches = [
# Disable tests requiring networking:
# "Error connecting to new server with address 192.0.2.1:53: connecting socket to 192.0.2.1:53: Network is unreachable"
./disable-network-tests.patch
];
nativeBuildInputs = [ pkg-config protobuf ];
buildInputs = [ systemd boost libsodium libedit re2 net-snmp lua openssl zlib h2o ];
buildInputs = [ systemd boost libsodium libedit re2 net-snmp lua openssl zlib h2o nghttp2 ];
configureFlags = [
"--with-libsodium"
@ -32,10 +39,14 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru.tests = {
inherit (nixosTests) dnsdist;
};
meta = with lib; {
description = "DNS Loadbalancer";
homepage = "https://dnsdist.org";
license = licenses.gpl2;
maintainers = with maintainers; [ SuperSandro2000 ];
maintainers = with maintainers; [ jojosch ];
};
}

28
pkgs/servers/dns/dnsdist/disable-network-tests.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/test-dnsdisttcp_cc.cc b/test-dnsdisttcp_cc.cc
index 1fbb00e..dc04137 100644
--- a/test-dnsdisttcp_cc.cc
+++ b/test-dnsdisttcp_cc.cc
@@ -848,6 +848,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionWithProxyProtocol_SelfAnswered)
BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR)
{
+ return;
auto local = getBackendAddress("1", 80);
ClientState localCS(local, true, false, false, "", {});
auto tlsCtx = std::make_shared<MockupTLSCtx>();
@@ -1711,6 +1712,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR)
BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR)
{
+ return;
auto local = getBackendAddress("1", 80);
ClientState localCS(local, true, false, false, "", {});
/* enable out-of-order on the front side */
@@ -3677,6 +3679,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR)
BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendNotOOOR)
{
+ return;
auto local = getBackendAddress("1", 80);
ClientState localCS(local, true, false, false, "", {});
/* enable out-of-order on the front side */

4
pkgs/tools/system/bfs/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bfs";
version = "2.2.1";
version = "2.3";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
sha256 = "sha256-3E1EXtI8QvHRDoVSV21K1/Rknp3E+GV1n5iorrv5jNY=";
sha256 = "sha256-ng8/Cgo54MRtrYHRRU9b1v+O1yN5ji/VuV87BWABIMM=";
};
buildInputs = lib.optionals stdenv.isLinux [ libcap acl ];

4
pkgs/tools/text/vale/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "vale";
version = "2.13.0";
version = "2.14.0";
subPackages = [ "cmd/vale" ];
outputs = [ "out" "data" ];
@ -11,7 +11,7 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
sha256 = "sha256-I1hrmlNZUDhjWTsOzmp8xIc8rv2gTGRx2/yiAmCy9IY=";
sha256 = "sha256-4kFd2ULap9kcMu81Lu0SxER7xDAnVVyi9yAVsS1yhnw=";
};
vendorSha256 = "sha256-tZarz6xwZo9IFfKB9qGxqezYaFrPyQp3wcug5jGaElY=";

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

@ -42,6 +42,7 @@ mapAliases ({
aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05
ag = silver-searcher; # added 2018-04-25
aircrackng = aircrack-ng; # added 2016-01-14
airtame = throw "airtame has been removed due to being unmaintained."; # added 2022-01-19
aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30
alienfx = throw "alienfx has been removed."; # added 2019-12-08
alsaLib = alsa-lib; # added 2021-06-09
@ -766,6 +767,7 @@ mapAliases ({
pidginotr = pidgin-otr; # added 2018-01-08
pidginsipe = pidgin-sipe; # added 2018-01-08
pidginwindowmerge = pidgin-window-merge; # added 2018-01-08
pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed."; # added 2022-01-19
piwik = matomo; # added 2018-01-16
pkgconfig = pkg-config; # added 2018-02-02, moved to aliases.nix 2021-01-18
pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02

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

@ -972,8 +972,6 @@ with pkgs;
airspyhf = callPackage ../applications/radio/airspyhf { };
airtame = callPackage ../applications/misc/airtame { };
aj-snapshot = callPackage ../applications/audio/aj-snapshot { };
ajour = callPackage ../tools/games/ajour {
@ -8931,8 +8929,6 @@ with pkgs;
pastebinit = callPackage ../tools/misc/pastebinit { };
pifi = callPackage ../applications/audio/pifi { };
pmacct = callPackage ../tools/networking/pmacct { };
pmix = callPackage ../development/libraries/pmix { };

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

@ -2796,6 +2796,8 @@ in {
fields = callPackage ../development/python-modules/fields { };
file-read-backwards = callPackage ../development/python-modules/file-read-backwards { };
filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { };
filebytes = callPackage ../development/python-modules/filebytes { };