Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
b4569f7a81
@ -7377,6 +7377,12 @@
|
||||
githubId = 7610974;
|
||||
name = "Jason Miller";
|
||||
};
|
||||
milogert = {
|
||||
email = "milo@milogert.com";
|
||||
github = "milogert";
|
||||
githubId = 5378535;
|
||||
name = "Milo Gertjejansen";
|
||||
};
|
||||
miltador = {
|
||||
email = "miltador@yandex.ua";
|
||||
name = "Vasiliy Solovey";
|
||||
|
||||
@ -13,6 +13,8 @@ in
|
||||
services.varnish = {
|
||||
enable = mkEnableOption "Varnish Server";
|
||||
|
||||
enableConfigCheck = mkEnableOption "checking the config during build time" // { default = true; };
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.varnish;
|
||||
@ -96,11 +98,10 @@ in
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
# check .vcl syntax at compile time (e.g. before nixops deployment)
|
||||
system.extraDependencies = [
|
||||
(pkgs.stdenv.mkDerivation {
|
||||
name = "check-varnish-syntax";
|
||||
buildCommand = "${cfg.package}/sbin/varnishd -C ${commandLine} 2> $out || (cat $out; exit 1)";
|
||||
})
|
||||
system.extraDependencies = mkIf cfg.enableConfigCheck [
|
||||
(pkgs.runCommand "check-varnish-syntax" {} ''
|
||||
${cfg.package}/bin/varnishd -C ${commandLine} 2> $out || (cat $out; exit 1)
|
||||
'')
|
||||
];
|
||||
|
||||
users.users.varnish = {
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
, libsecret
|
||||
, libhandy
|
||||
, wrapGAppsHook
|
||||
, libgpgerror
|
||||
, libgpg-error
|
||||
, json-glib
|
||||
, duplicity
|
||||
}:
|
||||
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
libsecret
|
||||
libhandy
|
||||
libgpgerror
|
||||
libgpg-error
|
||||
json-glib
|
||||
];
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, qtmacextras
|
||||
, monero, miniupnpc, unbound, readline
|
||||
, boost, libunwind, libsodium, pcsclite
|
||||
, randomx, zeromq, libgcrypt, libgpgerror
|
||||
, randomx, zeromq, libgcrypt, libgpg-error
|
||||
, hidapi, rapidjson, quirc
|
||||
, trezorSupport ? true, libusb1, protobuf, python3
|
||||
}:
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
qtxmlpatterns
|
||||
monero miniupnpc unbound readline
|
||||
randomx libgcrypt libgpgerror
|
||||
randomx libgcrypt libgpg-error
|
||||
boost libunwind libsodium pcsclite
|
||||
zeromq hidapi rapidjson quirc
|
||||
] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk2, atk, pango, freetype, fontconfig
|
||||
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
|
||||
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr
|
||||
, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }:
|
||||
|
||||
let
|
||||
packages = [
|
||||
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
|
||||
fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr nss
|
||||
fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss
|
||||
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
|
||||
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
|
||||
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
|
||||
pname = "zcash";
|
||||
version = "4.5.0";
|
||||
version = "4.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zcash";
|
||||
repo = "zcash";
|
||||
rev = "v${version}";
|
||||
sha256 = "0zn6ms2c4mh64cckjg88v0byy2ck116z5g4y82hh34mz3r11d9mn";
|
||||
sha256 = "0kyk3hv1y13b3vwg9kjcrpvz9v3l8lp0ikj977nykd5ms8b1rifa";
|
||||
};
|
||||
|
||||
cargoSha256 = "16il7napj7ryxsap6icvdpvagm9mvgz2mpshny9wn56y60qaymd0";
|
||||
cargoSha256 = "1mwprsg74xv6qlxf00w7xapnkisb1aid9hkyr8r90zcwdcy8783r";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ];
|
||||
buildInputs = [ boost175 libevent libsodium utf8cpp ]
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig
|
||||
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
|
||||
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr
|
||||
, gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk
|
||||
, at-spi2-core, libdbusmenu, libdrm, mesa
|
||||
}:
|
||||
@ -7,7 +7,7 @@
|
||||
let
|
||||
packages = [
|
||||
stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3
|
||||
fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr gconf nss
|
||||
fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr gconf nss
|
||||
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
|
||||
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
|
||||
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
|
||||
|
||||
@ -365,6 +365,36 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
boxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "boxy";
|
||||
ename = "boxy";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/boxy-1.0.2.tar";
|
||||
sha256 = "07m832kn4d6njfz21qfmh12gzd35d17v29pqlxfq9v03cazww4lr";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/boxy.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
boxy-headlines = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "boxy-headlines";
|
||||
ename = "boxy-headlines";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/boxy-headlines-1.0.2.tar";
|
||||
sha256 = "1j8j2vc318mb4i116qs9zj6cvkiy1fips09mkzj6lqr25qk5fi31";
|
||||
};
|
||||
packageRequires = [ boxy emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/boxy-headlines.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
brief = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "brief";
|
||||
@ -711,10 +741,10 @@
|
||||
elpaBuild {
|
||||
pname = "crdt";
|
||||
ename = "crdt";
|
||||
version = "0.2.5";
|
||||
version = "0.2.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/crdt-0.2.5.tar";
|
||||
sha256 = "092f82kq78c9gih6xri4n3ma5ixw9c8mx12i00c174g0v041r6sp";
|
||||
url = "https://elpa.gnu.org/packages/crdt-0.2.7.tar";
|
||||
sha256 = "0f6v937zbxj4kci07dv0a1h4q1ak0qabkjq2j258ydxyivvqyvsw";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1056,10 +1086,10 @@
|
||||
elpaBuild {
|
||||
pname = "ebdb";
|
||||
ename = "ebdb";
|
||||
version = "0.8.4";
|
||||
version = "0.8.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.8.4.tar";
|
||||
sha256 = "0n811af83fqpzq9513gf240gnz7qkwrjw07qs4sra4069q0pwnjr";
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.8.5.tar";
|
||||
sha256 = "1p2chzj5hnaiqhammvdp82ck5pi6h1rl9r782zaqxrhrqsp3vg09";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
@ -1116,10 +1146,10 @@
|
||||
elpaBuild {
|
||||
pname = "eev";
|
||||
ename = "eev";
|
||||
version = "20210925";
|
||||
version = "20211006";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eev-20210925.tar";
|
||||
sha256 = "0kwmjspmvz9lfm6y0kls9v2l55ccni0gviv9jlzxiwynrc01rz4y";
|
||||
url = "https://elpa.gnu.org/packages/eev-20211006.tar";
|
||||
sha256 = "08z9q5y46fqm7r1gwiv0ir2hcybwfrvh0b7pxsrppjs1gvclyazn";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2407,10 +2437,10 @@
|
||||
elpaBuild {
|
||||
pname = "modus-themes";
|
||||
ename = "modus-themes";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-1.5.0.tar";
|
||||
sha256 = "0y5a7g66iiai20fvc6qff3ki792bzca87zxbmxl8hpks4a6znc80";
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-1.6.0.tar";
|
||||
sha256 = "03ahavpvd57z7cw1n46k6lq5335p1ld7kkjcylyx5fvq1rc1jw44";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2437,6 +2467,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
multi-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "multi-mode";
|
||||
ename = "multi-mode";
|
||||
version = "1.14";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/multi-mode-1.14.tar";
|
||||
sha256 = "0aslndqr0277ai0iwywbmj07vmz88vpmc0mgydcy4li8fkn8h066";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/multi-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
multishell = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "multishell";
|
||||
@ -2532,6 +2577,36 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
nano-modeline = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "nano-modeline";
|
||||
ename = "nano-modeline";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/nano-modeline-0.1.tar";
|
||||
sha256 = "10hnxgjp56dqydf39mbn9zmwwvnwzi89lwnam5k3x6d6p2cnfgcx";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/nano-modeline.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
nano-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "nano-theme";
|
||||
ename = "nano-theme";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/nano-theme-0.2.tar";
|
||||
sha256 = "0kcirnl1fg9kvavw8aq9l16jv4rrxv5w62i7wrsjn7np697sm0s6";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/nano-theme.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
nhexl-mode = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, emacs
|
||||
@ -2690,10 +2765,10 @@
|
||||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "9.4.6";
|
||||
version = "9.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-9.4.6.tar";
|
||||
sha256 = "1k49ymsi77366as2wi4kzv2f1xnbwpb47iw7iw07yxwlhmm7vskq";
|
||||
url = "https://elpa.gnu.org/packages/org-9.5.tar";
|
||||
sha256 = "16cflg5nms5nb8w86nvwkg49zkl0rvdhigkf4xpvbs0v7zb5y3ky";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2716,6 +2791,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "org-real";
|
||||
ename = "org-real";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-real-1.0.1.tar";
|
||||
sha256 = "0rklzp32v30ndyqli3fjcsqvvpiz3klsz26b7zn2bai2ldx6016s";
|
||||
};
|
||||
packageRequires = [ boxy emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/org-real.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-translate = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
|
||||
elpaBuild {
|
||||
pname = "org-translate";
|
||||
@ -2930,10 +3020,10 @@
|
||||
elpaBuild {
|
||||
pname = "project";
|
||||
ename = "project";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/project-0.7.1.tar";
|
||||
sha256 = "1ip8s924n50mmh068p42zi0ylvv79a2pi9sji1c2pqj2q19d7jr6";
|
||||
url = "https://elpa.gnu.org/packages/project-0.8.0.tar";
|
||||
sha256 = "05q2zr661bn2h6pdvyv3apdajfxnsx0rb0n5np8cg98a7gw4zyxd";
|
||||
};
|
||||
packageRequires = [ emacs xref ];
|
||||
meta = {
|
||||
@ -3441,10 +3531,10 @@
|
||||
elpaBuild {
|
||||
pname = "setup";
|
||||
ename = "setup";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/setup-1.0.1.tar";
|
||||
sha256 = "1n390hiv5a8ij584r24cpbahj2sb12wjh0l3kzhccdxnxskrzgmh";
|
||||
url = "https://elpa.gnu.org/packages/setup-1.1.0.tar";
|
||||
sha256 = "1xbh4fix6n47avv57gz48zf4ad1l6mfj30qr5lwvk6pz5gpnjg7i";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3752,6 +3842,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
svg-lib = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "svg-lib";
|
||||
ename = "svg-lib";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/svg-lib-0.2.tar";
|
||||
sha256 = "0361w1paqrgqlv8wj5vf9ifssddrk2bwlarp2c2wzlxks3ahdf2x";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/svg-lib.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
swiper = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }:
|
||||
elpaBuild {
|
||||
pname = "swiper";
|
||||
@ -3880,10 +3985,10 @@
|
||||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.5.1.2";
|
||||
version = "2.5.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.1.2.tar";
|
||||
sha256 = "0p8m8prxrvrr455ahb626c1dry04m80y017h16ngr4i5ais0r85g";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.1.3.tar";
|
||||
sha256 = "1qcwdavfrbw8yyfy5rbzbcfyqavqbz13jncahkqlgwbkqvmgh7y5";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,12 +1,12 @@
|
||||
{ stdenv, lib, fetchurl, zlib, glib, alsa-lib, makeDesktopItem
|
||||
, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf
|
||||
, cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify
|
||||
, cairo, cups, expat, libgpg-error, nspr, gnome2, nss, xorg, systemd, libnotify
|
||||
}:
|
||||
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss
|
||||
fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr gnome2.GConf
|
||||
fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr gnome2.GConf
|
||||
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
|
||||
xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr
|
||||
xorg.libXcursor
|
||||
|
||||
@ -87,7 +87,7 @@ rec {
|
||||
nvim_with_plug = neovim.override {
|
||||
extraName = "-with-plug";
|
||||
configure.plug.plugins = with pkgs.vimPlugins; [
|
||||
base16-vim
|
||||
(base16-vim.overrideAttrs(old: { pname = old.pname + "-unique-for-tests-please-dont-use"; }))
|
||||
];
|
||||
configure.customRC = ''
|
||||
color base16-tomorrow-night
|
||||
@ -97,7 +97,7 @@ rec {
|
||||
|
||||
run_nvim_with_plug = runTest nvim_with_plug ''
|
||||
export HOME=$TMPDIR
|
||||
${nvim_with_plug}/bin/nvim -i NONE -c 'color base16-tomorrow-night' +quit!
|
||||
${nvim_with_plug}/bin/nvim -i NONE -c 'color base16-tomorrow-night' +quit! -e
|
||||
'';
|
||||
|
||||
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "456";
|
||||
version = "457";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r5EeHWqhJQMvImxB7IVV8MAoW8qIVYpuSN1uOYCTlHY=";
|
||||
sha256 = "sha256-ZXBVJc+9dFzi75JYl3U3ic0MKolWMsdR3UkLe5EOzsw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,32 +1,30 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
, gtk3
|
||||
, stdenv
|
||||
, rust
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "effitask";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanpii";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "09bffxdp43s8b1rpmsgqr2kyz3i4jbd2yrwbxw21fj3sf3mwb9ig";
|
||||
sha256 = "sha256-nZn+mINIqAnaCKZCiywG8/BOPx6TlSe0rKV/8gcW/B4=";
|
||||
};
|
||||
|
||||
# workaround for missing Cargo.lock file https://github.com/sanpii/effitask/issues/48
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
|
||||
cargoSha256 = "1a80kf95kr94l6jzxdj4i09x1342x358fqjy6119qjg3q3bj0y3p";
|
||||
|
||||
buildInputs = [ openssl gtk3 ];
|
||||
cargoSha256 = "sha256-aCjZRJNsxx75ghK0N95Q9w0h5H5mW9/77j/fumDrvyM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl gtk3 ];
|
||||
|
||||
# default installPhase don't install assets
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, gpgme, libgpgerror, libassuan }:
|
||||
{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, gpgme, libgpg-error, libassuan }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gpa-0.10.0";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ intltool pkg-config ];
|
||||
buildInputs = [ gtk2 gpgme libgpgerror libassuan ];
|
||||
buildInputs = [ gtk2 gpgme libgpg-error libassuan ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphical user interface for the GnuPG";
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
, libXtst
|
||||
, libargon2
|
||||
, libgcrypt
|
||||
, libgpgerror
|
||||
, libgpg-error
|
||||
, libsodium
|
||||
, libyubikey
|
||||
, pkg-config
|
||||
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
||||
libXtst
|
||||
libargon2
|
||||
libgcrypt
|
||||
libgpgerror
|
||||
libgpg-error
|
||||
libsodium
|
||||
libyubikey
|
||||
qrencode
|
||||
|
||||
26
pkgs/applications/misc/liberasurecode/default.nix
Normal file
26
pkgs/applications/misc/liberasurecode/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liberasurecode";
|
||||
version = "1.6.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openstack";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-qV7DL/7zrwrYOaPj6iHnChGA6KHFwYKjeaMnrGrTPrQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Erasure Code API library written in C with pluggable Erasure Code backends";
|
||||
homepage = "https://github.com/openstack/liberasurecode";
|
||||
license = licenses.bsd2;
|
||||
maintainers = teams.openstack.members;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "skytemple";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "13vvsp47frgq5c2wfllkg4lmsy5vxl53j5rw9c84d5xix5bisk1n";
|
||||
sha256 = "1sx2rib0la3mifvh84ia3jnnq4qw9jxc13vxyidsdkp6x82nbvcg";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -88,7 +88,7 @@ let
|
||||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
# Upstream source
|
||||
version = "10.5.6";
|
||||
version = "10.5.8";
|
||||
|
||||
lang = "en-US";
|
||||
|
||||
@ -98,7 +98,7 @@ let
|
||||
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "1hxjixriah08c65nngjdp1blbji1vlnhqkphp8f96hy34hk4dpiw";
|
||||
sha256 = "1bn31r3cayv79pjw5ndji5qzxy552cb2mcavij3nwchsmnfqp4z1";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
@ -106,7 +106,7 @@ let
|
||||
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "018kwwbbn02drvdj0bjkcyhsnbx97wnmd3lxkrx0kc9dw1s4r418";
|
||||
sha256 = "1j3xxflwwjwxfayixj75dn6a2ka751s53f60dpkfzwpp5rfwl572";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.21.3-k3s1" }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.22.2-k3s2" }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kube3d";
|
||||
version = "4.4.8";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = "k3d";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PdbAkiua9AdcNDCpu4UILsmAz0nb4nLjahYomGSHqnc=";
|
||||
sha256 = "1pkrcjr78xxw3idmyzpkbx0rp20972dl44bzwkkp06milrzsq27i";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
@ -18,7 +18,7 @@ buildGoModule rec {
|
||||
excludedPackages = "\\(tools\\|docgen\\)";
|
||||
|
||||
ldflags =
|
||||
let t = "github.com/rancher/k3d/v4/version"; in
|
||||
let t = "github.com/rancher/k3d/v5/version"; in
|
||||
[ "-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.K3sVersion=v${k3sVersion}" ];
|
||||
|
||||
doCheck = false;
|
||||
@ -34,7 +34,7 @@ buildGoModule rec {
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/k3d --help
|
||||
$out/bin/k3d version | grep "k3d version v${version}"
|
||||
$out/bin/k3d --version | grep -e "k3d version v${version}" -e "k3s version v${k3sVersion}"
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
, libgcrypt
|
||||
, libotr
|
||||
, html-tidy
|
||||
, libgpgerror
|
||||
, libgpg-error
|
||||
, libsignal-protocol-c
|
||||
, usrsctp
|
||||
|
||||
@ -76,7 +76,7 @@ mkDerivation rec {
|
||||
libgcrypt
|
||||
libotr
|
||||
html-tidy
|
||||
libgpgerror
|
||||
libgpg-error
|
||||
libsignal-protocol-c
|
||||
usrsctp
|
||||
] ++ lib.optionals voiceMessagesSupport [
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
{ lib, fetchurl, appimageTools }:
|
||||
|
||||
let
|
||||
pname = "tutanota-desktop";
|
||||
version = "3.88.4";
|
||||
name = "tutanota-desktop-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://mail.tutanota.com/desktop/tutanota-desktop-linux.AppImage";
|
||||
name = "tutanota-desktop-${version}.AppImage";
|
||||
sha256 = "sha256-MwvH6SGZwcvxAr5olklqKTF2p2pv8+F5qwpmwN3uZkc=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit name src; };
|
||||
|
||||
in appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${name} $out/bin/${pname}
|
||||
|
||||
install -m 444 -D ${appimageContents}/tutanota-desktop.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/tutanota-desktop.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tutanota official desktop client";
|
||||
homepage = "https://tutanota.com/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -55,7 +55,7 @@ let
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ lourkeur ];
|
||||
};
|
||||
stem' = stem.overrideAttrs (_: rec {
|
||||
stem' = stem.overridePythonAttrs (_: rec {
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
|
||||
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
|
||||
, gnutls, libgcrypt, libgpg-error, geoip, openssl, lua5, python3, libcap, glib
|
||||
, libssh, nghttp2, zlib, cmake, makeWrapper
|
||||
, withQt ? true, qt5 ? null
|
||||
, ApplicationServices, SystemConfiguration, gmp
|
||||
@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
|
||||
with lib;
|
||||
|
||||
let
|
||||
version = "3.4.8";
|
||||
version = "3.4.9";
|
||||
variant = if withQt then "qt" else "cli";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
|
||||
sha256 = "09fpvfj4m7glisj6p4zb8wylkrjkqqw69xnwnz4ah410zs6zm9sq";
|
||||
sha256 = "084nv4fbgpxsf6b6cfi6cinn8l3wsbn0g8lsd7p2aifjkf15wln6";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
@ -37,7 +37,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt
|
||||
libgpgerror gnutls geoip c-ares python3 glib zlib
|
||||
libgpg-error gnutls geoip c-ares python3 glib zlib
|
||||
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
|
||||
++ optionals stdenv.isLinux [ libcap libnl ]
|
||||
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lefthook";
|
||||
version = "0.7.6";
|
||||
version = "0.7.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
sha256 = "sha256-qCj6FsbzxnMISCITKFcIIYtqMiHzSNYNjlpgpE9S/Ss=";
|
||||
sha256 = "sha256-XyuXegCTJSW4uO6fEaRKq/jZnE+JbrxZw0kcDvhpsVo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Rp67FnFU27u85t02MIs7wZQoOa8oGsHVVPQ9OdIyTJg=";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
|
||||
, pkg-config, cmake, gnumake, yasm, python3Packages
|
||||
, libgcrypt, libgpgerror, libunistring
|
||||
, libgcrypt, libgpg-error, libunistring
|
||||
, boost, avahi, lame
|
||||
, gettext, pcre-cpp, yajl, fribidi, which
|
||||
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless
|
||||
@ -122,7 +122,7 @@ in stdenv.mkDerivation {
|
||||
sqlite libmysqlclient avahi lame
|
||||
curl bzip2 zip unzip glxinfo
|
||||
libcec libcec_platform dcadec libuuid
|
||||
libgcrypt libgpgerror libunistring
|
||||
libgcrypt libgpg-error libunistring
|
||||
libcrossguid libplist
|
||||
bluez giflib glib harfbuzz lcms2 libpthreadstubs
|
||||
ffmpeg flatbuffers fmt fstrcmp rapidjson
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, libarchive, perl, xorg, libdvdnav, libbluray
|
||||
, zlib, a52dec, libmad, faad2, ffmpeg, alsa-lib
|
||||
, pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska
|
||||
, libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp
|
||||
, libvorbis, libtheora, speex, lua5, libgcrypt, libgpg-error, libupnp
|
||||
, libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
|
||||
, mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
|
||||
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
# needing them
|
||||
buildInputs = [
|
||||
zlib a52dec libmad faad2 ffmpeg alsa-lib libdvdnav libdvdnav.libdvdread
|
||||
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
|
||||
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpg-error
|
||||
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
|
||||
systemd gnutls avahi libcddb SDL SDL_image libmtp taglib libarchive
|
||||
libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
|
||||
|
||||
@ -175,7 +175,7 @@ rec {
|
||||
|
||||
harfbuzz
|
||||
e2fsprogs
|
||||
libgpgerror
|
||||
libgpg-error
|
||||
keyutils.lib
|
||||
libjack2
|
||||
fribidi
|
||||
|
||||
@ -1,20 +1,17 @@
|
||||
{ lib, stdenv, fetchurl, unzip, cmake }:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="angelscript";
|
||||
version = "2.35.0";
|
||||
name="${baseName}-${version}";
|
||||
url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
|
||||
sha256 = "sha256-AQ3UXiPnNNRvWJHXDiaGB6EsuasSUD3aQvhC2dt+iFc=";
|
||||
};
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, unzip
|
||||
, cmake
|
||||
}:
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "angelscript";
|
||||
version = "2.35.1";
|
||||
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
url = "https://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
|
||||
sha256 = "12x12fs2bjkbh73n2w84wnqhg6xn6mnp6g79gbkwfl6gssv9c42w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip cmake ];
|
||||
@ -32,7 +29,6 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit (s) version;
|
||||
description = "Light-weight scripting library";
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
url http://www.angelcode.com/angelscript/downloads.html
|
||||
version_link '[.]zip$'
|
||||
version '.*_([0-9.]+)[.].*' '\1'
|
||||
do_overwrite () { do_overwrite_just_version ; }
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkg-config, gettext
|
||||
{ lib, stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpg-error, pkg-config, gettext
|
||||
, which
|
||||
|
||||
# GUI support
|
||||
@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext which ];
|
||||
|
||||
buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ];
|
||||
buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpg-error ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, libgpgerror, gobject-introspection }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, libgpg-error, gobject-introspection }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.6.23";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config gobject-introspection ];
|
||||
propagatedBuildInputs = [ glib zlib libgpgerror ];
|
||||
propagatedBuildInputs = [ glib zlib libgpg-error ];
|
||||
configureFlags = [ "--enable-introspection=yes" ];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
, autoreconfHook, libgpgerror, gnupg, pkg-config, glib, pth, libassuan
|
||||
, autoreconfHook, libgpg-error, gnupg, pkg-config, glib, pth, libassuan
|
||||
, file, which, ncurses
|
||||
, texinfo
|
||||
, buildPackages
|
||||
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
|
||||
|
||||
propagatedBuildInputs =
|
||||
[ libgpgerror glib libassuan pth ]
|
||||
[ libgpg-error glib libassuan pth ]
|
||||
++ lib.optional (qtbase != null) qtbase;
|
||||
|
||||
nativeBuildInputs = [ pkg-config gnupg texinfo autoreconfHook ]
|
||||
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [
|
||||
"--enable-fixed-path=${gnupg}/bin"
|
||||
"--with-libgpg-error-prefix=${libgpgerror.dev}"
|
||||
"--with-libgpg-error-prefix=${libgpg-error.dev}"
|
||||
"--with-libassuan-prefix=${libassuan.dev}"
|
||||
] ++ lib.optional pythonSupport "--enable-languages=python"
|
||||
# Tests will try to communicate with gpg-agent instance via a UNIX socket
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, bison, flex }:
|
||||
{ lib, stdenv, fetchurl, libgcrypt, libgpg-error, bison, flex }:
|
||||
|
||||
# library that allows libbluray to play AACS protected bluray disks
|
||||
# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d";
|
||||
};
|
||||
|
||||
buildInputs = [ libgcrypt libgpgerror ];
|
||||
buildInputs = [ libgcrypt libgpg-error ];
|
||||
|
||||
nativeBuildInputs = [ bison flex ];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ fetchurl, lib, stdenv, gettext, npth, libgpgerror, buildPackages }:
|
||||
{ fetchurl, lib, stdenv, gettext, npth, libgpg-error, buildPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libassuan";
|
||||
@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ npth gettext ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-libgpg-error-prefix=${libgpgerror.dev}"
|
||||
"--with-libgpg-error-prefix=${libgpg-error.dev}"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# Make sure includes are fixed for callers who don't use libassuan-config
|
||||
postInstall = ''
|
||||
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h
|
||||
sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' $dev/include/assuan.h
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, gettext }:
|
||||
{ lib, stdenv, fetchurl, libgcrypt, libgpg-error, gettext }:
|
||||
|
||||
# library that allows libbluray to play BDplus protected bluray disks
|
||||
# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
|
||||
};
|
||||
|
||||
buildInputs = [ libgcrypt libgpgerror gettext ];
|
||||
buildInputs = [ libgcrypt libgpg-error gettext ];
|
||||
|
||||
nativeBuildInputs = [ ];
|
||||
|
||||
|
||||
@ -13,9 +13,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config libtool ];
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
libpulseaudio libvorbis
|
||||
libtool # in buildInputs rather than nativeBuildInputs since libltdl is used (not libtool itself)
|
||||
] ++ (with gst_all_1; [ gstreamer gst-plugins-base ])
|
||||
++ lib.optional (gtkSupport == "gtk2") gtk2-x11
|
||||
++ lib.optional (gtkSupport == "gtk3") gtk3-x11
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchpatch, fetchurl, libgpgerror, enableCapabilities ? false, libcap }:
|
||||
{ lib, stdenv, fetchpatch, fetchurl, libgpg-error, enableCapabilities ? false, libcap }:
|
||||
|
||||
assert enableCapabilities -> stdenv.isLinux;
|
||||
|
||||
@ -19,13 +19,13 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ libgpgerror ]
|
||||
[ libgpg-error ]
|
||||
++ lib.optional enableCapabilities libcap;
|
||||
|
||||
# Make sure libraries are correct for .pc and .la files
|
||||
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
|
||||
postInstall = ''
|
||||
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/gcrypt.h
|
||||
sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' $out/include/gcrypt.h
|
||||
'' + lib.optionalString enableCapabilities ''
|
||||
sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
|
||||
'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap, buildPackages }:
|
||||
{ lib, stdenv, fetchurl, gettext, libgpg-error, enableCapabilities ? false, libcap, buildPackages }:
|
||||
|
||||
assert enableCapabilities -> stdenv.isLinux;
|
||||
|
||||
@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
buildInputs = [ libgpgerror ]
|
||||
buildInputs = [ libgpg-error ]
|
||||
++ lib.optional stdenv.isDarwin gettext
|
||||
++ lib.optional enableCapabilities libcap;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ]
|
||||
configureFlags = [ "--with-libgpg-error-prefix=${libgpg-error.dev}" ]
|
||||
++ lib.optional (stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--disable-asm"; # for darwin see https://dev.gnupg.org/T5157
|
||||
|
||||
# Necessary to generate correct assembly when compiling for aarch32 on
|
||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
# Make sure libraries are correct for .pc and .la files
|
||||
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
|
||||
postFixup = ''
|
||||
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h"
|
||||
sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h"
|
||||
'' + lib.optionalString enableCapabilities ''
|
||||
sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
|
||||
'';
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc
|
||||
, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome, buildPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgrss";
|
||||
@ -20,10 +22,24 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
|
||||
buildInputs = [ glib libxml2 libsoup ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
vala
|
||||
gobject-introspection
|
||||
gtk-doc
|
||||
docbook_xsl
|
||||
docbook_xml_dtd_412
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
libxml2
|
||||
libsoup
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
|
||||
] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
|
||||
"--enable-gtk-doc"
|
||||
];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ buildPackages, lib, stdenv, fetchurl, gettext, libgpgerror }:
|
||||
{ buildPackages, lib, stdenv, fetchurl, gettext, libgpg-error }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libksba-1.5.1";
|
||||
@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
|
||||
buildInputs = [ gettext ];
|
||||
propagatedBuildInputs = [ libgpgerror ];
|
||||
propagatedBuildInputs = [ libgpg-error ];
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ];
|
||||
configureFlags = [ "--with-libgpg-error-prefix=${libgpg-error.dev}" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $dev/bin
|
||||
|
||||
46
pkgs/development/libraries/libopenglrecorder/default.nix
Normal file
46
pkgs/development/libraries/libopenglrecorder/default.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, libjpeg
|
||||
, libvpx
|
||||
, openh264
|
||||
, withPulse ? stdenv.hostPlatform.isLinux
|
||||
, libpulseaudio
|
||||
, libvorbis
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libopenglrecorder";
|
||||
version = "unstable-2020-08-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Benau";
|
||||
repo = "libopenglrecorder";
|
||||
rev = "c1b81ce26e62fae1aaa086b5cd337cb12361ea3d";
|
||||
sha256 = "13s2d7qs8z4w0gb3hx03n97xmwl07d4s473m4gw90qcvmz217kiz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
libvpx
|
||||
openh264
|
||||
] ++ lib.optionals withPulse [
|
||||
libpulseaudio
|
||||
libvorbis
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library allowing Optional async readback OpenGL frame buffer with optional audio recording";
|
||||
homepage = "https://github.com/Benau/libopenglrecorder";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
platforms = with platforms; windows ++ linux;
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }:
|
||||
|
||||
with lib;
|
||||
{ lib, stdenv, fetchurl, gettext, libgpg-error, libgcrypt, libksba, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ntbtls";
|
||||
@ -13,14 +11,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
|
||||
buildInputs = [ libgcrypt libgpgerror libksba zlib ]
|
||||
buildInputs = [ libgcrypt libgpg-error libksba zlib ]
|
||||
++ lib.optional stdenv.isDarwin gettext;
|
||||
|
||||
postInstall = ''
|
||||
moveToOutput "bin/ntbtls-config" $dev
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A tiny TLS 1.2 only implementation";
|
||||
homepage = "https://www.gnupg.org/software/ntbtls/";
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
@ -2,20 +2,18 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "utf8cpp";
|
||||
version = "3.1.2";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nemtrif";
|
||||
repo = "utfcpp";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-l5sneFsuvPDIRni2x+aR9fmQ9bzXNnIiP9EzZ63sNtg=";
|
||||
sha256 = "0gsbwif97i025bxgyax4fbf6v9z44zrca4s6wwd8x36ac8qzjppf";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=None"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
"-DINSTALL_GTEST=OFF"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -25,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/nemtrif/utfcpp";
|
||||
description = "UTF-8 with C++ in a Portable Way";
|
||||
license = licenses.free;
|
||||
license = licenses.boost;
|
||||
maintainers = with maintainers; [ jobojeha ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -1,17 +1,19 @@
|
||||
{ lib, stdenv, fetchurl, ocaml, findlib, ncurses }:
|
||||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml-curses";
|
||||
version = "1.0.4";
|
||||
version = "1.0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ocaml.phauna.org/distfiles/ocaml-curses-${version}.ogunden1.tar.gz";
|
||||
sha256 = "08wq1r93lincdfzlriyc5nl2p4q7ca4h6ygzgp1nhkgd93pgk9v2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbacarella";
|
||||
repo = "curses";
|
||||
rev = version;
|
||||
sha256 = "0yy3wf8i7jgvzdc40bni7mvpkvclq97cgb5fw265mrjj0iqpkqpd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ncurses ];
|
||||
|
||||
buildInputs = [ ocaml findlib ];
|
||||
nativeBuildInputs = [ ocaml findlib ];
|
||||
|
||||
# Fix build for recent ncurses versions
|
||||
NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1";
|
||||
@ -26,8 +28,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "OCaml Bindings to curses/ncurses";
|
||||
homepage = "https://opam.ocaml.org/packages/curses/curses.1.0.4/";
|
||||
license = licenses.gpl2;
|
||||
homepage = "https://github.com/mbacarella/curses";
|
||||
license = licenses.lgpl21Plus;
|
||||
changelog = "https://github.com/mbacarella/curses/raw/${version}/CHANGES";
|
||||
maintainers = [ maintainers.volth ];
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
};
|
||||
|
||||
@ -21,8 +21,8 @@
|
||||
, codecov
|
||||
, coverage
|
||||
, qt5
|
||||
# This is usually used as a library, and it'd be a shame to force the gui
|
||||
# libraries to the closure if gui is not desired.
|
||||
# This is usually used as a library, and it'd be a shame to force the GUI
|
||||
# libraries to the closure if GUI is not desired.
|
||||
, withGui ? false
|
||||
# Tests take a very long time, and currently fail, but next release' tests
|
||||
# shouldn't fail
|
||||
@ -30,53 +30,52 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.3.5";
|
||||
pname = "androguard";
|
||||
version = "3.4.0a1";
|
||||
|
||||
# No tests in pypi tarball
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
owner = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0zc8m1xnkmhz2v12ddn47q0c01p3sbna2v5npfxhcp88szswlr9y";
|
||||
sha256 = "1aparxiq11y0hbvkayp92w684nyxyyx7mi0n1x6x51g5z6c58vmy";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
future
|
||||
networkx
|
||||
pygments
|
||||
lxml
|
||||
colorama
|
||||
matplotlib
|
||||
asn1crypto
|
||||
click
|
||||
pydot
|
||||
colorama
|
||||
future
|
||||
ipython
|
||||
lxml
|
||||
matplotlib
|
||||
networkx
|
||||
pydot
|
||||
pygments
|
||||
] ++ lib.optionals withGui [
|
||||
pyqt5
|
||||
pyperclip
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pyqt5
|
||||
pyperclip
|
||||
nose
|
||||
nose-timer
|
||||
codecov
|
||||
coverage
|
||||
mock
|
||||
nose
|
||||
nose-timer
|
||||
pyperclip
|
||||
pyqt5
|
||||
python_magic
|
||||
];
|
||||
inherit doCheck;
|
||||
|
||||
nativeBuildInputs = lib.optionals withGui [ qt5.wrapQtAppsHook ];
|
||||
nativeBuildInputs = lib.optionals withGui [
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
# If it won't be verbose, you'll see nothing going on for a long time.
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
nosetests --verbosity=3
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
@ -84,10 +83,10 @@ buildPythonPackage rec {
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Tool and python library to interact with Android Files";
|
||||
meta = with lib; {
|
||||
description = "Tool and Python library to interact with Android Files";
|
||||
homepage = "https://github.com/androguard/androguard";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.pmiddend ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ pmiddend ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonAtLeast
|
||||
@ -24,11 +24,11 @@ buildPythonPackage rec {
|
||||
${python.interpreter} tests/test.py default
|
||||
'';
|
||||
|
||||
doCheck = (!isPy38); # hmac functionality has changed
|
||||
doCheck = !isPy38; # hmac functionality has changed
|
||||
checkInputs = [ nose mock ];
|
||||
propagatedBuildInputs = [ requests httpretty ];
|
||||
|
||||
meta = with pkgs.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/boto/boto";
|
||||
license = licenses.mit;
|
||||
description = "Python interface to Amazon Web Services";
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deemix";
|
||||
version = "3.5.3";
|
||||
version = "3.5.5";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "36dc6279f547cc0947daceb568e2b5ac1e274655f642c133e2700c22892163ce";
|
||||
sha256 = "sha256-qattUKdGr9P2al5cibG0CPJNmVCJjgE+hucOtl7pAhE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-py";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1b5664835975fda7a2519ba4b411cc5f2e4113e614ee140389b61844906d0c05";
|
||||
sha256 = "sha256-JceyMBQFLD3fRPb9nJlGOSN7iACuJG8dmlFfOhhsYKc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-python";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "browniebroke";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0gkPwIz+nZJjxfucy71D0A5CFkhQaW32UH5t1DkuvEs=";
|
||||
sha256 = "sha256-4Jjkhlv3wK4j2uU8dT11WYuBttlFtg+/ZBrc57UVeao=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-storages";
|
||||
version = "1.11.1";
|
||||
version = "1.12";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c823dbf56c9e35b0999a13d7e05062b837bae36c518a40255d522fbe3750fbb4";
|
||||
sha256 = "b3fdb4337b1e54b8a23fe41c62d91648e26249f9fc00e882d1d09e16207aa204";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "3.2.7";
|
||||
version = "3.2.8";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "95b318319d6997bac3595517101ad9cc83fe5672ac498ba48d1a410f47afecd2";
|
||||
sha256 = "f6d2c4069c9b9bfac03bedff927ea1f9e0d29e34525cec8a68fd28eb2a8df7af";
|
||||
};
|
||||
|
||||
patches = lib.optional withGdal
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gdown";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8025f3685faa1bed29adc8b778de305935b2cda2d691b35fb47957e1140c9f32";
|
||||
sha256 = "sha256-XSYc3mCsFW+x6aZFDNtUE9lHv9vPUvkdsqmbtFX7aQw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ filelock requests tqdm setuptools six ];
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-datatransfer";
|
||||
version = "3.3.2";
|
||||
version = "3.3.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fcb71ebe5c5b232d24fe7d666b65709e4fc8db43263c8182e5ed8e5a52abefec";
|
||||
sha256 = "e0beee002f435236bf8026872ce34bd03c9d4f91467c79fc5e7cde591bd15596";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipyvue";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "61c21e698d99ec9dc22a155e8c00d50add99a2976b48cdfeab6bc010d2414f8b";
|
||||
sha256 = "6cc15428bfcd5c7daae73c45c776b34056fe4d885a34192fb93efc80d6b9753f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ipywidgets ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jaraco.stream";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "86c57fedffd4d5a4b18817f99ddf62ac8ed0a1bc31a1c41b9a88df9c6bb56e0b";
|
||||
sha256 = "3af4b0441090ee65bd6dde930d29f93f50c4a2fe6048e2a9d288285f5e4dc441";
|
||||
};
|
||||
|
||||
pythonNamespaces = [ "jaraco" ];
|
||||
|
||||
@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab";
|
||||
version = "3.1.14";
|
||||
version = "3.1.17";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "13174cb6076dd5da6f1b85725ccfcc9518d8f98e86b8b644fc89b1dfaeda63a9";
|
||||
sha256 = "7e829cedce4fec676fb9d83850805df9e563b3ca7f20f70bd2ea177a462b7a78";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jupyter-packaging ];
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langcodes";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
disabled = pythonOlder "3.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "38e06cd104847be351b003a9857e79f108fb94b49dd2e84dbab905fd3777530a";
|
||||
sha256 = "779a6da5036f87b6b56c180b2782ab111ddd6aa9157670a9b918402b0e07cd93";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ marisa-trie ];
|
||||
|
||||
@ -1,34 +1,42 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, six
|
||||
, pytest-runner
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "paste";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Paste";
|
||||
inherit version;
|
||||
sha256 = "17f3zppjjprs2jnklvzkz23mh9jdn6b1f445mvrjdm4ivi15q28v";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdent";
|
||||
repo = "paste";
|
||||
rev = version;
|
||||
sha256 = "sha256-yaOxbfQ8rdViepxhdF0UzlelC/ozdsP1lOdU5w4OPEQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
checkInputs = [ pytest-runner pytest ];
|
||||
|
||||
# Certain tests require network
|
||||
checkPhase = ''
|
||||
py.test -k "not test_cgiapp and not test_proxy"
|
||||
postPatch = ''
|
||||
patchShebangs tests/cgiapp_data/
|
||||
'';
|
||||
|
||||
# propagatedBuildInputs = [ six ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTests = [
|
||||
# broken test
|
||||
"test_file_cache"
|
||||
# requires network connection
|
||||
"test_proxy_to_website"
|
||||
];
|
||||
|
||||
pythonNamespaces = [ "paste" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools for using a Web Server Gateway Interface stack";
|
||||
homepage = "http://pythonpaste.org/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,31 +1,26 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest-runner
|
||||
, pytest
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pastedeploy";
|
||||
version = "2.1.1";
|
||||
pname = "PasteDeploy";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6dead6ab9823a85d585ef27f878bc647f787edb9ca8da0716aa9f1261b464817";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Pylons";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-9/8aM/G/EdapCZJlx0ZPzNbmw2uYjA1zGbNWJAWoeCU=";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest-runner ];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
# no tests in PyPI tarball
|
||||
# should be included with versions > 2.0.1
|
||||
doCheck = false;
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Load, configure, and compose WSGI applications and servers";
|
||||
homepage = "http://pythonpaste.org/deploy/";
|
||||
homepage = "https://github.com/Pylons/pastedeploy";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.openstack.members;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -4,28 +4,33 @@
|
||||
, nose
|
||||
, six
|
||||
, paste
|
||||
, PasteDeploy
|
||||
, cheetah
|
||||
, pastedeploy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pastescript";
|
||||
version = "3.2.1";
|
||||
pname = "PasteScript";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
pname = "PasteScript";
|
||||
inherit version;
|
||||
sha256 = "f3ef819785e1b284e6fc108a131bce7e740b18255d96cd2e99ee3f00fd452468";
|
||||
};
|
||||
|
||||
buildInputs = [ nose ];
|
||||
propagatedBuildInputs = [ six paste PasteDeploy cheetah ];
|
||||
propagatedBuildInputs = [
|
||||
paste
|
||||
pastedeploy
|
||||
six
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
checkInputs = [ nose ];
|
||||
|
||||
pythonNamespaces = [ "paste" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pluggable command-line frontend, including commands to setup package file layouts";
|
||||
homepage = "https://github.com/cdent/pastescript/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
65
pkgs/development/python-modules/patrowl4py/default.nix
Normal file
65
pkgs/development/python-modules/patrowl4py/default.nix
Normal file
@ -0,0 +1,65 @@
|
||||
{ lib
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, certifi
|
||||
, chardet
|
||||
, fetchFromGitHub
|
||||
, idna
|
||||
, iniconfig
|
||||
, more-itertools
|
||||
, packaging
|
||||
, pluggy
|
||||
, py
|
||||
, pyparsing
|
||||
, python-slugify
|
||||
, requests
|
||||
, six
|
||||
, text-unidecode
|
||||
, toml
|
||||
, urllib3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "patrowl4py";
|
||||
version = "1.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Patrowl";
|
||||
repo = "Patrowl4py";
|
||||
rev = version;
|
||||
sha256 = "19r9ym31bcaxcrv35gnfx5k8mn5lyascqzdr312rzc7ikbhcj73s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
certifi
|
||||
chardet
|
||||
idna
|
||||
iniconfig
|
||||
more-itertools
|
||||
packaging
|
||||
pluggy
|
||||
py
|
||||
pyparsing
|
||||
python-slugify
|
||||
requests
|
||||
six
|
||||
text-unidecode
|
||||
toml
|
||||
urllib3
|
||||
];
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"patrowl4py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API Client for PatrOwl";
|
||||
homepage = "https://github.com/Patrowl/Patrowl4py";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonenumbers";
|
||||
version = "8.12.33";
|
||||
version = "8.12.34";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "de3d5a3cb421c7421f584bb13cb9287e23ee2dd97d832fc35c9b55b96a576a3c";
|
||||
sha256 = "2d0f3db2944130f4a842f37a3b252f4a32cc0454a1a2e992c6480c7c17f1b121";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -1,10 +1,14 @@
|
||||
{ buildPythonPackage, fetchPypi, fetchpatch
|
||||
, plaster, PasteDeploy
|
||||
, pytest, pytest-cov
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, plaster
|
||||
, pastedeploy
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plaster_pastedeploy";
|
||||
pname = "plaster-pastedeploy";
|
||||
version = "0.6";
|
||||
|
||||
src = fetchPypi {
|
||||
@ -13,7 +17,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix tests compatibility with PasteDeploy 2+
|
||||
# Fix tests compatibility with pastedeploy 2+
|
||||
# https://github.com/Pylons/plaster_pastedeploy/pull/17
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Pylons/plaster_pastedeploy/commit/d77d81a57e917c67a20332beca8f418651172905.patch";
|
||||
@ -21,10 +25,14 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
propagatedBuildInputs = [ plaster pastedeploy ];
|
||||
|
||||
propagatedBuildInputs = [ plaster PasteDeploy ];
|
||||
checkInputs = [ pytest pytest-cov ];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "PasteDeploy binding to the plaster configuration loader";
|
||||
homepage = "https://github.com/Pylons/plaster_pastedeploy";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
35
pkgs/development/python-modules/pyeclib/default.nix
Normal file
35
pkgs/development/python-modules/pyeclib/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, liberasurecode, six }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyeclib";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-gBHjHuia5/uZymkWZgyH4BCEZqmWK9SXowAQIJdOO7E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# patch dlopen call
|
||||
substituteInPlace src/c/pyeclib_c/pyeclib_c.c \
|
||||
--replace "liberasurecode.so" "${liberasurecode}/lib/liberasurecode.so"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
# required for the custom find_library function in setup.py
|
||||
export LD_LIBRARY_PATH="${lib.makeLibraryPath [ liberasurecode ]}"
|
||||
'';
|
||||
|
||||
buildInputs = [ liberasurecode ];
|
||||
|
||||
checkInputs = [ six ];
|
||||
|
||||
pythonImportsCheck = [ "pyeclib" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "This library provides a simple Python interface for implementing erasure codes.";
|
||||
homepage = "https://github.com/openstack/pyeclib";
|
||||
license = licenses.bsd2;
|
||||
maintainers = teams.openstack.members;
|
||||
};
|
||||
}
|
||||
@ -4,7 +4,7 @@
|
||||
, webtest
|
||||
, zope_component
|
||||
, hupper
|
||||
, PasteDeploy
|
||||
, pastedeploy
|
||||
, plaster
|
||||
, plaster-pastedeploy
|
||||
, repoze_lru
|
||||
@ -27,11 +27,7 @@ buildPythonPackage rec {
|
||||
|
||||
checkInputs = [ webtest zope_component ];
|
||||
|
||||
propagatedBuildInputs = [ hupper PasteDeploy plaster plaster-pastedeploy repoze_lru translationstring venusian webob zope_deprecation zope_interface ];
|
||||
|
||||
# Failing tests
|
||||
# https://github.com/Pylons/pyramid/issues/1899
|
||||
doCheck = !isPy35;
|
||||
propagatedBuildInputs = [ hupper pastedeploy plaster plaster-pastedeploy repoze_lru translationstring venusian webob zope_deprecation zope_interface ];
|
||||
|
||||
pythonImportsCheck = [ "pyramid" ];
|
||||
|
||||
|
||||
@ -5,15 +5,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytmx";
|
||||
version = "3.25";
|
||||
version = "3.27";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitcraft";
|
||||
repo = "PyTMX";
|
||||
rev = version;
|
||||
sha256 = "0v07zhvzvl2qcqhjzgfzm8hgayq38gaqcxxkyhlq9n0hlk93nm97";
|
||||
# Release was not tagged.
|
||||
rev = "5bb094c45e648d1de6c9ba8d8c8f31f7b83478e1";
|
||||
sha256 = "0kpd39sr2ggwzh7nd3f5801mgwm57rzrrkqcgbcypdm8l2ayga3b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pygame pyglet pysdl2 six ];
|
||||
|
||||
@ -1,27 +1,51 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python
|
||||
, pkgs
|
||||
, pillow
|
||||
, twitter
|
||||
, pyfiglet
|
||||
, requests
|
||||
, arrow
|
||||
, python-dateutil
|
||||
, pysocks
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, freetype
|
||||
, glibcLocales
|
||||
, libjpeg
|
||||
, pillow
|
||||
, pocket
|
||||
, pyfiglet
|
||||
, pysocks
|
||||
, python
|
||||
, python-dateutil
|
||||
, requests
|
||||
, twitter
|
||||
, zlib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rainbowstream";
|
||||
version = "1.5.2";
|
||||
version = "1.5.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "527d39778c55d88300fe2017913341bfa1b1f0ffdc1fe5eab57a82bf4cd2edb3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "orakaro";
|
||||
repo = pname;
|
||||
# Request for tagging, https://github.com/orakaro/rainbowstream/issues/314
|
||||
rev = "96141fac10675e0775d703f65a59c4477a48c57e";
|
||||
sha256 = "0j0qcc428lk9b3l0cr2j418gd6wd5k4160ham2zn2mmdmxn5bldg";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
freetype
|
||||
glibcLocales
|
||||
libjpeg
|
||||
zlib
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
arrow
|
||||
pillow
|
||||
pocket
|
||||
pyfiglet
|
||||
pysocks
|
||||
python-dateutil
|
||||
requests
|
||||
twitter
|
||||
];
|
||||
|
||||
patches = [ ./image.patch ];
|
||||
|
||||
postPatch = ''
|
||||
@ -31,7 +55,7 @@ buildPythonPackage rec {
|
||||
sed -i 's/requests.*"/requests"/' setup.py
|
||||
'';
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib
|
||||
@ -42,13 +66,15 @@ buildPythonPackage rec {
|
||||
done
|
||||
'';
|
||||
|
||||
buildInputs = [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales pillow twitter pyfiglet requests arrow python-dateutil pysocks pocket ];
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "rainbowstream" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Streaming command-line twitter client";
|
||||
homepage = "http://www.rainbowstream.org/";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/orakaro/rainbowstream";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
31
pkgs/development/python-modules/rzpipe/default.nix
Normal file
31
pkgs/development/python-modules/rzpipe/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rzpipe";
|
||||
version = "0.1.1";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "13z88c4zjy10a1sc98ba25sz200v6w2wprbq4iknm4sy2fmrsydh";
|
||||
};
|
||||
|
||||
# No native rz_core library
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"rzpipe"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python interface for rizin";
|
||||
homepage = "https://rizin.re";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-files";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "04n2g2lbff0fr3mkqma39j6acpbj73dbizz9hw5m15110idc577h";
|
||||
sha256 = "1g3d5p6ng4zl0ib7k4gj4zy7lp30d2il2k1m92pf5gghwfjwwfca";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skytemple-icons";
|
||||
version = "1.2.0";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SkyTemple";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "036bxy0n3p0ivcdaymj11z0nw555xjxxj15ja0rpjsvq1mqamd80";
|
||||
sha256 = "0wagdvzks9irdl5lj8sfqkkvfwwmdpvjyzx6424shvpp5mk28dcv";
|
||||
};
|
||||
|
||||
doCheck = false; # there are no tests
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
, FormEncode
|
||||
, PasteDeploy
|
||||
, pastedeploy
|
||||
, paste
|
||||
, pydispatcher
|
||||
}:
|
||||
@ -17,13 +17,14 @@ buildPythonPackage rec {
|
||||
sha256 = "45064184decf7f42d386704e5f47a70dee517d3e449b610506e174025f84d921";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
propagatedBuildInputs = [ FormEncode PasteDeploy paste pydispatcher ];
|
||||
propagatedBuildInputs = [ FormEncode pastedeploy paste pydispatcher ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Object Relational Manager for providing an object interface to your database";
|
||||
homepage = "http://www.sqlobject.org/";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
82
pkgs/development/python-modules/swift/default.nix
Normal file
82
pkgs/development/python-modules/swift/default.nix
Normal file
@ -0,0 +1,82 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, boto3
|
||||
, cryptography
|
||||
, eventlet
|
||||
, greenlet
|
||||
, iana-etc
|
||||
, libredirect
|
||||
, lxml
|
||||
, mock
|
||||
, netifaces
|
||||
, pastedeploy
|
||||
, pbr
|
||||
, pyeclib
|
||||
, requests
|
||||
, setuptools
|
||||
, six
|
||||
, stestr
|
||||
, swiftclient
|
||||
, xattr
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "swift";
|
||||
version = "2.28.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "79a216498a842226f71e9dfbbce4dba4a5718cda9b2be92b6e0aa21df977f70d";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# files requires boto which is incompatible with python 3.9
|
||||
rm test/functional/s3api/{__init__.py,s3_test_client.py}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pbr ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
eventlet
|
||||
greenlet
|
||||
lxml
|
||||
netifaces
|
||||
pastedeploy
|
||||
pyeclib
|
||||
requests
|
||||
setuptools
|
||||
six
|
||||
xattr
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
boto3
|
||||
mock
|
||||
stestr
|
||||
swiftclient
|
||||
];
|
||||
|
||||
# a lot of tests currently fail while establishing a connection
|
||||
doCheck = false;
|
||||
|
||||
checkPhase = ''
|
||||
echo "nameserver 127.0.0.1" > resolv.conf
|
||||
export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf)
|
||||
export LD_PRELOAD=${libredirect}/lib/libredirect.so
|
||||
|
||||
export SWIFT_TEST_CONFIG_FILE=test/sample.conf
|
||||
|
||||
stestr run
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "swift" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OpenStack Object Storage";
|
||||
homepage = "https://github.com/openstack/swift";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.openstack.members;
|
||||
};
|
||||
}
|
||||
@ -10,7 +10,7 @@
|
||||
, mock
|
||||
, pyquery
|
||||
, wsgiproxy2
|
||||
, PasteDeploy
|
||||
, pastedeploy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-qsFotbK08gCvTjWGfPMWcSIQ49XbgcHL3/OHImR7sIc=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "nose<1.3.0" "nose"
|
||||
'';
|
||||
|
||||
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||
checkInputs = [
|
||||
nose
|
||||
mock
|
||||
PasteDeploy
|
||||
pastedeploy
|
||||
wsgiproxy2
|
||||
pyquery
|
||||
];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "tfsec";
|
||||
version = "0.58.12";
|
||||
version = "0.58.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+djNbTr4TBo3KJ2skQysfrhVp9Q+HuaeB1UCzASB1+w=";
|
||||
sha256 = "sha256-NbuhZkU3QYoqeVVh7/G6P+IeixuakD0+7QXU6YC1VN4=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/aquasecurity/tfsec";
|
||||
|
||||
@ -1,802 +0,0 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
new file mode 100644
|
||||
index 0000000..4ab2c17
|
||||
--- /dev/null
|
||||
+++ b/Cargo.lock
|
||||
@@ -0,0 +1,796 @@
|
||||
+# This file is automatically @generated by Cargo.
|
||||
+# It is not intended for manual editing.
|
||||
+[[package]]
|
||||
+name = "ahash"
|
||||
+version = "0.3.8"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "aho-corasick"
|
||||
+version = "0.7.13"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
|
||||
+dependencies = [
|
||||
+ "memchr",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "ansi_term"
|
||||
+version = "0.11.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
|
||||
+dependencies = [
|
||||
+ "winapi 0.3.9",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "atty"
|
||||
+version = "0.2.14"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
|
||||
+dependencies = [
|
||||
+ "hermit-abi",
|
||||
+ "libc",
|
||||
+ "winapi 0.3.9",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "autocfg"
|
||||
+version = "1.0.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "bigbro"
|
||||
+version = "0.5.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3eaac07a3e62cd31e2102ca97c7fdf20002893ba2a396d29ea4710d2415cdce5"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+ "seccomp-droundy",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "bitflags"
|
||||
+version = "1.2.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "cc"
|
||||
+version = "1.0.59"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "cfg-if"
|
||||
+version = "0.1.10"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "clap"
|
||||
+version = "2.33.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
|
||||
+dependencies = [
|
||||
+ "ansi_term",
|
||||
+ "atty",
|
||||
+ "bitflags",
|
||||
+ "strsim",
|
||||
+ "textwrap",
|
||||
+ "unicode-width",
|
||||
+ "vec_map",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "crude-profiler"
|
||||
+version = "0.1.7"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "9389510ac716b6ace8c4b635420cf023e12c81b61e933bfef06639142f149ecd"
|
||||
+dependencies = [
|
||||
+ "lazy_static 0.2.11",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "ctrlc"
|
||||
+version = "3.1.6"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d0b676fa23f995faf587496dcd1c80fead847ed58d2da52ac1caca9a72790dd2"
|
||||
+dependencies = [
|
||||
+ "nix",
|
||||
+ "winapi 0.3.9",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "either"
|
||||
+version = "1.6.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "env_logger"
|
||||
+version = "0.7.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
|
||||
+dependencies = [
|
||||
+ "log",
|
||||
+ "regex",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "fac"
|
||||
+version = "0.5.3"
|
||||
+dependencies = [
|
||||
+ "atty",
|
||||
+ "bigbro",
|
||||
+ "clap",
|
||||
+ "crude-profiler",
|
||||
+ "ctrlc",
|
||||
+ "git-version",
|
||||
+ "internment",
|
||||
+ "lazy_static 1.4.0",
|
||||
+ "libc",
|
||||
+ "metrohash",
|
||||
+ "notify",
|
||||
+ "num_cpus",
|
||||
+ "pathdiff",
|
||||
+ "quickcheck",
|
||||
+ "termcolor",
|
||||
+ "tinyset",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "filetime"
|
||||
+version = "0.2.12"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "libc",
|
||||
+ "redox_syscall",
|
||||
+ "winapi 0.3.9",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "fsevent"
|
||||
+version = "0.4.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
|
||||
+dependencies = [
|
||||
+ "bitflags",
|
||||
+ "fsevent-sys",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "fsevent-sys"
|
||||
+version = "2.0.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "fuchsia-zircon"
|
||||
+version = "0.3.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
|
||||
+dependencies = [
|
||||
+ "bitflags",
|
||||
+ "fuchsia-zircon-sys",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "fuchsia-zircon-sys"
|
||||
+version = "0.3.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "gcc"
|
||||
+version = "0.3.55"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "getrandom"
|
||||
+version = "0.1.15"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "libc",
|
||||
+ "wasi",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "git-version"
|
||||
+version = "0.3.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "94918e83f1e01dedc2e361d00ce9487b14c58c7f40bab148026fa39d42cb41e2"
|
||||
+dependencies = [
|
||||
+ "git-version-macro",
|
||||
+ "proc-macro-hack",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "git-version-macro"
|
||||
+version = "0.3.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "34a97a52fdee1870a34fa6e4b77570cba531b27d1838874fef4429a791a3d657"
|
||||
+dependencies = [
|
||||
+ "proc-macro-hack",
|
||||
+ "proc-macro2",
|
||||
+ "quote",
|
||||
+ "syn",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "hashbrown"
|
||||
+version = "0.8.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
|
||||
+dependencies = [
|
||||
+ "ahash",
|
||||
+ "autocfg",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "hermit-abi"
|
||||
+version = "0.1.15"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "inotify"
|
||||
+version = "0.7.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f"
|
||||
+dependencies = [
|
||||
+ "bitflags",
|
||||
+ "inotify-sys",
|
||||
+ "libc",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "inotify-sys"
|
||||
+version = "0.1.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "internment"
|
||||
+version = "0.3.13"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "7e5cba670f596a69e619cb796bcf609cb32c0ba4415d1e809104b8b832130d79"
|
||||
+dependencies = [
|
||||
+ "hashbrown",
|
||||
+ "lazy_static 1.4.0",
|
||||
+ "serde",
|
||||
+ "state",
|
||||
+ "tinyset",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "iovec"
|
||||
+version = "0.1.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "itertools"
|
||||
+version = "0.9.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
|
||||
+dependencies = [
|
||||
+ "either",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "kernel32-sys"
|
||||
+version = "0.2.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
|
||||
+dependencies = [
|
||||
+ "winapi 0.2.8",
|
||||
+ "winapi-build",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "lazy_static"
|
||||
+version = "0.2.11"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "lazy_static"
|
||||
+version = "1.4.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "lazycell"
|
||||
+version = "1.3.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "libc"
|
||||
+version = "0.2.77"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "log"
|
||||
+version = "0.4.11"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "memchr"
|
||||
+version = "2.3.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "metrohash"
|
||||
+version = "1.0.6"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3ba553cb19e2acbc54baa16faef215126243fe45e53357a3b2e9f4ebc7b0506c"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "mio"
|
||||
+version = "0.6.22"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "fuchsia-zircon",
|
||||
+ "fuchsia-zircon-sys",
|
||||
+ "iovec",
|
||||
+ "kernel32-sys",
|
||||
+ "libc",
|
||||
+ "log",
|
||||
+ "miow",
|
||||
+ "net2",
|
||||
+ "slab",
|
||||
+ "winapi 0.2.8",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "mio-extras"
|
||||
+version = "2.0.6"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
|
||||
+dependencies = [
|
||||
+ "lazycell",
|
||||
+ "log",
|
||||
+ "mio",
|
||||
+ "slab",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "miow"
|
||||
+version = "0.2.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
|
||||
+dependencies = [
|
||||
+ "kernel32-sys",
|
||||
+ "net2",
|
||||
+ "winapi 0.2.8",
|
||||
+ "ws2_32-sys",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "net2"
|
||||
+version = "0.2.35"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "libc",
|
||||
+ "winapi 0.3.9",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "nix"
|
||||
+version = "0.17.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
|
||||
+dependencies = [
|
||||
+ "bitflags",
|
||||
+ "cc",
|
||||
+ "cfg-if",
|
||||
+ "libc",
|
||||
+ "void",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "notify"
|
||||
+version = "4.0.15"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd"
|
||||
+dependencies = [
|
||||
+ "bitflags",
|
||||
+ "filetime",
|
||||
+ "fsevent",
|
||||
+ "fsevent-sys",
|
||||
+ "inotify",
|
||||
+ "libc",
|
||||
+ "mio",
|
||||
+ "mio-extras",
|
||||
+ "walkdir",
|
||||
+ "winapi 0.3.9",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "num_cpus"
|
||||
+version = "1.13.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
|
||||
+dependencies = [
|
||||
+ "hermit-abi",
|
||||
+ "libc",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "pathdiff"
|
||||
+version = "0.2.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "877630b3de15c0b64cc52f659345724fbf6bdad9bd9566699fc53688f3c34a34"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "pkg-config"
|
||||
+version = "0.3.18"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "ppv-lite86"
|
||||
+version = "0.2.9"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "proc-macro-hack"
|
||||
+version = "0.5.18"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "proc-macro2"
|
||||
+version = "1.0.21"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c"
|
||||
+dependencies = [
|
||||
+ "unicode-xid",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "quickcheck"
|
||||
+version = "0.9.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f"
|
||||
+dependencies = [
|
||||
+ "env_logger",
|
||||
+ "log",
|
||||
+ "rand",
|
||||
+ "rand_core",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "quote"
|
||||
+version = "1.0.7"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
|
||||
+dependencies = [
|
||||
+ "proc-macro2",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rand"
|
||||
+version = "0.7.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
|
||||
+dependencies = [
|
||||
+ "getrandom",
|
||||
+ "libc",
|
||||
+ "rand_chacha",
|
||||
+ "rand_core",
|
||||
+ "rand_hc",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rand_chacha"
|
||||
+version = "0.2.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
|
||||
+dependencies = [
|
||||
+ "ppv-lite86",
|
||||
+ "rand_core",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rand_core"
|
||||
+version = "0.5.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
|
||||
+dependencies = [
|
||||
+ "getrandom",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rand_hc"
|
||||
+version = "0.2.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
|
||||
+dependencies = [
|
||||
+ "rand_core",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "redox_syscall"
|
||||
+version = "0.1.57"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "regex"
|
||||
+version = "1.3.9"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
|
||||
+dependencies = [
|
||||
+ "aho-corasick",
|
||||
+ "memchr",
|
||||
+ "regex-syntax",
|
||||
+ "thread_local 1.0.1",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "regex-syntax"
|
||||
+version = "0.6.18"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "same-file"
|
||||
+version = "1.0.6"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
|
||||
+dependencies = [
|
||||
+ "winapi-util",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "seccomp-droundy"
|
||||
+version = "0.1.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d4b762ab71c6bf1a9a3e0b21e8600b73b088f2a6562e03cd77b2826821fae5f8"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+ "seccomp-droundy-sys",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "seccomp-droundy-sys"
|
||||
+version = "0.1.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "200976cc4ff22cd8b9c6c23681fe6aa89a12aa3637c86dd16e44c05d7c373488"
|
||||
+dependencies = [
|
||||
+ "gcc",
|
||||
+ "libc",
|
||||
+ "pkg-config",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "serde"
|
||||
+version = "1.0.115"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "slab"
|
||||
+version = "0.4.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "state"
|
||||
+version = "0.4.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "7345c971d1ef21ffdbd103a75990a15eb03604fc8b8852ca8cb418ee1a099028"
|
||||
+dependencies = [
|
||||
+ "thread_local 0.3.3",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "strsim"
|
||||
+version = "0.8.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "syn"
|
||||
+version = "1.0.40"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"
|
||||
+dependencies = [
|
||||
+ "proc-macro2",
|
||||
+ "quote",
|
||||
+ "unicode-xid",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "termcolor"
|
||||
+version = "1.1.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
|
||||
+dependencies = [
|
||||
+ "winapi-util",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "textwrap"
|
||||
+version = "0.11.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
|
||||
+dependencies = [
|
||||
+ "unicode-width",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "thread-id"
|
||||
+version = "3.3.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+ "redox_syscall",
|
||||
+ "winapi 0.3.9",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "thread_local"
|
||||
+version = "0.3.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "c85048c6260d17cf486ceae3282d9fb6b90be220bf5b28c400f5485ffc29f0c7"
|
||||
+dependencies = [
|
||||
+ "thread-id",
|
||||
+ "unreachable",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "thread_local"
|
||||
+version = "1.0.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
|
||||
+dependencies = [
|
||||
+ "lazy_static 1.4.0",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "tinyset"
|
||||
+version = "0.4.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "784f540960a63144d63992caf430ed87e39d920f2c474cb8ac586ff31fb861fc"
|
||||
+dependencies = [
|
||||
+ "itertools",
|
||||
+ "rand",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "unicode-width"
|
||||
+version = "0.1.8"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "unicode-xid"
|
||||
+version = "0.2.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "unreachable"
|
||||
+version = "0.1.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91"
|
||||
+dependencies = [
|
||||
+ "void",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "vec_map"
|
||||
+version = "0.8.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "void"
|
||||
+version = "1.0.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "walkdir"
|
||||
+version = "2.3.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
|
||||
+dependencies = [
|
||||
+ "same-file",
|
||||
+ "winapi 0.3.9",
|
||||
+ "winapi-util",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasi"
|
||||
+version = "0.9.0+wasi-snapshot-preview1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "winapi"
|
||||
+version = "0.2.8"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "winapi"
|
||||
+version = "0.3.9"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
+dependencies = [
|
||||
+ "winapi-i686-pc-windows-gnu",
|
||||
+ "winapi-x86_64-pc-windows-gnu",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "winapi-build"
|
||||
+version = "0.1.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "winapi-i686-pc-windows-gnu"
|
||||
+version = "0.4.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "winapi-util"
|
||||
+version = "0.1.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
|
||||
+dependencies = [
|
||||
+ "winapi 0.3.9",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "winapi-x86_64-pc-windows-gnu"
|
||||
+version = "0.4.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "ws2_32-sys"
|
||||
+version = "0.2.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
|
||||
+dependencies = [
|
||||
+ "winapi 0.2.8",
|
||||
+ "winapi-build",
|
||||
+]
|
||||
@ -1,20 +1,16 @@
|
||||
{ lib, git, fetchFromGitHub, rustPlatform }:
|
||||
{ lib, rustPlatform, fetchCrate, git }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fac-build";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "droundy";
|
||||
repo = "fac";
|
||||
rev = version;
|
||||
sha256 = "1gifrlb31jy8633rnhny58ccp3wlmd338129c6sh0h1a38vkmsxk";
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
crateName = "fac";
|
||||
sha256 = "sha256-+JJVuKUdnjJoQJ4a2EE0O6jZdVoFxPwbPgfD2LfiDPI=";
|
||||
};
|
||||
|
||||
# workaround for missing Cargo.lock file
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
|
||||
cargoSha256 = "033wif3wwm3912ppw0gshsyjxipilg9hhvkijw29zmjfm6074b21";
|
||||
cargoSha256 = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk=";
|
||||
|
||||
# fac includes a unit test called ls_files_works which assumes it's
|
||||
# running in a git repo. Nix's sandbox runs cargo build outside git,
|
||||
@ -45,6 +41,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://physics.oregonstate.edu/~roundyd/fac";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.dpercy ];
|
||||
maintainers = with maintainers; [ dpercy ];
|
||||
mainProgram = "fac";
|
||||
};
|
||||
}
|
||||
|
||||
40
pkgs/development/tools/database/beekeeper-studio/default.nix
Normal file
40
pkgs/development/tools/database/beekeeper-studio/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib, fetchurl, appimageTools, pkgs }:
|
||||
|
||||
let
|
||||
pname = "beekeeper-studio";
|
||||
version = "2.1.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${version}/Beekeeper-Studio-${version}.AppImage";
|
||||
name="${pname}-${version}.AppImage";
|
||||
sha512 = "1aik88wi9axv66axjmmjmlna1sp0pz92z8i2x6pq3bs0gcs4i1q3qxxbrfc14ynbpa65knimfhwzrrshchnijgdazx3qjzh8jwzfiwl";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
};
|
||||
in appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
|
||||
multiPkgs = null; # no 32bit needed
|
||||
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
ln -s $out/bin/${name} $out/bin/${pname}
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
|
||||
install -m 444 -D ${appimageContents}/${pname}.png \
|
||||
$out/share/icons/hicolor/512x512/apps/${pname}.png
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more. Linux, MacOS, and Windows";
|
||||
homepage = "https://www.beekeeperstudio.io";
|
||||
changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v2.1.4";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ milogert ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
, Security
|
||||
, openssl
|
||||
, pkg-config
|
||||
, protobuf
|
||||
@ -26,7 +27,11 @@ in rustPlatform.buildRustPackage rec {
|
||||
cargoSha256 = "sha256-NAXoKz+tZmjmZ/PkDaXEp9D++iu/3Knp0Yy6NJWEoDM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl protobuf ];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
protobuf
|
||||
] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
preBuild = ''
|
||||
export OPENSSL_DIR=${lib.getDev openssl}
|
||||
@ -52,7 +57,7 @@ in rustPlatform.buildRustPackage rec {
|
||||
description = "A collection of engines that power the core stack for Prisma";
|
||||
homepage = "https://www.prisma.io/";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ pamplemousse pimeys ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }:
|
||||
{ lib, stdenv, fetchurl, makeWrapper, sbcl_2_0_8, sqlite, freetds, libzip, curl, git, cacert, openssl }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgloader";
|
||||
version = "3.6.2";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ git makeWrapper ];
|
||||
buildInputs = [ sbcl cacert sqlite freetds libzip curl openssl ];
|
||||
buildInputs = [ sbcl_2_0_8 cacert sqlite freetds libzip curl openssl ];
|
||||
|
||||
LD_LIBRARY_PATH = lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ];
|
||||
|
||||
|
||||
23
pkgs/development/tools/rust/rusty-man/default.nix
Normal file
23
pkgs/development/tools/rust/rusty-man/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib, rustPlatform, fetchFromSourcehut }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rusty-man";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ireas";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1yp1clmf4hpvqbvn055hiq52584kbrz5b3cjzw8bgkw51nwxr2yx";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-mIM97YraTiDAowqlB4kAE4PdtWHgvw0UI6Nqoe1EBns=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line viewer for documentation generated by rustdoc";
|
||||
homepage = "https://git.sr.ht/~ireas/rusty-man";
|
||||
changelog = "https://git.sr.ht/~ireas/rusty-man/tree/v${version}/item/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
@ -1,493 +0,0 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/Cargo.lock
|
||||
@@ -0,0 +1,488 @@
|
||||
+# This file is automatically @generated by Cargo.
|
||||
+# It is not intended for manual editing.
|
||||
+version = 3
|
||||
+
|
||||
+[[package]]
|
||||
+name = "aho-corasick"
|
||||
+version = "0.7.18"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
|
||||
+dependencies = [
|
||||
+ "memchr",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "ansi_term"
|
||||
+version = "0.11.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
|
||||
+dependencies = [
|
||||
+ "winapi",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "anyhow"
|
||||
+version = "1.0.44"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "atty"
|
||||
+version = "0.2.14"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
|
||||
+dependencies = [
|
||||
+ "hermit-abi",
|
||||
+ "libc",
|
||||
+ "winapi",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "autocfg"
|
||||
+version = "1.0.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "bitflags"
|
||||
+version = "1.3.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "cast"
|
||||
+version = "0.2.7"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
|
||||
+dependencies = [
|
||||
+ "rustc_version",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "cfg-if"
|
||||
+version = "1.0.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "clap"
|
||||
+version = "2.33.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
|
||||
+dependencies = [
|
||||
+ "ansi_term",
|
||||
+ "atty",
|
||||
+ "bitflags",
|
||||
+ "strsim",
|
||||
+ "textwrap",
|
||||
+ "unicode-width",
|
||||
+ "vec_map",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "clap_conf"
|
||||
+version = "0.1.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "56039deda04adbf9af4e5595c199572dc276f4fe60b03a4c84c0186d4de649d8"
|
||||
+dependencies = [
|
||||
+ "anyhow",
|
||||
+ "clap",
|
||||
+ "serde",
|
||||
+ "thiserror",
|
||||
+ "toml",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "crossbeam-channel"
|
||||
+version = "0.5.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "crossbeam-utils",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "crossbeam-deque"
|
||||
+version = "0.8.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "crossbeam-epoch",
|
||||
+ "crossbeam-utils",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "crossbeam-epoch"
|
||||
+version = "0.9.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "crossbeam-utils",
|
||||
+ "lazy_static",
|
||||
+ "memoffset",
|
||||
+ "scopeguard",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "crossbeam-utils"
|
||||
+version = "0.8.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "lazy_static",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "either"
|
||||
+version = "1.6.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "env_logger"
|
||||
+version = "0.7.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
|
||||
+dependencies = [
|
||||
+ "atty",
|
||||
+ "humantime",
|
||||
+ "log",
|
||||
+ "regex",
|
||||
+ "termcolor",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "hermit-abi"
|
||||
+version = "0.1.19"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "humantime"
|
||||
+version = "1.3.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
|
||||
+dependencies = [
|
||||
+ "quick-error",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "inflections"
|
||||
+version = "1.1.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "lazy_static"
|
||||
+version = "1.4.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "libc"
|
||||
+version = "0.2.102"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "log"
|
||||
+version = "0.4.14"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "memchr"
|
||||
+version = "2.4.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "memoffset"
|
||||
+version = "0.6.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
|
||||
+dependencies = [
|
||||
+ "autocfg",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "num_cpus"
|
||||
+version = "1.13.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
|
||||
+dependencies = [
|
||||
+ "hermit-abi",
|
||||
+ "libc",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "once_cell"
|
||||
+version = "1.8.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "proc-macro2"
|
||||
+version = "1.0.29"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
|
||||
+dependencies = [
|
||||
+ "unicode-xid",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "quick-error"
|
||||
+version = "1.2.3"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "quote"
|
||||
+version = "1.0.9"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
|
||||
+dependencies = [
|
||||
+ "proc-macro2",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rayon"
|
||||
+version = "1.5.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
|
||||
+dependencies = [
|
||||
+ "autocfg",
|
||||
+ "crossbeam-deque",
|
||||
+ "either",
|
||||
+ "rayon-core",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rayon-core"
|
||||
+version = "1.9.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
|
||||
+dependencies = [
|
||||
+ "crossbeam-channel",
|
||||
+ "crossbeam-deque",
|
||||
+ "crossbeam-utils",
|
||||
+ "lazy_static",
|
||||
+ "num_cpus",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "regex"
|
||||
+version = "1.5.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
|
||||
+dependencies = [
|
||||
+ "aho-corasick",
|
||||
+ "memchr",
|
||||
+ "regex-syntax",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "regex-syntax"
|
||||
+version = "0.6.25"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rustc_version"
|
||||
+version = "0.4.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
|
||||
+dependencies = [
|
||||
+ "semver",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "scopeguard"
|
||||
+version = "1.1.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "semver"
|
||||
+version = "1.0.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "serde"
|
||||
+version = "1.0.130"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "strsim"
|
||||
+version = "0.8.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "svd-parser"
|
||||
+version = "0.10.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "697e7645ad9f5311fe3d872d094b135627b1616aea9e1573dddd28ca522579b9"
|
||||
+dependencies = [
|
||||
+ "anyhow",
|
||||
+ "once_cell",
|
||||
+ "rayon",
|
||||
+ "regex",
|
||||
+ "thiserror",
|
||||
+ "xmltree",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "svd2rust"
|
||||
+version = "0.19.0"
|
||||
+dependencies = [
|
||||
+ "anyhow",
|
||||
+ "cast",
|
||||
+ "clap",
|
||||
+ "clap_conf",
|
||||
+ "env_logger",
|
||||
+ "inflections",
|
||||
+ "log",
|
||||
+ "proc-macro2",
|
||||
+ "quote",
|
||||
+ "svd-parser",
|
||||
+ "syn",
|
||||
+ "thiserror",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "syn"
|
||||
+version = "1.0.76"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84"
|
||||
+dependencies = [
|
||||
+ "proc-macro2",
|
||||
+ "quote",
|
||||
+ "unicode-xid",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "termcolor"
|
||||
+version = "1.1.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
|
||||
+dependencies = [
|
||||
+ "winapi-util",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "textwrap"
|
||||
+version = "0.11.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
|
||||
+dependencies = [
|
||||
+ "unicode-width",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "thiserror"
|
||||
+version = "1.0.29"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88"
|
||||
+dependencies = [
|
||||
+ "thiserror-impl",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "thiserror-impl"
|
||||
+version = "1.0.29"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c"
|
||||
+dependencies = [
|
||||
+ "proc-macro2",
|
||||
+ "quote",
|
||||
+ "syn",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "toml"
|
||||
+version = "0.5.8"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
|
||||
+dependencies = [
|
||||
+ "serde",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "unicode-width"
|
||||
+version = "0.1.9"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "unicode-xid"
|
||||
+version = "0.2.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "vec_map"
|
||||
+version = "0.8.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "winapi"
|
||||
+version = "0.3.9"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
+dependencies = [
|
||||
+ "winapi-i686-pc-windows-gnu",
|
||||
+ "winapi-x86_64-pc-windows-gnu",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "winapi-i686-pc-windows-gnu"
|
||||
+version = "0.4.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "winapi-util"
|
||||
+version = "0.1.5"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
|
||||
+dependencies = [
|
||||
+ "winapi",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "winapi-x86_64-pc-windows-gnu"
|
||||
+version = "0.4.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "xml-rs"
|
||||
+version = "0.7.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "3c1cb601d29fe2c2ac60a2b2e5e293994d87a1f6fa9687a31a15270f909be9c2"
|
||||
+dependencies = [
|
||||
+ "bitflags",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "xmltree"
|
||||
+version = "0.8.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "ff8eaee9d17062850f1e6163b509947969242990ee59a35801af437abe041e70"
|
||||
+dependencies = [
|
||||
+ "xml-rs",
|
||||
+]
|
||||
@ -1,26 +1,23 @@
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }:
|
||||
{ lib, rustPlatform, fetchCrate, stdenv, libiconv }:
|
||||
|
||||
with rustPlatform;
|
||||
|
||||
buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svd2rust";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-embedded";
|
||||
repo = "svd2rust";
|
||||
rev = "v${version}";
|
||||
sha256 = "04mm0l7cv2q5yjxrkpr7p0kxd4nmi0d7m4l436q8p492nvgb75zx";
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-LNJd88Gw8HaE1qnRbD7mipVEFgG7jCsyUu9pbwY/4JY=";
|
||||
};
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
|
||||
cargoSha256 = "1v1qx0r3k86jipyaaggm25pinsqicmzvnzrxd0lr5xk77s1kvgid";
|
||||
cargoSha256 = "sha256-Qg/wA3R98FAb8UZ5s7GOEgOeifrqwFJ4lg0BC2SZOE8=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate Rust register maps (`struct`s) from SVD files";
|
||||
homepage = "https://github.com/rust-embedded/svd2rust";
|
||||
changelog = "https://github.com/rust-embedded/svd2rust/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit asl20 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,6 +6,8 @@
|
||||
, openjdk
|
||||
, stdenv
|
||||
, xorg
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -17,7 +19,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-/5ij/079aOad7otXSFFcmVmiYQnMX/0RXGOr1j0rkGY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = with xorg; [
|
||||
alsa-lib
|
||||
libXxf86vm
|
||||
@ -25,18 +30,37 @@ stdenv.mkDerivation rec {
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "starsector";
|
||||
exec = "starsector";
|
||||
icon = "starsector";
|
||||
comment = meta.description;
|
||||
genericName = "starsector";
|
||||
desktopName = "Starsector";
|
||||
categories = "Game;";
|
||||
})
|
||||
];
|
||||
|
||||
# need to cd into $out in order for classpath to pick up correct jar files
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
rm -r jre_linux # remove jre7
|
||||
rm starfarer.api.zip
|
||||
cp -r ./* $out
|
||||
|
||||
mkdir -p $out/share/icons/hicolor/64x64/apps
|
||||
ln -s $out/graphics/ui/s_icon64.png $out/share/icons/hicolor/64x64/apps/starsector.png
|
||||
|
||||
wrapProgram $out/starsector.sh \
|
||||
--prefix PATH : ${lib.makeBinPath [ openjdk ]} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} \
|
||||
--run "mkdir -p \$XDG_DATA_HOME/starsector; cd $out"
|
||||
--run 'mkdir -p ''${XDG_DATA_HOME:-~/.local/share}/starsector; cd '"$out"
|
||||
ln -s $out/starsector.sh $out/bin/starsector
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# it tries to run everything with relative paths, which makes it CWD dependent
|
||||
@ -44,8 +68,7 @@ stdenv.mkDerivation rec {
|
||||
postPatch = ''
|
||||
substituteInPlace starsector.sh \
|
||||
--replace "./jre_linux/bin/java" "${openjdk}/bin/java" \
|
||||
--replace "./native/linux" "$out/native/linux" \
|
||||
--replace "./" "\$XDG_DATA_HOME/starsector/"
|
||||
--replace "./native/linux" "$out/native/linux"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
let
|
||||
overridePkgs = lib.optionals (!runtimeOnly) (with pkgs; [
|
||||
libgpgerror
|
||||
libgpg-error
|
||||
libpulseaudio
|
||||
alsa-lib
|
||||
openalSoft
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, fetchsvn
|
||||
, cmake
|
||||
, pkg-config
|
||||
@ -20,15 +19,17 @@
|
||||
, mcpp
|
||||
, wiiuse
|
||||
, angelscript
|
||||
, libopenglrecorder
|
||||
, sqlite
|
||||
, Cocoa
|
||||
, IOKit
|
||||
, libsamplerate
|
||||
}:
|
||||
let
|
||||
dir = "stk-code";
|
||||
assets = fetchsvn {
|
||||
url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
|
||||
rev = "18218";
|
||||
sha256 = "11iv3cqzvbjg33zz5i5gkl2syn6mlw9wqv0jc7h36vjnjqjv17xw";
|
||||
rev = "18464";
|
||||
sha256 = "1a84j3psl4cxzkn5ynakpjill7i2f9ki2p729bpmbrvg8fki95aa";
|
||||
name = "stk-assets";
|
||||
};
|
||||
|
||||
@ -44,45 +45,35 @@ let
|
||||
# has been fixed to support it.
|
||||
"enet"
|
||||
# Internal library of STK, nothing to do about it
|
||||
"graphics_engine"
|
||||
# Internal library of STK, nothing to do about it
|
||||
"graphics_utils"
|
||||
# This irrlicht is bundled with cmake
|
||||
# whereas upstream irrlicht still uses
|
||||
# archaic Makefiles, too complicated to switch to.
|
||||
"irrlicht"
|
||||
# Not packaged to this date
|
||||
"libraqm"
|
||||
# Not packaged to this date
|
||||
"libsquish"
|
||||
# Not packaged to this date
|
||||
"sheenbidi"
|
||||
]
|
||||
# Our system angelscript causes linking error on ARM
|
||||
# ld: libangelscript.so: undefined reference to
|
||||
# `CallSystemFunctionNative(asCContext*, asCScriptFunction*, void*, unsigned int*, void*, unsigned long&, void*)'
|
||||
# Bundled angelscript compiles fine
|
||||
++ lib.optional stdenv.hostPlatform.isAarch64 "angelscript";
|
||||
# Not packaged to this date
|
||||
"tinygettext"
|
||||
# Not packaged to this date (needed on Darwin)
|
||||
"mojoal"
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "supertuxkart";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supertuxkart";
|
||||
repo = "stk-code";
|
||||
rev = version;
|
||||
sha256 = "1f98whk0v45jgwcsbdsb1qfambvrnbbgwq0w28kjz4278hinwzq6";
|
||||
name = dir;
|
||||
sha256 = "1llyxkdc4m9gnjxqaxlpwvv3ayvpw2bfjzfkkrljaxhznq811g0l";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Fix build with SDL 2.0.14
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/games-action/supertuxkart/files/supertuxkart-1.2-new-sdl.patch?id=288360dc7ce2f968a2f12099edeace3f3ed1a705";
|
||||
sha256 = "1jgab9393qan8qbqf5bf8cgw4mynlr5a6pggqhybzsmaczgnns3n";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Deletes all bundled libs in stk-code/lib except those
|
||||
# That couldn't be replaced with system packages
|
||||
@ -93,7 +84,11 @@ stdenv.mkDerivation rec {
|
||||
--replace 'NOT (APPLE OR HAIKU)) AND USE_SYSTEM_WIIUSE' 'NOT (HAIKU)) AND USE_SYSTEM_WIIUSE'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
@ -107,15 +102,16 @@ stdenv.mkDerivation rec {
|
||||
harfbuzz
|
||||
mcpp
|
||||
wiiuse
|
||||
angelscript
|
||||
sqlite
|
||||
]
|
||||
++ lib.optional (!stdenv.hostPlatform.isAarch64) angelscript
|
||||
++ lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) libopenglrecorder
|
||||
++ lib.optional stdenv.hostPlatform.isLinux openal
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenAL IOKit Cocoa ];
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenAL IOKit Cocoa libsamplerate ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs
|
||||
# doesn't work with our 2.35.0 on aarch64-linux
|
||||
"-DUSE_SYSTEM_ANGELSCRIPT=${if !stdenv.hostPlatform.isAarch64 then "ON" else "OFF"}"
|
||||
"-DBUILD_RECORDER=${if (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) then "ON" else "OFF"}"
|
||||
"-DUSE_SYSTEM_ANGELSCRIPT=ON"
|
||||
"-DCHECK_ASSETS=OFF"
|
||||
"-DUSE_SYSTEM_WIIUSE=ON"
|
||||
"-DOpenGL_GL_PREFERENCE=GLVND"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,10 +1,6 @@
|
||||
{ lib
|
||||
, fetchgit
|
||||
, fetchCrate
|
||||
, rustPlatform
|
||||
, unzip
|
||||
, rsync
|
||||
, innoextract
|
||||
, curl
|
||||
, cmake
|
||||
, pkg-config
|
||||
, openssl
|
||||
@ -14,14 +10,12 @@ rustPlatform.buildRustPackage rec {
|
||||
pname = "wyvern";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~nicohman/wyvern";
|
||||
rev = version;
|
||||
sha256 = "1sl3yhash1527amc8rs4374fd7jbgnkyy7qpw94ms2gs80sdv3s5";
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-OjL3wEoh4fT2nKqb7lMefP5B0vYyUaTRj09OXPEVfW4=";
|
||||
};
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
|
||||
cargoSha256 = "sha256:1nd5qla3p1jrssg5fqal8m3jcbxax0wsfc8cp97jdrpqlcgqfmrx";
|
||||
cargoSha256 = "sha256-CL6VXe7heyBbGX0qI4uaD7g7DLiFbykSfOcWemnEe8U=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
@ -30,7 +24,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "A simple CLI client for installing and maintaining linux GOG games";
|
||||
homepage = "https://git.sr.ht/~nicohman/wyvern";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers;[ _0x4A6F ];
|
||||
maintainers = with maintainers; [ _0x4A6F ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,13 +19,13 @@ let
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.0.7047"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
|
||||
version = "1.0.7058"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "7c5ead1c196d597384085cc9a609afdc89a43774";
|
||||
sha256 = "00c6il67y9ky0f8f97nn8aqm4klwz59842nsh554w98gwv8w1jjb";
|
||||
rev = "d92fff541bf6fddadabf6ab628ddf8fec41cd52e";
|
||||
sha256 = "1lsg4v15x8i43pwkgn4y8d2m95m6w7izwm4zhspnq8r2lv18lqb2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ];
|
||||
|
||||
@ -292,14 +292,12 @@ let
|
||||
|
||||
/* vim-plug is an extremely popular vim plugin manager.
|
||||
*/
|
||||
/* Remove repeated "/." suffixes from a path */
|
||||
stripDots = path: lib.head (builtins.split "(/\\.)*$" path);
|
||||
plugImpl =
|
||||
(''
|
||||
source ${vimPlugins.vim-plug.rtp}/plug.vim
|
||||
silent! call plug#begin('/dev/null')
|
||||
|
||||
'' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${stripDots pkg.rtp}'") plug.plugins) + ''
|
||||
'' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${pkg.rtp}'") plug.plugins) + ''
|
||||
|
||||
call plug#end()
|
||||
'');
|
||||
|
||||
@ -53,7 +53,10 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
makeFlags = [
|
||||
"prefix=$(out)"
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.nongnu.org/dmidecode/";
|
||||
|
||||
@ -1,22 +1,28 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "sof-firmware";
|
||||
version = "1.7";
|
||||
version = "1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thesofproject";
|
||||
repo = "sof-bin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z0Z4HLsIIuW8E1kFNhAECmzj1HkJVfbEw13B8V7PZLk=";
|
||||
sha256 = "sha256-yife3gO8lXOGwRye213II9rCQqDic7B7w1xW1o7ajF8=";
|
||||
};
|
||||
|
||||
dontFixup = true; # binaries must not be stripped or patchelfed
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
cd "v${version}.x"
|
||||
mkdir -p $out/lib/firmware/intel/
|
||||
cp -a sof-v${version} $out/lib/firmware/intel/sof
|
||||
cp -a sof-tplg-v${version} $out/lib/firmware/intel/sof-tplg
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.248";
|
||||
version = "4.14.249";
|
||||
|
||||
# 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 = "0m5nsd41b08xppcf7vvx8zgj3h3sp3n6xrgxfkccn6n4bk7yx4y9";
|
||||
sha256 = "0wn4yw9fliw3a8knvj2hdprbyyx7akm9ycclr2y1whpa5gmrc3rj";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.208";
|
||||
version = "4.19.209";
|
||||
|
||||
# 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 = "1556bk46v7pjd2xrvkldq254yc18cn9jll25ba8zig57562ahkg7";
|
||||
sha256 = "04z9hxgqw2p86xxi2667kaj2w99xxxiw9gn9i1217c305swxa9vk";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.285";
|
||||
version = "4.4.287";
|
||||
extraMeta.branch = "4.4";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0h8jzb2cg0wg4s07iqkghfxkxrnlxadwk3i3gvg2xs3ra0wrisp1";
|
||||
sha256 = "0qraild006in01vsqbhx1lf585g34skzwi2m3hv3kal8s03q0gzw";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.284";
|
||||
version = "4.9.285";
|
||||
extraMeta.branch = "4.9";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0054b0cm0h2mbf6rxzdgd3c2rfz7xa32qkyr5lv58l2852hf0ri8";
|
||||
sha256 = "1hkkk4mhr5qnrhwqcz0b20rff6j8pnwd868a5hsq8s867pa24ajb";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.70";
|
||||
version = "5.10.71";
|
||||
|
||||
# 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 = "0cmj5l425c6kkaplcp1y692j123lhyqq2jgfi642jzqxf4rnqwvm";
|
||||
sha256 = "15x4jbwy6j78ss31avdl7nr0mw4w6a1y6c6dyljh6gwngp98irh2";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.14.9";
|
||||
version = "5.14.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 = "1rl77k40xp9j0y8q5bgmhfmwiwbrdxjcsaw8dris456mjbdhg3xs";
|
||||
sha256 = "1n454038vp55wbi814fqpidjmk8k6p6h0jl07hknpd6imgh2bkj5";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.150";
|
||||
version = "5.4.151";
|
||||
|
||||
# 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 = "18iaqsbqlvk0j71d4q4h99ah300s0i7jwspr2x6g01shn2xsj97l";
|
||||
sha256 = "04rkymyg79mp1frdlkizc7k33palplmnnnz8klkag9ii7jw3zrxv";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user