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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-02-20 00:03:04 +00:00 committed by GitHub
commit 539195e509
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
64 changed files with 416 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/virtualisation/nixos-containers.nix
View File

@ -514,6 +514,7 @@ in
};
in [ extraConfig ] ++ (map (x: x.value) defs);
prefix = [ "containers" name ];
inherit (config) specialArgs;
}).config;
};
};
@ -555,6 +556,16 @@ in
'';
};
specialArgs = mkOption {
type = types.attrsOf types.unspecified;
default = {};
description = lib.mdDoc ''
A set of special arguments to be passed to NixOS modules.
This will be merged into the `specialArgs` used to evaluate
the NixOS configurations.
'';
};
ephemeral = mkOption {
type = types.bool;
default = false;

4
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -1,6 +1,6 @@
{ newScope, config, stdenv, fetchurl, makeWrapper
, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit
, glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit
, libva, pipewire, wayland
, gcc, nspr, nss, runCommand
, lib, libkrb5
@ -178,7 +178,7 @@ in stdenv.mkDerivation {
buildCommand = let
browserBinary = "${chromiumWV}/libexec/chromium/chromium";
libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 libkrb5 ];
libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 gtk4 libkrb5 ];
in with lib; ''
mkdir -p "$out/bin"

12
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -32,15 +32,15 @@
}
},
"dev": {
"version": "112.0.5582.0",
"sha256": "139g5cpqxvh6bf2x3aqs4md379rwrx143f8lcsym8hgpqdwq5sfk",
"sha256bin64": "1npksnnxcni62wx517xy64ysk3ja868gw48vgx4q8xc93g15n89c",
"version": "112.0.5596.2",
"sha256": "03s6phrqv3a6vdkig9npkvnpgc8hcfb6fqgxlmlcmhrf9cszvycg",
"sha256bin64": "1an3gmxcfkzfx30ympli8r7p3xp93i8zmvrayvgddvb8xszrbc3c",
"deps": {
"gn": {
"version": "2023-01-30",
"version": "2023-02-07",
"url": "https://gn.googlesource.com/gn",
"rev": "84c8431f3e03cc6226c59dd49637c15ea31169a1",
"sha256": "15dqiy1bf1cixqg23bqpfb8mrlcxqbarjwzajc5hjmivykrjn2s3"
"rev": "edf6ef4b06b42c58292faea78498aff76bdf68ed",
"sha256": "1l3wz5rxg6q4923gxwx7hrrbx8123i7iniw8ihajp7v4qz27xbcp"
}
}
},

6
pkgs/applications/networking/cluster/linkerd/edge.nix
View File

@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "edge";
version = "23.2.1";
sha256 = "0qjl6qxfg6bj22fwm2y01if5dqp2w79y45ibrg46r33pf6gbwjxj";
vendorSha256 = "sha256-YxWBjbE3aBFfCbQeSTfQv5QzP5n4IRHHqNrFwrJPQ7g=";
version = "23.2.2";
sha256 = "1ylimwxp5b7dp14kjl5jimpjiqh5vh83cfah226kxndb6k64i7h8";
vendorSha256 = "sha256-UWzWBZBzoq4Mzqk3ukvGAcXqiSeJV/V3K2V1GOA9vwc=";
}

6
pkgs/applications/networking/cluster/temporal/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "temporal";
version = "1.19.1";
version = "1.20.0";
src = fetchFromGitHub {
owner = "temporalio";
repo = "temporal";
rev = "v${version}";
hash = "sha256-j2+K/ZDDNakofrToxhyA1gh534l3Eq6G/fNXE0ktceY=";
hash = "sha256-YZzGAOPCljTMmyt1t0gjbgn+IelntCo/275+SjOJiJE=";
};
vendorHash = "sha256-KkgyL37VJy1DhfCB5RJpjczBPbzQwt1xsovQ0xCXGr4=";
vendorHash = "sha256-UMqkgQsnOxFcXgbm+oi3JGjqmbwaKEh6s5bzivGVAM8=";
excludedPackages = [ "./build" ];

4
pkgs/applications/office/qownnotes/default.nix
View File

@ -17,14 +17,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "23.2.0";
version = "23.2.4";
in
stdenv.mkDerivation {
inherit pname appname version;
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
sha256 = "sha256-S5m78E1wrWBu/bMmNUmv/ZprebyYPC9NDfINU2C/i8w=";
sha256 = "sha256-ZliVhnO9fK/6k4Ga86ZSmhzQ3YKziAab19oZs9Pteic=";
};
nativeBuildInputs = [

6
pkgs/applications/version-management/gitmux/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gitmux";
version = "0.7.12";
version = "0.9.0";
src = fetchFromGitHub {
owner = "arl";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JPrXq4+53cem0TVnm1/AJz/mYcEKaYzqhptJU4V2U0o=";
sha256 = "sha256-Q0V4nUW/oL7YP7/UEcITLls6uCz5OKqqZymJ9eXHGac=";
};
vendorHash = "sha256-V6xe+19NiHYIIN4rgkyzdP4eGnRXo0aW4fVbdlIcvig=";
vendorHash = "sha256-talZSkf8lQXwXKdkQliHFv2K+42BFtcg13oB5Szkff0=";
# GitHub source does contain a regression test for the module
# but it requires networking as it git clones a repo from github

6
pkgs/applications/version-management/gitoxide/default.nix
View File

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitoxide";
version = "0.20.0";
version = "0.22.1";
src = fetchFromGitHub {
owner = "Byron";
repo = "gitoxide";
rev = "v${version}";
sha256 = "sha256-8+4AEX4NPflhAB1rZHaz0XPycoL5T3z20ZKlNRdUEdw=";
sha256 = "sha256-PetU/cUWFZWl1OoSObI7wwqJLexWPTP6ynNSyPXjvMc=";
};
cargoSha256 = "sha256-ybsrrJFH4xKcxRQCI+ypfp5biCrlIidAog01SFCx1ms=";
cargoHash = "sha256-A7gwC9EQ+5GVciGsL9uPbZ6nThPfku3ZNH8qQwfI0QQ=";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ curl ] ++ (if stdenv.isDarwin

4
pkgs/applications/video/hdhomerun-config-gui/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "hdhomerun-config-gui";
version = "20221031";
version = "20221205";
src = fetchurl {
url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${version}.tgz";
sha256 = "17zf0hzw68b0xdkh1maqhl96jb7171mbhd29y64as29nps9x4fmz";
sha256 = "sha256-vzrSk742Ca2I8Uk0uGo44SxpEoVY1QBn62Ahwz8E7p8=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/data/fonts/nanum/default.nix
View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "nanum";
version = "20170925";
version = "20200506";
src = fetchurl {
url = "mirror://ubuntu/pool/universe/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.xz";
hash = "sha256-GlVXH9YUU3wHMkNoz5miBv7N2oUEbwUXlcVoElQ9++4=";
hash = "sha256-FXgDdIGYFRJQo898sDrvhE5AjpyYhJ3YieGRhGqsrUs=";
};
installPhase = ''

4
pkgs/data/fonts/sarasa-gothic/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "sarasa-gothic";
version = "0.40.0";
version = "0.40.1";
src = fetchurl {
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
hash = "sha256-i8W1PLFPXR7ftRt51LmKZEqc22ms7RGFW9cKMUsMRhk=";
hash = "sha256-cpgFOhmFSyJA2yhGCCud9jF3LEboiRKyfb3NPiRzJdQ=";
};
sourceRoot = ".";

4
pkgs/data/fonts/spleen/default.nix
View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "spleen";
version = "1.9.1";
version = "1.9.2";
src = fetchurl {
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
hash = "sha256-fvWcTgKkXp3e1ryhi1Oc3w8OtJ5svLJXhY2lasXapiI=";
hash = "sha256-AOGgGJLye0Yg3QTlNZPgRdtRim8atn+ZIm8aPpUnivY=";
};
nativeBuildInputs = [ xorg.mkfontscale ];

4
pkgs/data/misc/spdx-license-list-data/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "spdx-license-list-data";
version = "3.19";
version = "3.20";
src = fetchFromGitHub {
owner = "spdx";
repo = "license-list-data";
rev = "v${version}";
hash = "sha256-qT9Q6Mntnt9lOhYmGFJlkDyAHQ0CGQpWr1rLF08FGeg=";
hash = "sha256-qMVUP1EpeeO+i5RfnAt/Idz+pR9dVyCT4Ss9lEJgj6k=";
};
# List of file formats to package.

0
pkgs/development/libraries/cyclondds/0001-Use-full-path-in-pkgconfig.patch → pkgs/development/libraries/cyclonedds/0001-Use-full-path-in-pkgconfig.patch
View File

2
pkgs/development/libraries/cyclondds/default.nix → pkgs/development/libraries/cyclonedds/default.nix
View File

@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
pname = "cyclondds";
pname = "cyclonedds";
version = "0.10.2";
src = fetchFromGitHub {

40
pkgs/development/libraries/duckdb/default.nix
View File

@ -7,7 +7,6 @@
, openssl
, openjdk11
, unixODBC
, withHttpFs ? true
, withJdbc ? false
, withOdbc ? false
}:
@ -17,35 +16,47 @@ let
in
stdenv.mkDerivation rec {
pname = "duckdb";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-no4fcukEpzKmh2i41sdXGDljGhEDkzk3rYBATqlq6Gw=";
sha256 = "sha256-9m9+fldOgv2QTuUbw5y0zekBxZe8Dd4+8FqR3t3uFGg=";
};
patches = [ ./version.patch ];
postPatch = ''
substituteInPlace CMakeLists.txt --subst-var-by DUCKDB_VERSION "v${version}"
substituteInPlace tools/shell/CMakeLists.txt \
--replace \
'install(TARGETS shell RUNTIME DESTINATION "''${PROJECT_BINARY_DIR}")' \
'install(TARGETS shell RUNTIME DESTINATION "''${INSTALL_BIN_DIR}")'
'';
nativeBuildInputs = [ cmake ninja ];
buildInputs = [ openssl ]
++ lib.optionals withJdbc [ openjdk11 ]
++ lib.optionals withOdbc [ unixODBC ];
cmakeFlags = [
"-DBUILD_EXCEL_EXTENSION=ON"
"-DBUILD_FTS_EXTENSION=ON"
"-DBUILD_HTTPFS_EXTENSION=${enableFeature withHttpFs}"
"-DBUILD_ICU_EXTENSION=ON"
"-DBUILD_JSON_EXTENSION=ON"
"-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}"
"-DBUILD_PARQUET_EXTENSION=ON"
"-DBUILD_TPCDS_EXTENSION=ON"
"-DBUILD_TPCE=ON"
"-DBUILD_TPCH_EXTENSION=ON"
"-DBUILD_TPCDS_EXTENSION=ON"
"-DBUILD_FTS_EXTENSION=ON"
"-DBUILD_HTTPFS_EXTENSION=ON"
"-DBUILD_VISUALIZER_EXTENSION=ON"
"-DBUILD_JSON_EXTENSION=ON"
"-DBUILD_JEMALLOC_EXTENSION=ON"
"-DBUILD_EXCEL_EXTENSION=ON"
"-DBUILD_INET_EXTENSION=ON"
"-DBUILD_TPCE=ON"
"-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}"
"-DJDBC_DRIVER=${enableFeature withJdbc}"
# development settings
"-DBUILD_UNITTESTS=ON"
];
doInstallCheck = true;
@ -69,6 +80,10 @@ stdenv.mkDerivation rec {
"test/sql/storage/compression/chimp/chimp_read_float.test"
"test/sql/storage/compression/patas/patas_compression_ratio.test_coverage"
"test/sql/storage/compression/patas/patas_read.test"
"test/sql/json/read_json_objects.test"
"test/sql/json/read_json.test"
"test/sql/copy/parquet/parquet_5968.test"
"test/fuzzer/pedro/buffer_manager_out_of_memory.test"
# these are only hidden if no filters are passed in
"[!hide]"
# this test apparently never terminates
@ -87,11 +102,6 @@ stdenv.mkDerivation rec {
runHook postInstallCheck
'';
nativeBuildInputs = [ cmake ninja ];
buildInputs = lib.optionals withHttpFs [ openssl ]
++ lib.optionals withJdbc [ openjdk11 ]
++ lib.optionals withOdbc [ unixODBC ];
meta = with lib; {
homepage = "https://github.com/duckdb/duckdb";
description = "Embeddable SQL OLAP Database Management System";

4
pkgs/development/libraries/example-robot-data/default.nix
View File

@ -8,14 +8,14 @@
stdenv.mkDerivation rec {
pname = "example-robot-data";
version = "4.0.4";
version = "4.0.5";
src = fetchFromGitHub {
owner = "Gepetto";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-5FqMRChv/YGeoZq/jLSEJI5iQazQIDwslT78fbERVfs=";
sha256 = "sha256-KE+wmYlgETt6RtyN/BMApgS075/WtuhY+rM7YFkBH0E=";
};
strictDeps = true;

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

@ -29,11 +29,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "imlib2";
version = "1.9.1";
version = "1.10.0";
src = fetchurl {
url = "mirror://sourceforge/enlightenment/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
hash = "sha256-SiJAOL//vl1NJQxE4F9O5a4k3P74OVsWd8cVxY92TUM=";
hash = "sha256-cnwak3yIXAgMNyF+R23Ii1o+YNc38b8ECzQ1ILeBy7o=";
};
buildInputs = [

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

@ -11,14 +11,14 @@
stdenv.mkDerivation rec {
pname = "pinocchio";
version = "2.6.16";
version = "2.6.17";
src = fetchFromGitHub {
owner = "stack-of-tasks";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-ihyLoElqpIhsZXPF3o4XgbkzeE/BYdz8+WhLLcpc6PE=";
hash = "sha256-P/2cwFMtVaxT+qt2RDa7qjUIFjDBJ7U6epRFahOKux4=";
};
# error: use of undeclared identifier '__sincos'

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

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "wangle";
version = "2023.01.30.00";
version = "2023.02.13.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "wangle";
rev = "v${version}";
sha256 = "sha256-pHBFX9zs1vHXveZw9HCieRuQldLrq5fwJXWzNyLx1Kg=";
sha256 = "sha256-Qt+wW9y16ESVBAU3BkdZc/ho1eZNLcCd/+NaUbnJjKU=";
};
nativeBuildInputs = [ cmake ];

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

@ -36,6 +36,10 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [
"aioruuvigateway"
];
meta = with lib; {
description = "An asyncio-native library for requesting data from a Ruuvi Gateway";
homepage = "https://github.com/akx/aioruuvigateway";
@ -43,5 +47,3 @@ buildPythonPackage rec {
maintainers = with maintainers; [ hexa ];
};
}

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "atlassian-python-api";
version = "3.32.2";
version = "3.33.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "atlassian-api";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-fI+c2JiChDZhZPdoy3PaRtUwgWMRJnZieHcF4OR6nZE=";
sha256 = "sha256-vn2bI6wyYAhCxkiL4oEpJFwFicJScvhMfwLD6g6pVw8=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "azure-mgmt-cosmosdb";
version = "8.0.0";
version = "9.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-/6ySVfCjr1YiiZIZJElrd1EfirV+TJvE/FvKs7UhoKo=";
hash = "sha256-7bP8klNIp2skhNKU8s51zaxQOG6pYMCK9wk6ce5pySA=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "azure-mgmt-servicebus";
version = "8.1.0";
version = "8.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
hash = "sha256-R8Narn7eC7j59tDjsgbk9lF0PcOgOwSnzoMp3Qu0rmg=";
hash = "sha256-i+kgjxQdmnifaNuNIZdU/3gGn9j5OQ6fdkS7laO+nsI=";
};
propagatedBuildInputs = [

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

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "biopython";
version = "1.80";
version = "1.81";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-UoBemviHZ+RQ4t+BE7W8Welk4uinu4A6g1cL27UcDkM=";
sha256 = "sha256-LPOBErbYQVrTnWphGYjNEftfM+sJNGZmqHJjvrqWFOA=";
};
disabled = !isPy3k;

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

@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "devito";
version = "4.7.1";
version = "4.8.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "devitocodes";
repo = "devito";
rev = "refs/tags/v${version}";
hash = "sha256-crKTxlueE8NGjAqu625iFvp35UK2U7+9kl8rpbzf0gs=";
hash = "sha256-Wuq49deZKhIHHhxgxgzxxY/3aQcJVCJ0ofGwDrUcHkY=";
};
postPatch = ''

11
pkgs/development/python-modules/duo-client/default.nix
View File

@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "duo-client";
version = "4.5.0";
version = "4.6.1";
src = fetchFromGitHub {
owner = "duosecurity";
repo = "duo_client_python";
rev = version;
sha256 = "sha256-9ADFtCrSJ4Y2QQY5YC/BMvoVZs2vaYHkhIM/rBlZm4I=";
rev = "refs/tags/${version}";
hash = "sha256-1xasV9iLbSODy8q1wEVDvELdmSQwj3qVCXOE94lyjFU=";
};
postPatch = ''
@ -38,11 +38,14 @@ buildPythonPackage rec {
pytz
];
pythonImportsCheck = [ "duo_client" ];
pythonImportsCheck = [
"duo_client"
];
meta = with lib; {
description = "Python library for interacting with the Duo Auth, Admin, and Accounts APIs";
homepage = "https://github.com/duosecurity/duo_client_python";
changelog = "https://github.com/duosecurity/duo_client_python/releases/tag/${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ SuperSandro2000 ];
};

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

@ -112,6 +112,10 @@ buildPythonPackage rec {
"--dist=loadgroup"
"-m"
"'${lib.concatStringsSep " or " testBackends} or core'"
# these will be fixed in ibis-framework 5.0.0
"--deselect=ibis/backends/tests/test_string.py::test_string"
"--deselect=ibis/backends/tests/test_register.py::test_csv_reregister_schema"
"--deselect=ibis/backends/tests/test_client.py::test_list_databases"
];
# remove when sqlalchemy backend no longer uses deprecated methods

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "motionblinds";
version = "0.6.16";
version = "0.6.17";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "motion-blinds";
rev = "refs/tags/${version}";
hash = "sha256-S+3aIeP63JklGbH2Gc0r8jeThJywQZnJo8alAsPvxhQ=";
hash = "sha256-rCPwOhhv1hDwJqs8g3JfXcSgvrLf6UhNm0JPtRGW5S0=";
};
propagatedBuildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "oci";
version = "2.91.0";
version = "2.92.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "oracle";
repo = "oci-python-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-sKz++PtqLjgBTf8Y/pYoa/wyuK3OoXOdGyjsbXX0iao=";
hash = "sha256-evxY/1MhSCZOTjhH/2tI5amnZpd+fCdSdFBD4W9uZ+c=";
};
propagatedBuildInputs = [

47
pkgs/development/python-modules/py3status/default.nix
View File

@ -1,40 +1,48 @@
{ lib
, buildPythonPackage
, acpi
, alsa-utils
, coreutils
, dbus-python
, fetchPypi
, requests
, pytz
, tzlocal
, file
, i3
, i3ipc
, libnotify
, lm_sensors
, procps
, pydbus
, pygobject3
, pyserial
, pytz
, requests
, setuptools
, dbus-python
, file
, acpi
, coreutils
, alsa-utils
, i3
, procps
, lm_sensors
, libnotify
, tzlocal
, xorg
}:
buildPythonPackage rec {
pname = "py3status";
version = "3.48";
version = "3.49";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-igt0niF52at/LERv4+1aVvdU+ZLVvgL2W+l6feuEAO0=";
hash = "sha256-aTQ3hYDMyXSTcEiCVtdU3XQ4xO7mN5dZ0S94ZWbSGo4=";
};
doCheck = false;
propagatedBuildInputs = [
pytz requests tzlocal i3ipc pydbus pygobject3 pyserial setuptools dbus-python file
pytz
requests
tzlocal
i3ipc
pydbus
pygobject3
pyserial
setuptools
dbus-python
file
];
prePatch = ''
sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py
sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py
@ -48,10 +56,13 @@ buildPythonPackage rec {
sed -i -e "s|'xset|'${xorg.xset}/bin/xset|" py3status/modules/keyboard_layout.py
'';
doCheck = false;
meta = with lib; {
description = "Extensible i3status wrapper";
license = licenses.bsd3;
homepage = "https://github.com/ultrabug/py3status";
changelog = "https://github.com/ultrabug/py3status/blob/${version}/CHANGELOG";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};
}

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

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "railroad-diagrams";
version = "2.0.4";
version = "3.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-dBP/oZRYO9UQ78PkZo9h1aOL7soYa7fDbuptDW8D+0U=";
hash = "sha256-qRMyuskAyzw2czH6m2mfCJe8+GtyZPZUWGdd9DDQTOM=";
};
# This is a dependency of pyparsing, which is a dependency of pytest

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "sybil";
version = "4.0.0";
version = "4.0.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "simplistix";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-9fXvQfVS3IVdOV4hbA0bEYFJU7uK0WpqJKMNBltqFTI=";
hash = "sha256-NvgmAFRuiBbyPnJykQlYNyQYALx1bFubMrakw671fDY=";
};
# Circular dependency with testfixtures

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

@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "types-pillow";
version = "9.4.0.12";
version = "9.4.0.13";
format = "setuptools";
src = fetchPypi {
inherit version;
pname = "types-Pillow";
sha256 = "sha256-4AdBSdXwbTWTwRisyD41P4VCvMc1dv/vtlaOqrVnE0g=";
sha256 = "sha256-RRCqmKKJR79j8rKe3rvRG3z/hkfZC4Z87Js2dMCowyE=";
};
# Modules doesn't have tests

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "webauthn";
version = "1.7.0";
version = "1.7.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "duo-labs";
repo = "py_webauthn";
rev = "refs/tags/v${version}";
hash = "sha256-iAEvWFxJGf4H2PEseG+ykt9sriGyNvbmj4+NZFcPGPk=";
hash = "sha256-B8GdtaufMMl0gHywZ00wNyYZ+rojrExKuQsA/vmbYRI=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/apksigcopier/default.nix
View File

@ -9,13 +9,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "apksigcopier";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "obfusk";
repo = "apksigcopier";
rev = "refs/tags/v${version}";
sha256 = "sha256-58NoYe26GsNE0jpSRt4sIkTJ2iR4VVnvthOfi7QFfN0=";
sha256 = "sha256-VuwSaoTv5qq1jKwgBTKd1y9RKUzz89n86Z4UBv7Q51o=";
};
nativeBuildInputs = [

6
pkgs/development/tools/rust/cargo-llvm-lines/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-llvm-lines";
version = "0.4.23";
version = "0.4.24";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "sha256-u3MvDiagCGD7WjagbVF+TtZ0ATe8WBT3xeyduxrXPi4=";
sha256 = "sha256-+jCjbx3CytE7wpVmErJjGFZS7E8VB8wjl7BAd9/USuY=";
};
cargoSha256 = "sha256-9oBnETZqJV35FEw6NImy6cqfVOVE5EHPNVGajE2UT10=";
cargoSha256 = "sha256-QC4+hXJiDB0odGm0/m0/JpQv5TyaAg4MmU/0vMJytk4=";
meta = with lib; {
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";

8
pkgs/games/anki/bin.nix
View File

@ -3,22 +3,22 @@
let
pname = "anki-bin";
# Update hashes for both Linux and Darwin!
version = "2.1.57";
version = "2.1.58";
sources = {
linux = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst";
sha256 = "sha256-W8EQxvdOQRYHVKoYGu+6LNAHJZGsVQgdvNsRXOBVUKM=";
sha256 = "sha256-9rlNShbdosCa60f4JlhC14dl3j2DxqFr3GgOOMWdXFY=";
};
# For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version
darwin-x86_64 = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg";
sha256 = "sha256-NhCMmXuZj+Il/hhZZhbk7eLsmbfnqYlSRgw33xIbv8M=";
sha256 = "sha256-Zp5C9r5uAfIg8szMtpCzWV3N7Em7iYN7WLO6DiEslWc=";
};
darwin-aarch64 = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg";
sha256 = "sha256-8gLtFoqJVvh1NfaSpNeH8+YecMln+A7UyqeSXWVEtmo=";
sha256 = "sha256-Ssg+SuCYBfaQ+XZP7hnZDD/k5dMduU5oj8H+gP+iPMY=";
};
};

3
pkgs/os-specific/linux/microcode/iucode-tool.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, autoreconfHook, fetchpatch }:
{ lib, stdenv, fetchFromGitLab, autoreconfHook, fetchpatch, argp-standalone }:
stdenv.mkDerivation rec {
pname = "iucode-tool";
@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = lib.optional stdenv.hostPlatform.isMusl argp-standalone;
enableParallelBuilding = true;

6
pkgs/servers/etcd/3.4.nix
View File

@ -2,9 +2,9 @@
buildGoModule rec {
pname = "etcd";
version = "3.4.23";
version = "3.4.24";
vendorSha256 = "sha256-kq9KYe4wnPbOLHra5DHZH1N3w2R+dNF7ouF2c26e/cU=";
vendorHash = "sha256-8fWiei7hZ4NO1CIMPQaRe4gyBF1CUjcqU5Eghyiy64w=";
doCheck = false;
@ -12,7 +12,7 @@ buildGoModule rec {
owner = "etcd-io";
repo = "etcd";
rev = "v${version}";
sha256 = "sha256-7HAA3MHDlsnTYDu5AmzpFfiWaarUGO09QHrPGLHolyM=";
sha256 = "sha256-jbMwSvCn9y4md60pWd7nF2Ck2XJDkYfg5olr1qVrPd4=";
};
buildPhase = ''

26
pkgs/servers/http/envoy/use-system-python.patch → pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch
View File

@ -1,5 +1,15 @@
From 329ad7cb56e66464e5570bbb51dea0fd56c4d9ae Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sun, 19 Feb 2023 17:40:50 +0000
Subject: [PATCH 1/2] nixpkgs: use system Python
---
bazel/python_dependencies.bzl | 4 ----
bazel/repositories_extra.bzl | 13 +------------
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl
index d9dfb14a9b..b8e92452a7 100644
index a5c3283d0a..1c2c31ebf2 100644
--- a/bazel/python_dependencies.bzl
+++ b/bazel/python_dependencies.bzl
@@ -1,10 +1,8 @@
@ -14,7 +24,7 @@ index d9dfb14a9b..b8e92452a7 100644
extra_pip_args = ["--require-hashes"],
)
@@ -12,14 +10,12 @@ def envoy_python_dependencies():
# These need to use `pip_install`
# TODO(phlax): switch to `pip_parse`
pip_install(
# Note: dev requirements do *not* check hashes
- python_interpreter_target = interpreter,
@ -22,17 +32,17 @@ index d9dfb14a9b..b8e92452a7 100644
requirements = "@envoy//tools/dev:requirements.txt",
)
pip_install(
pip_parse(
name = "fuzzing_pip3",
- python_interpreter_target = interpreter,
requirements = "@rules_fuzzing//fuzzing:requirements.txt",
requirements_lock = "@rules_fuzzing//fuzzing:requirements.txt",
extra_pip_args = ["--require-hashes"],
)
diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl
index 885b41dec6..ac5605eb30 100644
index 9d1b31c5d6..ac5605eb30 100644
--- a/bazel/repositories_extra.bzl
+++ b/bazel/repositories_extra.bzl
@@ -1,22 +1,12 @@
@@ -1,23 +1,12 @@
load("@emsdk//:deps.bzl", emsdk_deps = "deps")
-load("@rules_python//python:repositories.bzl", "python_register_toolchains")
load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime:crates.bzl", "wasmtime_fetch_remote_crates")
@ -53,6 +63,10 @@ index 885b41dec6..ac5605eb30 100644
- python_register_toolchains(
- name = "python%s" % ("_".join(python_version.split(".")[:-1])),
- python_version = python_version,
- ignore_root_user_error = True,
- )
-
aspect_bazel_lib_dependencies()
--
2.39.1

94
pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch Normal file
View File

@ -0,0 +1,94 @@
From 31d864a3b6a1a3455191e87ff680eb812f77dc3c Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sun, 19 Feb 2023 17:43:03 +0000
Subject: [PATCH 2/2] nixpkgs: use system Go
---
bazel/dependency_imports.bzl | 29 +----------------------------
bazel/repositories.bzl | 3 ---
bazel/repository_locations.bzl | 4 ++--
3 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
index 7dbdb0174e..e73662ed79 100644
--- a/bazel/dependency_imports.bzl
+++ b/bazel/dependency_imports.bzl
@@ -15,7 +15,7 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "register_jq_toolchains", "regis
load("@com_google_cel_cpp//bazel:deps.bzl", "parser_deps")
# go version for rules_go
-GO_VERSION = "1.18"
+GO_VERSION = "host"
JQ_VERSION = "1.6"
YQ_VERSION = "4.24.4"
@@ -25,7 +25,6 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y
rules_foreign_cc_dependencies(register_default_tools = False, register_built_tools = False)
go_rules_dependencies()
go_register_toolchains(go_version)
- envoy_download_go_sdks(go_version)
gazelle_dependencies(go_sdk = "go_sdk")
apple_rules_dependencies()
pip_dependencies()
@@ -134,29 +133,3 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y
# use_category = ["api"],
# source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.6.1/dependencies.bzl#L23-L28"
)
-
-def envoy_download_go_sdks(go_version):
- go_download_sdk(
- name = "go_linux_amd64",
- goos = "linux",
- goarch = "amd64",
- version = go_version,
- )
- go_download_sdk(
- name = "go_linux_arm64",
- goos = "linux",
- goarch = "arm64",
- version = go_version,
- )
- go_download_sdk(
- name = "go_darwin_amd64",
- goos = "darwin",
- goarch = "amd64",
- version = go_version,
- )
- go_download_sdk(
- name = "go_darwin_arm64",
- goos = "darwin",
- goarch = "arm64",
- version = go_version,
- )
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index fca05b6062..a2f60014cb 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -115,9 +115,6 @@ def _go_deps(skip_targets):
if "io_bazel_rules_go" not in skip_targets:
external_http_archive(
name = "io_bazel_rules_go",
- # TODO(wrowe, sunjayBhatia): remove when Windows RBE supports batch file invocation
- patch_args = ["-p1"],
- patches = ["@envoy//bazel:rules_go.patch"],
)
external_http_archive("bazel_gazelle")
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index e4e89d281a..fb62c4f8f3 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -878,8 +878,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "Go rules for Bazel",
project_desc = "Bazel rules for the Go language",
project_url = "https://github.com/bazelbuild/rules_go",
- version = "0.36.0",
- sha256 = "ae013bf35bd23234d1dea46b079f1e05ba74ac0321423830119d3e787ec73483",
+ version = "0.38.1",
+ sha256 = "dd926a88a564a9246713a9c00b35315f54cbd46b31a26d5d8fb264c07045f05d",
urls = ["https://github.com/bazelbuild/rules_go/releases/download/v{version}/rules_go-v{version}.zip"],
use_category = ["build", "api"],
release_date = "2022-11-23",
--
2.39.1

15
pkgs/servers/http/envoy/bump-brotli.patch
View File

@ -1,15 +0,0 @@
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index 454c54b0ef..2ac0623cf0 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -510,8 +510,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_url = "https://brotli.org",
# Use the dev branch of brotli to resolve compilation issues.
# TODO(rojkov): Remove when brotli > 1.0.9 is released.
- version = "0cd2e3926e95e7e2930f57ae3f4885508d462a25",
- sha256 = "93810780e60304b51f2c9645fe313a6e4640711063ed0b860cfa60999dd256c5",
+ version = "27dd7265403d8e8fed99a854b9c3e1db7d79525f",
+ sha256 = "e71238b12e30233bdf25997132b29ae49639a69f33fdef3ae18a47abfc0d5e4c",
strip_prefix = "brotli-{version}",
urls = ["https://github.com/google/brotli/archive/{version}.tar.gz"],
use_category = ["dataplane_ext"],

29
pkgs/servers/http/envoy/default.nix
View File

@ -24,8 +24,8 @@ let
# However, the version string is more useful for end-users.
# These are contained in a attrset of their own to make it obvious that
# people should update both.
version = "1.23.3";
rev = "4801f5881893857fbc53a4061f0b20ef4ca91a5b";
version = "1.25.1";
rev = "bae2e9d642a6a8ae6c5d3810f77f3e888f0d97da";
};
in
buildBazelPackage rec {
@ -36,13 +36,12 @@ buildBazelPackage rec {
owner = "envoyproxy";
repo = "envoy";
inherit (srcVer) rev;
sha256 = "sha256-akAuFk+jESWWvLRCDQ0XDT1Eplutfj5uacAFQp714vM=";
sha256 = "sha256-qA3+bta2vXGtAYX3mg+CmSIEitk4576JQB/QLPsj9Vc=";
postFetch = ''
chmod -R +w $out
rm $out/.bazelversion
echo ${srcVer.rev} > $out/SOURCE_VERSION
sed -i 's/GO_VERSION = ".*"/GO_VERSION = "host"/g' $out/bazel/dependency_imports.bzl
'';
};
@ -51,20 +50,15 @@ buildBazelPackage rec {
sed -i '/javabase=/d' .bazelrc
sed -i '/"-Werror"/d' bazel/envoy_internal.bzl
# Use system Python.
sed -i -e '/python_interpreter_target =/d' -e '/@python3_10/d' bazel/python_dependencies.bzl
cp ${./protobuf.patch} bazel/protobuf.patch
'';
patches = [
# fix issues with brotli and GCC 11.2.0+ (-Werror=vla-parameter)
./bump-brotli.patch
# fix linux-aarch64 WAMR builds
# (upstream WAMR only detects aarch64 on Darwin, not Linux)
./fix-aarch64-wamr.patch
# use system Python, not bazel-fetched binary Python
./use-system-python.patch
./0001-nixpkgs-use-system-Python.patch
# use system Go, not bazel-fetched binary Go
./0002-nixpkgs-use-system-Go.patch
];
nativeBuildInputs = [
@ -81,10 +75,13 @@ buildBazelPackage rec {
linuxHeaders
];
# external/com_github_grpc_grpc/src/core/ext/transport/binder/transport/binder_transport.cc:756:29: error: format not a string literal and no format arguments [-Werror=format-security]
hardeningDisable = [ "format" ];
fetchAttrs = {
sha256 = {
x86_64-linux = "sha256-UXTh5sCN7PJxNbTaG47YnW7aQBBtu101UjfsWU1CtBw=";
aarch64-linux = "sha256-uynV2/RWBybR2bjErDjcfoacv5vsI4GJ3SL4OF1kFOE=";
x86_64-linux = "sha256-H2s8sTbmKF+yRfSzLsZAT2ckFuunFwh/FMSKj+GYyPM=";
aarch64-linux = "sha256-R9jzy/dpdCcGgT9yq59Wo/IN/bVo6fxnVPGhLMZ9fbM=";
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
dontUseCmakeConfigure = true;
dontUseGnConfigure = true;

38
pkgs/servers/http/envoy/fix-aarch64-wamr.patch
View File

@ -1,38 +0,0 @@
diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl
index f48ebe7056..1e5cc5d663 100644
--- a/bazel/envoy_build_system.bzl
+++ b/bazel/envoy_build_system.bzl
@@ -102,6 +102,7 @@ def envoy_cmake(
pdb_name = "",
cmake_files_dir = "$BUILD_TMPDIR/CMakeFiles",
generate_crosstool_file = False,
+ generate_args = [],
**kwargs):
cache_entries.update({"CMAKE_BUILD_TYPE": "Bazel"})
cache_entries_debug = dict(cache_entries)
@@ -131,7 +132,7 @@ def envoy_cmake(
"@envoy//bazel:dbg_build": cache_entries_debug,
"//conditions:default": cache_entries,
}),
- generate_args = ["-GNinja"],
+ generate_args = ["-GNinja"] + generate_args,
targets = ["", "install"],
# TODO: Remove install target and make this work
install = False,
diff --git a/bazel/foreign_cc/BUILD b/bazel/foreign_cc/BUILD
index 4d3a281669..b4716dfe2e 100644
--- a/bazel/foreign_cc/BUILD
+++ b/bazel/foreign_cc/BUILD
@@ -394,6 +394,12 @@ envoy_cmake(
"WAMR_BUILD_LIBC_WASI": "0",
"WAMR_BUILD_TAIL_CALL": "1",
},
+ generate_args = select({
+ "//conditions:default": [],
+ "@platforms//cpu:aarch64": [
+ "-DWAMR_BUILD_TARGET=AARCH64",
+ ],
+ }),
lib_source = "@com_github_wamr//:all",
out_static_libs = ["libvmlib.a"],
tags = ["skip_on_windows"],

53
pkgs/servers/http/envoy/protobuf.patch Normal file
View File

@ -0,0 +1,53 @@
diff --git a/BUILD.bazel b/BUILD.bazel
index 0f6e41e3a..c0d2bbccf 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -138,7 +138,7 @@ cc_library(
visibility = ["//visibility:public"],
deps = [":protobuf_lite"] + select({
"//build_defs:config_msvc": [],
- "//conditions:default": ["@zlib//:zlib"],
+ "//conditions:default": ["//external:zlib"],
}),
)
@@ -755,7 +820,7 @@ cc_test(
"@com_google_googletest//:gtest_main",
] + select({
"//build_defs:config_msvc": [],
- "//conditions:default": ["@zlib//:zlib"],
+ "//conditions:default": ["//external:zlib"],
}),
)
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
index e7555ee10..a93beb1c5 100644
--- a/python/google/protobuf/__init__.py
+++ b/python/google/protobuf/__init__.py
@@ -31,3 +31,10 @@
# Copyright 2007 Google Inc. All Rights Reserved.
__version__ = '4.21.12'
+
+
+if __name__ != '__main__':
+ try:
+ __import__('pkg_resources').declare_namespace(__name__)
+ except ImportError:
+ __path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/src/google/protobuf/generated_message_tctable_lite.cc b/src/google/protobuf/generated_message_tctable_lite.cc
index 9993811dc..d80006af7 100644
--- a/src/google/protobuf/generated_message_tctable_lite.cc
+++ b/src/google/protobuf/generated_message_tctable_lite.cc
@@ -343,11 +343,6 @@ const char* TcParser::MiniParse(PROTOBUF_TC_PARAM_DECL) {
namespace {
-// Offset returns the address `offset` bytes after `base`.
-inline void* Offset(void* base, uint32_t offset) {
- return static_cast<uint8_t*>(base) + offset;
-}
-
// InvertPacked changes tag bits from the given wire type to length
// delimited. This is the difference expected between packed and non-packed
// repeated fields.

6
pkgs/servers/http/go-camo/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-camo";
version = "2.4.1";
version = "2.4.2";
src = fetchFromGitHub {
owner = "cactus";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3gjn8UAfj7jT/gncgXShrfI75DPwiNU4hHMVJlYDIPA=";
sha256 = "sha256-TW32pzYcSMdtcO3MGxgANCLMLvq7S/Tq3KSimv90PU0=";
};
vendorSha256 = "sha256-31B6LXCutIdPwxqMFTMUfxAaCuYW14py8Vu1EycBydE=";
vendorHash = "sha256-AcSClJwDsM+tUbDE7sQ8LLkxCPTtLEGXsQePqQ6CwMA=";
ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ];

8
pkgs/servers/http/tengine/check-resolv-conf.patch
View File

@ -2,13 +2,11 @@ diff --git a/auto/unix b/auto/unix
index a38c12dc..025a4899 100644
--- a/auto/unix
+++ b/auto/unix
@@ -1072,9 +1072,7 @@ ngx_feature_test='int fd;
@@ -1072,7 +1072,5 @@ ngx_feature_test='int fd;
# Auto read nameserver from /etc/resolv.conf.
# Tengine: auto read nameserver from /etc/resolv.conf.
- if [ -f "/etc/resolv.conf" ]; then
have=NGX_RESOLVER_FILE
value=\"/etc/resolv.conf\"
. auto/define
have=NGX_RESOLVER_FILE value="\"/etc/resolv.conf\"" . auto/define
-fi

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

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

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

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.20.3063";
version = "0.20.3160";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha512-ROp2nKfXD9OWsgEUz7lhqVusIBBMHUhaPOp3g4F/25bAN0vl5E0Mm4m3V9ChvFV6otlxfZJEByBlsC+aALxbyg==";
hash = "sha512-bn41nReIfRs99zwDgTJtQ1hrQRrn7EjQvYh5JDTU9ICBsJangnO8l1o8Xfn4jhxvcDJRDjaA7jG7TAoIC3WAFA==";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

4
pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "matrix-synapse-mjolnir-antispam";
version = "1.6.1";
version = "1.6.4";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "mjolnir";
rev = "refs/tags/v${version}";
sha256 = "sha256-pTQF3iUXJv953I/savQu/aUK0R1ujE6IrN68FkKO9sU=";
sha256 = "sha256-/vnojWLpu/fktqPUhAdL1QTESxDwFrBVYAkyF79Fj9w=";
};
sourceRoot = "./source/synapse_antispam";

6
pkgs/servers/monitoring/mackerel-agent/default.nix
View File

@ -2,20 +2,20 @@
buildGoModule rec {
pname = "mackerel-agent";
version = "0.75.0";
version = "0.75.1";
src = fetchFromGitHub {
owner = "mackerelio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XwyBHCx3MngLItgCZfil5k/h6DfQTO+0LN3brldceXI=";
sha256 = "sha256-haJzhKb0DOMJAlK6tSsx0FMz9ZkYIHT8OGVjwIqzSgU=";
};
nativeBuildInputs = [ makeWrapper ];
nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];
buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ];
vendorHash = "sha256-cSWyNGR1J2kk4XcaJXFEsMGx5OtyKyBoxY2FCa62x9c=";
vendorHash = "sha256-VJy9bbVxcekrehq48yaSbZKP8o65IFmFJglYg92HP20=";
subPackages = [ "." ];

28
pkgs/servers/mqtt/nanomq/default.nix
View File

@ -1,32 +1,48 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja, mbedtls, sqlite }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config
, cyclonedds, libmysqlclient, mariadb, mbedtls, sqlite, zeromq
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nanomq";
version = "0.15.1";
version = "0.15.5";
src = fetchFromGitHub {
owner = "emqx";
repo = "nanomq";
rev = finalAttrs.version;
hash = "sha256-h4TCorZfg9Sin4CZPRifUkqeg4F2V1DluolerSeREs4=";
hash = "sha256-eIwUsYPpRZMl1oCuuZeOj0SCBHDaJdmdWdoI4yuqxrg=";
fetchSubmodules = true;
};
patches = [
# Fix the conflict on function naming in ddsproxy
(fetchpatch {
url = "https://github.com/emqx/nanomq/commit/20f436a3b9d45f9809d7c7f0714905c657354631.patch";
hash = "sha256-ISMlf9QW73oogMTlifi/r08uSxBpzRYvBSJBB1hn2xY=";
})
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "DESTINATION /etc" "DESTINATION $out/etc"
'';
nativeBuildInputs = [ cmake ninja ];
nativeBuildInputs = [ cmake ninja pkg-config ];
buildInputs = [ mbedtls sqlite ];
buildInputs = [ cyclonedds libmysqlclient mariadb mbedtls sqlite zeromq ];
cmakeFlags = [
"-DBUILD_BENCH=ON"
"-DBUILD_DDS_PROXY=ON"
"-DBUILD_NANOMQ_CLI=ON"
"-DNNG_ENABLE_TLS=ON"
"-DBUILD_ZMQ_GATEWAY=ON"
"-DENABLE_RULE_ENGINE=ON"
"-DNNG_ENABLE_SQLITE=ON"
"-DNNG_ENABLE_TLS=ON"
];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type";
meta = with lib; {
description = "An ultra-lightweight and blazing-fast MQTT broker for IoT edge";
homepage = "https://nanomq.io/";

6
pkgs/shells/murex/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "murex";
version = "3.0.9310";
version = "3.1.3100";
src = fetchFromGitHub {
owner = "lmorg";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UjEEP5gDS20PXgzeN1q/j9eydEF/EaB2+TyugHPbbqE=";
sha256 = "sha256-haYS3M3Cg+RBGbH5Af/9qcTkKroqx76r1Fb6Bf08lgY=";
};
vendorHash = "sha256-vr8r0C01FlJOiAJjbkHxxFpC8hlQNPdoWGARZUl8YGs=";
vendorHash = "sha256-GKgwll9Cl+FMYwn07F7d33VXl4a9lcC7muzNvRzmR4k=";
subPackages = [ "." ];

4
pkgs/tools/admin/awscli2/default.nix
View File

@ -25,14 +25,14 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.10.0"; # N.B: if you change this, check if overrides are still up-to-date
version = "2.10.1"; # N.B: if you change this, check if overrides are still up-to-date
format = "pyproject";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = version;
hash = "sha256-W05ZxpqamYqtFY/2mV2+XODCeuWRE9KhMdMkaAGAiTU=";
hash = "sha256-omg4WNX/DegN6xjHBBGwEijqtvd/b9VfcCC71KfXq98=";
};
nativeBuildInputs = [

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "wander";
version = "0.8.2";
version = "0.9.0";
src = fetchFromGitHub {
owner = "robinovitch61";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BcjK1GNj6URk6PmZIqG/t6vvy5ZXo3Z6wDqY1kbLSfw=";
sha256 = "sha256-g9QAdwAqy3OA+nYsSpVLUPv1gn6N12339fgmYFT6Iys=";
};
vendorSha256 = "sha256-iTaZ5/0UrLJ3JE3FwQpvjKKrhqklG4n1WFTJhWfj/rI=";
vendorHash = "sha256-iTaZ5/0UrLJ3JE3FwQpvjKKrhqklG4n1WFTJhWfj/rI=";
ldflags = [ "-s" "-w" "-X=github.com/robinovitch61/wander/cmd.Version=v${version}" ];

2
pkgs/tools/backup/dar/default.nix
View File

@ -18,6 +18,7 @@ args @ {
lzo,
xz,
zlib,
zstd,
CoreFoundation,
}:
@ -53,6 +54,7 @@ stdenv.mkDerivation rec {
lzo
xz
zlib
zstd
] ++ lib.optionals stdenv.isLinux [
attr
e2fsprogs

4
pkgs/tools/graphics/nip2/default.nix
View File

@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "nip2";
version = "8.7.1";
version = "8.9.1";
src = fetchurl {
url = "https://github.com/libvips/nip2/releases/download/v${version}/nip2-${version}.tar.gz";
sha256 = "0l7n427njif53npqn02gfjjly8y3khbrkzqxp10j5vp9h97psgiw";
sha256 = "sha256-t14m6z+5lPqpiOjgdDbKwqSWXCyrCL7zlo6BeoZtds0=";
};
nativeBuildInputs = [

4
pkgs/tools/misc/hyfetch/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "hyfetch";
version = "1.4.6";
version = "1.4.7";
format = "setuptools";
src = fetchFromGitHub {
owner = "hykilpikonna";
repo = "hyfetch";
rev = "refs/tags/${version}";
hash = "sha256-bbAJV4G5FAY0mSfrbIEs0eNFARZD74dUvHEBQuPc0rI=";
hash = "sha256-DfPU42X9WCvOXf/BvFkfIM4yWQnunBgjjSfncaL6HPA=";
};
propagatedBuildInputs = with python3.pkgs; [

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

@ -24,14 +24,14 @@
stdenv.mkDerivation rec {
pname = "xrootd";
version = "5.5.2";
version = "5.5.3";
src = fetchFromGitHub {
owner = "xrootd";
repo = "xrootd";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-2zVCOcjL8TUbo38Dx7W8431ziouzuAdCfogsIMSOOmQ=";
hash = "sha256-61+8M6ubKX/GnsPLTql6XzGw/PTljpiXoDa1YoECya4=";
};
outputs = [ "bin" "out" "dev" "man" ];

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

@ -15,13 +15,13 @@
let
pname = "zerotierone";
version = "1.10.2";
version = "1.10.3";
src = fetchFromGitHub {
owner = "zerotier";
repo = "ZeroTierOne";
rev = version;
sha256 = "sha256-p900bw+BGzyMwH91W9NRfYS1ZUW74YaALwr1Gv9BlvQ=";
sha256 = "sha256-MhkGcmt1YPvlePF54XsLVFUX+P979uUqhtJjudRx69g=";
};
in stdenv.mkDerivation {
inherit pname version src;

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

@ -26,61 +26,47 @@
rustPlatform.buildRustPackage rec {
pname = "rbw";
version = "1.4.3";
version = "1.5.0";
src = fetchCrate {
inherit version;
crateName = pname;
sha256 = "sha256-teeGKQNf+nuUcF9BcdiTV/ycENTbcGvPZZ34FdOO31k=";
sha256 = "sha256-3kSBE2D+kC9CTbWlCKPro9fLu2tnd6LFTV4EshHMm3Y=";
};
cargoSha256 = "sha256-Soquc3OuGlDsGSwNCvYOWQeraYpkzX1oJwmM03Rc3Jg=";
cargoSha256 = "sha256-DL3qaUZxWnzsJOxi8+GtXBbZC7vfsridJWqhOTdcsgM=";
nativeBuildInputs = [
pkg-config
makeWrapper
installShellFiles
];
] ++ lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
postPatch = ''
patchShebangs bin/git-credential-rbw
substituteInPlace bin/git-credential-rbw \
--replace rbw $out/bin/rbw
'' + lib.optionalString withFzf ''
patchShebangs bin/rbw-fzf
substituteInPlace bin/rbw-fzf \
--replace fzf ${fzf}/bin/fzf \
--replace perl ${perl}/bin/perl
'' + lib.optionalString withRofi ''
patchShebangs bin/rbw-rofi
substituteInPlace bin/rbw-rofi \
--replace rofi ${rofi}/bin/rofi \
--replace xclip ${xclip}/bin/xclip
'' + lib.optionalString withRofi ''
patchShebangs bin/pass-import
substituteInPlace bin/pass-import \
--replace pass ${pass}/bin/pass
'';
preConfigure = ''
preConfigure = lib.optionalString stdenv.isLinux ''
export OPENSSL_INCLUDE_DIR="${openssl.dev}/include"
export OPENSSL_LIB_DIR="${lib.getLib openssl}/lib"
'';
postInstall = ''
for shell in bash zsh fish; do
$out/bin/rbw gen-completions $shell > rbw.$shell
installShellCompletion rbw.$shell
done
cp bin/git-credential-rbw $out/bin
install -Dm755 -t $out/bin bin/git-credential-rbw
installShellCompletion --cmd rbw \
--bash <($out/bin/rbw gen-completions bash) \
--fish <($out/bin/rbw gen-completions fish) \
--zsh <($out/bin/rbw gen-completions zsh)
'' + lib.optionalString withFzf ''
cp bin/rbw-fzf $out/bin
install -Dm755 -t $out/bin bin/rbw-fzf
substituteInPlace $out/bin/rbw-fzf \
--replace fzf ${fzf}/bin/fzf \
--replace perl ${perl}/bin/perl
'' + lib.optionalString withRofi ''
cp bin/rbw-rofi $out/bin
install -Dm755 -t $out/bin bin/rbw-rofi
substituteInPlace $out/bin/rbw-rofi \
--replace rofi ${rofi}/bin/rofi \
--replace xclip ${xclip}/bin/xclip
'' + lib.optionalString withPass ''
cp bin/pass-import $out/bin
install -Dm755 -t $out/bin bin/pass-import
substituteInPlace $out/bin/pass-import \
--replace pass ${pass}/bin/pass
'';
meta = with lib; {

2
pkgs/tools/system/rocm-smi/default.nix
View File

@ -8,7 +8,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocm-smi";
version = "5.4.2";
version = "5.4.3";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";

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

@ -3097,7 +3097,7 @@ with pkgs;
cuelsp = callPackage ../development/tools/cuelsp {};
cyclondds = callPackage ../development/libraries/cyclondds { };
cyclonedds = callPackage ../development/libraries/cyclonedds { };
cyclone-scheme = callPackage ../development/interpreters/cyclone { };