Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
1848e071c9
@ -3071,6 +3071,12 @@
|
||||
githubId = 8182846;
|
||||
name = "Francesco Gazzetta";
|
||||
};
|
||||
figsoda = {
|
||||
email = "figsoda@pm.me";
|
||||
github = "figsoda";
|
||||
githubId = 40620903;
|
||||
name = "figsoda";
|
||||
};
|
||||
fionera = {
|
||||
email = "nix@fionera.de";
|
||||
github = "fionera";
|
||||
|
||||
@ -414,6 +414,7 @@ in
|
||||
vector = handleTest ./vector.nix {};
|
||||
victoriametrics = handleTest ./victoriametrics.nix {};
|
||||
virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
|
||||
vscodium = handleTest ./vscodium.nix {};
|
||||
wasabibackend = handleTest ./wasabibackend.nix {};
|
||||
wireguard = handleTest ./wireguard {};
|
||||
wordpress = handleTest ./wordpress.nix {};
|
||||
|
||||
62
nixos/tests/vscodium.nix
Normal file
62
nixos/tests/vscodium.nix
Normal file
@ -0,0 +1,62 @@
|
||||
import ./make-test-python.nix ({ pkgs, ...} :
|
||||
|
||||
{
|
||||
name = "vscodium";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ turion ];
|
||||
};
|
||||
|
||||
machine = { ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./common/user-account.nix
|
||||
./common/x11.nix
|
||||
];
|
||||
|
||||
virtualisation.memorySize = 2047;
|
||||
services.xserver.enable = true;
|
||||
test-support.displayManager.auto.user = "alice";
|
||||
environment.systemPackages = with pkgs; [
|
||||
vscodium
|
||||
];
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
||||
testScript = { nodes, ... }: ''
|
||||
# Start up X
|
||||
start_all()
|
||||
machine.wait_for_x()
|
||||
|
||||
# Create a file that we'll open
|
||||
machine.succeed("su - alice -c 'echo \" Hello World\" > foo.txt'")
|
||||
|
||||
# It's one line long
|
||||
assert "1 foo.txt" in machine.succeed(
|
||||
"su - alice -c 'wc foo.txt -l'"
|
||||
), "File has wrong length"
|
||||
|
||||
# Start VSCodium with that file
|
||||
machine.succeed("su - alice -c 'codium foo.txt' &")
|
||||
|
||||
# Wait for the window to appear
|
||||
machine.wait_for_text("VSCodium")
|
||||
|
||||
# Add a line
|
||||
machine.send_key("ret")
|
||||
|
||||
# Save file
|
||||
machine.send_key("ctrl-s")
|
||||
|
||||
# Wait until the file has been saved
|
||||
machine.sleep(1)
|
||||
|
||||
# Now the file is 2 lines long
|
||||
assert "2 foo.txt" in machine.succeed(
|
||||
"su - alice -c 'wc foo.txt -l'"
|
||||
), "File has wrong length"
|
||||
|
||||
machine.screenshot("VSCodium")
|
||||
'';
|
||||
})
|
||||
23
pkgs/applications/audio/mmtc/default.nix
Normal file
23
pkgs/applications/audio/mmtc/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ fetchFromGitHub, lib, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mmtc";
|
||||
version = "0.2.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "figsoda";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1chcnv8wql6v2vckpzvq6sxgpss7mnxaj008jdm8xalhw9d496s4";
|
||||
};
|
||||
|
||||
cargoSha256 = "06b0hag3s5irvi57n0hc97agfw4sw783lkkl1b26iap6mfbvrqma";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minimal mpd terminal client that aims to be simple yet highly configurable";
|
||||
homepage = "https://github.com/figsoda/mmtc";
|
||||
changelog = "https://github.com/figsoda/mmtc/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
@ -41,6 +41,8 @@ let
|
||||
mopidy-tunein = callPackage ./tunein.nix { };
|
||||
|
||||
mopidy-youtube = callPackage ./youtube.nix { };
|
||||
|
||||
mopidy-subidy = callPackage ./subidy.nix { };
|
||||
};
|
||||
|
||||
in self
|
||||
|
||||
24
pkgs/applications/audio/mopidy/subidy.nix
Normal file
24
pkgs/applications/audio/mopidy/subidy.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ lib, fetchFromGitHub, pythonPackages, mopidy }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "mopidy-subidy";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Prior99";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0c5ghhhrj5v3yp4zmll9ari6r5c6ha8c1izwqshvadn40b02q7xz";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mopidy pythonPackages.py-sonic ];
|
||||
|
||||
checkInputs = with pythonPackages; [ pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.mopidy.com/";
|
||||
description = "Mopidy extension for playing music from a Subsonic-compatible Music Server";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ wenngle ];
|
||||
};
|
||||
}
|
||||
@ -3,6 +3,9 @@
|
||||
, gtk2, atomEnv, at-spi2-atk, autoPatchelfHook
|
||||
, systemd, fontconfig, libdbusmenu
|
||||
|
||||
# Populate passthru.tests
|
||||
, tests
|
||||
|
||||
# Attributes inherit from specific versions
|
||||
, version, src, meta, sourceRoot
|
||||
, executableName, longName, shortName, pname
|
||||
@ -16,7 +19,7 @@ in
|
||||
inherit pname version src sourceRoot;
|
||||
|
||||
passthru = {
|
||||
inherit executableName;
|
||||
inherit executableName tests;
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, callPackage, fetchurl }:
|
||||
{ lib, stdenv, callPackage, fetchurl, nixosTests }:
|
||||
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
@ -45,6 +45,8 @@ in
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
tests = nixosTests.vscodium;
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
Open source source code editor developed by Microsoft for Windows,
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }:
|
||||
|
||||
{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }:
|
||||
let
|
||||
myPatchElf = file: with lib; ''
|
||||
patchelf --set-interpreter \
|
||||
@ -7,22 +6,23 @@ let
|
||||
${file}
|
||||
'';
|
||||
|
||||
udevRules = callPackage ./udev_rules_type1.nix {};
|
||||
udevRules = callPackage ./udev_rules_type1.nix { };
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "brscan4-0.4.8-1";
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb";
|
||||
sha256 = "15hrf1gpm36lniqi6yf47dvdqjinm644xb752c6rcv8n06wb79ag";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
|
||||
sha256 = "0pyprjl0capg403yp6pp07gd6msx9kn7bzjcdswdbn28fyxrk5l4";
|
||||
}
|
||||
else throw "${name} is not supported on ${stdenv.hostPlatform.system} (only i686-linux and x86_64 linux are supported)";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brscan4";
|
||||
version = "0.4.9-1";
|
||||
src = {
|
||||
"i686-linux" = fetchurl {
|
||||
url = "http://download.brother.com/welcome/dlf006646/${pname}-${version}.i386.deb";
|
||||
sha256 = "0pkg9aqvnkpjnb9cgzf7lxw2g4jqrf2w98irkv22r0gfsfs3nwma";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
|
||||
url = "https://download.brother.com/welcome/dlf006645/${pname}-${version}.amd64.deb";
|
||||
sha256 = "0kakkl8rmsi2yr3f8vd1kk8vsl9g2ijhqil1cvvbwrhwgi0b7ai7";
|
||||
};
|
||||
}."${stdenv.hostPlatform.system}";
|
||||
|
||||
unpackPhase = ''
|
||||
ar x $src
|
||||
@ -87,7 +87,7 @@ in stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Brother brscan4 sane backend driver";
|
||||
homepage = "http://www.brother.com";
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ jraygauthier ];
|
||||
};
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ lib, python3, fetchPypi, appdirs, attrs, requests,
|
||||
beautifulsoup4, click-plugins, elasticsearch, flask_login, flask_wtf,
|
||||
pypandoc, python-dotenv, python-frontmatter, tinydb, validators,
|
||||
watchdog, wtforms }:
|
||||
watchdog, wtforms, html2text, flask-compress }:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "archivy";
|
||||
version = "0.9.3";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b6ff08a9ecd0a929663c36c73844ac5cb4dc847e69aae639a450c64d4320a506";
|
||||
sha256 = "FDyUfahjv4zqOVFr0nRhcgxr7mskFP1W/PlhZWx/6E8=";
|
||||
};
|
||||
|
||||
# Relax some dependencies
|
||||
@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
--replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \
|
||||
--replace 'requests ==' 'requests >=' \
|
||||
--replace 'validators ==' 'validators >=' \
|
||||
--replace 'watchdog ==' 'watchdog >='
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -41,6 +40,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
validators
|
||||
watchdog
|
||||
wtforms
|
||||
html2text
|
||||
flask-compress
|
||||
];
|
||||
|
||||
# __init__.py attempts to mkdir in read-only file system
|
||||
|
||||
@ -1,19 +1,18 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "tut";
|
||||
version = "0.0.14";
|
||||
|
||||
goPackagePath = "github.com/RasmusLindroth/tut";
|
||||
goDeps = ./deps.nix;
|
||||
version = "0.0.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RasmusLindroth";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1l7lc6cjx97v9zhc0b6lfzqjmyv1i3qj83drkck36if3mc60vvwi";
|
||||
sha256 = "0g4kbprsdjk2lbx81azdvz8kkhyk370id3622xxssr894v0i7iwj";
|
||||
};
|
||||
|
||||
vendorSha256 = "1kf7ynmxrzvhl028b4nbz9h9v9x5srarsbynpgpp4vicmxqlvrmh";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A TUI for Mastodon with vim inspired keys";
|
||||
homepage = "https://github.com/RasmusLindroth/tut";
|
||||
|
||||
318
pkgs/applications/misc/tut/deps.nix
generated
318
pkgs/applications/misc/tut/deps.nix
generated
@ -1,318 +0,0 @@
|
||||
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/BurntSushi/toml";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/BurntSushi/toml";
|
||||
rev = "v0.3.1";
|
||||
sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/DATA-DOG/go-sqlmock";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/DATA-DOG/go-sqlmock";
|
||||
rev = "v1.3.3";
|
||||
sha256 = "1xrly2vmy1mgj9dbkmivhh8gvq6v9f9xy2yp2dw54i1895zzs928";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/PuerkitoBio/goquery";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/PuerkitoBio/goquery";
|
||||
rev = "v1.5.0";
|
||||
sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/andybalholm/cascadia";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/andybalholm/cascadia";
|
||||
rev = "v1.0.0";
|
||||
sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/davecgh/go-spew";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/davecgh/go-spew";
|
||||
rev = "v1.1.1";
|
||||
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/fatih/color";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/fatih/color";
|
||||
rev = "v1.9.0";
|
||||
sha256 = "086z8ssmr1fn9ba4mqnw7pnccfpys6l5yfhvycv1gdrsk7n27mvs";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gdamore/encoding";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gdamore/encoding";
|
||||
rev = "v1.0.0";
|
||||
sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gdamore/tcell";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gdamore/tcell";
|
||||
rev = "v1.3.0";
|
||||
sha256 = "1csg9qkmbg4ksj5247kgqcy7bxvqgz6b98r0rv2s4c1mkc99gx2r";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gopherjs/gopherjs";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gopherjs/gopherjs";
|
||||
rev = "0766667cb4d1";
|
||||
sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gorilla/websocket";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gorilla/websocket";
|
||||
rev = "v1.4.1";
|
||||
sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/jtolds/gls";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/jtolds/gls";
|
||||
rev = "v4.20.0";
|
||||
sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kyoh86/xdg";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kyoh86/xdg";
|
||||
rev = "v1.2.0";
|
||||
sha256 = "0a5nz53fdz1c2qvwlf2dpjdd72nxri95i6q4b07c37kiipgaxncn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/lucasb-eyer/go-colorful";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/lucasb-eyer/go-colorful";
|
||||
rev = "v1.0.3";
|
||||
sha256 = "12bgz6dxbb2ki1g3x7fg9ipsjgfkd58fp7cdpv63h4kvlj2n7j69";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-colorable";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-colorable";
|
||||
rev = "v0.1.4";
|
||||
sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-isatty";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-isatty";
|
||||
rev = "v0.0.11";
|
||||
sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-mastodon";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-mastodon";
|
||||
rev = "3e91c76504df";
|
||||
sha256 = "1wh2hqrzx80gfs1y34f4h68mnz83asx88v0bsw372ch5j1shswlr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-runewidth";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-runewidth";
|
||||
rev = "v0.0.8";
|
||||
sha256 = "14ilkbhnhl8yj443dd1ga4biapswv4g0b4vm2mix78a8srdww39j";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-tty";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-tty";
|
||||
rev = "v0.0.3";
|
||||
sha256 = "0d1d63q02pc5k5ga8bw4yjbkrli2769vg237psajsskjirjy53vf";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/microcosm-cc/bluemonday";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/microcosm-cc/bluemonday";
|
||||
rev = "v1.0.2";
|
||||
sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pelletier/go-toml";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pelletier/go-toml";
|
||||
rev = "v1.7.0";
|
||||
sha256 = "0sqrwldjj2qxrgjz1diw1ffviya4ma7mz7nhdgydbisi2h55lqla";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/rivo/tview";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/rivo/tview";
|
||||
rev = "ca37f83cb2e7";
|
||||
sha256 = "05nifgrxv6aib8f20mhs9m0grdfdyyg5vyhk6zgwsxjlwbzaj021";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/rivo/uniseg";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/rivo/uniseg";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "0flpc1px1l6b1lxzhdxi0mvpkkjchppvgxshxxnlmm40s76i9ww5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/smartystreets/assertions";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/smartystreets/assertions";
|
||||
rev = "b2de0cb4f26d";
|
||||
sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/smartystreets/goconvey";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/smartystreets/goconvey";
|
||||
rev = "v1.6.4";
|
||||
sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/tomnomnom/linkheader";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/tomnomnom/linkheader";
|
||||
rev = "02ca5825eb80";
|
||||
sha256 = "1ghrv28vrvvrpyr4d4q817yby8g1j04mid8ql00sds1pvfv67d32";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/urfave/cli";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/urfave/cli";
|
||||
rev = "v1.20.0";
|
||||
sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "c2843e01d9a2";
|
||||
sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "d3edc9973b7e";
|
||||
sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sync";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sync";
|
||||
rev = "cd5d95a43a6e";
|
||||
sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "85ca7c5b95cd";
|
||||
sha256 = "1504qkgbhhm4f0bhk77v2r1lj6x171ay5m79alkg78wjb5cign5l";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "v0.3.2";
|
||||
sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/tools";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/tools";
|
||||
rev = "ab21143f2384";
|
||||
sha256 = "15fk0psk53pplpyghz55bhay0kvsv5rikmn5hwgjnnyxq9vfy178";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/check.v1";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/check.v1";
|
||||
rev = "20d25e280405";
|
||||
sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/ini.v1";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/ini.v1";
|
||||
rev = "v1.55.0";
|
||||
sha256 = "1b7wsfal3b3pl5pv5n2qix09b3imh0zhirrphlsg5p2rb8fk0d0j";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/yaml.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/yaml.v2";
|
||||
rev = "v2.2.8";
|
||||
sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helm";
|
||||
version = "3.4.2";
|
||||
version = "3.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helm";
|
||||
repo = "helm";
|
||||
rev = "v${version}";
|
||||
sha256 = "17bb0f2w0qn6zq5isskckwqlscqig2d6pra3f7mfwilnckg1lj9s";
|
||||
sha256 = "sha256-XFWJtzKQrZL6lcr8JNiEQ8ldG5289x5pE21E8XgoYkA=";
|
||||
};
|
||||
vendorSha256 = "0ycp0i26rf3c96i4nqcbh7rb6i6lk62hljcsgsjyggq3pj3gpb4x";
|
||||
vendorSha256 = "sha256-mjWQxCCtTgj1VCFjnuJWgDjwMt/r4jiFC9Of+CXRgPg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,45 +2,43 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "waypoint";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iGR2N1ZYA5G9K2cpfrwWRhSEfehRshx157ot1yq15AY=";
|
||||
sha256 = "sha256-bCvi5xIL6xAtQ9mgf4feh076sAmog/3eGBlgvcLXJyc=";
|
||||
};
|
||||
|
||||
deleteVendor = true;
|
||||
vendorSha256 = "sha256-ArebHOjP3zvpASVAoaPXpSbrG/jq+Jbx7+EaQ1uHSVY=";
|
||||
|
||||
subPackages = ["."];
|
||||
|
||||
nativeBuildInputs = [ go-bindata ];
|
||||
|
||||
# GIT_{COMMIT,DIRTY} filled in blank to prevent trying to run git and ending up blank anyway
|
||||
buildPhase = ''
|
||||
CGO_ENABLED=0 go build -ldflags '-s -w -extldflags "-static"' -o ./internal/assets/ceb/ceb ./cmd/waypoint-entrypoint
|
||||
cd internal/assets
|
||||
go-bindata -pkg assets -o prod.go -tags assetsembedded ./ceb
|
||||
cd ../../
|
||||
CGO_ENABLED=0 go build -ldflags '-s -w -X github.com/hashicorp/waypoint/version.GitDescribe=v${version}' -tags assetsembedded -o ./waypoint ./cmd/waypoint
|
||||
CGO_ENABLED=0 go build -ldflags '-s -w' -tags assetsembedded -o ./waypoint-entrypoint ./cmd/waypoint-entrypoint
|
||||
make bin GIT_DESCRIBE="v${version}" GIT_COMMIT="" GIT_DIRTY=""
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mv waypoint{,-entrypoint} $out/bin/
|
||||
install -D waypoint $out/bin/waypoint
|
||||
'';
|
||||
|
||||
dontPatchELF = true;
|
||||
dontPatchShebangs = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://waypointproject.io";
|
||||
changelog = "https://github.com/hashicorp/waypoint/blob/v${version}/CHANGELOG.md";
|
||||
description = "A tool to build, deploy, and release any application on any platform";
|
||||
longDescription = ''
|
||||
Waypoint allows developers to define their application build, deploy, and release lifecycle as code, reducing the
|
||||
time to deliver deployments through a consistent and repeatable workflow.
|
||||
Waypoint allows developers to define their application build, deploy, and
|
||||
release lifecycle as code, reducing the time to deliver deployments
|
||||
through a consistent and repeatable workflow.
|
||||
'';
|
||||
homepage = "https://waypointproject.io";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ winpat jk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -31,11 +31,11 @@
|
||||
assert pulseaudioSupport -> libpulseaudio != null;
|
||||
|
||||
let
|
||||
version = "5.5.6981.0202";
|
||||
version = "5.5.7011.0206";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
|
||||
sha256 = "05alb81cn1vbpva5rcfwh58sjbg4f2pils4vcdgw6dvi4pbvs694";
|
||||
sha256 = "00ahly3kjjznn73vcxgm5wj2pxgw6wdk6vzgd8svfmnl5kqq6c02";
|
||||
};
|
||||
};
|
||||
dontUnpack = true;
|
||||
|
||||
74
pkgs/applications/office/kbibtex/default.nix
Normal file
74
pkgs/applications/office/kbibtex/default.nix
Normal file
@ -0,0 +1,74 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
# build-time
|
||||
, extra-cmake-modules
|
||||
, shared-mime-info
|
||||
# Qt
|
||||
, qtxmlpatterns
|
||||
, qtwebengine
|
||||
, qca-qt5
|
||||
# KDE
|
||||
, ki18n
|
||||
, kxmlgui
|
||||
, kio
|
||||
, kiconthemes
|
||||
, kitemviews
|
||||
, kparts
|
||||
, kcoreaddons
|
||||
, kservice
|
||||
, ktexteditor
|
||||
, kdoctools
|
||||
, kwallet
|
||||
, kcrash
|
||||
# other
|
||||
, poppler
|
||||
, bibutils
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kbibtex";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/KBibTeX/${version}/kbibtex-${version}.tar.xz";
|
||||
sha256 = "09xcdx363z9hps3wbr1kx96a6q6678y8pg8r3apyps4xm7xm31nr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
shared-mime-info
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtxmlpatterns
|
||||
qtwebengine
|
||||
qca-qt5
|
||||
# TODO qtoauth
|
||||
ki18n
|
||||
kxmlgui
|
||||
kio
|
||||
kiconthemes
|
||||
kitemviews
|
||||
kparts
|
||||
kcoreaddons
|
||||
kservice
|
||||
ktexteditor
|
||||
kdoctools
|
||||
kwallet
|
||||
kcrash
|
||||
poppler
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix" "PATH" ":" "${lib.makeBinPath [ bibutils ]}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bibliography editor for KDE";
|
||||
homepage = "https://userbase.kde.org/KBibTeX";
|
||||
changelog = "https://invent.kde.org/office/kbibtex/-/raw/v${version}/ChangeLog";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wayfire";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/WayfireWM/wayfire/releases/download/${version}/wayfire-${version}.tar.xz";
|
||||
sha256 = "0wc5szslgf8d4r4dlbfgc5v49j2ziaa8fycmknq4p0vl67mh7acq";
|
||||
url = "https://github.com/WayfireWM/wayfire/releases/download/v${version}/wayfire-${version}.tar.xz";
|
||||
sha256 = "19k9nk5whql03ik66i06r4xgxk5v7mpdphjpv13hdw8ba48w73hd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland ];
|
||||
|
||||
@ -1,16 +1,14 @@
|
||||
{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, wayland, wrapGAppsHook
|
||||
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook
|
||||
, gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wcm";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = "wcm";
|
||||
rev = "v${version}";
|
||||
sha256 = "1b22gymqfn0c49nf39676q5bj25rxab874iayiq31cmn14r30dyg";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/WayfireWM/wcm/releases/download/v${version}/wcm-${version}.tar.xz";
|
||||
sha256 = "19za1fnlf5hz4n4mxxwqcr5yxp6mga9ah539ifnjnqrgvj19cjlj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wf-config";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/WayfireWM/wf-config/releases/download/${version}/wf-config-${version}.tar.xz";
|
||||
sha256 = "1a5aqybhbp9dp4jygrm3gbkdap5qbd52y6ihfr4rm1cj37sckcn0";
|
||||
url = "https://github.com/WayfireWM/wf-config/releases/download/v${version}/wf-config-${version}.tar.xz";
|
||||
sha256 = "1bas5gsbnf8jxkkxd95992chz8yk5ckgg7r09gfnmm7xi8w0pyy7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wf-shell";
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
|
||||
# > Note to packagers: do not use the autogenerated "Source code"
|
||||
# > archives from GitHub, but the wf-shell-0.4.0.tar.xz file.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz";
|
||||
sha256 = "0jl8gj185k2ff754lcj5b5nldhkvrhmlaj8lsik4kx78vlb5m3ns";
|
||||
sha256 = "1isybm9lcpxwyf6zh2vzkwrcnw3q7qxm21535g4f08f0l68cd5bl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iconpack-jade";
|
||||
version = "1.24";
|
||||
version = "1.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "madmaxms";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1bns1f3vv7d7ps08plnhl3432cy2l2mhv85h7n4fifjqqi8bll9x";
|
||||
sha256 = "0pwz3l5i93s84iwkn1jq8a150ma96788a0n41xq2cgy00j8h8xh0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Icon pack based upon Faenza and Mint-X";
|
||||
homepage = "https://github.com/madmaxms/iconpack-jade";
|
||||
license = licenses.lgpl3;
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
|
||||
@ -9,10 +9,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lxappearance-0.6.3";
|
||||
pname = "lxappearance";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz";
|
||||
url = "mirror://sourceforge/project/lxde/LXAppearance/${pname}-${version}.tar.xz";
|
||||
sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj";
|
||||
};
|
||||
|
||||
@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Lightweight program for configuring the theme and fonts of gtk applications";
|
||||
homepage = "https://lxde.org/";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ hinton romildo ];
|
||||
};
|
||||
|
||||
@ -1,21 +1,54 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, m4, intltool, libxmlxx, keybinder
|
||||
, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf, gdk-pixbuf-xlib
|
||||
, menu-cache, lxmenu-data, wirelesstools, curl
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
, m4
|
||||
, intltool
|
||||
, libxmlxx
|
||||
, keybinder
|
||||
, gtk2
|
||||
, libX11
|
||||
, libfm
|
||||
, libwnck
|
||||
, libXmu
|
||||
, libXpm
|
||||
, cairo
|
||||
, gdk-pixbuf
|
||||
, gdk-pixbuf-xlib
|
||||
, menu-cache
|
||||
, lxmenu-data
|
||||
, wirelesstools
|
||||
, curl
|
||||
, supportAlsa ? false, alsaLib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lxpanel-0.10.0";
|
||||
pname = "lxpanel";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lxde/${name}.tar.xz";
|
||||
url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
|
||||
sha256 = "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ];
|
||||
buildInputs = [
|
||||
keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf gdk-pixbuf-xlib.dev
|
||||
menu-cache lxmenu-data m4 wirelesstools curl
|
||||
keybinder
|
||||
gtk2
|
||||
libX11
|
||||
libfm
|
||||
libwnck
|
||||
libXmu
|
||||
libXpm
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
gdk-pixbuf-xlib.dev
|
||||
menu-cache
|
||||
lxmenu-data
|
||||
m4
|
||||
wirelesstools
|
||||
curl
|
||||
] ++ lib.optional supportAlsa alsaLib;
|
||||
|
||||
postPatch = ''
|
||||
@ -25,11 +58,11 @@ stdenv.mkDerivation rec {
|
||||
--replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Lightweight X11 desktop panel for LXDE";
|
||||
homepage = "https://lxde.org/";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ lib.maintainers.ryneeverett ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.ryneeverett ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,23 +1,37 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, intltool
|
||||
, gtk2
|
||||
, libX11
|
||||
, xrandr
|
||||
, withGtk3 ? false, gtk3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lxrandr-0.3.2";
|
||||
pname = "lxrandr";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lxde/${name}.tar.xz";
|
||||
url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
|
||||
sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb";
|
||||
};
|
||||
|
||||
configureFlags = lib.optional withGtk3 "--enable-gtk3";
|
||||
|
||||
nativeBuildInputs = [ pkg-config intltool ];
|
||||
buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ];
|
||||
buildInputs = [
|
||||
libX11
|
||||
xrandr
|
||||
(if withGtk3 then gtk3 else gtk2)
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Standard screen manager of LXDE";
|
||||
homepage = "https://lxde.org/";
|
||||
license = lib.licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ rawkode ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -58,9 +58,9 @@ stdenv.mkDerivation rec {
|
||||
preConfigure = "./autogen.sh";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.lxde.org/en/LXSession";
|
||||
description = "Classic LXDE session manager";
|
||||
license = licenses.gpl2Plus;
|
||||
homepage = "https://wiki.lxde.org/en/LXSession";
|
||||
maintainers = [ maintainers.shamilton ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -1,4 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libintl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, intltool
|
||||
, gtk3
|
||||
, libintl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxtask";
|
||||
@ -15,7 +22,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [ "--enable-gtk3" ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.lxde.org/en/LXTask";
|
||||
description = "Lightweight and desktop independent task manager";
|
||||
longDescription = ''
|
||||
LXTask is a lightweight task manager derived from xfce4 task manager
|
||||
@ -24,9 +32,8 @@ stdenv.mkDerivation rec {
|
||||
Desktop Environment, it's totally desktop independent and only
|
||||
requires pure GTK.
|
||||
'';
|
||||
homepage = "https://wiki.lxde.org/en/LXTask";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.romildo ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -40,9 +40,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "GUI configuration tool for compton X composite manager";
|
||||
homepage = "https://github.com/lxqt/compton-conf";
|
||||
license = licenses.lgpl21;
|
||||
description = "GUI configuration tool for compton X composite manager";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -46,9 +46,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Core library of PCManFM-Qt (Qt binding for libfm)";
|
||||
homepage = "https://github.com/lxqt/libfm-qt";
|
||||
license = licenses.lgpl21;
|
||||
description = "Core library of PCManFM-Qt (Qt binding for libfm)";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -40,9 +40,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt implementation of freedesktop.org xdg specs";
|
||||
homepage = "https://github.com/lxqt/libqtxdg";
|
||||
license = licenses.lgpl21;
|
||||
description = "Qt implementation of freedesktop.org xdg specs";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -45,9 +45,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "The image viewer and screenshot tool for lxqt";
|
||||
homepage = "https://github.com/lxqt/lximage-qt";
|
||||
license = licenses.gpl2;
|
||||
description = "The image viewer and screenshot tool for lxqt";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -40,9 +40,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dialogue window providing information about LXQt and the system it's running on";
|
||||
homepage = "https://github.com/lxqt/lxqt-about";
|
||||
license = licenses.lgpl21;
|
||||
description = "Dialogue window providing information about LXQt and the system it's running on";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -47,9 +47,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "LXQt system administration tool";
|
||||
homepage = "https://github.com/lxqt/lxqt-admin";
|
||||
license = licenses.lgpl21;
|
||||
description = "LXQt system administration tool";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -42,9 +42,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Archive tool for the LXQt desktop environment";
|
||||
homepage = "https://github.com/lxqt/lxqt-archiver/";
|
||||
license = licenses.gpl2;
|
||||
description = "Archive tool for the LXQt desktop environment";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ jchw ];
|
||||
};
|
||||
|
||||
@ -44,9 +44,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Various packaging tools and scripts for LXQt applications";
|
||||
homepage = "https://github.com/lxqt/lxqt-build-tools";
|
||||
license = licenses.lgpl21;
|
||||
description = "Various packaging tools and scripts for LXQt applications";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -58,9 +58,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools to configure LXQt and the underlying operating system";
|
||||
homepage = "https://github.com/lxqt/lxqt-config";
|
||||
license = licenses.lgpl21;
|
||||
description = "Tools to configure LXQt and the underlying operating system";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -42,9 +42,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "LXQt service for global keyboard shortcuts registration";
|
||||
homepage = "https://github.com/lxqt/lxqt-globalkeys";
|
||||
license = licenses.lgpl21;
|
||||
description = "LXQt service for global keyboard shortcuts registration";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -42,9 +42,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "The LXQt notification daemon";
|
||||
homepage = "https://github.com/lxqt/lxqt-notificationd";
|
||||
license = licenses.lgpl21;
|
||||
description = "The LXQt notification daemon";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -42,9 +42,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "GUI to query passwords on behalf of SSH agents";
|
||||
homepage = "https://github.com/lxqt/lxqt-openssh-askpass";
|
||||
license = licenses.lgpl21;
|
||||
description = "GUI to query passwords on behalf of SSH agents";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -73,9 +73,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "The LXQt desktop panel";
|
||||
homepage = "https://github.com/lxqt/lxqt-panel";
|
||||
license = licenses.lgpl21;
|
||||
description = "The LXQt desktop panel";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -48,9 +48,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "The LXQt PolicyKit agent";
|
||||
homepage = "https://github.com/lxqt/lxqt-policykit";
|
||||
license = licenses.lgpl21;
|
||||
description = "The LXQt PolicyKit agent";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -48,9 +48,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Power management module for LXQt";
|
||||
homepage = "https://github.com/lxqt/lxqt-powermanagement";
|
||||
license = licenses.lgpl21;
|
||||
description = "Power management module for LXQt";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -47,9 +47,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "LXQt Qt platform integration plugin";
|
||||
homepage = "https://github.com/lxqt/lxqt-qtplugin";
|
||||
license = licenses.lgpl21;
|
||||
description = "LXQt Qt platform integration plugin";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -52,9 +52,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool used to launch programs quickly by typing their names";
|
||||
homepage = "https://github.com/lxqt/lxqt-runner";
|
||||
license = licenses.lgpl21;
|
||||
description = "Tool used to launch programs quickly by typing their names";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -49,9 +49,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "An alternative session manager ported from the original razor-session";
|
||||
homepage = "https://github.com/lxqt/lxqt-session";
|
||||
license = licenses.lgpl21;
|
||||
description = "An alternative session manager ported from the original razor-session";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -44,9 +44,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "GUI frontend for sudo/su";
|
||||
homepage = "https://github.com/lxqt/lxqt-sudo";
|
||||
license = licenses.lgpl21;
|
||||
description = "GUI frontend for sudo/su";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -25,9 +25,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Themes, graphics and icons for LXQt";
|
||||
homepage = "https://github.com/lxqt/lxqt-themes";
|
||||
license = licenses.lgpl21;
|
||||
description = "Themes, graphics and icons for LXQt";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -44,9 +44,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Qt port of obconf, the Openbox configuration tool";
|
||||
homepage = "https://github.com/lxqt/obconf-qt";
|
||||
license = licenses.gpl2;
|
||||
description = "The Qt port of obconf, the Openbox configuration tool";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -39,9 +39,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
|
||||
homepage = "https://github.com/lxqt/pavucontrol-qt";
|
||||
license = licenses.gpl2;
|
||||
description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -47,9 +47,9 @@ mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
|
||||
homepage = "https://github.com/lxqt/pcmanfm-qt";
|
||||
license = licenses.gpl2;
|
||||
description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -40,9 +40,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt based process manager";
|
||||
homepage = "https://github.com/lxqt/qps";
|
||||
license = licenses.gpl2;
|
||||
description = "Qt based process manager";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; linux; # does not build on darwin
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -36,9 +36,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lightweight Qt-based terminal emulator";
|
||||
homepage = "https://github.com/lxqt/qterminal";
|
||||
license = licenses.gpl2;
|
||||
description = "A lightweight Qt-based terminal emulator";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo globin ];
|
||||
};
|
||||
|
||||
@ -32,9 +32,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A terminal emulator widget for Qt 5";
|
||||
homepage = "https://github.com/lxqt/qtermwidget";
|
||||
license = licenses.gpl2;
|
||||
description = "A terminal emulator widget for Qt 5";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -45,9 +45,9 @@ mkDerivation rec {
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Crossplatform tool for fast making screenshots";
|
||||
homepage = "https://github.com/lxqt/screengrab";
|
||||
license = licenses.gpl2;
|
||||
description = "Crossplatform tool for fast making screenshots";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
@ -8,8 +8,9 @@
|
||||
, pkg-config
|
||||
, vala
|
||||
, extraOnly ? false
|
||||
, withGtk3 ? true , gtk3, gtk2
|
||||
, withGtk3 ? false, gtk2, gtk3
|
||||
}:
|
||||
|
||||
let
|
||||
gtk = if withGtk3 then gtk3 else gtk2;
|
||||
inherit (lib) optional;
|
||||
|
||||
51
pkgs/development/libraries/sharness/default.nix
Normal file
51
pkgs/development/libraries/sharness/default.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, perl
|
||||
, perlPackages
|
||||
, sharnessExtensions ? {} }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sharness";
|
||||
version = "1.1.0-dev";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chriscool";
|
||||
repo = pname;
|
||||
rev = "3f238a740156dd2082f4bd60ced205e05894d367"; # 2020-12-09
|
||||
sha256 = "FCYskpIqkrpNaWCi2LkhEkiow4/rXLe+lfEWNUthLUg=";
|
||||
};
|
||||
|
||||
# Used for testing
|
||||
nativeBuildInputs = [ perl perlPackages.IOTty ];
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
|
||||
extensions = lib.mapAttrsToList (k: v: "${k}.sh ${v}") sharnessExtensions;
|
||||
|
||||
postInstall = lib.optionalString (sharnessExtensions != {}) ''
|
||||
extDir=$out/share/sharness/sharness.d
|
||||
mkdir -p "$extDir"
|
||||
linkExtensions() {
|
||||
set -- $extensions
|
||||
while [ $# -ge 2 ]; do
|
||||
ln -s "$2" "$extDir/$1"
|
||||
shift 2
|
||||
done
|
||||
}
|
||||
linkExtensions
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Portable shell library to write, run and analyze automated tests adhering to Test Anything Protocol (TAP)";
|
||||
homepage = "https://github.com/chriscool/sharness";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ maintainers.spacefrogg ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
3033
pkgs/development/node-packages/node-packages.nix
generated
3033
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "anyio";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "agronholm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "06nazfrm2sclp3lpgsn9wl8vmqxvx36s3gr2gnqz3zhjpf3glkxv";
|
||||
sha256 = "0k5c4a7xcbiyah8rgrfh2hwj3l3a9al7rh2lyz9ip4rr1hwnqvaf";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apispec";
|
||||
version = "4.0.0";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "360e28e5e84a4d7023b16de2b897327fe3da63ddc8e01f9165b9113b7fe1c48a";
|
||||
sha256 = "fbbd069caa22c0270bc71a5330b46b5a4e1984d8345b9236ca02fbca23094647";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -1,19 +1,29 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pyhamcrest
|
||||
, pytest-benchmark
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "base58";
|
||||
version = "2.0.1";
|
||||
disabled = isPy27; # python 2 abandoned upstream
|
||||
version = "2.1.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "365c9561d9babac1b5f18ee797508cd54937a724b6e419a130abad69cec5ca79";
|
||||
sha256 = "sha256-FxpUe0o8YeGuOAciSm967HXjZMQ5XnViZJ1zNXaAAaI=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest pyhamcrest ];
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
checkInputs = [
|
||||
pyhamcrest
|
||||
pytest-benchmark
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "base58" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Base58 and Base58Check implementation";
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
pname = "BespON";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a75cd7e62746fb0fef9b98aa157a44f9ed2ef63e952f7ae4ec5b3c2892669187";
|
||||
sha256 = "2f2bda67fea8ee95c8aa7e885835ab88bdbfa392a94077ce1c9d29017420ce7a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ];
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Encodes and decodes data in the BespON format.";
|
||||
homepage = "https://github.com/gpoore/bespon_py";
|
||||
license = licenses.lgpl3;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ synthetica ];
|
||||
};
|
||||
|
||||
|
||||
@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fonttools";
|
||||
version = "4.18.2";
|
||||
version = "4.19.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0h750gvwpsp7fpmgfwkx93gkaf0m1s698g6r7n4xlaji563nlkiv";
|
||||
sha256 = "16jz3g4jzfdc43hs33b59vzd9m233qgflvy3ycdynifqk16lqsp2";
|
||||
};
|
||||
|
||||
# all dependencies are optional, but
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gtts";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pndurette";
|
||||
repo = "gTTS";
|
||||
rev = "v${version}";
|
||||
sha256 = "1a984691kfin1n896p5l7y8ggjzx19ynih2cw040smfms0azhp4w";
|
||||
sha256 = "052l7gk1v0zckraavyba1bc2cqvmrbffwxxjsklgnslbdcg5h514";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -47,6 +47,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "A Python library and CLI tool to interface with Google Translate text-to-speech API";
|
||||
homepage = "https://gtts.readthedocs.io";
|
||||
changelog = "https://gtts.readthedocs.io/en/latest/changelog.html";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ unode ];
|
||||
};
|
||||
|
||||
@ -18,6 +18,10 @@ buildPythonPackage rec {
|
||||
nosetests
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit libvirt;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.libvirt.org/";
|
||||
description = "libvirt Python bindings";
|
||||
|
||||
@ -1,4 +1,12 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, isPy27, nbconvert, pytest, requests, responses }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, nbconvert
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
, responses
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbconflux";
|
||||
@ -14,11 +22,13 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ nbconvert requests ];
|
||||
|
||||
checkInputs = [ pytest responses ];
|
||||
checkInputs = [ pytestCheckHook responses ];
|
||||
|
||||
checkPhase = ''
|
||||
pytest tests
|
||||
'';
|
||||
JUPYTER_PATH="${nbconvert}/share/jupyter";
|
||||
disabledTests = [
|
||||
"test_post_to_confluence"
|
||||
"test_optional_components"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Converts Jupyter Notebooks to Atlassian Confluence (R) pages using nbconvert";
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbsphinx";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "369c16fe93af14c878d61fb3e81d838196fb35b27deade2cd7b95efe1fe56ea0";
|
||||
sha256 = "19lf036h0d9ryqasrh91myhn3dq5zcw4rik9jy6sayq7l6irmm94";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -29,9 +29,13 @@ buildPythonPackage rec {
|
||||
traitlets
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m nbsphinx
|
||||
'';
|
||||
# The package has not tests
|
||||
doCheck = false;
|
||||
|
||||
JUPYTER_PATH = "${nbconvert}/share/jupyter";
|
||||
pythonImportsCheck = [
|
||||
"nbsphinx"
|
||||
];
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
|
||||
28
pkgs/development/python-modules/pkce/default.nix
Normal file
28
pkgs/development/python-modules/pkce/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pkce";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RomeoDespres";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "15fzpp3b5qmj27hpgnwkzjwllgwwdfccizz8ydmliakm2hdr1xpn";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "pkce" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to work with PKCE";
|
||||
homepage = "https://github.com/RomeoDespres/pkce";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -1,25 +1,37 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, requests
|
||||
, tqdm, websocket_client, pytest, pillow, isPy27 }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, requests
|
||||
, tqdm
|
||||
, websocket_client
|
||||
, isPy27
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PlexAPI";
|
||||
version = "4.1.2";
|
||||
version = "4.3.1";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pkkid";
|
||||
repo = "python-plexapi";
|
||||
rev = version;
|
||||
sha256 = "1l955q1q6lljq3bmyiayr33gzxrlw16xdwgjdaflznvyg16fcjkk";
|
||||
sha256 = "sha256-gRXNOGd9YGcGysKbAtiNwi5NxPvv39F6PEXBjiYbVq4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests tqdm websocket_client ];
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
tqdm
|
||||
websocket_client
|
||||
];
|
||||
|
||||
checkInputs = [ pytest pillow ];
|
||||
# Tests require a running Plex instance
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "plexapi" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pkkid/python-plexapi";
|
||||
description = "Python bindings for the Plex API";
|
||||
homepage = "https://github.com/pkkid/python-plexapi";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ colemickens ];
|
||||
};
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "praw";
|
||||
version = "7.1.3";
|
||||
version = "7.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praw-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ndj7JNRQVLlWyOkS7zSi3B07mZyulyIL0Ju3owNoAsw=";
|
||||
sha256 = "sha256-onxag3kmswqqSycbwW+orofrukry0pCaRSxVRq2u53A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,21 +1,21 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, poetry
|
||||
, aiohttp
|
||||
, numpy
|
||||
, pysmb
|
||||
, aresponses
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, poetry-core
|
||||
, pysmb
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyairvisual";
|
||||
version = "5.0.5";
|
||||
version = "5.0.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -24,10 +24,10 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0jjvng3py5g97gvx6rdbk5zxbn5rw8gq1ki4qi4vfsypchxbpz2q";
|
||||
sha256 = "sha256-7u8AwIr1Ah/7zCfXFwj/C/CaD/B3uLRkZ8Gf6d18Xp0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry ];
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
|
||||
@ -1,26 +1,26 @@
|
||||
{ lib
|
||||
, aiodns
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, beautifulsoup4
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pkce
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymyq";
|
||||
version = "2.0.14";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arraylabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "18825b9c6qk4zcvva79hpg6098z4zqxyapnqmjsli23npw0zh67w";
|
||||
sha256 = "sha256-uCXgJxMy5gZQBvhHnmfev/rfJXOjhLqZdOrn8SetUT0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiodns
|
||||
aiohttp
|
||||
async-timeout
|
||||
beautifulsoup4
|
||||
pkce
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
|
||||
@ -30,7 +30,15 @@ buildPythonPackage rec {
|
||||
pytestcov
|
||||
];
|
||||
|
||||
disabledTests = [ "test_to_json_schema_complex_regular_expression" ];
|
||||
disabledTests = [
|
||||
# https://github.com/encode/typesystem/issues/102. cosmetic issue where python3.8 changed
|
||||
# the default string formatting of regular expression flags which breaks test assertion
|
||||
"test_to_json_schema_complex_regular_expression"
|
||||
];
|
||||
disabledTestFiles = [
|
||||
# for some reason jinja2 not picking up forms directory (1% of tests)
|
||||
"tests/test_forms.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A type system library for Python";
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kustomize";
|
||||
version = "3.9.2";
|
||||
# rev is the 3.9.2 commit, mainly for kustomize version command output
|
||||
rev = "e98eada7365fc564c9aba392e954f306a9cbf1dd";
|
||||
version = "3.9.3";
|
||||
# rev is the 3.9.3 commit, mainly for kustomize version command output
|
||||
rev = "1ae8303bdc9372bc7c15942df6e9cf5d67fdba1a";
|
||||
|
||||
buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in
|
||||
''
|
||||
@ -17,13 +17,13 @@ buildGoModule rec {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = pname;
|
||||
rev = "kustomize/v${version}";
|
||||
sha256 = "0p1rxswfaj0g3y8nfw70qmxrlyv1pnzkapy1mxpzzyf04mmhg7wn";
|
||||
sha256 = "147g8mhgcb8sjx10sz7r9yh84gqxwk6dald848jim2v2rax47v0p";
|
||||
};
|
||||
|
||||
# avoid finding test and development commands
|
||||
sourceRoot = "source/kustomize";
|
||||
|
||||
vendorSha256 = "1pv8g0nnrpzbvd6dqgnrw2i27xkilbrr9npdz6pxr7mmbcg3w3w9";
|
||||
vendorSha256 = "0ps4is8x2akvvvvin9sqdyjg4ms3b5b5y15923rs65fd7x33rxgp";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Customization of kubernetes YAML configurations";
|
||||
@ -34,6 +34,6 @@ buildGoModule rec {
|
||||
'';
|
||||
homepage = "https://github.com/kubernetes-sigs/kustomize";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime Chili-Man];
|
||||
maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime Chili-Man ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
{
|
||||
rust-analyzer-unwrapped = callPackage ./generic.nix rec {
|
||||
rev = "2021-02-01";
|
||||
rev = "2021-02-08";
|
||||
version = "unstable-${rev}";
|
||||
sha256 = "sha256-bPv51Jp6zJRdNJehuR8LVaBw/hubSeHbI5BeMwqEn4M=";
|
||||
cargoSha256 = "sha256-5g9wFQ6qlkJgSHLSLS0pad00XT7KflyGAq8/BknF9/M=";
|
||||
sha256 = "sha256-Idaaw6d0lvBUyZxpHKQ94aMtgM0zb0P8QRh+3pctX4k=";
|
||||
cargoSha256 = "sha256-J6Hia83biutScZt/BMO4/qXYi35/Ec9MeaHeDG8Lqmc=";
|
||||
};
|
||||
|
||||
rust-analyzer = callPackage ./wrapper.nix {} {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8, llvmPackages_latest }:
|
||||
{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8 }:
|
||||
|
||||
let
|
||||
inherit (vscode-utils) buildVscodeMarketplaceExtension;
|
||||
@ -689,9 +689,7 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
vadimcn.vscode-lldb = callPackage ./vscode-lldb {
|
||||
lldb = llvmPackages_latest.lldb;
|
||||
};
|
||||
vadimcn.vscode-lldb = callPackage ./vscode-lldb { };
|
||||
|
||||
vincaslt.highlight-matching-tag = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
|
||||
@ -1,24 +1,24 @@
|
||||
{
|
||||
"name": "vscode-lldb",
|
||||
"version": "1.5.3",
|
||||
"dependencies": {
|
||||
"@types/json5": "^0.0.30",
|
||||
"@types/mocha": "^7.0.1",
|
||||
"@types/node": "^8.10.50",
|
||||
"@types/vscode": "^1.31.0",
|
||||
"@types/yauzl": "^2.9.0",
|
||||
"json5": "^2.1.0",
|
||||
"memory-streams": "^0.1.3",
|
||||
"mocha": "^7.0.1",
|
||||
"source-map-support": "^0.5.12",
|
||||
"string-argv": "^0.3.1",
|
||||
"ts-loader": "^6.2.1",
|
||||
"typescript": "^3.7.0",
|
||||
"vsce": "^1.73.0",
|
||||
"vscode-debugadapter-testsupport": "^1.35.0",
|
||||
"vscode-debugprotocol": "^1.35.0",
|
||||
"webpack": "^4.39.1",
|
||||
"webpack-cli": "^3.3.7",
|
||||
"yauzl": "^2.10.0"
|
||||
}
|
||||
"name": "vscode-lldb",
|
||||
"version": "1.6.1",
|
||||
"dependencies": {
|
||||
"string-argv": "^0.3.1",
|
||||
"yaml": "^1.10.0",
|
||||
"yauzl": "^2.10.0",
|
||||
"@types/vscode": "^1.31.0",
|
||||
"@types/node": "^8.10.50",
|
||||
"@types/mocha": "^7.0.1",
|
||||
"@types/yauzl": "^2.9.0",
|
||||
"@types/json5": "^0.0.30",
|
||||
"typescript": "^3.7.0",
|
||||
"mocha": "^7.0.1",
|
||||
"source-map-support": "^0.5.12",
|
||||
"memory-streams": "^0.1.3",
|
||||
"vscode-debugprotocol": "^1.35.0",
|
||||
"vscode-debugadapter-testsupport": "^1.35.0",
|
||||
"vsce": "^1.73.0",
|
||||
"webpack": "^4.39.1",
|
||||
"webpack-cli": "^3.3.7",
|
||||
"ts-loader": "^6.2.1"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,35 +1,25 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 890abd4..157a8a1 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -9,13 +9,6 @@ include(cmake/CopyFiles.cmake)
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
set(CMAKE_INSTALL_PREFIX $ENV{HOME}/.vscode/extensions/vscode-lldb CACHE PATH "Install location")
|
||||
|
||||
-set(LLDB_ROOT $ENV{LLDB_ROOT} CACHE PATH "Root of LLDB build directory")
|
||||
-if (LLDB_ROOT)
|
||||
- message("Using LLDB from ${LLDB_ROOT}")
|
||||
@@ -16,13 +16,6 @@ endif()
|
||||
set(VERSION "${VERSION}${VERSION_SUFFIX}")
|
||||
message("Version ${VERSION}")
|
||||
|
||||
-set(LLDB_PACKAGE $ENV{LLDB_PACKAGE} CACHE PATH "Zip archive containing LLDB files")
|
||||
-if (LLDB_PACKAGE)
|
||||
- message("Using LLDB_PACKAGE=${LLDB_PACKAGE}")
|
||||
-else()
|
||||
- message(FATAL_ERROR "LLDB_ROOT not set." )
|
||||
- message(FATAL_ERROR "LLDB_PACKAGE not set." )
|
||||
-endif()
|
||||
-
|
||||
set(TEST_TIMEOUT 5000 CACHE STRING "Test timeout [ms]")
|
||||
|
||||
# General OS-specific definitions
|
||||
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||
set(DylibPrefix lib)
|
||||
@@ -64,8 +57,9 @@ set(UpdateFile ${CMAKE_COMMAND} -E copy_if_different)
|
||||
|
||||
# Adapter
|
||||
|
||||
-add_subdirectory(adapter)
|
||||
-add_subdirectory(lldb)
|
||||
+add_custom_target(adapter)
|
||||
+add_custom_target(lldb)
|
||||
+add_custom_target(codelldb)
|
||||
|
||||
# Extension package content
|
||||
|
||||
@@ -74,16 +68,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY)
|
||||
@@ -87,16 +80,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY)
|
||||
configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js @ONLY)
|
||||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
|
||||
-# Run 'npm install'
|
||||
-execute_process(
|
||||
- COMMAND ${NPM} install
|
||||
@ -42,4 +32,3 @@
|
||||
-
|
||||
# Copy it back, so we can commit the lock file.
|
||||
file(COPY ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
@ -1,100 +1,94 @@
|
||||
{ lib, stdenv, vscode-utils, fetchFromGitHub, rustPlatform, makeWrapper, jq
|
||||
, nodePackages, cmake, nodejs, unzip, python3, lldb, breakpointHook
|
||||
, setDefaultLldbPath ? true
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, jq, callPackage
|
||||
, nodePackages, cmake, nodejs, unzip, python3
|
||||
}:
|
||||
assert lib.versionAtLeast python3.version "3.5";
|
||||
let
|
||||
publisher = "vadimcn";
|
||||
name = "vscode-lldb";
|
||||
version = "1.5.3";
|
||||
|
||||
dylibExt = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
pname = "vscode-lldb";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vadimcn";
|
||||
repo = "vscode-lldb";
|
||||
rev = "v${version}";
|
||||
sha256 = "1139945j3z0fxc3nlyvd81k0ypymqsj051idrbgbibwshpi86y93";
|
||||
sha256 = "sha256-mi+AeHg9zO0vjF0OZCufPkliInqxTvDGV350wqAwe90=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
adapter = rustPlatform.buildRustPackage {
|
||||
pname = "${name}-adapter";
|
||||
inherit version src;
|
||||
lldb = callPackage ./lldb.nix {};
|
||||
|
||||
cargoSha256 = "0jl4msf2jcjxddwqkx8fr0c35wg4vwvg5c19mihri1v34i09zc5r";
|
||||
adapter = rustPlatform.buildRustPackage {
|
||||
pname = "${pname}-adapter";
|
||||
inherit version src;
|
||||
|
||||
# It will pollute the build environment of `buildRustPackage`.
|
||||
cargoPatches = [ ./reset-cargo-config.patch ];
|
||||
|
||||
cargoSha256 = "sha256-HPVbqYsst/iFrHn5wvmWtqeVHOHR7JT8lu+/xZq1lK0=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildAndTestSubdir = "adapter";
|
||||
|
||||
# Hack: Need a nightly compiler.
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
cargoFlags = [
|
||||
"--lib"
|
||||
"--bin=codelldb"
|
||||
"--features=weak-linkage"
|
||||
];
|
||||
|
||||
# `adapter` expects a special hierarchy to resolve everything well.
|
||||
postInstall = ''
|
||||
mkdir -p $out/adapter
|
||||
mv -t $out/adapter \
|
||||
$out/bin/* \
|
||||
$out/lib/* \
|
||||
./adapter/*.py \
|
||||
./formatters/*.py
|
||||
rmdir $out/{bin,lib}
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/adapter/codelldb \
|
||||
--prefix PATH : "${python3}/bin" \
|
||||
--prefix LD_LIBRARY_PATH : "${python3}/lib"
|
||||
'';
|
||||
# Tests are linked to liblldb but it is not available here.
|
||||
doCheck = false;
|
||||
};
|
||||
|
||||
build-deps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps";
|
||||
nodeDeps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps";
|
||||
|
||||
vsix = stdenv.mkDerivation {
|
||||
name = "${name}-${version}-vsix";
|
||||
inherit src;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "vscode-extension-${pname}";
|
||||
inherit src;
|
||||
vscodeExtUniqueId = "${publisher}.${pname}";
|
||||
installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}";
|
||||
|
||||
# Only build the extension. We handle `adapter` and `lldb` with nix.
|
||||
patches = [ ./cmake-build-extension-only.patch ];
|
||||
nativeBuildInputs = [ cmake nodejs unzip makeWrapper ];
|
||||
|
||||
nativeBuildInputs = [ cmake nodejs unzip breakpointHook ];
|
||||
patches = [ ./cmake-build-extension-only.patch ];
|
||||
|
||||
postConfigure = ''
|
||||
cp -r ${build-deps}/lib/node_modules/vscode-lldb/{node_modules,package-lock.json} .
|
||||
'';
|
||||
|
||||
makeFlags = [ "vsix_bootstrap" ];
|
||||
|
||||
installPhase = ''
|
||||
unzip ./codelldb-bootstrap.vsix 'extension/*' -d ./vsix-extracted
|
||||
mv vsix-extracted/extension $out
|
||||
|
||||
ln -s ${adapter}/adapter $out
|
||||
# Mark that adapter and lldb are installed.
|
||||
touch $out/platform.ok
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
};
|
||||
|
||||
in vscode-utils.buildVscodeExtension {
|
||||
inherit name;
|
||||
src = vsix;
|
||||
|
||||
nativeBuildInputs = lib.optional setDefaultLldbPath jq;
|
||||
postUnpack = lib.optionalString setDefaultLldbPath ''
|
||||
jq '.contributes.configuration.properties."lldb.library".default = $s' \
|
||||
--arg s "${lldb}/lib/liblldb.so" \
|
||||
$sourceRoot/package.json >$sourceRoot/package.json.new
|
||||
mv $sourceRoot/package.json.new $sourceRoot/package.json
|
||||
postConfigure = ''
|
||||
cp -r ${nodeDeps}/lib/node_modules/vscode-lldb/{node_modules,package-lock.json} .
|
||||
'';
|
||||
|
||||
vscodeExtUniqueId = "${publisher}.${name}";
|
||||
cmakeFlags = [
|
||||
# Do not append timestamp to version.
|
||||
"-DVERSION_SUFFIX="
|
||||
];
|
||||
makeFlags = [ "vsix_bootstrap" ];
|
||||
|
||||
installPhase = ''
|
||||
ext=$out/$installPrefix
|
||||
runHook preInstall
|
||||
|
||||
unzip ./codelldb-bootstrap.vsix 'extension/*' -d ./vsix-extracted
|
||||
|
||||
mkdir -p $ext/{adapter,formatters}
|
||||
mv -t $ext vsix-extracted/extension/*
|
||||
cp -t $ext/adapter ${adapter}/{bin,lib}/* ../adapter/*.py
|
||||
cp -t $ext/formatters ../formatters/*.py
|
||||
ln -s ${lldb} $ext/lldb
|
||||
# Mark that all components are installed.
|
||||
touch $ext/platform.ok
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# `adapter` will find python binary and libraries at runtime.
|
||||
fixupPhase = ''
|
||||
wrapProgram $out/$installPrefix/adapter/codelldb \
|
||||
--prefix PATH : "${python3}/bin" \
|
||||
--prefix LD_LIBRARY_PATH : "${python3}/lib"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit lldb adapter;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A native debugger extension for VSCode based on LLDB";
|
||||
@ -102,5 +96,6 @@ in vscode-utils.buildVscodeExtension {
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ oxalica ];
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin; # Build failed on x86_64-darwin currently.
|
||||
};
|
||||
}
|
||||
|
||||
23
pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix
Normal file
23
pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix
Normal file
@ -0,0 +1,23 @@
|
||||
# Patched lldb for Rust language support.
|
||||
{ lldb_11, fetchFromGitHub }:
|
||||
let
|
||||
llvmSrc = fetchFromGitHub {
|
||||
owner = "vadimcn";
|
||||
repo = "llvm-project";
|
||||
rev = "dd7efd9ea2d38e3227bc2e83a99772aceeb44242";
|
||||
sha256 = "sha256-XY8J8Ie1cWb6ok72Gju/KUxZ4fIFQVitYVnuCezGRKQ=";
|
||||
};
|
||||
in lldb_11.overrideAttrs (oldAttrs: {
|
||||
src = "${llvmSrc}/lldb";
|
||||
|
||||
passthru = (oldAttrs.passthru or {}) // {
|
||||
inherit llvmSrc;
|
||||
};
|
||||
|
||||
doInstallCheck = true;
|
||||
postInstallCheck = (oldAttrs.postInstallCheck or "") + ''
|
||||
versionOutput="$($out/bin/lldb --version)"
|
||||
echo "'lldb --version' returns: $versionOutput"
|
||||
echo "$versionOutput" | grep -q 'rust-enabled'
|
||||
'';
|
||||
})
|
||||
35
pkgs/misc/vscode-extensions/vscode-lldb/update.sh
Executable file
35
pkgs/misc/vscode-extensions/vscode-lldb/update.sh
Executable file
@ -0,0 +1,35 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p jq nix-prefetch
|
||||
set -eo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
if [[ $# -ne 1 ]]; then
|
||||
echo "Usage: ./update.sh <version>"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "
|
||||
FIXME: This script doesn't update patched lldb. Please manually check branches
|
||||
of https://github.com/vadimcn/llvm-project and update lldb with correct version of LLVM.
|
||||
"
|
||||
|
||||
nixpkgs=../../../..
|
||||
nixFile=./default.nix
|
||||
owner=vadimcn
|
||||
repo=vscode-lldb
|
||||
version="$1"
|
||||
|
||||
sed -E 's/\bversion = ".*?"/version = "'$version'"/' --in-place "$nixFile"
|
||||
srcHash=$(nix-prefetch fetchFromGitHub --owner vadimcn --repo vscode-lldb --rev "v$version" --fetchSubmodules)
|
||||
sed -E 's/\bsha256 = ".*?"/sha256 = "'$srcHash'"/' --in-place "$nixFile"
|
||||
cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })")
|
||||
sed -E 's#\bcargoSha256 = ".*?"#cargoSha256 = "'$cargoHash'"#' --in-place "$nixFile"
|
||||
|
||||
src="$(nix-build $nixpkgs -A vscode-extensions.vadimcn.vscode-lldb.src --no-out-link)"
|
||||
jq '{ name, version: $version, dependencies: (.dependencies + .devDependencies) }' \
|
||||
--arg version "$version" \
|
||||
"$src/package.json" \
|
||||
> build-deps/package.json
|
||||
|
||||
# Regenerate nodePackages.
|
||||
cd "$nixpkgs/pkgs/development/node-packages"
|
||||
exec ./generate.sh
|
||||
@ -30,6 +30,16 @@ stdenv.mkDerivation rec {
|
||||
"DEFAULT_SEMANAGE_CONF_LOCATION=$(out)/etc/selinux/semanage.conf"
|
||||
];
|
||||
|
||||
# The following turns the 'clobbered' error into a warning
|
||||
# which should fix the following error:
|
||||
#
|
||||
# semanage_store.c: In function 'semanage_exec_prog':
|
||||
# semanage_store.c:1278:6: error: variable 'i' might be clobbered by 'longjmp' or 'vfork' [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wclobbered-Werror=clobbered8;;]
|
||||
# 1278 | int i;
|
||||
# | ^
|
||||
# cc1: all warnings being treated as errors
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=clobbered" ];
|
||||
|
||||
installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ];
|
||||
|
||||
meta = removeAttrs libsepol.meta ["outputsToInstall"] // {
|
||||
|
||||
@ -370,6 +370,16 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
spnego-http-auth = {
|
||||
src = fetchFromGitHub {
|
||||
name = "spnego-http-auth";
|
||||
owner = "stnoonan";
|
||||
repo = "spnego-http-auth-nginx-module";
|
||||
rev = "72c8ee04c81f929ec84d5a6d126f789b77781a8c";
|
||||
sha256 = "05rw3a7cv651951li995r5l1yzz6kwkm2xpbd59jsfzd74bw941i";
|
||||
};
|
||||
};
|
||||
|
||||
statsd = {
|
||||
src = fetchFromGitHub {
|
||||
name = "statsd";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.23.0";
|
||||
version = "1.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LVWUfaACdDp9xsuXHysPO/8QMdaDqS+yhP2U9cc4jh4=";
|
||||
sha256 = "sha256-uriXZ4fEUswSBh9hv122wkAPHOnmt6+AodKkCHAMSh8=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/exoscale/cli";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "11fd32qb69g23lxrynsnfy8a783sl60rzknvq4shdg41p2ikigdk";
|
||||
sha256 = "sha256-E/tPjVc+XLDCFYzloAipwWjB4I86kAe/6NVoJSCrY2M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "09birwc8x90l2y0znf4fwny3phnmq0cz0l2z3xzwg0j3msrdl2np";
|
||||
vendorSha256 = "sha256-YoQF0Eug747LhsR3V0IplwXgm0ndDqK1pUVjguOhjOU=";
|
||||
|
||||
subPackages = [ "cmd/trivy" ];
|
||||
|
||||
|
||||
@ -1,16 +1,70 @@
|
||||
{ callPackage, fetchurl, fetchpatch }:
|
||||
{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert, nixopsAzurePackages ? []
|
||||
, fetchurl, fetchpatch
|
||||
}:
|
||||
|
||||
callPackage ./generic.nix (rec {
|
||||
let
|
||||
version = "1.7";
|
||||
|
||||
in python2Packages.buildPythonApplication {
|
||||
pname = "nixops";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
|
||||
sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# follow redirect in nixos-infect. Remove with the next release.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/NixOS/nixops/commit/fb6d4665e8efd858a215bbaaf079ec3f5ebc49b8.patch";
|
||||
sha256 = "1hbhykl811zsqlaj3y5m9d8lfsal6ps6n5p16ah6lqy2s18ap9d0";
|
||||
})
|
||||
./optional-virtd.patch
|
||||
];
|
||||
})
|
||||
|
||||
buildInputs = [ libxslt ];
|
||||
|
||||
pythonPath = with python2Packages;
|
||||
[ prettytable
|
||||
boto
|
||||
boto3
|
||||
hetzner
|
||||
libcloud
|
||||
adal
|
||||
# Go back to sqlite once Python 2.7.13 is released
|
||||
pysqlite
|
||||
datadog
|
||||
digital-ocean
|
||||
typing
|
||||
]
|
||||
++ lib.optional (!libvirt.passthru.libvirt.meta.insecure or true) libvirt
|
||||
++ nixopsAzurePackages;
|
||||
|
||||
checkPhase =
|
||||
# Ensure, that there are no (python) import errors
|
||||
''
|
||||
SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt \
|
||||
HOME=$(pwd) \
|
||||
$out/bin/nixops --version
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
make -C doc/manual install nixops.1 docbookxsl=${docbook_xsl_ns}/xml/xsl/docbook \
|
||||
docdir=$out/share/doc/nixops mandir=$out/share/man
|
||||
|
||||
mkdir -p $out/share/nix/nixops
|
||||
cp -av "nix/"* $out/share/nix/nixops
|
||||
|
||||
# Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
|
||||
# the version of openssh is causing errors when have big networks (40+)
|
||||
wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/NixOS/nixops";
|
||||
description = "NixOS cloud provisioning and deployment tool";
|
||||
maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.lgpl3;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert, nixopsAzurePackages ? []
|
||||
# version args
|
||||
, src, version
|
||||
, meta ? {}
|
||||
, patches ? null
|
||||
}:
|
||||
|
||||
python2Packages.buildPythonApplication {
|
||||
name = "nixops-${version}";
|
||||
inherit version src patches;
|
||||
|
||||
buildInputs = [ libxslt ];
|
||||
|
||||
pythonPath = with python2Packages;
|
||||
[ prettytable
|
||||
boto
|
||||
boto3
|
||||
hetzner
|
||||
libcloud
|
||||
adal
|
||||
# Go back to sqlite once Python 2.7.13 is released
|
||||
pysqlite
|
||||
datadog
|
||||
digital-ocean
|
||||
libvirt
|
||||
typing
|
||||
] ++ nixopsAzurePackages;
|
||||
|
||||
checkPhase =
|
||||
# Ensure, that there are no (python) import errors
|
||||
''
|
||||
SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt \
|
||||
HOME=$(pwd) \
|
||||
$out/bin/nixops --version
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
make -C doc/manual install nixops.1 docbookxsl=${docbook_xsl_ns}/xml/xsl/docbook \
|
||||
docdir=$out/share/doc/nixops mandir=$out/share/man
|
||||
|
||||
mkdir -p $out/share/nix/nixops
|
||||
cp -av "nix/"* $out/share/nix/nixops
|
||||
|
||||
# Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
|
||||
# the version of openssh is causing errors when have big networks (40+)
|
||||
wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/NixOS/nixops";
|
||||
description = "NixOS cloud provisioning and deployment tool";
|
||||
maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.lgpl3;
|
||||
} // meta;
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
{ callPackage, newScope, pkgs, fetchurl }:
|
||||
|
||||
callPackage ./generic.nix (rec {
|
||||
version = "1.6.1";
|
||||
src = fetchurl {
|
||||
url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
|
||||
sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3";
|
||||
};
|
||||
nixopsAzurePackages = with python2Packages; [
|
||||
azure-storage
|
||||
azure-mgmt-compute
|
||||
azure-mgmt-network
|
||||
azure-mgmt-resource
|
||||
azure-mgmt-storage
|
||||
];
|
||||
# nixops is incompatible with the most recent versions of listed
|
||||
# azure-mgmt-* packages, therefore we are pinning them to
|
||||
# package-private versions, so that they don't get trampled by
|
||||
# updates.
|
||||
# see
|
||||
# https://github.com/NixOS/nixops/issues/1065
|
||||
python2Packages = pkgs.python2Packages.override {
|
||||
overrides = (self: super: let callPackage = newScope self; in {
|
||||
azure-mgmt-compute = callPackage ./azure-mgmt-compute { };
|
||||
azure-mgmt-network = callPackage ./azure-mgmt-network { };
|
||||
azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { };
|
||||
azure-mgmt-resource = callPackage ./azure-mgmt-resource { };
|
||||
azure-mgmt-storage = callPackage ./azure-mgmt-storage { };
|
||||
azure-storage = callPackage ./azure-storage { };
|
||||
});
|
||||
};
|
||||
})
|
||||
24
pkgs/tools/package-management/nixops/optional-virtd.patch
Normal file
24
pkgs/tools/package-management/nixops/optional-virtd.patch
Normal file
@ -0,0 +1,24 @@
|
||||
diff --git a/nixops/backends/libvirtd.py b/nixops/backends/libvirtd.py
|
||||
index bc5f4af7..edd1348b 100644
|
||||
--- a/nixops/backends/libvirtd.py
|
||||
+++ b/nixops/backends/libvirtd.py
|
||||
@@ -8,12 +8,18 @@ import shutil
|
||||
import string
|
||||
import subprocess
|
||||
import time
|
||||
-import libvirt
|
||||
|
||||
from nixops.backends import MachineDefinition, MachineState
|
||||
import nixops.known_hosts
|
||||
import nixops.util
|
||||
|
||||
+try:
|
||||
+ import libvirt
|
||||
+except:
|
||||
+ class libvirt(object):
|
||||
+ def __getattribute__(self, name):
|
||||
+ raise ValueError("The libvirt backend has been disabled because of security issues.")
|
||||
+
|
||||
# to prevent libvirt errors from appearing on screen, see
|
||||
# https://www.redhat.com/archives/libvirt-users/2017-August/msg00011.html
|
||||
|
||||
@ -16616,6 +16616,8 @@ in
|
||||
|
||||
shapelib = callPackage ../development/libraries/shapelib { };
|
||||
|
||||
sharness = callPackage ../development/libraries/sharness { };
|
||||
|
||||
shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { };
|
||||
|
||||
skaffold = callPackage ../development/tools/skaffold { };
|
||||
@ -23075,6 +23077,8 @@ in
|
||||
|
||||
k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
|
||||
|
||||
kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };
|
||||
|
||||
kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
|
||||
|
||||
kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
|
||||
@ -23547,6 +23551,8 @@ in
|
||||
|
||||
mmsd = callPackage ../tools/networking/mmsd { };
|
||||
|
||||
mmtc = callPackage ../applications/audio/mmtc { };
|
||||
|
||||
moc = callPackage ../applications/audio/moc { };
|
||||
|
||||
mod-distortion = callPackage ../applications/audio/mod-distortion { };
|
||||
@ -23605,6 +23611,7 @@ in
|
||||
mopidy-soundcloud
|
||||
mopidy-spotify
|
||||
mopidy-spotify-tunigo
|
||||
mopidy-subidy
|
||||
mopidy-tunein
|
||||
mopidy-youtube;
|
||||
|
||||
@ -28794,8 +28801,6 @@ in
|
||||
|
||||
nixops = callPackage ../tools/package-management/nixops { };
|
||||
|
||||
nixops_1_6_1 = callPackage ../tools/package-management/nixops/nixops-v1_6_1.nix {};
|
||||
|
||||
nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { });
|
||||
|
||||
nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { };
|
||||
|
||||
@ -4897,6 +4897,8 @@ in {
|
||||
|
||||
pixelmatch = callPackage ../development/python-modules/pixelmatch { };
|
||||
|
||||
pkce = callPackage ../development/python-modules/pkce { };
|
||||
|
||||
pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkg-config; };
|
||||
|
||||
pkginfo = callPackage ../development/python-modules/pkginfo { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user