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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-03-12 12:01:31 +00:00 committed by GitHub
commit 9d8f144878
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 1690 additions and 1612 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/blockchains/polkadot/default.nix
View File

@ -12,13 +12,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "0.9.39";
version = "0.9.39-1";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
hash = "sha256-ewjab9BtItJWtadEZO1PH5+2fOAafNof+2uVm8e78V4=";
hash = "sha256-Hr3VFqfoBW7VGc7FXLxeCtZDLRMM+jITgR8LGA5uEP8=";
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
'';
};
cargoHash = "sha256-KqdUh+ES9UB01yrmNVXdiyYZPh9pjJOEjcuwlJr6Jxc=";
cargoHash = "sha256-gLU/3wHiSpOA7oQwmy7v5s3PiAtElJv4EwLqdOyKhds=";
buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

6
pkgs/data/fonts/openmoji/default.nix
View File

@ -63,6 +63,12 @@ in stdenv.mkDerivation rec {
nodePackages.lodash
];
postPatch = ''
# this is API change in glob >9
substituteInPlace helpers/generate-font-glyphs.js \
--replace "require('glob').sync" "require('glob').globSync"
'';
buildPhase = ''
runHook preBuild

6
pkgs/desktops/deepin/apps/deepin-compressor/default.nix
View File

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "deepin-compressor";
version = "5.12.9";
version = "5.12.14";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-HJDtUvXUT94G4WqrK92UMmijnuC4ApkKHU3yE3rOKHQ=";
sha256 = "sha256-0F1LdoeGtIKOVepifwdNMohbEb9fakpQLiNHg5H9Nlw=";
};
postPatch = ''
@ -58,6 +58,8 @@ stdenv.mkDerivation rec {
"-DUSE_TEST=OFF"
];
strictDeps = true;
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
qtWrapperArgs = [
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"

15
pkgs/desktops/deepin/apps/deepin-draw/default.nix
View File

@ -2,25 +2,26 @@
, lib
, fetchFromGitHub
, fetchpatch
, dtkwidget
, qt5integration
, qt5platform-plugins
, cmake
, qttools
, pkg-config
, wrapQtAppsHook
, qtbase
, qtsvg
, dtkwidget
, qt5integration
, qt5platform-plugins
}:
stdenv.mkDerivation rec {
pname = "deepin-draw";
version = "5.11.4";
version = "5.11.7";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-49RQQ52HR5aqzeVEjGm9vQpTOxhY7I0X724x/Bboo90=";
sha256 = "sha256-oryh1b7/78Hp3JclN9vKvfcKRg58nsfGZQvBx6VyJBs";
};
patches = [
@ -44,12 +45,16 @@ stdenv.mkDerivation rec {
];
buildInputs = [
qtbase
qtsvg
dtkwidget
qt5platform-plugins
];
cmakeFlags = [ "-DVERSION=${version}" ];
strictDeps = true;
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
qtWrapperArgs = [
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"

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

@ -20,7 +20,7 @@
# Can also use cuFFT
stdenv.mkDerivation (finalAttrs: {
pname = "hipfft";
version = "5.4.2";
version = "5.4.3";
outputs = [
"out"

4
pkgs/development/libraries/nss/latest.nix
View File

@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.88.1";
hash = "sha256-J9JD7fh9HPG7nIYfA9OH4OkjDOUBf0MIyUH1WLVLNJY=";
version = "3.89";
hash = "sha256-VcN6P02gENBXT7izkmTLHntM6ebClUwcfs+fQe4AvtU=";
}

4
pkgs/development/libraries/ogre/default.nix
View File

@ -36,13 +36,13 @@
stdenv.mkDerivation rec {
pname = "ogre";
version = "13.6.2";
version = "13.6.3";
src = fetchFromGitHub {
owner = "OGRECave";
repo = "ogre";
rev = "v${version}";
hash = "sha256-4Jmhseg1+4g0b8Pa8A4YL+ixYMe/HxzXrDaXUfElh+k=";
hash = "sha256-+A+GpS6kZREczX0oOETAQJ+smiFVAEzPMIskU/Vh/9U=";
};
nativeBuildInputs = [

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

@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "openai";
version = "0.27.0";
version = "0.27.1";
format = "setuptools";
disabled = pythonOlder "3.7.1";
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "openai";
repo = "openai-python";
rev = "refs/tags/v${version}";
hash = "sha256-pXttGvnApYuwkWU7kCDNjw0rjHD5AyUvujfvpDVjgxM=";
hash = "sha256-GGwRx5yF/xdtnJiKF1junxuebaaBkGhx+DR4pqChcS4=";
};
propagatedBuildInputs = [

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

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "bacon";
version = "2.6.2";
version = "2.6.3";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-aCdVu9R1RGju05lAeXtm47ZroNOcqTSr/vYH6capcjs=";
hash = "sha256-EmkPH0TjLa9ouRjgv0IEyhqx5VaHR2TUQdqznKIKZdY=";
};
cargoHash = "sha256-uiKKyIy2IHDtHWJmG3G9UVHaASL9uEg5Zu+2Wj8mw0k=";
cargoHash = "sha256-vEged6GfcdcibCm4JX4/GIo1qbVtT+jX721+iLKOQsc=";
buildInputs = lib.optional stdenv.isDarwin [
CoreServices

2
pkgs/development/tools/cpm-cmake/default.nix
View File

@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
simple API and more.
'';
license = licenses.mit;
maintainers = with maintainers; [ ken-matsui ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
})

4
pkgs/servers/imgproxy/default.nix
View File

@ -3,12 +3,12 @@
buildGoModule rec {
pname = "imgproxy";
version = "3.13.2";
version = "3.14.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
sha256 = "sha256-0VB2nXVUtnAqM+cblYaulHFMv6dmztqiBwAxW/Ui1hs=";
sha256 = "sha256-12yThmRsRW0RLNAgafZaciqJP5sRonyrkVSUf+LM7J0=";
rev = "v${version}";
};

6
pkgs/servers/monitoring/sensu-go/default.nix
View File

@ -4,19 +4,19 @@ let
generic = { subPackages, pname, postInstall ? "", mainProgram }:
buildGoModule rec {
inherit pname;
version = "6.9.1";
version = "6.9.2";
shortRev = "3a1ac58"; # for internal version info
src = fetchFromGitHub {
owner = "sensu";
repo = "sensu-go";
rev = "v${version}";
sha256 = "sha256-vw5A5Cg4envrDfLsdauSONgd6rPZSu5wPiPOoNIcS9w=";
sha256 = "sha256-Xd15fkoSmQXbkyEMsBvc8ewLvn+wlsZoclfDjarp1FQ=";
};
inherit subPackages postInstall;
vendorSha256 = "sha256-zrwTdMlDfG1RudOfV52qOP9NMU3/XYb5TND6xyglJ0I=";
vendorHash = "sha256-zrwTdMlDfG1RudOfV52qOP9NMU3/XYb5TND6xyglJ0I=";
doCheck = false;

6
pkgs/tools/admin/meshcentral/default.nix
View File

@ -1,11 +1,11 @@
{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs-16_x, jq, dos2unix }:
yarn2nix-moretea.mkYarnPackage {
version = "1.1.2";
version = "1.1.4";
src = fetchzip {
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.2.tgz";
sha256 = "0fhmvh10wlf17fwxdclra06z1bq5bg6n53smzwni1v1h4967hhk3";
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.4.tgz";
sha256 = "1q13d01ar3nhg3v7w22byn02sga5qkzxbjzpzp30qrvb3gx8prmp";
};
patches = [ ./fix-js-include-paths.patch ];

8
pkgs/tools/admin/meshcentral/package.json
View File

@ -1,6 +1,6 @@
{
"name": "meshcentral",
"version": "1.1.2",
"version": "1.1.4",
"keywords": [
"Remote Device Management",
"Remote Device Monitoring",
@ -41,7 +41,7 @@
"body-parser": "^1.19.0",
"cbor": "~5.2.0",
"compression": "^1.7.4",
"cookie-session": "^1.4.0",
"cookie-session": "^2.0.0",
"express": "^4.17.0",
"express-handlebars": "^5.3.5",
"express-ws": "^4.0.0",
@ -85,7 +85,7 @@
"express-ws": "4.0.0",
"compression": "*",
"body-parser": "*",
"cookie-session": "1.4.0",
"cookie-session": "2.0.0",
"express-handlebars": "*",
"node-windows": "0.1.4",
"loadavg-windows": "*",
@ -98,7 +98,7 @@
"aedes": "0.39.0",
"mysql": "*",
"@mysql/xdevapi": "*",
"mongodb": "4.12.1",
"mongodb": "4.13.0",
"saslprep": "*",
"pg": "8.7.1",
"pgtools": "0.3.2",

1860
pkgs/tools/admin/meshcentral/yarn.lock
View File

File diff suppressed because it is too large Load Diff

1344
pkgs/tools/admin/meshcentral/yarn.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/tools/networking/mubeng/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "mubeng";
version = "0.13.2";
version = "0.14.0";
src = fetchFromGitHub {
owner = "kitabisa";
repo = pname;
rev = "v${version}";
hash = "sha256-EIglOoHL1ZmkFUn2MTU+ISQmaX96kCxelwk5ylHlMHk=";
hash = "sha256-Z1MwI76jOJft68+/yX4QEO7zYkUyQY7+DdZlejtNA8k=";
};
vendorHash = "sha256-1RJAmz3Tw6c2Y7lXlXvq/aEkVLO+smkwuNJbi7aBUNo=";

15
pkgs/tools/security/rbw/default.nix
View File

@ -1,13 +1,11 @@
{ lib
, stdenv
, rustPlatform
, fetchCrate
, fetchzip
, openssl
, pkg-config
, makeWrapper
, installShellFiles
, Security
, libiconv
# rbw-fzf
, withFzf ? false
@ -26,15 +24,14 @@
rustPlatform.buildRustPackage rec {
pname = "rbw";
version = "1.5.0";
version = "1.6.0";
src = fetchCrate {
inherit version;
crateName = pname;
sha256 = "sha256-3kSBE2D+kC9CTbWlCKPro9fLu2tnd6LFTV4EshHMm3Y=";
src = fetchzip {
url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz";
sha256 = "sha256-f8ckTYfmwHt3g3n/D2U275G1nn7uG+2W+DIi6YmsvjQ=";
};
cargoSha256 = "sha256-DL3qaUZxWnzsJOxi8+GtXBbZC7vfsridJWqhOTdcsgM=";
cargoHash = "sha256-EVEl1hhaeYBXIMQTgl0tDIbhE3cUm8jiyDTeWtsNaq0=";
nativeBuildInputs = [
installShellFiles