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-31 06:01:44 +00:00 committed by GitHub
commit 0a73a64936
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 142 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/monitoring/grafana.nix
View file

@ -408,7 +408,7 @@ in {
socket = mkOption {
description = lib.mdDoc "Path where the socket should be created when protocol=socket. Make sure that Grafana has appropriate permissions before you change this setting.";
default = "";
default = "/run/grafana/grafana.sock";
type = types.str;
};
};

4
pkgs/applications/audio/bambootracker/default.nix
View file

@ -12,14 +12,14 @@
mkDerivation rec {
pname = "bambootracker";
version = "0.5.2";
version = "0.5.3";
src = fetchFromGitHub {
owner = "BambooTracker";
repo = "BambooTracker";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-+9PmpmsF08oU//pJOWaoGQzG7a2O13kYqKbGwVRAMlU=";
sha256 = "sha256-OaktEUWWDEW+MYnQkaB8FvkuH29VDXFqBVSTEJ7Sz7A=";
};
nativeBuildInputs = [ qmake qttools pkg-config ];

14
pkgs/applications/audio/cava/default.nix
View file

@ -1,33 +1,27 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, alsa-lib, fftw,
libpulseaudio, ncurses }:
libpulseaudio, ncurses, iniparser }:
stdenv.mkDerivation rec {
pname = "cava";
version = "0.7.4";
version = "0.8.2";
buildInputs = [
alsa-lib
fftw
libpulseaudio
ncurses
iniparser
];
src = fetchFromGitHub {
owner = "karlstav";
repo = "cava";
rev = version;
sha256 = "sha256-BlHGst34aUgQcXcuQG43VnKUTclCxfQmWRa6iCud8dc=";
sha256 = "sha256-5nguoC2MrcNHMQ6rMOIRdSPtjA6bx5OrMGYdU/H08z0=";
};
nativeBuildInputs = [ autoreconfHook ];
postConfigure = ''
substituteInPlace Makefile.am \
--replace "-L/usr/local/lib -Wl,-rpath /usr/local/lib" ""
substituteInPlace configure.ac \
--replace "/usr/share/consolefonts" "$out/share/consolefonts"
'';
meta = with lib; {
description = "Console-based Audio Visualizer for Alsa";
homepage = "https://github.com/karlstav/cava";

4
pkgs/applications/networking/cluster/odo/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "odo";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitHub {
owner = "redhat-developer";
repo = "odo";
rev = "v${version}";
sha256 = "sha256-CtlT6nUh0oqjJSWaIqAgu9CNGVHcf+uLNWBCl950Kus=";
sha256 = "sha256-+QLRm01JTV7nnMiIvitdkm38E08TsmU6EfrNTUCTddY=";
};
vendorSha256 = null;

20
pkgs/applications/science/electronics/kicad/versions.nix
View file

@ -3,22 +3,22 @@
{
"kicad" = {
kicadVersion = {
version = "6.0.8";
version = "6.0.9";
src = {
rev = "f2edbf62ab6eb123d605d06cffedadc424fed55b";
sha256 = "0f5iriahskzflgfzahbjihiff7m7nbdmp3ip8dx69xa28b9012w9";
rev = "8da3e8f7071484853b31c61cbd5045903b5c6dd3";
sha256 = "1fr02jcy09v14d3k8ril0zhwnzhcqcf77wfj5b3bkrh6r8xraqhs";
};
};
libVersion = {
version = "6.0.8";
version = "6.0.9";
libSources = {
symbols.rev = "64a2f338f3f994975edfd33bc04f92fd6b9ed1c3";
symbols.sha256 = "1nxz8r3h3j62fs3s77lj27333fsj5c4i01n05lv0gqx36h28hqxk";
templates.rev = "549275966dd4f01ce656cec2b46599d1b7a3ca62";
symbols.rev = "0d9559dfddd51110e5c5223901ada2445285ce80";
symbols.sha256 = "0y5mjjmmln37hkp9wmydinlfgrn8im8rn20145g9xgdpj8j38d48";
templates.rev = "ae2b46f8756d79379b90fec01d4fdde1ccfd73c1";
templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v";
footprints.rev = "8eedad538f5b8234d3889ad08a3f272832b724b1";
footprints.sha256 = "19di37hi80rzlwd468w3b6bq5kzxbslp3daskv8xb4y4f7pk3n00";
packages3d.rev = "471e36d23c2d4f9971a591e2ab6ce717709438f9";
footprints.rev = "6705da57c29e9896556c7cdbe719ede3f96e9121";
footprints.sha256 = "02j445i0kcf87fhj9y6pwfcwq3arppxbrv77lbizm8kcpkpcfldl";
packages3d.rev = "45df600c5e3dd5113d62e6445115e7c37bdf362f";
packages3d.sha256 = "0cnrg7mr3khpglviid1adk2ihs1qwj0r7l32z2vqsl8aidzbg9kr";
};
};

2
pkgs/applications/science/electronics/ngspice/default.nix
View file

@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
homepage = "http://ngspice.sourceforge.net";
license = with licenses; [ "BSD" gpl2 ];
maintainers = with maintainers; [ bgamari rongcuid ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

28
pkgs/applications/science/math/cemu/default.nix → pkgs/applications/science/math/cemu-ti/default.nix
View file

@ -1,55 +1,43 @@
{ fetchFromGitHub
{ stdenv
, lib
, SDL2
, libGL
, libarchive
, libusb-compat-0_1
, qtbase
, fetchFromGitHub
, qmake
, git
, libpng
, pkg-config
, wrapQtAppsHook
, stdenv
, libarchive
, libpng
}:
stdenv.mkDerivation rec {
pname = "CEmu";
version = "1.3";
version = "unstable-2022-06-29";
src = fetchFromGitHub {
owner = "CE-Programming";
repo = "CEmu";
rev = "v${version}";
sha256 = "1wcdnzcqscawj6jfdj5wwmw9g9vsd6a1rx0rrramakxzf8b7g47r";
rev = "880d391ba9f8b7b2ec36ab9b45a34e9ecbf744e9";
hash = "sha256-aFwGZJceh1jEP8cEajY5wYlSaFuNhYvSoZ/E1QDfJEI=";
fetchSubmodules = true;
};
nativeBuildInputs = [
qmake
git
wrapQtAppsHook
pkg-config
];
buildInputs = [
SDL2
libGL
libarchive
libusb-compat-0_1
qtbase
libpng
];
qmakeFlags = [
"gui/qt"
"CONFIG+=ltcg"
];
meta = with lib; {
changelog = "https://github.com/CE-Programming/CEmu/releases/tag/v${version}";
description = "Third-party TI-84 Plus CE / TI-83 Premium CE emulator, focused on developer features";
homepage = "https://ce-programming.github.io/CEmu";
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ luc65r ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
broken = stdenv.isDarwin;

53
pkgs/data/fonts/maple-font/default.nix Normal file
View file

@ -0,0 +1,53 @@
{ lib
, stdenv
, unzip
, fetchurl
}:
let
maple-font = { pname, version, sha256, desc }: stdenv.mkDerivation
rec{
inherit pname version desc;
src = fetchurl {
url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip";
inherit sha256;
};
# 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 = [ unzip ];
installPhase = ''
find . -name '*.ttf' -exec install -Dt $out/share/fonts/truetype {} \;
'';
meta = with lib; {
homepage = "https://github.com/subframe7536/Maple-font";
description = ''
Open source ${desc} font with round corner and ligatures for IDE and command line
'';
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ oluceps ];
};
};
in
{
Mono-v5 = maple-font {
pname = "MapleMono";
version = "5.5";
sha256 = "sha256-xkZ9NefjWHPjWNW8LGM8CgT2Zrg4j1evvx1K56sUzR8=";
desc = "monospace";
};
Mono-NF-v5 = maple-font {
pname = "MapleMono-NF";
version = "5.5";
sha256 = "sha256-cPVGuH1CSfnRvQ4ehBvOVno7CT6Popc1Nnpcn5uJoQY=";
desc = "Nerd Font";
};
}

30
pkgs/data/fonts/monocraft/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "monocraft";
version = "1.2";
src = fetchFromGitHub {
owner = "IdreesInc";
repo = "Monocraft";
rev = "v${version}";
sha256 = "sha256-frg7LcMv6zWPWxkr6RIl01fC68THELbb45mJVqefXC0=";
};
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
install -Dm644 -t $out/share/fonts/opentype *.otf
runHook postInstall
'';
meta = with lib; {
description = "A programming font based on the typeface used in Minecraft";
homepage = "https://github.com/IdreesInc/Monocraft";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ zhaofengli ];
};
}

7
pkgs/development/libraries/libff/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config }:
{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config
, enableStatic ? stdenv.hostPlatform.isStatic }:
stdenv.mkDerivation rec {
pname = "libff";
@ -15,9 +16,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DWITH_PROCPS=Off" ]
++ lib.optionals stdenv.isAarch64 [ "-DCURVE=ALT_BN128" "-DUSE_ASM=OFF" ];
# CMake is hardcoded to always build static library which causes linker
# failure for Haskell applications depending on haskellPackages.hevm on macOS.
postPatch = lib.optionalString stdenv.isDarwin ''
postPatch = lib.optionalString (!enableStatic) ''
substituteInPlace libff/CMakeLists.txt --replace "STATIC" "SHARED"
'';

4
pkgs/development/libraries/rapidfuzz-cpp/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "rapidfuzz-cpp";
version = "1.3.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "maxbachmann";
repo = "rapidfuzz-cpp";
rev = "v${version}";
hash = "sha256-LhMubYSq5EO4Pup+mVPQpcXwur/bPz+NZ1CcyqDt6lM=";
hash = "sha256-HhVkOPZ9LGoF5HSs0tOiZyUQWBwrfDTKJMc8WwGOdq8=";
};
patches = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "levenshtein";
version = "0.20.3";
version = "0.20.8";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "Levenshtein";
rev = "refs/tags/v${version}";
hash = "sha256-oPG7qAzsUPKfLxjriS4/1fFjRu+FkceP87h2vC0OTBE=";
hash = "sha256-McTgQa4c+z+ABlm+tOgVf82meXZ1vWlzYCREnkxIfv0=";
};
nativeBuildInputs = [

8
pkgs/development/python-modules/rapidfuzz/default.nix
View file

@ -5,7 +5,6 @@
, cmake
, cython_3
, ninja
, rapidfuzz-capi
, scikit-build
, setuptools
, jarowinkler
@ -20,9 +19,9 @@
buildPythonPackage rec {
pname = "rapidfuzz";
version = "2.6.0";
version = "2.13.0";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
format = "pyproject";
@ -30,14 +29,13 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "RapidFuzz";
rev = "refs/tags/v${version}";
hash = "sha256-EplQodBTdZCqhM+6nCovpnqDJ6zvu+jG5muVMLIxdKI=";
hash = "sha256-IeH4Lk0WAQhZFBRuQobC8qOCZPJJiK5U09VYWOK9MOY=";
};
nativeBuildInputs = [
cmake
cython_3
ninja
rapidfuzz-capi
scikit-build
setuptools
];

4
pkgs/development/tools/misc/ccache/default.nix
View file

@ -15,13 +15,13 @@
let ccache = stdenv.mkDerivation rec {
pname = "ccache";
version = "4.7.1";
version = "4.7.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-k19Rbc7IPZemT6k5uTRXpoIV1n57aRSXQC276Xdc2EM=";
sha256 = "sha256-djqqXw6SSxH0ki1905hvRrCa1vYKDRFIsCvZ2vat/CM=";
};
outputs = [ "out" "man" ];

4
pkgs/servers/http/tengine/default.nix
View file

@ -10,14 +10,14 @@
with lib;
stdenv.mkDerivation rec {
version = "2.3.3";
version = "2.3.4";
pname = "tengine";
src = fetchFromGitHub {
owner = "alibaba";
repo = pname;
rev = version;
sha256 = "0p43qsldwhx4zfwp585x8kps0akrf7b0gxdgf0sh0yqcp7l28gmx";
sha256 = "sha256-0xue5XDvK9U64+rka8GRNv2lX62zcrYA1Tz7DrsA0ts=";
};
buildInputs =

4
pkgs/servers/komga/default.nix
View file

@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation rec {
pname = "komga";
version = "0.157.2";
version = "0.157.3";
src = fetchurl {
url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar";
sha256 = "sha256-RN8EoCy/adcb9gwtjSIbQEi27OZJw4KlNAu76kGJrM8=";
sha256 = "sha256-AsIo/mQx4lUjrJGurJ40Wy1QhBKiYcuzX9PvyM7bfRg=";
};
nativeBuildInputs = [

6
pkgs/tools/misc/opentelemetry-collector/contrib.nix
View file

@ -6,17 +6,17 @@
buildGoModule rec {
pname = "opentelemetry-collector-contrib";
version = "0.62.0";
version = "0.63.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector-contrib";
rev = "v${version}";
sha256 = "sha256-pNpCh2oe8hptXlDJsrfJOae8s6K4101lUFXFpXMdEmY=";
sha256 = "sha256-oZGh80zer2VHGoypcIJ/WZ+DMe349/qRrmlx6UJlZVI=";
};
# proxy vendor to avoid hash missmatches between linux and macOS
proxyVendor = true;
vendorSha256 = "sha256-sNJOPHGyppdoqYeiBL9LdC5UWHw50CWWp3FS9JlIM+4=";
vendorSha256 = "sha256-zd6ll30nROV9ORJhyRPPSRqzpw7MJN3xryDSUg8XxPY=";
subPackages = [ "cmd/otelcontribcol" ];

6
pkgs/tools/misc/opentelemetry-collector/default.nix
View file

@ -12,17 +12,17 @@ let
in
buildGoModule rec {
pname = "opentelemetry-collector";
version = "0.62.1";
version = "0.63.1";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector";
rev = "v${version}";
sha256 = "sha256-X0ltNJQEmw7Ifp1DB4Gp1PkdR1tdPzDU4skfxp5Q3ak=";
sha256 = "sha256-YeW9A338HZHdW4PQaxUwdAPXwY9kijcFEGos/4NdZek=";
};
# there is a nested go.mod
sourceRoot = "source/cmd/otelcorecol";
vendorSha256 = "sha256-E/OB4n3R8B8pOpPVmGU4nzBRIeweNboTq6TBjfCgGQQ=";
vendorSha256 = "sha256-U3RPRuDdXXoeAQY3RYToply7VhePnlq9hn/79KCrum4=";
preBuild = ''
# set the build version, can't be done via ldflags

6
pkgs/tools/misc/xq/default.nix
View file

@ -6,14 +6,14 @@
rustPlatform.buildRustPackage rec {
pname = "xq";
version = "0.2.39";
version = "0.2.40";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-eyQ38Ld/sVI5vvQRohGfu+cXNtS3nTOBwxiO9BqjxhM=";
sha256 = "sha256-sOCdNQ+prQRdj3Oeaa4HLhufbwtClUzzhnMDwSU4SJE=";
};
cargoSha256 = "sha256-LajK6OaH6uwnwXvOSJCY/oTtAd2+mcFTWghxC5mVAjQ=";
cargoSha256 = "sha256-b41D/sg+qD/SbwQvEqv3sFWuW15VQ4gEiL51I7/hOmI=";
meta = with lib; {
description = "Pure rust implementation of jq";

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

@ -4483,6 +4483,9 @@ with pkgs;
mapcidr = callPackage ../tools/misc/mapcidr { };
maple-mono = (callPackage ../data/fonts/maple-font { }).Mono-v5;
maple-mono-NF = (callPackage ../data/fonts/maple-font { }).Mono-NF-v5;
marl = callPackage ../development/libraries/marl {};
marlin-calc = callPackage ../tools/misc/marlin-calc {};
@ -5212,9 +5215,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
};
cemu = qt5.callPackage ../applications/science/math/cemu {
stdenv = gcc9Stdenv;
};
cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { };
cider = callPackage ../applications/audio/cider { };
@ -9310,6 +9311,8 @@ with pkgs;
monit = callPackage ../tools/system/monit { };
monocraft = callPackage ../data/fonts/monocraft { };
monolith = callPackage ../tools/backup/monolith {
inherit (darwin.apple_sdk.frameworks) Security;
};