Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-02-16 06:16:35 +00:00 committed by GitHub
commit 60a01d886e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 1245 additions and 753 deletions

View File

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "reaper";
version = "6.21";
version = "6.23";
src = fetchurl {
url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
sha256 = "11nvfjfrri9y0k7n7psz3yk1l7mxp9f6yi69pq7hvn9d4n26p5vd";
sha256 = "1s9c8prqk38738hjaixiy8ljp94cqw7jq3160890477jyk6cvicd";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = ''
runHook preInstall
XDG_DATA_HOME="$out/share" ./install-reaper.sh \
--install $out/opt \
--integrate-user-desktop
@ -57,6 +59,8 @@ stdenv.mkDerivation rec {
mkdir $out/bin
ln -s $out/opt/REAPER/reaper $out/bin/
ln -s $out/opt/REAPER/reamote-server $out/bin/
runHook postInstall
'';
meta = with lib; {

View File

@ -1,14 +1,20 @@
{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper
, fontconfig, freetype, glib, gtk3
, jdk, libX11, libXrender, libXtst, zlib }:
# The build process is almost like eclipse's.
# See `pkgs/applications/editors/eclipse/*.nix`
stdenv.mkDerivation rec {
pname = "dbeaver-ce";
version = "7.3.2";
{ lib
, stdenv
, fetchFromGitHub
, makeDesktopItem
, makeWrapper
, fontconfig
, freetype
, glib
, gtk3
, jdk
, libX11
, libXrender
, libXtst
, zlib
, maven
}:
let
desktopItem = makeDesktopItem {
name = "dbeaver";
exec = "dbeaver";
@ -18,45 +24,101 @@ stdenv.mkDerivation rec {
genericName = "SQL Integrated Development Environment";
categories = "Development;";
};
in
stdenv.mkDerivation rec {
pname = "dbeaver-ce";
version = "7.3.5"; # When updating also update fetchedMavenDeps.sha256
src = fetchFromGitHub {
owner = "dbeaver";
repo = "dbeaver";
rev = version;
sha256 = "sha256-gEE7rndOaXzruWL7TG+QgVkq1+06tIZwyGzU9cFc+oU=";
};
fetchedMavenDeps = stdenv.mkDerivation {
name = "dbeaver-${version}-maven-deps";
inherit src;
buildInputs = [
maven
];
buildPhase = "mvn package -Dmaven.repo.local=$out/.m2";
# keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
installPhase = ''
find $out -type f \
-name \*.lastUpdated -or \
-name resolver-status.properties -or \
-name _remote.repositories \
-delete
'';
# don't do any fixup
dontFixup = true;
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "sha256-jT0Z154rVmafUbb6dqYSl3cUxMuK5MR4HUsprkrgSDw=";
};
buildInputs = [
fontconfig freetype glib gtk3
jdk libX11 libXrender libXtst zlib
fontconfig
freetype
glib
gtk3
jdk
libX11
libXrender
libXtst
makeWrapper
zlib
];
nativeBuildInputs = [
makeWrapper
maven
];
src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "sha256-4BVXcR8/E4uIrPQJe9KU9577j4XLTxJWTO8g0vCHWts=";
};
installPhase = ''
# remove bundled jre
rm -rf jre
mkdir -p $out/
cp -r . $out/dbeaver
# Patch binaries.
interpreter=$(cat $NIX_CC/nix-support/dynamic-linker)
patchelf --set-interpreter $interpreter $out/dbeaver/dbeaver
makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \
--prefix PATH : ${jdk}/bin \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
# Create desktop item.
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
mkdir -p $out/share/pixmaps
ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm
buildPhase = ''
mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
'';
installPhase =
let
productTargetPath = "product/standalone/target/products/org.jkiss.dbeaver.core.product";
in
if stdenv.isDarwin then ''
mkdir -p $out/Applications $out/bin
cp -r ${productTargetPath}/macosx/cocoa/x86_64/DBeaver.app $out/Applications
sed -i "/^-vm/d; /bin\/java/d" $out/Applications/DBeaver.app/Contents/Eclipse/dbeaver.ini
ln -s $out/Applications/DBeaver.app/Contents/MacOS/dbeaver $out/bin/dbeaver
wrapProgram $out/Applications/DBeaver.app/Contents/MacOS/dbeaver \
--prefix JAVA_HOME : ${jdk.home} \
--prefix PATH : ${jdk}/bin
'' else ''
mkdir -p $out/
cp -r ${productTargetPath}/linux/gtk/x86_64/dbeaver $out/dbeaver
# Patch binaries.
interpreter=$(cat $NIX_CC/nix-support/dynamic-linker)
patchelf --set-interpreter $interpreter $out/dbeaver/dbeaver
makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \
--prefix PATH : ${jdk}/bin \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
# Create desktop item.
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
mkdir -p $out/share/pixmaps
ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm
'';
meta = with lib; {
homepage = "https://dbeaver.io/";
description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more";
@ -67,7 +129,7 @@ stdenv.mkDerivation rec {
Teradata, Firebird, Derby, etc.
'';
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
maintainers = [ maintainers.jojosch ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ jojosch ];
};
}

View File

@ -17052,15 +17052,15 @@ self: {
"Rattus" = callPackage
({ mkDerivation, base, Cabal, containers, ghc, ghc-prim
, simple-affine-space
, simple-affine-space, transformers
}:
mkDerivation {
pname = "Rattus";
version = "0.4";
sha256 = "1sgr33yq5l43k3b8nwx7m6wrygv5k8d8yigzms3p6pq5pk3g5sq1";
version = "0.5";
sha256 = "1dh6ln8awqhgnk7hqh4zdkv4pqy3wmsqbmqrd016raf8vjbc1i3m";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
base containers ghc ghc-prim simple-affine-space
base containers ghc ghc-prim simple-affine-space transformers
];
testHaskellDepends = [ base containers ];
description = "A modal FRP language";
@ -31899,10 +31899,10 @@ self: {
}:
mkDerivation {
pname = "approx";
version = "0.1.0.0";
sha256 = "1vc6k0w4zr355gfvprb5syh5jpmkdvp6wjibi4l95q9zwwdwhjn2";
version = "0.1.0.1";
sha256 = "0vzi0ai7lf7ji2lbf9v412fvrins7acy0dqs4j8ylfd1chck1w99";
revision = "1";
editedCabalFile = "0k34bjsazp4wbv7zzmvh5vnqv7yzyq20h99q30mcrn4g2bvpc0q1";
editedCabalFile = "0kj9qqfv8fzg5b6l33avflxjlmd52wjsjridff1d5n071dnif37y";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -31915,7 +31915,7 @@ self: {
base containers hashable QuickCheck text time unordered-containers
vector
];
description = "Easy-to-use reasonable way of emulating approximate in Haskell";
description = "Easy-to-use emulation of approximate, ranges and tolerances in Haskell";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
broken = true;
@ -58092,8 +58092,8 @@ self: {
}:
mkDerivation {
pname = "coinbase-pro";
version = "0.8.0.0";
sha256 = "021c05qkrvgxlylvrrlb81bjxl49v5varn0fi5wqs5sda15766n3";
version = "0.9.0.0";
sha256 = "1wnjpm49gy75nl3m01bablchbk7clsgf4x53xqx5k2bsvn1xd1n1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -118454,8 +118454,8 @@ self: {
pname = "haskell-language-server";
version = "0.9.0.0";
sha256 = "0wzwadmrw57dqp9mszr4nmcnrwa01kav70z0wqkh8g2ag0kv3nfm";
revision = "1";
editedCabalFile = "0cnvijjjfps2cwh0m1lyn1mnx33p6jfjs42z1xx5z8z1a05xsnn1";
revision = "3";
editedCabalFile = "02dvw9d9c7wja6y8q5ncjks5hjxjplnfn9jnw9cqzfyi97pv4cm6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -120302,8 +120302,8 @@ self: {
}:
mkDerivation {
pname = "haskellish";
version = "0.2.4";
sha256 = "0hj96lkqglsq66iaglqdd5gwks2arzi41ljw0izybypxccd5q46i";
version = "0.2.4.2";
sha256 = "1d7rpb9l1ycmcr8ahxjb5p2v3qdlwnjdxkm292bnakvwazgnq7cw";
libraryHaskellDepends = [
base containers haskell-src-exts mtl template-haskell text
];
@ -120785,8 +120785,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store";
version = "0.45.0";
sha256 = "1mnpgj0d5f3ad4m66zsr4kyp5cdjcryabpkrnnv8s173nd9zksr6";
version = "0.46.0";
sha256 = "18iig8wbbgknzgzjxicjhpbhp7a9wzq1nrvixfwf4gpdlxmzq18y";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -120830,8 +120830,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store-data";
version = "0.44.0";
sha256 = "03v5dbka4cz3z4f6qcpbhjv2r8c5x5a8iw24apc6agzir5q5zza8";
version = "0.45.0";
sha256 = "1hzlc8w9xmbwsvz6j74pxbkxla9a0wdgill81vn8g3zk4r7z0xx5";
libraryHaskellDepends = [
aeson base bytestring cereal containers data-default deepseq
hashable haskoin-core http-client http-types lens mtl network
@ -127152,6 +127152,39 @@ self: {
license = lib.licenses.bsd3;
}) {};
"hie-bios_0_7_3" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, bytestring
, conduit, conduit-extra, containers, cryptohash-sha1, deepseq
, directory, extra, file-embed, filepath, ghc, hslogger
, hspec-expectations, optparse-applicative, process, tasty
, tasty-expected-failure, tasty-hunit, temporary, text, time
, transformers, unix-compat, unordered-containers, vector, yaml
}:
mkDerivation {
pname = "hie-bios";
version = "0.7.3";
sha256 = "0njgxy8dx43smqk4wv3zg0c8a7llbgnz4fbil9dw53yx2xncgapi";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base base16-bytestring bytestring conduit conduit-extra
containers cryptohash-sha1 deepseq directory extra file-embed
filepath ghc hslogger process temporary text time transformers
unix-compat unordered-containers vector yaml
];
executableHaskellDepends = [
base directory filepath ghc optparse-applicative
];
testHaskellDepends = [
base directory extra filepath ghc hspec-expectations tasty
tasty-expected-failure tasty-hunit temporary text
unordered-containers yaml
];
description = "Set up a GHC API session";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"hie-compat" = callPackage
({ mkDerivation, array, base, bytestring, containers, directory
, filepath, ghc, ghc-boot, transformers
@ -134311,6 +134344,18 @@ self: {
broken = true;
}) {};
"hs-swisstable-hashtables-class" = callPackage
({ mkDerivation, base, hashtables, swisstable }:
mkDerivation {
pname = "hs-swisstable-hashtables-class";
version = "0.1.0.0";
sha256 = "15zc24ai13x11ksyhsrs05v9vh93mdlmx9p3rg3lkllqjqy6b35m";
libraryHaskellDepends = [ base hashtables swisstable ];
testHaskellDepends = [ base hashtables swisstable ];
description = "Data.HashTable.Class instance definition for Data.HashTable.ST.Swiss";
license = lib.licenses.bsd3;
}) {};
"hs-twitter" = callPackage
({ mkDerivation, base, HTTP, json, mime, network, old-locale
, old-time, random, utf8-string
@ -143793,6 +143838,22 @@ self: {
broken = true;
}) {};
"ice40-prim" = callPackage
({ mkDerivation, base, Cabal, clash-prelude, ghc-typelits-extra
, ghc-typelits-knownnat, ghc-typelits-natnormalise, interpolate
}:
mkDerivation {
pname = "ice40-prim";
version = "0.1.0.0";
sha256 = "00l0kwwayf0bark2yqjrx8imr8997d5mrnhjf3zsayxk9a521j99";
libraryHaskellDepends = [
base Cabal clash-prelude ghc-typelits-extra ghc-typelits-knownnat
ghc-typelits-natnormalise interpolate
];
description = "Lattice iCE40 Primitive IP";
license = lib.licenses.bsd3;
}) {};
"icepeak" = callPackage
({ mkDerivation, aeson, async, base, bytestring, containers
, directory, hashable, hspec, hspec-core, hspec-expectations
@ -155368,10 +155429,8 @@ self: {
}:
mkDerivation {
pname = "kqueue";
version = "0.2";
sha256 = "0sbkyq17i41kln7scrfc9kdzsbyb787z33kzpkdz2vrziapns33h";
revision = "3";
editedCabalFile = "17wanwn4pmh6z6v7ncg50q4sgg87lllld50wa5j5mmb07q4c3mj7";
version = "0.2.1";
sha256 = "0svrswcglipmm47lnqi41hcsn1gvkcniva6qajwqxrdr0wvvhgdi";
libraryHaskellDepends = [ base directory filepath mtl time unix ];
libraryToolDepends = [ c2hs ];
description = "A binding to the kqueue event library";
@ -166371,8 +166430,8 @@ self: {
}:
mkDerivation {
pname = "lsp";
version = "1.1.0.0";
sha256 = "0jfpcih4xxzikagxvns3jyiqi9aw2m6hp55gpmzpf53mvpkcs7ws";
version = "1.1.1.0";
sha256 = "04ndz4v1mwga13qndmnaaj145y5zqw7zv64px7ak26qvd1m26h9r";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -174755,20 +174814,20 @@ self: {
}) {};
"mmsyn7l" = callPackage
({ mkDerivation, base, directory, mmsyn2, mmsyn3, mmsyn7ukr
, process, vector
({ mkDerivation, base, directory, mmsyn2-array, mmsyn3
, mmsyn7ukr-common, process
}:
mkDerivation {
pname = "mmsyn7l";
version = "0.8.0.0";
sha256 = "0w1k89phzxyq2nwzr0vn313rlp0f7d62vhdvq113pqszbdbjh6gd";
version = "0.9.0.0";
sha256 = "0j8xi8jxak818sw310srxljrywggsa8ss1l4yw0razsa28h92nxq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base directory mmsyn2 mmsyn3 mmsyn7ukr process vector
base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process
];
executableHaskellDepends = [
base directory mmsyn2 mmsyn3 mmsyn7ukr process vector
base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process
];
description = "Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package";
license = lib.licenses.mit;
@ -179352,8 +179411,8 @@ self: {
}:
mkDerivation {
pname = "mu-rpc";
version = "0.5.0.0";
sha256 = "15a950ig348h0fxfvzq4pj8s8rryn18cd26vmrcmx7s6w32zlzyr";
version = "0.5.0.1";
sha256 = "0r5kbi378iwg5b578dydvv4smy2xqn4y33h015fp5nyphxz83173";
libraryHaskellDepends = [
aeson base conduit http-types mtl mu-schema sop-core
template-haskell text wai
@ -181015,6 +181074,8 @@ self: {
pname = "mwc-random";
version = "0.15.0.1";
sha256 = "1p8c5g4hb72k90ai39rgpn6cr942i6636l1y0zfp9xgjb3v0a2q3";
revision = "1";
editedCabalFile = "1ay26mvzxqw6rzw3hkib1j12gk6fa2hsilz12q8vhp646bqqc744";
libraryHaskellDepends = [
base math-functions primitive random time vector
];
@ -183904,6 +183965,8 @@ self: {
pname = "network-byte-order";
version = "0.1.6";
sha256 = "0pnwcg13k4qw82n0zc1xibyc24sc77y79j5a62pqdmjrnz4wrc7j";
revision = "1";
editedCabalFile = "0fpyfd1adg9fr7w6afxkx306c0kaz3ji3x78sl29v9j3mh4vdn13";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [ base bytestring doctest ];
description = "Network byte order utilities";
@ -197019,8 +197082,8 @@ self: {
pname = "perfect-vector-shuffle";
version = "0.1.1.1";
sha256 = "1z4iv4sv9ld0gvdfa46ll5bsbxi9lckh69paip1c5ijcg78vy5y0";
revision = "4";
editedCabalFile = "14q0773vxmkh4nwskiq85ch175jq12xms2lypaddglciykqs6ml6";
revision = "5";
editedCabalFile = "0lppvhpfpfzcpdm4fxmsps8s272gz3wd2h5xc1w1908b7qqln0rw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -198870,8 +198933,8 @@ self: {
}:
mkDerivation {
pname = "phonetic-languages-simplified-base";
version = "0.1.0.0";
sha256 = "0fd2pslmgm5bvv0yiza87vp61601pl1c69xa5snbgrnb2mlp6f98";
version = "0.2.0.0";
sha256 = "1382i77ci70ax7lvbkqqvg1wr2pp5irl8wxvypngr15czqgj7sca";
libraryHaskellDepends = [
base phonetic-languages-permutations-array subG
];
@ -201136,6 +201199,21 @@ self: {
broken = true;
}) {};
"pixel-printer" = callPackage
({ mkDerivation, base, JuicyPixels, lens }:
mkDerivation {
pname = "pixel-printer";
version = "0.1.0";
sha256 = "1cx485lvd5z6895jv1iiq93kspch78w9m730ggw6nvf0rimvazyy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base JuicyPixels lens ];
executableHaskellDepends = [ base JuicyPixels ];
testHaskellDepends = [ base ];
description = "A program for turning pixel art into 3D prints";
license = lib.licenses.gpl3;
}) {};
"pixela" = callPackage
({ mkDerivation, aeson, base, bytestring, data-default-class
, http-client, http-client-tls, http-types, split, text, time
@ -213575,8 +213653,8 @@ self: {
pname = "random";
version = "1.2.0";
sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4";
revision = "4";
editedCabalFile = "08mq836ganl3sq6mfn3hrj6xm0h30klp21y7gbd9md2882agndrk";
revision = "5";
editedCabalFile = "1jai1pcs39ijdhxc8q36x1yayr8rsblhx3y88paf4bqxrks2vmrh";
libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ];
testHaskellDepends = [
base bytestring containers doctest mwc-random primitive smallcheck
@ -213643,6 +213721,24 @@ self: {
license = lib.licenses.mit;
}) {};
"random-bytestring_0_1_4" = callPackage
({ mkDerivation, async, base, bytestring, criterion, cryptonite
, entropy, ghc-prim, mwc-random, pcg-random, primitive, random
}:
mkDerivation {
pname = "random-bytestring";
version = "0.1.4";
sha256 = "0f4n41gqxxggadysvx3vg2iq89z7i7692ccrfmiajq73lbp6y34j";
libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
benchmarkHaskellDepends = [
async base bytestring criterion cryptonite entropy ghc-prim
mwc-random pcg-random primitive random
];
description = "Efficient generation of random bytestrings";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
}) {};
"random-class" = callPackage
({ mkDerivation, base, primitive, transformers, util }:
mkDerivation {
@ -221319,8 +221415,8 @@ self: {
}:
mkDerivation {
pname = "rhbzquery";
version = "0.4.2";
sha256 = "1j9nxizi1wsgz5gamdn9izy4aq6ci41gbkvsw7bbpc8fnvv5gpd2";
version = "0.4.3";
sha256 = "13brargymd1c9b0csaprj85qdqg98bzj3z2smbb0v66myj48v6fp";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [

View File

@ -3,17 +3,17 @@
with lib;
stdenv.mkDerivation rec {
pname = "babashka";
version = "0.2.3";
version = "0.2.10";
reflectionJson = fetchurl {
name = "reflection.json";
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json";
sha256 = "0lbdh3v3g3j00bn99bjhjj3gk1q9ks2alpvl9bxc00xpyw86f7z8";
sha256 = "1c7f0z1hi0vcfz532r3fhr4c64jjqppf94idpa1jziz1dljkwk85";
};
src = fetchurl {
url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "0vh6k3dkzyk346jjzg6n4mdi65iybrmhb3js9lm73yc3ay2c5dyi";
sha256 = "0j6k3vmdljf3bjmj5dywhxjmxcs1axscc8dlnw94g5rwf9bin0dn";
};
dontUnpack = true;

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pyserial
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "aqualogic";
version = "2.3";
src = fetchFromGitHub {
owner = "swilson";
repo = pname;
rev = version;
sha256 = "0101lni458y88yrw1wri3pz2cn5jlxln03pa3q2pxaybcyklb9qk";
};
propagatedBuildInputs = [ pyserial ];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "aqualogic" ];
meta = with lib; {
description = "Python library to interface with Hayward/Goldline AquaLogic/ProLogic pool controllers";
homepage = "https://github.com/swilson/aqualogic";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -20,12 +20,6 @@ buildPythonPackage {
inherit disabled;
doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2
NIX_CFLAGS_COMPILE = toString (
# work around python distutils compiling C++ with $CC
lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"
++ lib.optional (lib.versionOlder protobuf.version "2.7.0") "-std=c++98"
);
outputs = [ "out" "dev" ];
propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ];

View File

@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, varint
, base58
, netaddr
, idna
, py-cid
, py-multicodec
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "py-multiaddr";
version = "0.0.9";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "multiformats";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cGM7iYQPP+UOkbTxRhzuED0pkcydFCO8vpx9wTc0/HI=";
};
postPatch = ''
substituteInPlace setup.py --replace "'pytest-runner'," ""
'';
propagatedBuildInputs = [
varint
base58
netaddr
idna
py-cid
py-multicodec
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "multiaddr" ];
meta = with lib; {
description = "Composable and future-proof network addresses";
homepage = "https://github.com/multiformats/py-multiaddr";
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ Luflosi ];
};
}

View File

@ -0,0 +1,22 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "pqrs";
version = "0.1.1";
src = fetchFromGitHub {
owner = "manojkarthick";
repo = "pqrs";
rev = "v${version}";
sha256 = "1vx952ki1rhwfmr3faxs363m9fh61b37b0bkbs57ggn9r44sk1z2";
};
cargoSha256 = "1c482y83gzpvazdsxsx5n509mkqmyz640s18y4yg928mmqbsz9c4";
meta = with lib; {
description = "CLI tool to inspect Parquet files";
homepage = "https://github.com/manojkarthick/pqrs";
license = with licenses; [ mit /* or */ asl20 ];
maintainers = [ maintainers.manojkarthick ];
};
}

View File

@ -2,10 +2,10 @@
{
rust-analyzer-unwrapped = callPackage ./generic.nix rec {
rev = "2021-02-08";
rev = "2021-02-15";
version = "unstable-${rev}";
sha256 = "sha256-Idaaw6d0lvBUyZxpHKQ94aMtgM0zb0P8QRh+3pctX4k=";
cargoSha256 = "sha256-J6Hia83biutScZt/BMO4/qXYi35/Ec9MeaHeDG8Lqmc=";
sha256 = "sha256-4Dgj2RQDe2FoOSXjL7oaHg8WlYX1vnc66LzzbXvTmjM=";
cargoSha256 = "sha256-c6kr2PWSG3Sns6/O1zOVUFdkLWHAXcQ8LMeensCEuSk=";
};
rust-analyzer = callPackage ./wrapper.nix {} {

View File

@ -3,14 +3,14 @@
"version": "0.4.0-dev",
"dependencies": {
"node-fetch": "^2.6.1",
"vscode-languageclient": "7.0.0",
"vscode-languageclient": "^7.1.0-next.1",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-node-resolve": "^11.0.0",
"@types/glob": "^7.1.3",
"@types/mocha": "^8.0.4",
"@types/node": "~12.12.6",
"@types/node-fetch": "^2.5.7",
"@types/vscode": "^1.52.0",
"@types/vscode": "^1.53.0",
"@typescript-eslint/eslint-plugin": "^4.9.0",
"@typescript-eslint/parser": "^4.9.0",
"eslint": "^7.15.0",

View File

@ -74,6 +74,9 @@ let
# only redfish for x86_64
haveRedfish = stdenv.isx86_64;
# only use msr if x86 (requires cpuid)
haveMSR = isx86;
# # Currently broken on Aarch64
# haveFlashrom = isx86;
# Experimental
@ -196,6 +199,8 @@ let
"-Dplugin_redfish=false"
] ++ lib.optionals haveFlashrom [
"-Dplugin_flashrom=true"
] ++ lib.optionals (!haveMSR) [
"-Dplugin_msr=false"
];
# TODO: wrapGAppsHook wraps efi capsule even though it is not ELF
@ -277,7 +282,6 @@ let
passthru = {
filesInstalledToEtc = [
"fwupd/daemon.conf"
"fwupd/redfish.conf"
"fwupd/remotes.d/lvfs-testing.conf"
"fwupd/remotes.d/lvfs.conf"
"fwupd/remotes.d/vendor.conf"
@ -294,6 +298,8 @@ let
"pki/fwupd-metadata/LVFS-CA.pem"
] ++ lib.optionals haveDell [
"fwupd/remotes.d/dell-esrt.conf"
] ++ lib.optionals haveRedfish [
"fwupd/redfish.conf"
];
# DisabledPlugins key in fwupd/daemon.conf

View File

@ -41,7 +41,7 @@
"apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ];
"apprise" = ps: with ps; [ apprise ];
"aprs" = ps: with ps; [ geopy ]; # missing inputs: aprslib
"aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic
"aqualogic" = ps: with ps; [ aqualogic ];
"aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc
"arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj
"arduino" = ps: with ps; [ ]; # missing inputs: PyMata

View File

@ -0,0 +1,41 @@
{ lib
, rustPlatform
, fetchFromGitHub
, cmake
, pkg-config
, expat
, fontconfig
, freetype
}:
rustPlatform.buildRustPackage rec {
pname = "cicero-tui";
version = "0.1.4";
src = fetchFromGitHub {
owner = "eyeplum";
repo = "cicero-tui";
rev = "v${version}";
sha256 = "1bz2y37qf9c3fxc73chb42rffdivp5krczhgd9rnwq5r6n6bdgq7";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
expat
fontconfig
freetype
];
cargoSha256 = "04359gf9mirczqwh8jv3rf0cc4pp05r8ncqyz0n8r7x5qv77kgcp";
meta = with lib; {
description = "Unicode tool with a terminal user interface";
homepage = "https://github.com/eyeplum/cicero-tui";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ shamilton ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,41 @@
{ lib
, rustPlatform
, fetchFromGitHub
, cmake
, pkg-config
, expat
, fontconfig
, freetype
}:
rustPlatform.buildRustPackage rec {
pname = "fontfor";
version = "0.3.1";
src = fetchFromGitHub {
owner = "7sDream";
repo = "fontfor";
rev = "v${version}";
sha256 = "1b07hd41blwsnb91vh2ax9zigm4lh8n0i5man0cjmxhavvbfy12b";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
expat
fontconfig
freetype
];
cargoSha256 = "194c4knjfb3pnpvw3zl1srwx3q1jp6z78vzln0q2mk5nf0a35yy0";
meta = with lib; {
description = "Find fonts which can show a specified character and preview them in browser";
homepage = "https://github.com/7sDream/fontfor";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ shamilton ];
platforms = platforms.linux;
};
}

View File

@ -1,19 +1,19 @@
{ stdenv, fetchurl, lib
, pandoc, pkg-config, makeWrapper, curl, openssl, tpm2-tss
, pandoc, pkg-config, makeWrapper, curl, openssl, tpm2-tss, libuuid
, abrmdSupport ? true, tpm2-abrmd ? null }:
stdenv.mkDerivation rec {
pname = "tpm2-tools";
version = "4.1.3";
version = "5.0";
src = fetchurl {
url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "0117r0zzdnblkibv81y71v3limixsw5m7g9xwf7lcx8fc8836pdv";
sha256 = "sha256-4bkH/imHdigFLgithO68bD92RtKVBe1IYulhYqjJG6E=";
};
nativeBuildInputs = [ pandoc pkg-config makeWrapper ];
buildInputs = [
curl openssl tpm2-tss
curl openssl tpm2-tss libuuid
];
preFixup = let

View File

@ -3102,6 +3102,8 @@ in
chunksync = callPackage ../tools/backup/chunksync { };
cicero-tui = callPackage ../tools/misc/cicero-tui { };
cipherscan = callPackage ../tools/security/cipherscan {
openssl = if stdenv.hostPlatform.system == "x86_64-linux"
then openssl-chacha
@ -3479,7 +3481,15 @@ in
davfs2 = callPackage ../tools/filesystems/davfs2 { };
dbeaver = callPackage ../applications/misc/dbeaver { };
dbeaver = callPackage ../applications/misc/dbeaver {
jdk = jdk11; # AlgorithmId.md5WithRSAEncryption_oid was removed in jdk15
# TODO: remove once maven uses JDK 11
# error: org/eclipse/tycho/core/p2/P2ArtifactRepositoryLayout has been compiled by a more recent version of the Java Runtime (class file version 55.0), this version of the Java Runtime only recognizes class file versions up to 52.0
maven = maven.override {
jdk = jdk11;
};
};
dbench = callPackage ../development/tools/misc/dbench { };
@ -4245,6 +4255,8 @@ in
python = python2;
};
fontfor = callPackage ../tools/misc/fontfor { };
fontforge = lowPrio (callPackage ../tools/misc/fontforge {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
python = python3;
@ -12648,6 +12660,8 @@ in
pprof = callPackage ../development/tools/profiling/pprof { };
pqrs = callPackage ../development/tools/pqrs { };
pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree;
prelink = callPackage ../development/tools/misc/prelink { };

View File

@ -412,6 +412,8 @@ in {
apsw = callPackage ../development/python-modules/apsw { };
aqualogic = callPackage ../development/python-modules/aqualogic { };
arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { };
archinfo = callPackage ../development/python-modules/archinfo { };
@ -5693,6 +5695,8 @@ in {
pymsteams = callPackage ../development/python-modules/pymsteams { };
py-multiaddr = callPackage ../development/python-modules/py-multiaddr { };
py-multibase = callPackage ../development/python-modules/py-multibase { };
py-multicodec = callPackage ../development/python-modules/py-multicodec { };