Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
683aa50df6
|
|
@ -48,7 +48,17 @@ let
|
|||
let
|
||||
result = builtins.tryEval pathContent;
|
||||
|
||||
dedupResults = lst: nubOn ({ package, attrPath }: package.updateScript) (lib.concatLists lst);
|
||||
somewhatUniqueRepresentant =
|
||||
{ package, attrPath }: {
|
||||
inherit (package) updateScript;
|
||||
# Some updaters use the same `updateScript` value for all packages.
|
||||
# Also compare `meta.description`.
|
||||
position = package.meta.position or null;
|
||||
# We cannot always use `meta.position` since it might not be available
|
||||
# or it might be shared among multiple packages.
|
||||
};
|
||||
|
||||
dedupResults = lst: nubOn somewhatUniqueRepresentant (lib.concatLists lst);
|
||||
in
|
||||
if result.success then
|
||||
let
|
||||
|
|
|
|||
|
|
@ -650,6 +650,14 @@
|
|||
module removed, due to lack of maintainers.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>nix.checkConfig</literal> option now fully
|
||||
disables the config check. The new
|
||||
<literal>nix.checkAllErrors</literal> option behaves like
|
||||
<literal>nix.checkConfig</literal> previously did.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>generateOptparseApplicativeCompletions</literal> and
|
||||
|
|
|
|||
|
|
@ -216,6 +216,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
|||
|
||||
- virtlyst package and `services.virtlyst` module removed, due to lack of maintainers.
|
||||
|
||||
- The `nix.checkConfig` option now fully disables the config check. The new `nix.checkAllErrors` option behaves like `nix.checkConfig` previously did.
|
||||
|
||||
- `generateOptparseApplicativeCompletions` and `generateOptparseApplicativeCompletion` from `haskell.lib.compose`
|
||||
(and `haskell.lib`) have been deprecated in favor of `generateOptparseApplicativeCompletions` (plural!) as
|
||||
provided by the haskell package sets (so `haskellPackages.generateOptparseApplicativeCompletions` etc.).
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ let
|
|||
${mkKeyValuePairs cfg.settings}
|
||||
${cfg.extraOptions}
|
||||
'';
|
||||
checkPhase =
|
||||
checkPhase = lib.optionalString cfg.checkConfig (
|
||||
if pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform then ''
|
||||
echo "Ignoring validation for cross-compilation"
|
||||
''
|
||||
|
|
@ -72,9 +72,9 @@ let
|
|||
${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net"} \
|
||||
${optionalString (isNixAtLeast "2.4pre") "--option experimental-features nix-command"} \
|
||||
|& sed -e 's/^warning:/error:/' \
|
||||
| (! grep '${if cfg.checkConfig then "^error:" else "^error: unknown setting"}')
|
||||
| (! grep '${if cfg.checkAllErrors then "^error:" else "^error: unknown setting"}')
|
||||
set -o pipefail
|
||||
'';
|
||||
'');
|
||||
};
|
||||
|
||||
legacyConfMappings = {
|
||||
|
|
@ -395,8 +395,15 @@ in
|
|||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
If enabled (the default), checks for data type mismatches and that Nix
|
||||
can parse the generated nix.conf.
|
||||
If enabled, checks that Nix can parse the generated nix.conf.
|
||||
'';
|
||||
};
|
||||
|
||||
checkAllErrors = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
If enabled, checks the nix.conf parsing for any kind of error. When disabled, checks only for unknown settings.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ in
|
|||
assertions = [
|
||||
{
|
||||
assertion = !((cfg.webDriverSupport == true) && (cfg.playwrightSupport == true));
|
||||
message = "'services.changedetection-io.webDriverSupport' and 'services.changedetion-io.playwrightSupport' cannot be used together.";
|
||||
message = "'services.changedetection-io.webDriverSupport' and 'services.changedetection-io.playwrightSupport' cannot be used together.";
|
||||
}
|
||||
];
|
||||
|
||||
|
|
@ -135,7 +135,7 @@ in
|
|||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
StateDirectory = mkIf defaultStateDir "changedetion-io";
|
||||
StateDirectory = mkIf defaultStateDir "changedetection-io";
|
||||
StateDirectoryMode = mkIf defaultStateDir "0750";
|
||||
WorkingDirectory = cfg.datastorePath;
|
||||
Environment = lib.optional (cfg.baseURL != null) "BASE_URL=${cfg.baseURL}"
|
||||
|
|
@ -213,6 +213,7 @@ in
|
|||
};
|
||||
})
|
||||
];
|
||||
podman.defaultNetwork.dnsname.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system};
|
||||
lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system};
|
||||
lxd-image-metadata = lxd-image.lxdMeta.${pkgs.stdenv.hostPlatform.system};
|
||||
lxd-image-rootfs = lxd-image.lxdImage.${pkgs.stdenv.hostPlatform.system};
|
||||
|
||||
in {
|
||||
name = "lxd-image-server";
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system};
|
||||
lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system};
|
||||
lxd-image-metadata = lxd-image.lxdMeta.${pkgs.stdenv.hostPlatform.system};
|
||||
lxd-image-rootfs = lxd-image.lxdImage.${pkgs.stdenv.hostPlatform.system};
|
||||
|
||||
in {
|
||||
name = "lxd";
|
||||
|
|
@ -23,7 +23,7 @@ in {
|
|||
|
||||
nodes.machine = { lib, ... }: {
|
||||
virtualisation = {
|
||||
diskSize = 2048;
|
||||
diskSize = 4096;
|
||||
|
||||
# Since we're testing `limits.cpu`, we've gotta have a known number of
|
||||
# cores to lean on
|
||||
|
|
|
|||
|
|
@ -1413,8 +1413,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "latex-workshop";
|
||||
publisher = "James-Yu";
|
||||
version = "8.28.0";
|
||||
sha256 = "sha256-ZH2n/r4iKNxf6QETmNnGc5KIAIE0hcAReX3p2MDkve8=";
|
||||
version = "8.29.0";
|
||||
sha256 = "sha256-khAlxN+y06aneZE97fqNg2esj/wvIUINiMdVc/exd38=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "felix";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyoheiu";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yMuV7a8nkdymgJTPuVcZ/PEA2/Vr7rQf8mpikNe3e1w=";
|
||||
sha256 = "sha256-DXsuTmkfzWbjpTb3ZJRVSDGgivDlEQraqAeyRzAB4UU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-yePPIehyv11f58HQzFoPh7izSPjmbhdVu9xlHD6PGRY=";
|
||||
cargoSha256 = "sha256-gv7ujyAbFEpz95cHRDKPxUW2TiYiJz35jfiKlzi6gJY=";
|
||||
|
||||
checkInputs = [ zoxide ];
|
||||
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "File Manager and User Shell for the GNU Project";
|
||||
description = "File Manager and User Shell for the GNU Project, known as Midnight Commander";
|
||||
downloadPage = "https://www.midnight-commander.org/downloads/";
|
||||
homepage = "https://www.midnight-commander.org";
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
, glib
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, Foundation
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -54,6 +55,8 @@ stdenv.mkDerivation rec {
|
|||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Foundation
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kiln";
|
||||
version = "0.3.2";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~adnano";
|
||||
repo = pname;
|
||||
repo = "kiln";
|
||||
rev = version;
|
||||
hash = "sha256-PI80td/GV92Msdtive+f+H6FWo7wdaPmPCpwrX3iLlo=";
|
||||
hash = "sha256-BMYySYbV4Exl0gCUt+95FnOoIhKM1UO4cw8gCw3Zf9M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ scdoc installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdfsam-basic";
|
||||
version = "4.3.3";
|
||||
version = "4.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
|
||||
sha256 = "sha256-SUvj9YP7hIgF003caPsx5AWnMYr38y/XRf6TRm0tMAo=";
|
||||
sha256 = "sha256-DYCiK5DgWTu1cm4TRsGDCB3LzVCGVkVzSlG3Jeo2WVI=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -741,13 +741,13 @@
|
|||
"version": "3.3.0"
|
||||
},
|
||||
"minio": {
|
||||
"hash": "sha256-rB7GhbTUSPTd8YOFV2XG1riBr2Wd6DTEZd2CreMbBD0=",
|
||||
"hash": "sha256-fSZf5lLs3INa742AL3ayuvHr5vsr2/i4yjSvNrCzBT0=",
|
||||
"owner": "aminueza",
|
||||
"provider-source-address": "registry.terraform.io/aminueza/minio",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v1.7.1",
|
||||
"vendorHash": "sha256-DDP/YAZ5CVcQWxG6+RTw8ihrk9wADAckpWx2x1I0MDE=",
|
||||
"version": "1.7.1"
|
||||
"rev": "v1.8.0",
|
||||
"vendorHash": "sha256-LcU7Pord10j4Eyxx2xIVcQXiZQT9kSTz8iBJCe8/E7s=",
|
||||
"version": "1.8.0"
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"hash": "sha256-NVbUKSG5rGUtRlaJVND3nW+0Svc2d8R8uvxGKcQktco=",
|
||||
|
|
|
|||
|
|
@ -11,17 +11,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aerc";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rjarry";
|
||||
repo = pname;
|
||||
repo = "aerc";
|
||||
rev = version;
|
||||
hash = "sha256-n5rRvLhCy2d8xUoTNyM5JYKGJWN0nEwkQeBCOpUrUrc=";
|
||||
hash = "sha256-pUp/hW4Kk3pixGfbQvphLJM9Dc/w01T1KPRewOicPqM=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-Z1dW3cK3Anl8JpAfwppsSBRgV5SdRmQemOG+652z0KA=";
|
||||
vendorHash = "sha256-Nx+k0PLPIx7Ia0LobXUOw7oOFVz1FXV49haAkRAVOcM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -58,7 +58,7 @@ buildGoModule rec {
|
|||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/aerc --prefix PATH ":" \
|
||||
"$out/share/aerc/filters:${lib.makeBinPath [ ncurses ]}"
|
||||
"${lib.makeBinPath [ ncurses ]}"
|
||||
wrapProgram $out/share/aerc/filters/html --prefix PATH ":" \
|
||||
${lib.makeBinPath [ w3m dante ]}
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
, gobject-introspection
|
||||
, libadwaita
|
||||
, librsvg
|
||||
, gtk4
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
|
|
@ -40,10 +41,11 @@ python3.pkgs.buildPythonApplication rec {
|
|||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
gobject-introspection
|
||||
gtk4 # for gtk4-update-icon-cache
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection
|
||||
libadwaita
|
||||
librsvg
|
||||
];
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
, lang ? "en"
|
||||
, libGL
|
||||
, libGLU
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -39,8 +40,9 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
wrapQtAppsHook
|
||||
];
|
||||
dontWrapQtApps = true;
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
|
|
@ -120,11 +122,14 @@ stdenv.mkDerivation rec {
|
|||
makeWrapper $out/libexec/${dirName}/SystemFiles/Kernel/Binaries/Linux-x86-64/$path $out/bin/$path --set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}"
|
||||
done
|
||||
|
||||
# ... and xkeyboard config path for Qt
|
||||
wrapQtApp "$out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer" \
|
||||
--set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" \
|
||||
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
|
||||
substituteInPlace $out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer \
|
||||
--replace "TopDirectory=" "TopDirectory=$out/libexec/${dirName} #"
|
||||
|
||||
for path in WolframPlayer wolframplayer; do
|
||||
makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path \
|
||||
--set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" \
|
||||
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
|
||||
makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path
|
||||
done
|
||||
|
||||
# Install man pages
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ for package in *; do
|
|||
# If multiple remote sources are enabled, nuget will try them all
|
||||
# concurrently and use the one that responds first. We always use the
|
||||
# first source that has the package.
|
||||
echo "$package $version is available on $url, but was downloaded from ${base_addresses[$used_source]}$package/$version/$package.$version.nupkg" 1>&2
|
||||
echo "$package $version is available at $url, but was restored from $used_source" 1>&2
|
||||
found=true
|
||||
break
|
||||
else
|
||||
|
|
|
|||
29
pkgs/development/guile-modules/guile-config/default.nix
Normal file
29
pkgs/development/guile-modules/guile-config/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, texinfo, guile }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "guile-config";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "a-sassmannshausen";
|
||||
repo = "guile-config";
|
||||
rev = version;
|
||||
hash = "sha256-n4ukGCyIx5G1ITfKSqS6FGJ6dnDBsyxXKSFNi81E4Gg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config texinfo ];
|
||||
|
||||
buildInputs = [ guile ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Configuration management library for GNU Guile";
|
||||
homepage = "https://gitlab.com/a-sassmannshausen/guile-config";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = guile.meta.platforms;
|
||||
};
|
||||
}
|
||||
34
pkgs/development/libraries/geographiclib/default.nix
Normal file
34
pkgs/development/libraries/geographiclib/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, doxygen }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geographiclib";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geographiclib";
|
||||
repo = "geographiclib";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7K4vI5vNSGPo2d9QNmasjJa4oMDfE8WTW6Guk2604Yg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_DOCUMENTATION=ON"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "C++ geographic library";
|
||||
longDescription = ''
|
||||
GeographicLib is a small C++ library for:
|
||||
* geodesic and rhumb line calculations
|
||||
* conversions between geographic, UTM, UPS, MGRS, geocentric, and local cartesian coordinates
|
||||
* gravity (e.g., EGM2008) and geomagnetic field (e.g., WMM2020) calculations
|
||||
'';
|
||||
homepage = "https://geographiclib.sourceforge.io/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,13 +5,13 @@
|
|||
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oneDNN";
|
||||
version = "2.7";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "oneDNN";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-b0cBExzS4rsdSmZ8uPtM8+Djy2ncvuGVEwLsf2h0Sro=";
|
||||
sha256 = "sha256-HBCuSZkApd/6UkAxz/KDFb/gyX2SI1S2GwgXAXSTU/c=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -262,6 +262,6 @@ qtModule {
|
|||
# and qtwebengine 5.14+ requires at least SDK 10.14
|
||||
# (qtwebengine 5.12 is fine with SDK 10.12)
|
||||
# on aarch64-darwin we are already at MacOS SDK 11.0
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64 && (lib.versionAtLeast qtCompatVersion "5.14");
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
43
pkgs/development/libraries/vk-bootstrap/default.nix
Normal file
43
pkgs/development/libraries/vk-bootstrap/default.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, vulkan-headers
|
||||
, glfw
|
||||
, catch2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vk-bootstrap";
|
||||
version = "0.5";
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charles-lunarg";
|
||||
repo = "vk-bootstrap";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rKyfUWfRYiVNzLWh6y44ASHW4j+yabY0kZTdZi8j2Dc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Upstream uses cmake FetchContent to resolve glfw and catch2
|
||||
# needed for examples and tests
|
||||
sed -iE 's=add_subdirectory(ext)==g' CMakeLists.txt
|
||||
sed -iE 's=Catch2==g' tests/CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ vulkan-headers glfw catch2 ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DVK_BOOTSTRAP_VULKAN_HEADER_DIR=${vulkan-headers}/include"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Vulkan Bootstrapping Library";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/charles-lunarg/vk-bootstrap";
|
||||
maintainers = with maintainers; [ shamilton ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -80,4 +80,5 @@
|
|||
vscode-json-languageserver-bin = "json-languageserver";
|
||||
vue-language-server = "vls";
|
||||
webtorrent-cli = "webtorrent";
|
||||
"@zwave-js/server" = "zwave-server";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -151,6 +151,7 @@
|
|||
, "gitmoji-cli"
|
||||
, "glob"
|
||||
, "gramma"
|
||||
, "grammarly-languageserver"
|
||||
, "graphql"
|
||||
, "graphql-cli"
|
||||
, "graphql-language-service-cli"
|
||||
|
|
@ -398,5 +399,6 @@
|
|||
, "yalc"
|
||||
, "yarn"
|
||||
, "yo"
|
||||
, "@zwave-js/server"
|
||||
, "zx"
|
||||
]
|
||||
|
|
|
|||
8826
pkgs/development/node-packages/node-packages.nix
generated
8826
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,26 +1,29 @@
|
|||
{ lib
|
||||
, python
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "demjson3";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "103dc4pzwg8791q3zll1vv4gcc17d9v3jvr9zj23cpv9hpfsp6mb";
|
||||
hash = "sha256-N8g7DG6wjSXe/IjfCipIddWKeAmpZQvW7uev2AU826w=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} test/test_demjson3.py
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "demjson3" ];
|
||||
pythonImportsCheck = [
|
||||
"demjson3"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qingping-ble";
|
||||
version = "0.8.0";
|
||||
version = "0.8.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "bluetooth-devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oUmehWOeweHSqhFmr+SQg2I6Au/6pYfl2s069yWMymo=";
|
||||
hash = "sha256-vfezalq3x9KAMtwixUkIVQIwBO2zd+BDl+JwdRqBn7w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
, itemloaders
|
||||
, jmespath
|
||||
, lxml
|
||||
, packaging
|
||||
, parsel
|
||||
, protego
|
||||
, pydispatcher
|
||||
|
|
@ -30,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scrapy";
|
||||
version = "2.6.3";
|
||||
version = "2.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -38,7 +39,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Scrapy";
|
||||
hash = "sha256-vf8arzVHwuVAQ206uGgLIQOTJ71dOi74nDQWWZLT5fM=";
|
||||
hash = "sha256-Ssvg8fX7XqkTU1EriVjtMEvCX2373ig5oNh6SUNRWLk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -51,6 +52,7 @@ buildPythonPackage rec {
|
|||
itemadapter
|
||||
itemloaders
|
||||
lxml
|
||||
packaging
|
||||
parsel
|
||||
protego
|
||||
pydispatcher
|
||||
|
|
@ -103,6 +105,9 @@ buildPythonPackage rec {
|
|||
"FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157
|
||||
"test_timeout_download_from_spider_nodata_rcvd"
|
||||
"test_timeout_download_from_spider_server_hangs"
|
||||
# Depends on uvloop
|
||||
"test_asyncio_enabled_reactor_different_loop"
|
||||
"test_asyncio_enabled_reactor_same_loop"
|
||||
# Fails with AssertionError
|
||||
"test_peek_fifo"
|
||||
"test_peek_one_element"
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sentry-sdk";
|
||||
version = "1.9.10";
|
||||
version = "1.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -55,7 +55,7 @@ buildPythonPackage rec {
|
|||
owner = "getsentry";
|
||||
repo = "sentry-python";
|
||||
rev = version;
|
||||
hash = "sha256-ZrteALD+HsqUwkFDPih8adxNP5TO5JqdPFI8oMBphY4=";
|
||||
hash = "sha256-la+MgVulQS6k6zux2mC7AiXqZWEU2LG/fGUUMFrBI6k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,41 +1,45 @@
|
|||
{ lib, python2Packages, fetchFromGitHub }:
|
||||
{ lib, python3Packages, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
pgdbconn = python2Packages.buildPythonPackage rec {
|
||||
pgdbconn = python3Packages.buildPythonPackage rec {
|
||||
pname = "pgdbconn";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "perseas";
|
||||
repo = "pgdbconn";
|
||||
rev = "v${version}";
|
||||
sha256 = "09r4idk5kmqi3yig7ip61r6js8blnmac5n4q32cdcbp1rcwzdn6z";
|
||||
};
|
||||
|
||||
# The tests are impure (they try to access a PostgreSQL server)
|
||||
doCheck = false;
|
||||
propagatedBuildInputs = [
|
||||
python2Packages.psycopg2
|
||||
python2Packages.pytest
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ psycopg2 pytest ];
|
||||
};
|
||||
in
|
||||
|
||||
python2Packages.buildPythonApplication {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyrseas";
|
||||
version = "0.8.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "perseas";
|
||||
repo = "Pyrseas";
|
||||
rev = "2e9be763e61168cf20d28bd69010dc5875bd7b97";
|
||||
sha256 = "1h9vahplqh0rzqjsdq64qqar6hj1bpbc6nl1pqwwgca56385br8r";
|
||||
rev = version;
|
||||
sha256 = "sha256-+MxnxvbLMxK1Ak+qKpKe3GHbzzC+XHO0eR7rl4ON9H4=";
|
||||
};
|
||||
# The tests are impure (they try to access a PostgreSQL server)
|
||||
doCheck = false;
|
||||
propagatedBuildInputs = [
|
||||
python2Packages.psycopg2
|
||||
python2Packages.pytest
|
||||
python2Packages.pyyaml
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
psycopg2
|
||||
pytest
|
||||
pyyaml
|
||||
pgdbconn
|
||||
];
|
||||
|
||||
# The tests are impure (they try to access a PostgreSQL server)
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "A declarative language to describe PostgreSQL databases";
|
||||
homepage = "https://perseas.github.io/";
|
||||
|
|
|
|||
48
pkgs/development/tools/guile/guile-hall/default.nix
Normal file
48
pkgs/development/tools/guile/guile-hall/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config
|
||||
, texinfo, makeWrapper, guile, guile-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "guile-hall";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "a-sassmannshausen";
|
||||
repo = "guile-hall";
|
||||
rev = version;
|
||||
hash = "sha256-TUCN8kW44X6iGbSJURurcz/Tc2eCH1xgmXH1sMOMOXs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config texinfo makeWrapper ];
|
||||
|
||||
buildInputs = [ guile guile-config ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postInstall =
|
||||
let
|
||||
guileVersion = lib.versions.majorMinor guile.version;
|
||||
in
|
||||
''
|
||||
wrapProgram $out/bin/hall \
|
||||
--prefix GUILE_LOAD_PATH : "$out/share/guile/site/${guileVersion}:$GUILE_LOAD_PATH" \
|
||||
--prefix GUILE_LOAD_COMPILED_PATH : "$out/lib/guile/${guileVersion}/site-ccache:$GUILE_LOAD_COMPILED_PATH"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
export HOME=$TMPDIR
|
||||
$out/bin/hall --version | grep ${version} > /dev/null
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Project manager and build tool for GNU guile";
|
||||
homepage = "https://gitlab.com/a-sassmannshausen/guile-hall";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = guile.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "12.6.5";
|
||||
version = "12.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oo3ygMdc+9Tt5hViKucLBaMatlVmmAb4QopJ9JWBJU8=";
|
||||
sha256 = "sha256-R5PlkAs+NtAajWWU0NODC4jaSWPSG9wqoahfSj2GIa4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "okteto";
|
||||
version = "2.8.1";
|
||||
version = "2.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okteto";
|
||||
repo = "okteto";
|
||||
rev = version;
|
||||
sha256 = "sha256-YTz4W+txxs1G6NukckWkOlGwlOrS4LgMly8ilmgt5GE=";
|
||||
sha256 = "sha256-UJaPGnS0VK0FK2EJFUEh5mCMaLw5vX9V4sOYOgDWENk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/oR8R0/GC6cgCqXinCRH5x93qgRPeQmxHgZZGshrDr4=";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,16 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, fetchFromGitHub
|
||||
, curl
|
||||
, installShellFiles
|
||||
, pkg-config
|
||||
, openssl
|
||||
, stdenv
|
||||
, darwin
|
||||
, nix-update-script
|
||||
, callPackage
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-asm";
|
||||
version = "0.1.24";
|
||||
|
|
@ -21,14 +24,25 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoHash = "sha256-S7OpHNjiTfQg7aPmHEx6Q/OV5QA9pB29F3MTIeiLAXg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
buildInputs = [ openssl ];
|
||||
nativeBuildInputs = [
|
||||
curl.dev
|
||||
installShellFiles
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
CoreFoundation
|
||||
SystemConfiguration
|
||||
]);
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd foobar \
|
||||
installShellCompletion --cmd cargo-asm \
|
||||
--bash <($out/bin/cargo-asm --bpaf-complete-style-bash) \
|
||||
--fish <($out/bin/cargo-asm --bpaf-complete-style-fish) \
|
||||
--zsh <($out/bin/cargo-asm --bpaf-complete-style-zsh )
|
||||
--zsh <($out/bin/cargo-asm --bpaf-complete-style-zsh)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
@ -44,7 +58,6 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "Cargo subcommand showing the assembly, LLVM-IR and MIR generated for Rust code";
|
||||
homepage = "https://github.com/pacak/cargo-show-asm";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ oxalica ];
|
||||
broken = stdenv.isDarwin; # FIXME: Seems to have issue compiling bundled curl.
|
||||
maintainers = with maintainers; [ figsoda oxalica ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "imgproxy";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
sha256 = "sha256-T82z6rqS4mCXo0844xe4VZzI5AScn0dPWvu9q8nO2uQ=";
|
||||
sha256 = "sha256-+eI/I+olBPoHez+rjj7Cgqc71M0ZcD9oa35BLQwHPsU=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-QwmrxG3DMXdw/MQKChlP/icc9s5x85vbrRKoael4Bc4=";
|
||||
vendorSha256 = "sha256-A6oToGLAFeG0Rd3koDOx+bBsiCye+OcihBwENZNFBSY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubemq-community";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubemq-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uomC3bO+u46LvLapXXzx57nY5DdwBk7sWXuBX1Ntrz4=";
|
||||
sha256 = "sha256-rZlWVbAmmZ1w6YSb481GHl64aUvdehPVAqYpwk48RGA=";
|
||||
};
|
||||
|
||||
CGO_ENABLED=0;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, python3
|
||||
}:
|
||||
let
|
||||
|
|
@ -18,6 +19,17 @@ let
|
|||
"test_redirect"
|
||||
];
|
||||
});
|
||||
lxml = prev.lxml.override {
|
||||
libxml2 = prev.libxml2.overrideAttrs (old: rec {
|
||||
# etree.fromstring always returns None with 2.10.0
|
||||
version = "2.9.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
|
||||
sha256 = "sha256-YNdKJX0czsBHXnScui8hVZ5IE577pv8oIkNXx8eY3+4=";
|
||||
};
|
||||
});
|
||||
};
|
||||
werkzeug = prev.werkzeug.overridePythonAttrs (old: rec {
|
||||
version = "2.0.3";
|
||||
src = old.src.override {
|
||||
|
|
@ -30,14 +42,14 @@ let
|
|||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "changedetection-io";
|
||||
version = "0.39.20.3";
|
||||
version = "0.39.20.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgtlmoon";
|
||||
repo = "changedetection.io";
|
||||
rev = version;
|
||||
sha256 = "sha256-0Sv/1YoZuSnslQgMOu+uHTxb9QewXPC0tLAvzJA4Aa8=";
|
||||
sha256 = "sha256-XhCByQbGWAwWe71jsitpYJnQ2xRIdmhc9mY6Smxmp3w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "loksh";
|
||||
version = "7.1";
|
||||
version = "7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dimkr";
|
||||
repo = finalAttrs.pname;
|
||||
rev = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-APjY7wQUfUTXe3TRKWkDmMZuax0MpuU/KmgZfogdAGU=";
|
||||
sha256 = "sha256-Dnt1xo/5URs5yiNtj75a5K/qGJ+0lirPExnG+0xLuq8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "resvg";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RazrFalcon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GiRLunAfDBqJtaq2ccQ3tvPDfmTg5OklkI6apAiMYL0=";
|
||||
sha256 = "sha256-cVrfyUtgPAyQvDEbQG88xrsjo0IoRtYZgJSjRWg/WCY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-rFhmR3H2u5LBBUCK5mCfHvIevFjbIe+CQLS535mJ53w=";
|
||||
cargoSha256 = "sha256-JR3lenTRthJmVC+dcsiX8S3iKhDbowMt9Eka5Yw/Svw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An SVG rendering library";
|
||||
|
|
|
|||
|
|
@ -1,23 +1,21 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, Security
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "grex";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pemistahl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iKrsiHGXaZ4OXkS28+6r0AhPZsb22fDVbDA2QjaVVTw=";
|
||||
sha256 = "sha256-of6mZ0SeiFXuXmvk64WoUNv6CLoj05K2kQpDQLMLwuY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-J+kz4aj6CXm0QsMQfPwK+30EtQOtfpCwp821DLhpVCI=";
|
||||
cargoSha256 = "sha256-BS9K/1CyNYFwC/zQXEWZcSCjQyWgLgcVNbuyez2q/Ak=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,22 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mprocs";
|
||||
version = "0.4.0";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pvolok";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IzaXcEm4eUpLWsn59ZSiIJ0mCegLhBiA3ONKI1Djemk=";
|
||||
sha256 = "sha256-CEvQq5tBVRvjgb/yReuGkPk8Uq1oZbrsGilV4ulOPEk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-nTFCFmmS3IIm+D2PjvDxUKQGTn2h0ajXtxLuosa9rRY=";
|
||||
cargoSha256 = "sha256-RK8VmEajfqYXGS8VMCRxhENLbe40CdaC+vS4EKeW958=";
|
||||
|
||||
# Package tests are currently failing (even upstream) but the package seems to work fine.
|
||||
# Relevant issues:
|
||||
# https://github.com/pvolok/mprocs/issues/50
|
||||
# https://github.com/pvolok/mprocs/issues/61
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A TUI tool to run multiple commands in parallel and show the output of each command separately";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mutagen-compose";
|
||||
version = "0.15.4";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mutagen-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fr9x9QA82wybfsnO/nXPgRBPmNgCBO0Rx+AosBV8Its=";
|
||||
sha256 = "sha256-fr4Emw8S7Uu0I08Yxha+hzZF54cJZ8UQgWF4GGvWDu0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-tFrwrpUIc7BnNJe8BBn+jmEeYTekBwEz0GAkHxLUcnU=";
|
||||
vendorSha256 = "sha256-P6FnDp+nEEZM/7uvSb9Zkrn2zLha816A82xN2AFNgWc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rlwrap";
|
||||
version = "0.45.2";
|
||||
version = "0.46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hanslub42";
|
||||
repo = "rlwrap";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ubhAOyswdDG0mFKpnSDDq5f7umyCHsW/m721IHdjNMc=";
|
||||
sha256 = "sha256-NlpVg1AimJn3VAbUl2GK1kaLkqU1Djw7/2Uc21AY0Jo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "starfetch";
|
||||
version = "0.0.2";
|
||||
version = "0.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Haruno19";
|
||||
repo = "starfetch";
|
||||
rev = version;
|
||||
sha256 = "sha256-waJ1DbOqhZ3hHtqcODSXBC+O46S8RSxuBuoEqs8OfgI=";
|
||||
sha256 = "sha256-2npevr3eSFhB58gRB2IuG4nwzPEGr0xcoSa/4VS0DNg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.22"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.23"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: 655933e55b2cb2d8541777d1070b445a7bbae0cf
|
||||
ref: refs/tags/6.2.22
|
||||
revision: 98564a6c45884e021349c5c6dc235c7ba0ba6f44
|
||||
ref: refs/tags/6.2.23
|
||||
specs:
|
||||
metasploit-framework (6.2.22)
|
||||
metasploit-framework (6.2.23)
|
||||
actionpack (~> 6.0)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
|
|
@ -129,8 +129,8 @@ GEM
|
|||
arel-helpers (2.14.0)
|
||||
activerecord (>= 3.1.0, < 8)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.647.0)
|
||||
aws-sdk-core (3.161.0)
|
||||
aws-partitions (1.649.0)
|
||||
aws-sdk-core (3.164.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.525.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
|
|
@ -144,7 +144,7 @@ GEM
|
|||
aws-sdk-kms (1.58.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.114.0)
|
||||
aws-sdk-s3 (1.116.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.4)
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.2.22";
|
||||
version = "6.2.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-I+Taz2o2V7v/OhxcTC7ZfoHw/yUWBHe1tVpwPrCNXRk=";
|
||||
sha256 = "sha256-DSLcGBKfw2/pSAV/6jF6xZlyIhPf7FDo14nz659F+qs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -104,20 +104,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1yrc8c531vap8gmjjnfqclzp729cl0kppfq02csmj5w2y1v68087";
|
||||
sha256 = "00gd6ad006wm6aqpb9hql86cnggaiqkm8mhk6053w6vrszmlhi65";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.647.0";
|
||||
version = "1.649.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vhbmvwq77bj30dxgj6cg6m4ynqk1yj6l8njn97q6393g0169rd0";
|
||||
sha256 = "1wdla6mwsli6w09z85abkhdxhmjmjawmb3c71rqfgqnffqdl351w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.161.0";
|
||||
version = "3.164.0";
|
||||
};
|
||||
aws-sdk-ec2 = {
|
||||
groups = ["default"];
|
||||
|
|
@ -154,10 +154,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf";
|
||||
sha256 = "0wm4k4i1rplddrm4pnr39biv1fikc5jg8l48z84knh05bxp8wvln";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.114.0";
|
||||
version = "1.116.0";
|
||||
};
|
||||
aws-sigv4 = {
|
||||
groups = ["default"];
|
||||
|
|
@ -604,12 +604,12 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "655933e55b2cb2d8541777d1070b445a7bbae0cf";
|
||||
sha256 = "06axinq3ww2snnspf10n4pzz10byv4p4qp0w7bzvnmrndb7xmr13";
|
||||
rev = "98564a6c45884e021349c5c6dc235c7ba0ba6f44";
|
||||
sha256 = "1azs8ngypww9szl51v6z2ci756f5g8qylzq593lnzhwz28cdq8hd";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.2.22";
|
||||
version = "6.2.23";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pinentry-bemenu";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "t-8ch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jt7G/OuXqJdnkW7sMNH0o+CI3noDK6EcbOLXq0JoDTk=";
|
||||
sha256 = "sha256-5ll4a/1Ughx0s2l/mcIsp1g4oNoNhm0RWvY/tXDvPGE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gdu";
|
||||
version = "5.19.0";
|
||||
version = "5.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-876O7LdKqmg3oWNoboGId5jcdiGND1HyIMefy1uYu/g=";
|
||||
sha256 = "sha256-8wkp6pu6QDQBrXJVasi9YhxdzyaobDp0WbwNFCQpLag=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-UP6IdJLc93gRP4vwKKOJl3sNt4sOFeYXjvwk8QM+D48=";
|
||||
|
|
|
|||
|
|
@ -7783,9 +7783,7 @@ with pkgs;
|
|||
|
||||
httpx = callPackage ../tools/security/httpx { };
|
||||
|
||||
hurl = callPackage ../tools/networking/hurl {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
hurl = callPackage ../tools/networking/hurl { };
|
||||
|
||||
hub = callPackage ../applications/version-management/git-and-tools/hub { };
|
||||
|
||||
|
|
@ -12303,6 +12301,8 @@ with pkgs;
|
|||
|
||||
vdmfec = callPackage ../applications/backup/vdmfec {};
|
||||
|
||||
vk-bootstrap = callPackage ../development/libraries/vk-bootstrap { };
|
||||
|
||||
vk-cli = callPackage ../applications/networking/instant-messengers/vk-cli { };
|
||||
|
||||
vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger {};
|
||||
|
|
@ -15937,6 +15937,8 @@ with pkgs;
|
|||
|
||||
guile-commonmark = callPackage ../development/guile-modules/guile-commonmark { };
|
||||
|
||||
guile-config = callPackage ../development/guile-modules/guile-config { };
|
||||
|
||||
guile-fibers = callPackage ../development/guile-modules/guile-fibers { };
|
||||
|
||||
guile-gcrypt = callPackage ../development/guile-modules/guile-gcrypt { };
|
||||
|
|
@ -16937,6 +16939,8 @@ with pkgs;
|
|||
|
||||
guff = callPackage ../tools/graphics/guff { };
|
||||
|
||||
guile-hall = callPackage ../development/tools/guile/guile-hall { };
|
||||
|
||||
guile-lint = callPackage ../development/tools/guile/guile-lint {
|
||||
guile = guile_1_8;
|
||||
};
|
||||
|
|
@ -18749,6 +18753,8 @@ with pkgs;
|
|||
geoipDatabase = geolite-legacy;
|
||||
};
|
||||
|
||||
geographiclib = callPackage ../development/libraries/geographiclib { };
|
||||
|
||||
geoip = callPackage ../development/libraries/geoip { };
|
||||
|
||||
geoipjava = callPackage ../development/libraries/java/geoipjava { };
|
||||
|
|
@ -30747,7 +30753,9 @@ with pkgs;
|
|||
|
||||
obconf = callPackage ../tools/X11/obconf { };
|
||||
|
||||
gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate { };
|
||||
gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation;
|
||||
};
|
||||
|
||||
obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {
|
||||
ffmpeg_4 = ffmpeg-full;
|
||||
|
|
@ -35371,7 +35379,7 @@ with pkgs;
|
|||
|
||||
trilinos-mpi = callPackage ../development/libraries/science/math/trilinos { withMPI = true; };
|
||||
|
||||
wolfram-engine = callPackage ../applications/science/math/wolfram-engine { };
|
||||
wolfram-engine = libsForQt5.callPackage ../applications/science/math/wolfram-engine { };
|
||||
|
||||
wolfram-for-jupyter-kernel = callPackage ../applications/editors/jupyter-kernels/wolfram { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue