Merge branch 'master' into staging-next
This commit is contained in:
Weijia Wang
commit
32da89a1a1
77 changed files with 7334 additions and 228 deletions
|
|
@ -48,6 +48,7 @@ lua-resty-jwt,,,,,,
|
|||
lua-resty-openidc,,,,,,
|
||||
lua-resty-openssl,,,,,,
|
||||
lua-resty-session,,,,,,
|
||||
lua-rtoml,https://github.com/lblasc/lua-rtoml,,,,,lblasc
|
||||
lua-subprocess,https://github.com/0x0ade/lua-subprocess,,,,5.1,scoder12
|
||||
lua-term,,,,,,
|
||||
lua-toml,,,,,,
|
||||
|
|
|
|||
|
|
|
@ -369,7 +369,7 @@ in
|
|||
PrivateDevices = true;
|
||||
PrivateMounts = true;
|
||||
PrivateNetwork = mkDefault false;
|
||||
PrivateUsers = true;
|
||||
PrivateUsers = false; # Enabling this breaks on zfs-2.2.0
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
|
|
|
|||
|
|
@ -899,25 +899,6 @@ in {
|
|||
'';
|
||||
};
|
||||
};
|
||||
|
||||
managementFrameProtection = mkOption {
|
||||
default = "required";
|
||||
type = types.enum ["disabled" "optional" "required"];
|
||||
apply = x:
|
||||
getAttr x {
|
||||
"disabled" = 0;
|
||||
"optional" = 1;
|
||||
"required" = 2;
|
||||
};
|
||||
description = mdDoc ''
|
||||
Management frame protection (MFP) authenticates management frames
|
||||
to prevent deauthentication (or related) attacks.
|
||||
|
||||
- {var}`"disabled"`: No management frame protection
|
||||
- {var}`"optional"`: Use MFP if a connection allows it
|
||||
- {var}`"required"`: Force MFP for all clients
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = let
|
||||
|
|
@ -943,7 +924,8 @@ in {
|
|||
|
||||
# IEEE 802.11i (authentication) related configuration
|
||||
# Encrypt management frames to protect against deauthentication and similar attacks
|
||||
ieee80211w = bssCfg.managementFrameProtection;
|
||||
ieee80211w = mkDefault 1;
|
||||
sae_require_mfp = mkDefault 1;
|
||||
|
||||
# Only allow WPA by default and disable insecure WEP
|
||||
auth_algs = mkDefault 1;
|
||||
|
|
@ -1184,14 +1166,6 @@ in {
|
|||
assertion = (length (attrNames radioCfg.networks) > 1) -> (bssCfg.bssid != null);
|
||||
message = ''hostapd radio ${radio} bss ${bss}: bssid must be specified manually (for now) since this radio uses multiple BSS.'';
|
||||
}
|
||||
{
|
||||
assertion = auth.mode == "wpa3-sae" -> bssCfg.managementFrameProtection == 2;
|
||||
message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE which requires managementFrameProtection="required"'';
|
||||
}
|
||||
{
|
||||
assertion = auth.mode == "wpa3-sae-transition" -> bssCfg.managementFrameProtection != 0;
|
||||
message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE in transition mode with WPA2-SHA256, which requires managementFrameProtection="optional" or ="required"'';
|
||||
}
|
||||
{
|
||||
assertion = countWpaPasswordDefinitions <= 1;
|
||||
message = ''hostapd radio ${radio} bss ${bss}: must use at most one WPA password option (wpaPassword, wpaPasswordFile, wpaPskFile)'';
|
||||
|
|
|
|||
|
|
@ -997,7 +997,7 @@ in
|
|||
virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047MB RAM on 32bit max.
|
||||
'';
|
||||
}
|
||||
{ assertion = cfg.directBoot.initrd != options.virtualisation.directBoot.initrd.default -> cfg.directBoot.enable;
|
||||
{ assertion = cfg.directBoot.enable || cfg.directBoot.initrd == options.virtualisation.directBoot.initrd.default;
|
||||
message =
|
||||
''
|
||||
You changed the default of `virtualisation.directBoot.initrd` but you are not
|
||||
|
|
|
|||
|
|
@ -55,4 +55,5 @@ in
|
|||
};
|
||||
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
security.sudo-rs.wheelNeedsPassword = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,6 +49,6 @@ in appimageTools.wrapType2 rec {
|
|||
homepage = "https://mycrypto.com";
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ oxalica ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
, python3
|
||||
, substituteAll
|
||||
, wrapGAppsHook
|
||||
, libepoxy
|
||||
, zlib
|
||||
}:
|
||||
let
|
||||
|
|
@ -48,12 +49,17 @@ let
|
|||
appdirs
|
||||
beautifulsoup4
|
||||
cachecontrol
|
||||
filelock
|
||||
]
|
||||
# CacheControl requires extra runtime dependencies for FileCache
|
||||
# https://gitlab.com/inkscape/extras/extension-manager/-/commit/9a4acde6c1c028725187ff5972e29e0dbfa99b06
|
||||
++ cachecontrol.optional-dependencies.filecache
|
||||
++ [
|
||||
numpy
|
||||
lxml
|
||||
packaging
|
||||
pillow
|
||||
scour
|
||||
pyparsing
|
||||
pyserial
|
||||
requests
|
||||
pygobject3
|
||||
|
|
@ -61,11 +67,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "inkscape";
|
||||
version = "1.2.2";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz";
|
||||
sha256 = "oMf9DQPAohU15kjvMB3PgN18/B81ReUQZfvxuj7opcQ=";
|
||||
url = "https://inkscape.org/release/inkscape-${version}/source/archive/xz/dl/inkscape-${version}.tar.xz";
|
||||
sha256 = "sha256-v08oawJeAWm4lIzBTVGZqbTCBNdhyJTEtISWVx7HYwc=";
|
||||
};
|
||||
|
||||
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
|
||||
|
|
@ -143,6 +149,7 @@ stdenv.mkDerivation rec {
|
|||
potrace
|
||||
python3Env
|
||||
zlib
|
||||
libepoxy
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
gspell
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
|
|
@ -152,8 +159,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Make sure PyXML modules can be found at run-time.
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape
|
||||
install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview
|
||||
for f in $out/lib/inkscape/*.dylib; do
|
||||
ln -s $f $out/lib/$(basename $f)
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
4
pkgs/applications/misc/bazecor/10-dygma.rules
Normal file
4
pkgs/applications/misc/bazecor/10-dygma.rules
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2201", MODE="0666"
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2200", MODE="0666"
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="35ef", MODE="0666"
|
||||
KERNEL=="hidraw*", ATTRS{idVendor}=="35ef", MODE="0666"
|
||||
56
pkgs/applications/misc/bazecor/default.nix
Normal file
56
pkgs/applications/misc/bazecor/default.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
{ lib
|
||||
, appimageTools
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
appimageTools.wrapAppImage rec {
|
||||
pname = "bazecor";
|
||||
version = "1.3.6";
|
||||
|
||||
src = appimageTools.extract {
|
||||
inherit pname version;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Dygmalab/Bazecor/releases/download/v.${version}/Bazecor-${version}-x64.AppImage";
|
||||
hash = "sha256-Mz7T/AAlyfMzdfy/ZV4AEP3ClTolwr2pPzkSCPL66/w=";
|
||||
};
|
||||
|
||||
# Workaround for https://github.com/Dygmalab/Bazecor/issues/370
|
||||
postExtract = ''
|
||||
substituteInPlace \
|
||||
$out/usr/lib/bazecor/resources/app/.webpack/main/index.js \
|
||||
--replace \
|
||||
'checkUdev=()=>{try{if(c.default.existsSync(f))return c.default.readFileSync(f,"utf-8").trim()===l.trim()}catch(e){console.error(e)}return!1}' \
|
||||
'checkUdev=()=>{return 1}'
|
||||
'';
|
||||
};
|
||||
|
||||
# also make sure to update the udev rules in ./10-dygma.rules; most recently
|
||||
# taken from
|
||||
# https://github.com/Dygmalab/Bazecor/blob/v1.3.6/src/main/utils/udev.ts#L6
|
||||
|
||||
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
|
||||
p.glib
|
||||
];
|
||||
|
||||
# Also expose the udev rules here, so it can be used as:
|
||||
# services.udev.packages = [ pkgs.bazecor ];
|
||||
# to allow non-root modifications to the keyboards.
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/bazecor-* $out/bin/bazecor
|
||||
|
||||
mkdir -p $out/lib/udev/rules.d
|
||||
ln -s --target-directory=$out/lib/udev/rules.d ${./10-dygma.rules}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Graphical configurator for Dygma Products";
|
||||
homepage = "https://github.com/Dygmalab/Bazecor";
|
||||
changelog = "https://github.com/Dygmalab/Bazecor/releases/tag/v${version}";
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ amesgen ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "bazecor";
|
||||
};
|
||||
}
|
||||
|
|
@ -33,7 +33,7 @@ mkDerivation rec {
|
|||
description = "Mail system tray notification icon for Thunderbird";
|
||||
homepage = "https://github.com/gyunaev/birdtray";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ Flakebi oxalica ];
|
||||
maintainers = with maintainers; [ Flakebi ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://hovancik.net/stretchly";
|
||||
downloadPage = "https://hovancik.net/stretchly/downloads/";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ _1000101 oxalica ];
|
||||
maintainers = with maintainers; [ _1000101 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, yubikey-manager
|
||||
, fido2
|
||||
, mss
|
||||
, zxing_cpp
|
||||
, zxing-cpp
|
||||
, pillow
|
||||
, cryptography
|
||||
|
||||
|
|
@ -43,7 +43,7 @@ buildPythonApplication {
|
|||
yubikey-manager
|
||||
fido2
|
||||
mss
|
||||
zxing_cpp
|
||||
zxing-cpp
|
||||
pillow
|
||||
cryptography
|
||||
];
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubectl-cnpg";
|
||||
version = "1.20.2";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudnative-pg";
|
||||
repo = "cloudnative-pg";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JkvaFhzazvuqRJ6ertwMQhp+H2zsjRGA23XbvLCIYg0=";
|
||||
hash = "sha256-FRSypaZex55ABE+e23kvNZFTTn6Z8AEy8ag3atwMdEk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-unOPTQeJW9rUOpZh7gTjD8IZDh4wi04oBAfDO5juJf8=";
|
||||
vendorHash = "sha256-mirnieBrrVwRccJDgelZvSfQaAVlTsttOh3nJBN6ev0=";
|
||||
|
||||
subPackages = [ "cmd/kubectl-cnpg" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ python.pkgs.buildPythonApplication rec {
|
|||
whoosh
|
||||
zipp
|
||||
zope_interface
|
||||
zxing_cpp
|
||||
zxing-cpp
|
||||
]
|
||||
++ redis.optional-dependencies.hiredis
|
||||
++ twisted.optional-dependencies.tls
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.65.4";
|
||||
version = "0.65.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
hash = "sha256-2+1lwaO2+kq/EjJoA4EvGCMLH6iErR9KtWINLoO17+w=";
|
||||
hash = "sha256-NdBs/WyN1WDOJ5tnIYPtQTAm4EdVJj1HXm2KIjOKC7E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitoxide";
|
||||
version = "0.30.0";
|
||||
version = "0.31.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Byron";
|
||||
repo = "gitoxide";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VJZwNLFePUNIRHEyiEr1tiLaB2tuL6Ah81LNuM/1H14=";
|
||||
hash = "sha256-ML0sVsegrG96rBfpnD7GgOf9TWe/ojRo9UJwMFpDsKs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vEp0wLxmmmv33oRO7eOxOoOsV87/7DQ8db5RUfqUb88=";
|
||||
cargoHash = "sha256-gz4VY4a4AK9laIQo2MVTabyKzMyc7jRHrYsrfOLx+Ao=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ checkout_ref(){
|
|||
|
||||
# Update submodules
|
||||
init_submodules(){
|
||||
clean_git submodule update --init --recursive -j ${NIX_BUILD_CORES:-1}
|
||||
clean_git submodule update --init --recursive -j ${NIX_BUILD_CORES:-1} --progress
|
||||
}
|
||||
|
||||
clone(){
|
||||
|
|
|
|||
31
pkgs/by-name/ll/llm-ls/package.nix
Normal file
31
pkgs/by-name/ll/llm-ls/package.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "llm-ls";
|
||||
version = "0.4.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = "llm-ls";
|
||||
rev = version;
|
||||
sha256 = "sha256-aMoT/rH6o4dHCSiSI/btdKysFfIbHvV7R5dRHIOF/Qs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Z6BO4kDtlIrVdDk1fiwyelpu1rj7e4cibgFZRsl1pfA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "LSP server leveraging LLMs for code completion (and more?)";
|
||||
homepage = "https://github.com/huggingface/llm-ls";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jfvillablanca ];
|
||||
platforms = platforms.all;
|
||||
badPlatforms = platforms.darwin;
|
||||
mainProgram = "llm-ls";
|
||||
};
|
||||
}
|
||||
|
|
@ -10,7 +10,7 @@ let
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
|
||||
hash = "sha256-6OAGNkMyHOZI5wh92OtalnvUVFWNAS9PvkFS0e4YXhk=";
|
||||
hash = "sha512-YUddAvsPbuuOvhJZsWDvgF/7yghABU6Av7DcKNX1bKZqE3BzMAAQADJuNuNL4+UydoTaHetXvRO8oJCbrqgtAQ==";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
|
|
@ -30,6 +30,8 @@ appimageTools.wrapType2 rec {
|
|||
--replace 'Icon=launcher' 'Icon=lunar-client'
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free Minecraft client with mods, cosmetics, and performance boost.";
|
||||
homepage = "https://www.lunarclient.com/";
|
||||
12
pkgs/by-name/lu/lunar-client/update.sh
Executable file
12
pkgs/by-name/lu/lunar-client/update.sh
Executable file
|
|
@ -0,0 +1,12 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl yq
|
||||
set -eu -o pipefail
|
||||
|
||||
target="$(dirname "$(readlink -f "$0")")/package.nix"
|
||||
host="https://launcherupdates.lunarclientcdn.com"
|
||||
metadata=$(curl "$host/latest-linux.yml")
|
||||
version=$(echo "$metadata" | yq .version -r)
|
||||
sha512=$(echo "$metadata" | yq .sha512 -r)
|
||||
|
||||
sed -i "s@version = .*;@version = \"$version\";@g" "$target"
|
||||
sed -i "s@hash.* = .*;@hash = \"sha512-$sha512\";@g" "$target"
|
||||
|
|
@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoc
|
||||
];
|
||||
|
|
@ -40,13 +42,16 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
xcbutilwm
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Simple X hotkey daemon";
|
||||
homepage = "https://github.com/baskerville/sxhkd";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ vyp AndersonTorres ncfavier ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.bsd2;
|
||||
mainProgram = "sxhkd";
|
||||
maintainers = with lib.maintainers; [ vyp AndersonTorres ncfavier ];
|
||||
inherit (libxcb.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -11,11 +11,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hills";
|
||||
repo = finalAttrs.pname;
|
||||
repo = "xosview";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-9Pr7voJiCH7oBziMFRHCWxoyuGdndcdRD2POjiNT7yw=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -28,12 +30,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"PLATFORM=linux"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "http://www.pogo.org.uk/~mark/xosview/";
|
||||
description = "A classic system monitoring tool";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = with platforms; linux;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
mainProgram = "xosview";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
})
|
||||
# TODO: generalize to other platforms
|
||||
|
||||
|
|
@ -6,16 +6,18 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xosview2";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/xosview/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-ex1GDBgx9Zzx5tOkZ2IRYskmBh/bUYpRTXHWRoE30vA=";
|
||||
url = "mirror://sourceforge/xosview/xosview2-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-kEp6n9KmZ+6sTFyJr1V8Ssq9aZuh69c4U1YIiqvxIxw=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
buildInputs = [ libX11 ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://xosview.sourceforge.net/index.html";
|
||||
description = "Lightweight graphical operating system monitor";
|
||||
longDescription = ''
|
||||
|
|
@ -35,8 +37,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
connect to it on a network, then you can popup an xosview instance and
|
||||
monitor what is going on.
|
||||
'';
|
||||
license = with licenses; [ gpl2 bsdOriginal ];
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.all;
|
||||
license = with lib.licenses; [ gpl2 bsdOriginal ];
|
||||
mainProgram = "xosview2";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
inherit (libX11.meta) platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = if set != null then "iosevka-${set}" else "iosevka";
|
||||
version = "27.3.2";
|
||||
version = "27.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "be5invis";
|
||||
repo = "iosevka";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-an2/Aqb+5t61CkiBhwL9lA0WPxhIC+tDDjhn8alcqJQ=";
|
||||
hash = "sha256-JsK2jzXyAACh9e3P2y0YLky2XQuR/dKyEbRpFUSnJdM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-BQTM/ea/X2iqRkX510fAzouPNcV7cUmtY7J/CSUMH7o=";
|
||||
npmDepsHash = "sha256-uchJ+1NWbo4FpNOjOO3luhIdZyQZLToZ1UCMLdGzjkY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
remarshal
|
||||
|
|
|
|||
|
|
@ -67,6 +67,8 @@
|
|||
overrides = packageOverrides;
|
||||
python = self;
|
||||
});
|
||||
pythonOnBuildForHost_overridden =
|
||||
pythonOnBuildForHost.override { inherit packageOverrides; self = pythonOnBuildForHost_overridden; };
|
||||
in rec {
|
||||
isPy27 = pythonVersion == "2.7";
|
||||
isPy37 = pythonVersion == "3.7";
|
||||
|
|
@ -89,9 +91,10 @@ in rec {
|
|||
pythonAtLeast = lib.versionAtLeast pythonVersion;
|
||||
pythonOlder = lib.versionOlder pythonVersion;
|
||||
inherit hasDistutilsCxxPatch;
|
||||
# TODO: rename to pythonOnBuild
|
||||
# TODO: deprecate
|
||||
# Not done immediately because its likely used outside Nixpkgs.
|
||||
pythonForBuild = pythonOnBuildForHost.override { inherit packageOverrides; self = pythonForBuild; };
|
||||
pythonForBuild = pythonOnBuildForHost_overridden;
|
||||
pythonOnBuildForHost = pythonOnBuildForHost_overridden;
|
||||
|
||||
tests = callPackage ./tests.nix {
|
||||
python = self;
|
||||
|
|
|
|||
|
|
@ -76,13 +76,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gdal";
|
||||
version = "3.7.2";
|
||||
version = "3.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "gdal";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/7Egbg4Cg5Gqsy+CEMVbs2NCWbdJteDNWelBsrQSUj4=";
|
||||
hash = "sha256-+69mh1hKL1r7SNwDilaQz5UochMMWFG2lrBLYBF31JY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
|
|||
"-DBUILD_SHARED_LIBS=ON"
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc"
|
||||
"-D_gRPC_CPP_PLUGIN=${buildPackages.grpc}/bin/grpc_cpp_plugin"
|
||||
]
|
||||
# The build scaffold defaults to c++14 on darwin, even when the compiler uses
|
||||
# a more recent c++ version by default [1]. However, downgrades are
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lib2geom";
|
||||
version = "1.2.2";
|
||||
version = "1.3";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -23,16 +23,19 @@ stdenv.mkDerivation rec {
|
|||
owner = "inkscape";
|
||||
repo = "lib2geom";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-xkUxcAk8KJkL482R7pvgmCT+5I8aUMm/q25pvK3ZPuY=";
|
||||
hash = "sha256-llUpW8VRBD8RKaGfyedzsMbLRb8DIo0ePt6m2T2w7Po=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixed upstream, remove when the new version releases:
|
||||
# https://gitlab.com/inkscape/lib2geom/-/issues/49
|
||||
# Fix compilation with Clang.
|
||||
# https://gitlab.com/inkscape/lib2geom/-/merge_requests/102
|
||||
(fetchpatch {
|
||||
name = "expect-double-eq-in-choose-test.patch";
|
||||
url = "https://gitlab.com/inkscape/lib2geom/-/commit/5b7c75dd3841cb415f163f0a81f556c57d3e0a83.patch";
|
||||
sha256 = "RMgwJkylrGFTTrqBzqs5j2LMSLsHhcE/UT1pKBZnU50=";
|
||||
url = "https://gitlab.com/inkscape/lib2geom/-/commit/a5b5ac7d992023f8a80535ede60421e73ecd8e20.patch";
|
||||
hash = "sha256-WJYkk3WRYVyPSvyTbKDUrYvUwFgKA9mmTiEWtYQqM4Q=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/inkscape/lib2geom/-/commit/23d9393af4bee17aeb66a3c13bdad5dbed982d08.patch";
|
||||
hash = "sha256-LAaGMIXpDI/Wzv5E2LasW1Y2/G4ukhuEzDmFu3AzZOA=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -60,6 +63,20 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
# TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829
|
||||
checkPhase = let
|
||||
disabledTests =
|
||||
lib.optionals stdenv.isAarch64 [
|
||||
# Broken on all platforms, test just accidentally passes on some.
|
||||
# https://gitlab.com/inkscape/lib2geom/-/issues/63
|
||||
"elliptical-arc-test"
|
||||
];
|
||||
in ''
|
||||
runHook preCheck
|
||||
ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$'
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Easy to use 2D geometry library in C++";
|
||||
homepage = "https://gitlab.com/inkscape/lib2geom";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tbox";
|
||||
version = "1.7.4";
|
||||
version = "1.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tboox";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-b461JNTS7jNI/qawumDjL2vfC4fAaWB7a++9PpUUDB0=";
|
||||
hash = "sha256-VM6LOTVwM47caXYiH+6c7t174i0W5MY1dg2Y5yutlcc=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (python3.pkgs) zxing_cpp;
|
||||
inherit (python3.pkgs) zxing-cpp;
|
||||
};
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
|
|
|
|||
|
|
@ -1414,6 +1414,35 @@ buildLuarocksPackage {
|
|||
};
|
||||
}) {};
|
||||
|
||||
lua-rtoml = callPackage({ luaOlder, luarocks-build-rust-mlua, buildLuarocksPackage, lua, fetchgit }:
|
||||
buildLuarocksPackage {
|
||||
pname = "lua-rtoml";
|
||||
version = "0.2-0";
|
||||
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/lblasc/lua-rtoml.git",
|
||||
"rev": "e59ad00f5df8426767ddfb355f4ba6093468a168",
|
||||
"date": "2023-11-02T14:17:41+01:00",
|
||||
"path": "/nix/store/ynn6bvnwyqrackvyxzysxy294gh9prg1-lua-rtoml",
|
||||
"sha256": "1y2ncdl3mpwqc1h5xm0rf9g1ns2vswgqffsj9sqrqidmg984jkr4",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
'') ["date" "path"]) ;
|
||||
|
||||
disabled = (luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua luarocks-build-rust-mlua ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/lblasc/lua-rtoml";
|
||||
description = "Lua bindings for the Rust toml crate.";
|
||||
maintainers = with lib.maintainers; [ lblasc ];
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
lua-subprocess = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "subprocess";
|
||||
|
|
|
|||
|
|
@ -401,6 +401,17 @@ with prev;
|
|||
meta.broken = luaOlder "5.1" || luaAtLeast "5.4";
|
||||
});
|
||||
|
||||
lua-rtoml = prev.lua-rtoml.overrideAttrs (oa: {
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
src = oa.src;
|
||||
hash = "sha256-EcP4eYsuOVeEol+kMqzsVHd8F2KoBdLzf6K0KsYToUY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = oa.propagatedBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ];
|
||||
|
||||
});
|
||||
|
||||
lush-nvim = prev.lush-nvim.overrideAttrs (drv: {
|
||||
doCheck = false;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiocomelit";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "chemelli74";
|
||||
repo = "aiocomelit";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-o8i1H4MsK21kJVbLD22PAUqj5Q9k31JfdZQYARPQICc=";
|
||||
hash = "sha256-/nixEjCQED1R2Z+iNs+bvxa6T+bPJ0b5Hn5vMO+v46Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "amqp";
|
||||
version = "5.1.1";
|
||||
version = "5.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-LBsT/swIk+lGxly9XzZCeGHP+k6iIB2Pb8oi4qNzteI=";
|
||||
hash = "sha256-oez/QlrQY61CpIbJAoB9FIIxFIHIrZWnJpSyl1519/0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -44,6 +44,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project";
|
||||
homepage = "https://github.com/celery/py-amqp";
|
||||
changelog = "https://github.com/celery/py-amqp/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boschshcpy";
|
||||
version = "0.2.73";
|
||||
version = "0.2.75";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tschamm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-DHH9VZWnQaLWEiZSrU4y2/jlqhvUvoKRjWpBTz01m8k=";
|
||||
hash = "sha256-T3QTNnnkquv0IurwNtblX9CF/gLeMONEFfbJV/n/Wj4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
, fetchPypi
|
||||
, fetchurl
|
||||
, minexr
|
||||
, opencv3
|
||||
, opencv4
|
||||
, python3Packages
|
||||
, requests
|
||||
, runCommand
|
||||
|
|
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
|||
minexr
|
||||
zcs
|
||||
requests
|
||||
opencv3
|
||||
opencv4
|
||||
boxx
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,15 +10,16 @@
|
|||
, pandas
|
||||
, tabulate
|
||||
, click
|
||||
, pdfminer
|
||||
, pdfminer-six
|
||||
, pypdf
|
||||
, opencv3
|
||||
, opencv4
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "camelot-py";
|
||||
version = "0.11.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -27,16 +28,18 @@ buildPythonPackage rec {
|
|||
hash = "sha256-l6fZBtaF5AWaSlSaY646UfCrcqPIJlV/hEPGWhGB3+Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
charset-normalizer
|
||||
chardet
|
||||
pandas
|
||||
tabulate
|
||||
click
|
||||
pdfminer
|
||||
pdfminer-six
|
||||
openpyxl
|
||||
pypdf
|
||||
opencv3
|
||||
opencv4
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cobs";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2TsQtTcNyIaJYK77cK2x9zpOYQexaRgwekru79PtuPY=";
|
||||
hash = "sha256-Kvf4eRzeGufGuTb10MNf4p/rEN4l95wVsK8NZyl4PMA=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-crispy-forms";
|
||||
version = "2.0";
|
||||
version = "2.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "django-crispy-forms";
|
||||
repo = "django-crispy-forms";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-oxOW7gFpjUehWGeqZZjhPwptX0Gpgj5lP0lw0zkYGuE=";
|
||||
hash = "sha256-UQ5m0JWir20TdLgS+DVVLcMBlIEIfmzv8pkMJtaC0LA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-ipware";
|
||||
version = "5.0.0";
|
||||
version = "5.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-T6VgfuheEu5eFYvHVp/x4TT7FXloGqH/Pw7QS+Ib4VM=";
|
||||
hash = "sha256-qzq3ZF5nTfaCwRRqW936UVGxt7576SEIcsMVa9g2qtQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "djangorestframework-dataclasses";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxan";
|
||||
repo = "djangorestframework-dataclasses";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aUz+f8Q7RwQsoRpjq1AAmNtDzTA6KKxyc+MtBJEfyL8=";
|
||||
hash = "sha256-12EdSaGpsX0qDXgJ2QWYj6qAUbsrITQjWowk+gJFwwY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "duckduckgo-search";
|
||||
version = "3.8.5";
|
||||
version = "3.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deedy5";
|
||||
repo = "duckduckgo_search";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FOGMqvr5+O3+UTdM0m1nJBAcemP6hpAOXv0elvnCUHU=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-R96ezs0INIZAXTcD1eWXuj4MSJvCbtbgzgC3ls7wYyI=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvclive";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-qPGtYMpUFGQfSYEPabn4eC74lmr8xvet07RR5brV5No=";
|
||||
hash = "sha256-Z1Nxdz4/45uSypufuwDGiCeUwl+izRGIDA2s9F+jT1Q=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, hdf5
|
||||
, numpy
|
||||
, onnx
|
||||
, opencv3
|
||||
, opencv4
|
||||
, pillow
|
||||
, pyaml
|
||||
, pyclipper
|
||||
|
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [
|
||||
hdf5
|
||||
numpy
|
||||
opencv3
|
||||
opencv4
|
||||
pillow
|
||||
pyaml
|
||||
pyclipper
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
, protobuf
|
||||
}:
|
||||
let
|
||||
version = "0.2.30";
|
||||
version = "0.2.32";
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "fschat";
|
||||
|
|
@ -40,7 +40,7 @@ buildPythonPackage {
|
|||
owner = "lm-sys";
|
||||
repo = "FastChat";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SkrdRpmbxnt/Xn8TTmozxhr3fPeAFPP7X0cM9vJC9Sc=";
|
||||
hash = "sha256-3IJcqVULOK0Nf72sgv80q9U8QZ3pNHLYaNwCQohdBB8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-channelz";
|
||||
version = "1.59.0";
|
||||
version = "1.59.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-H25CEs6JW+gnpuGJe88vSh0h5ETKMT8lxEgfViExhMk=";
|
||||
hash = "sha256-apOnMd8EDU+ocj6fL/dkl3tqh6en/Q8H9K/lgvkqFN8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-reflection";
|
||||
version = "1.59.0";
|
||||
version = "1.59.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-H+jw3WwYD9z04SztKo94TZx0HMvAsZhYWx3wJLf48/I=";
|
||||
hash = "sha256-l5bcvFnc+59tVGXVnn+mKld3o+TVqolPRIVciWpG+os=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, numpy
|
||||
, scikit-image
|
||||
, lib
|
||||
, opencv3
|
||||
, opencv4
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scikit-image
|
||||
opencv3
|
||||
opencv4
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
, fetchFromGitHub
|
||||
, lib
|
||||
, numpy
|
||||
, opencv3
|
||||
, sphinx-rtd-theme
|
||||
, opencv4
|
||||
, lxml
|
||||
, xmljson
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -21,8 +21,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
opencv3
|
||||
sphinx-rtd-theme
|
||||
opencv4
|
||||
lxml
|
||||
xmljson
|
||||
];
|
||||
|
|
@ -32,8 +31,7 @@ buildPythonPackage rec {
|
|||
--replace "'opencv-python>=3'," ""
|
||||
'';
|
||||
|
||||
# failing on NixOS
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "imantics" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ index 036232b..d2e7829 100755
|
|||
- if os.path.exists(profile):
|
||||
- return profile
|
||||
- return "/usr/share/color/icc/sRGB.icc"
|
||||
+ return "@colord@/share/color/icc/colord/sRGB.icc"
|
||||
+ return "@srgbProfile@"
|
||||
|
||||
|
||||
def get_main_parser():
|
||||
|
|
|
|||
|
|
@ -38,7 +38,10 @@ buildPythonPackage rec {
|
|||
patches = [
|
||||
(substituteAll {
|
||||
src = ./default-icc-profile.patch;
|
||||
inherit colord;
|
||||
srgbProfile = if stdenv.isDarwin then
|
||||
"/System/Library/ColorSync/Profiles/sRGB Profile.icc"
|
||||
else
|
||||
"${colord}/share/color/icc/colord/sRGB.icc";
|
||||
})
|
||||
(fetchpatch {
|
||||
# https://gitlab.mister-muffin.de/josch/img2pdf/issues/178
|
||||
|
|
@ -57,6 +60,12 @@ buildPythonPackage rec {
|
|||
pillow
|
||||
];
|
||||
|
||||
# FIXME: Only add "sRGB Profile.icc" to __impureHostDeps once
|
||||
# https://github.com/NixOS/nix/issues/9301 is fixed.
|
||||
__impureHostDeps = lib.optionals stdenv.isDarwin [
|
||||
"/System/Library/ColorSync/Profiles"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
exiftool
|
||||
ghostscript
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, opencv3
|
||||
, opencv4
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
|||
sha256 = "03827a9fca8b5c540305c0844a62591cf35a0caec199cb0f2f0a4a0fb15d8f24";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ opencv3 ];
|
||||
propagatedBuildInputs = [ opencv4 ];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, inkscape
|
||||
, fetchFromGitLab
|
||||
, poetry-core
|
||||
, cssselect
|
||||
|
|
@ -8,6 +9,7 @@
|
|||
, packaging
|
||||
, pillow
|
||||
, pygobject3
|
||||
, pyparsing
|
||||
, pyserial
|
||||
, scour
|
||||
, gobject-introspection
|
||||
|
|
@ -15,24 +17,13 @@
|
|||
, gtk3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "inkex";
|
||||
version = "1.2.2";
|
||||
inherit (inkscape) version;
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "inkscape";
|
||||
repo = "extensions";
|
||||
rev = "EXTENSIONS_AT_INKSCAPE_${version}";
|
||||
hash = "sha256-jw7daZQTBxLHWOpjZkMYtP1vIQvd/eLgiktWqVSjEgU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '"1.2.0"' '"${version}"' \
|
||||
--replace 'scour = "^0.37"' 'scour = ">=0.37"'
|
||||
'';
|
||||
inherit (inkscape) src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
|
|
@ -42,11 +33,8 @@ buildPythonPackage rec {
|
|||
cssselect
|
||||
lxml
|
||||
numpy
|
||||
packaging
|
||||
pillow
|
||||
pygobject3
|
||||
pyserial
|
||||
scour
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "inkex" ];
|
||||
|
|
@ -58,6 +46,10 @@ buildPythonPackage rec {
|
|||
|
||||
checkInputs = [
|
||||
gtk3
|
||||
packaging
|
||||
pillow
|
||||
pyparsing
|
||||
scour
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
|
@ -74,6 +66,13 @@ buildPythonPackage rec {
|
|||
"tests/test_inkex_gui_pixmaps.py"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cd share/extensions
|
||||
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'scour = "^0.37"' 'scour = ">=0.37"'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Library for manipulating SVG documents which is the basis for Inkscape extensions";
|
||||
homepage = "https://gitlab.com/inkscape/extensions";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
, tqdm
|
||||
# Advanced image processing (triples size of output)
|
||||
, advancedProcessing ? false
|
||||
, opencv3
|
||||
, scikit-image
|
||||
, scikit-learn
|
||||
, scipy
|
||||
|
|
@ -47,7 +46,6 @@ buildPythonPackage rec {
|
|||
requests
|
||||
proglog
|
||||
] ++ lib.optionals advancedProcessing [
|
||||
opencv3
|
||||
scikit-image
|
||||
scikit-learn
|
||||
scipy
|
||||
|
|
|
|||
|
|
@ -1,13 +1,17 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, jax
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, jaxlib
|
||||
, jax
|
||||
, numpy
|
||||
, parameterized
|
||||
, pillow
|
||||
, scipy
|
||||
, tensorboard
|
||||
, keras
|
||||
, pytestCheckHook
|
||||
, tensorflow
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -17,10 +21,17 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "objax";
|
||||
rev = "v${version}";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1/XmxFZfU+XMD0Mlcv4xTUYZDwltAx1bZOlPuKWQQC0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch { # https://github.com/google/objax/pull/266
|
||||
url = "https://github.com/google/objax/pull/266/commits/a1bcb71ebd92c94fec98222349d7cd57048e541d.patch";
|
||||
hash = "sha256-MO9/LAxbghjhRU8sbYWm3xa4RPuU+5m74YU3n3hJ09s=";
|
||||
})
|
||||
];
|
||||
|
||||
# Avoid propagating the dependency on `jaxlib`, see
|
||||
# https://github.com/NixOS/nixpkgs/issues/156767
|
||||
buildInputs = [
|
||||
|
|
@ -40,6 +51,25 @@ buildPythonPackage rec {
|
|||
"objax"
|
||||
];
|
||||
|
||||
# This is necessay to ignore the presence of two protobufs version (tensorflow is bringing an
|
||||
# older version).
|
||||
catchConflicts = false;
|
||||
|
||||
nativeCheckInputs = [
|
||||
keras
|
||||
pytestCheckHook
|
||||
tensorflow
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests/*.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Test requires internet access for prefetching some weights
|
||||
"test_pretrained_keras_weight_0_ResNet50V2"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Objax is a machine learning framework that provides an Object Oriented layer for JAX.";
|
||||
homepage = "https://github.com/google/objax";
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ in buildPythonPackage (rec {
|
|||
] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
|
||||
sip
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
buildPackages.python3Packages.sip
|
||||
python.pythonOnBuildForHost.pkgs.sip
|
||||
] ++ [
|
||||
qtbase
|
||||
qtsvg
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-on-whales";
|
||||
version = "0.65.0";
|
||||
version = "0.66.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "gabrieldemarmiesse";
|
||||
repo = "python-on-whales";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aFE4qeNMSxhHs7IAjYQYl15s4NkHH8balTV3N0obNPs=";
|
||||
hash = "sha256-Y18NospSDcr9K93xS24vKTnrT8DT1GPRX78clZB040E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlite-utils";
|
||||
version = "3.35.1";
|
||||
version = "3.35.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4PA+aXawW9t6XFZFSXGg6YD8Ftv9NRK7073KxPDkNw4=";
|
||||
hash = "sha256-WQsUrSd5FMs/x9XiVHZIR/rNqqI8e6/YXsk4dPb0IUM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
, nose
|
||||
, numba
|
||||
, numpy
|
||||
, opencv3
|
||||
, opencv4
|
||||
, pandas
|
||||
, pims
|
||||
, pyqt5
|
||||
|
|
@ -48,7 +48,7 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
opencv3
|
||||
opencv4
|
||||
pyqt5
|
||||
pyqtgraph
|
||||
numpy
|
||||
|
|
@ -84,5 +84,6 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/portugueslab/stytra";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ tbenst ];
|
||||
broken = true; # incompatible with pyqtgraph>0.13.0: https://github.com/portugueslab/stytra/issues/87
|
||||
};
|
||||
}
|
||||
|
|
|
|||
53
pkgs/development/python-modules/zxing-cpp/default.nix
Normal file
53
pkgs/development/python-modules/zxing-cpp/default.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, cmake
|
||||
, setuptools-scm
|
||||
, numpy
|
||||
, pillow
|
||||
, pybind11
|
||||
, libzxing-cpp
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zxing-cpp";
|
||||
inherit (libzxing-cpp) src version meta;
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/wrappers/python";
|
||||
|
||||
# we don't need pybind11 in the root environment
|
||||
# https://pybind11.readthedocs.io/en/stable/installing.html#include-with-pypi
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "pybind11[global]" "pybind11"
|
||||
'';
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pybind11
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pillow
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"test.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"zxingcpp"
|
||||
];
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, cmake
|
||||
, numpy
|
||||
, pillow
|
||||
, pybind11
|
||||
, zxing-cpp
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zxing_cpp";
|
||||
inherit (zxing-cpp) src version meta;
|
||||
|
||||
sourceRoot = "${src.name}/wrappers/python";
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pybind11
|
||||
numpy
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pillow
|
||||
];
|
||||
}
|
||||
|
|
@ -166,6 +166,6 @@ rustPlatform.buildRustPackage {
|
|||
* Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ oxalica Profpatsch ];
|
||||
maintainers = with maintainers; [ Profpatsch ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wasmedge";
|
||||
version = "0.13.4";
|
||||
version = "0.13.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WasmEdge";
|
||||
repo = "WasmEdge";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-2EKUnRvd1w1TxO7OFKYpTzSXC3fdIU7Jk0MIPPTY96U=";
|
||||
sha256 = "sha256-JaFaqYIwcRXYl5JukAfViUn8VTpMPThFO8EaVTPIudA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
, SDL2
|
||||
, lttng-ust
|
||||
, numactl
|
||||
, dotnetCorePackages
|
||||
, libglvnd
|
||||
, xorg
|
||||
, udev
|
||||
|
|
@ -84,7 +83,7 @@ buildDotnetModule rec {
|
|||
cc-by-nc-40
|
||||
unfreeRedistributable # osu-framework contains libbass.so in repository
|
||||
];
|
||||
maintainers = with maintainers; [ oxalica thiagokokada ];
|
||||
maintainers = with maintainers; [ thiagokokada ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "osu!";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, kernel, kernelAtLeast }:
|
||||
{ stdenv, lib, fetchFromGitHub, kernel }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "isgx-${version}-${kernel.version}";
|
||||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://github.com/intel/linux-sgx-driver";
|
||||
license = with licenses; [ bsd3 /* OR */ gpl2Only ];
|
||||
maintainers = with maintainers; [ oxalica ];
|
||||
maintainers = [ ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
165
pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild
Normal file
165
pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild
Normal file
|
|
@ -0,0 +1,165 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# We're faking a `nix build` command-line to re-use Nix's own completion
|
||||
# for the few options passed through to Nix.
|
||||
_nixos-rebuild_pretend-nix() {
|
||||
COMP_LINE="nix build ${COMP_LINE}"
|
||||
# number of prepended chars
|
||||
(( COMP_POINT = COMP_POINT + 10))
|
||||
|
||||
COMP_WORDS=(
|
||||
nix build
|
||||
"${COMP_WORDS[@]}"
|
||||
)
|
||||
# Add the amount of prepended words
|
||||
(( COMP_CWORD = COMP_CWORD + 2))
|
||||
_complete_nix "nix"
|
||||
}
|
||||
|
||||
_nixos-rebuild() {
|
||||
local curr="$2"
|
||||
local prev="$3"
|
||||
local subcommandGiven=0
|
||||
local word
|
||||
local subcommand
|
||||
|
||||
__load_completion nix
|
||||
|
||||
# Arrays are re-ordered by the completion, so it's fine to sort them in logical chunks
|
||||
local all_args=(
|
||||
--verbose -v
|
||||
|
||||
# nixos-rebuild options
|
||||
--fast
|
||||
--no-build-nix
|
||||
--profile-name -p # name
|
||||
--rollback
|
||||
--specialisation -c # name
|
||||
--use-remote-sudo
|
||||
--build-host # host
|
||||
--target-host # host
|
||||
# Used with list-generations
|
||||
--json
|
||||
|
||||
# generation switching options
|
||||
--install-bootloader
|
||||
|
||||
# nix-channel options
|
||||
--upgrade
|
||||
--upgrade-all
|
||||
|
||||
# flakes options
|
||||
--commit-lock-file
|
||||
--flake # flake-uri
|
||||
--override-input # input-name flake-uri
|
||||
--recreate-lock-file
|
||||
--update-input
|
||||
--no-flake
|
||||
--no-registries
|
||||
--no-update-lock-file
|
||||
--no-write-lock-file
|
||||
|
||||
# Nix-copy options
|
||||
--use-substitutes --substitute-on-destination -s
|
||||
|
||||
# Nix options
|
||||
--option
|
||||
--impure
|
||||
--builders # builder-spec
|
||||
--show-trace
|
||||
--keep-failed -K
|
||||
--keep-going -k
|
||||
--max-jobs -j # number
|
||||
--log-format # format
|
||||
-I # NIX_PATH
|
||||
)
|
||||
|
||||
local all_subcommands=(
|
||||
boot
|
||||
build
|
||||
build-vm
|
||||
build-vm-with-bootloader
|
||||
dry-activate
|
||||
dry-build
|
||||
edit
|
||||
list-generations
|
||||
switch
|
||||
test
|
||||
)
|
||||
|
||||
# Suggest arguments that can be consumed under some conditions only
|
||||
for word in "${COMP_WORDS[@]}"; do
|
||||
for subcommand in "${all_subcommands[@]}"; do
|
||||
if [[ "$word" == "$subcommand" ]]; then
|
||||
subcommandGiven=1
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
# Fake out a way to complete the second arg to some options
|
||||
case "${COMP_WORDS[COMP_CWORD-2]}" in
|
||||
"--override-input")
|
||||
prev="--override-input_2"
|
||||
;;
|
||||
"--option")
|
||||
prev="--option_2"
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$prev" in
|
||||
--max-jobs|-j)
|
||||
COMPREPLY=( )
|
||||
;;
|
||||
|
||||
--profile-name|-p)
|
||||
if [[ "$curr" == "" ]]; then
|
||||
COMPREPLY=( /nix/var/nix/profiles/* )
|
||||
else
|
||||
COMPREPLY=( "$curr"* )
|
||||
fi
|
||||
;;
|
||||
|
||||
--build-host|--target-host|-t|-h)
|
||||
_known_hosts_real "$curr"
|
||||
;;
|
||||
|
||||
--specialisation|-c)
|
||||
COMPREPLY=()
|
||||
;;
|
||||
|
||||
-I)
|
||||
_nixos-rebuild_pretend-nix
|
||||
;;
|
||||
--builders)
|
||||
_nixos-rebuild_pretend-nix
|
||||
;;
|
||||
--flake)
|
||||
_nixos-rebuild_pretend-nix
|
||||
;;
|
||||
--override-input)
|
||||
_nixos-rebuild_pretend-nix
|
||||
;;
|
||||
--override-input_2)
|
||||
_nixos-rebuild_pretend-nix
|
||||
;;
|
||||
--log-format)
|
||||
_nixos-rebuild_pretend-nix
|
||||
;;
|
||||
--option)
|
||||
_nixos-rebuild_pretend-nix
|
||||
;;
|
||||
--option_2)
|
||||
_nixos-rebuild_pretend-nix
|
||||
;;
|
||||
|
||||
*)
|
||||
if [[ "$curr" == -* ]] || (( subcommandGiven )); then
|
||||
COMPREPLY=( $(compgen -W "${all_args[*]}" -- "$2") )
|
||||
else
|
||||
COMPREPLY=( $(compgen -W "${all_subcommands[*]}" -- "$2") )
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
complete -F _nixos-rebuild nixos-rebuild
|
||||
|
|
@ -28,6 +28,9 @@ substituteAll {
|
|||
];
|
||||
postInstall = ''
|
||||
installManPage ${./nixos-rebuild.8}
|
||||
|
||||
installShellCompletion \
|
||||
--bash ${./_nixos-rebuild}
|
||||
'';
|
||||
|
||||
# run some a simple installer tests to make sure nixos-rebuild still works for them
|
||||
|
|
|
|||
|
|
@ -117,11 +117,11 @@ while [ "$#" -gt 0 ]; do
|
|||
specialisation="$1"
|
||||
shift 1
|
||||
;;
|
||||
--build-host|h)
|
||||
--build-host)
|
||||
buildHost="$1"
|
||||
shift 1
|
||||
;;
|
||||
--target-host|t)
|
||||
--target-host)
|
||||
targetHost="$1"
|
||||
shift 1
|
||||
;;
|
||||
|
|
|
|||
6715
pkgs/servers/kanidm/Cargo.lock
generated
Normal file
6715
pkgs/servers/kanidm/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -19,17 +19,23 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanidm";
|
||||
version = "1.1.0-beta.13";
|
||||
version = "1.1.0-rc.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
# Latest 1.1.0-beta.13 tip
|
||||
rev = "5d1e2f90e6901017ab3ef9b5fbc10e25a5451fd2";
|
||||
hash = "sha256-70yeHVOrCuC+H96UC84kly3CCQ+y1RGzF5K/2FIag/o=";
|
||||
# Latest 1.1.0-rc.15 tip
|
||||
rev = "a5ca8018e3a636dbb0a79b3fd869db059d92979d";
|
||||
hash = "sha256-PFGoeGn7a/lVR6rOmOKA3ydAoo3/+9RlkwBAKS22Psg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Qdc+E5+k9NNE4s6eAnpkam56pc2JJPahkuT4lB328cY=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"base64urlsafedata-0.1.3" = "sha256-D+u4CIhx8BNyx+EH1efS4mrinjeSJopWCteSaMY1kh8=";
|
||||
"sshkeys-0.3.2" = "sha256-CNG9HW8kSwezAdIYW+CR5rqFfmuso4R0+m4OpIyXbSM=";
|
||||
};
|
||||
};
|
||||
|
||||
KANIDM_BUILD_PROFILE = "release_nixos_${arch}";
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postPatch = ''
|
||||
# Nix 2.4+ provides its own completion for the nix command, see https://github.com/hedning/nix-bash-completions/issues/20
|
||||
substituteInPlace _nix --replace 'nix nixos-option' 'nixos-option'
|
||||
# NixOS provides its own completions for nixos-rebuild now.
|
||||
substituteInPlace _nix \
|
||||
--replace 'nix nixos-option' 'nixos-option' \
|
||||
--replace 'nixos-rebuild nixos-install' 'nixos-install'
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "carapace";
|
||||
version = "0.28.2";
|
||||
version = "0.28.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rsteube";
|
||||
repo = "${pname}-bin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ojcQ69FxU7luxYzKxnblwQgX0sapFJS8YNalMdTuzCo=";
|
||||
hash = "sha256-d56tA+tTlnwE9t0toJCCpRwNXGNwNVastdcJPunCO0c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jbKF68fPwMigKSoSOP6pJMjn+PW2yeI/oZKv2ytoHuY=";
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "restic";
|
||||
version = "0.16.1";
|
||||
version = "0.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "restic";
|
||||
repo = "restic";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sMxOZEnZr2UdhmwLXQnggQzw+pXcoWmqqADlQ0yDhj8=";
|
||||
hash = "sha256-Qrbg8/f1ne+7c+mnUc/8CoZBjiGLohJXnu0cnc0pT4g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocserv";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "openconnect";
|
||||
repo = "ocserv";
|
||||
rev = version;
|
||||
sha256 = "sha256-mYf0cdWIxRSDGvszlFDex2SU6TtvodD1sXcUZOOcYd0=";
|
||||
sha256 = "sha256-wVHmELB70TkHxm+yYaLxOk/hABYwxBm7GOIPw7QXqu8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook gperf pkg-config ronn ];
|
||||
|
|
|
|||
|
|
@ -342,6 +342,8 @@ with pkgs;
|
|||
|
||||
bakelite = callPackage ../tools/backup/bakelite { };
|
||||
|
||||
bazecor = callPackage ../applications/misc/bazecor { };
|
||||
|
||||
bearer = callPackage ../development/tools/bearer { };
|
||||
|
||||
benthos = callPackage ../development/tools/benthos { };
|
||||
|
|
@ -34269,7 +34271,6 @@ with pkgs;
|
|||
shotcut = libsForQt5.callPackage ../applications/video/shotcut { };
|
||||
|
||||
shogun = callPackage ../applications/science/machine-learning/shogun {
|
||||
opencv = opencv3;
|
||||
protobuf = protobuf_21;
|
||||
};
|
||||
|
||||
|
|
@ -34321,8 +34322,6 @@ with pkgs;
|
|||
|
||||
sndpeek = callPackage ../applications/audio/sndpeek { };
|
||||
|
||||
sxhkd = callPackage ../tools/X11/sxhkd { };
|
||||
|
||||
mpop = callPackage ../applications/networking/mpop {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
|
@ -37478,8 +37477,6 @@ with pkgs;
|
|||
|
||||
ltris = callPackage ../games/lgames/ltris { };
|
||||
|
||||
lunar-client = callPackage ../games/lunar-client { };
|
||||
|
||||
maelstrom = callPackage ../games/maelstrom { };
|
||||
|
||||
mar1d = callPackage ../games/mar1d { } ;
|
||||
|
|
@ -41534,10 +41531,6 @@ with pkgs;
|
|||
|
||||
xosd = callPackage ../misc/xosd { };
|
||||
|
||||
xosview = callPackage ../tools/X11/xosview { };
|
||||
|
||||
xosview2 = callPackage ../tools/X11/xosview2 { };
|
||||
|
||||
xow_dongle-firmware = callPackage ../os-specific/linux/firmware/xow_dongle-firmware { };
|
||||
|
||||
xpad = callPackage ../applications/misc/xpad { };
|
||||
|
|
|
|||
|
|
@ -248,6 +248,7 @@ mapAliases ({
|
|||
Nuitka = nuitka; # added 2023-02-19
|
||||
ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead.";
|
||||
openapi-schema-pydantic = throw "openapi-schema-pydantic has been removed, since it is no longer maintained"; # added 2023-10-30
|
||||
opencv3 = throw "opencv3 has been removed as it is obsolete"; # added 2023-10-12
|
||||
opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16
|
||||
ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28
|
||||
pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19
|
||||
|
|
@ -452,4 +453,5 @@ mapAliases ({
|
|||
zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29
|
||||
zope_lifecycleevent = zope-lifecycleevent; # added 2023-10-11
|
||||
zope_proxy = zope-proxy; # added 2023-10-07
|
||||
zxing_cpp = zxing-cpp; # added 2023-11-05
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8446,11 +8446,6 @@ self: super: with self; {
|
|||
|
||||
opencontainers = callPackage ../development/python-modules/opencontainers { };
|
||||
|
||||
opencv3 = toPythonModule (pkgs.opencv3.override {
|
||||
enablePython = true;
|
||||
pythonPackages = self;
|
||||
});
|
||||
|
||||
opencv4 = toPythonModule (pkgs.opencv4.override {
|
||||
enablePython = true;
|
||||
pythonPackages = self;
|
||||
|
|
@ -16108,5 +16103,7 @@ self: super: with self; {
|
|||
|
||||
zxcvbn = callPackage ../development/python-modules/zxcvbn { };
|
||||
|
||||
zxing_cpp = callPackage ../development/python-modules/zxing_cpp { };
|
||||
zxing-cpp = callPackage ../development/python-modules/zxing-cpp {
|
||||
libzxing-cpp = pkgs.zxing-cpp;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue