Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
sternenseemann
commit
014a2a9976
@ -2334,6 +2334,12 @@
|
||||
githubId = 3956062;
|
||||
name = "Simon Lackerbauer";
|
||||
};
|
||||
cimm = {
|
||||
email = "8k9ft8m5gv@astil.be";
|
||||
github = "cimm";
|
||||
githubId = 68112;
|
||||
name = "Simon";
|
||||
};
|
||||
cirno-999 = {
|
||||
email = "reverene@protonmail.com";
|
||||
github = "cirno-999";
|
||||
@ -9856,6 +9862,12 @@
|
||||
githubId = 6931743;
|
||||
name = "pasqui23";
|
||||
};
|
||||
patricksjackson = {
|
||||
email = "patrick@jackson.dev";
|
||||
github = "patricksjackson";
|
||||
githubId = 160646;
|
||||
name = "Patrick Jackson";
|
||||
};
|
||||
patryk27 = {
|
||||
email = "pwychowaniec@pm.me";
|
||||
github = "Patryk27";
|
||||
|
||||
@ -19,7 +19,7 @@ let
|
||||
# per debian's udev deb hook (https://man7.org/linux/man-pages/man1/dh_installudev.1.html)
|
||||
destination = "60-scdaemon.rules";
|
||||
|
||||
scdaemonUdevRulesPkg = pkgs.runCommandNoCC "scdaemon-udev-rules" {} ''
|
||||
scdaemonUdevRulesPkg = pkgs.runCommand "scdaemon-udev-rules" {} ''
|
||||
loc="$out/lib/udev/rules.d/"
|
||||
mkdir -p "''${loc}"
|
||||
cp "${scdaemonRules}" "''${loc}/${destination}"
|
||||
|
||||
@ -98,7 +98,7 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
(pkgs.runCommandNoCC "captive-browser-desktop-item" { } ''
|
||||
(pkgs.runCommand "captive-browser-desktop-item" { } ''
|
||||
install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*.desktop
|
||||
'')
|
||||
];
|
||||
|
||||
@ -53,7 +53,7 @@ in {
|
||||
else cfg.configFile;
|
||||
in
|
||||
{
|
||||
ExecStart = "${pkgs.grafana-mimir}/bin/mimir --config.file=${conf}";
|
||||
ExecStart = "${pkgs.mimir}/bin/mimir --config.file=${conf}";
|
||||
DynamicUser = true;
|
||||
Restart = "always";
|
||||
ProtectSystem = "full";
|
||||
|
||||
@ -1027,6 +1027,7 @@ in
|
||||
${pkgs.envsubst}/bin/envsubst \
|
||||
-o ${cfg.workDir}/config.json \
|
||||
-i ${prettyJSON cfg.configuration}
|
||||
mkdir -p ${cfg.configuration.uploadsPath}
|
||||
'';
|
||||
serviceConfig = {
|
||||
WorkingDirectory = cfg.workDir;
|
||||
|
||||
@ -170,7 +170,7 @@ in {
|
||||
frr = handleTest ./frr.nix {};
|
||||
fsck = handleTest ./fsck.nix {};
|
||||
ft2-clone = handleTest ./ft2-clone.nix {};
|
||||
grafana-mimir = handleTest ./grafana-mimir.nix {};
|
||||
mimir = handleTest ./mimir.nix {};
|
||||
gerrit = handleTest ./gerrit.nix {};
|
||||
geth = handleTest ./geth.nix {};
|
||||
ghostunnel = handleTest ./ghostunnel.nix {};
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "grafana-mimir";
|
||||
name = "mimir";
|
||||
nodes = {
|
||||
server = { ... }: {
|
||||
environment.systemPackages = [ pkgs.jq ];
|
||||
@ -1,51 +0,0 @@
|
||||
{ lib, gcc10Stdenv, fetchhg, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
|
||||
|
||||
gcc10Stdenv.mkDerivation rec {
|
||||
version = "10.8";
|
||||
pname = "textadept";
|
||||
|
||||
nativeBuildInputs = [ pkg-config unzip ];
|
||||
buildInputs = [
|
||||
gtk2 ncurses glib zip
|
||||
];
|
||||
|
||||
src = fetchhg {
|
||||
url = "http://foicica.com/hg/textadept";
|
||||
rev = "textadept_${version}";
|
||||
sha256 = "sha256-dEZSx2tuHTWYhk9q5iGlrWTAvDvKaM8HaHwXcFcv33s=";
|
||||
};
|
||||
|
||||
preConfigure =
|
||||
lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params:
|
||||
"ln -s ${fetchurl params} $PWD/src/${name}"
|
||||
) (import ./deps.nix)) + ''
|
||||
|
||||
cd src
|
||||
make deps
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
make curses
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
mkdir -p $out/share/pixmaps
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
make curses install PREFIX=$out MAKECMDGOALS=curses
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An extensible text editor based on Scintilla with Lua scripting";
|
||||
homepage = "http://foicica.com/textadept";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ raskin mirrexagon ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
42
pkgs/applications/editors/textadept/10/deps.nix
generated
42
pkgs/applications/editors/textadept/10/deps.nix
generated
@ -1,42 +0,0 @@
|
||||
{
|
||||
"99fa62b828ee.zip" = {
|
||||
url = "http://foicica.com/hg/scintilla/archive/99fa62b828ee.zip";
|
||||
sha256 = "sha256-QO4iGhx72CfB1/0Pp/Qab92qm98VZn/EkrHZGndoHVc=";
|
||||
};
|
||||
"lua-5.3.5.tar.gz" = {
|
||||
url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz";
|
||||
sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc";
|
||||
};
|
||||
"lpeg-1.0.2.tar.gz" = {
|
||||
url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz";
|
||||
sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4=";
|
||||
};
|
||||
"v1_7_0_2.zip" = {
|
||||
url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip";
|
||||
sha256 = "sha256-kXSriR8dOStCpYeyr7c3+VZez4qGDS5aK/9FeFj1hHg=";
|
||||
};
|
||||
"db67f8a489e8.zip" = {
|
||||
url = "http://foicica.com/hg/gtdialog/archive/db67f8a489e8.zip";
|
||||
sha256 = "sha256-UIvjbDrg3jyz7t2tm4y1zzH/TG6Kqaz3LE5y2U6OHuM=";
|
||||
};
|
||||
"cdk-5.0-20150928.tgz" = {
|
||||
url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz";
|
||||
sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
|
||||
};
|
||||
"libtermkey-0.20.tar.gz" = {
|
||||
url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz";
|
||||
sha256 = "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc";
|
||||
};
|
||||
"pdcurs36.zip" = {
|
||||
url = "http://prdownloads.sourceforge.net/pdcurses/pdcurs36.zip";
|
||||
sha256 = "0y91zpygrxms7d1l5ksrz42bkvq8jd2xqlj5j7wgyxcl58chcw9b";
|
||||
};
|
||||
"bombay.zip" = {
|
||||
url = "http://foicica.com/hg/bombay/archive/b25520cc76bb.zip";
|
||||
sha256 = "07spq7jmkfyq20gv67yffara3ln3ns2xi0k02m2mxdms3xm1q36h";
|
||||
};
|
||||
"cloc-1.60.pl" = {
|
||||
url = "http://prdownloads.sourceforge.net/cloc/cloc-1.60.pl";
|
||||
sha256 = "0p504bi19va3dh274v7lb7giqrydwa5yyry60f7jpz84y6z71a2a";
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "11.3";
|
||||
pname = "textadept11";
|
||||
pname = "textadept";
|
||||
|
||||
nativeBuildInputs = [ pkg-config unzip zip ];
|
||||
buildInputs = [
|
||||
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
description = "An extensible text editor based on Scintilla with Lua scripting.";
|
||||
homepage = "http://foicica.com/textadept";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ raskin mirrexagon ];
|
||||
maintainers = with maintainers; [ raskin mirrexagon patricksjackson ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "19.0.0";
|
||||
version = "19.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
|
||||
sha256 = "aabf2addc3182996c76a01df16024b77ae16a489e52cedf87bcfb14891f72118";
|
||||
sha256 = "da9fb38970987b7d5b84fd0d91824f206ba7a3681a7354adc6d6e795c7613828";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, autoreconfHook, intltool
|
||||
, gtk, pkg-config, flex }:
|
||||
|
||||
@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pul patch pending upstream inclusion for -fno-common toolchain support:
|
||||
# https://github.com/galculator/galculator/pull/45
|
||||
(fetchpatch {
|
||||
name = "fno-common.patch";
|
||||
url = "https://github.com/galculator/galculator/commit/501a9e3feeb2e56889c0ff98ab6d0ab20348ccd6.patch";
|
||||
sha256 = "08c9d2b49a1mizgk7v37dp8r96x389zc13mzv4dcy16x448lhp67";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook intltool pkg-config ];
|
||||
buildInputs = [ gtk flex ];
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gnome-secrets";
|
||||
version = "6.4";
|
||||
version = "6.5";
|
||||
format = "other";
|
||||
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
||||
|
||||
@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "World";
|
||||
repo = "secrets";
|
||||
rev = version;
|
||||
sha256 = "sha256-qO2DJ/Eb9+G1R3un2+n9Tf6oxpGrEuH3SBrajQ9tCPU=";
|
||||
sha256 = "sha256-Hy2W7cvvzVcKtd/KzTn81awoolnfM3ST0Nm70YBLTYY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "0.30.2";
|
||||
sha256 = "0z4f0vf2n7vfp6ff0lxcl5qyl65ihd4absad8cd16hncz15nyjgl";
|
||||
manifestsSha256 = "04dlxzlrhggq54nkywn9nwdagdn43f0rb7cjkqdn3hlm4hwd07pb";
|
||||
version = "0.31.0";
|
||||
sha256 = "073ij9mllxvw6rg8nm8pj6b8m5jzgbiihr9kknhhpp788wya155d";
|
||||
manifestsSha256 = "0kp75h119l9051p2xcjfwcllk4hilmq25fcrx86bm0646krvk0pk";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
@ -23,7 +23,7 @@ in buildGoModule rec {
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-POziJtCdD4klu23WuGmWdt72Ugr4KwCAjXRTCuzikSk=";
|
||||
vendorSha256 = "sha256-XTtVSSqU2jWRZvudE6G5QaNaZxw3oESiMPnnQzDs/1w=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "roxctl";
|
||||
version = "3.69.1";
|
||||
version = "3.70.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackrox";
|
||||
repo = "stackrox";
|
||||
rev = version;
|
||||
sha256 = "sha256-fB43C+gMtUOg/Ah1fOTnOWOUmS0TjXkNCzw/TKfMzj4=";
|
||||
sha256 = "sha256-VnnMD2tRixCswO/9nrP3PgXmev6O8QUTbkwmFIpPUyE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-M+ZueycJEaDVzC2bFwQc5EulCrdz6lvzyD8YCoGyW1g=";
|
||||
vendorSha256 = "sha256-xh2bgLSWjQHOjHrgDpQri78LvCL4CDbMteQYARyGLgg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -1,18 +1,16 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
# https://github.com/erroneousboat/slack-term
|
||||
buildGoModule rec {
|
||||
pname = "slack-term";
|
||||
version = "0.5.0";
|
||||
|
||||
goPackagePath = "github.com/erroneousboat/slack-term";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erroneousboat";
|
||||
repo = "slack-term";
|
||||
rev = "v${version}";
|
||||
sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Slack client for your terminal";
|
||||
|
||||
@ -8,23 +8,23 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mujmap";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elizagamedev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-O5CbLgs+MkATPtess0gocgPB9kwD8FMR/urwm6jo2rA=";
|
||||
sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-nOZ+HnzXhVp+tLrNMZO1NmZIhIqlWz0fRMbHVIQkOxI=";
|
||||
cargoSha256 = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU=";
|
||||
|
||||
buildInputs = [
|
||||
notmuch
|
||||
] ++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bridge for synchronizing email and tags between JMAP and notmuch";
|
||||
description = "JMAP integration for notmuch mail";
|
||||
homepage = "https://github.com/elizagamedev/mujmap/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ elizagamedev ];
|
||||
|
||||
@ -11,7 +11,7 @@ assert withQt -> qt5 != null;
|
||||
with lib;
|
||||
|
||||
let
|
||||
version = "3.6.3";
|
||||
version = "3.6.5";
|
||||
variant = if withQt then "qt" else "cli";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
@ -21,7 +21,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
|
||||
sha256 = "sha256-tgNkpMAGihCBGrP9B1ymwesOddRGACcbiKIO2Tou9jE=";
|
||||
sha256 = "sha256-otdB1g/zUWE31LnzjNwH7uVKVuw2BG9MOv7mv7T26qE=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "glances";
|
||||
version = "3.2.4.2";
|
||||
version = "3.2.5";
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nicolargo";
|
||||
repo = "glances";
|
||||
rev = "v${version}";
|
||||
sha256 = "0gql61lrav3f7wbsvgc1d6vf8r0xi5xs9rz9d3sqw3wj5m90w0vq";
|
||||
sha256 = "sha256-kTnUP7WvmEw4VazjLrGb0FhSdz+/OadzgwDXs1SA02o=";
|
||||
};
|
||||
|
||||
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.24.0";
|
||||
version = "1.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LbLBG8nvEgSF5KAeAYnp7dM9cbqF078QpVai1iDx63U=";
|
||||
sha256 = "sha256-/AoZKeUcYF1fyYtllXpB7GNWR/6SWEOy2ffDLYbTp9E=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
||||
@ -10,7 +10,6 @@ rec {
|
||||
*
|
||||
* Examples:
|
||||
* runCommand "name" {envVariable = true;} ''echo hello > $out''
|
||||
* runCommandNoCC "name" {envVariable = true;} ''echo hello > $out'' # equivalent to prior
|
||||
* runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out'';
|
||||
*
|
||||
* The `*Local` variants force a derivation to be built locally,
|
||||
|
||||
@ -79,13 +79,13 @@ let
|
||||
++ (op opensslSupport openssl)
|
||||
++ (op gdbmSupport gdbm)
|
||||
++ (op yamlSupport libyaml)
|
||||
++ (op jemallocSupport jemalloc)
|
||||
# Looks like ruby fails to build on darwin without readline even if curses
|
||||
# support is not enabled, so add readline to the build inputs if curses
|
||||
# support is disabled (if it's enabled, we already have it) and we're
|
||||
# running on darwin
|
||||
++ op (!cursesSupport && stdenv.isDarwin) readline
|
||||
++ ops stdenv.isDarwin [ libiconv libobjc libunwind Foundation ];
|
||||
propagatedBuildInputs = op jemallocSupport jemalloc;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmediaart";
|
||||
version = "1.9.5";
|
||||
version = "1.9.6";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1mlw1qgj8nkd9ll6b6h54r1gfdy3zp8a8xqz7qfyfaj85jjgbph7";
|
||||
sha256 = "w7xQJdfbOAWH+cjrgAxhH2taFta0t4/P+T9ih2pnfxc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
|
||||
|
||||
@ -244,9 +244,9 @@ stdenv.mkDerivation {
|
||||
echo '"(build info elided)"' > modules/core/version_string.inc
|
||||
'';
|
||||
|
||||
buildInputs =
|
||||
[ zlib pcre hdf5 boost gflags protobuf ]
|
||||
buildInputs = [ zlib pcre boost gflags protobuf ]
|
||||
++ lib.optional enablePython pythonPackages.python
|
||||
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5
|
||||
++ lib.optional enableGtk2 gtk2
|
||||
++ lib.optional enableGtk3 gtk3
|
||||
++ lib.optional enableVtk vtk
|
||||
|
||||
16
pkgs/development/ocaml-modules/posix/time2.nix
Normal file
16
pkgs/development/ocaml-modules/posix/time2.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ lib, buildDunePackage, posix-base, posix-types, unix-errno }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "posix-time2";
|
||||
|
||||
inherit (posix-base) version src;
|
||||
|
||||
propagatedBuildInputs = [ posix-base posix-types unix-errno ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = posix-base.meta // {
|
||||
description = "posix-time2 provides the types and bindings for posix time APIs";
|
||||
maintainers = with lib.maintainers; [ dandellion ];
|
||||
};
|
||||
}
|
||||
@ -6,25 +6,22 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "srt";
|
||||
version = "0.1.1";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-srt";
|
||||
rev = "v${version}";
|
||||
sha256 = "0xh89w4j7lljvpy2n08x6m9kw88f82snmzf23kp0gw637sjnrj6f";
|
||||
sha256 = "sha256-rnM50IzeiKOrpFf79jTHp+fXn0tdx+vrLuD3kzqLh5g=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [ posix-socket srt ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "OCaml bindings for the libsrt library";
|
||||
license = lib.licenses.gpl2Only;
|
||||
inherit (src.meta) homepage;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
maintainers = with maintainers; [ vbgl dandellion ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
22
pkgs/development/ocaml-modules/unix-errno/default.nix
Normal file
22
pkgs/development/ocaml-modules/unix-errno/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ lib, buildDunePackage, fetchurl, ctypes, integers, result }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "unix-errno";
|
||||
version = "0.6.1";
|
||||
|
||||
minimalOCamlVersion = "4.03.0"; # Specified to be 4.01.0, but it's actually 4.03
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/xapi-project/ocaml-unix-errno/releases/download/${version}/unix-errno-${version}.tbz";
|
||||
sha256 = "sha256-jZqtHwUKTffjuOP2jdKKQRtEOBKyclhfeiPO96hEj4c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ctypes integers result ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/xapi-project/ocaml-unix-errno"; # This is the repo used in the opam package
|
||||
description = "Unix errno types, maps, and support for OCaml";
|
||||
license = with licenses; [ isc lgpl21Only ]; # All the files indicate ISC, but there's an LGPL LICENSE file
|
||||
maintainers = with maintainers; [ dandellion ];
|
||||
};
|
||||
}
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "Noltari";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-fYhYqBnwvnfu2GbWUlmMmW/Xon3OE3fh+gGlnQRsCyA=";
|
||||
hash = "sha256-sNlqG5A8a8AIgKc9xDAEwxBeKJ/HaW847BZR4WdcsrQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asdf";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1uDRoS9nyZCLPdbiAQBADoiwqaVBzj1NMpZXdJQYoxQ=";
|
||||
hash = "sha256-WRSDTQd7o79ouar9xka58nzl5W4cJBFn1GHe5DsQI+k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "atenpdu";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-hlbrjx6WKVJYaxrMT4fiRXlxKRcQU4AIQUVgA8mbWa8=";
|
||||
sha256 = "sha256-/duY1hS+RU/UAdcQoHF1+c99XaN74jj/0Hj/86U0kmo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pysnmp ];
|
||||
|
||||
@ -1,47 +1,107 @@
|
||||
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python-dateutil, jsonref, jsonschema,
|
||||
pyyaml, simplejson, six, pytz, msgpack, swagger-spec-validator, rfc3987,
|
||||
strict-rfc3339, webcolors, mypy-extensions, jsonpointer, idna, pytest, mock,
|
||||
pytest-benchmark, isPy27, enum34 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fqdn
|
||||
, idna
|
||||
, isoduration
|
||||
, jsonpointer
|
||||
, jsonref
|
||||
, jsonschema
|
||||
, mock
|
||||
, msgpack
|
||||
, mypy-extensions
|
||||
, pytest-benchmark
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pytz
|
||||
, pyyaml
|
||||
, rfc3987
|
||||
, rfc3339-validator
|
||||
, simplejson
|
||||
, six
|
||||
, strict-rfc3339
|
||||
, swagger-spec-validator
|
||||
, uri-template
|
||||
, webcolors
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bravado-core";
|
||||
version = "5.17.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yelp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE=";
|
||||
hash = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jsonref
|
||||
jsonschema
|
||||
msgpack
|
||||
python-dateutil
|
||||
pytz
|
||||
pyyaml
|
||||
simplejson
|
||||
six
|
||||
swagger-spec-validator
|
||||
|
||||
# the following packages are included when jsonschema (3.2) is installed
|
||||
# as jsonschema[format], which reflects what happens in setup.py
|
||||
fqdn
|
||||
idna
|
||||
isoduration
|
||||
jsonpointer
|
||||
rfc3987
|
||||
rfc3339-validator
|
||||
strict-rfc3339
|
||||
uri-template
|
||||
webcolors
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
mypy-extensions
|
||||
pytest
|
||||
pytestCheckHook
|
||||
mock
|
||||
pytest-benchmark
|
||||
];
|
||||
|
||||
checkPhase = "pytest --benchmark-skip";
|
||||
pythonImportsCheck = [
|
||||
"bravado_core"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python-dateutil
|
||||
jsonref
|
||||
jsonschema
|
||||
pyyaml
|
||||
simplejson
|
||||
six
|
||||
pytz
|
||||
msgpack
|
||||
swagger-spec-validator
|
||||
pytestFlagsArray = [
|
||||
"--benchmark-skip"
|
||||
];
|
||||
|
||||
# the following 3 packages are included when jsonschema (3.2) is installed
|
||||
# as jsonschema[format], which reflects what happens in setup.py
|
||||
rfc3987
|
||||
strict-rfc3339
|
||||
webcolors
|
||||
jsonpointer
|
||||
idna
|
||||
] ++ lib.optionals isPy27 [ enum34 ];
|
||||
disabledTestPaths = [
|
||||
# Tests are out-dated (not supporting later modules releases, e.g., jsonschema)
|
||||
"tests/_decorators_test.py"
|
||||
"tests/formatter"
|
||||
"tests/marshal"
|
||||
"tests/model"
|
||||
"tests/operation"
|
||||
"tests/param"
|
||||
"tests/request"
|
||||
"tests/resource"
|
||||
"tests/response"
|
||||
"tests/schema"
|
||||
"tests/security_test.py"
|
||||
"tests/spec"
|
||||
"tests/swagger20_validator"
|
||||
"tests/unmarshal"
|
||||
"tests/validate"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_petstore_spec"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "browser-cookie3";
|
||||
version = "0.14.1";
|
||||
version = "0.14.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2cMWFyHK+7M99Z9O7PiKue37c5XVBe/n88AF5ax7A2s=";
|
||||
hash = "sha256-YR5NcDmbLlnhxcDuyM6hjjuL/Ozw79ytbCF4/nmSZmQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,16 +13,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-python";
|
||||
version = "5.3.2";
|
||||
version = "5.3.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "browniebroke";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-lOVHSYL57hwzvdC+pJFDkDGFuu29jdZ36BYscw82uDE=";
|
||||
hash = "sha256-eiznL23Pt7bwBLxNG8V3ITSNMnwMBjFdiGgu0cSoSw0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -46,7 +46,9 @@ buildPythonPackage rec {
|
||||
--replace " --cov=deezer" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "deezer" ];
|
||||
pythonImportsCheck = [
|
||||
"deezer"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper around the Deezer API";
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fakeredis";
|
||||
version = "1.8";
|
||||
version = "1.8.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,8 +24,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "dsoftwareinc";
|
||||
repo = "fakeredis-py";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HWt2EE25h8zUarknrNMBJmizP3rNM9W8IEUMxLyUii8=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gmQuQIlpE4PdgZ1J5aucSQkJpfrh1qTJNLfyI+cMCJU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-asset";
|
||||
version = "3.9.0";
|
||||
version = "3.9.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-DMRBAzGlByjcdLr/HnVxFxbNWK1TbYFpYKEjDdzfEeg=";
|
||||
hash = "sha256-rGN3P4EfSs7bLLca4Y2J1jF1/wPR5Oc1d6iZFjeQHTM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-datatransfer";
|
||||
version = "3.6.1";
|
||||
version = "3.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hR5qHucBpq1LS9pIZeovcPMiVbw3dhSeeJxkYH8xuMk=";
|
||||
hash = "sha256-y8W0qwm4rTHlDO8L+/fhIJlfW5PonUhAYBU5wLIZJ94=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-logging";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-i8Bh39MnQRQtE4WwDNhHdxFX2bGL6txT+sV8RcvXiZw=";
|
||||
sha256 = "sha256-hIwKcQNPG6AHudqjy2dotACk51IeivwRbJZZaiFweqs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-storage";
|
||||
version = "2.13.1";
|
||||
version = "2.13.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7a25148f635a04ca9ff568d47e64be275d3a4a3c90772524879e8f88f270d92d";
|
||||
sha256 = "sha256-rEznNOgFrKfnOmlhexTTHmkKETRGE26SKSp04diz47I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.10.7";
|
||||
version = "2.10.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-I3oYldj915GBCX5VLEZRqGS7jMHWasQGVIvj50EUTK4=";
|
||||
hash = "sha256-cQ5wFAwgqT2NT+jTfsg13wA7OOq8bk/QIRiIsK2ZyJ0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datacatalog";
|
||||
version = "3.8.0";
|
||||
version = "3.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-kGYfdvAnvdFm/1u0CS+n6rGKhV5GtGhW1zF7SVUu8PY=";
|
||||
hash = "sha256-t7kFCkyH3/MNGFX8S4OzgWnW/NSomAFDbDPCx9hV40g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dataproc";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-C2hAkWSb3h+lFC3pUIHlttme44Ugfae8opmFQbVWYTE=";
|
||||
sha256 = "sha256-9PqMYqZpcy+Lv/3sh5Ru0X0wQWW5VW7CDsFGgHvErpU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datastore";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-2ItUrY5oMTtWig2UIC2IEOKgaaYsVuy9ralDitzQzdc=";
|
||||
sha256 = "sha256-Ie/SyTY8AkmDXRKWwZiukD76HpwJEtp7IBusWj+Y4HE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dlp";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-aUabWEz+ou12Lgys7PZnldjHnifPWPPqO8iJqkDgx9U=";
|
||||
hash = "sha256-q2I3ku8f55rSJQE5oiDttQOJFYtGPjmrW7htrZ+BMPU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-error-reporting";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wjRUPBZwyGP+2528vZ/x4EqiZwqH+9ZvK5rx4ISklHE=";
|
||||
hash = "sha256-J+MzM6aaVy4xmlNUFhSOgAomT007p3ODYVXN71UmZJA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-iam-logging";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZmoBaY0OM2pQcqasGCJQIeN6Rmbo4xlYK7LtH7SecgY=";
|
||||
hash = "sha256-f5ZETn1zLrC+1Gil47zzJGanx7cFBisdoFPoDe1FFwo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-iam";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-c1XPE5PBDXRgpiKGBfAhHB6yTPyvby3aZ5nF40+qFiQ=";
|
||||
sha256 = "sha256-IOl5ZWekpiikOOMQ/afryiP+0lPLt4idSmVARRJj8LE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-iot";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-bZ2Zn4r+hQ2MfkgXmJPYWbKy3tYlTkYh6ohmWQA/75U=";
|
||||
sha256 = "sha256-Y71v505bwXEV1u28WFAHs12Qx0tKY7BDjFCc+oBgZcw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-kms";
|
||||
version = "2.11.1";
|
||||
version = "2.11.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-n0alfJIsaqhQ4Wr4/d2JRXTCE24JTrRJBsYOnRhpV00=";
|
||||
sha256 = "sha256-X95xD/L18dXPYxCbvxIPjaOolMSDr7vpyQnzb5oMFEQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-language";
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-kxJySGikHdichitekEiPjzs48bDqWaXMBhmI6IAwKRM=";
|
||||
sha256 = "sha256-1N5nnT22ILyaubDrpj2bS260AP4YrjrMQ0tgBA3OChg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-os-config";
|
||||
version = "1.11.1";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-i4STXwnFyfXauRx4zvYMO1uWMechvNUOxolOcY3Z5us=";
|
||||
sha256 = "sha256-n3bCKr+fszqHsi6uDmOXSfzoPP8JfpZRAGXIzE3gOVU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-runtimeconfig";
|
||||
version = "0.33.0";
|
||||
version = "0.33.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "cc85e5de7cdb58a27561885021ee6fcf1d9f89e0f0db7c371bdca9c54788dd15";
|
||||
sha256 = "sha256-SKinB6fiBh+oe+lb2IGMD6248DDOrG7g3kiFpMGX4BU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core google-cloud-core ];
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-tasks";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MjXGDlqRDFn2whxnEm1lf0G+vU9U/S3BmNvi47aEJro=";
|
||||
sha256 = "sha256-wIO22BScrDJdbia6oOEuuXptedxrCehqWKLXmxTJmKE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-texttospeech";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-UJSP3a9G6k1arMpoh4/rWrnR4gYtPW6d6LGwWuk5WGg=";
|
||||
sha256 = "sha256-4I7zmjZMjXjkxjEtwWNbev0ryTOIyOWsVkC46tgRyqc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-websecurityscanner";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-yK4xEu9rfFkA6RDNDjul0V+Xjc8TehJ6f8lv1k2WULc=";
|
||||
sha256 = "sha256-JDuMhyk1018pMYNOhRVmP7XyF2wsK5temDTP5033Dxk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "luxtronik";
|
||||
version = "0.3.13";
|
||||
version = "0.3.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "Bouni";
|
||||
repo = "python-luxtronik";
|
||||
rev = version;
|
||||
sha256 = "sha256-ULpi3oNJJe8H9z1C1nCNsR5eMmXQnXtbonrV9Ec2NyY=";
|
||||
sha256 = "sha256-7TuvqOAb/MUumOF6BKTRLOJuvteqZPmFUXXsuwEpmOM=";
|
||||
};
|
||||
|
||||
# Project has no tests
|
||||
|
||||
@ -14,12 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oauthenticator";
|
||||
version = "14.2.0";
|
||||
version = "15.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4baa02ff2c159cbba06f8d07fe11a6e624285ca2f813b1258b4c68766c0ee46b";
|
||||
hash = "sha256-d1toYgrufnVd10QhJ4nhQqyDRaq4CjWLDjC+7ABNp6Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -37,12 +39,14 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Test are outdated, https://github.com/jupyterhub/oauthenticator/issues/432
|
||||
# Tests are outdated, https://github.com/jupyterhub/oauthenticator/issues/432
|
||||
"test_azuread"
|
||||
"test_mediawiki"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "oauthenticator" ];
|
||||
pythonImportsCheck = [
|
||||
"oauthenticator"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more.";
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyeight";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "mezz64";
|
||||
repo = "pyEight";
|
||||
rev = version;
|
||||
sha256 = "sha256-ERilZWroFaBCYjTfU7W0vegJaGibmJYVcgt0z84TPEI=";
|
||||
sha256 = "sha256-H8f7990+ZKoOEzPgeYt4vMHCrcWwIa0X1gMh2qXBAoo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,24 +1,23 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, lxml
|
||||
, pythonOlder
|
||||
, xmltodict
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyialarmxr";
|
||||
pname = "pyialarmxr-homeassistant";
|
||||
version = "1.0.18";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bigmoby";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Q1NsPLA1W4nxSG/9jlMf6BkC3ZrUrhl8oDX7U4aAjxM=";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-aQHJiSmaGyABHP17oFH+6JQ9zNJ6pj2+PcE+gsRuhaQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lxml
|
||||
xmltodict
|
||||
@ -33,7 +32,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to interface with Antifurto365 iAlarmXR systems";
|
||||
homepage = "https://github.com/bigmoby/pyialarmxr";
|
||||
homepage = "https://pypi.org/project/pyialarmxr-homeassistant/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-core";
|
||||
version = "0.6.9";
|
||||
version = "0.6.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.core";
|
||||
inherit version;
|
||||
hash = "sha256-lH0Mi2nR4jqawvpvVfn79U0AflxE8lU1VLKvqAEXDOo=";
|
||||
hash = "sha256-hwI7sSaR0938VeCShzZ39b2CAU5SJLqui8Ri3CGXPwk=";
|
||||
};
|
||||
|
||||
# pyroute2 sub-modules have no tests
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-ethtool";
|
||||
version = "0.6.9";
|
||||
version = "0.6.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.ethtool";
|
||||
inherit version;
|
||||
hash = "sha256-6o75plLeSle6ZFgoIZGKLCjx1hg4Z2okOq2RqAT2g8E=";
|
||||
hash = "sha256-5i1zbKs40RXCQB1cn3jrDOX+Fgl0nknTFLsvI69udxw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-ipdb";
|
||||
version = "0.6.9";
|
||||
version = "0.6.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.ipdb";
|
||||
inherit version;
|
||||
hash = "sha256-sJ9Zzlrh9FWVWL7StyHpPPuXo6TtNLz2/lQBCl53Wrk=";
|
||||
hash = "sha256-emPIh94LqN/QCCLC6Mr+IiVyXtjdsmhduBdPko1V83A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-ipset";
|
||||
version = "0.6.9";
|
||||
version = "0.6.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.ipset";
|
||||
inherit version;
|
||||
hash = "sha256-icEMJno03WKUdIYTZ6BIAo9lm43RwMjxNXcoSkYF81M=";
|
||||
hash = "sha256-1Fk3imqMz9qx1zBcQ/Uyp2eVrTygGIklVF5/QBbuSoI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-ndb";
|
||||
version = "0.6.9";
|
||||
version = "0.6.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.ndb";
|
||||
inherit version;
|
||||
hash = "sha256-ASk6ycw3dQNMV4xmaxPAHDL1KtrY1JGQ5yJYcJ+OgUE=";
|
||||
hash = "sha256-kjgeA7PV6JLvCvaZxe4y984wTo8ExU7Yf1Wr+7jNwu4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-nftables";
|
||||
version = "0.6.9";
|
||||
version = "0.6.10";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.nftables";
|
||||
inherit version;
|
||||
sha256 = "sha256-8BLz8IIobmrGb64PhXz1XWfl3KJTOhOL+j1C4/jlXuI=";
|
||||
sha256 = "sha256-dUuCTGs7RaEehsAgK7yNw11tE3VGtT5LxDilMVWpCNU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-nslink";
|
||||
version = "0.6.9";
|
||||
version = "0.6.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.nslink";
|
||||
inherit version;
|
||||
hash = "sha256-WZjRexKn1FWXj+5KZxqZXB0aZmnd0ECKWt3hvVDdz4w=";
|
||||
hash = "sha256-PynJRg2pXZIeB4Ucz/tvghdEt1iWAr8azjET9hsnUPE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-protocols";
|
||||
version = "0.6.9";
|
||||
version = "0.6.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.protocols";
|
||||
inherit version;
|
||||
hash = "sha256-7vP4rbid2cVGKlYUM5qsmYXQhUfvIWoaDXYnxSUnSJY=";
|
||||
hash = "sha256-xMTKAJC++X1zO7rm+cUr0IuEDxkllyje00Omv9tLZ6E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2";
|
||||
version = "0.6.9";
|
||||
version = "0.6.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PRxNGnH7VpyrV49V9xNO8C1I6LMYK05+ZrKndWKO2vs=";
|
||||
hash = "sha256-Vj7W3/yQPYIUFEdvNv3AS9OqddqtISRbcmWUJxc5JiI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twitterapi";
|
||||
version = "2.7.12";
|
||||
version = "2.7.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "geduldig";
|
||||
repo = "TwitterAPI";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WqeoIZt2OGDXKPAbjm3cHI1kgiCEJC6+ROXXx4TR4b4=";
|
||||
hash = "sha256-48Gphpo3tPcVEGNOSEb8mQaSQARQDCOGFyhGJ+i4BWI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yolink-api";
|
||||
version = "0.0.6";
|
||||
version = "0.0.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "YoSmart-Inc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-e0WeQdxQYwaklXOlyUc22NvJraY/eG6HCLsI6/+A6vg=";
|
||||
hash = "sha256-zdCHKckt28abeJ6PQjX50e/4wOl/xx0TKFEQaUIqrYo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -40,5 +40,8 @@ buildPythonPackage rec {
|
||||
description = "JSON Web Token implementation in Python";
|
||||
homepage = "https://github.com/jpadilla/pyjwt";
|
||||
license = licenses.mit;
|
||||
knownVulnerabilities = [
|
||||
"CVE-2022-29217"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -77,5 +77,8 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/shazow/urllib3";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
knownVulnerabilities = [
|
||||
"CVE-2021-33503"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -32,14 +32,14 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.1188";
|
||||
version = "2.0.1195";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-TK2In3FlcjrJjwfS0flgmgbd7nVv4g69v/ZZfWmbkr4=";
|
||||
hash = "sha256-YzM/YzTeFqNe7ThNH138g13aSzEXK8rzTWit1g27GVw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
||||
@ -1,34 +1,39 @@
|
||||
{ lib, stdenv, fetchgit, sqlite, pkg-config, perl
|
||||
, buildllvmsparse ? true
|
||||
, buildc2xml ? true
|
||||
, llvm, libxml2
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, sqlite
|
||||
, openssl
|
||||
, buildllvmsparse ? false
|
||||
, buildc2xml ? false
|
||||
, libllvm
|
||||
, libxml2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "smatch";
|
||||
version = "20120924";
|
||||
version = "1.72";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://repo.or.cz/${pname}.git";
|
||||
rev = "23656e3e578b700cbf96d043f039e6341a3ba5b9";
|
||||
sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy";
|
||||
src = fetchFromGitHub {
|
||||
owner = "error27";
|
||||
repo = "smatch";
|
||||
rev = version;
|
||||
sha256 = "sha256-XVW4sAgIxaJjAk75bp/O286uddIfgfKtIA2LniUGWBM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ sqlite perl ]
|
||||
++ lib.optional buildllvmsparse llvm
|
||||
++ lib.optional buildc2xml libxml2;
|
||||
|
||||
preBuild = ''
|
||||
sed -i Makefile \
|
||||
-e "s|^PREFIX=.*|PREFIX = $out|g"
|
||||
'';
|
||||
buildInputs = [ sqlite openssl ]
|
||||
++ lib.optionals buildllvmsparse [ libllvm ]
|
||||
++ lib.optionals buildc2xml [ libxml2.dev ];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" "CXX=${stdenv.cc.targetPrefix}c++" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A semantic analysis tool for C";
|
||||
homepage = "http://smatch.sourceforge.net/";
|
||||
maintainers = with maintainers; [];
|
||||
license = licenses.free; /* OSL, see http://www.opensource.org */
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{
|
||||
"version": "0.1.6",
|
||||
"version": "0.1.7",
|
||||
"assets": {
|
||||
"x86_64-darwin": {
|
||||
"asset": "scala-cli-x86_64-apple-darwin.gz",
|
||||
"sha256": "1wcm47x0w4gdhkqrqjn0qvgnn36c707mz9m260pdnnffja203vyr"
|
||||
"sha256": "1sly3s9y742nms8kqwh2cikjkcnbkkafsql8sw2w2zr53z28g10v"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"asset": "scala-cli-x86_64-pc-linux.gz",
|
||||
"sha256": "1jwv67p2r6kxqlz8p2zvk5g5jdswl8cymj822b88lbp78a497kc6"
|
||||
"sha256": "1lgcbxzhwqfnj6n81w1ssdcrn1j0c93chqgh0zzqi08w8wk3x4j5"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
26
pkgs/development/tools/goresym/default.nix
Normal file
26
pkgs/development/tools/goresym/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ stdenv, lib, fetchFromGitHub, buildGoModule }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goresym";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mandiant";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XDy6qALE2xuOVQHuuvU/gOyTRZ/6CWpyjN3i7VmznoI=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-dnQ/tP4RS6WkACobfW7jTTJSHbLrdlZDy1fmO65743Q=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Go symbol recovery tool";
|
||||
homepage = "https://github.com/mandiant/GoReSym";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mrhedgehog ];
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,9 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "terraform-lsp";
|
||||
version = "0.0.12";
|
||||
|
||||
@ -11,7 +14,7 @@ buildGoPackage rec {
|
||||
sha256 = "111350jbq0dp0qhk48j12hrlisd1fwzqpcv357igrbqf6ki7r78q";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/juliosueiras/terraform-lsp";
|
||||
vendorSha256 = null;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitCommit=${src.rev}" ];
|
||||
|
||||
@ -19,6 +22,6 @@ buildGoPackage rec {
|
||||
description = "Language Server Protocol for Terraform";
|
||||
homepage = "https://github.com/juliosueiras/terraform-lsp";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-generate";
|
||||
version = "0.12.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ashleygwilliams";
|
||||
repo = "cargo-generate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VMcyBa8bjH4n8hKS+l5xcaQCBYkBVWjDV2uk4JmhxFs=";
|
||||
sha256 = "sha256-OYYGOB1NfNnOl8bd8KozgMCyW4Gb39LoFtD80DPzpdw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-9RMzvZLGRFGJ0Bw2is2aeRCoLzHsZZ6LCfoCTrKjHbo=";
|
||||
cargoSha256 = "sha256-qmRKjPhPLpzVVuTHuoo0iTlX3BnT2Udo1kFXvA3zNQE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ runCommandNoCC, cargo, neovim, rust-analyzer, rustc }:
|
||||
runCommandNoCC "test-neovim-rust-analyzer" {
|
||||
{ runCommand, cargo, neovim, rust-analyzer, rustc }:
|
||||
runCommand "test-neovim-rust-analyzer" {
|
||||
nativeBuildInputs = [ cargo neovim rust-analyzer rustc ];
|
||||
|
||||
testRustSrc = /* rust */ ''
|
||||
|
||||
@ -357,7 +357,7 @@ rec {
|
||||
} // lib.mapAttrs (_name: type: elixirOr type) lib.types;
|
||||
};
|
||||
|
||||
generate = name: value: pkgs.runCommandNoCC name
|
||||
generate = name: value: pkgs.runCommand name
|
||||
{
|
||||
value = toConf value;
|
||||
passAsFile = [ "value" ];
|
||||
|
||||
@ -1,23 +1,23 @@
|
||||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
x86_64-darwin = fetchzip {
|
||||
sha256 = "sha256-vUOdHDyvVg+8GhctW925WfjONi7TnPRfVfXmehOweB4=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_darwin_amd64.zip";
|
||||
sha256 = "sha256-z7QFnx414sdGazUZIenAVA+7LcSZT0tTb/ldv1SGV3Q=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_darwin_amd64.zip";
|
||||
};
|
||||
aarch64-darwin = fetchzip {
|
||||
sha256 = "sha256-3JmMvxd317Qmyrv7vWyfQsLol+yPuKBXHByt5YRrbX8=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_darwin_arm64.zip";
|
||||
sha256 = "sha256-Pbl7YaDVxdER/ubOiPq54ASB4ILnH0B3GiQlQBe7gFs=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_darwin_arm64.zip";
|
||||
};
|
||||
i686-linux = fetchurl {
|
||||
sha256 = "sha256-A6IsDRbRHyU0+IUKkrudKvlKiJkVNNs12MrKQ6RlpMQ=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_386.tar.gz";
|
||||
sha256 = "sha256-P2PsSdpW5i2hwBPUKb+viYewlVHTER/eBkwPp3koawo=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_386.tar.gz";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
sha256 = "sha256-nPcqAk0m1e9izkylBuNcatHESgvSewR+MKmVdz+HBec=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_amd64.tar.gz";
|
||||
sha256 = "sha256-cbTlVBlGdFgEz2b6pb0SJ7yUf4wFXnZwLCkmvX75FzU=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_amd64.tar.gz";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
sha256 = "sha256-ITkZdVU03FG9AUAMgD6nlCyioPJX357wB9m1jYdPlS4=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_arm64.tar.gz";
|
||||
sha256 = "sha256-TKZ3bOM5oq30GtLn9ifNyY6+2Li4nf1+r2L0ExG/10c=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.6";
|
||||
version = "0.107.7";
|
||||
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2022.6.2";
|
||||
version = "2022.6.3";
|
||||
components = {
|
||||
"abode" = ps: with ps; [
|
||||
abodepy
|
||||
@ -1207,7 +1207,7 @@
|
||||
pyialarm
|
||||
];
|
||||
"ialarm_xr" = ps: with ps; [
|
||||
pyialarmxr
|
||||
pyialarmxr-homeassistant
|
||||
];
|
||||
"iammeter" = ps: with ps; [
|
||||
]; # missing inputs: iammeter
|
||||
|
||||
@ -166,7 +166,7 @@ let
|
||||
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2022.6.2";
|
||||
hassVersion = "2022.6.3";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -184,7 +184,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256-M0wBvAdvoGrvJrE96ZM9+X1KMp796vtzbzIo8ScXcy8=";
|
||||
hash = "sha256-dYJbYrOwjJ2OO+gYT9UmCam+gNvSycFGUEeHBoGTqSM=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
||||
@ -18,7 +18,7 @@ buildGoModule rec {
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) grafana-mimir;
|
||||
inherit (nixosTests) mimir;
|
||||
};
|
||||
|
||||
ldflags = let t = "github.com/grafana/mimir/pkg/util/version";
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "unifi-exporter";
|
||||
version = "0.4.0+git1";
|
||||
rev = "9a4e69fdea91dd0033bda4842998d751b40a6130";
|
||||
|
||||
goPackagePath = "github.com/mdlayher/unifi_exporter";
|
||||
|
||||
src= fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "mdlayher";
|
||||
repo = "unifi_exporter";
|
||||
sha256 = "08zqvwvdqnc301f8jfh7bdvc138szw6xszx884b2v8w2x38w3rmn";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Prometheus exporter that exposes metrics from a Ubiquiti UniFi Controller and UniFi devices";
|
||||
homepage = "https://github.com/mdlayher/unifi_exporter";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bachp globin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oil";
|
||||
version = "0.9.9";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
|
||||
sha256 = "sha256-b2tMS5z4oejh3C/3vznIWhG4cd3anp5RuffhoORrKCQ=";
|
||||
sha256 = "sha256-jI+QQ+jE3Qzd0b9VishVwBzDlFHCVKv8cZ0BsHnkd0Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -5,15 +5,15 @@
|
||||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2022-06-05";
|
||||
version = "2022-06-06";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "6622210d7d4afe859f11c5d50c177bd5e500f2c6";
|
||||
rev = "d41ca84af1271e8bfbe26f581cebe3b86521d0db";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "3+3ekdryhiILou+8yJpq7axS2PEHDCWnBCQ5373m1uo=";
|
||||
sha256 = "87jAe5cEPj6e1raovj8sD4LZB1sfrSZkCleW8of2HP8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib, stdenv, makeWrapper, fetchurl, which, pkg-config
|
||||
, fetchFromGitLab
|
||||
, fetchFromGitHub
|
||||
, ocamlPackages
|
||||
, libao, portaudio, alsa-lib, libpulseaudio, libjack2
|
||||
, libsamplerate, libmad, taglib, lame, libogg
|
||||
@ -24,7 +25,8 @@ in
|
||||
|
||||
# Liquidsoap 1.4.2 is not compatible with menhir ≥ 20220210
|
||||
# Locally override menhir to an earlier version
|
||||
let menhirLib = ocamlPackages.menhirLib.overrideAttrs (o: rec {
|
||||
let
|
||||
menhirLib = ocamlPackages.menhirLib.overrideAttrs (o: rec {
|
||||
version = "20211128";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.inria.fr";
|
||||
@ -41,6 +43,15 @@ let menhirLib = ocamlPackages.menhirLib.overrideAttrs (o: rec {
|
||||
inherit menhirLib menhirSdk;
|
||||
};
|
||||
|
||||
srt = ocamlPackages.srt.overrideAttrs (old: rec {
|
||||
version = "0.1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-srt";
|
||||
rev = "v${version}";
|
||||
sha256 = "0xh89w4j7lljvpy2n08x6m9kw88f82snmzf23kp0gw637sjnrj6f";
|
||||
};
|
||||
});
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -82,7 +93,7 @@ stdenv.mkDerivation {
|
||||
ocamlPackages.xmlm ocamlPackages.ocaml_pcre
|
||||
ocamlPackages.camomile
|
||||
ocamlPackages.fdkaac
|
||||
ocamlPackages.srt ocamlPackages.sedlex menhir menhirLib
|
||||
srt ocamlPackages.sedlex menhir menhirLib
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" "fortify" ];
|
||||
|
||||
29
pkgs/tools/bluetooth/bluewalker/default.nix
Normal file
29
pkgs/tools/bluetooth/bluewalker/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib, buildGoModule, fetchFromGitLab }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bluewalker";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "jtaimisto";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-spuJRiNiaBV4EsetUq8vUfR6ejUNZxLhVzS3AZZyrrQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "189qs6vmx63vwsjmc4qgf1y8xjsi7x6l1f5c3kd8j8jnagl26z4h";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple command line Bluetooth LE scanner";
|
||||
homepage = "https://gitlab.com/jtaimisto/bluewalker";
|
||||
changelog = "https://gitlab.com/jtaimisto/bluewalker/-/tags/v${version}";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ cimm ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "httm";
|
||||
version = "0.10.16";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimono-koans";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "09zdexeMu54Y/4HbieZ0EJLxhwCv7upRJxqVbqr2hUw=";
|
||||
sha256 = "GNiqWm6MsgLYjrkrbIHgKxtLmE4IJntcLd9GVRu1v2A=";
|
||||
};
|
||||
|
||||
cargoSha256 = "SLEp88KwRg1RN78oX+fMYNR6ia9omrfH2bnJb+PrTAY=";
|
||||
cargoSha256 = "87BkVAZ3BPtnuNUBTzdR4oiE0ZLIr5CacdYenU4V9qU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interactive, file-level ZFS Time Machine-like tool";
|
||||
description = "Interactive, file-level Time Machine-like tool for ZFS/btrfs";
|
||||
homepage = "https://github.com/kimono-koans/httm";
|
||||
license = licenses.mpl20;
|
||||
platforms = platforms.unix;
|
||||
|
||||
98
pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch
Normal file
98
pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch
Normal file
@ -0,0 +1,98 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9aa25bd5..c7c0437b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -185,6 +185,30 @@ AC_ARG_ENABLE(
|
||||
]
|
||||
)
|
||||
|
||||
+AC_ARG_WITH(
|
||||
+ [mount-helper],
|
||||
+ [AS_HELP_STRING([--with-mount-helper=BIN],[use the specified binary as mount helper @<:@default=/sbin/mount@:>@])],
|
||||
+ [mount_helper="$withval"],
|
||||
+ [mount_helper="/sbin/mount"]
|
||||
+)
|
||||
+AC_DEFINE_UNQUOTED([MOUNT_HELPER], ["$mount_helper"], [Binary used as mount helper.])
|
||||
+
|
||||
+AC_ARG_WITH(
|
||||
+ [umount-helper],
|
||||
+ [AS_HELP_STRING([--with-umount-helper=BIN],[use the specified binary as umount helper @<:@default=/sbin/umount@:>@])],
|
||||
+ [umount_helper="$withval"],
|
||||
+ [umount_helper="/sbin/umount"]
|
||||
+)
|
||||
+AC_DEFINE_UNQUOTED([UMOUNT_HELPER], ["$umount_helper"], [Binary used as umount helper.])
|
||||
+
|
||||
+AC_ARG_WITH(
|
||||
+ [modprobe-helper],
|
||||
+ [AS_HELP_STRING([--with-modprobe-helper=BIN],[use the specified binary as modprobe helper @<:@default=/sbin/modprobe@:>@])],
|
||||
+ [modprobe_helper="$withval"],
|
||||
+ [modprobe_helper="/sbin/modprobe"]
|
||||
+)
|
||||
+AC_DEFINE_UNQUOTED([MODPROBE_HELPER], ["$modprobe_helper"], [Binary used as modprobe helper.])
|
||||
+
|
||||
# pthread_rwlock_t requires _GNU_SOURCE
|
||||
AC_GNU_SOURCE
|
||||
|
||||
diff --git a/libfuse-lite/mount_util.c b/libfuse-lite/mount_util.c
|
||||
index 8b317224..ee75ace6 100644
|
||||
--- a/libfuse-lite/mount_util.c
|
||||
+++ b/libfuse-lite/mount_util.c
|
||||
@@ -89,10 +89,10 @@ int fuse_mnt_add_mount(const char *progname, const char *fsname,
|
||||
exit(1);
|
||||
}
|
||||
rmdir(tmp);
|
||||
- execle("/sbin/mount", "/sbin/mount", "-F", type, "-o", opts,
|
||||
+ execle(MOUNT_HELPER, MOUNT_HELPER, "-F", type, "-o", opts,
|
||||
fsname, mnt, NULL, &env);
|
||||
- fprintf(stderr, "%s: failed to execute /sbin/mount: %s\n", progname,
|
||||
- strerror(errno));
|
||||
+ fprintf(stderr, "%s: failed to execute %s: %s\n", progname,
|
||||
+ MOUNT_HELPER, strerror(errno));
|
||||
exit(1);
|
||||
}
|
||||
res = waitpid(res, &status, 0);
|
||||
@@ -126,14 +126,14 @@ int fuse_mnt_umount(const char *progname, const char *mnt, int lazy)
|
||||
|
||||
setuid(geteuid());
|
||||
if (lazy) {
|
||||
- execle("/sbin/umount", "/sbin/umount", mnt,
|
||||
+ execle(UMOUNT_HELPER, UMOUNT_HELPER, mnt,
|
||||
NULL, &env);
|
||||
} else {
|
||||
- execle("/sbin/umount", "/sbin/umount", "-f", mnt,
|
||||
+ execle(UMOUNT_HELPER, UMOUNT_HELPER, "-f", mnt,
|
||||
NULL, &env);
|
||||
}
|
||||
- fprintf(stderr, "%s: failed to execute /sbin/umount: %s\n", progname,
|
||||
- strerror(errno));
|
||||
+ fprintf(stderr, "%s: failed to execute %s: %s\n", progname,
|
||||
+ UMOUNT_HELPER, strerror(errno));
|
||||
exit(1);
|
||||
}
|
||||
res = waitpid(res, &status, 0);
|
||||
diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c
|
||||
index 9330500c..dd18a93f 100644
|
||||
--- a/src/lowntfs-3g.c
|
||||
+++ b/src/lowntfs-3g.c
|
||||
@@ -4463,7 +4463,7 @@ static fuse_fstype load_fuse_module(void)
|
||||
int i;
|
||||
struct stat st;
|
||||
pid_t pid;
|
||||
- const char *cmd = "/sbin/modprobe";
|
||||
+ const char *cmd = MODPROBE_HELPER;
|
||||
char *env = (char*)NULL;
|
||||
struct timespec req = { 0, 100000000 }; /* 100 msec */
|
||||
fuse_fstype fstype;
|
||||
diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c
|
||||
index d8227e71..f5d77252 100644
|
||||
--- a/src/ntfs-3g.c
|
||||
+++ b/src/ntfs-3g.c
|
||||
@@ -4171,7 +4171,7 @@ static fuse_fstype load_fuse_module(void)
|
||||
int i;
|
||||
struct stat st;
|
||||
pid_t pid;
|
||||
- const char *cmd = "/sbin/modprobe";
|
||||
+ const char *cmd = MODPROBE_HELPER;
|
||||
char *env = (char*)NULL;
|
||||
struct timespec req = { 0, 100000000 }; /* 100 msec */
|
||||
fuse_fstype fstype;
|
||||
@ -0,0 +1,48 @@
|
||||
diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am
|
||||
index 08228322..a390d8c7 100644
|
||||
--- a/ntfsprogs/Makefile.am
|
||||
+++ b/ntfsprogs/Makefile.am
|
||||
@@ -165,7 +165,7 @@ extras: libs $(EXTRA_PROGRAMS)
|
||||
|
||||
if ENABLE_MOUNT_HELPER
|
||||
install-exec-hook:
|
||||
- $(INSTALL) -d $(DESTDIR)/$(sbindir)
|
||||
+ $(INSTALL) -d $(DESTDIR)$(sbindir)
|
||||
$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)$(sbindir)/mkfs.ntfs
|
||||
|
||||
install-data-hook:
|
||||
@@ -173,7 +173,7 @@ install-data-hook:
|
||||
$(LN_S) -f mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8
|
||||
|
||||
uninstall-local:
|
||||
- $(RM) -f $(DESTDIR)/sbin/mkfs.ntfs
|
||||
+ $(RM) -f $(DESTDIR)$(sbindir)/mkfs.ntfs
|
||||
$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8
|
||||
endif
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 8d984083..ea407067 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -66,9 +66,9 @@ endif
|
||||
|
||||
if ENABLE_MOUNT_HELPER
|
||||
install-exec-local: install-rootbinPROGRAMS
|
||||
- $(MKDIR_P) "$(DESTDIR)/sbin"
|
||||
- $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
|
||||
- $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
|
||||
+ $(MKDIR_P) "$(DESTDIR)$(rootsbindir)"
|
||||
+ $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.ntfs-3g"
|
||||
+ $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.lowntfs-3g"
|
||||
|
||||
install-data-local: install-man8
|
||||
$(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
|
||||
@@ -76,7 +76,7 @@ install-data-local: install-man8
|
||||
|
||||
uninstall-local:
|
||||
$(RM) -f "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
|
||||
- $(RM) -f "$(DESTDIR)/sbin/mount.ntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
|
||||
+ $(RM) -f "$(DESTDIR)$(rootsbindir)/mount.ntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.lowntfs-3g"
|
||||
endif
|
||||
|
||||
endif # ENABLE_NTFS_3G
|
||||
@ -1,30 +1,34 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, mount, libuuid
|
||||
, macfuse-stubs, DiskArbitration
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
|
||||
, gettext, mount, libuuid, kmod, macfuse-stubs, DiskArbitration
|
||||
, crypto ? false, libgcrypt, gnutls
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ntfs3g";
|
||||
version = "2021.8.22";
|
||||
version = "2022.5.17";
|
||||
|
||||
outputs = [ "out" "dev" "man" "doc" ];
|
||||
|
||||
buildInputs = [ libuuid ] ++ lib.optionals crypto [ gnutls libgcrypt ]
|
||||
++ lib.optionals stdenv.isDarwin [ macfuse-stubs DiskArbitration ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz";
|
||||
sha256 = "55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tuxera";
|
||||
repo = "ntfs-3g";
|
||||
rev = version;
|
||||
sha256 = "sha256-xh8cMNIHeJ1rtk5zwOsmcxeedgZ3+MSiWn2UC7y+gtQ=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace src/Makefile.in --replace /sbin '@sbindir@'
|
||||
substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@'
|
||||
substituteInPlace libfuse-lite/mount_util.c \
|
||||
--replace /bin/mount ${mount}/bin/mount \
|
||||
--replace /bin/umount ${mount}/bin/umount
|
||||
'';
|
||||
buildInputs = [ gettext libuuid ]
|
||||
++ lib.optionals crypto [ gnutls libgcrypt ]
|
||||
++ lib.optionals stdenv.isDarwin [ macfuse-stubs DiskArbitration ];
|
||||
|
||||
# Note: libgcrypt is listed here non-optionally because its m4 macros are
|
||||
# being used in ntfs-3g's configure.ac.
|
||||
nativeBuildInputs = [ autoreconfHook libgcrypt pkg-config ];
|
||||
|
||||
patches = [
|
||||
# https://github.com/tuxera/ntfs-3g/pull/39
|
||||
./autoconf-sbin-helpers.patch
|
||||
./consistent-sbindir-usage.patch
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--disable-ldconfig"
|
||||
@ -34,6 +38,9 @@ stdenv.mkDerivation rec {
|
||||
"--enable-xattr-mappings"
|
||||
"--${if crypto then "enable" else "disable"}-crypto"
|
||||
"--enable-extras"
|
||||
"--with-mount-helper=${mount}/bin/mount"
|
||||
"--with-umount-helper=${mount}/bin/umount"
|
||||
"--with-modprobe-helper=${kmod}/bin/modprobe"
|
||||
];
|
||||
|
||||
postInstall =
|
||||
@ -42,6 +49,8 @@ stdenv.mkDerivation rec {
|
||||
ln -sv mount.ntfs-3g $out/sbin/mount.ntfs
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tuxera/ntfs-3g";
|
||||
description = "FUSE-based NTFS driver with full write support";
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
||||
cp $src jpegexiforient.c
|
||||
'';
|
||||
buildPhase = ''
|
||||
cc -o jpegexiforient jpegexiforient.c
|
||||
$CC -o jpegexiforient jpegexiforient.c
|
||||
'';
|
||||
installPhase = ''
|
||||
install -Dt $out/bin jpegexiforient
|
||||
|
||||
@ -6,6 +6,18 @@ let
|
||||
inherit (poetry2nix.mkPoetryPackages {
|
||||
projectDir = ./python-env;
|
||||
python = python2;
|
||||
overrides = [
|
||||
poetry2nix.defaultPoetryOverrides
|
||||
(self: super: {
|
||||
pyjwt = super.pyjwt.overridePythonAttrs (old: {
|
||||
meta = old.meta // {
|
||||
knownVulnerabilities = lib.optionals (lib.versionOlder old.version "2.4.0") [
|
||||
"CVE-2022-29217"
|
||||
];
|
||||
};
|
||||
});
|
||||
})
|
||||
];
|
||||
}) python;
|
||||
pythonPackages = python.pkgs;
|
||||
|
||||
|
||||
@ -2,26 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "runitor";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
vendorSha256 = null;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdd";
|
||||
repo = "runitor";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-96WKMeRkkG6en9JXaZjjnqeZOcLSII3knx8cdjTBAKw=";
|
||||
sha256 = "sha256-qqfaA1WAHkuiyzyQbrSvnmwuRXElArErJ6PtLPOxzsg=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
"-s" "-X main.Version=v${version}"
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "backport_TestPostRetries-timeout-fix.patch";
|
||||
url = "https://github.com/bdd/runitor/commit/418142585a8387224825637cca3fe275d3c3d147.patch";
|
||||
sha256 = "sha256-cl+KYoiHm2ioFuJVKokZkglIzL/NaEd5JNUuj4g8MUg=";
|
||||
})
|
||||
"-s" "-w" "-X main.Version=v${version}"
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
|
||||
22
pkgs/tools/system/rwc/default.nix
Normal file
22
pkgs/tools/system/rwc/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ stdenv, fetchFromGitHub, lib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rwc";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leahneukirchen";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-axHBkrbLEcYygCDofhqfIeZ5pv1sR34I5UgFUwVb2rI=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Report when files are changed";
|
||||
license = licenses.publicDomain;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ somasis ];
|
||||
};
|
||||
}
|
||||
@ -538,6 +538,7 @@ mapAliases ({
|
||||
graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15
|
||||
graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15
|
||||
gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03
|
||||
grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07
|
||||
gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16
|
||||
grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22
|
||||
gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16
|
||||
@ -1122,6 +1123,7 @@ mapAliases ({
|
||||
prometheus-cups-exporter = throw "outdated and broken by design; removed by developer"; # Added 2021-03-16
|
||||
prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
|
||||
prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05
|
||||
prometheus-unifi-exporter = throw "prometheus-unifi-exporter is deprecated and archived by upstream, use unifi-poller instead"; # Added 2022-06-03
|
||||
proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15
|
||||
pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23
|
||||
pulseaudio-modules-bt = throw "pulseaudio-modules-bt has been abandoned, and is superseded by pulseaudio's native bt functionality"; # Added 2022-04-01
|
||||
|
||||
@ -2710,6 +2710,8 @@ with pkgs;
|
||||
|
||||
bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
|
||||
|
||||
bluewalker = callPackage ../tools/bluetooth/bluewalker { };
|
||||
|
||||
blur-effect = callPackage ../tools/graphics/blur-effect { };
|
||||
|
||||
bootiso = callPackage ../tools/cd-dvd/bootiso { };
|
||||
@ -10042,6 +10044,8 @@ with pkgs;
|
||||
|
||||
rw = callPackage ../tools/misc/rw { };
|
||||
|
||||
rwc = callPackage ../tools/system/rwc { };
|
||||
|
||||
rxp = callPackage ../tools/text/xml/rxp { };
|
||||
|
||||
rzip = callPackage ../tools/compression/rzip { };
|
||||
@ -10846,9 +10850,7 @@ with pkgs;
|
||||
|
||||
texstudio = libsForQt5.callPackage ../applications/editors/texstudio { };
|
||||
|
||||
textadept = callPackage ../applications/editors/textadept/10 { };
|
||||
|
||||
textadept11 = callPackage ../applications/editors/textadept/11 { stdenv = gcc10StdenvCompat; };
|
||||
textadept = callPackage ../applications/editors/textadept { };
|
||||
|
||||
texworks = libsForQt5.callPackage ../applications/editors/texworks { };
|
||||
|
||||
@ -16215,10 +16217,7 @@ with pkgs;
|
||||
|
||||
sloc = nodePackages.sloc;
|
||||
|
||||
smatch = callPackage ../development/tools/analysis/smatch {
|
||||
buildllvmsparse = false;
|
||||
buildc2xml = false;
|
||||
};
|
||||
smatch = callPackage ../development/tools/analysis/smatch { };
|
||||
|
||||
smc = callPackage ../tools/misc/smc { };
|
||||
|
||||
@ -21795,7 +21794,7 @@ with pkgs;
|
||||
|
||||
grafana-loki = callPackage ../servers/monitoring/loki { };
|
||||
|
||||
grafana-mimir = callPackage ../servers/monitoring/mimir { };
|
||||
mimir = callPackage ../servers/monitoring/mimir { };
|
||||
|
||||
promtail = grafana-loki.overrideAttrs (o: {
|
||||
pname = "promtail";
|
||||
@ -22478,7 +22477,6 @@ with pkgs;
|
||||
prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { };
|
||||
prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { };
|
||||
prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
@ -23564,6 +23562,8 @@ with pkgs;
|
||||
|
||||
gore = callPackage ../development/tools/gore { };
|
||||
|
||||
goresym = callPackage ../development/tools/goresym { };
|
||||
|
||||
gotests = callPackage ../development/tools/gotests { };
|
||||
|
||||
gotestsum = callPackage ../development/tools/gotestsum { };
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user