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-08-26 18:00:55 +00:00 committed by GitHub
commit 3503eea847
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
60 changed files with 519 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View File

@ -443,7 +443,7 @@ in {
loki = handleTest ./loki.nix {};
luks = handleTest ./luks.nix {};
lvm2 = handleTest ./lvm2 {};
lxd = handleTest ./lxd {};
lxd = pkgs.recurseIntoAttrs (handleTest ./lxd {});
lxd-image-server = handleTest ./lxd-image-server.nix {};
#logstash = handleTest ./logstash.nix {};
lorri = handleTest ./lorri/default.nix {};

2
nixos/tests/dolibarr.nix
View File

@ -50,7 +50,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
# Now, we have installed the machine, let's verify we still have the right configuration.
assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php")
# We do not want any redirect now as we have installed the machine.
machine.succeed('curl -f -X POST http://localhost')
machine.succeed('curl -f -X GET http://localhost')
# Test authentication to the webservice.
parser = TokenParser()
parser.feed(machine.succeed('curl -f -X GET http://localhost/index.php?mainmenu=login&username=root'))

44
pkgs/applications/editors/emacs/default.nix
View File

@ -4,6 +4,14 @@ lib.makeScope pkgs.newScope (self:
let
gconf = pkgs.gnome2.GConf;
inherit (self) callPackage;
inheritedArgs = {
inherit gconf;
inherit (pkgs.darwin) sigtool;
inherit (pkgs.darwin.apple_sdk.frameworks)
AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz
QuartzCore WebKit;
};
in {
sources = import ./sources.nix {
inherit lib;
@ -12,14 +20,7 @@ lib.makeScope pkgs.newScope (self:
fetchFromSavannah;
};
emacs28 = callPackage (self.sources.emacs28) {
inherit gconf;
inherit (pkgs.darwin) sigtool;
inherit (pkgs.darwin.apple_sdk.frameworks)
AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz
QuartzCore WebKit;
};
emacs28 = callPackage (self.sources.emacs28) inheritedArgs;
emacs28-gtk2 = self.emacs28.override {
withGTK2 = true;
@ -33,14 +34,7 @@ lib.makeScope pkgs.newScope (self:
noGui = true;
});
emacs29 = callPackage (self.sources.emacs29) {
inherit gconf;
inherit (pkgs.darwin) sigtool;
inherit (pkgs.darwin.apple_sdk.frameworks)
AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz
QuartzCore WebKit;
};
emacs29 = callPackage (self.sources.emacs29) inheritedArgs;
emacs29-gtk3 = self.emacs29.override {
withGTK3 = true;
@ -54,21 +48,7 @@ lib.makeScope pkgs.newScope (self:
withPgtk = true;
};
emacs28-macport = callPackage (self.sources.emacs28-macport) {
inherit gconf;
emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs;
inherit (pkgs.darwin) sigtool;
inherit (pkgs.darwin.apple_sdk.frameworks)
AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz
QuartzCore WebKit;
};
emacs29-macport = callPackage (self.sources.emacs29-macport) {
inherit gconf;
inherit (pkgs.darwin) sigtool;
inherit (pkgs.darwin.apple_sdk.frameworks)
AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz
QuartzCore WebKit;
};
emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs;
})

7
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View File

@ -535,6 +535,13 @@ let
(attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ];
});
typst-mode = super.typst-mode.overrideAttrs (attrs: {
postPatch = attrs.postPatch or "" + ''
substituteInPlace typst-mode.el \
--replace 'typst-executable-location "typst"' 'typst-executable-location "${lib.getExe pkgs.typst}"'
'';
});
vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: {
nativeBuildInputs =
(attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ];

121
pkgs/applications/editors/emacs/sources.nix
View File

@ -4,14 +4,29 @@
}:
let
metaFor = variant: version: rev: {
homepage = {
"mainline" = "https://www.gnu.org/software/emacs/";
"macport" = "https://bitbucket.org/mituharu/emacs-mac/";
mkArgs = { pname, version, variant, rev, hash }: {
inherit pname version variant;
src = {
"mainline" = (fetchFromSavannah {
repo = "emacs";
inherit rev hash;
});
"macport" = (fetchFromBitbucket {
owner = "mituharu";
repo = "emacs-mac";
inherit rev hash;
});
}.${variant};
description = "The extensible, customizable GNU text editor"
+ lib.optionalString (variant == "macport") " - macport variant";
longDescription = ''
meta = {
homepage = {
"mainline" = "https://www.gnu.org/software/emacs/";
"macport" = "https://bitbucket.org/mituharu/emacs-mac/";
}.${variant};
description = "The extensible, customizable GNU text editor"
+ lib.optionalString (variant == "macport") " - macport variant";
longDescription = ''
GNU Emacs is an extensible, customizable text editor—and more. At its core
is an interpreter for Emacs Lisp, a dialect of the Lisp programming
language with extensions to support text editing.
@ -30,79 +45,57 @@ let
This release is built from Mitsuharu Yamamoto's patched source code
tailored for macOS.
'';
changelog = {
"mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}";
"macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac";
}.${variant};
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
AndersonTorres
adisbladis
atemu
jwiegley
lovek323
matthewbauer
];
platforms = {
"mainline" = lib.platforms.all;
"macport" = lib.platforms.darwin;
}.${variant};
mainProgram = "emacs";
changelog = {
"mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}";
"macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac";
}.${variant};
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [
AndersonTorres
adisbladis
atemu
jwiegley
lovek323
matthewbauer
];
platforms = {
"mainline" = lib.platforms.all;
"macport" = lib.platforms.darwin;
}.${variant};
mainProgram = "emacs";
};
};
in
{
emacs28 = import ./generic.nix {
emacs28 = import ./generic.nix (mkArgs {
pname = "emacs";
version = "28.2";
variant = "mainline";
src = fetchFromSavannah {
repo = "emacs";
rev = "28.2";
hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
};
rev = "28.2";
hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
});
meta = metaFor "mainline" "28.2" "28.2";
};
emacs29 = import ./generic.nix {
emacs29 = import ./generic.nix (mkArgs {
pname = "emacs";
version = "29.1";
variant = "mainline";
src = fetchFromSavannah {
repo = "emacs";
rev = "29.1";
hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg=";
};
rev = "29.1";
hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg=";
});
meta = metaFor "mainline" "29.1" "29.1";
};
emacs28-macport = import ./generic.nix {
emacs28-macport = import ./generic.nix (mkArgs {
pname = "emacs-mac";
version = "28.2";
variant = "macport";
src = fetchFromBitbucket {
owner = "mituharu";
repo = "emacs-mac";
rev = "emacs-28.2-mac-9.1";
hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";
};
rev = "emacs-28.2-mac-9.1";
hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";
});
meta = metaFor "macport" "28.2" "emacs-28.2-mac-9.1";
};
emacs29-macport = import ./generic.nix {
emacs29-macport = import ./generic.nix (mkArgs {
pname = "emacs-mac";
version = "29.1";
variant = "macport";
src = fetchFromBitbucket {
owner = "mituharu";
repo = "emacs-mac";
rev = "emacs-29.1-mac-10.0";
hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU=";
};
meta = metaFor "macport" "29.1" "emacs-29.1-mac-10.0";
};
rev = "emacs-29.1-mac-10.0";
hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU=";
});
}

2
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -40,6 +40,7 @@ https://github.com/ycm-core/YouCompleteMe/,,
https://github.com/vim-scripts/a.vim/,,
https://github.com/mileszs/ack.vim/,,
https://github.com/eikenb/acp/,,
https://github.com/Mofiqul/adwaita.nvim/,HEAD,
https://github.com/stevearc/aerial.nvim/,,
https://github.com/Numkil/ag.nvim/,,
https://github.com/derekelkins/agda-vim/,,
@ -595,6 +596,7 @@ https://gitlab.com/usmcamp0811/nvim-julia-autotest,HEAD,
https://github.com/ethanholz/nvim-lastplace/,HEAD,
https://github.com/kosayoda/nvim-lightbulb/,,
https://github.com/josa42/nvim-lightline-lsp/,,
https://github.com/martineausimon/nvim-lilypond-suite/,HEAD,
https://github.com/mfussenegger/nvim-lint/,,
https://github.com/mrded/nvim-lsp-notify/,HEAD,
https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,,

4
pkgs/applications/misc/minder/default.nix
View File

@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "minder";
version = "1.15.2";
version = "1.15.6";
src = fetchFromGitHub {
owner = "phase1geo";
repo = pname;
rev = version;
sha256 = "sha256-aMKu59IWHjK6NlaIZgbpKPISsvGub2tQxEdvogx2XCY=";
sha256 = "sha256-vxUZo68QdeuFlQxLldWplmeGtyX2NHo3AJZmt+JLCF4=";
};
nativeBuildInputs = [

2
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
View File

@ -22,6 +22,7 @@ rec {
changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/";
description = "A full-featured e-mail client";
homepage = "https://thunderbird.net/";
mainProgram = "thunderbird";
maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ];
platforms = platforms.unix;
badPlatforms = platforms.darwin;
@ -59,6 +60,7 @@ rec {
changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/";
description = "A full-featured e-mail client";
homepage = "https://thunderbird.net/";
mainProgram = "thunderbird";
maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ];
platforms = platforms.unix;
badPlatforms = platforms.darwin;

6
pkgs/applications/science/logic/egglog/default.nix
View File

@ -5,13 +5,13 @@
rustPlatform.buildRustPackage {
pname = "egglog";
version = "unstable-2023-08-19";
version = "unstable-2023-08-23";
src = fetchFromGitHub {
owner = "egraphs-good";
repo = "egglog";
rev = "a4768b1751b72292b0e79e6e442d54ab270748fb";
hash = "sha256-WTdMhtdPvBtS6WAS3S4dui/8ospJ7nkeRhLce2zY8KE=";
rev = "9e530381961a59524f2bbacd89973575b4e036d8";
hash = "sha256-xzfa1Z7ibSO4D5zpprC7heaswA7Be5Qmb81XoDwANqw=";
};
cargoLock = {

1
pkgs/applications/terminal-emulators/alacritty/default.nix
View File

@ -132,6 +132,7 @@ rustPlatform.buildRustPackage rec {
description = "A cross-platform, GPU-accelerated terminal emulator";
homepage = "https://github.com/alacritty/alacritty";
license = licenses.asl20;
mainProgram = "alacritty";
maintainers = with maintainers; [ Br1ght0ne mic92 ];
platforms = platforms.unix;
changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md";

1
pkgs/applications/terminal-emulators/kitty/default.nix
View File

@ -239,6 +239,7 @@ buildPythonApplication rec {
license = licenses.gpl3Only;
changelog = "https://sw.kovidgoyal.net/kitty/changelog/";
platforms = platforms.darwin ++ platforms.linux;
mainProgram = "kitty";
maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens ];
};
}

1
pkgs/applications/version-management/gh/default.nix
View File

@ -47,6 +47,7 @@ buildGoModule rec {
homepage = "https://cli.github.com/";
changelog = "https://github.com/cli/cli/releases/tag/v${version}";
license = licenses.mit;
mainProgram = "gh";
maintainers = with maintainers; [ zowoq ];
};
}

1
pkgs/applications/virtualization/looking-glass-client/default.nix
View File

@ -95,6 +95,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://looking-glass.io/";
license = licenses.gpl2Plus;
mainProgram = "looking-glass-client";
maintainers = with maintainers; [ alexbakker babbaj j-brn ];
platforms = [ "x86_64-linux" ];
};

1
pkgs/applications/virtualization/virt-manager/default.nix
View File

@ -93,6 +93,7 @@ python3.pkgs.buildPythonApplication rec {
'';
license = licenses.gpl2;
platforms = platforms.unix;
mainProgram = "virt-manager";
maintainers = with maintainers; [ qknight offline fpletz globin ];
};
}

4
pkgs/desktops/gnome/apps/gnome-maps/default.nix
View File

@ -27,11 +27,11 @@
stdenv.mkDerivation rec {
pname = "gnome-maps";
version = "44.3";
version = "44.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-O+E7Ie66mp2jDmnfFtcYvrEw7b+9QG649AK/6hdBJgI=";
hash = "sha256-3admgmWnCVKWDElRnPv7+jV2gyb8W4CyYX8U/7LJuHM=";
};
doCheck = true;

1
pkgs/desktops/xfce/core/thunar/default.nix
View File

@ -58,6 +58,7 @@ let unwrapped = mkXfceDerivation {
meta = with lib; {
description = "Xfce file manager";
mainProgram = "thunar";
maintainers = with maintainers; [ ] ++ teams.xfce.members;
};
};

6
pkgs/development/compilers/cairo/default.nix
View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cairo";
version = "2.0.2";
version = "2.2.0";
src = fetchFromGitHub {
owner = "starkware-libs";
repo = "cairo";
rev = "v${version}";
hash = "sha256-tFWY4bqI+YVVu0E9EPl+c0UAsSn/cjgvEOQtyT9tkYg=";
hash = "sha256-X8CqiikY1/S8/WxrZbcwOB+bz0PJsNpuLWLb+k3+5kw=";
};
cargoHash = "sha256-fnkzR07MIwzjvg2ZRhhzYIUhuidEBZt0mGfxwHyhyVE=";
cargoHash = "sha256-jrUH3vmTbbxod547JAE5sOSo+FR15XNgVpM15uXAsvg=";
nativeCheckInputs = [
rustfmt

6
pkgs/development/compilers/emscripten/default.nix
View File

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "emscripten";
version = "3.1.42";
version = "3.1.45";
llvmEnv = symlinkJoin {
name = "emscripten-llvm-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
name = "emscripten-node-modules-${version}";
inherit pname version src;
npmDepsHash = "sha256-QlKm6UvPUa7+VJ9ZvXdxYZzK+U96Ju/oAHPhZ/hyv/I=";
npmDepsHash = "sha256-kcWAio1fKuwqFCFlupX9KevjWPbv9W/Z/5EPrihQ6ms=";
dontBuild = true;
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "emscripten-core";
repo = "emscripten";
hash = "sha256-elp/LPd9SAuVZy42Wkgb6pCbPi2GnETTfyRJqU92S0E=";
hash = "sha256-yf0Yb/UjaBQpIEPZzzjaUmR+JzKPSJHMkrYLHxDXwOg=";
rev = version;
};

1
pkgs/development/compilers/llvm/15/libcxxabi/default.nix
View File

@ -68,7 +68,6 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || !stdenv.hostPlatform.isDarwin) [
# libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib,
# but that does not appear to be the case for example when building
# pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc).

1
pkgs/development/compilers/llvm/16/libcxxabi/default.nix
View File

@ -68,7 +68,6 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || !stdenv.hostPlatform.isDarwin) [
# libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib,
# but that does not appear to be the case for example when building
# pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc).

1
pkgs/development/compilers/llvm/git/libcxxabi/default.nix
View File

@ -68,7 +68,6 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || !stdenv.hostPlatform.isDarwin) [
# libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib,
# but that does not appear to be the case for example when building
# pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc).

4
pkgs/development/interpreters/luau/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "luau";
version = "0.591";
version = "0.592";
src = fetchFromGitHub {
owner = "Roblox";
repo = "luau";
rev = version;
hash = "sha256-eCYB+B5bglUcF+xAAHBWwwgDrvY9NatmcwL/GUnIhOk=";
hash = "sha256-S0Sr28jPnFBurLlCCj3BzTLh7yvzEPlR0MAUz7cDf1k=";
};
nativeBuildInputs = [ cmake ];

27
pkgs/development/libraries/kcp/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "kcp";
version = "1.7";
src = fetchFromGitHub {
owner = "skywind3000";
repo = "kcp";
rev = version;
hash = "sha256-yW40x4T++4rB7hoabGN8qiSN7octyoUYEfE9oDlLxjU=";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "A Fast and Reliable ARQ Protocol";
homepage = "https://github.com/skywind3000/kcp";
license = licenses.mit;
maintainers = with maintainers; [ rs0vere ];
platforms = platforms.all;
};
}

6
pkgs/development/libraries/lcrq/default.nix
View File

@ -5,14 +5,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
name = "lcrq";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "librecast";
repo = "lcrq";
rev = "v${finalAttrs.version}";
hash = "sha256-GvfmHST53qwVrztnmCzUVbVkgNGtAl5adqdNWOHItiU=";
hash = "sha256-r4UiZ9oNDxF3rHMqg+1NLLjm6LPZtzgtZOs7pRe5SdQ=";
};
installFlags = [ "PREFIX=$(out)" ];
@ -23,6 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://librecast.net/lcrq.html";
license = [ lib.licenses.gpl2 lib.licenses.gpl3 ];
maintainers = with lib.maintainers; [ albertchae aynish DMills27 jasonodoom jleightcap ];
platforms = lib.platforms.gnu;
platforms = lib.platforms.unix;
};
})

25
pkgs/development/php-packages/opentelemetry/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib, buildPecl, fetchFromGitHub }:
let
version = "1.0.0beta6";
in buildPecl {
inherit version;
pname = "opentelemetry";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-php-instrumentation";
rev = version;
hash = "sha256-dbyFb+Wh4thbnwASgPuQ4ceeke6NDMFLvNXjp66hLCM=";
};
doCheck = true;
meta = with lib; {
changelog = "https://github.com/open-telemetry/opentelemetry-php-instrumentation/releases/tag/${version}";
description = "OpenTelemetry PHP auto-instrumentation extension";
homepage = "https://opentelemetry.io/";
license = licenses.asl20;
maintainers = with maintainers; [ gaelreyrol ];
};
}

51
pkgs/development/python-modules/anytree/default.nix
View File

@ -1,24 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, substituteAll
, six
, withGraphviz ? true
, graphviz
, fetchFromGitHub
, fontconfig
# Tests
, graphviz
, poetry-core
, pytestCheckHook
, nose
, pythonOlder
, six
, substituteAll
, withGraphviz ? true
}:
buildPythonPackage rec {
pname = "anytree";
version = "2.8.0";
version = "2.9.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "c0fec0de";
repo = "anytree";
rev = "refs/tags/${version}";
hash = "sha256-e7mmOOvrZuMCcyUg74YLLXGzkb5nCtuYmhNzAbY65gg=";
};
patches = lib.optionals withGraphviz [
@ -28,30 +32,35 @@ buildPythonPackage rec {
})
];
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
six
];
# tests print “Fontconfig error: Cannot load default config file”
nativeCheckInputs = [
pytestCheckHook
];
# Tests print “Fontconfig error: Cannot load default config file”
preCheck = lib.optionalString withGraphviz ''
export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf
'';
# circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree
# Circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree
doCheck = withGraphviz;
nativeCheckInputs = [ pytestCheckHook nose ];
pytestFlagsArray = lib.optionals (pythonOlder "3.4") [
# Use enums, which aren't available pre-python3.4
"--ignore=tests/test_resolver.py"
"--ignore=tests/test_search.py"
pythonImportsCheck = [
"anytree"
];
meta = with lib; {
description = "Powerful and Lightweight Python Tree Data Structure";
homepage = "https://github.com/c0fec0de/anytree";
changelog = "https://github.com/c0fec0de/anytree/releases/tag/${version}";
license = licenses.asl20;
maintainers = [ ];
maintainers = with maitnainers; [ ];
};
}

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

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "awacs";
version = "2.3.0";
version = "2.4.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-0tizZWcHe1qbLxpXS/IngExaFFUHZyXXlksWcNL/vEw=";
hash = "sha256-iflg6tjqFl1gWOzlJhQwGHhAQ/pKm9n8GVvUz6fSboM=";
};
propagatedBuildInputs = lib.lists.optionals (pythonOlder "3.8") [

9
pkgs/development/python-modules/aws-lambda-builders/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aws-lambda-builders";
version = "1.34.0";
version = "1.36.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,9 +21,14 @@ buildPythonPackage rec {
owner = "awslabs";
repo = "aws-lambda-builders";
rev = "refs/tags/v${version}";
hash = "sha256-MjX0im9GX0mdWkumUoJUIBjPZl/Ok5+sR6Dgq6vVGKM=";
hash = "sha256-cHpeNY0WY4yai/yWw2Oy1QLLjlj8PFNdB3BMbkP31Ds=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "version=read_version()," 'version="${version}",'
'';
propagatedBuildInputs = [
six
];

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

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "awscrt";
version = "0.16.10";
version = "0.19.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-MQFJm0ebgvBAP2Fb9SDB+LlQaBjSdePiit4lzGvNuSs=";
hash = "sha256-Q5DA+lraOebUYgjFDj11XUPZY1X8qD/1dwgeMoL2SZ0=";
};
buildInputs = lib.optionals stdenv.isDarwin [

4
pkgs/development/python-modules/bluetooth-data-tools/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "bluetooth-data-tools";
version = "1.7.0";
version = "1.9.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-EmZPiZKm/80nJpPnJWhI9i4I6MhgQMifLOEUBFLqbSw=";
hash = "sha256-LhrByEkc6WhPkp/V7c0jQJlYmT5q2zIQ0nHvb6Nq8Xo=";
};
# The project can build both an optimized cython version and an unoptimized

105
pkgs/development/python-modules/cairo-lang/default.nix
View File

@ -1,105 +0,0 @@
{ lib
, aiohttp
, buildPythonPackage
, cachetools
, ecdsa
, eth-hash
, fastecdsa
, fetchzip
, frozendict
, gmp
, lark
, marshmallow
, marshmallow-dataclass
, marshmallow-enum
, marshmallow-oneofschema
, mpmath
, numpy
, pipdeptree
, prometheus-client
, pytest
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
, pyyaml
, setuptools
, sympy
, typeguard
, web3
}:
buildPythonPackage rec {
pname = "cairo-lang";
version = "0.10.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchzip {
url = "https://github.com/starkware-libs/cairo-lang/releases/download/v${version}/cairo-lang-${version}.zip";
hash = "sha256-MNbzDqqNhij9JizozLp9hhQjbRGzWxECOErS3TOPlAA=";
};
nativeBuildInputs = [
pythonRelaxDepsHook
];
buildInputs = [
gmp
];
propagatedBuildInputs = [
aiohttp
cachetools
setuptools
ecdsa
fastecdsa
sympy
mpmath
numpy
typeguard
frozendict
prometheus-client
marshmallow
marshmallow-enum
marshmallow-dataclass
marshmallow-oneofschema
pipdeptree
lark
web3
eth-hash
pyyaml
] ++ eth-hash.optional-dependencies.pycryptodome;
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
];
pythonRelaxDeps = [
"frozendict"
];
pythonRemoveDeps = [
# TODO: pytest and pytest-asyncio must be removed as they are check inputs
"pytest"
"pytest-asyncio"
];
postFixup = ''
chmod +x $out/bin/*
'';
# There seems to be no test included in the ZIP release…
# Cloning from GitHub is harder because they use a custom CMake setup
# TODO(raitobezarius): upstream was pinged out of band about it.
doCheck = false;
meta = with lib; {
description = "Tooling for Cairo language";
homepage = "https://github.com/starkware/cairo-lang";
license = licenses.mit;
maintainers = with maintainers; [ raitobezarius ];
};
}

14
pkgs/development/python-modules/filedepot/default.nix
View File

@ -2,10 +2,10 @@
, anyascii
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, flaky
, google-cloud-storage
, mock
, paste
, pillow
, pymongo
, pytestCheckHook
@ -28,6 +28,15 @@ buildPythonPackage rec {
hash = "sha256-vPceky5cvmy3MooWz7dRdy68VoAHN7i3a7egBs4dPE8=";
};
patches = [
# Add support for Pillow 10, https://github.com/amol-/depot/pull/84
(fetchpatch {
name = "support-pillow-10.patch";
url = "https://github.com/amol-/depot/commit/bdb73d1b3898279068b421bc061ecc18c5108fa4.patch";
hash = "sha256-7+VGrdJstkiy0bYAqA9FjF1NftZiurgyPd8Wlz6GUy8=";
})
];
propagatedBuildInputs = [
anyascii
google-cloud-storage
@ -36,7 +45,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
flaky
mock
paste
pillow
pymongo
pytestCheckHook
@ -45,6 +53,8 @@ buildPythonPackage rec {
];
disabledTestPaths = [
# ModuleNotFoundError: No module named 'depot._pillow_compat'
"tests/test_fields_sqlalchemy.py"
# The examples have tests
"examples"
# Missing dependencies (TurboGears2 and ming)

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "opower";
version = "0.0.31";
version = "0.0.32";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "tronikos";
repo = "opower";
rev = "refs/tags/v${version}";
hash = "sha256-lJVaQnGfZBjMgWLKZG/LNao8l4Fj3z3AZhnfgJwOcxo=";
hash = "sha256-zfLulpFEB3KfN2wm1wXYbHZ9opI9k3q0YIWardNPZa0=";
};
pythonRemoveDeps = [

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

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "snitun";
version = "0.35.0";
version = "0.36.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "NabuCasa";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-sZMmou9uHThl7AIMnuBxABnWTF1CCFsDj1I7FYxgJ3Y=";
hash = "sha256-ViFAPAA6uU5MQNHCTIw0OTR8eZPgF34GqRP+py6L6RU=";
};
propagatedBuildInputs = [

29
pkgs/development/python-modules/types-docopt/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "types-docopt";
version = "0.6.11.4";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-mRpkwVaTEMIkCuc0/SwQYnq7ikr6875axvTv+aYB8xo=";
};
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"docopt-stubs"
];
meta = with lib; {
description = "Typing stubs for docopt";
homepage = "https://pypi.org/project/types-docopt/";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

2
pkgs/development/python-modules/web3/default.nix
View File

@ -67,6 +67,6 @@ buildPythonPackage rec {
description = "Web3 library for interactions";
homepage = "https://github.com/ethereum/web3";
license = licenses.mit;
maintainers = with maintainers; [ raitobezarius ];
maintainers = with maintainers; [ ];
};
}

5
pkgs/development/tools/aws-sam-cli/default.nix
View File

@ -42,9 +42,11 @@ python3.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace requirements/base.txt \
--replace 'PyYAML>=' 'PyYAML>=5.4.1 #' \
--replace "aws_lambda_builders==" "aws_lambda_builders>=" \
--replace 'aws-sam-translator==1.70.0' 'aws-sam-translator>=1.60.1' \
--replace 'boto3>=' 'boto3>=1.26.79 #' \
--replace 'cfn-lint~=0.77.9' 'cfn-lint~=0.73.2' \
--replace "cookiecutter~=" "cookiecutter>=" \
--replace 'docker~=6.1.0' 'docker~=6.0.1' \
--replace 'ruamel_yaml~=0.17.32' 'ruamel_yaml~=0.17.21' \
--replace 'tomlkit==0.11.8' 'tomlkit>=0.11.8' \
@ -56,8 +58,9 @@ python3.pkgs.buildPythonApplication rec {
doCheck = false;
meta = with lib; {
homepage = "https://github.com/awslabs/aws-sam-cli";
description = "CLI tool for local development and testing of Serverless applications";
homepage = "https://github.com/awslabs/aws-sam-cli";
changelog = "https://github.com/aws/aws-sam-cli/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ lo1tuma ];
};

6
pkgs/development/tools/database/sqlcmd/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "sqlcmd";
version = "1.2.1";
version = "1.3.0";
src = fetchFromGitHub {
repo = "go-sqlcmd";
owner = "microsoft";
rev = "v${version}";
sha256 = "sha256-d9XxE+yY3LEsg9JYOFYs9r2ZHaH0+tnEOqNV+5tEiAs=";
sha256 = "sha256-omclEa/URexzzpn5jRw2ivBPxmx6kw+WBIOk4XZASkU=";
};
vendorHash = "sha256-+buoX9etR34p1N2G8+48ZvF6cg/y4uKb89sSIwkoeuY=";
vendorHash = "sha256-mqyKH6xLfTqKVStEZYqau19U9y/NlqoD0XLeoWHScgM=";
proxyVendor = true;
ldflags = [ "-s" "-w" "-X main.version=${version}" ];

20
pkgs/development/tools/misc/pkgconf/default.nix
View File

@ -4,13 +4,13 @@
, removeReferencesTo
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "pkgconf";
version = "1.9.5";
version = "2.0.2";
src = fetchurl {
url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-GsFlbeuydJdWMDb3v/woFJD4P5uEV8DWC8+2OPtrYXE=";
url = "https://distfiles.dereferenced.org/pkgconf/pkgconf-${finalAttrs.version}.tar.xz";
hash = "sha256-6lol748lHrU3fsDiHHX7YYlEM8+9vwslWboz5MJmRAE=";
};
outputs = [ "out" "lib" "dev" "man" "doc" ];
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
mv ${placeholder "dev"}/share ${placeholder "out"}
'';
meta = with lib; {
meta = {
homepage = "https://github.com/pkgconf/pkgconf";
description = "Package compiler and linker metadata toolkit";
longDescription = ''
@ -52,8 +52,10 @@ stdenv.mkDerivation rec {
functionality, to allow other tooling such as compilers and IDEs to
discover and use libraries configured by pkgconf.
'';
license = licenses.isc;
maintainers = with maintainers; [ zaninime AndersonTorres ];
platforms = platforms.all;
changelog = "https://github.com/pkgconf/pkgconf/blob/pkgconf-${finalAttrs.version}/NEWS";
license = lib.licenses.isc;
mainProgram = "pkgconf";
maintainers = with lib.maintainers; [ zaninime AndersonTorres ];
platforms = lib.platforms.all;
};
}
})

10
pkgs/development/tools/sq/default.nix
View File

@ -1,17 +1,17 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }:
{ lib, buildGo121Module, fetchFromGitHub, installShellFiles, testers, sq }:
buildGoModule rec {
buildGo121Module rec {
pname = "sq";
version = "0.40.0";
version = "0.42.0";
src = fetchFromGitHub {
owner = "neilotoole";
repo = pname;
rev = "v${version}";
sha256 = "sha256-TD9brvMxU2gdiOiJPs/M5PmiwFd99P9YohCG7bcjLas=";
hash = "sha256-IL3041R35WL+sYCpTjfPXUpd7GTcQoaILYBufwH1WoE=";
};
vendorHash = "sha256-/LsQfhU5+Wobts6R3cJDJaKSvPUqWNBpx9ILgNC2otc=";
vendorHash = "sha256-ez5qhGgK0q3oDT0L0Fs+JKJjMbNoJukzCoir2a9ro48=";
proxyVendor = true;

3
pkgs/os-specific/darwin/skhd/default.nix
View File

@ -35,7 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
description = "Simple hotkey daemon for macOS";
homepage = "https://github.com/koekeishiya/skhd";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ cmacrae lnl7 periklis khaneliman];
mainProgram = "skhd";
maintainers = with lib.maintainers; [ cmacrae lnl7 periklis khaneliman ];
platforms = lib.platforms.darwin;
};
})

1
pkgs/os-specific/darwin/yabai/default.nix
View File

@ -37,6 +37,7 @@ let
changelog = "https://github.com/koekeishiya/yabai/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
platforms = platforms.darwin;
mainProgram = "yabai";
maintainers = with maintainers; [
cmacrae
shardy

4
pkgs/servers/web-apps/dolibarr/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dolibarr";
version = "16.0.5";
version = "17.0.3";
src = fetchFromGitHub {
owner = "Dolibarr";
repo = "dolibarr";
rev = version;
sha256 = "sha256-+OAkUMwLXZGFPQocJARIG//+0V1Dv5MdZvythbp4KPw=";
sha256 = "sha256-RpmeBoFY2TyYTpHLG2Kx5FezUHzwukj1+SfZhQOqxqU=";
};
dontBuild = true;

4
pkgs/servers/web-apps/netbox/default.nix
View File

@ -26,8 +26,8 @@ in
};
netbox = callPackage generic {
version = "3.5.7";
hash = "sha256-R5P4FOhn7rE6e9H9U3JlE3ms4Svv6ps4c3+ZjE1KwNM=";
version = "3.5.8";
hash = "sha256-i8LwMZYItDG5wz0yVn59710R615i81/KYT58og1Ut6A=";
extraPatches = [
# Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL
./config.patch

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

@ -3,7 +3,6 @@
, groff
, less
, fetchFromGitHub
, fetchpatch
, nix-update-script
, testers
, awscli2
@ -24,31 +23,27 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.13.7"; # N.B: if you change this, check if overrides are still up-to-date
version = "2.13.13"; # 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-SQ9ggHSpQioptic5qjrhCB63t9pld7KGAeCNtq4OJyQ=";
rev = "refs/tags/${version}";
hash = "sha256-0Wx/Ze6W0Fa8OzM79PFu2liSxl1UwuUqIoYT0WhTk5k=";
};
patches = [
# https://github.com/aws/aws-cli/pull/7912
(fetchpatch {
name = "update-flit-core.patch";
url = "https://github.com/aws/aws-cli/commit/83412a4b2ec750bada640a34a87bfe07ce41fb50.patch";
hash = "sha256-uhO6aOSptsARYWuXXEFhx+6rCW5/uGn2KQ15BnhzH68=";
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \
--replace 'flit_core>=3.7.1,<3.8.1' 'flit_core>=3.7.1'
--replace 'flit_core>=3.7.1,<3.8.1' 'flit_core>=3.7.1' \
--replace 'awscrt>=0.16.4,<=0.16.16' 'awscrt>=0.16.4'
# upstream needs pip to build and install dependencies and validates this
substituteInPlace requirements-base.txt \
--replace "wheel==0.38.4" "wheel>=0.38.4" \
--replace "flit_core==3.8.0" "flit_core>=3.8.0"
# Upstream needs pip to build and install dependencies and validates this
# with a configure script, but we don't as we provide all of the packages
# through PYTHONPATH
sed -i '/pip>=/d' requirements/bootstrap.txt
@ -61,18 +56,18 @@ with py.pkgs; buildPythonApplication rec {
propagatedBuildInputs = [
awscrt
bcdoc
botocore
colorama
cryptography
distro
docutils
groff
jmespath
less
prompt-toolkit
pyyaml
rsa
ruamel-yaml
python-dateutil
jmespath
pyyaml
ruamel-yaml
urllib3
];
@ -131,9 +126,9 @@ with py.pkgs; buildPythonApplication rec {
};
meta = with lib; {
description = "Unified tool to manage your AWS services";
homepage = "https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html";
changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst";
description = "Unified tool to manage your AWS services";
license = licenses.asl20;
maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb anthonyroussel ];
mainProgram = "aws";

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

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.151.0";
version = "0.153.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
hash = "sha256-XZo4g66r/pvIHT5XqvQYcwPzrYUGoQKNE2h5skhPzU4=";
hash = "sha256-BB2EPkfp8kcCPkRftKTPnMYqAJT6RSeqBhcjseJQMS8=";
};
vendorHash = "sha256-p+zCwVKUP6igQLR5GycsmF2oNyDfP/EEgg89kBDS1VU=";
vendorHash = "sha256-/aL1mweWPJRjjqzGBcGc7UHcH0ymVANdu2LkpoCTkh0=";
doCheck = false;

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

@ -18,11 +18,11 @@
buildGoModule rec {
pname = "lxd-unwrapped";
version = "5.16";
version = "5.17";
src = fetchurl {
url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz";
hash = "sha256-evtNPZvnx8rzr/tJkEp0E7BhUBWHBSJdMtZJQk3VZI8=";
hash = "sha256-21pw8Q8UYjuxdaKzNXoTanxxyTNRXXbuerIZPIQK4yg=";
};
vendorHash = null;

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "syft";
version = "0.87.0";
version = "0.88.0";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
hash = "sha256-qDeUo/xAGCy/Ih5B8AyiJ7q9aCd5iWNkW7T+0OqAfTY=";
hash = "sha256-A9EYbZigG6TmyYhMjqhpZRaYnR7KzCJpaOBEEaSXWQ4=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -22,7 +22,7 @@ buildGoModule rec {
};
# hash mismatch with darwin
proxyVendor = true;
vendorHash = "sha256-7lrim4N3hT2qkpTIVF1A/GUu5BfJ3Z8A6H1nd8yHwaw=";
vendorHash = "sha256-7KL/Z95Gg2Cy6oUIVS8KLS3DvQYcLCZaxgKbtzR1M1U=";
nativeBuildInputs = [ installShellFiles ];

12
pkgs/tools/backup/rdiff-backup/default.nix
View File

@ -6,22 +6,18 @@ let
in
pypkgs.buildPythonApplication rec {
pname = "rdiff-backup";
version = "2.0.5";
version = "2.2.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-VNFgOOYgFO2RbHHIMDsH0vphpqaAOMoYn8LTFTSw84s=";
sha256 = "sha256-huKCa3hOw+pO8YfZNu5fFSd0IsQHfvoBVu9n4xOeoI4=";
};
# pkg_resources fails to find the version and then falls back to "DEV"
postPatch = ''
substituteInPlace src/rdiff_backup/Globals.py \
--replace 'version = "DEV"' 'version = "${version}"'
'';
nativeBuildInputs = with pypkgs; [ setuptools-scm ];
buildInputs = [ librsync ];
nativeBuildInputs = with pypkgs; [ setuptools-scm ];
propagatedBuildInputs = with pypkgs; [ pyyaml ];
# no tests from pypi
doCheck = false;

26
pkgs/tools/filesystems/catcli/default.nix
View File

@ -1,28 +1,38 @@
{ lib
, fetchFromGitHub
, buildPythonApplication
, docopt, anytree
, python3
}:
buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "catcli";
version = "0.8.7";
version = "0.9.6";
format = "setuptools";
src = fetchFromGitHub {
owner = "deadc0de6";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-hVunxgc/aUapQYe6k3hKdkC+2Jw0x1HjI/kl/fJdWUo=";
hash = "sha256-+/kd7oPT6msojPj25bzG9HwVqPj47gIUg9LngbDc3y8=";
};
propagatedBuildInputs = [ docopt anytree ];
postPatch = "patchShebangs . ";
propagatedBuildInputs = with python3.pkgs; [
anytree
docopt
fusepy
pyfzf
types-docopt
];
nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
];
meta = with lib; {
description = "The command line catalog tool for your offline data";
homepage = "https://github.com/deadc0de6/catcli";
changelog = "https://github.com/deadc0de6/catcli/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ petersjt014 ];
platforms = platforms.all;

1
pkgs/tools/misc/ckb-next/default.nix
View File

@ -50,6 +50,7 @@ mkDerivation rec {
homepage = "https://github.com/ckb-next/ckb-next";
license = licenses.gpl2;
platforms = platforms.linux;
mainProgram = "ckb-next";
maintainers = with maintainers; [ ];
};
}

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

@ -78,11 +78,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3.pkgs.buildPythonApplication rec {
pname = "diffoscope";
version = "247";
version = "248";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
hash = "sha256-sbLny1eK/eyCQKeSUyQc3DTvlHeCp8rAgrx681KjvNQ=";
hash = "sha256-Lub+SIr0EyY4YmPsoLXWavXJhcpmK5VRb6eEnozZ0XQ=";
};
outputs = [

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

@ -42,13 +42,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fastfetch";
version = "2.0.4";
version = "2.0.5";
src = fetchFromGitHub {
owner = "fastfetch-cli";
repo = "fastfetch";
rev = finalAttrs.version;
hash = "sha256-8A00XGKX/dbJElrHQrtoDCEGZJ8ktpFJ6zsxu2qZcxI=";
hash = "sha256-KYicfYpJiO7ZfQ2vlGDKuiNprIwXnxz6Razf3GrjRq8=";
};
nativeBuildInputs = [

176
pkgs/tools/security/nbtscanner/Cargo.lock.patch Normal file
View File

@ -0,0 +1,176 @@
diff --git a/Cargo.lock b/Cargo.lock
index 9b32d00..9767c48 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,39 +1,44 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
+version = 3
+
[[package]]
name = "ansi_term"
-version = "0.10.2"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
[[package]]
name = "assert_matches"
-version = "1.1.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e772942dccdf11b368c31e044e4fca9189f80a773d2f0808379de65894cbf57"
+checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
[[package]]
name = "atty"
-version = "0.2.6"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8352656fd42c30a0c3c89d26dea01e3b77c0ab2af18230835c15e2e13cd51859"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
+ "hermit-abi",
"libc",
- "termion",
"winapi",
]
[[package]]
name = "bitflags"
-version = "1.0.1"
+version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "clap"
-version = "2.29.1"
+version = "2.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4a2b3bb7ef3c672d7c13d15613211d5a6976b6892c598b0fcb5d40765f19c2"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
dependencies = [
"ansi_term",
"atty",
@@ -45,77 +50,60 @@ dependencies = [
]
[[package]]
-name = "libc"
-version = "0.2.36"
+name = "hermit-abi"
+version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e5d97d6708edaa407429faa671b942dc0f2727222fb6b6539bf1db936e4b121"
-
-[[package]]
-name = "nbtscanner"
-version = "0.0.1"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
dependencies = [
- "assert_matches",
- "clap",
+ "libc",
]
[[package]]
-name = "redox_syscall"
-version = "0.1.37"
+name = "libc"
+version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
-name = "redox_termios"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
+name = "nbtscanner"
+version = "0.0.2"
dependencies = [
- "redox_syscall",
+ "assert_matches",
+ "clap",
]
[[package]]
name = "strsim"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
-
-[[package]]
-name = "termion"
-version = "1.5.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
-dependencies = [
- "libc",
- "redox_syscall",
- "redox_termios",
-]
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "textwrap"
-version = "0.9.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
dependencies = [
"unicode-width",
]
[[package]]
name = "unicode-width"
-version = "0.1.4"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "vec_map"
-version = "0.8.0"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "winapi"
-version = "0.3.3"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09fb3b6f248ea4cd42c9a65113a847d612e17505d6ebd1f7357ad68a8bf8693"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
@@ -123,12 +111,12 @@ dependencies = [
[[package]]
name = "winapi-i686-pc-windows-gnu"
-version = "0.3.2"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec6667f60c23eca65c561e63a13d81b44234c2e38a6b6c959025ee907ec614cc"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
-version = "0.3.2"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98f12c52b2630cd05d2c3ffd8e008f7f48252c042b4871c72aed9dc733b96668"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

10
pkgs/tools/security/nbtscanner/default.nix
View File

@ -7,16 +7,20 @@
rustPlatform.buildRustPackage rec {
pname = "nbtscanner";
version = "0.0.1";
version = "0.0.2";
src = fetchFromGitHub {
owner = "jonkgrimes";
repo = pname;
rev = version;
sha256 = "06507a8y41v42cmvjpzimyrzdp972w15fjpc6c6750n1wa2wdl6c";
hash = "sha256-lnTTutOc829COwfNhBkSK8UpiNnGsm7Da53b+eSBt1Q=";
};
cargoSha256 = "0cis54zmr2x0f4z664lmhk9dzx00hvds6jh3x417308sz7ak11gd";
cargoHash = "sha256-NffNQXKJ+b1w7Ar2M6UDev/AxruDEf8IGQ+mNdvU6e4=";
cargoPatches = [
./Cargo.lock.patch
];
buildInputs = lib.optional stdenv.isDarwin Security;

4
pkgs/tools/security/nuclei/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "nuclei";
version = "2.9.12";
version = "2.9.13";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-XLSNBFblgDkGGimwx0KqgHfDOekj7GH81EaKQ106v5U=";
hash = "sha256-mjb7U7F4OZ9nRjtLjZk1s7T+n/VqV/RPMbnGodxRVUE=";
};
vendorHash = "sha256-/1F2aY3cRLRz06s1KXQ6bt7UgaZgiXEjS/5stGi7xIw=";

1
pkgs/tools/typesetting/typst/default.nix
View File

@ -49,5 +49,6 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/typst/typst/releases/tag/${src.rev}";
license = licenses.asl20;
maintainers = with maintainers; [ drupol figsoda kanashimia ];
mainProgram = "typst";
};
}

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

@ -22339,6 +22339,8 @@ with pkgs;
judy = callPackage ../development/libraries/judy { };
kcp = callPackage ../development/libraries/kcp { };
kddockwidgets = libsForQt5.callPackage ../development/libraries/kddockwidgets { };
keybinder = callPackage ../development/libraries/keybinder {

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

@ -254,6 +254,8 @@ lib.makeScope pkgs.newScope (self: with self; {
oci8 = callPackage ../development/php-packages/oci8 { };
opentelemetry = callPackage ../development/php-packages/opentelemetry { };
openswoole = callPackage ../development/php-packages/openswoole { };
pdlib = callPackage ../development/php-packages/pdlib { };

4
pkgs/top-level/python-packages.nix
View File

@ -1689,8 +1689,6 @@ self: super: with self; {
caio = callPackage ../development/python-modules/caio { };
cairo-lang = callPackage ../development/python-modules/cairo-lang { };
cairocffi = callPackage ../development/python-modules/cairocffi { };
cairosvg = callPackage ../development/python-modules/cairosvg { };
@ -13148,6 +13146,8 @@ self: super: with self; {
types-deprecated = callPackage ../development/python-modules/types-deprecated { };
types-docopt = callPackage ../development/python-modules/types-docopt { };
types-docutils = callPackage ../development/python-modules/types-docutils { };
types-enum34 = callPackage ../development/python-modules/types-enum34 { };