mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
b10ed56b8e
83 changed files with 1283 additions and 483 deletions
|
|
@ -2589,6 +2589,12 @@
|
|||
githubId = 119483;
|
||||
name = "Matthew Brown";
|
||||
};
|
||||
eduardosm = {
|
||||
email = "esm@eduardosm.net";
|
||||
github = "eduardosm";
|
||||
githubId = 761151;
|
||||
name = "Eduardo Sánchez Muñoz";
|
||||
};
|
||||
eduarrrd = {
|
||||
email = "e.bachmakov@gmail.com";
|
||||
github = "eduarrrd";
|
||||
|
|
@ -3711,6 +3717,12 @@
|
|||
githubId = 362833;
|
||||
name = "Hongchang Wu";
|
||||
};
|
||||
hoverbear = {
|
||||
email = "operator+nix@hoverbear.org";
|
||||
github = "hoverbear";
|
||||
githubId = 130903;
|
||||
name = "Ana Hobden";
|
||||
};
|
||||
hrdinka = {
|
||||
email = "c.nix@hrdinka.at";
|
||||
github = "hrdinka";
|
||||
|
|
@ -6727,6 +6739,12 @@
|
|||
githubId = 7677321;
|
||||
name = "Paul Trehiou";
|
||||
};
|
||||
nyanotech = {
|
||||
name = "nyanotech";
|
||||
email = "nyanotechnology@gmail.com";
|
||||
github = "nyanotech";
|
||||
githubId = 33802077;
|
||||
};
|
||||
nyarly = {
|
||||
email = "nyarly@gmail.com";
|
||||
github = "nyarly";
|
||||
|
|
|
|||
|
|
@ -169,6 +169,7 @@
|
|||
./programs/sway.nix
|
||||
./programs/system-config-printer.nix
|
||||
./programs/thefuck.nix
|
||||
./programs/tilp2.nix
|
||||
./programs/tmux.nix
|
||||
./programs/traceroute.nix
|
||||
./programs/tsm-client.nix
|
||||
|
|
|
|||
28
nixos/modules/programs/tilp2.nix
Normal file
28
nixos/modules/programs/tilp2.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.programs.tilp2;
|
||||
|
||||
in {
|
||||
options.programs.tilp2 = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enable tilp2 and udev rules for supported calculators.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.udev.packages = [
|
||||
pkgs.libticables2
|
||||
];
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.tilp2
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -326,8 +326,8 @@ let
|
|||
]
|
||||
++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub
|
||||
++ optionals (bootLoader == "grub" && grubVersion == 2) [
|
||||
pkgs.grub2
|
||||
pkgs.grub2_efi
|
||||
(pkgs.grub2.override { zfsSupport = true; })
|
||||
(pkgs.grub2_efi.override { zfsSupport = true; })
|
||||
];
|
||||
|
||||
nix.binaryCaches = mkForce [ ];
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "6.20";
|
||||
version = "6.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
|
||||
sha256 = "194xglhk74ks534r3d00v84s26s4yybxkhb4h8k5rqp76g0jv635";
|
||||
sha256 = "11nvfjfrri9y0k7n7psz3yk1l7mxp9f6yi69pq7hvn9d4n26p5vd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
{ stdenv, lib, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf
|
||||
, cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }:
|
||||
with lib;
|
||||
|
||||
let
|
||||
bracketsLibs = makeLibraryPath [
|
||||
gtk2 glib gdk-pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd libXdamage expat
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brackets";
|
||||
version = "1.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/adobe/brackets/releases/download/release-${version}/Brackets.Release.${version}.64-bit.deb";
|
||||
sha256 = "0c4l2rr0853xd21kw8hhxlmrx8mqwb7iqa2k24zvwyjp4nnwkgbp";
|
||||
name = "${pname}-${version}.deb";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" "fixupPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
ar p $src data.tar.xz | tar -C $out -xJ
|
||||
|
||||
mv $out/usr/* $out/
|
||||
rmdir $out/usr
|
||||
ln -sf $out/opt/brackets/brackets $out/bin/brackets
|
||||
|
||||
ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
|
||||
|
||||
substituteInPlace $out/opt/brackets/brackets.desktop \
|
||||
--replace "Exec=/opt/brackets/brackets" "Exec=brackets"
|
||||
mkdir -p $out/share/applications
|
||||
ln -s $out/opt/brackets/brackets.desktop $out/share/applications/
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${bracketsLibs}:$out/opt/brackets/lib" \
|
||||
$out/opt/brackets/Brackets
|
||||
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${bracketsLibs}" \
|
||||
$out/opt/brackets/Brackets-node
|
||||
|
||||
patchelf --set-rpath "${bracketsLibs}" \
|
||||
$out/opt/brackets/lib/libcef.so
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "An open source code editor for the web, written in JavaScript, HTML and CSS";
|
||||
homepage = "http://brackets.io/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.matejc ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "mediaelch";
|
||||
version = "2.8.4";
|
||||
version = "2.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Komet";
|
||||
repo = "MediaElch";
|
||||
rev = "v${version}";
|
||||
sha256 = "00jwmpdwbn6rgaha0iimcbwg9pwb8ilpjgxhv0p13j2c6dcisjzh";
|
||||
sha256 = "1134vw7hr0mpqcsxjq4bqmg5760dngz17bzj97ypfc5cvzcxjh43";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "qbec";
|
||||
version = "0.12.2";
|
||||
version = "0.13.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "splunk";
|
||||
repo = "qbec";
|
||||
rev = "v${version}";
|
||||
sha256 = "10bf9ja44n1gzhb5znqbmr1xjc87akrsdyxfvrz4f5bd3p1fh6j0";
|
||||
sha256 = "sha256-jbGEkBBXb1dDv4E7vEPVyvDahz27Kpyo3taenCH/vfw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0xkmccm6cyw1p5mah7psbpfsfaw8f09r1a2k4iksfggrn9mimaam";
|
||||
vendorSha256 = "sha256-rzxtLaGUl8hxcJ+GWlrkjN+f7mb0lXrtkHj/pBO8HzQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ipfs-cluster";
|
||||
version = "unstable-2020-10-20";
|
||||
version = "0.13.1";
|
||||
|
||||
vendorSha256 = "0abfhl4v4yqy89aqn13ymj4rw5zhr92a9fh1abgpkr19adnyrs3d";
|
||||
vendorSha256 = "0ls6d5ijl8bbh48w0i30mwd4a4na93iw9xqpbw23lnb8pvskaggh";
|
||||
|
||||
patches = [
|
||||
./test.patch
|
||||
|
|
@ -13,8 +13,8 @@ buildGoModule rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "ipfs";
|
||||
repo = "ipfs-cluster";
|
||||
rev = "c78f7839a2d5645806e01bfbf7af862600f8fbc4";
|
||||
sha256 = "0fschpysma2piy2bfas56yapxm2cl6nj986ww3sp7ysldjzadmkk";
|
||||
rev = "v${version}";
|
||||
sha256 = "0kmsa7cnk88wrplsjysrpg6n0gd0risnhw0kh33jqx0fcg12b7h8";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
54
pkgs/applications/science/math/gfm/default.nix
Normal file
54
pkgs/applications/science/math/gfm/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, gnome2
|
||||
, glib
|
||||
, libtifiles2
|
||||
, libticables2
|
||||
, libticalcs2
|
||||
, libticonv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gfm";
|
||||
version = "1.08";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0zq1a9mm54zr18dz2mqh79w1a126xwqz6dcrpjlbd1pnmg01l0q9";
|
||||
};
|
||||
|
||||
patches = fetchpatch {
|
||||
name = "remove-broken-kde-support.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=gfm";
|
||||
sha256 = "03yc8s2avicmv04f2ygg3r3q8l7kpsc94mhp6clp584kmjpjqag5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gnome2.gtk
|
||||
gnome2.libglade
|
||||
glib
|
||||
libtifiles2
|
||||
libticables2
|
||||
libticalcs2
|
||||
libticonv
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${libticables2}/include/tilp2";
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
|
||||
description = "Group File Manager (GFM) allows manipulation of single/group/tigroup files";
|
||||
homepage = "http://lpg.ticalc.org/prj_gfm/index.html";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ siraben luc65r ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
56
pkgs/applications/science/math/tilp2/default.nix
Normal file
56
pkgs/applications/science/math/tilp2/default.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, intltool
|
||||
, glib
|
||||
, gnome2
|
||||
, gfm
|
||||
, libticables2
|
||||
, libticalcs2
|
||||
, libticonv
|
||||
, libtifiles2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tilp2";
|
||||
version = "1.18";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0isf73bjwk06baz2gm3vpdh600gqck9ca4aqxzb089dmxriv6fkv";
|
||||
};
|
||||
|
||||
patches = fetchpatch {
|
||||
name = "remove-broken-kde-support.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=tilp";
|
||||
sha256 = "1fn6vh7r45spkwpmkvffkbn7zrcsdrs5mjmspd5rwi3jc12cy3ny";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
intltool
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gnome2.gtk
|
||||
gnome2.libglade
|
||||
gfm
|
||||
libticables2
|
||||
libticalcs2
|
||||
libticonv
|
||||
libtifiles2
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
|
||||
description = "Transfer data between Texas Instruments graphing calculators and a computer";
|
||||
homepage = "http://lpg.ticalc.org/prj_tilp/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ luc65r ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lab";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zaquestion";
|
||||
repo = "lab";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vl5ylix4h6z1vrdslv9qphgb6yqpqd4r54jzk5kd6zgrnf9c2zc";
|
||||
sha256 = "1l6xsikd1113qd4y0mvjsl64gbi4327m9v4d593f27fxink39j8s";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
|
|
|||
|
|
@ -290,6 +290,17 @@ stdenv.mkDerivation {
|
|||
echo "-L${gccForLibs.lib}/${targetPlatform.config}/lib" >> $out/nix-support/cc-ldflags
|
||||
''
|
||||
|
||||
# TODO We would like to connect this to `useGccForLibs`, but we cannot yet
|
||||
# because `libcxxStdenv` on linux still needs this. Maybe someday we'll
|
||||
# always set `useLLVM` on Darwin, and maybe also break down `useLLVM` into
|
||||
# fine-grained use flags (libgcc vs compiler-rt, ld.lld vs legacy, libc++
|
||||
# vs libstdc++, etc.) since Darwin isn't `useLLVM` on all counts. (See
|
||||
# https://clang.llvm.org/docs/Toolchain.html for all the axes one might
|
||||
# break `useLLVM` into.)
|
||||
+ optionalString (isClang && gccForLibs != null && targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
|
||||
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
|
||||
''
|
||||
|
||||
##
|
||||
## General libc support
|
||||
##
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "theme-jade1";
|
||||
version = "1.10";
|
||||
version = "1.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz";
|
||||
sha256 = "17s4r8yjhnz9wrnrma6m8qjp02r47xkjk062sdb8s91dxhh7l8q2";
|
||||
sha256 = "0jljmychbs2lsf6g1pck83x4acljdqqsllkdjgiwv3nnlwahzlvs";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "theme-obsidian2";
|
||||
version = "2.17";
|
||||
version = "2.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz";
|
||||
sha256 = "1gff34xqypqjhh15lv4cc4ifsg07jx2znlsj9is4wmqf39a8h8n4";
|
||||
sha256 = "1w3grlkws4ih7333hys33z4bgm33jbc78bq2pyp8nzw4q9d2hz2r";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-unite-shell";
|
||||
pname = "gnome-shell-extension-unite";
|
||||
version = "44";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -6,7 +6,7 @@ let
|
|||
lib' = pkgs.callPackage ./lib.nix {};
|
||||
|
||||
# FIXME: add support for overrideScope
|
||||
callPackageWithScope = scope: drv: args: lib'.callPackageWith scope drv args;
|
||||
callPackageWithScope = scope: drv: args: lib.callPackageWith scope drv args;
|
||||
mkScope = scope: pkgs // scope;
|
||||
|
||||
packages = self:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, writeText, elixir }:
|
||||
{ lib, stdenv, fetchFromGitHub, writeText, elixir }:
|
||||
|
||||
let
|
||||
shell = drv: stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, buildHex }:
|
||||
{ lib, buildHex }:
|
||||
|
||||
buildHex {
|
||||
name = "pc";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchFromGitHub, buildRebar3 }:
|
||||
{ lib, stdenv, fetchFromGitHub, buildRebar3 }:
|
||||
|
||||
let
|
||||
shell = drv: stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchFromGitHub, writeText, erlang }:
|
||||
{ lib, stdenv, fetchFromGitHub, writeText, erlang }:
|
||||
|
||||
let
|
||||
shell = drv: stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -26,8 +26,6 @@ let
|
|||
ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
|
||||
ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share"
|
||||
echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
|
||||
'' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
|
||||
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
|
||||
'';
|
||||
in {
|
||||
|
||||
|
|
|
|||
|
|
@ -28,8 +28,6 @@ let
|
|||
ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
|
||||
ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share"
|
||||
echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
|
||||
'' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
|
||||
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
|
||||
'';
|
||||
in {
|
||||
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@ let
|
|||
ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
|
||||
ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
|
||||
echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
|
||||
'' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
|
||||
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
|
||||
'';
|
||||
in {
|
||||
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@ let
|
|||
ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
|
||||
ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
|
||||
echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
|
||||
'' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
|
||||
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
|
||||
'';
|
||||
in {
|
||||
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@ let
|
|||
ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
|
||||
ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
|
||||
echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
|
||||
'' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
|
||||
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
|
||||
'';
|
||||
in {
|
||||
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@ let
|
|||
ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
|
||||
ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
|
||||
echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
|
||||
'' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
|
||||
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
|
||||
'';
|
||||
in {
|
||||
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@ let
|
|||
ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
|
||||
ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
|
||||
echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
|
||||
'' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
|
||||
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
|
||||
'';
|
||||
in {
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,12 @@ let
|
|||
chmod u+rw -R $out/lib
|
||||
cp -r ${basegcc.libc}/lib/* $(ls -d $out/lib/gcc/*/*)
|
||||
'';
|
||||
gcc_multi_sysroot = runCommand "gcc-multi-sysroot" {} ''
|
||||
gcc_multi_sysroot = runCommand "gcc-multi-sysroot" {
|
||||
passthru = {
|
||||
inherit (gcc64) version;
|
||||
lib = gcc_multi_sysroot;
|
||||
};
|
||||
} ''
|
||||
mkdir -p $out/lib/gcc
|
||||
|
||||
ln -s ${combine gcc64}/lib/gcc/* $out/lib/gcc/
|
||||
|
|
@ -32,17 +37,16 @@ let
|
|||
'';
|
||||
|
||||
clangMulti = clang.override {
|
||||
# Only used for providing expected structure re:dynamic linkers, AFAIK
|
||||
# Most of the magic is done by setting the --gcc-toolchain option below
|
||||
# Only used for providing expected structure re:dynamic linkers, AFAIK Most
|
||||
# of the magic is done by setting the --gcc-toolchain option via
|
||||
# `gccForLibs`.
|
||||
libc = gcc_multi_sysroot;
|
||||
|
||||
bintools = clang.bintools.override {
|
||||
libc = gcc_multi_sysroot;
|
||||
};
|
||||
|
||||
extraBuildCommands = ''
|
||||
sed -e '$a --gcc-toolchain=${gcc_multi_sysroot}' -i $out/nix-support/libc-cflags
|
||||
'';
|
||||
gccForLibs = gcc_multi_sysroot;
|
||||
};
|
||||
|
||||
in clangMulti
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ in rec {
|
|||
mkdir "$rsrc"
|
||||
ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc"
|
||||
echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
|
||||
echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags
|
||||
echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
|
||||
rm $out/nix-support/add-hardening.sh
|
||||
touch $out/nix-support/add-hardening.sh
|
||||
|
|
|
|||
64
pkgs/development/libraries/libticables2/default.nix
Normal file
64
pkgs/development/libraries/libticables2/default.nix
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, glib
|
||||
, libusb1
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libticables2";
|
||||
version = "1.3.5";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
|
||||
sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libusb1
|
||||
glib
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-libusb10"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/etc/udev/rules.d
|
||||
cat > $out/etc/udev/rules.d/69-libsane.rules << EOF
|
||||
ACTION!="add", GOTO="libticables_end"
|
||||
|
||||
# serial device (assume TI calculator)
|
||||
KERNEL=="ttyS[0-3]", ENV{ID_PDA}="1"
|
||||
# parallel device (assume TI calculator)
|
||||
SUBSYSTEM=="ppdev", ENV{ID_PDA}="1"
|
||||
# SilverLink
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e001", ENV{ID_PDA}="1"
|
||||
# TI-84+ DirectLink
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e003", ENV{ID_PDA}="1"
|
||||
# TI-89 Titanium DirectLink
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e004", ENV{ID_PDA}="1"
|
||||
# TI-84+ SE DirectLink
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e008", ENV{ID_PDA}="1"
|
||||
# TI-Nspire DirectLink
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="0451", ATTR{idProduct}=="e012", ENV{ID_PDA}="1"
|
||||
|
||||
LABEL="libticables_end"
|
||||
EOF
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
|
||||
description = "This library is part of the TiLP framework";
|
||||
homepage = "http://lpg.ticalc.org/prj_tilp/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ siraben luc65r ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
50
pkgs/development/libraries/libticalcs2/default.nix
Normal file
50
pkgs/development/libraries/libticalcs2/default.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, glib
|
||||
, libticonv
|
||||
, libtifiles2
|
||||
, libticables2
|
||||
, lzma
|
||||
, bzip2
|
||||
, acl
|
||||
, libobjc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libticalcs2";
|
||||
version = "1.1.9";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
|
||||
sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
libticonv
|
||||
libtifiles2
|
||||
libticables2
|
||||
lzma
|
||||
bzip2
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
acl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libobjc
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
|
||||
description = "This library is part of the TiLP framework";
|
||||
homepage = "http://lpg.ticalc.org/prj_tilp/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ siraben luc65r ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
38
pkgs/development/libraries/libticonv/default.nix
Normal file
38
pkgs/development/libraries/libticonv/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, glib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libticonv";
|
||||
version = "1.1.5";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-iconv"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
|
||||
description = "This library is part of the TiLP framework";
|
||||
homepage = "http://lpg.ticalc.org/prj_tilp/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ siraben luc65r ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
38
pkgs/development/libraries/libtifiles2/default.nix
Normal file
38
pkgs/development/libraries/libtifiles2/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, glib
|
||||
, libarchive
|
||||
, libticonv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtifiles2";
|
||||
version = "1.1.7";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
|
||||
sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
libarchive
|
||||
libticonv
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
|
||||
description = "This library is part of the TiLP framework";
|
||||
homepage = "http://lpg.ticalc.org/prj_tilp/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ siraben luc65r ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -11,12 +11,12 @@
|
|||
, doCheck ? true
|
||||
}:
|
||||
let
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
rSrc = fetchFromGitHub {
|
||||
owner = "abathur";
|
||||
repo = "resholve";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VK7r+kdtWvS9d4B90Hq7fhLfWT/B/Y9zppvOX9tPt5g=";
|
||||
hash = "sha256-ArUQjqh4LRvFLzHiTIcae0q/VFxFF/X9eOFeRnYmTO0=";
|
||||
};
|
||||
deps = callPackage ./deps.nix {
|
||||
/*
|
||||
|
|
|
|||
20
pkgs/development/ocaml-modules/either/default.nix
Normal file
20
pkgs/development/ocaml-modules/either/default.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{ lib, buildDunePackage, fetchurl }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "either";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/either/releases/download/${version}/either-${version}.tbz";
|
||||
sha256 = "bf674de3312dee7b7215f07df1e8a96eb3d679164b8a918cdd95b8d97e505884";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Compatibility Either module";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/mirage/either";
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
};
|
||||
}
|
||||
30
pkgs/development/ocaml-modules/repr/default.nix
Normal file
30
pkgs/development/ocaml-modules/repr/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib, buildDunePackage, fetchurl, fmt, uutf, jsonm, base64, either }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "repr";
|
||||
version = "0.2.1";
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-fuzz-${version}.tbz";
|
||||
sha256 = "1cbzbawbn71mmpw8y84s1p2pbhc055w1znz64jvr00c7fdr9p8hc";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
fmt
|
||||
uutf
|
||||
jsonm
|
||||
base64
|
||||
either
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dynamic type representations. Provides no stability guarantee";
|
||||
homepage = "https://github.com/mirage/repr";
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
};
|
||||
}
|
||||
23
pkgs/development/ocaml-modules/repr/ppx.nix
Normal file
23
pkgs/development/ocaml-modules/repr/ppx.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ buildDunePackage, repr, ppxlib, ppx_deriving, alcotest, hex }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "ppx_repr";
|
||||
|
||||
inherit (repr) src version useDune2;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
repr
|
||||
ppxlib
|
||||
ppx_deriving
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
alcotest
|
||||
hex
|
||||
];
|
||||
|
||||
meta = repr.meta // {
|
||||
description = "PPX deriver for type representations";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
version = "2.27.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0rnmy74rjjcyni5sr8h1djffpj7wngn2wqckl5vknp2smaihp34l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
# Project has not published tests yet
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "adafruit_platformdetect" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Platform detection for use by Adafruit libraries";
|
||||
homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
29
pkgs/development/python-modules/adafruit-pureio/default.nix
Normal file
29
pkgs/development/python-modules/adafruit-pureio/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Adafruit-PureIO";
|
||||
version = "1.1.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Adafruit_PureIO";
|
||||
inherit version;
|
||||
sha256 = "1mfa6sfz7qwgajz3lqw0s69ivvwbwvblwkjzbrwdrxjbma4jaw66";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
# Physical SMBus is not present
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "Adafruit_PureIO" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python interface to Linux IO including I2C and SPI";
|
||||
homepage = "https://github.com/adafruit/Adafruit_Python_PureIO";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,8 +1,17 @@
|
|||
{ lib, stdenv, buildPythonPackage, isPy27, fetchFromGitHub, itsdangerous, python-multipart
|
||||
, pytestCheckHook, starlette, httpx, pytest-asyncio }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy27
|
||||
, fetchFromGitHub
|
||||
, itsdangerous
|
||||
, python-multipart
|
||||
, pytestCheckHook
|
||||
, starlette
|
||||
, httpx
|
||||
, pytest-asyncio
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.7.1";
|
||||
version = "0.8";
|
||||
pname = "asgi-csrf";
|
||||
disabled = isPy27;
|
||||
|
||||
|
|
@ -11,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "simonw";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1hhqrb9r46y6i3d3w6hc9zm6yyikdyd2k5pcbyw0r9fl959yi4hf";
|
||||
sha256 = "sha256-0I/p9SjVVZhJQeR7s1R3tooP9XMNLPlcxl0dBSzsVaw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -26,10 +35,7 @@ buildPythonPackage rec {
|
|||
starlette
|
||||
];
|
||||
|
||||
# tests fail while importing a private module from httpx
|
||||
# E ModuleNotFoundError: No module named 'httpx._content_streams'
|
||||
# https://github.com/simonw/asgi-csrf/issues/18
|
||||
doCheck = false;
|
||||
doCheck = false; # asgi-lifespan missing
|
||||
|
||||
pythonImportsCheck = [ "asgi_csrf" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pyserial
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "binho-host-adapter";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0mp8xa1qwaww2k5g2nqg7mcivzsbfw2ny1l9yjsi73109slafv8y";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyserial ];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "binhoHostAdapter" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for Binho Multi-Protocol USB Host Adapters";
|
||||
homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitbox02";
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0hnjjjarr4q22wh03zyyqfhsizzsvg46030kks3qkzbsv29vqqh5";
|
||||
sha256 = "52b0b617660601939b30c8b588c28910946448b1b6d69ca231d5e3e47a322b71";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ];
|
||||
|
|
|
|||
40
pkgs/development/python-modules/fortiosapi/default.nix
Normal file
40
pkgs/development/python-modules/fortiosapi/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, oyaml
|
||||
, packaging
|
||||
, paramiko
|
||||
, pexpect
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fortiosapi";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fortinet-solutions-cse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0679dizxcd4sk1b4h6ss8qsbjb3c8qyijlp4gzjqji91w6anzg9k";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pexpect
|
||||
requests
|
||||
paramiko
|
||||
packaging
|
||||
oyaml
|
||||
];
|
||||
|
||||
# Tests require a local VM
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "fortiosapi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to work with Fortigate/Fortios devices";
|
||||
homepage = "https://github.com/fortinet-solutions-cse/fortiosapi";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
39
pkgs/development/python-modules/geojson-client/default.nix
Normal file
39
pkgs/development/python-modules/geojson-client/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, geojson
|
||||
, haversine
|
||||
, pytz
|
||||
, requests
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "geojson-client";
|
||||
version = "0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-geojson-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cc6ymbn45dv7xdl1r8bbizlmsdbxjmsfza442yxmmm19nxnnqjv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
geojson
|
||||
haversine
|
||||
pytz
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "geojson_client" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for convenient access to GeoJSON feeds";
|
||||
homepage = "https://github.com/exxamalte/python-geojson-client";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
32
pkgs/development/python-modules/haversine/default.nix
Normal file
32
pkgs/development/python-modules/haversine/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "haversine";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapado";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1c3yf9162b2b7l1lsw3ffd1linnc542qvljpgwxp6y5arrmljqnv";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
numpy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "haversine" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module the distance between 2 points on earth";
|
||||
homepage = "https://github.com/mapado/haversine";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -61,6 +61,12 @@ rustPlatform.buildRustPackage rec {
|
|||
numpy
|
||||
];
|
||||
|
||||
# Remove with the next release after 0.5.0. This change is required
|
||||
# for compatibility with maturin 0.9.0.
|
||||
postPatch = ''
|
||||
sed '/project-url = /d' -i Cargo.toml
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
maturin build --release --manylinux off --strip --cargo-extra-args="-j $NIX_BUILD_CORES --frozen"
|
||||
|
|
|
|||
|
|
@ -12,20 +12,20 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyatmo";
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jabesq";
|
||||
repo = "netatmo-api-python";
|
||||
repo = "pyatmo";
|
||||
rev = "v${version}";
|
||||
sha256 = "12lmjhqjn71a358nkpzl3dwgiwmmz4lcv9f0qf69ngznpiirk28m";
|
||||
sha256 = "sha256-3IxDDLa8KMHVkHAeTmdNVRPc5aKzF3VwL2kKnG8Fp7I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "oauthlib~=3.1.0" "oauthlib" \
|
||||
--replace "requests~=2.23.0" "requests"
|
||||
--replace "oauthlib~=3.1" "oauthlib" \
|
||||
--replace "requests~=2.24" "requests"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,18 +1,33 @@
|
|||
{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, requests
|
||||
, requests_oauthlib
|
||||
, voluptuous
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pybotvac";
|
||||
version = "0.0.18";
|
||||
version = "0.0.20";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e983c9ffc0734c2e5a7c2adf5d0d0dfe399d94157c590ef70fad765f882c341f";
|
||||
sha256 = "sha256-1NnTSO4vO3Ryt4vYD5ZTQGr241GqA2KsGRBVowSTCzM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
requests_oauthlib
|
||||
voluptuous
|
||||
];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "pybotvac" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python package for controlling Neato pybotvac Connected vacuum robot";
|
||||
description = "Python module for interacting with Neato Botvac Connected vacuum robots";
|
||||
homepage = "https://github.com/stianaske/pybotvac";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ elseym ];
|
||||
|
|
|
|||
|
|
@ -15,18 +15,35 @@ let
|
|||
|
||||
inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34;
|
||||
|
||||
sip = (pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: {
|
||||
# If we install sip in another folder, then we need to create a __init__.py as well
|
||||
# if we want to be able to import it with Python 2.
|
||||
# Python 3 could rely on it being an implicit namespace package, however,
|
||||
# PyQt5 we made an explicit namespace package so sip should be as well.
|
||||
postInstall = ''
|
||||
cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py
|
||||
from pkgutil import extend_path
|
||||
__path__ = extend_path(__path__, __name__)
|
||||
EOF
|
||||
'';
|
||||
});
|
||||
sip = if isPy3k then
|
||||
pythonPackages.sip_5
|
||||
else
|
||||
(pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: {
|
||||
# If we install sip in another folder, then we need to create a __init__.py as well
|
||||
# if we want to be able to import it with Python 2.
|
||||
# Python 3 could rely on it being an implicit namespace package, however,
|
||||
# PyQt5 we made an explicit namespace package so sip should be as well.
|
||||
postInstall = ''
|
||||
cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py
|
||||
from pkgutil import extend_path
|
||||
__path__ = extend_path(__path__, __name__)
|
||||
EOF
|
||||
'';
|
||||
});
|
||||
|
||||
pyqt5_sip = buildPythonPackage rec {
|
||||
pname = "PyQt5_sip";
|
||||
version = "12.8.1";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd";
|
||||
};
|
||||
|
||||
# There is no test code and the check phase fails with:
|
||||
# > error: could not create 'PyQt5/sip.cpython-38-x86_64-linux-gnu.so': No such file or directory
|
||||
doCheck = false;
|
||||
};
|
||||
|
||||
in buildPythonPackage rec {
|
||||
pname = "PyQt5";
|
||||
|
|
@ -69,8 +86,7 @@ in buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
dbus-python
|
||||
sip
|
||||
] ++ lib.optional (!isPy3k) enum34;
|
||||
] ++ (if isPy3k then [ pyqt5_sip ] else [ sip enum34 ]);
|
||||
|
||||
patches = [
|
||||
# Fix some wrong assumptions by ./configure.py
|
||||
|
|
@ -103,7 +119,7 @@ in buildPythonPackage rec {
|
|||
runHook postConfigure
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (!isPy3k) ''
|
||||
ln -s ${sip}/${python.sitePackages}/PyQt5/sip.* $out/${python.sitePackages}/PyQt5/
|
||||
for i in $out/bin/*; do
|
||||
wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
|
||||
|
|
@ -116,26 +132,21 @@ in buildPythonPackage rec {
|
|||
EOF
|
||||
'';
|
||||
|
||||
installCheckPhase = let
|
||||
modules = [
|
||||
"PyQt5"
|
||||
"PyQt5.QtCore"
|
||||
"PyQt5.QtQml"
|
||||
"PyQt5.QtWidgets"
|
||||
"PyQt5.QtGui"
|
||||
]
|
||||
# Checked using pythonImportsCheck
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"PyQt5"
|
||||
"PyQt5.QtCore"
|
||||
"PyQt5.QtQml"
|
||||
"PyQt5.QtWidgets"
|
||||
"PyQt5.QtGui"
|
||||
]
|
||||
++ lib.optional withWebSockets "PyQt5.QtWebSockets"
|
||||
++ lib.optional withWebKit "PyQt5.QtWebKit"
|
||||
++ lib.optional withMultimedia "PyQt5.QtMultimedia"
|
||||
++ lib.optional withConnectivity "PyQt5.QtConnectivity"
|
||||
;
|
||||
imports = lib.concatMapStrings (module: "import ${module};") modules;
|
||||
in ''
|
||||
echo "Checking whether modules can be imported..."
|
||||
${python.interpreter} -c "${imports}"
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
26
pkgs/development/python-modules/sip/5.x.nix
Normal file
26
pkgs/development/python-modules/sip/5.x.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, packaging, toml }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sip";
|
||||
version = "5.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "sip";
|
||||
inherit version;
|
||||
sha256 = "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ packaging toml ];
|
||||
|
||||
# There aren't tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "sipbuild" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Creates C++ bindings for Python modules";
|
||||
homepage = "http://www.riverbankcomputing.co.uk/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ eduardosm ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
}:
|
||||
let
|
||||
pname = "wasmer";
|
||||
version = "1.0.0-beta1";
|
||||
version = "1.0.0";
|
||||
|
||||
wheel = rustPlatform.buildRustPackage rec {
|
||||
inherit pname version;
|
||||
|
|
@ -17,10 +17,10 @@ let
|
|||
owner = "wasmerio";
|
||||
repo = "wasmer-python";
|
||||
rev = version;
|
||||
sha256 = "0302lcfjlw7nz18nf86z6swhhpp1qnpwcsm2fj4avl22rsv0h78j";
|
||||
hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Rq5m9Lu6kePvohfhODLMOpGPFtCh0woTsQY2TufoiNQ=";
|
||||
cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc=";
|
||||
|
||||
nativeBuildInputs = [ maturin python ];
|
||||
|
||||
|
|
|
|||
26
pkgs/development/tools/convco/default.nix
Normal file
26
pkgs/development/tools/convco/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, stdenv, openssl, perl, pkg-config, libiconv, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "convco";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "convco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0fqq6irbq1aikhhw08gc9kp0vbk2aminfbvwdlm58cvywyq91bn4";
|
||||
};
|
||||
|
||||
cargoSha256 = "073sfv42fbl8rjm3dih1ghs9vq75mjshp66zdzdan2dmmrnw5m9z";
|
||||
|
||||
nativeBuildInputs = [ openssl perl pkg-config ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Conventional commit cli";
|
||||
homepage = "https://github.com/convco/convco";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ hoverbear ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,16 +5,16 @@ let
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
name = "maturin-${version}";
|
||||
version = "0.8.3";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyO3";
|
||||
repo = "maturin";
|
||||
rev = "v${version}";
|
||||
sha256 = "08l5r7d75id6qzf8xhkjv4hkdr64cq4dbcmdjywmvf9szjbnr65z";
|
||||
sha256 = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n";
|
||||
cargoSha256 = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,63 +1,15 @@
|
|||
{ stdenv
|
||||
, fetchurl
|
||||
, lib
|
||||
, libarchive
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, glib
|
||||
, libusb1
|
||||
, darwin
|
||||
, acl
|
||||
, lzma
|
||||
, bzip2
|
||||
, gnome2
|
||||
, libticonv
|
||||
, libtifiles2
|
||||
, libticables2
|
||||
, libticalcs2
|
||||
}:
|
||||
let
|
||||
libticonv = stdenv.mkDerivation rec {
|
||||
pname = "libticonv";
|
||||
version = "1.1.5";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0y080v12bm81wgjm6fnw7q0yg7scphm8hhrls9njcszj7fkscv9i";
|
||||
};
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ glib ];
|
||||
configureFlags = [ "--enable-iconv" ];
|
||||
};
|
||||
libticables2 = stdenv.mkDerivation rec {
|
||||
pname = "libticables2";
|
||||
version = "1.3.5";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
|
||||
sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc";
|
||||
};
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ glib libusb1 ];
|
||||
configureFlags = [ "--enable-libusb10" ];
|
||||
};
|
||||
libticalcs2 = stdenv.mkDerivation rec {
|
||||
pname = "libticalcs2";
|
||||
version = "1.1.9";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
|
||||
sha256 = "08c9wgrdnyqcs45mx1bjb8riqq81bzfkhgaijxzn96rhpj40fy3n";
|
||||
};
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ glib libticables2 libticonv libtifiles2 lzma bzip2 ]
|
||||
++ lib.optionals stdenv.isLinux [ acl ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.libobjc ];
|
||||
};
|
||||
libtifiles2 = stdenv.mkDerivation rec {
|
||||
pname = "libtifiles2";
|
||||
version = "1.1.7";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
|
||||
sha256 = "10n9mhlabmaw3ha5ckllxfy6fygs2pmlmj5v6w5v62bvx54kpils";
|
||||
};
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ glib libticonv libarchive lzma bzip2 ];
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tilem";
|
||||
version = "2.0";
|
||||
|
|
@ -72,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://lpg.ticalc.org/prj_tilem/";
|
||||
description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
maintainers = with maintainers; [ siraben luc65r ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,12 +65,12 @@ let
|
|||
|
||||
ale = buildVimPluginFrom2Nix {
|
||||
pname = "ale";
|
||||
version = "2021-01-23";
|
||||
version = "2021-01-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dense-analysis";
|
||||
repo = "ale";
|
||||
rev = "9fd9435cd525b1d3c4470db0d514f72ed31cfece";
|
||||
sha256 = "0nbnq3wmwm5m4g2b8jknjvallq1pq7qdxmbz81nnjkdmf6sw75ji";
|
||||
rev = "471e20ed2bfb373068ccd54db5603bd3f4dcbae0";
|
||||
sha256 = "0gzl8vbbqpjr1pw328p2lq7xsp85wrg0sfa1hsj62vay4gw3m84q";
|
||||
};
|
||||
meta.homepage = "https://github.com/dense-analysis/ale/";
|
||||
};
|
||||
|
|
@ -377,12 +377,12 @@ let
|
|||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2021-01-23";
|
||||
version = "2021-01-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "614af72a9b0afaac26e3e7fe2e1f30eb416bb96b";
|
||||
sha256 = "04mnhwk1sn174nrvr9jfvcfq4dff1c595y9i2r94xy6yag5cv61l";
|
||||
rev = "64e54cc9f39dc2084555522bec017cc35ccb8d9d";
|
||||
sha256 = "04fm2m2iiclbcijdmqa20a72af2vizx6bid8q348bsw2ppdh3r1a";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
|
|
@ -473,12 +473,12 @@ let
|
|||
|
||||
coc-explorer = buildVimPluginFrom2Nix {
|
||||
pname = "coc-explorer";
|
||||
version = "2021-01-18";
|
||||
version = "2021-01-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "weirongxu";
|
||||
repo = "coc-explorer";
|
||||
rev = "272d783f338107426cf75fa48b6f0a30860a8ac4";
|
||||
sha256 = "07dyy8v0j07w6gi89p08l0vcc0ba6d3qnz4wpsfj4hzf6cgifsw4";
|
||||
rev = "9b0687cdbe4b64c790f6022c605f1078430916d9";
|
||||
sha256 = "0n74sab6i8bq21zjrdd3vcv97bra9dg06dn6zpdc81n7pi13z6a5";
|
||||
};
|
||||
meta.homepage = "https://github.com/weirongxu/coc-explorer/";
|
||||
};
|
||||
|
|
@ -1487,12 +1487,12 @@ let
|
|||
|
||||
galaxyline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "galaxyline-nvim";
|
||||
version = "2021-01-17";
|
||||
version = "2021-01-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "glepnir";
|
||||
repo = "galaxyline.nvim";
|
||||
rev = "64d6b8e31459057ba4f9b03a977fce0d2cc3d748";
|
||||
sha256 = "1w5cggvxvmnm3zparnsgb3iz1pkw7d8bwvflcxaxg4pilgsniqsa";
|
||||
rev = "22791e9aadfc2a24ccc22d21b4c50f6b52e12980";
|
||||
sha256 = "1dw9k5ql7h8mgj7ag34pxa2jr9b2k788csc2a0jmyp6qp0d0x5ad";
|
||||
};
|
||||
meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
|
||||
};
|
||||
|
|
@ -2868,12 +2868,12 @@ let
|
|||
|
||||
nvim-gdb = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-gdb";
|
||||
version = "2021-01-20";
|
||||
version = "2021-01-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sakhnik";
|
||||
repo = "nvim-gdb";
|
||||
rev = "50b578efc1514f6ba45e23cdc89d656a51929208";
|
||||
sha256 = "0qcnchf1mnq0bwgkg7las62i4l4hwyisycymcrs0ki9skqdw5swh";
|
||||
rev = "531a575d1768be4531246950e55a784739b5d0a7";
|
||||
sha256 = "03hd7bq09gz23619b19cz29hafhia5r28xm8bqnj03d2m6b2xlyh";
|
||||
};
|
||||
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
|
||||
};
|
||||
|
|
@ -2916,12 +2916,12 @@ let
|
|||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2021-01-23";
|
||||
version = "2021-01-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "6a33e9ba757245a300531e370c6b2ebe6e5a7097";
|
||||
sha256 = "1grsh5186in83n0j28n8r0vw64kx8h1c5z8pm19adwdan0pcbs1r";
|
||||
rev = "9f91a07b38b6f66a56ca15161ffec83a5468b95a";
|
||||
sha256 = "01da135ffng6praixsnwgas0nm26ik9y8hm06jy394p2b2mk1g1g";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
|
|
@ -3024,12 +3024,12 @@ let
|
|||
|
||||
nvim-ts-rainbow = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-ts-rainbow";
|
||||
version = "2021-01-23";
|
||||
version = "2021-01-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "p00f";
|
||||
repo = "nvim-ts-rainbow";
|
||||
rev = "955f6d08e2e829f819d5f838e742761b43a263f5";
|
||||
sha256 = "19yy39sv1xv36aa9chrlkpf9xfw5l556s5sljcspynn66sdz8n5y";
|
||||
rev = "aca42922425e80582f7e3bb77c87f914119fb664";
|
||||
sha256 = "0d7h5fc5kyd4i17s0xjfq7ifg7h2xbrsnspilbraxppyfj0xhdrs";
|
||||
};
|
||||
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
|
||||
};
|
||||
|
|
@ -3758,12 +3758,12 @@ let
|
|||
|
||||
sql-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "sql-nvim";
|
||||
version = "2021-01-22";
|
||||
version = "2021-01-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tami5";
|
||||
repo = "sql.nvim";
|
||||
rev = "af875daf178fe38c2186b14d55a6bbdb6fbb2e15";
|
||||
sha256 = "00qa9m6bij9y39xyf73a3gz0xx0l0mqc1byrk6xl3kdbcngig5il";
|
||||
rev = "f0958180a5648ed1fc1fbedb89b94d81a45216a6";
|
||||
sha256 = "1bi2j4j9vkjw8dnb73jb7la4s4b71wr2q5mwhc1iyd15gxaya7xw";
|
||||
};
|
||||
meta.homepage = "https://github.com/tami5/sql.nvim/";
|
||||
};
|
||||
|
|
@ -4574,6 +4574,18 @@ let
|
|||
meta.homepage = "https://github.com/benizi/vim-automkdir/";
|
||||
};
|
||||
|
||||
vim-autoswap = buildVimPluginFrom2Nix {
|
||||
pname = "vim-autoswap";
|
||||
version = "2019-01-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gioele";
|
||||
repo = "vim-autoswap";
|
||||
rev = "e587e4b14a605d8921942ba65a37583813289272";
|
||||
sha256 = "0l0ijbdl2s9p5i3cxfkq8jncncz38qprp51whbjcda485d1knk9n";
|
||||
};
|
||||
meta.homepage = "https://github.com/gioele/vim-autoswap/";
|
||||
};
|
||||
|
||||
vim-bazel = buildVimPluginFrom2Nix {
|
||||
pname = "vim-bazel";
|
||||
version = "2020-08-22";
|
||||
|
|
@ -5777,12 +5789,12 @@ let
|
|||
|
||||
vim-illuminate = buildVimPluginFrom2Nix {
|
||||
pname = "vim-illuminate";
|
||||
version = "2021-01-23";
|
||||
version = "2021-01-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RRethy";
|
||||
repo = "vim-illuminate";
|
||||
rev = "d69a2787524a6973a187e67c978e1a92529fd910";
|
||||
sha256 = "013xnvxrma4jdv9a5i33qzjw65c0rrlvidsgdg4snrmwhdqw744q";
|
||||
rev = "a500e9fae73e433757c5d8a44da74e66373eb21e";
|
||||
sha256 = "1mxl0aziakvialk0qgm0mnpqdk9iwqnss9wqj7584nfxvz9zck20";
|
||||
};
|
||||
meta.homepage = "https://github.com/RRethy/vim-illuminate/";
|
||||
};
|
||||
|
|
@ -6006,12 +6018,12 @@ let
|
|||
|
||||
vim-LanguageTool = buildVimPluginFrom2Nix {
|
||||
pname = "vim-LanguageTool";
|
||||
version = "2020-10-29";
|
||||
version = "2021-01-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dpelle";
|
||||
repo = "vim-LanguageTool";
|
||||
rev = "d1f94ef917dddfd8c82589957b7aa6a55f382964";
|
||||
sha256 = "1y2y3rkhnj6xhzkm0snfkb08h6jmyjiicmk4j8lw2vhszsfgz6ns";
|
||||
rev = "f92e2577ab937f437c06d91639100952b540365b";
|
||||
sha256 = "09jw26mmbyvjlz5fw1gj9q0dwmv0aqwbl288h4hcliyx56snijhl";
|
||||
};
|
||||
meta.homepage = "https://github.com/dpelle/vim-LanguageTool/";
|
||||
};
|
||||
|
|
@ -8049,12 +8061,12 @@ let
|
|||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2021-01-19";
|
||||
version = "2021-01-24";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "5d3d96dcdf0f87273978c482e9c1b39201f4516f";
|
||||
sha256 = "04rn9w17mmf2ka4wqdl8x4nzwg5imnb0q1mnsm1hx8bvlr8zs0h6";
|
||||
rev = "fb6ed9883ea48c93e419736777d5f2e86fa4009b";
|
||||
sha256 = "0zrf3l7rckidrhlx6jdndabdiwgdyjfnax0ax20g4ynzmzlbj24l";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -133,6 +133,7 @@ gentoo/gentoo-syntax
|
|||
GEverding/vim-hocon
|
||||
gfanto/fzf-lsp.nvim@main
|
||||
gibiansky/vim-textobj-haskell
|
||||
gioele/vim-autoswap
|
||||
glepnir/galaxyline.nvim@main
|
||||
glts/vim-textobj-comment
|
||||
godlygeek/csapprox
|
||||
|
|
|
|||
|
|
@ -1,32 +1,26 @@
|
|||
{
|
||||
"4.14": {
|
||||
"extra": ".a",
|
||||
"name": "linux-hardened-4.14.216.a.patch",
|
||||
"sha256": "1pv0akd1dmhm10r9b7xambn3ipl1niypsmb3ibfmxdj4zln0g7aq",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.216.a/linux-hardened-4.14.216.a.patch"
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.14.217-hardened1.patch",
|
||||
"sha256": "1hb5fa06xw9rn0f77lklrlhb6vajr1hjv64qxv5y03l7zqfsi7lx",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.217-hardened1/linux-hardened-4.14.217-hardened1.patch"
|
||||
},
|
||||
"4.19": {
|
||||
"extra": ".a",
|
||||
"name": "linux-hardened-4.19.169.a.patch",
|
||||
"sha256": "0l3n1yjsa777pdxh4ib7phpfrw7c8vr1xwzgs8khnffllj9f16iq",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.169.a/linux-hardened-4.19.169.a.patch"
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.170-hardened1.patch",
|
||||
"sha256": "0wx1bhkxyiqk6r51922dhv29jfkx6kfwk4w3z2rc8shpm6krdngv",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.170-hardened1/linux-hardened-4.19.170-hardened1.patch"
|
||||
},
|
||||
"5.10": {
|
||||
"extra": ".a",
|
||||
"name": "linux-hardened-5.10.9.a.patch",
|
||||
"sha256": "0mkwyknafdbc2hqv4j7jjc6wsrrx6a76d69hxh7x90gi0s3f5rfw",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.9.a/linux-hardened-5.10.9.a.patch"
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.10-hardened1.patch",
|
||||
"sha256": "0hm8ng073lzqcj5khgpxvr775z0jns9y00qj8b0n63yq0klm2pqh",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.10-hardened1/linux-hardened-5.10.10-hardened1.patch"
|
||||
},
|
||||
"5.4": {
|
||||
"extra": ".a",
|
||||
"name": "linux-hardened-5.4.91.a.patch",
|
||||
"sha256": "0kqn9g6wh4rp9riwkjmzapmnwk0fd5z18z26j2rqfgq7x4r8d7rm",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.91.a/linux-hardened-5.4.91.a.patch"
|
||||
},
|
||||
"5.9": {
|
||||
"extra": "",
|
||||
"name": "linux-hardened-5.9.16.a.patch",
|
||||
"sha256": "024wdzc9bwgr4nd4z0l6bazcl35jczhsmdl2lb26bvffjwg207rw",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.16.a/linux-hardened-5.9.16.a.patch"
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.92-hardened1.patch",
|
||||
"sha256": "0qklpyrd20xsyrvw6ij8y337vjfnxlkyyvalzk96ngkvlfv5b7qh",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.92-hardened1/linux-hardened-5.4.92-hardened1.patch"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
diff --git a/localversion-hardened b/localversion-hardened
|
||||
new file mode 100644
|
||||
index 0000000000..e578045860
|
||||
--- /dev/null
|
||||
+++ b/localversion-hardened
|
||||
@@ -0,0 +1 @@
|
||||
+-hardened
|
||||
|
|
@ -101,7 +101,7 @@ def verify_openpgp_signature(
|
|||
|
||||
def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]:
|
||||
release = release_info.release
|
||||
extra = f'.{release_info.version[-1]}'
|
||||
extra = f'-{release_info.version[-1]}'
|
||||
|
||||
def find_asset(filename: str) -> str:
|
||||
try:
|
||||
|
|
@ -138,7 +138,7 @@ def fetch_patch(*, name: str, release_info: ReleaseInfo) -> Optional[Patch]:
|
|||
|
||||
def parse_version(version_str: str) -> Version:
|
||||
version: Version = []
|
||||
for component in version_str.split("."):
|
||||
for component in re.split('\.|\-', version_str):
|
||||
try:
|
||||
version.append(int(component))
|
||||
except ValueError:
|
||||
|
|
@ -208,7 +208,7 @@ failures = False
|
|||
releases = {}
|
||||
for release in repo.get_releases():
|
||||
version = parse_version(release.tag_name)
|
||||
# needs to look like e.g. 5.6.3.a
|
||||
# needs to look like e.g. 5.6.3-hardened1
|
||||
if len(version) < 4:
|
||||
continue
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.216";
|
||||
version = "4.14.217";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "19dvxmqvs1ysl127zqdcqq2pyf7370jj66fd73zdx6ya2pplz1mp";
|
||||
sha256 = "04adj8x7p1has4mh8ygxhqgwb1i08fz9izqw1y6xj5hh8cjnm8v2";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.169";
|
||||
version = "4.19.170";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "156y4ly7qyy5z7sbp2vccrs7za72k3zi2hfjpskqqd6civdlvln7";
|
||||
sha256 = "0jjvwbxpfvmzj4z6gkd2mh3kz9vh8hsgsm0013866hzgz1j043fx";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.252";
|
||||
version = "4.4.253";
|
||||
extraMeta.branch = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0lchvfvn0kvqh1yixwscz4wrzd965zsxjkpc7nqiw9rhmvma3paf";
|
||||
sha256 = "0nlqnfhrkaj2s582kc0wxqi0881hgp6l9z85qx4ckflc8jwrh7k6";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.252";
|
||||
version = "4.9.253";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1shllgrmxi6darnyzwkzazzjhpwxhm19z1swv40hnm0pbvgxm7hw";
|
||||
sha256 = "065w35vb0qp4fvnwmcx7f92inmx64f9r04zzwcwbs0826nl52nws";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.9";
|
||||
version = "5.10.10";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0la7dklpy6xd79fkzavpmlfyrc60kmmwz491msd95dmvv06kwwvz";
|
||||
sha256 = "06fvgkrn9127xw9kly6l4ws3yv80q8xfqdzaam92lljim5pqdvb0";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.91";
|
||||
version = "5.4.92";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "05swzh4gb0mk6wzza0k6b0283cygkvj8a2d2b2gab6sb0fxn208f";
|
||||
sha256 = "1zcl4dadyfrgmx6rh0ncy403rsqb1qs092m6zr6b3i14i3wpz4y0";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
|
||||
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.9.16";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
|
||||
# branchVersion needs to be x.y
|
||||
extraMeta.branch = versions.majorMinor version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "11mbnjvb5d5gwbrwlkqvzpg1ij4m19l5wr3wca9iiyg5i2papmxh";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
|
@ -33,11 +33,6 @@
|
|||
|
||||
cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches;
|
||||
|
||||
tag_hardened = {
|
||||
name = "tag-hardened";
|
||||
patch = ./hardened/tag-hardened.patch;
|
||||
};
|
||||
|
||||
hardened = let
|
||||
mkPatch = kernelVersion: src: {
|
||||
name = lib.removeSuffix ".patch" src.name;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2021.1.4";
|
||||
version = "2021.1.5";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ abodepy ];
|
||||
"accuweather" = ps: with ps; [ accuweather ];
|
||||
|
|
@ -270,7 +270,7 @@
|
|||
"folder_watcher" = ps: with ps; [ watchdog ];
|
||||
"foobot" = ps: with ps; [ ]; # missing inputs: foobot_async
|
||||
"forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java
|
||||
"fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi
|
||||
"fortios" = ps: with ps; [ fortiosapi ];
|
||||
"foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam
|
||||
"foursquare" = ps: with ps; [ aiohttp-cors ];
|
||||
"free_mobile" = ps: with ps; [ ]; # missing inputs: freesms
|
||||
|
|
@ -292,7 +292,7 @@
|
|||
"generic" = ps: with ps; [ ];
|
||||
"generic_thermostat" = ps: with ps; [ ];
|
||||
"geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client
|
||||
"geo_json_events" = ps: with ps; [ ]; # missing inputs: geojson_client
|
||||
"geo_json_events" = ps: with ps; [ geojson-client ];
|
||||
"geo_location" = ps: with ps; [ ];
|
||||
"geo_rss_events" = ps: with ps; [ ]; # missing inputs: georss_generic_client
|
||||
"geofency" = ps: with ps; [ aiohttp-cors ];
|
||||
|
|
@ -885,7 +885,7 @@
|
|||
"uptime" = ps: with ps; [ ];
|
||||
"uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot
|
||||
"uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus
|
||||
"usgs_earthquakes_feed" = ps: with ps; [ ]; # missing inputs: geojson_client
|
||||
"usgs_earthquakes_feed" = ps: with ps; [ geojson-client ];
|
||||
"utility_meter" = ps: with ps; [ ];
|
||||
"uvc" = ps: with ps; [ uvcclient ];
|
||||
"vacuum" = ps: with ps; [ ];
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ let
|
|||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2021.1.4";
|
||||
hassVersion = "2021.1.5";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -76,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
sha256 = "03aa7kd216rnp8h80nv002ahafiy0031lxk1bkwcirrznphcw7sj";
|
||||
sha256 = "sha256-xi5rHZlhwgEHll3TFlRu7D963tdcQNMmWcoXVjEFLXo=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
|
|
|||
45
pkgs/shells/zsh/zsh-fzf-tab/default.nix
Normal file
45
pkgs/shells/zsh/zsh-fzf-tab/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ stdenv, lib, fetchFromGitHub, ncurses }:
|
||||
|
||||
let
|
||||
INSTALL_PATH="${placeholder "out"}/share/fzf-tab";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zsh-fzf-tab";
|
||||
version = "unstable-2021-01-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aloxaf";
|
||||
repo = "fzf-tab";
|
||||
rev = "78b4cefb27dc2bef5e4c9ac3bf2bd28413620fcd";
|
||||
sha256 = "1f5m7vf7wxzczis2nzvhgqaqnphhp3a0wv8b612m7g4fnvk3lnkn";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
postConfigure = ''
|
||||
pushd modules
|
||||
./configure --disable-gdbm --without-tcsetpgrp
|
||||
popd
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
pushd modules
|
||||
make -j$NIX_BUILD_CORES
|
||||
popd
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p ${INSTALL_PATH}
|
||||
cp -r lib ${INSTALL_PATH}/lib
|
||||
install -D fzf-tab.zsh ${INSTALL_PATH}/fzf-tab.zsh
|
||||
install -D fzf-tab.plugin.zsh ${INSTALL_PATH}/fzf-tab.plugin.zsh
|
||||
install -D modules/Src/aloxaf/fzftab.so ${INSTALL_PATH}/modules/Src/aloxaf/fzftab.so
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Aloxaf/fzf-tab";
|
||||
description = "Replace zsh's default completion selection menu with fzf!";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ vonfry ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lf";
|
||||
version = "18";
|
||||
version = "19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gokcehan";
|
||||
repo = "lf";
|
||||
rev = "r${version}";
|
||||
sha256 = "1xzy85lz99kwzvpkkaqlylynn57nhn76dff3cxy304d23y3r26w6";
|
||||
sha256 = "096lb0kbiqchw8mfp1vbgn9p1bqnp3h5wn172s9q4jl55l5l0kn1";
|
||||
};
|
||||
|
||||
vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg";
|
||||
|
|
|
|||
31
pkgs/tools/networking/getmail6/default.nix
Normal file
31
pkgs/tools/networking/getmail6/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ stdenv, fetchFromGitHub, python3Packages, lib }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "getmail6";
|
||||
version = "6.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1a3bw4wwdapd9n051dgwqldd8gwiipb5shaz08qwp1jndpvylm7d";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "getmailcore" ];
|
||||
|
||||
postPatch = ''
|
||||
# getmail spends a lot of effort to build an absolute path for
|
||||
# documentation installation; too bad it is counterproductive now
|
||||
sed -e '/datadir or prefix,/d' -i setup.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A program for retrieving mail";
|
||||
homepage = "https://getmail6.org";
|
||||
updateWalker = true;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ abbe ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchpatch
|
||||
, pkg-config, autoreconfHook
|
||||
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages
|
||||
, sqlite
|
||||
, sqlite, zstd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ cpio zlib bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ]
|
||||
buildInputs = [ cpio zlib zstd bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ]
|
||||
++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
|
||||
|
||||
# rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
|
||||
|
|
@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
|
|||
"--enable-python"
|
||||
"--enable-ndb"
|
||||
"--enable-sqlite"
|
||||
"--enable-zstd"
|
||||
"--localstatedir=/var"
|
||||
"--sharedstatedir=/com"
|
||||
];
|
||||
|
|
|
|||
54
pkgs/tools/security/ike-scan/default.nix
Normal file
54
pkgs/tools/security/ike-scan/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ lib
|
||||
, autoconf
|
||||
, automake
|
||||
, autoreconfHook
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, openssl
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ike-scan";
|
||||
version = "1.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "royhills";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "01a39bk9ma2lm59q320m9g11909if5gc3qynd8pzn6slqiq5r8kw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
openssl
|
||||
];
|
||||
|
||||
configureFlags = [ "--with-openssl=${openssl.dev}" ];
|
||||
|
||||
patches = [
|
||||
# Using the same patches as for the Fedora RPM
|
||||
(fetchpatch {
|
||||
# Memory leaks, https://github.com/royhills/ike-scan/pull/15
|
||||
url = "https://github.com/royhills/ike-scan/pull/15/commits/d864811de08dcddd65ac9b8d0f2acf5d7ddb9dea.patch";
|
||||
sha256 = "0wbrq89dl8js7cdivd0c45hckmflan33cpgc3qm5s3az6r4mjljm";
|
||||
})
|
||||
(fetchpatch {
|
||||
# Unknown vendor IDs, https://github.com/royhills/ike-scan/pull/18, was merged but not released
|
||||
url = "https://github.com/royhills/ike-scan/pull/18/commits/e065ddbe471880275dc7975e7da235e7a2097c22.patch";
|
||||
sha256 = "13ly01c96nnd5yh7rxrhv636csm264m5xf2a1inprrzxkkri5sls";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to discover, fingerprint and test IPsec VPN servers";
|
||||
longDescription = ''
|
||||
ike-scan is a command-line tool that uses the IKE protocol to discover,
|
||||
fingerprint and test IPsec VPN servers.
|
||||
'';
|
||||
homepage = "https://github.com/royhills/ike-scan";
|
||||
license = with licenses; [ gpl3Plus ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
38
pkgs/tools/security/proxmark3/proxmark3-rrg.nix
Normal file
38
pkgs/tools/security/proxmark3/proxmark3-rrg.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ stdenv, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5
|
||||
, readline
|
||||
|
||||
, hardwarePlatform ? "PM3RDV4"
|
||||
|
||||
, hardwarePlatformExtras ? "" }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "proxmark3-rrg";
|
||||
version = "4.9237";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RfidResearchGroup";
|
||||
repo = "proxmark3";
|
||||
rev = "v${version}";
|
||||
sha256 = "13xrhvrsm73rfgqpgca6a37c3jixdkxvfggmacnnx5fdfb393bfx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gcc-arm-embedded ];
|
||||
buildInputs = [ bluez5 readline ];
|
||||
|
||||
makeFlags = [
|
||||
"PLATFORM=${hardwarePlatform}"
|
||||
"PLATFORM_EXTRAS=${hardwarePlatformExtras}"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -Dt $out/bin client/proxmark3
|
||||
install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Client for proxmark3, powerful general purpose RFID tool";
|
||||
homepage = "https://rfidresearchgroup.com/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ nyanotech ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,26 +2,31 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "auto-cpufreq";
|
||||
version = "1.5.1";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdnanHodzic";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "uVhftO6AqFnZ0uaEYRAPvVskkouNOXPtNVYXx7WJKyw=";
|
||||
sha256 = "sha256-NDIdQ4gUN2jG+VWXsv3fdUogZxOOiNtnbekD30+jx6M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ click distro psutil ];
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "source" ];
|
||||
pythonImportsCheck = [ "auto_cpufreq" ];
|
||||
|
||||
# patch to prevent script copying and to disable install
|
||||
patches = [ ./prevent-install-and-copy.patch ];
|
||||
|
||||
postInstall = ''
|
||||
# copy script manually
|
||||
cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl
|
||||
cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl.auto-cpufreq
|
||||
|
||||
# systemd service
|
||||
mkdir -p $out/lib/systemd/system
|
||||
cp ${src}/scripts/auto-cpufreq.service $out/lib/systemd/system
|
||||
substituteInPlace $out/lib/systemd/system/auto-cpufreq.service --replace "/usr/local" $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -1,3 +1,121 @@
|
|||
diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py
|
||||
index 482a544..d142013 100644
|
||||
--- a/auto_cpufreq/core.py
|
||||
+++ b/auto_cpufreq/core.py
|
||||
@@ -163,31 +163,13 @@ def get_current_gov():
|
||||
return print("Currently using:", getoutput("cpufreqctl.auto-cpufreq --governor").strip().split(" ")[0], "governor")
|
||||
|
||||
def cpufreqctl():
|
||||
- """
|
||||
- deploy cpufreqctl script
|
||||
- """
|
||||
-
|
||||
- # detect if running on a SNAP
|
||||
- if os.getenv('PKG_MARKER') == "SNAP":
|
||||
- pass
|
||||
- else:
|
||||
- # deploy cpufreqctl.auto-cpufreq script
|
||||
- if os.path.isfile("/usr/bin/cpufreqctl"):
|
||||
- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl.auto-cpufreq")
|
||||
- else:
|
||||
- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl.auto-cpufreq")
|
||||
+ # scripts are already in the correct place
|
||||
+ pass
|
||||
|
||||
|
||||
def cpufreqctl_restore():
|
||||
- """
|
||||
- remove cpufreqctl.auto-cpufreq script
|
||||
- """
|
||||
- # detect if running on a SNAP
|
||||
- if os.getenv('PKG_MARKER') == "SNAP":
|
||||
- pass
|
||||
- else:
|
||||
- if os.path.isfile("/usr/bin/cpufreqctl.auto-cpufreq"):
|
||||
- os.remove("/usr/bin/cpufreqctl.auto-cpufreq")
|
||||
+ # no need to restore
|
||||
+ pass
|
||||
|
||||
def footer(l=79):
|
||||
print("\n" + "-" * l + "\n")
|
||||
@@ -212,74 +194,12 @@ def remove_complete_msg():
|
||||
|
||||
|
||||
def deploy_daemon():
|
||||
- print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n")
|
||||
-
|
||||
- # deploy cpufreqctl script func call
|
||||
- cpufreqctl()
|
||||
-
|
||||
- print("* Turn off bluetooth on boot")
|
||||
- btconf = Path("/etc/bluetooth/main.conf")
|
||||
- try:
|
||||
- orig_set = "AutoEnable=true"
|
||||
- change_set = "AutoEnable=false"
|
||||
- with btconf.open(mode="r+") as f:
|
||||
- content = f.read()
|
||||
- f.seek(0)
|
||||
- f.truncate()
|
||||
- f.write(content.replace(orig_set, change_set))
|
||||
- except:
|
||||
- print("\nERROR:\nWas unable to turn off bluetooth on boot")
|
||||
-
|
||||
- auto_cpufreq_log_path.touch(exist_ok=True)
|
||||
-
|
||||
- print("\n* Deploy auto-cpufreq install script")
|
||||
- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/bin/auto-cpufreq-install")
|
||||
-
|
||||
- print("\n* Deploy auto-cpufreq remove script")
|
||||
- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/bin/auto-cpufreq-remove")
|
||||
-
|
||||
- call("/usr/bin/auto-cpufreq-install", shell=True)
|
||||
-
|
||||
+ # prevent needless copying and system changes
|
||||
+ pass
|
||||
|
||||
# remove auto-cpufreq daemon
|
||||
def remove():
|
||||
-
|
||||
- # check if auto-cpufreq is installed
|
||||
- if not os.path.exists("/usr/bin/auto-cpufreq-remove"):
|
||||
- print("\nauto-cpufreq daemon is not installed.\n")
|
||||
- sys.exit(1)
|
||||
-
|
||||
- print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n")
|
||||
-
|
||||
- print("* Turn on bluetooth on boot")
|
||||
- btconf = "/etc/bluetooth/main.conf"
|
||||
- try:
|
||||
- orig_set = "AutoEnable=true"
|
||||
- change_set = "AutoEnable=false"
|
||||
- with open(btconf, "r+") as f:
|
||||
- content = f.read()
|
||||
- f.seek(0)
|
||||
- f.truncate()
|
||||
- f.write(content.replace(change_set, orig_set))
|
||||
- except:
|
||||
- print("\nERROR:\nWas unable to turn on bluetooth on boot")
|
||||
-
|
||||
- # run auto-cpufreq daemon install script
|
||||
- call("/usr/bin/auto-cpufreq-remove", shell=True)
|
||||
-
|
||||
- # remove auto-cpufreq-remove
|
||||
- os.remove("/usr/bin/auto-cpufreq-remove")
|
||||
-
|
||||
- # delete log file
|
||||
- if auto_cpufreq_log_path.exists():
|
||||
- if auto_cpufreq_log_file is not None:
|
||||
- auto_cpufreq_log_file.close()
|
||||
-
|
||||
- auto_cpufreq_log_path.unlink()
|
||||
-
|
||||
- # restore original cpufrectl script
|
||||
- cpufreqctl_restore()
|
||||
-
|
||||
+ pass
|
||||
|
||||
def gov_check():
|
||||
for gov in get_avail_gov():
|
||||
diff --git a/scripts/cpufreqctl.sh b/scripts/cpufreqctl.sh
|
||||
index 63a2b5b..e157efe 100755
|
||||
--- a/scripts/cpufreqctl.sh
|
||||
|
|
@ -42,137 +160,3 @@ index 63a2b5b..e157efe 100755
|
|||
+ echo "reset is disabled in the nix package"
|
||||
exit
|
||||
fi
|
||||
diff --git a/source/core.py b/source/core.py
|
||||
index 531c0c4..2e27e65 100644
|
||||
--- a/source/core.py
|
||||
+++ b/source/core.py
|
||||
@@ -24,8 +24,6 @@ warnings.filterwarnings("ignore")
|
||||
# - re-enable CPU fan speed display and make more generic and not only for thinkpad
|
||||
# - replace get system/CPU load from: psutil.getloadavg() | available in 5.6.2)
|
||||
|
||||
-SCRIPTS_DIR = Path("/usr/local/share/auto-cpufreq/scripts/")
|
||||
-
|
||||
# from the highest performance to the lowest
|
||||
ALL_GOVERNORS = ("performance", "ondemand", "conservative", "schedutil", "userspace", "powersave")
|
||||
CPUS = os.cpu_count()
|
||||
@@ -156,34 +154,16 @@ def cpufreqctl():
|
||||
"""
|
||||
deploy cpufreqctl script
|
||||
"""
|
||||
-
|
||||
- # detect if running on a SNAP
|
||||
- if os.getenv('PKG_MARKER') == "SNAP":
|
||||
- pass
|
||||
- else:
|
||||
- # deploy cpufreqctl script (if missing)
|
||||
- if os.path.isfile("/usr/bin/cpufreqctl"):
|
||||
- shutil.copy("/usr/bin/cpufreqctl", "/usr/bin/cpufreqctl.auto-cpufreq.bak")
|
||||
- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl")
|
||||
- else:
|
||||
- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl")
|
||||
+ # scripts are already in the correct place
|
||||
+ pass
|
||||
|
||||
|
||||
def cpufreqctl_restore():
|
||||
"""
|
||||
restore original cpufreqctl script
|
||||
"""
|
||||
- # detect if running on a SNAP
|
||||
- if os.getenv('PKG_MARKER') == "SNAP":
|
||||
- pass
|
||||
- else:
|
||||
- # restore original cpufreqctl script
|
||||
- if os.path.isfile("/usr/bin/cpufreqctl.auto-cpufreq.bak"):
|
||||
- os.system("cp /usr/bin/cpufreqctl.auto-cpufreq.bak /usr/bin/cpufreqctl")
|
||||
- os.remove("/usr/bin/cpufreqctl.auto-cpufreq.bak")
|
||||
- # ToDo: implement mechanism to make sure cpufreqctl (auto-cpufreq) file is
|
||||
- # restored if overwritten by system. But during tool removal to also remove it
|
||||
- # in def cpufreqctl
|
||||
+ # no need to restore
|
||||
+ pass
|
||||
|
||||
|
||||
def footer(l=79):
|
||||
@@ -209,71 +189,13 @@ def remove_complete_msg():
|
||||
|
||||
|
||||
def deploy_daemon():
|
||||
- print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n")
|
||||
-
|
||||
- # deploy cpufreqctl script func call
|
||||
- cpufreqctl()
|
||||
-
|
||||
- print("* Turn off bluetooth on boot")
|
||||
- btconf = Path("/etc/bluetooth/main.conf")
|
||||
- try:
|
||||
- orig_set = "AutoEnable=true"
|
||||
- change_set = "AutoEnable=false"
|
||||
- with btconf.open(mode="r+") as f:
|
||||
- content = f.read()
|
||||
- f.seek(0)
|
||||
- f.truncate()
|
||||
- f.write(content.replace(orig_set, change_set))
|
||||
- except:
|
||||
- print("\nERROR:\nWas unable to turn off bluetooth on boot")
|
||||
-
|
||||
- auto_cpufreq_log_file.touch(exist_ok=True)
|
||||
-
|
||||
- print("\n* Deploy auto-cpufreq install script")
|
||||
- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/bin/auto-cpufreq-install")
|
||||
-
|
||||
- print("\n* Deploy auto-cpufreq remove script")
|
||||
- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/bin/auto-cpufreq-remove")
|
||||
-
|
||||
- call("/usr/bin/auto-cpufreq-install", shell=True)
|
||||
+ # prevent needless copying and system changes
|
||||
+ pass
|
||||
|
||||
|
||||
# remove auto-cpufreq daemon
|
||||
def remove():
|
||||
-
|
||||
- # check if auto-cpufreq is installed
|
||||
- if not os.path.exists("/usr/bin/auto-cpufreq-remove"):
|
||||
- print("\nauto-cpufreq daemon is not installed.\n")
|
||||
- sys.exit(1)
|
||||
-
|
||||
- print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n")
|
||||
-
|
||||
- print("* Turn on bluetooth on boot")
|
||||
- btconf = "/etc/bluetooth/main.conf"
|
||||
- try:
|
||||
- orig_set = "AutoEnable=true"
|
||||
- change_set = "AutoEnable=false"
|
||||
- with open(btconf, "r+") as f:
|
||||
- content = f.read()
|
||||
- f.seek(0)
|
||||
- f.truncate()
|
||||
- f.write(content.replace(change_set, orig_set))
|
||||
- except:
|
||||
- print("\nERROR:\nWas unable to turn on bluetooth on boot")
|
||||
-
|
||||
- # run auto-cpufreq daemon install script
|
||||
- call("/usr/bin/auto-cpufreq-remove", shell=True)
|
||||
-
|
||||
- # remove auto-cpufreq-remove
|
||||
- os.remove("/usr/bin/auto-cpufreq-remove")
|
||||
-
|
||||
- # delete log file
|
||||
- if auto_cpufreq_log_file.exists():
|
||||
- auto_cpufreq_log_file.unlink()
|
||||
-
|
||||
- # restore original cpufrectl script
|
||||
- cpufreqctl_restore()
|
||||
-
|
||||
+ pass
|
||||
|
||||
def gov_check():
|
||||
for gov in get_avail_gov():
|
||||
@@ -798,4 +720,4 @@ def running_daemon():
|
||||
exit(1)
|
||||
elif os.getenv("PKG_MARKER") == "SNAP" and dcheck == "enabled":
|
||||
deploy_complete_msg()
|
||||
- exit(1)
|
||||
\ No newline at end of file
|
||||
+ exit(1)
|
||||
29
pkgs/tools/system/go-audit/default.nix
Normal file
29
pkgs/tools/system/go-audit/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-audit";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slackhq";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "02iwjzaz2ks0zmwijaijwzc3gn9mhn7xpx369ylgaz68arlapfjg";
|
||||
};
|
||||
|
||||
vendorSha256 = "11kb7xm82s0d8d06b2jknwn3dfh4i0a1dv0740y47vk62sf6f05i";
|
||||
|
||||
# Tests need network access
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An alternative to the auditd daemon";
|
||||
homepage = "https://github.com/slackhq/go-audit";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -70,6 +70,7 @@ mapAliases ({
|
|||
bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19
|
||||
beegfs = throw "beegfs has been removed."; # added 2019-11-24
|
||||
bluezFull = bluez; # Added 2019-12-03
|
||||
brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24
|
||||
bridge_utils = bridge-utils; # added 2015-02-20
|
||||
bro = zeek; # added 2019-09-29
|
||||
bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10
|
||||
|
|
@ -321,7 +322,6 @@ mapAliases ({
|
|||
libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22
|
||||
libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09
|
||||
links = links2; # added 2016-01-31
|
||||
linux_mptcp_5_9 = linux_5_9; # added 2020-01-07
|
||||
linux_rpi0 = linux_rpi1;
|
||||
linuxPackages_rpi0 = linuxPackages_rpi1;
|
||||
|
||||
|
|
|
|||
|
|
@ -1349,6 +1349,8 @@ in
|
|||
|
||||
asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { };
|
||||
|
||||
go-audit = callPackage ../tools/system/go-audit { };
|
||||
|
||||
gopass = callPackage ../tools/security/gopass { };
|
||||
|
||||
gospider = callPackage ../tools/security/gospider { };
|
||||
|
|
@ -4344,6 +4346,8 @@ in
|
|||
|
||||
getmail = callPackage ../tools/networking/getmail { };
|
||||
|
||||
getmail6 = callPackage ../tools/networking/getmail6 { };
|
||||
|
||||
getopt = callPackage ../tools/misc/getopt { };
|
||||
|
||||
gexiv2 = callPackage ../development/libraries/gexiv2 { };
|
||||
|
|
@ -5165,6 +5169,8 @@ in
|
|||
|
||||
iruby = callPackage ../applications/editors/jupyter-kernels/iruby { };
|
||||
|
||||
ike-scan = callPackage ../tools/security/ike-scan { };
|
||||
|
||||
imapproxy = callPackage ../tools/networking/imapproxy {
|
||||
openssl = openssl_1_0_2;
|
||||
};
|
||||
|
|
@ -7130,6 +7136,8 @@ in
|
|||
inherit (callPackages ../tools/security/proxmark3 { gcc-arm-embedded = gcc-arm-embedded-8; })
|
||||
proxmark3 proxmark3-unstable;
|
||||
|
||||
proxmark3-rrg = libsForQt5.callPackage ../tools/security/proxmark3/proxmark3-rrg.nix { };
|
||||
|
||||
proxychains = callPackage ../tools/networking/proxychains { };
|
||||
|
||||
proxify = callPackage ../tools/networking/proxify { };
|
||||
|
|
@ -8206,6 +8214,8 @@ in
|
|||
|
||||
tilem = callPackage ../misc/emulators/tilem { };
|
||||
|
||||
tilp2 = callPackage ../applications/science/math/tilp2 { };
|
||||
|
||||
timemachine = callPackage ../applications/audio/timemachine { };
|
||||
|
||||
timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { };
|
||||
|
|
@ -9156,6 +9166,8 @@ in
|
|||
|
||||
zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { };
|
||||
|
||||
zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { };
|
||||
|
||||
zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { };
|
||||
|
||||
zsh-powerlevel10k = callPackage ../shells/zsh/zsh-powerlevel10k { };
|
||||
|
|
@ -9499,8 +9511,6 @@ in
|
|||
mkdir -p "$rsrc/lib"
|
||||
ln -s "${cc}/lib" "$rsrc/include"
|
||||
echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
|
||||
'' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) ''
|
||||
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -10717,6 +10727,10 @@ in
|
|||
|
||||
crate2nix = callPackage ../development/tools/rust/crate2nix { };
|
||||
|
||||
convco = callPackage ../development/tools/convco {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
maturin = callPackage ../development/tools/rust/maturin { };
|
||||
inherit (rustPackages) rls;
|
||||
rustfmt = rustPackages.rustfmt;
|
||||
|
|
@ -13807,6 +13821,8 @@ in
|
|||
|
||||
gflags = callPackage ../development/libraries/gflags { };
|
||||
|
||||
gfm = callPackage ../applications/science/math/gfm { };
|
||||
|
||||
gperftools = callPackage ../development/libraries/gperftools { };
|
||||
|
||||
grab-site = callPackage ../tools/backup/grab-site { };
|
||||
|
|
@ -15286,6 +15302,16 @@ in
|
|||
|
||||
libthreadar = callPackage ../development/libraries/libthreadar { };
|
||||
|
||||
libticables2 = callPackage ../development/libraries/libticables2 { };
|
||||
|
||||
libticalcs2 = callPackage ../development/libraries/libticalcs2 {
|
||||
inherit (darwin) libobjc;
|
||||
};
|
||||
|
||||
libticonv = callPackage ../development/libraries/libticonv { };
|
||||
|
||||
libtifiles2 = callPackage ../development/libraries/libtifiles2 { };
|
||||
|
||||
libtiff = callPackage ../development/libraries/libtiff { };
|
||||
|
||||
libtiger = callPackage ../development/libraries/libtiger { };
|
||||
|
|
@ -18919,14 +18945,6 @@ in
|
|||
];
|
||||
};
|
||||
|
||||
linux_5_9 = callPackage ../os-specific/linux/kernel/linux-5.9.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.export_kernel_fpu_functions."5.3"
|
||||
];
|
||||
};
|
||||
|
||||
linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
|
|
@ -19219,7 +19237,6 @@ in
|
|||
linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
|
||||
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
|
||||
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
|
||||
linuxPackages_5_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_9);
|
||||
linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
|
||||
|
||||
# When adding to the list above:
|
||||
|
|
@ -19266,10 +19283,9 @@ in
|
|||
inherit (kernel) version;
|
||||
};
|
||||
kernelPatches = kernel.kernelPatches ++ [
|
||||
kernelPatches.tag_hardened
|
||||
kernelPatches.hardened.${kernel.meta.branch}
|
||||
];
|
||||
modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra + "-hardened";
|
||||
modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra;
|
||||
isHardened = true;
|
||||
});
|
||||
|
||||
|
|
@ -21126,8 +21142,6 @@ in
|
|||
|
||||
bonzomatic = callPackage ../applications/editors/bonzomatic { };
|
||||
|
||||
brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; };
|
||||
|
||||
brave = callPackage ../applications/networking/browsers/brave { };
|
||||
|
||||
break-time = callPackage ../applications/misc/break-time { };
|
||||
|
|
@ -27198,13 +27212,15 @@ in
|
|||
tilingnome = callPackage ../desktops/gnome-3/extensions/tilingnome { };
|
||||
timepp = callPackage ../desktops/gnome-3/extensions/timepp { };
|
||||
topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { };
|
||||
unite-shell = callPackage ../desktops/gnome-3/extensions/unite-shell { };
|
||||
unite = callPackage ../desktops/gnome-3/extensions/unite { };
|
||||
window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { };
|
||||
window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { };
|
||||
workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { };
|
||||
|
||||
nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks.";
|
||||
mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md";
|
||||
} // lib.optionalAttrs (config.allowAliases or false) {
|
||||
unite-shell = gnomeExtensions.unite; # added 2021-01-19
|
||||
};
|
||||
|
||||
gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { };
|
||||
|
|
@ -29150,7 +29166,7 @@ in
|
|||
|
||||
ssh-audit = callPackage ../tools/security/ssh-audit { };
|
||||
|
||||
autocpu-freq = callPackage ../tools/system/autocpu-freq { };
|
||||
auto-cpufreq = callPackage ../tools/system/auto-cpufreq { };
|
||||
|
||||
thermald = callPackage ../tools/system/thermald { };
|
||||
|
||||
|
|
|
|||
|
|
@ -281,6 +281,8 @@ let
|
|||
|
||||
eigen = callPackage ../development/ocaml-modules/eigen { };
|
||||
|
||||
either = callPackage ../development/ocaml-modules/either { };
|
||||
|
||||
elina = callPackage ../development/ocaml-modules/elina { };
|
||||
|
||||
eliom = callPackage ../development/ocaml-modules/eliom { };
|
||||
|
|
@ -883,6 +885,8 @@ let
|
|||
|
||||
resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { };
|
||||
|
||||
repr = callPackage ../development/ocaml-modules/repr { };
|
||||
|
||||
result = callPackage ../development/ocaml-modules/ocaml-result { };
|
||||
|
||||
secp256k1 = callPackage ../development/ocaml-modules/secp256k1 {
|
||||
|
|
@ -967,6 +971,8 @@ let
|
|||
ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix {
|
||||
};
|
||||
|
||||
ppx_repr = callPackage ../development/ocaml-modules/repr/ppx.nix { };
|
||||
|
||||
ppx_tools =
|
||||
if lib.versionAtLeast ocaml.version "4.02"
|
||||
then callPackage ../development/ocaml-modules/ppx_tools {}
|
||||
|
|
|
|||
|
|
@ -162,6 +162,10 @@ in {
|
|||
|
||||
actdiag = callPackage ../development/python-modules/actdiag { };
|
||||
|
||||
adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { };
|
||||
|
||||
adafruit-pureio = callPackage ../development/python-modules/adafruit-pureio { };
|
||||
|
||||
adal = callPackage ../development/python-modules/adal { };
|
||||
|
||||
adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { };
|
||||
|
|
@ -921,6 +925,8 @@ in {
|
|||
|
||||
binaryornot = callPackage ../development/python-modules/binaryornot { };
|
||||
|
||||
binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { };
|
||||
|
||||
binwalk = callPackage ../development/python-modules/binwalk {
|
||||
pyqtgraph = null;
|
||||
matplotlib = null;
|
||||
|
|
@ -2384,6 +2390,8 @@ in {
|
|||
|
||||
forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { };
|
||||
|
||||
fortiosapi = callPackage ../development/python-modules/fortiosapi { };
|
||||
|
||||
FormEncode = callPackage ../development/python-modules/FormEncode { };
|
||||
|
||||
foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; };
|
||||
|
|
@ -2504,6 +2512,8 @@ in {
|
|||
|
||||
geojson = callPackage ../development/python-modules/geojson { };
|
||||
|
||||
geojson-client = callPackage ../development/python-modules/geojson-client { };
|
||||
|
||||
geopandas = callPackage ../development/python-modules/geopandas { };
|
||||
|
||||
geopy = if isPy3k then
|
||||
|
|
@ -2861,6 +2871,8 @@ in {
|
|||
|
||||
hatasmota = callPackage ../development/python-modules/hatasmota { };
|
||||
|
||||
haversine = callPackage ../development/python-modules/haversine { };
|
||||
|
||||
hawkauthlib = callPackage ../development/python-modules/hawkauthlib { };
|
||||
|
||||
hbmqtt = callPackage ../development/python-modules/hbmqtt { };
|
||||
|
|
@ -7109,6 +7121,8 @@ in {
|
|||
|
||||
sip = callPackage ../development/python-modules/sip { };
|
||||
|
||||
sip_5 = callPackage ../development/python-modules/sip/5.x.nix { };
|
||||
|
||||
sipsimple = callPackage ../development/python-modules/sipsimple { };
|
||||
|
||||
six = callPackage ../development/python-modules/six { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue