mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 03:12:51 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
700540c4fb
@ -8166,6 +8166,17 @@
|
||||
githubId = 56316606;
|
||||
name = "Amneesh Singh";
|
||||
};
|
||||
nazarewk = {
|
||||
name = "Krzysztof Nazarewski";
|
||||
email = "3494992+nazarewk@users.noreply.github.com";
|
||||
matrix = "@nazarewk:matrix.org";
|
||||
github = "nazarewk";
|
||||
githubId = 3494992;
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0x916D8B67241892AE";
|
||||
fingerprint = "4BFF 0614 03A2 47F0 AA0B 4BC4 916D 8B67 2418 92AE";
|
||||
}];
|
||||
};
|
||||
nbren12 = {
|
||||
email = "nbren12@gmail.com";
|
||||
github = "nbren12";
|
||||
|
||||
@ -36,6 +36,13 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
async = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Whether to fetch suggestions asynchronously";
|
||||
example = false;
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = with types; attrsOf str;
|
||||
default = {};
|
||||
@ -56,6 +63,7 @@ in
|
||||
|
||||
export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}"
|
||||
export ZSH_AUTOSUGGEST_STRATEGY=("${cfg.strategy}")
|
||||
${optionalString (!cfg.async) "unset ZSH_AUTOSUGGEST_USE_ASYNC"}
|
||||
|
||||
${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)}
|
||||
'';
|
||||
|
||||
@ -314,6 +314,9 @@ let
|
||||
if [ -e renewed ]; then
|
||||
rm renewed
|
||||
${data.postRun}
|
||||
${optionalString (data.reloadServices != [])
|
||||
"systemctl --no-block try-reload-or-restart ${escapeShellArgs data.reloadServices}"
|
||||
}
|
||||
fi
|
||||
'');
|
||||
};
|
||||
@ -474,6 +477,15 @@ let
|
||||
description = "Group running the ACME client.";
|
||||
};
|
||||
|
||||
reloadServices = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = ''
|
||||
The list of systemd services to call <code>systemctl try-reload-or-restart</code>
|
||||
on.
|
||||
'';
|
||||
};
|
||||
|
||||
postRun = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
|
||||
@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
|
||||
downloadPage = "https://app-updates.agilebits.com/product_history/CLI";
|
||||
maintainers = with maintainers; [ joelburget marsam ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
||||
26
pkgs/applications/misc/cfm/default.nix
Normal file
26
pkgs/applications/misc/cfm/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cfm";
|
||||
version = "0.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "willeccles";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uXL0RO9P+NYSZ0xCv91KzjHOJJI500YUT8IJkFS86pE=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
"DESTDIR=${placeholder "out"}"
|
||||
"PREFIX="
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple and fast TUI file manager with no dependencies";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ legendofmiracles ];
|
||||
homepage = "https://github.com/willeccles/cfm";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
{ lib, stdenv, buildEnv, fetchurl, mono }:
|
||||
|
||||
let
|
||||
version = "1.0.0";
|
||||
|
||||
drv = stdenv.mkDerivation {
|
||||
pname = "keepass-charactercopy";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/SketchingDev/Character-Copy/releases/download/v${version}/CharacterCopy.plgx";
|
||||
sha256 = "f8a81a60cd1aacc04c92a242479a8e4210452add019c52ebfbb1810b58d8800a";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/dotnet/keepass/
|
||||
cp $src $out/lib/dotnet/keepass/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Enables KeePass to copy individual characters by index";
|
||||
longDescription = ''
|
||||
Character Copy is a lightweight KeePass plugin that integrates into KeePass' entry menu and
|
||||
allows users to securely copy individual characters from
|
||||
an entry's protected string fields, such as the password field
|
||||
'';
|
||||
homepage = "https://github.com/SketchingDev/Character-Copy";
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
# licensing info was found in source files https://github.com/SketchingDev/Character-Copy/search?q=license
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ nazarewk ];
|
||||
};
|
||||
};
|
||||
in
|
||||
# Mono is required to compile plugin at runtime, after loading.
|
||||
buildEnv { name = drv.name; paths = [ mono drv ]; }
|
||||
@ -0,0 +1,40 @@
|
||||
{ lib, stdenv, buildEnv, fetchurl, mono }:
|
||||
|
||||
let
|
||||
version = "0.108.0";
|
||||
|
||||
drv = stdenv.mkDerivation {
|
||||
pname = "keepass-keetraytotp";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/KeeTrayTOTP/KeeTrayTOTP/releases/download/v${version}/KeeTrayTOTP.plgx";
|
||||
sha256 = "4f7251a9bbb79cad04aee96d1809c6b36d43285a9f3834fef5330fc97ae8bc09";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/dotnet/keepass/
|
||||
cp $src $out/lib/dotnet/keepass/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Augments KeePass with TOTP user interface";
|
||||
longDescription = ''
|
||||
This KeePass2 plugin adds advanced support for generating Time-based One-Time Passwords (TOTPs)
|
||||
from the KeePass tray icon. It also provides a column in the main entry list to display and/or use TOTPs.
|
||||
TOTPs can also be sent by auto-type. The plugin is compatible with Google, Dropbox, Steam, and many more services.
|
||||
'';
|
||||
homepage = "https://github.com/KeeTrayTOTP/KeeTrayTOTP";
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ nazarewk ];
|
||||
};
|
||||
};
|
||||
in
|
||||
# Mono is required to compile plugin at runtime, after loading.
|
||||
buildEnv { name = drv.name; paths = [ mono drv ]; }
|
||||
@ -0,0 +1,39 @@
|
||||
{ lib, stdenv, buildEnv, fetchurl, mono }:
|
||||
|
||||
let
|
||||
version = "1.0.4";
|
||||
|
||||
drv = stdenv.mkDerivation {
|
||||
pname = "keepass-qrcodeview";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JanisEst/KeePassQRCodeView/releases/download/v${version}/KeePassQRCodeView.plgx";
|
||||
sha256 = "e13c9f02bb0d79b479ca0e92490b822b5b88f49bb18ba2954d3bbe0808f46e6d";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/dotnet/keepass/
|
||||
cp $src $out/lib/dotnet/keepass/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Enables KeePass to display data as QR code images";
|
||||
longDescription = ''
|
||||
KeePassQRCodeView is a plugin for KeePass 2.x which shows QR codes for entry fields.
|
||||
These codes can be scanned to copy the encoded data to the scanner (smartphone, ...)
|
||||
'';
|
||||
homepage = "https://github.com/JanisEst/KeePassQRCodeView";
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ nazarewk ];
|
||||
};
|
||||
};
|
||||
in
|
||||
# Mono is required to compile plugin at runtime, after loading.
|
||||
buildEnv { name = drv.name; paths = [ mono drv ]; }
|
||||
@ -17,6 +17,7 @@ let
|
||||
inherit (data) owner repo rev sha256;
|
||||
};
|
||||
vendorSha256 = data.vendorSha256 or null;
|
||||
deleteVendor = data.deleteVendor or false;
|
||||
|
||||
# Terraform allow checking the provider versions, but this breaks
|
||||
# if the versions are not provided via file paths.
|
||||
|
||||
@ -34,11 +34,14 @@
|
||||
"version": "1.8.0"
|
||||
},
|
||||
"alicloud": {
|
||||
"owner": "terraform-providers",
|
||||
"deleteVendor": true,
|
||||
"owner": "aliyun",
|
||||
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.86.0",
|
||||
"sha256": "1hbv9ah7fd173sapwgsbg7790piwxw9zx90wfj5vz5b96ggbg28d",
|
||||
"version": "1.86.0"
|
||||
"rev": "v1.144.0",
|
||||
"sha256": "14nphpz15p83n6fsvvrnaz96nb87wvb10ri21hlhlsm2579zcbqd",
|
||||
"vendorSha256": "1k28fcfm7437i7gfbcbrigk2i50c1mix7z1rb2g617prih84wa6y",
|
||||
"version": "1.144.0"
|
||||
},
|
||||
"archive": {
|
||||
"owner": "hashicorp",
|
||||
|
||||
@ -1,26 +1,35 @@
|
||||
{ stdenv, fetchurl, python3Packages, makeWrapper
|
||||
, enablePlayer ? true, libvlc, qt5, lib }:
|
||||
{ stdenv, lib, fetchurl, python3, makeWrapper
|
||||
, libtorrent-rasterbar-1_2_x, qt5
|
||||
}:
|
||||
|
||||
let
|
||||
libtorrent = (python3.pkgs.toPythonModule (
|
||||
libtorrent-rasterbar-1_2_x.override { python = python3; })).python;
|
||||
|
||||
aiohttp-apispec = python3.pkgs.callPackage
|
||||
../../../../development/python-modules/aiohttp-apispec/unstable.nix { };
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tribler";
|
||||
version = "7.4.4";
|
||||
version = "7.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
|
||||
sha256 = "0hxiyf1k07ngym2p8r1b5mcx1y2crkyz43gi9sgvsvsyijyaff3p";
|
||||
sha256 = "1x45z23d1cqf0lai7wg5ki7gi2vba5hqk0swhggzplcjwma4wmh9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3Packages.wrapPython
|
||||
python3.pkgs.wrapPython
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
python3Packages.python
|
||||
python3.pkgs.python
|
||||
];
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
libtorrent-rasterbar
|
||||
pythonPath = [
|
||||
libtorrent
|
||||
] ++ (with python3.pkgs; [
|
||||
twisted
|
||||
netifaces
|
||||
pycrypto
|
||||
@ -42,49 +51,44 @@ stdenv.mkDerivation rec {
|
||||
pony
|
||||
lz4
|
||||
pyqtgraph
|
||||
pyyaml
|
||||
aiohttp
|
||||
aiohttp-apispec
|
||||
faker
|
||||
sentry-sdk
|
||||
pytest-asyncio
|
||||
pytest-timeout
|
||||
asynctest
|
||||
yappi
|
||||
|
||||
# there is a BTC feature, but it requires some unclear version of
|
||||
# bitcoinlib, so this doesn't work right now.
|
||||
# bitcoinlib
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
${lib.optionalString enablePlayer ''
|
||||
substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${libvlc}/lib/libvlc.so')"
|
||||
substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" \
|
||||
--replace "if vlc and vlc.plugin_path" "if vlc" \
|
||||
--replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'"
|
||||
''}
|
||||
'';
|
||||
]);
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out
|
||||
# Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
|
||||
wrapPythonPrograms
|
||||
cp -prvd ./* $out/
|
||||
makeWrapper ${python3Packages.python}/bin/python $out/bin/tribler \
|
||||
makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \
|
||||
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \
|
||||
--set _TRIBLERPATH $out \
|
||||
--set PYTHONPATH $out:$program_PYTHONPATH \
|
||||
--set _TRIBLERPATH $out/src \
|
||||
--set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \
|
||||
--set NO_AT_BRIDGE 1 \
|
||||
--run 'cd $_TRIBLERPATH' \
|
||||
--add-flags "-O $out/run_tribler.py" \
|
||||
${lib.optionalString enablePlayer ''
|
||||
--prefix LD_LIBRARY_PATH : ${libvlc}/lib
|
||||
''}
|
||||
--add-flags "-O $out/src/run_tribler.py"
|
||||
|
||||
mkdir -p $out/share/applications $out/share/icons $out/share/man/man1
|
||||
cp $out/Tribler/Main/Build/Ubuntu/tribler.desktop $out/share/applications/tribler.desktop
|
||||
cp $out/Tribler/Main/Build/Ubuntu/tribler_big.xpm $out/share/icons/tribler.xpm
|
||||
cp $out/Tribler/Main/Build/Ubuntu/tribler.1 $out/share/man/man1/tribler.1
|
||||
mkdir -p $out/share/applications $out/share/icons
|
||||
cp $out/build/debian/tribler/usr/share/applications/tribler.desktop $out/share/applications/tribler.desktop
|
||||
cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ xvapx ];
|
||||
maintainers = with maintainers; [ xvapx viric ];
|
||||
homepage = "https://www.tribler.org/";
|
||||
description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
broken = true; # 2021-03-17 see https://github.com/NixOS/nixpkgs/issues/93053
|
||||
};
|
||||
}
|
||||
|
||||
32
pkgs/applications/office/notion-app-enhanced/default.nix
Normal file
32
pkgs/applications/office/notion-app-enhanced/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ appimageTools, lib, fetchurl }:
|
||||
let
|
||||
pname = "notion-app-enhanced";
|
||||
version = "2.0.16-5";
|
||||
name = "${pname}-v${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/notion-enhancer/notion-repackaged/releases/download/v${version}/Notion-Enhanced-${version}.AppImage";
|
||||
sha256 = "1v733b4clc9sjgb72fasmbqiyz26d09f3kmvd1nqshwp5d14dajz";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit name src; };
|
||||
in appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${name} $out/bin/${pname}
|
||||
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Notion Desktop builds with Notion Enhancer for Windows, MacOS and Linux.";
|
||||
homepage = "https://github.com/notion-enhancer/desktop";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ sei40kr ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "delta";
|
||||
version = "0.9.2";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-DJG8C7oSTf4YKeSVytN4pVF4qVImg1bsTYbnfkR+U94=";
|
||||
sha256 = "sha256-PkVZag/h1KzOWsE6+61HIixs+DldrGk9khlZy7DEbC8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-mweH+ZIcNGGmoGUhnmZzaB5y14eO/XkHqrL8Nz/b3Jg=";
|
||||
cargoSha256 = "sha256-o1HyPJ81g9fLA7CKQNKg1EctoIh3W0uGzKF2YNE+Ado=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
47
pkgs/applications/video/mpv/scripts/cutter.nix
Normal file
47
pkgs/applications/video/mpv/scripts/cutter.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "video-cutter";
|
||||
version = "unstable-2021-02-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rushmj";
|
||||
repo = "mpv-video-cutter";
|
||||
rev = "718d6ce9356e63fdd47208ec44f575a212b9068a";
|
||||
sha256 = "sha256-ramID1DPl0UqEzevpqdYKb9aaW3CAy3Dy9CPb/oJ4eY=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
dontCheck = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cutter.lua \
|
||||
--replace '~/.config/mpv/scripts/c_concat.sh' '${placeholder "out"}/share/mpv/scripts/c_concat.sh'
|
||||
|
||||
# needs to be ran separately so that we can replace everything, and not every single mention explicitly
|
||||
# original script places them in the scripts folder, just spawning unnecessary errors
|
||||
# i know that hardcoding .config and especially the .mpv directory isn't best practice, but I didn't want to deviate too much from upstream
|
||||
substituteInPlace cutter.lua \
|
||||
--replace '~/.config/mpv/scripts' "''${XDG_CONFIG_HOME:-~/.config}/mpv/cutter"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 c_concat.sh $out/share/mpv/scripts/c_concat.sh
|
||||
install cutter.lua $out/share/mpv/scripts/cutter.lua
|
||||
|
||||
wrapProgram $out/share/mpv/scripts/c_concat.sh \
|
||||
--run "mkdir -p ~/.config/mpv/cutter/"
|
||||
'';
|
||||
|
||||
passthru.scriptName = "cutter.lua";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cut videos and concat them automatically";
|
||||
homepage = "https://github.com/rushmj/mpv-video-cutter";
|
||||
# repo doesn't have a license
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ legendofmiracles ];
|
||||
};
|
||||
}
|
||||
@ -80,7 +80,10 @@ let
|
||||
makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs}
|
||||
'';
|
||||
|
||||
meta.mainProgram = "mpv";
|
||||
meta = {
|
||||
inherit (mpv.meta) homepage description longDescription maintainers;
|
||||
mainProgram = "mpv";
|
||||
};
|
||||
};
|
||||
in
|
||||
lib.makeOverridable wrapper
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
substitute $dllFixer $out --subst-var-by perl $perl/bin/perl
|
||||
chmod +x $out
|
||||
@ -1,8 +1,11 @@
|
||||
{stdenv, perl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "mono-dll-fixer";
|
||||
builder = ./builder.sh;
|
||||
dllFixer = ./dll-fixer.pl;
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
substitute $dllFixer $out --subst-var-by perl $perl/bin/perl
|
||||
chmod +x $out
|
||||
'';
|
||||
inherit perl;
|
||||
}
|
||||
|
||||
@ -3,17 +3,8 @@
|
||||
{ shortTarget, originalCargoToml, target, RUSTFLAGS }:
|
||||
|
||||
let
|
||||
cargoSrc = stdenv.mkDerivation {
|
||||
name = "cargo-src";
|
||||
preferLocalBuild = true;
|
||||
phases = [ "installPhase" ];
|
||||
installPhase = ''
|
||||
RUSTC_SRC=${rustPlatform.rustcSrc.override { minimalContent = false; }} ORIG_CARGO=${originalCargoToml} \
|
||||
${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py}
|
||||
mkdir -p $out
|
||||
cp Cargo.toml $out/Cargo.toml
|
||||
cp ${./Cargo.lock} $out/Cargo.lock
|
||||
'';
|
||||
cargoSrc = import ../../sysroot/src.nix {
|
||||
inherit stdenv rustPlatform buildPackages originalCargoToml;
|
||||
};
|
||||
in rustPlatform.buildRustPackage {
|
||||
inherit target RUSTFLAGS;
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p python3 python3.pkgs.toml cargo
|
||||
|
||||
set -e
|
||||
|
||||
HERE=$(dirname "${BASH_SOURCE[0]}")
|
||||
NIXPKGS_ROOT="$HERE/../../../.."
|
||||
|
||||
# https://unix.stackexchange.com/a/84980/390173
|
||||
tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-lockfile')
|
||||
|
||||
cd "$tempdir"
|
||||
nix-build -E "with import (/. + \"${NIXPKGS_ROOT}\") {}; pkgs.rustPlatform.rustcSrc.override { minimalContent = false; }"
|
||||
RUSTC_SRC="$(pwd)/result" python3 "$HERE/cargo.py"
|
||||
RUSTC_BOOTSTRAP=1 cargo build || echo "Build failure is expected. All that's needed is the lockfile."
|
||||
|
||||
cp Cargo.lock "$HERE"
|
||||
|
||||
rm -rf "$tempdir"
|
||||
|
||||
|
||||
@ -10,9 +10,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "compiler_builtins"
|
||||
version = "0.1.36"
|
||||
version = "0.1.52"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7cd0782e0a7da7598164153173e5a5d4d9b1da094473c98dce0ff91406112369"
|
||||
checksum = "b6591c2442ee984e2b264638a8b5e7ae44fd47b32d28e3a08e2e9c3cdb0c2fb0"
|
||||
dependencies = [
|
||||
"rustc-std-workspace-core",
|
||||
]
|
||||
@ -21,9 +21,22 @@ dependencies = [
|
||||
name = "core"
|
||||
version = "0.0.0"
|
||||
|
||||
[[package]]
|
||||
name = "nixpkgs-sysroot-stub-crate"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"alloc",
|
||||
"compiler_builtins",
|
||||
"core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustc-std-workspace-core"
|
||||
version = "1.99.0"
|
||||
dependencies = [
|
||||
"core",
|
||||
]
|
||||
|
||||
[[patch.unused]]
|
||||
name = "rustc-std-workspace-alloc"
|
||||
version = "1.99.0"
|
||||
@ -6,7 +6,7 @@ orig_cargo = os.environ['ORIG_CARGO'] if 'ORIG_CARGO' in os.environ else None
|
||||
|
||||
base = {
|
||||
'package': {
|
||||
'name': 'alloc',
|
||||
'name': 'nixpkgs-sysroot-stub-crate',
|
||||
'version': '0.0.0',
|
||||
'authors': ['The Rust Project Developers'],
|
||||
'edition': '2018',
|
||||
@ -17,17 +17,19 @@ base = {
|
||||
'features': ['rustc-dep-of-std', 'mem'],
|
||||
},
|
||||
'core': {
|
||||
'path': os.path.join(rust_src, 'libcore'),
|
||||
'path': os.path.join(rust_src, 'core'),
|
||||
},
|
||||
'alloc': {
|
||||
'path': os.path.join(rust_src, 'alloc'),
|
||||
},
|
||||
},
|
||||
'lib': {
|
||||
'name': 'alloc',
|
||||
'path': os.path.join(rust_src, 'liballoc/lib.rs'),
|
||||
},
|
||||
'patch': {
|
||||
'crates-io': {
|
||||
'rustc-std-workspace-core': {
|
||||
'path': os.path.join(rust_src, 'tools/rustc-std-workspace-core'),
|
||||
'path': os.path.join(rust_src, 'rustc-std-workspace-core'),
|
||||
},
|
||||
'rustc-std-workspace-alloc': {
|
||||
'path': os.path.join(rust_src, 'rustc-std-workspace-alloc'),
|
||||
},
|
||||
},
|
||||
},
|
||||
26
pkgs/build-support/rust/sysroot/src.nix
Normal file
26
pkgs/build-support/rust/sysroot/src.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, stdenv, rustPlatform, buildPackages
|
||||
, originalCargoToml ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "cargo-src";
|
||||
preferLocalBuild = true;
|
||||
|
||||
unpackPhase = "true";
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
export RUSTC_SRC=${rustPlatform.rustLibSrc.override { }}
|
||||
''
|
||||
+ lib.optionalString (originalCargoToml != null) ''
|
||||
export ORIG_CARGO=${originalCargoToml}
|
||||
''
|
||||
+ ''
|
||||
${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py}
|
||||
mkdir -p $out/src
|
||||
touch $out/src/lib.rs
|
||||
cp Cargo.toml $out/Cargo.toml
|
||||
cp ${./Cargo.lock} $out/Cargo.lock
|
||||
'';
|
||||
}
|
||||
27
pkgs/build-support/rust/sysroot/update-lockfile.sh
Executable file
27
pkgs/build-support/rust/sysroot/update-lockfile.sh
Executable file
@ -0,0 +1,27 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p python3 python3.pkgs.toml cargo
|
||||
|
||||
set -eu pipefile
|
||||
|
||||
HERE=$(readlink -e $(dirname "${BASH_SOURCE[0]}"))
|
||||
NIXPKGS_ROOT="$HERE/../../../.."
|
||||
|
||||
# https://unix.stackexchange.com/a/84980/390173
|
||||
tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-lockfile')
|
||||
cd "$tempdir"
|
||||
mkdir -p src
|
||||
touch src/lib.rs
|
||||
|
||||
RUSTC_SRC=$(nix-build "${NIXPKGS_ROOT}" -A pkgs.rustPlatform.rustLibSrc --no-out-link)
|
||||
|
||||
ln -s $RUSTC_SRC/{core,alloc} ./
|
||||
|
||||
export RUSTC_SRC
|
||||
python3 "$HERE/cargo.py"
|
||||
|
||||
export RUSTC_BOOTSTRAP=1
|
||||
cargo generate-lockfile
|
||||
|
||||
cp Cargo.lock "$HERE"
|
||||
|
||||
rm -rf "$tempdir"
|
||||
@ -8,7 +8,8 @@
|
||||
, gnome
|
||||
, gtksourceview4
|
||||
, gjs
|
||||
, webkitgtk_4_1
|
||||
, libsoup
|
||||
, webkitgtk
|
||||
, icu
|
||||
, wrapGAppsHook
|
||||
, gst_all_1
|
||||
@ -48,11 +49,14 @@ stdenv.mkDerivation rec {
|
||||
gtksourceview4
|
||||
gdk-pixbuf
|
||||
librsvg
|
||||
webkitgtk_4_1
|
||||
libsoup
|
||||
webkitgtk
|
||||
libepoxy
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-ugly
|
||||
];
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/issues/31168
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
# build-time dependency too.
|
||||
buildLlvmPackages, llvmPackages
|
||||
buildTargetLlvmPackages, llvmPackages
|
||||
|
||||
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
|
||||
# library instead of the faster but GPLed integer-gmp library.
|
||||
@ -122,7 +122,7 @@ let
|
||||
|
||||
toolsForTarget = [
|
||||
pkgsBuildTarget.targetPackages.stdenv.cc
|
||||
] ++ lib.optional useLLVM buildLlvmPackages.llvm;
|
||||
] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
|
||||
|
||||
targetCC = builtins.head toolsForTarget;
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
# build-time dependency too.
|
||||
buildLlvmPackages, llvmPackages
|
||||
buildTargetLlvmPackages, llvmPackages
|
||||
|
||||
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
|
||||
# library instead of the faster but GPLed integer-gmp library.
|
||||
@ -130,7 +130,7 @@ let
|
||||
|
||||
toolsForTarget = [
|
||||
pkgsBuildTarget.targetPackages.stdenv.cc
|
||||
] ++ lib.optional useLLVM buildLlvmPackages.llvm;
|
||||
] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
|
||||
|
||||
targetCC = builtins.head toolsForTarget;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
# build-time dependency too.
|
||||
buildLlvmPackages, llvmPackages
|
||||
buildTargetLlvmPackages, llvmPackages
|
||||
|
||||
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
|
||||
# library instead of the faster but GPLed integer-gmp library.
|
||||
@ -117,7 +117,7 @@ let
|
||||
|
||||
toolsForTarget = [
|
||||
pkgsBuildTarget.targetPackages.stdenv.cc
|
||||
] ++ lib.optional useLLVM buildLlvmPackages.llvm;
|
||||
] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
|
||||
|
||||
targetCC = builtins.head toolsForTarget;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
# build-time dependency too.
|
||||
buildLlvmPackages, llvmPackages
|
||||
buildTargetLlvmPackages, llvmPackages
|
||||
|
||||
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
|
||||
# library instead of the faster but GPLed integer-gmp library.
|
||||
@ -117,7 +117,7 @@ let
|
||||
|
||||
toolsForTarget = [
|
||||
pkgsBuildTarget.targetPackages.stdenv.cc
|
||||
] ++ lib.optional useLLVM buildLlvmPackages.llvm;
|
||||
] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
|
||||
|
||||
targetCC = builtins.head toolsForTarget;
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
# build-time dependency too.
|
||||
buildLlvmPackages, llvmPackages
|
||||
buildTargetLlvmPackages, llvmPackages
|
||||
|
||||
, # If enabled, GHC will be built with the GPL-free but slightly slower native
|
||||
# bignum backend instead of the faster but GPLed gmp backend.
|
||||
@ -130,7 +130,7 @@ let
|
||||
|
||||
toolsForTarget = [
|
||||
pkgsBuildTarget.targetPackages.stdenv.cc
|
||||
] ++ lib.optional useLLVM buildLlvmPackages.llvm;
|
||||
] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
|
||||
|
||||
targetCC = builtins.head toolsForTarget;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, rustc, minimalContent ? true }:
|
||||
{ lib, stdenv, rustc, minimalContent ? true }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "rust-src";
|
||||
@ -6,9 +6,20 @@ stdenv.mkDerivation {
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
installPhase = ''
|
||||
mv src $out
|
||||
rm -rf $out/{${if minimalContent
|
||||
then "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,tools,vendor,stdarch"
|
||||
else "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,vendor"
|
||||
}}
|
||||
rm -rf $out/{${lib.concatStringsSep "," ([
|
||||
"ci"
|
||||
"doc"
|
||||
"etc"
|
||||
"grammar"
|
||||
"llvm-project"
|
||||
"llvm-emscripten"
|
||||
"rtstartup"
|
||||
"rustllvm"
|
||||
"test"
|
||||
"vendor"
|
||||
] ++ lib.optionals minimalContent [
|
||||
"tools"
|
||||
"stdarch"
|
||||
])}}
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ dhallPackages, buildDhallGitHubPackage }:
|
||||
{ buildDhallGitHubPackage, Prelude }:
|
||||
|
||||
buildDhallGitHubPackage {
|
||||
name = "grafana";
|
||||
@ -7,5 +7,5 @@ buildDhallGitHubPackage {
|
||||
# 2021-11-12
|
||||
rev = "d5630dc55deacf5100a99802a4df1d9680b263b3";
|
||||
sha256 = "01320hpqgr5r4grsydmdl9yznmly1ssnlc9gcwa8rj1ah0a8xlgz";
|
||||
dependencies = [ dhallPackages.Prelude ];
|
||||
dependencies = [ Prelude ];
|
||||
}
|
||||
|
||||
@ -64,6 +64,19 @@ proc getNimbleValues(filePath, key: string): seq[string] =
|
||||
if s.len > 0 and s[0] == '"':
|
||||
s = s.unescape()
|
||||
|
||||
proc getOutputDir(name: string): string =
|
||||
## Return the output directory for output `name`.
|
||||
## If `name` is not a valid output then the first output
|
||||
## is returned as a default.
|
||||
let outputs = splitWhitespace getEnv("outputs")
|
||||
doAssert(outputs.len > 0)
|
||||
if outputs.contains name:
|
||||
result = getEnv(name)
|
||||
if result == "":
|
||||
result = getEnv("out")
|
||||
if result == "":
|
||||
result = getEnv(outputs[0], "/dev/null")
|
||||
|
||||
proc configurePhase*() =
|
||||
## Generate "config.nims" which will be read by the Nim
|
||||
## compiler during later phases.
|
||||
@ -103,14 +116,14 @@ proc buildPhase*() =
|
||||
nf = getNimbleFilePath()
|
||||
bins = nf.getNimbleValues("bin")
|
||||
srcDir = nf.getNimbleValue("srcDir", ".")
|
||||
binDir = getenv("outputBin", getenv("out", "/dev/null")) / "bin"
|
||||
binDir = getOutputDir("bin") / "bin"
|
||||
if bins != @[]:
|
||||
for bin in bins:
|
||||
cmds.add("nim compile $# --outdir:$# $#" %
|
||||
[getenv"nimFlags", binDir, normalizedPath(srcDir / bin)])
|
||||
if getEnvBool"nimDoc":
|
||||
echo "generating documentation"
|
||||
let docDir = getenv("outputDoc", (getenv("out", "/dev/null") / "doc"))
|
||||
let docDir = getOutputDir("doc") / "doc"
|
||||
for path in walkFiles(srcDir / "*.nim"):
|
||||
cmds.add("nim doc --outdir:$# $#" % [docDir, path])
|
||||
if cmds.len > 0:
|
||||
@ -126,7 +139,7 @@ proc installPhase*() =
|
||||
let
|
||||
nf = getNimbleFilePath()
|
||||
srcDir = nf.getNimbleValue("srcDir", ".")
|
||||
devDir = getenv("outputDev", getenv("out", "/dev/null"))
|
||||
devDir = getOutputDir "dev"
|
||||
echo "Install ", srcDir, " to ", devDir
|
||||
copyDir(normalizedPath(srcDir), normalizedPath(devDir / srcDir))
|
||||
copyFile(nf, devDir / nf.extractFilename)
|
||||
|
||||
@ -20,6 +20,7 @@
|
||||
, "alex"
|
||||
, "alloy"
|
||||
, "asar"
|
||||
, "audiosprite"
|
||||
, "autoprefixer"
|
||||
, "aws-azure-login"
|
||||
, "awesome-lint"
|
||||
@ -209,6 +210,7 @@
|
||||
, "npm-check-updates"
|
||||
, "npm-merge-driver"
|
||||
, {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"}
|
||||
, "nrm"
|
||||
, "ocaml-language-server"
|
||||
, "parcel-bundler"
|
||||
, "parsoid"
|
||||
|
||||
1053
pkgs/development/node-packages/node-packages.nix
generated
1053
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.0.10576";
|
||||
version = "9.0.10651";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-s8GZV+hcuAZJhKVoLAtC2mwHlqr/vJ6P5mwlNDczEyY=";
|
||||
sha256 = "sha256-Cgd6lT7iqpvY5OJgBFNMkDJVV7uF6WwVdzQwGGZo4Qc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyvex ];
|
||||
|
||||
37
pkgs/development/python-modules/aiohttp-apispec/unstable.nix
Normal file
37
pkgs/development/python-modules/aiohttp-apispec/unstable.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, pythonOlder
|
||||
, aiohttp, webargs, fetchFromGitHub, callPackage
|
||||
}:
|
||||
|
||||
let
|
||||
apispec3 = callPackage ../apispec/3.nix {};
|
||||
jinja2 = callPackage ../jinja2/2.nix {};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohttp-apispec";
|
||||
version = "unstable-2021-21-08";
|
||||
|
||||
# unstable so we can use latest webargs
|
||||
src = fetchFromGitHub {
|
||||
owner = "maximdanilchenko";
|
||||
repo = "aiohttp-apispec";
|
||||
rev = "cfa19646394480dda289f6b7af19b7d50f245d81";
|
||||
sha256 = "uEgDRAlMjTa4rvdE3fkORCHIlCLzxPJJ2/m4ZRU3eIQ=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp webargs apispec3 jinja2 ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiohttp_apispec"
|
||||
];
|
||||
|
||||
# Requires pytest-sanic, currently broken in nixpkgs
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Build and document REST APIs with aiohttp and apispec";
|
||||
homepage = "https://github.com/maximdanilchenko/aiohttp-apispec/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.viric ];
|
||||
};
|
||||
}
|
||||
@ -44,14 +44,14 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.0.10576";
|
||||
version = "9.0.10651";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lRoJZX7HPZE6y7v5AuU1C6sjOIXXefv8M/qPiNQtobw=";
|
||||
sha256 = "sha256-aywfB2oEPyh+MbN5jb+qA3DMUi8Pp/f2OhuUzoTAIoA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angrop";
|
||||
version = "9.0.10576";
|
||||
version = "9.0.10651";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i4F6VyJYJ6XON9G43Z2VwWAPHGRxR9DzxnEDGiJ8LSE=";
|
||||
sha256 = "sha256-tJ+yeaBI4eBxvvN2rqAfun3aSxDLrSFtfu00d4O1sak=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
47
pkgs/development/python-modules/apispec/3.nix
Normal file
47
pkgs/development/python-modules/apispec/3.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pyyaml
|
||||
, prance
|
||||
, marshmallow
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
, openapi-spec-validator
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apispec";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d23ebd5b71e541e031b02a19db10b5e6d5ef8452c552833e3e1afc836b40b1ad";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyyaml
|
||||
prance
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm tests/test_ext_marshmallow.py
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
openapi-spec-validator
|
||||
marshmallow
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"apispec"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification";
|
||||
homepage = "https://github.com/marshmallow-code/apispec";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.viric ];
|
||||
};
|
||||
}
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.0.10576";
|
||||
version = "9.0.10651";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-K36tAsVfminDFK09jE6+ruROkaLfCTNPCL5ziZJOrVk=";
|
||||
sha256 = "sha256-Lvobjbjl1gfW3HllHfsxHnLOB4hRGbZ9Hhuf14zd94w=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k
|
||||
, python, twisted, jinja2, zope_interface, sqlalchemy
|
||||
, sqlalchemy-migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq
|
||||
, txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial
|
||||
, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins
|
||||
, parameterized, git, openssh, glibcLocales, ldap3, nixosTests
|
||||
, python, twisted, jinja2, zope_interface, sqlalchemy, alembic, python-dateutil
|
||||
, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, txrequests, pypugjs, boto3
|
||||
, moto, mock, lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker
|
||||
, buildbot-pkg, buildbot-plugins, parameterized, git, openssh, glibcLocales
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
let
|
||||
@ -31,11 +31,11 @@ let
|
||||
|
||||
package = buildPythonPackage rec {
|
||||
pname = "buildbot";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-FST+mCIQpzxc/5iQdsSNBlKxY985v+z6Xeh8ZQRu2FE=";
|
||||
sha256 = "sha256-14w1sF1aOpfUW76uhAIUpdrjAEhQkEWcRGg9Osc+qFk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -44,7 +44,7 @@ let
|
||||
jinja2
|
||||
zope_interface
|
||||
sqlalchemy
|
||||
sqlalchemy-migrate
|
||||
alembic
|
||||
python-dateutil
|
||||
txaio
|
||||
autobahn
|
||||
@ -74,9 +74,6 @@ let
|
||||
git
|
||||
openssh
|
||||
glibcLocales
|
||||
# optional dependency that was accidentally made required for tests
|
||||
# https://github.com/buildbot/buildbot/pull/5857
|
||||
ldap3
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
||||
@ -6,7 +6,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-PVmDJN3/PMsvZrrwSNaUUQLPkOMWO6edIEEfZSwspTs=";
|
||||
sha256 = "sha256-NAc85JomnxS052SjCu8+UQ/hik2gbq1u7/gc21Nj67Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-KFGTNudUxjSV6406NV4QJP8t9t5p2ckMlntkqsf1x2U=";
|
||||
sha256 = "sha256-65ZbCiNtxH3YjAcdhv5cwSUNrLT65jlQh/2oL8342Tw=";
|
||||
};
|
||||
|
||||
# Remove unneccessary circular dependency on buildbot
|
||||
@ -34,7 +34,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-UoKCRAnPAQjb7Fgm+YkGv1boXY+xSDkYA3E2EiEkNGE=";
|
||||
sha256 = "sha256-2wu6rE5tgjPXxlcIND8s+DAmX9CF29M3ElonV0L8WOs=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
@ -56,7 +56,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Ccmk8TPtMfGrlNaBKhos1s/G1pHzf+zSD+A88F+/8+c=";
|
||||
sha256 = "sha256-Vu4CouTuVyxpmx5C4fthQJPdFBAtN1jliQjy4pLYAzc=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
@ -78,7 +78,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-oHvn7E4NS0RhTU2hDn1GgFjalYCoXUNCtGEz2lHel+M=";
|
||||
sha256 = "sha256-BDzI4VBbNGCKRxv6294IIVkDXZV0KHauvUYDjIVovvE=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
@ -100,7 +100,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-HoiR2WF6EWebbb9c3WcLU2H17HMqkrF6JNOwpUk9CbU=";
|
||||
sha256 = "sha256-hkcxwZWFJOLHMIRJfzzMTEoH6oc2UblJEKFjYthFfDc=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
||||
@ -7,7 +7,7 @@ buildPythonPackage (rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-nDP46rLWYXXKJktR6NTWLb0erC6FU8fXe9FAIX+MWuU=";
|
||||
sha256 = "sha256-SFZ0Q51hrBb7eBMGzvVOhc/ogFCIO/Mo7U9652WJ2GU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ twisted future ];
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.0.10576";
|
||||
version = "9.0.10651";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-86ySQ/2l1h5vayMfAsr9ShyE8oRKL37sT3bfrgIGFHY=";
|
||||
sha256 = "sha256-ishKQ3BdY7sPRyhr04dB3gtGC/JqoJ/W0Cv/hxTkJXg=";
|
||||
};
|
||||
|
||||
# Use upstream z3 implementation
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.0.10576";
|
||||
version = "9.0.10651";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ftaFISU37GcCFTybxV31PwUl2vrbKVm/S00Qo+pUxgo=";
|
||||
sha256 = "sha256-XhU0SS0zWPtI4t49oboc5/Fr34dR6oqm8hlI4f4q8Bk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,24 +1,23 @@
|
||||
{ lib, python, isPy3k, buildPythonPackage, fetchPypi, flask }:
|
||||
{ lib, python, buildPythonPackage, fetchPypi, pytestCheckHook, flask }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-HTTPAuth";
|
||||
version = "4.4.0";
|
||||
pname = "flask-httpauth";
|
||||
version = "4.5.0";
|
||||
|
||||
disabled = !isPy3k;
|
||||
disabled = python.pythonOlder "3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0fl1if91hg2c92b6sic7h2vhxxvb06ri7wflmwp0pfiwbaisgamw";
|
||||
pname = "Flask-HTTPAuth";
|
||||
version = version;
|
||||
sha256 = "0ada63rkcvwkakjyx4ay98fjzwx5h55br12ys40ghkc5lbyl0l1r";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
propagatedBuildInputs = [ flask ];
|
||||
|
||||
pythonImportsCheck = [ "flask_httpauth" ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest discover
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extension that provides HTTP authentication for Flask routes";
|
||||
homepage = "https://github.com/miguelgrinberg/Flask-HTTPAuth";
|
||||
|
||||
28
pkgs/development/python-modules/future-typing/default.nix
Normal file
28
pkgs/development/python-modules/future-typing/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "future-typing";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "future_typing";
|
||||
inherit version;
|
||||
sha256 = "65fdc5034a95db212790fee5e977fb0a2df8deb60dccf3bac17d6d2b1a9bbacd";
|
||||
};
|
||||
|
||||
doCheck = false; # No tests in pypi source. Did not get tests from GitHub source to work.
|
||||
|
||||
pythonImportsCheck = [ "future_typing" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Use generic type hints and new union syntax `|` with python 3.6+";
|
||||
homepage = "https://github.com/PrettyWood/future-typing";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kfollesdal ];
|
||||
};
|
||||
}
|
||||
@ -1,29 +1,50 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, httpx
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytest-httpx
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "glances-api";
|
||||
version = "0.2.1";
|
||||
version = "0.3.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-ecosystem";
|
||||
repo = "python-glances-api";
|
||||
rev = version;
|
||||
sha256 = "sha256-mbkZZg2fmus4kOXFxHE/UV/nxemFAsoEZu8IUa7SPsg=";
|
||||
sha256 = "sha256-zVK63SI8ZeVrY2iEEkgp8pq6RDheKeApb9/RWgZCKGI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
# no tests are present
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "glances_api" ];
|
||||
propagatedBuildInputs = [
|
||||
httpx
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytest-httpx
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'httpx = ">=0.20,<1"' 'httpx = ">=0.19,<1"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"glances_api"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API for interacting with Glances";
|
||||
|
||||
@ -35,7 +35,9 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
stestr run
|
||||
stestr run -e <(echo "
|
||||
hacking.tests.test_doctest.HackingTestCase.test_flake8
|
||||
")
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "hacking" ];
|
||||
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
doCheck = !stdenv.is32bit || isPy3k;
|
||||
|
||||
checkPhase = ''
|
||||
pytest -v tests
|
||||
pytest -v tests -W ignore::ResourceWarning -W ignore::DeprecationWarning
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -6,25 +6,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbclient";
|
||||
version = "0.5.8";
|
||||
version = "0.5.9";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-NPUsycuDGl2MzXAxU341THXcYaJEh/mYcS0Sid4yCiU=";
|
||||
sha256 = "sha256-meRt2vrNC4YSk78kb+2FQKGErfo6p9ZB+JAx7AcHAeA=";
|
||||
};
|
||||
|
||||
inherit doCheck;
|
||||
checkInputs = [ pytest xmltodict nbconvert ipywidgets ];
|
||||
propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];
|
||||
|
||||
postFixup = ''
|
||||
# Remove until fixed by upstream
|
||||
# https://github.com/jupyter/nbclient/pull/173#issuecomment-968760082
|
||||
rm $out/bin/.jupyter-run-wrapped
|
||||
rm $out/bin/jupyter-run
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jupyter/nbclient";
|
||||
description = "A client library for executing notebooks";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, liberasurecode, six }:
|
||||
{ lib, stdenv, buildPythonPackage, fetchPypi, liberasurecode, six }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyeclib";
|
||||
@ -13,11 +13,16 @@ buildPythonPackage rec {
|
||||
# patch dlopen call
|
||||
substituteInPlace src/c/pyeclib_c/pyeclib_c.c \
|
||||
--replace "liberasurecode.so" "${liberasurecode}/lib/liberasurecode.so"
|
||||
# python's platform.platform() doesn't return "Darwin" (anymore?)
|
||||
substituteInPlace setup.py \
|
||||
--replace '"Darwin"' '"macOS"'
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
# required for the custom find_library function in setup.py
|
||||
export LD_LIBRARY_PATH="${lib.makeLibraryPath [ liberasurecode ]}"
|
||||
preBuild = let
|
||||
ldLibraryPathEnvName = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
|
||||
in ''
|
||||
# required for the custom _find_library function in setup.py
|
||||
export ${ldLibraryPathEnvName}="${lib.makeLibraryPath [ liberasurecode ]}"
|
||||
'';
|
||||
|
||||
buildInputs = [ liberasurecode ];
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, async-timeout
|
||||
, awesomeversion
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
@ -12,21 +11,20 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhaversion";
|
||||
version = "21.10.0";
|
||||
version = "21.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
# Only 3.8.0 and beyond are supported
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-EvVkewFgkfYL6BjmJ/IWeuCyR+0R0ZxI35i9sxKcqxo=";
|
||||
sha256 = "sha256-wh6NJRDgOrEHYEN3QlC4lOZHPnPeiPCJFF1xLoixQ14=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
awesomeversion
|
||||
];
|
||||
|
||||
@ -36,7 +34,16 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyhaversion" ];
|
||||
postPatch = ''
|
||||
# Upstream doesn't set a version for the tagged releases
|
||||
substituteInPlace setup.py \
|
||||
--replace "main" ${version}
|
||||
'';
|
||||
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyhaversion"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to the newest version number of Home Assistant";
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, webtest
|
||||
, pyramid
|
||||
, Mako
|
||||
@ -15,6 +16,15 @@ buildPythonPackage rec {
|
||||
sha256 = "0066c863441f1c3ddea60cee1ccc50d00a91a317a8052ca44131da1a12a840e2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix tests with pyramid >= 2.0
|
||||
# https://github.com/Pylons/pyramid_mako/pull/54
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Pylons/pyramid_mako/commit/c0f9e7e0146a7f94e35a9401b1519ac8b7765f5b.patch";
|
||||
sha256 = "15swfm0a07bdl32s85426rmjh72jwfasjcrl849ppg035z75q9fx";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ webtest ];
|
||||
propagatedBuildInputs = [ pyramid Mako ];
|
||||
|
||||
@ -23,8 +33,5 @@ buildPythonPackage rec {
|
||||
description = "Mako template bindings for the Pyramid web framework";
|
||||
license = licenses.bsd0;
|
||||
maintainers = with maintainers; [];
|
||||
# broken on pyramid>=2.0
|
||||
# https://github.com/Pylons/pyramid_mako/issues/53
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,30 +2,34 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, urllib3
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-opendata-transport";
|
||||
version = "0.2.2";
|
||||
version = "0.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "python_opendata_transport";
|
||||
inherit version;
|
||||
sha256 = "sha256-Z0VHkKYHpwbBwwFrMtA5JRy0m7f0566IjCmGizoKEoo=";
|
||||
sha256 = "sha256-CpzMMp2C3UOiUna9EcUucD/PKv7AZlkaU8QJfWntoi8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
urllib3
|
||||
];
|
||||
|
||||
# no tests are present
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "opendata_transport" ];
|
||||
pythonImportsCheck = [
|
||||
"opendata_transport"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for interacting with transport.opendata.ch";
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.0.10576";
|
||||
version = "9.0.10651";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-pOQZXymIuffUfShAUrXqlxwWCIRKZpkMZcJS1fad2bs=";
|
||||
sha256 = "sha256-GuZqaEI7y/kLNV7RfEMBXQgFsdVuRh1ouweTwlXE6r4=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "srpenergy";
|
||||
version = "1.3.2";
|
||||
version = "1.3.5";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "lamoreauxlab";
|
||||
repo = "srpenergy-api-client-python";
|
||||
rev = version;
|
||||
sha256 = "03kldjk90mrnzf2hpd7xky0lpph853mjxc34kfa2m5mbpbpkxz9c";
|
||||
sha256 = "sha256-s90+gzjcG27pUcMGpzf2rf+mR8/fmpvwBXGfvv3rNGI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
69
pkgs/development/python-modules/typical/default.nix
Normal file
69
pkgs/development/python-modules/typical/default.nix
Normal file
@ -0,0 +1,69 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, inflection
|
||||
, pendulum
|
||||
, fastjsonschema
|
||||
, typing-extensions
|
||||
, orjson
|
||||
, future-typing
|
||||
, poetry-core
|
||||
, pydantic
|
||||
, sqlalchemy
|
||||
, pandas
|
||||
, mypy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "typical";
|
||||
version = "2.7.9";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seandstewart";
|
||||
repo = "typical";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ITIsSM92zftnvqLiVGFl//IbBb8N3ffkkqohzOx2JO4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./use-poetry-core.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
inflection
|
||||
pendulum
|
||||
fastjsonschema
|
||||
orjson
|
||||
typing-extensions
|
||||
future-typing
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
mypy
|
||||
pydantic
|
||||
sqlalchemy
|
||||
pandas
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_ujson" # We use orjson
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"benchmark/"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "typic" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://python-typical.org/";
|
||||
description = "Typical: Python's Typing Toolkit.";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kfollesdal ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index a588a0d..43da394 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -154,7 +154,7 @@ exclude = '''
|
||||
|
||||
[build-system]
|
||||
requires = ["poetry>=0.12"]
|
||||
-build-backend = "poetry.masonry.api"
|
||||
+build-backend = "poetry.core.masonry.api"
|
||||
|
||||
[bumpver]
|
||||
current_version = "v2.7.5"
|
||||
@ -4,19 +4,20 @@
|
||||
, setuptools-scm
|
||||
, getmac
|
||||
, requests
|
||||
, semver
|
||||
, pytestCheckHook
|
||||
, responses
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vilfo-api-client";
|
||||
version = "0.3.3";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ManneW";
|
||||
repo = "vilfo-api-client-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf";
|
||||
rev = version;
|
||||
sha256 = "sha256-j06Bbv0hWSmrlCv8RfgvfGTyOF+vSX+zZnX3AvG5Hys=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -33,6 +34,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
getmac
|
||||
requests
|
||||
semver
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
||||
"webargs"
|
||||
];
|
||||
|
||||
|
||||
propagatedBuildInputs = [ marshmallow ];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-aiohttp
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles
|
||||
{ stdenv, callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, installShellFiles
|
||||
, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs
|
||||
# this package (through the fixpoint glass)
|
||||
, bazel_self
|
||||
@ -214,6 +214,14 @@ stdenv.mkDerivation rec {
|
||||
src = ../bazel_rc.patch;
|
||||
bazelSystemBazelRCPath = bazelRC;
|
||||
})
|
||||
|
||||
# On macOS Monterey, protoc segfaults.
|
||||
# Issue: https://github.com/bazelbuild/bazel/issues/14216
|
||||
# Fix: https://github.com/bazelbuild/bazel/pull/14275
|
||||
(fetchpatch {
|
||||
url = "https://github.com/bazelbuild/bazel/commit/ae0a6c98d4f94abedbedb2d51c27de5febd7df67.patch";
|
||||
sha256 = "sha256-YcdxqjTMGI86k1wgFqxJqghv0kknAjlFQFpt4VccCTE=";
|
||||
})
|
||||
] ++ lib.optional enableNixHacks ../nix-hacks.patch;
|
||||
|
||||
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "postman";
|
||||
version = "9.1.1";
|
||||
version = "9.1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.pstmn.io/download/version/${version}/linux64";
|
||||
sha256 = "QqlA/8fEOwucs+nU6ahDh3GB64PdhY8JFWPiyEBxGsE=";
|
||||
sha256 = "bUhJ1vbesTibXF8rZuVWd5EY8uBbGaYGEbPKSXAVAsE=";
|
||||
name = "${pname}.tar.gz";
|
||||
};
|
||||
|
||||
|
||||
41
pkgs/misc/plasma-hud/default.nix
Normal file
41
pkgs/misc/plasma-hud/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib, python3, fetchFromGitHub, rofi, gobject-introspection }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec{
|
||||
pname = "plasma-hud";
|
||||
version = "19.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zren";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "19vlc156jfdamw7q1pc78fmlf0h3sff5ar3di9j316vbb60js16l";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
rofi
|
||||
dbus-python
|
||||
setproctitle
|
||||
xlib
|
||||
pygobject3
|
||||
gobject-introspection
|
||||
];
|
||||
format = "other";
|
||||
postPatch = ''
|
||||
sed -i "s:/usr/lib/plasma-hud:$out/bin:" etc/xdg/autostart/plasma-hud.desktop
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
patchShebangs $out/bin/plasma-hud
|
||||
mkdir -p $out/bin $out/etc/xdg/autostart
|
||||
cp -r $src/usr/lib/plasma-hud/plasma-hud $out/bin/plasma-hud
|
||||
cp -r $src/etc $out/etc
|
||||
'';
|
||||
|
||||
meta = with lib;{
|
||||
license = licenses.gpl2Only;
|
||||
homepage = "https://github.com/Zren/plasma-hud";
|
||||
platforms = platforms.unix;
|
||||
description = "Run menubar commands, much like the Unity 7 Heads-Up Display (HUD)";
|
||||
maintainers = with maintainers; [ pasqui23 ];
|
||||
};
|
||||
}
|
||||
@ -26,13 +26,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "openvscode-server";
|
||||
version = "1.62.0";
|
||||
version = "1.62.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitpod-io";
|
||||
repo = "openvscode-server";
|
||||
rev = "openvscode-server-v${version}";
|
||||
sha256 = "0lmka1hgf1703h70s7i2lx07535n2l867kmnc5h89c4vaswy6649";
|
||||
sha256 = "0822181gbd6y8bzn65liv7prqv7pg067sbl8nac02zg7268qwi6j";
|
||||
};
|
||||
|
||||
yarnCache = stdenv.mkDerivation {
|
||||
@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "142m0vkddzv09rbbqw7y7x19q7akkn00dn6az5ppr86k6bmhyk6p";
|
||||
outputHash = "0rmcixcn7lmrndb2pq0x895qp34hc271h1j0n3xq9rv603v1ayvk";
|
||||
};
|
||||
|
||||
# Extract the Node.js source code which is used to compile packages with
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hilbish";
|
||||
version = "0.6.1";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rosettea";
|
||||
repo = "Hilbish";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3qU1gQSWxyKgQcHgT61Q+n6u0rGU0vqTdT/VwMN20yw=";
|
||||
sha256 = "sha256-YQNLv6/4I5WM/xhlWIjThgO23tN+ZCyJVZVatnIUllc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-xnq0CEfz9uVpDkqY5/Sw9O5uMTHV74vQBXrav3bbH7E=";
|
||||
vendorSha256 = "sha256-xzB6sqBnDuvqTFMmLcXdSj6UFWYzA54PxUBKrFKhyQk=";
|
||||
|
||||
buildInputs = [ readline ];
|
||||
|
||||
|
||||
32
pkgs/tools/admin/google-cloud-sdk/data.nix
Normal file
32
pkgs/tools/admin/google-cloud-sdk/data.nix
Normal file
@ -0,0 +1,32 @@
|
||||
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||
{ }:
|
||||
{
|
||||
version = "365.0.0";
|
||||
googleCloudSdkPkgs = {
|
||||
x86_64-linux =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-linux-x86_64.tar.gz";
|
||||
sha256 = "1h1z2ddhgrc74gnfaicvginl2yy7zjx8dlvkx017vsd3vijavl41";
|
||||
};
|
||||
x86_64-darwin =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-darwin-x86_64.tar.gz";
|
||||
sha256 = "0428pc85jlwsydn5nl7vya3rsbiww8z2jvc68wy1sdk7a1md01cy";
|
||||
};
|
||||
aarch64-linux =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-linux-arm.tar.gz";
|
||||
sha256 = "0ji29kd6cfyl59vlms77bnlqf95yh86g9c08wkx1f1kdavi78l0d";
|
||||
};
|
||||
aarch64-darwin =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-darwin-arm.tar.gz";
|
||||
sha256 = "1rg996y4r24aif5vv6cnl3g7g6fknz8zv6m87ayl8x7yljrqcy27";
|
||||
};
|
||||
i686-linux =
|
||||
{
|
||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-linux-x86.tar.gz";
|
||||
sha256 = "0jvcridqlk2r5m6b22ldxi9g4mxfy120428ynw9rgpwx0chjmpi6";
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -17,39 +17,15 @@ let
|
||||
crcmod
|
||||
] ++ lib.optional (with-gce) google-compute-engine);
|
||||
|
||||
baseUrl = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads";
|
||||
sources = name: system: {
|
||||
x86_64-darwin = {
|
||||
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
|
||||
sha256 = "19s3nryngzv7zs7piwx92hii5p2y97fs7wngqrd9v8cxvgavp1dc";
|
||||
};
|
||||
|
||||
aarch64-darwin = {
|
||||
url = "${baseUrl}/${name}-darwin-arm.tar.gz";
|
||||
sha256 = "1iphpkxrrp0gdan7ikbjbhykdpazcs1fnlcwkfyv2m9baggkd53z";
|
||||
};
|
||||
|
||||
x86_64-linux = {
|
||||
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
|
||||
sha256 = "1z1ymvij9vi8jc05b004jhd08dqbk133wd03fdxnagd6nfr0bjqm";
|
||||
};
|
||||
|
||||
i686-linux = {
|
||||
url = "${baseUrl}/${name}-linux-x86.tar.gz";
|
||||
sha256 = "17i5pkwjmi38klgr12xqgza7iwkx459cbavlq0x33zaq2a4zanlc";
|
||||
};
|
||||
|
||||
aarch64-linux = {
|
||||
url = "${baseUrl}/${name}-linux-arm.tar.gz";
|
||||
sha256 = "17zjnab4ai5w6p3cbxys9zsg4bdlp0lh6pvmkvdz9hszxxch4yms";
|
||||
};
|
||||
}.${system} or (throw "Unsupported system: ${system}");
|
||||
data = import ./data.nix { };
|
||||
sources = system:
|
||||
data.googleCloudSdkPkgs.${system} or (throw "Unsupported system: ${system}");
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "google-cloud-sdk";
|
||||
version = "362.0.0";
|
||||
inherit (data) version;
|
||||
|
||||
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
|
||||
src = fetchurl (sources stdenv.hostPlatform.system);
|
||||
|
||||
buildInputs = [ python ];
|
||||
|
||||
@ -135,8 +111,9 @@ in stdenv.mkDerivation rec {
|
||||
# This package contains vendored dependencies. All have free licenses.
|
||||
license = licenses.free;
|
||||
homepage = "https://cloud.google.com/sdk/";
|
||||
changelog = "https://cloud.google.com/sdk/docs/release-notes";
|
||||
maintainers = with maintainers; [ iammrinal0 pradyuman stephenmw zimbatm ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
|
||||
platforms = builtins.attrNames data.googleCloudSdkPkgs;
|
||||
mainProgram = "gcloud";
|
||||
};
|
||||
}
|
||||
|
||||
47
pkgs/tools/admin/google-cloud-sdk/update.sh
Executable file
47
pkgs/tools/admin/google-cloud-sdk/update.sh
Executable file
@ -0,0 +1,47 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p nix
|
||||
|
||||
BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk"
|
||||
|
||||
# Version of Google Cloud SDK from
|
||||
# https://cloud.google.com/sdk/docs/release-notes
|
||||
VERSION="365.0.0"
|
||||
|
||||
function genMainSrc() {
|
||||
local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"
|
||||
local sha256
|
||||
sha256=$(nix-prefetch-url "$url")
|
||||
echo " {"
|
||||
echo " url = \"${url}\";"
|
||||
echo " sha256 = \"${sha256}\";"
|
||||
echo " };"
|
||||
}
|
||||
|
||||
{
|
||||
cat <<EOF
|
||||
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||
{ }:
|
||||
{
|
||||
version = "${VERSION}";
|
||||
googleCloudSdkPkgs = {
|
||||
EOF
|
||||
|
||||
echo " x86_64-linux ="
|
||||
genMainSrc "linux" "x86_64"
|
||||
|
||||
echo " x86_64-darwin ="
|
||||
genMainSrc "darwin" "x86_64"
|
||||
|
||||
echo " aarch64-linux ="
|
||||
genMainSrc "linux" "arm"
|
||||
|
||||
echo " aarch64-darwin ="
|
||||
genMainSrc "darwin" "arm"
|
||||
|
||||
echo " i686-linux ="
|
||||
genMainSrc "linux" "x86"
|
||||
|
||||
echo " };"
|
||||
echo "}"
|
||||
|
||||
} >data.nix
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, git, openssl, makeWrapper, buildPythonApplication, pytestCheckHook, ps
|
||||
{ stdenv, lib, git, openssl, makeWrapper, buildPythonApplication, pytestCheckHook, ps
|
||||
, fetchPypi, fetchFromGitLab }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pmbootstrap";
|
||||
version = "1.30.0";
|
||||
version = "1.39.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-uHN3nplQOMuBeQIxAocCVqwnmJUQZL67+iXLhQ7onps=";
|
||||
sha256 = "13krdb0xmwgldfn8izm1x3j6i6s4n9j8n8n0p4g5kd74ygkvfczz";
|
||||
};
|
||||
|
||||
repo = fetchFromGitLab {
|
||||
@ -15,7 +15,7 @@ buildPythonApplication rec {
|
||||
owner = "postmarketOS";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-JunI/mqq+UvmzNVt3mdJN3+tKGN4uTrxkUU2imCNCNY=";
|
||||
sha256 = "0mrhgi5y3jwd922cmm2niy9ia0g8p6bsqjjxg523yandshpa3683";
|
||||
};
|
||||
|
||||
pmb_test = "${repo}/test";
|
||||
@ -23,64 +23,65 @@ buildPythonApplication rec {
|
||||
checkInputs = [ pytestCheckHook git openssl ps ];
|
||||
|
||||
# Add test dependency in PATH
|
||||
checkPhase = "export PYTHONPATH=$PYTHONPATH:${pmb_test}";
|
||||
preCheck = "export PYTHONPATH=$PYTHONPATH:${pmb_test}";
|
||||
|
||||
# skip impure tests
|
||||
disabledTests = [
|
||||
"test_get_apkbuild"
|
||||
"test_check_build_for_arch"
|
||||
"test_get_depends"
|
||||
"test_build_depends_no_binary_error"
|
||||
"test_build_depends_binary_outdated"
|
||||
"test_init_buildenv"
|
||||
"test_run_abuild"
|
||||
"test_finish"
|
||||
"test_package"
|
||||
"test_build_depends_high_level"
|
||||
"test_build_local_source_high_level"
|
||||
"test_chroot_interactive_shell"
|
||||
"test_chroot_interactive_shell_user"
|
||||
"test_chroot_arguments"
|
||||
"test_switch_to_channel_branch"
|
||||
"test_read_config_channel"
|
||||
"test_cross_compile_distcc"
|
||||
"test_build_src_invalid_path"
|
||||
"test_can_fast_forward"
|
||||
"test_clean_worktree"
|
||||
"test_get_upstream_remote"
|
||||
"test_pull"
|
||||
"test_helpers_package_get_apkindex"
|
||||
"test_filter_missing_packages_invalid"
|
||||
"test_filter_missing_packages_binary_exists"
|
||||
"test_filter_missing_packages_pmaports"
|
||||
"test_filter_aport_packages"
|
||||
"test_pmbootstrap_status"
|
||||
"test_print_checks_git_repo"
|
||||
"test_helpers_ui"
|
||||
"test_newapkbuild"
|
||||
"test_package_from_aports"
|
||||
"test_recurse_invalid"
|
||||
"test_questions_bootimg"
|
||||
"test_questions_keymaps"
|
||||
"test_questions_work_path"
|
||||
"test_questions_channel"
|
||||
"test_apk_static"
|
||||
"test_aportgen"
|
||||
"test_aportgen_device_wizard"
|
||||
"test_bootimg"
|
||||
"test_build_depends_binary_outdated"
|
||||
"test_build_depends_high_level"
|
||||
"test_build_depends_no_binary_error"
|
||||
"test_build_is_necessary"
|
||||
"test_build_local_source_high_level"
|
||||
"test_build_src_invalid_path"
|
||||
"test_can_fast_forward"
|
||||
"test_check_build_for_arch"
|
||||
"test_chroot_arguments"
|
||||
"test_chroot_interactive_shell"
|
||||
"test_chroot_interactive_shell_user"
|
||||
"test_clean_worktree"
|
||||
"test_config_user"
|
||||
"test_cross_compile_distcc"
|
||||
"test_crossdirect"
|
||||
"test_file"
|
||||
"test_filter_aport_packages"
|
||||
"test_filter_missing_packages_binary_exists"
|
||||
"test_filter_missing_packages_invalid"
|
||||
"test_filter_missing_packages_pmaports"
|
||||
"test_finish"
|
||||
"test_folder_size"
|
||||
"test_get_apkbuild"
|
||||
"test_get_depends"
|
||||
"test_get_upstream_remote"
|
||||
"test_helpers_lint"
|
||||
"test_helpers_package_get_apkindex"
|
||||
"test_helpers_repo"
|
||||
"test_helpers_ui"
|
||||
"test_init_buildenv"
|
||||
"test_kconfig_check"
|
||||
"test_keys"
|
||||
"test_newapkbuild"
|
||||
"test_package"
|
||||
"test_package_from_aports"
|
||||
"test_pkgrel_bump"
|
||||
"test_pmbootstrap_status"
|
||||
"test_print_checks_git_repo"
|
||||
"test_pull"
|
||||
"test_qemu_running_processes"
|
||||
"test_questions_additional_options"
|
||||
"test_questions_bootimg"
|
||||
"test_questions_channel"
|
||||
"test_questions_keymaps"
|
||||
"test_questions_work_path"
|
||||
"test_read_config_channel"
|
||||
"test_recurse_invalid"
|
||||
"test_run_abuild"
|
||||
"test_run_core"
|
||||
"test_shell_escape"
|
||||
"test_switch_to_channel_branch"
|
||||
"test_version"
|
||||
];
|
||||
|
||||
@ -91,5 +92,7 @@ buildPythonApplication rec {
|
||||
homepage = "https://gitlab.com/postmarketOS/pmbootstrap";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ payas ];
|
||||
# https://github.com/NixOS/nixpkgs/pull/146576#issuecomment-974267651
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,22 +1,33 @@
|
||||
{ stdenv, lib, openssl, pkg-config, rustPlatform, fetchFromGitHub, Security
|
||||
, libiconv, installShellFiles }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, withNativeTls ? true
|
||||
, Security
|
||||
, libiconv
|
||||
, openssl }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xh";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ducaale";
|
||||
repo = "xh";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fTd4VSUUj9Im+kCEuFgDsA7eofM1xQfrRzigr1vyJ3I=";
|
||||
sha256 = "sha256-G6uAHpptX+hvh0ND+mqgR3AG0GT/qily6Y8Pt5yVbxg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-yZdGw/6iVg8PaUyjTrxj6h/2yhBtqEqvMhdRHhMwDZc=";
|
||||
cargoSha256 = "sha256-W2l1kiD2yY6FFA29WYPlWCjxKzuSgCdPN8M8bE4QGMU=";
|
||||
|
||||
buildFeatures = lib.optional withNativeTls "native-tls";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
||||
buildInputs = if stdenv.isDarwin then [ Security libiconv ] else [ openssl ];
|
||||
buildInputs = lib.optionals withNativeTls
|
||||
(if stdenv.isDarwin then [ Security libiconv ] else [ openssl ]);
|
||||
|
||||
# Get openssl-sys to use pkg-config
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-11-23";
|
||||
version = "2021-11-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-mYElt+KdeyRxr0Ef++/o47IWhPXBFmRIHbnw1UNXfr4=";
|
||||
sha256 = "sha256-pe4SQRVE4e6tNy5eF5uthI6AZ8BwaX72EpNxAU0+UmY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1087,6 +1087,8 @@ with pkgs;
|
||||
|
||||
nimmm = callPackage ../applications/terminal-emulators/nimmm { };
|
||||
|
||||
notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { };
|
||||
|
||||
pikchr = callPackage ../tools/graphics/pikchr { };
|
||||
|
||||
roxterm = callPackage ../applications/terminal-emulators/roxterm { };
|
||||
@ -2429,6 +2431,8 @@ with pkgs;
|
||||
|
||||
cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { };
|
||||
|
||||
cfm = callPackage ../applications/misc/cfm { };
|
||||
|
||||
charliecloud = callPackage ../applications/virtualization/charliecloud { };
|
||||
|
||||
chelf = callPackage ../tools/misc/chelf { };
|
||||
@ -19210,6 +19214,8 @@ with pkgs;
|
||||
|
||||
pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {};
|
||||
|
||||
plasma-hud = callPackage ../misc/plasma-hud { };
|
||||
|
||||
re2 = callPackage ../development/libraries/re2 { };
|
||||
|
||||
qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { };
|
||||
@ -24883,14 +24889,20 @@ with pkgs;
|
||||
|
||||
keepass = callPackage ../applications/misc/keepass { };
|
||||
|
||||
keepass-charactercopy = callPackage ../applications/misc/keepass-plugins/charactercopy { };
|
||||
|
||||
keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { };
|
||||
|
||||
keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { };
|
||||
|
||||
keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { };
|
||||
|
||||
keepass-keetraytotp = callPackage ../applications/misc/keepass-plugins/keetraytotp { };
|
||||
|
||||
keepass-otpkeyprov = callPackage ../applications/misc/keepass-plugins/otpkeyprov { };
|
||||
|
||||
keepass-qrcodeview = callPackage ../applications/misc/keepass-plugins/qrcodeview { };
|
||||
|
||||
kerbrute = callPackage ../tools/security/kerbrute { };
|
||||
|
||||
exrdisplay = callPackage ../applications/graphics/exrdisplay { };
|
||||
@ -26964,6 +26976,7 @@ with pkgs;
|
||||
sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {};
|
||||
thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { };
|
||||
youtube-quality = callPackage ../applications/video/mpv/scripts/youtube-quality.nix { };
|
||||
cutter = callPackage ../applications/video/mpv/scripts/cutter.nix { };
|
||||
};
|
||||
|
||||
mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ buildPackages, pkgs, newScope, stdenv }:
|
||||
{ buildPackages, pkgsBuildTarget, pkgs, newScope, stdenv }:
|
||||
|
||||
let
|
||||
# These are attributes in compiler and packages that don't support integer-simple.
|
||||
@ -79,7 +79,7 @@ in {
|
||||
else
|
||||
packages.ghc865Binary;
|
||||
inherit (buildPackages.python3Packages) sphinx;
|
||||
buildLlvmPackages = buildPackages.llvmPackages_7;
|
||||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7;
|
||||
llvmPackages = pkgs.llvmPackages_7;
|
||||
};
|
||||
ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix {
|
||||
@ -96,7 +96,7 @@ in {
|
||||
# https://github.com/xattr/xattr/issues/44 and
|
||||
# https://github.com/xattr/xattr/issues/55 are solved.
|
||||
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
|
||||
buildLlvmPackages = buildPackages.llvmPackages_9;
|
||||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_9;
|
||||
llvmPackages = pkgs.llvmPackages_9;
|
||||
};
|
||||
ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix {
|
||||
@ -109,7 +109,7 @@ in {
|
||||
packages.ghc8107Binary;
|
||||
inherit (buildPackages.python3Packages) sphinx;
|
||||
inherit (buildPackages.darwin) autoSignDarwinBinariesHook;
|
||||
buildLlvmPackages = buildPackages.llvmPackages_10;
|
||||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_10;
|
||||
llvmPackages = pkgs.llvmPackages_10;
|
||||
};
|
||||
ghc921 = callPackage ../development/compilers/ghc/9.2.1.nix {
|
||||
@ -124,7 +124,7 @@ in {
|
||||
# https://github.com/xattr/xattr/issues/44 and
|
||||
# https://github.com/xattr/xattr/issues/55 are solved.
|
||||
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
|
||||
buildLlvmPackages = buildPackages.llvmPackages_10;
|
||||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_10;
|
||||
llvmPackages = pkgs.llvmPackages_10;
|
||||
};
|
||||
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
|
||||
@ -134,7 +134,7 @@ in {
|
||||
# https://github.com/xattr/xattr/issues/44 and
|
||||
# https://github.com/xattr/xattr/issues/55 are solved.
|
||||
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
|
||||
buildLlvmPackages = buildPackages.llvmPackages_10;
|
||||
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_10;
|
||||
llvmPackages = pkgs.llvmPackages_10;
|
||||
libffi = pkgs.libffi;
|
||||
};
|
||||
|
||||
@ -2984,6 +2984,8 @@ in {
|
||||
|
||||
future-fstrings = callPackage ../development/python-modules/future-fstrings { };
|
||||
|
||||
future-typing = callPackage ../development/python-modules/future-typing { };
|
||||
|
||||
fuzzyfinder = callPackage ../development/python-modules/fuzzyfinder { };
|
||||
|
||||
fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { };
|
||||
@ -9613,6 +9615,8 @@ in {
|
||||
|
||||
typesystem = callPackage ../development/python-modules/typesystem { };
|
||||
|
||||
typical = callPackage ../development/python-modules/typical { };
|
||||
|
||||
typing = null;
|
||||
|
||||
typing-extensions = callPackage ../development/python-modules/typing-extensions { };
|
||||
@ -9937,6 +9941,8 @@ in {
|
||||
|
||||
weasyprint = callPackage ../development/python-modules/weasyprint { };
|
||||
|
||||
webargs = callPackage ../development/python-modules/webargs { };
|
||||
|
||||
webapp2 = callPackage ../development/python-modules/webapp2 { };
|
||||
|
||||
webassets = callPackage ../development/python-modules/webassets { };
|
||||
@ -9955,8 +9961,6 @@ in {
|
||||
|
||||
webhelpers = callPackage ../development/python-modules/webhelpers { };
|
||||
|
||||
webargs = callPackage ../development/python-modules/webargs { };
|
||||
|
||||
webob = callPackage ../development/python-modules/webob { };
|
||||
|
||||
weboob = callPackage ../development/python-modules/weboob { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user