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

Merge branch 'master' into da/fixup-sd-card-move

Browse Source
This commit is contained in:
David Arnold 2021-02-21 16:39:38 -05:00
commit 6a3855af2b
No known key found for this signature in database
GPG Key ID: 6D6A936E69C59D08
18 changed files with 156 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
View File

@ -37,7 +37,8 @@ in {
services.pipewire.media-session = {
enable = mkOption {
type = types.bool;
default = true;
default = config.services.pipewire.enable;
defaultText = "config.services.pipewire.enable";
description = "Example pipewire session manager";
};

22
nixos/modules/system/boot/plymouth.nix
View File

@ -38,6 +38,14 @@ in
enable = mkEnableOption "Plymouth boot splash screen";
font = mkOption {
default = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf";
type = types.path;
description = ''
Font file made available for displaying text on the splash screen.
'';
};
themePackages = mkOption {
default = [ nixosBreezePlymouth ];
type = types.listOf types.package;
@ -113,7 +121,7 @@ in
mkdir -p $out/lib/plymouth/renderers
# module might come from a theme
cp ${themesEnv}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth
cp ${themesEnv}/lib/plymouth/{text,details,label,$moduleName}.so $out/lib/plymouth
cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/lib/plymouth/renderers
mkdir -p $out/share/plymouth/themes
@ -133,6 +141,17 @@ in
cp -r themes/* $out/share/plymouth/themes
cp ${cfg.logo} $out/share/plymouth/logo.png
mkdir -p $out/share/fonts
cp ${cfg.font} $out/share/fonts
mkdir -p $out/etc/fonts
cat > $out/etc/fonts/fonts.conf <<EOF
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig>
<dir>$out/share/fonts</dir>
</fontconfig>
EOF
'';
boot.initrd.extraUtilsCommandsTest = ''
@ -154,6 +173,7 @@ in
ln -s $extraUtils/share/plymouth/logo.png /etc/plymouth/logo.png
ln -s $extraUtils/share/plymouth/themes /etc/plymouth/themes
ln -s $extraUtils/lib/plymouth /etc/plymouth/plugins
ln -s $extraUtils/etc/fonts /etc/fonts
plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session
plymouth show-splash

24
pkgs/development/python-modules/protobuf3-to-dict/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchPypi, protobuf, six }:
buildPythonPackage rec {
pname = "protobuf3-to-dict";
version = "0.1.5";
src = fetchPypi {
inherit pname version;
sha256 = "0nibblvj3n20zvq6d73zalbjqjby0w8ji5mim7inhn7vb9dw4hhy";
};
doCheck = false;
pythonImportsCheck = [ "protobuf_to_dict" ];
propagatedBuildInputs = [ protobuf six ];
meta = with lib; {
description = "A teeny Python library for creating Python dicts from protocol buffers and the reverse";
homepage = "https://github.com/kaporzhu/protobuf-to-dict";
license = licenses.publicDomain;
maintainers = with maintainers; [ nequissimus ];
};
}

34
pkgs/development/python-modules/sagemaker/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib, buildPythonPackage, fetchPypi, attrs, boto3, google-pasta
, importlib-metadata, numpy, protobuf, protobuf3-to-dict, smdebug-rulesconfig }:
buildPythonPackage rec {
pname = "sagemaker";
version = "2.24.5";
src = fetchPypi {
inherit pname version;
sha256 = "1j1a058ic00yxnf0cc364fzn82pacih5ffrh5s4dw1q4s3by4cvd";
};
doCheck = false;
pythonImportsCheck = [ "sagemaker" ];
propagatedBuildInputs = [
attrs
boto3
google-pasta
importlib-metadata
numpy
protobuf
protobuf3-to-dict
smdebug-rulesconfig
];
meta = with lib; {
description = "Library for training and deploying machine learning models on Amazon SageMaker";
homepage = "https://github.com/aws/sagemaker-python-sdk/";
license = licenses.asl20;
maintainers = with maintainers; [ nequissimus ];
};
}

23
pkgs/development/python-modules/smdebug-rulesconfig/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "smdebug-rulesconfig";
version = "1.0.1";
src = fetchPypi {
inherit version;
pname = "smdebug_rulesconfig";
sha256 = "1mpwjfvpmryqqwlbyf500584jclgm3vnxa740yyfzkvb5vmyc6bs";
};
doCheck = false;
pythonImportsCheck = [ "smdebug_rulesconfig" ];
meta = with lib; {
description = "These builtin rules are available in Amazon SageMaker";
homepage = "https://github.com/awslabs/sagemaker-debugger-rulesconfig";
license = licenses.asl20;
maintainers = with maintainers; [ nequissimus ];
};
}

2
pkgs/development/python-modules/swspotify/default.nix
View File

@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "Library to get the currently playing song and artist from Spotify";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
platforms = lib.platforms.linux;
platforms = platforms.linux;
};
}

2
pkgs/development/tools/knightos/scas/default.nix
View File

@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
description = "Assembler and linker for the Z80";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
platforms = platforms.unix;
platforms = platforms.all;
};
}

6
pkgs/development/tools/mockgen/default.nix
View File

@ -1,14 +1,14 @@
{ buildGoModule, lib, fetchFromGitHub }:
buildGoModule rec {
pname = "mockgen";
version = "1.4.4";
version = "1.5.0";
src = fetchFromGitHub {
owner = "golang";
repo = "mock";
rev = "v${version}";
sha256 = "1lj0dvd6div4jaq1s0afpwqaq9ah8cxhkq93wii2ably1xmp2l0a";
sha256 = "sha256-YSPfe8/Ra72qk12+T78mTppvkag0Hw6O7WNyfhG4h4o=";
};
vendorSha256 = "1md4cg1zzhc276sc7i2v0xvg5pf6gzy0n9ga2g1lx3d572igq1wy";
vendorSha256 = "sha256-cL4a7iOSeaQiG6YO0im9bXxklCL1oyKhEDmB1BtEmEw=";
doCheck = false;

4
pkgs/games/osu-lazer/default.nix
View File

@ -16,13 +16,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
version = "2021.212.0";
version = "2021.220.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
sha256 = "JQUQEAZlVdyKhazhr7aI2I0+cHMQ303DZXUVgQiMaNs=";
sha256 = "XGwG/1cWSUNniCrUY1/18KHRtumxIWjfW5x+aYQ6RKU=";
};
patches = [ ./bypass-tamper-detection.patch ];

16
pkgs/games/osu-lazer/deps.nix generated
View File

@ -366,8 +366,8 @@
})
(fetchNuGet {
name = "Microsoft.Build.Locator";
version = "1.2.6";
sha256 = "1rnfd7wq2bkynqj767xmq9ha38mz010fmqvvvrgb4v86gd537737";
version = "1.4.1";
sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx";
})
(fetchNuGet {
name = "Microsoft.CodeAnalysis.Analyzers";
@ -556,8 +556,8 @@
})
(fetchNuGet {
name = "Microsoft.Extensions.ObjectPool";
version = "5.0.1";
sha256 = "012klayhnnygncdi9zzq32vballb2wbknk91g2ziz5mhdhg38lr8";
version = "5.0.2";
sha256 = "0asbw0l5syfgk2qb26czggvdix43d6043kl25ihdqdlhghcyy806";
})
(fetchNuGet {
name = "Microsoft.Extensions.Options";
@ -721,13 +721,13 @@
})
(fetchNuGet {
name = "NUnit";
version = "3.12.0";
sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2";
version = "3.13.1";
sha256 = "07156gr0yl9rqhyj44cp1xz9jpngbl5kb7ci3qfy9fcp01dczmm9";
})
(fetchNuGet {
name = "ppy.osu.Framework";
version = "2021.128.0";
sha256 = "19c0bj9d0hjcyhaf04aapyzyd4yrzhc61k89z2il7y32841vnzg6";
version = "2021.220.0";
sha256 = "0lsv1xl4wav9wv50d1aba56sf6dgqa5qsx4lfn81azy3lzpcbzpp";
})
(fetchNuGet {
name = "ppy.osu.Framework.NativeLibs";

6
pkgs/servers/minio/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio";
version = "2021-02-14T04-01-33Z";
version = "2021-02-19T04-38-02Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "sha256-Su3BkVZJ4c5T829/1TNQi7b0fZhpG/Ly80ynt5Po+Qs=";
sha256 = "sha256-Swm8gQeSN84SYE0M03Se9n/clYVT/W/v0GAmRRsL674=";
};
vendorSha256 = "sha256-r0QtgpIfDYu2kSy6/wSAExc3Uwd62sDEi1UZ8XzTBoU=";
vendorSha256 = "sha256-7WvR6WHiaFHHBhpPoqnkr9pzFxNpLpZuaB1a/SkLBtc=";
doCheck = false;

20
pkgs/tools/misc/mysqltuner/default.nix
View File

@ -11,17 +11,29 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Yv1XjD8sZcmGr2SVD6TEElUH7vspJ61WwQwfXLOrao0=";
};
postPatch = ''
substituteInPlace mysqltuner.pl \
--replace '$basic_password_files = "/usr/share/mysqltuner/basic_passwords.txt"' "\$basic_password_files = \"$out/share/basic_passwords.txt\"" \
--replace '$opt{cvefile} = "/usr/share/mysqltuner/vulnerabilities.csv"' "\$opt{cvefile} = \"$out/share/vulnerabilities.csv\""
'';
buildInputs = [ perl ];
installPhase = ''
mkdir -p $out/bin
install -m0755 mysqltuner.pl $out/bin/mysqltuner
runHook preInstall
mkdir -p "$out/bin"
install -Dm 0755 mysqltuner.pl "$out/bin/mysqltuner"
install -Dm 0644 basic_passwords.txt "$out/share/basic_passwords.txt"
install -Dm 0644 vulnerabilities.csv "$out/share/vulnerabilities.csv"
runHook postInstall
'';
meta = with lib; {
description = "Make recommendations for increased performance and stability of MariaDB/MySQL";
homepage = "http://mysqltuner.com";
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
license = licenses.gpl3Plus;
maintainers = with maintainers; [ peterhoeg shamilton ];
};
}

2
pkgs/tools/misc/swaglyrics/default.nix
View File

@ -42,6 +42,6 @@ python3.pkgs.buildPythonApplication rec {
homepage = "https://github.com/SwagLyrics/SwagLyrics-For-Spotify";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
platforms = lib.platforms.linux;
platforms = platforms.linux;
};
}

4
pkgs/tools/misc/youtube-dl/default.nix
View File

@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2021.02.10";
version = "2021.02.22";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "08liybkivqb32nbrzvvlv56yw6418zwmml7p6dbqcivhdgvas1yn";
sha256 = "19j4kfqln1yk47dpid9j4z3zvgxy6xar1mpfsadifikfdgbmsq7x";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

6
pkgs/tools/networking/minio-client/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio-client";
version = "2021-02-14T04-28-06Z";
version = "2021-02-19T05-34-40Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "sha256-Wef8HyJVffDb+ZdVPZOxguIFBC0B9s/1u39j7uXWSnw=";
sha256 = "sha256-tkNGWX0QyMlMw+wB8wkYuGfveln6NUoIBLPscRHnQT4=";
};
vendorSha256 = "sha256-V/fsFfc1QbPR/ouW/9AqGeVhLSbDg6NHPqZYa4Fpx6I=";
vendorSha256 = "sha256-6l8VcHTSZBbFe96rzumMCPIVFVxUMIWoqiBGMtrx75U=";
doCheck = false;

6
pkgs/tools/system/consul-template/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "consul-template";
version = "0.25.1";
version = "0.25.2";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "consul-template";
rev = "v${version}";
sha256 = "1205rhv4mizpb1nbc2sry52n7wljcwb8xp7lpazh1r1cldfayr5b";
sha256 = "sha256-r9/CxXFaeod48NgOFWhl+axiNqjaU+RIEHI71fmYzP8=";
};
vendorSha256 = "0hv4b6k8k7xkzkjgzcm5y8pqyiwyk790a1qw18gjslkwkyw5hjf2";
vendorSha256 = "sha256-DLjaDj3fJYl5ICxJuaCLKdd/AfwfUIM8teJLs3a2MHo=";
# consul-template tests depend on vault and consul services running to
# execute tests so we skip them here

6
pkgs/tools/virtualization/shipyard/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "shipyard";
version = "0.1.18";
version = "0.2.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "shipyard-run";
repo = pname;
sha256 = "sha256-ZrzW1sx0wCuaICONS3SR0VsqDj2ZUM53LaB5Wj1s9uc=";
sha256 = "sha256-eTwl2tMrhLPeHI0C76Rvm/OOt02OtDtejXYr4N6IWcg=";
};
vendorSha256 = "sha256-eeR316CKlAqWxlYcPZVlP260NR7WHfmCVE3PywMay/w=";
vendorSha256 = "sha256-rglpY7A0S56slL+mXFRgaZwS0bF1b9zxxmNYiX6TJzs=";
buildFlagsArray = [
"-ldflags=-s -w -X main.version=${version}"

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

@ -5137,6 +5137,8 @@ in {
protobuf = pkgs.protobuf;
};
protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { };
prov = callPackage ../development/python-modules/prov { };
prox-tv = callPackage ../development/python-modules/prox-tv { };
@ -7018,6 +7020,8 @@ in {
safety = callPackage ../development/python-modules/safety { };
sagemaker = callPackage ../development/python-modules/sagemaker { };
salmon-mail = callPackage ../development/python-modules/salmon-mail { };
sane = callPackage ../development/python-modules/sane {
@ -7330,6 +7334,8 @@ in {
smbus-cffi = callPackage ../development/python-modules/smbus-cffi { };
smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { };
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
smmap = callPackage ../development/python-modules/smmap { };