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

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-10-26 06:01:50 +00:00 committed by GitHub
commit 01d2877656
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 183 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/lib/make-options-doc/default.nix
View file

@ -125,7 +125,11 @@ in rec {
nativeBuildInputs = [
pkgs.brotli
(let
self = (pkgs.python3Minimal.override {
# python3Minimal can't be overridden with packages on Darwin, due to a missing framework.
# Instead of modifying stdenv, we take the easy way out, since most people on Darwin will
# just be hacking on the Nixpkgs manual (which also uses make-options-doc).
python = if pkgs.stdenv.isDarwin then pkgs.python3 else pkgs.python3Minimal;
self = (python.override {
inherit self;
includeSiteCustomize = true;
});

1
nixos/modules/module-list.nix
View file

@ -1253,6 +1253,7 @@
./system/boot/systemd/user.nix
./system/boot/timesyncd.nix
./system/boot/tmp.nix
./system/boot/uvesafb.nix
./system/etc/etc-activation.nix
./tasks/auto-upgrade.nix
./tasks/bcache.nix

39
nixos/modules/system/boot/uvesafb.nix Normal file
View file

@ -0,0 +1,39 @@
{ config, lib, pkgs, ... }:
let
cfg = config.boot.uvesafb;
inherit (lib) mkIf mkEnableOption mkOption mdDoc types;
in {
options = {
boot.uvesafb = {
enable = mkEnableOption (mdDoc "uvesafb");
gfx-mode = mkOption {
type = types.str;
default = "1024x768-32";
description = mdDoc "Screen resolution in modedb format. See [uvesafb](https://docs.kernel.org/fb/uvesafb.html) and [modedb](https://docs.kernel.org/fb/modedb.html) documentation for more details. The default value is a sensible default but may be not ideal for all setups.";
};
v86d.package = mkOption {
type = types.package;
description = mdDoc "Which v86d package to use with uvesafb";
defaultText = ''config.boot.kernelPackages.v86d.overrideAttrs (old: {
hardeningDisable = [ "all" ];
})'';
default = config.boot.kernelPackages.v86d.overrideAttrs (old: {
hardeningDisable = [ "all" ];
});
};
};
};
config = mkIf cfg.enable {
boot.initrd = {
kernelModules = [ "uvesafb" ];
extraFiles."/usr/v86d".source = cfg.v86d.package;
};
boot.kernelParams = [
"video=uvesafb:mode:${cfg.gfx-mode},mtrr:3,ywrap"
''uvesafb.v86d="${cfg.v86d.package}/bin/v86d"''
];
};
}

12
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -138,13 +138,13 @@
"version": "1.0.0"
},
"baiducloud": {
"hash": "sha256-9r9Y1iegVgaZk+2bKB0uHy6w0JotDuNUXemOqtJSAeg=",
"hash": "sha256-7dNFy3UJ20HbacmaZDxv3IRxsDHGgJdMJFa4/pJIYdw=",
"owner": "baidubce",
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
"repo": "terraform-provider-baiducloud",
"rev": "v1.16.0",
"rev": "v1.16.1",
"vendorHash": null,
"version": "1.16.0"
"version": "1.16.1"
},
"bigip": {
"hash": "sha256-uSe+J4AlW8Dt96BVF1ZI/yrgWUbZsl64b/D+k5ysHC0=",
@ -349,13 +349,13 @@
"version": "2.22.0"
},
"elasticsearch": {
"hash": "sha256-7sMF7LBM5tnOtERufh7LaJlfcJ5WHIynpzlTg/05u3I=",
"hash": "sha256-+cktPArBOysc4V+uR3KWsVlxtxSIbuVMCmPSU21xF/U=",
"owner": "phillbaker",
"provider-source-address": "registry.terraform.io/phillbaker/elasticsearch",
"repo": "terraform-provider-elasticsearch",
"rev": "v2.0.5",
"rev": "v2.0.6",
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=",
"version": "2.0.5"
"version": "2.0.6"
},
"equinix": {
"hash": "sha256-gvI9awkKiWWnw6O/KvskFTHZfvajGfgYu8DGsT34Siw=",

27
pkgs/applications/networking/p2p/magnetico/default.nix
View file

@ -1,27 +1,40 @@
{ lib, fetchFromGitHub, buildGoModule, go-bindata }:
{ lib
, fetchFromGitHub
, nixosTests
, buildGoModule
}:
buildGoModule rec {
pname = "magnetico";
version = "0.12.0";
version = "unstable-2022-08-10";
src = fetchFromGitHub {
owner = "boramalper";
owner = "ireun";
repo = "magnetico";
rev = "v${version}";
sha256 = "1avqnfn4llmc9xmpsjfc9ivki0cfvd8sljfzd9yac94xcj581s83";
rev = "828e230d3b3c0759d3274e27f5a7b70400f4d6ea";
sha256 = "sha256-V1pBzillWTk9iuHAhFztxYaq4uLL3U3HYvedGk6ffbk=";
};
vendorSha256 = "087kikj6sjhjxqymnj7bpxawfmwckihi6mbmi39w0bn2040aflx5";
vendorSha256 = "sha256-ngYkTtBEZSyYYnfBHi0VrotwKGvMOiowbrwigJnjsuU=";
nativeBuildInputs = [ go-bindata ];
buildPhase = ''
runHook preBuild
make magneticow magneticod
runHook postBuild
'';
checkPhase = ''
runHook preBuild
make test
runHook postBuild
'';
passthru.tests = { inherit (nixosTests) magnetico; };
meta = with lib; {
description = "Autonomous (self-hosted) BitTorrent DHT search engine suite";
homepage = "https://github.com/boramalper/magnetico";

34
pkgs/development/python-modules/flit-scm/default.nix Normal file
View file

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchFromGitLab
, pythonOlder
, git
, flit-core
, setuptools-scm
, tomli
}:
buildPythonPackage rec {
pname = "flit-scm";
version = "1.7.0";
format = "pyproject";
src = fetchFromGitLab {
owner = "WillDaSilva";
repo = "flit_scm";
rev = version;
sha256 = "sha256-K5sH+oHgX/ftvhkY+vIg6wUokAP96YxrTWds3tnEtyg=";
leaveDotGit = true;
};
nativeBuildInputs = [ flit-core setuptools-scm tomli git ];
propagatedBuildInputs = [ flit-core setuptools-scm ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
meta = with lib; {
description = "A PEP 518 build backend that uses setuptools_scm to generate a version file from your version control system, then flit to build the package.";
homepage = "https://gitlab.com/WillDaSilva/flit_scm";
license = licenses.mit;
maintainers = with maintainers; [ cpcloud ];
};
}

11
pkgs/development/python-modules/rtoml/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "rtoml";
version = "0.7";
version = "0.8";
disabled = pythonOlder "3.7";
@ -18,13 +18,13 @@ buildPythonPackage rec {
owner = "samuelcolvin";
repo = pname;
rev = "v${version}";
sha256 = "sha256-h4vY63pDkrMHt2X244FssLxHsphsfjNd6gnVFUeZZTY=";
sha256 = "sha256-tvX4KcQGw0khBjEXVFmkhsVyAkdr2Bgm6IfD1yGZ37c=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "05fwcs6w023ihw3gyihzbnfwjaqy40d6h0z2yas4kqkkvz9x4f8j";
sha256 = "sha256-KcF3Z71S7ZNZicViqwpClfT736nYYbKcKWylOP+S3HI=";
};
nativeBuildInputs = with rustPlatform; [
@ -50,11 +50,6 @@ buildPythonPackage rec {
cd tests
'';
pytestFlagsArray = [
"-W"
"ignore::DeprecationWarning"
];
meta = with lib; {
description = "Rust based TOML library for Python";
homepage = "https://github.com/samuelcolvin/rtoml";

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

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
version = "3.15.5";
version = "3.15.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-jzQEsrCwSB+OY9XGmztkvbM2ZzT4mUkuYvO86ed6XUc=";
sha256 = "sha256-4BVU2rubDyBpg6OmUl5dqiFAkgeHJvqW96kL/Im0su8=";
};
propagatedBuildInputs = [ numpy ];

74
pkgs/development/tools/database/schemaspy/default.nix
View file

@ -1,30 +1,83 @@
{ lib, stdenv, fetchurl, jre, makeWrapper, graphviz }:
{ lib
, stdenv
, callPackage
, maven
, jdk
, jre
, buildMaven
, makeWrapper
, git
, fetchFromGitHub
, graphviz
, ensureNewerSourcesHook
}:
stdenv.mkDerivation rec {
version = "6.1.0";
let
version = "6.1.1-SNAPSHOT";
pname = "schemaspy";
src = fetchurl {
url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${pname}-${version}.jar";
sha256 = "0lgz6b17hx9857fb2l03ggz8y3n8a37vrcsylif0gmkwj1v4qgl7";
src = fetchFromGitHub {
owner = "schemaspy";
repo = "schemaspy";
rev = "110b1614f9ae4aec0e4dc4e8f0e7c647274d3af6";
sha256 = "sha256-X5B34zGhD/NxcK8TQvwdk1NljGJ1HwfBp47ocbE4HiU=";
};
dontUnpack = true;
deps = stdenv.mkDerivation {
name = "${pname}-${version}-deps";
inherit src;
nativeBuildInputs = [ jdk maven git ];
buildInputs = [ jre ];
buildPhase = ''
mvn package -Dmaven.test.skip=true -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000
'';
# keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
installPhase = ''
find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete
find $out/.m2 -type f -iname '*.pom' -exec sed -i -e 's/\r\+$//' {} \;
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "sha256-CUFA9L6qqjo3Jp5Yy1yCqbS9QAEb9PElys4ArPa9VhA=";
doCheck = false;
};
in
stdenv.mkDerivation rec {
inherit version pname src;
buildInputs = [
jre
maven
];
nativeBuildInputs = [
makeWrapper
# the build system gets angry if it doesn't see git (even though it's not
# actually in a git repository)
git
# springframework boot gets angry about 1970 sources
# fix from https://github.com/nix-community/mavenix/issues/25
(ensureNewerSourcesHook { year = "1980"; })
];
wrappedPath = lib.makeBinPath [
graphviz
];
buildPhase = ''
VERSION=${version}
SEMVER_STR=${version}
mvn package --offline -Dmaven.test.skip=true -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
'';
installPhase = ''
install -D ${src} "$out/share/java/${pname}-${version}.jar"
install -D target/${pname}-${version}.jar $out/share/java/${pname}-${version}.jar
makeWrapper ${jre}/bin/java $out/bin/schemaspy \
--add-flags "-jar $out/share/java/${pname}-${version}.jar" \
@ -34,8 +87,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://schemaspy.org";
description = "Document your database simply and easily";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.mit;
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ jraygauthier ];
};
}

6
pkgs/development/tools/rust/svd2rust/default.nix
View file

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "svd2rust";
version = "0.27.0";
version = "0.27.1";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-fU/qaYuuZM9tfveWYD4tCJugLELTR4DlQsr4WP/0f4o=";
sha256 = "sha256-Tnow5NjeDyz4oMY+UMs2TDquLTioElhSNzbC6eEYpTs=";
};
cargoSha256 = "sha256-csiwkBOiIzIVADjKFE8YvBRO0iqtEr4I4s0XDMyb7Sc=";
cargoSha256 = "sha256-sN3uJTU9h9Ls2fygz6My3hao77lQFdNkA0gkUevV7Jc=";
meta = with lib; {
description = "Generate Rust register maps (`struct`s) from SVD files";

4
pkgs/development/web/flyctl/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
version = "0.0.417";
version = "0.0.419";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
sha256 = "sha256-Bxe0YzSHF7ziCLiyxb1inWbwZAqRO6/qFxWsllbjXK4=";
sha256 = "sha256-x9ZwwUn6Rwn6tGaSpkWc8syMJDusn4j2QzLjmr1/ciM=";
};
vendorSha256 = "sha256-a0ZnZlKB/Uotrm4npXB1dd1+oWHRhJVW7ofMSKlqcvM=";

4
pkgs/tools/admin/exoscale-cli/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "exoscale-cli";
version = "1.59.3";
version = "1.60.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-QJDj8YW7gO0xvKqUYrgNlSfOqtk29C3nLsqO1BjowTE=";
sha256 = "sha256-hvLPLqy5wgywM4vZizBiB2jpC5JszSC5bUSmchqGQcA=";
};
vendorSha256 = null;

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

@ -30005,10 +30005,7 @@ with pkgs;
electron = electron_9;
};
magnetico = callPackage ../applications/networking/p2p/magnetico {
# pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
buildGoModule = buildGo117Module;
};
magnetico = callPackage ../applications/networking/p2p/magnetico { };
mastodon-bot = nodePackages.mastodon-bot;

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

@ -3525,6 +3525,8 @@ in {
flit-core = callPackage ../development/python-modules/flit-core { };
flit-scm = callPackage ../development/python-modules/flit-scm { };
flow-record = callPackage ../development/python-modules/flow-record { };
flower = callPackage ../development/python-modules/flower { };