Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-01-16 12:40:04 +00:00 committed by GitHub
commit 2445824f40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
86 changed files with 1307 additions and 1506 deletions

View file

@ -610,6 +610,16 @@
githubId = 11699655;
name = "Stanislas Lange";
};
anhdle14 = {
name = "Le Anh Duc";
email = "anhdle14@icloud.com";
github = "anhdle14";
githubId = 9645992;
keys = [{
longkeyid = "rsa4096/0x0299AFF9ECBB5169";
fingerprint = "AA4B 8EC3 F971 D350 482E 4E20 0299 AFF9 ECBB 5169";
}];
};
ankhers = {
email = "me@ankhers.dev";
github = "ankhers";

View file

@ -28,17 +28,7 @@ let
];
};
nixos-rebuild =
let fallback = import ./nix-fallback-paths.nix; in
makeProg {
name = "nixos-rebuild";
src = ./nixos-rebuild.sh;
inherit (pkgs) runtimeShell;
nix = config.nix.package.out;
nix_x86_64_linux = fallback.x86_64-linux;
nix_i686_linux = fallback.i686-linux;
path = makeBinPath [ pkgs.jq ];
};
nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; };
nixos-generate-config = makeProg {
name = "nixos-generate-config";

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
preInstall="mkdir -p $out/lib/ladspa";
meta = {
description = ''A set of ambisonics ladspa plugins'';
description = "A set of ambisonics ladspa plugins";
longDescription = ''
Mono and stereo to B-format panning, horizontal rotator, square, hexagon and cube decoders.
'';

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
preInstall="mkdir -p $out/lib/ladspa";
meta = {
description = ''a four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed'';
description = "a four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed";
longDescription = ''
Each section has an active/bypass switch, frequency, bandwidth and gain controls.
There is also a global bypass switch and gain control.

View file

@ -1,28 +1,79 @@
{ lib, stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext,
libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
cmake
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, cmake
, wxGTK
, pkg-config
, python3
, gettext
, file
, libvorbis
, libmad
, libjack2
, lv2
, lilv
, serd
, sord
, sratom
, suil
, alsaLib
, libsndfile
, soxr
, flac
, twolame
, expat
, libid3tag
, libopus
, ffmpeg
, soundtouch
, pcre /*, portaudio - given up fighting their portaudio.patch */
, at-spi2-core ? null
, dbus ? null
, epoxy ? null
, libXdmcp ? null
, libXtst ? null
, libpthreadstubs ? null
, libselinux ? null
, libsepol ? null
, libxkbcommon ? null
, utillinux ? null
}:
with stdenv.lib;
# TODO
# - as of 2.4.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions
# - detach sbsms
stdenv.mkDerivation rec {
version = "2.4.1";
pname = "audacity";
version = "2.4.2";
src = fetchzip {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
sha256 = "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn";
src = fetchFromGitHub {
owner = "audacity";
repo = "audacity";
rev = "Audacity-${version}";
sha256 = "sha256-hpRTo5B0EMyzORopsNPOgv6mohBkwJfWfCLnPvFmdFI=";
};
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
patches = [
(fetchpatch {
url = "https://github.com/audacity/audacity/commit/a070b5d8a8ba10fb86edba6aeb8fdab0f66ba408.patch";
sha256 = "sha256-8UZupGcN+/tytAhyy5T1P0nufvsQPeyLgOUMGt7l8Oc=";
name = "audacity_xdg_paths.patch";
})
];
# audacity only looks for lame and ffmpeg at runtime, so we need to link them in manually
# this file *should* be generated by cmake but as of 2.4.2 isn't yet
postPatch = ''
touch src/RevisionIdent.h
'';
# workaround for a broken cmake. Drop it with a later version to see if it works.
# https://github.com/NixOS/nixpkgs/issues/94905
cmakeFlags = lib.optional stdenv.isLinux "-DCMAKE_OSX_ARCHITECTURES=";
# audacity only looks for ffmpeg at runtime, so we need to link it in manually
NIX_LDFLAGS = toString [
# LAME
"-lmp3lame"
# ffmpeg
"-lavcodec"
"-lavdevice"
@ -35,14 +86,45 @@ stdenv.mkDerivation rec {
"-lswscale"
];
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [
file gettext wxGTK30 expat alsaLib
libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk
ffmpeg_3 libmad lame libvorbis flac soundtouch
]; #ToDo: detach sbsms
nativeBuildInputs = [ cmake gettext pkg-config python3 ];
buildInputs = [
alsaLib
expat
ffmpeg
file
flac
libid3tag
libjack2
libmad
libopus
libsndfile
libvorbis
lilv
lv2
pcre
serd
sord
soundtouch
soxr
sratom
suil
twolame
wxGTK
wxGTK.gtk
] ++ lib.optionals stdenv.isLinux [
at-spi2-core
dbus
epoxy
libXdmcp
libXtst
libpthreadstubs
libxkbcommon
libselinux
libsepol
utillinux
];
dontDisableStatic = true;
doCheck = false; # Test fails
meta = with lib; {

View file

@ -32,7 +32,7 @@ stdenv.mkDerivation {
meta = {
inherit (s) version;
description = ''MIDI to Lilypond converter'';
description = "MIDI to Lilypond converter";
license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;

View file

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
description = ''Constructive solid geometry package'';
description = "Constructive solid geometry package";
broken = true; # 2018-04-11
};
}

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation {
makeFlags = [ "PREFIX=$(out)" ];
meta = {
inherit (s) version;
description = ''A console dmenu-like tool'';
description = "A console dmenu-like tool";
license = lib.licenses.mit;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;

View file

@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
'';
meta = with lib; {
description = ''A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}'';
description = "A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}";
maintainers = with maintainers; [ raskin ];
platforms = if mediaSupport then platforms.linux else platforms.unix;
license = licenses.gpl2;

View file

@ -35,7 +35,7 @@ stdenv.mkDerivation {
outputHash = "1kwj31cjgdirqvh6bxs4fnvvr1ppaz6z8w40kvhkivgs69jglmzw";
meta = {
description = ''Tempora font'';
description = "Tempora font";
license = lib.licenses.gpl2 ;
maintainers = [lib.maintainers.raskin];
};

View file

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
meta = {
inherit version;
description = ''Bitmapped character-art-friendly Unicode fonts'';
description = "Bitmapped character-art-friendly Unicode fonts";
# Basically GPL2+ with font exception — because of the Unifont-augmented
# version. The reduced version is public domain.
license = "http://unifoundry.com/LICENSE.txt";

View file

@ -1,43 +0,0 @@
{ lib, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "prjxray-db";
version = "0.0-0232-g303a61d";
src = fetchFromGitHub {
owner = "SymbiFlow";
repo = "prjxray-db";
rev = "303a61d8bc552f7a533b91b17448c59e908aa391";
sha256 = "0r75xig16dbgh3nfygggir0a160x52y766h7hd9xcib9m88jixb2";
};
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
DBDIR="$out/share/symbiflow/prjxray-db/"
DB_CONFIG="$out/bin/prjxray-config"
mkdir -p $DBDIR $out/bin
for device in artix7 kintex7 zynq7; do
cp -r $src/$device $DBDIR
done
echo -e "#!/bin/sh\n\necho $DBDIR" > $DB_CONFIG
chmod +x $DB_CONFIG
runHook postInstall
'';
meta = with lib; {
description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation";
homepage = "https://github.com/SymbiFlow/prjxray-db";
license = licenses.cc0;
maintainers = with maintainers; [ mcaju ];
platforms = platforms.all;
};
}

View file

@ -1,47 +0,0 @@
{ lib, stdenv
, fetchurl
, autoPatchelfHook
, python3Packages
, archs ? [ "xc7a100t" "xc7a50t" "xc7z010" "xc7z020" ]
}:
stdenv.mkDerivation rec {
pname = "symbiflow-arch-defs";
version = "20200914-111752-g05d68df0";
src = fetchurl {
url = "https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/66/20200914-111752/symbiflow-arch-defs-install-05d68df0.tar.xz";
sha256 = "1gmynybh8n33ag521w17c2kd16n834hqc6d8hi2pfs5kg1jl1a74";
};
sourceRoot = ".";
propagatedBuildInputs = [
python3Packages.lxml
python3Packages.python-constraint
];
installPhase = ''
mkdir -p $out/bin
cp -r bin/{symbiflow_*,vpr_common,python} $out/bin
for script in $out/bin/symbiflow_*; do
substituteInPlace $script --replace '/env' '/symbiflow_env'
done
cp bin/env $out/bin/symbiflow_env
mkdir -p $out/share/symbiflow/arch
cp -r share/symbiflow/{scripts,techmaps} $out/share/symbiflow/
for arch in ${builtins.concatStringsSep " " archs}; do
cp -r share/symbiflow/arch/"$arch"_test* $out/share/symbiflow/arch/
done
'';
meta = with lib; {
description = "Project X-Ray - Xilinx Series 7 Bitstream Documentation";
homepage = "https://github.com/SymbiFlow/symbiflow-arch-defs";
hydraPlatforms = [];
license = licenses.isc;
platforms = platforms.all;
};
}

View file

@ -6,7 +6,7 @@ buildHex {
sha256 = "0xq411ig5ny3iilkkkqa4vm3w3dgjc9cfzkqwk8pm13dw9mcm8h0";
meta = {
description = ''a rebar3 port compiler for native code'';
description = "a rebar3 port compiler for native code";
license = stdenv.lib.licenses.mit;
homepage = "https://github.com/blt/port_compiler";
};

View file

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [jre ant jdk jre];
meta = {
inherit version;
description = ''A JVM-based Common Lisp implementation'';
description = "A JVM-based Common Lisp implementation";
license = stdenv.lib.licenses.gpl3 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;

View file

@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
meta = {
inherit version;
description = ''A Common Lisp implementation based on LLVM with C++ integration'';
description = "A Common Lisp implementation based on LLVM with C++ integration";
license = stdenv.lib.licenses.lgpl21Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;

View file

@ -5,13 +5,15 @@ assert backend == "mcode" || backend == "llvm";
stdenv.mkDerivation rec {
pname = "ghdl-${backend}";
version = "0.37";
# NOTE(aseipp): move to 0.38 when it comes out, since it should support a stable
# version of the yosys plugin
version = "unstable-2021.01.14";
src = fetchFromGitHub {
owner = "ghdl";
repo = "ghdl";
rev = "v${version}";
sha256 = "0b53yl4im33c1cd4mdyc4ks9cmrpixym17gzchfmplrl22w3l17y";
owner = "ghdl";
repo = "ghdl";
rev = "4868294436574660552ccef50a5b0849559393de";
sha256 = "1wqjf0qc66dam1n2mskmlvj53bcsdwwk5rq9gimq6ah1vcwi222p";
};
LIBRARY_PATH = "${stdenv.cc.libc}/lib";
@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
sed -i 's/check_version 7.0/check_version 7/g' configure
'';
configureFlags = lib.optional (backend == "llvm")
configureFlags = [ "--enable-synth" ] ++ lib.optional (backend == "llvm")
"--with-llvm-config=${llvm}/bin/llvm-config";
hardeningDisable = [ "format" ];
@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/ghdl/ghdl";
description = "VHDL 2008/93/87 simulator";
maintainers = with maintainers; [ lucus16 ];
maintainers = with maintainers; [ lucus16 thoughtpolice ];
platforms = platforms.linux;
license = licenses.gpl2;
};

View file

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
meta = {
inherit version;
description = ''A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs'';
description = "A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs";
license = stdenv.lib.licenses.bsd3;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;

View file

@ -1,29 +0,0 @@
{ stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "prjxray-tools";
version = "0.1-2676-gac8d30e3";
src = fetchFromGitHub {
owner = "SymbiFlow";
repo = "prjxray";
fetchSubmodules = true;
rev = "ac8d30e3fe2029122408888d2313844b3e0c265b";
sha256 = "1ag7dk12hdhip821crwinncp8vgyzs0r85l1h2vbgn61lnxc7f4h";
};
nativeBuildInputs = [ cmake ];
doCheck = true;
meta = with stdenv.lib; {
description = "Documenting the Xilinx 7-series bit-stream format";
homepage = "https://github.com/SymbiFlow/prjxray";
license = licenses.isc;
platforms = platforms.all;
maintainers = with maintainers; [ mcaju ];
};
}

View file

@ -1,40 +0,0 @@
{ stdenv
, fetchFromGitHub
, bison
, cmake
, flex
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "symbiflow-vtr";
version = "8.0.0.rc2-4003-g8980e4621";
src = fetchFromGitHub {
owner = "SymbiFlow";
repo = "vtr-verilog-to-routing";
rev = "8980e46218542888fac879961b13aa7b0fba8432";
sha256 = "1sq7f1f3dzfm48a9vq5nvp0zllby0nasm3pvqab70f4jaq0m1aaa";
};
nativeBuildInputs = [
bison
cmake
flex
pkg-config
];
cmakeFlags = [
"-DWITH_ODIN=OFF"
"-DWITH_ABC=OFF"
];
doCheck = true;
meta = with stdenv.lib; {
description = "SymbiFlow WIP changes for Verilog to Routing (VTR)";
homepage = "https://github.com/SymbiFlow/vtr-verilog-to-routing";
platforms = platforms.all;
maintainers = with maintainers; [ mcaju ];
};
}

View file

@ -1,37 +0,0 @@
{ stdenv
, fetchFromGitHub
, symbiflow-yosys
, zlib
, readline
}:
stdenv.mkDerivation rec {
pname = "symbiflow-yosys-plugins";
version = "1.0.0.7-0060-g7454cd6b";
src = fetchFromGitHub {
owner = "SymbiFlow";
repo = "yosys-symbiflow-plugins";
rev = "7454cd6b5e4fd22854e2ada219a5e3c3a06e0717";
sha256 = "0r9r31p7fy4ylfrwvwlbivq5a03xrph34blxbxzx2c8bc02mbv0s";
};
enableParallelBuilding = true;
nativeBuildInputs = [ symbiflow-yosys ];
buildInputs = [
readline
zlib
];
makeFlags = [ "PLUGINS_DIR=${placeholder "out"}/share/yosys/plugins" ];
meta = with stdenv.lib; {
description = "Yosys SymbiFlow Plugins";
homepage = "https://github.com/SymbiFlow/yosys-symbiflow-plugins";
license = licenses.isc;
platforms = platforms.all;
maintainers = with maintainers; [ mcaju ];
};
}

View file

@ -1,37 +0,0 @@
{ stdenv
, abc-verifier
, fetchFromGitHub
, yosys
, plugins ? []
}:
let
localAbc-verifier = abc-verifier.overrideAttrs (_: rec {
pname = "abc-verifier";
version = "2020.06.22";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "abc";
rev = "341db25668f3054c87aa3372c794e180f629af5d";
sha256 = "14cgv34vz5ljkcms6nrv19vqws2hs8bgjgffk5q03cbxnm2jxv5s";
};
passthru.rev = src.rev;
});
in
(yosys.overrideAttrs (oldAttrs: rec {
pname = "symbiflow-yosys";
version = "0.9+2406";
src = fetchFromGitHub {
owner = "SymbiFlow";
repo = "yosys";
rev = "d8b2d1a2b1a93057678cf49bb8f0329f191faba1";
sha256 = "1w8jnqzabvzixjllhb6ak2n2gmjvsn6qd996i7z70bsq5rgdkq9g";
};
})).override {
abc-verifier = localAbc-verifier;
plugins = plugins;
}

View file

@ -1,4 +1,4 @@
{ stdenv
{ stdenv, lib
, abc-verifier
, bash
, bison
@ -12,7 +12,6 @@
, tcl
, verilog
, zlib
, plugins ? []
}:
# NOTE: as of late 2020, yosys has switched to an automation robot that
@ -33,8 +32,6 @@
# ultimately less confusing than using dates.
stdenv.mkDerivation rec {
inherit plugins;
pname = "yosys";
version = "0.9+3830";
@ -46,17 +43,21 @@ stdenv.mkDerivation rec {
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkg-config protobuf flex bison python3 ];
nativeBuildInputs = [ pkg-config bison flex ];
buildInputs = [ tcl readline libffi python3 protobuf zlib ];
makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"];
patchPhase = ''
patches = [
./plugin-search-dirs.patch
];
postPatch = ''
substituteInPlace ./Makefile \
--replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}'
chmod +x ./misc/yosys-config.in
patchShebangs ./misc/yosys-config.in
patchShebangs tests
patchShebangs tests ./misc/yosys-config.in
'';
preBuild = let
@ -75,7 +76,7 @@ stdenv.mkDerivation rec {
fi
if ! grep -q "YOSYS_VER := $version" Makefile; then
echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package ($version), failing."
echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing."
exit 1
fi
'';
@ -92,16 +93,11 @@ stdenv.mkDerivation rec {
# add a symlink to fake things so that both variants work the same way. this
# is also needed at build time for the test suite.
postBuild = "ln -sfv ${abc-verifier}/bin/abc ./yosys-abc";
postInstall = ''
ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc
postInstall = "ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc";
mkdir -p $out/share/yosys/plugins
for plugin in $plugins; do
ln -sfv $plugin/share/yosys/plugins/* $out/share/yosys/plugins/
done
'';
setupHook = ./setup-hook.sh;
meta = with stdenv.lib; {
meta = with lib; {
description = "Open RTL synthesis framework and tools";
homepage = "http://www.clifford.at/yosys/";
license = licenses.isc;

View file

@ -0,0 +1,34 @@
diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc
index 3ed19497..f9534bd0 100644
--- a/passes/cmds/plugin.cc
+++ b/passes/cmds/plugin.cc
@@ -75,8 +75,27 @@ void load_plugin(std::string filename, std::vector<std::string> aliases)
#endif
void *hdl = dlopen(filename.c_str(), RTLD_LAZY|RTLD_LOCAL);
- if (hdl == NULL && orig_filename.find('/') == std::string::npos)
- hdl = dlopen((proc_share_dirname() + "plugins/" + orig_filename + ".so").c_str(), RTLD_LAZY|RTLD_LOCAL);
+ if (hdl == NULL && orig_filename.find('/') == std::string::npos) {
+ std::string install_dir = proc_share_dirname() + "plugins";
+
+ vector<string> all_dirs;
+ all_dirs.push_back(install_dir);
+
+ char* plugin_dirs = getenv("NIX_YOSYS_PLUGIN_DIRS");
+ if (plugin_dirs != NULL) {
+ std::string p(plugin_dirs), t;
+ std::stringstream ss(p);
+
+ while(std::getline(ss, t, ':')) {
+ all_dirs.push_back(t);
+ }
+ }
+
+ for (auto dir : all_dirs) {
+ hdl = dlopen((dir + "/" + orig_filename + ".so").c_str(), RTLD_LAZY|RTLD_LOCAL);
+ if (hdl != NULL) break;
+ }
+ }
if (hdl == NULL)
log_cmd_error("Can't load module `%s': %s\n", filename.c_str(), dlerror());
loaded_plugins[orig_filename] = hdl;

View file

@ -0,0 +1,32 @@
{ stdenv, lib, fetchFromGitHub, pkg-config
, yosys, readline, zlib, bluespec
}:
stdenv.mkDerivation {
pname = "yosys-bluespec";
version = "2021.01.14";
src = fetchFromGitHub {
owner = "thoughtpolice";
repo = "yosys-bluespec";
rev = "7a0c609e9b601560067c34b8ce41e89ea4a397d4";
sha256 = "0xj9j5dwvq0dwqzfjd4ikmxkd28amj6d9m6ava7pwcrpjhyjnd0c";
};
buildInputs = [ yosys readline zlib bluespec ];
nativeBuildInputs = [ pkg-config ];
doCheck = true;
makeFlags = [
"PREFIX=$(out)/share/yosys/plugins"
"STATIC_BSC_PATH=${bluespec}/bin/bsc"
"STATIC_BSC_LIBDIR=${bluespec}/lib"
];
meta = with lib; {
description = "Bluespec plugin for Yosys";
license = licenses.isc;
platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice ];
};
}

View file

@ -0,0 +1,31 @@
{ stdenv, lib, fetchFromGitHub, pkg-config
, yosys, readline, zlib, ghdl
}:
stdenv.mkDerivation {
pname = "yosys-ghdl";
version = "2021.01.01";
src = fetchFromGitHub {
owner = "ghdl";
repo = "ghdl-yosys-plugin";
rev = "8b3e740fef9a653a20a838f1ade475960e1d379b";
sha256 = "13kpcp37r11xgqd8aksddi40a5vpzqi7p8qgyjbs99lyscyli75x";
};
buildInputs = [ yosys readline zlib ghdl ];
nativeBuildInputs = [ pkg-config ];
doCheck = true;
installPhase = ''
mkdir -p $out/share/yosys/plugins
cp ghdl.so $out/share/yosys/plugins/ghdl.so
'';
meta = with lib; {
description = "GHDL plugin for Yosys";
license = licenses.isc;
platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice ];
};
}

View file

@ -0,0 +1,5 @@
addYosysPluginPath() {
addToSearchPath NIX_YOSYS_PLUGIN_DIRS "$1/share/yosys/plugins"
}
addEnvHooks "$targetOffset" addYosysPluginPath

View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = ''A very high level general-purpose programming language'';
description = "A very high level general-purpose programming language";
maintainers = with maintainers; [ vrthra yurrriq ];
platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd ++ cygwin ++ illumos;
license = licenses.publicDomain;

View file

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = ''Relative expression based object language, a language where code is data'';
description = "Relative expression based object language, a language where code is data";
maintainers = with maintainers; [ vrthra ];
platforms = [ "x86_64-linux" ];
license = licenses.asl20;

View file

@ -34,7 +34,7 @@ stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
description = ''A very high level, goal-directed, object-oriented, general purpose applications language'';
description = "A very high level, goal-directed, object-oriented, general purpose applications language";
maintainers = with maintainers; [ vrthra ];
platforms = platforms.linux;
license = licenses.gpl2;

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
inherit version;
description = ''A library for arbitrary-precision interval arithmetic'';
description = "A library for arbitrary-precision interval arithmetic";
homepage = "http://arblib.org/";
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = teams.sage.members;

View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
inherit version;
description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron'';
description = "An implementation of the Double Description Method for generating all vertices of a convex polyhedron";
license = licenses.gpl2Plus;
maintainers = teams.sage.members;
platforms = platforms.unix;

View file

@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
meta = {
maintainers = with stdenv.lib.maintainers; [raskin];
platforms = stdenv.lib.platforms.linux;
description = ''DXF file format library'';
description = "DXF file format library";
};
}

View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
inherit version;
description = ''Elliptic curve tools'';
description = "Elliptic curve tools";
homepage = "https://github.com/JohnCremona/eclib";
license = licenses.gpl2Plus;
maintainers = teams.sage.members;

View file

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
inherit version;
description = ''Finite Field Linear Algebra Subroutines'';
description = "Finite Field Linear Algebra Subroutines";
license = licenses.lgpl21Plus;
maintainers = teams.sage.members;
platforms = platforms.unix;

View file

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
inherit version;
description = ''Fast Library for Number Theory'';
description = "Fast Library for Number Theory";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.unix;

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [gmp mpfr];
meta = {
inherit version;
description = ''Lattice algorithms using floating-point arithmetic'';
description = "Lattice algorithms using floating-point arithmetic";
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;

View file

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
description = ''Lattice algorithms using floating-point arithmetic'';
description = "Lattice algorithms using floating-point arithmetic";
changelog = [
# Some release notes are added to the github tags, though they are not
# always complete.

View file

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
description = ''Routines for fast arithmetic in GF(2)[x]'';
description = "Routines for fast arithmetic in GF(2)[x]";
homepage = "http://gf2x.gforge.inria.fr";
license = licenses.gpl2Plus;
maintainers = teams.sage.members;

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [autoconf automake libtool gmpxx];
meta = {
inherit version;
description = ''A C++ library for arithmetic and algebraic computations'';
description = "A C++ library for arithmetic and algebraic computations";
license = stdenv.lib.licenses.cecill-b;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [autoconf automake libtool gmpxx];
meta = {
inherit version;
description = ''A C++ library for arithmetic and algebraic computations'';
description = "A C++ library for arithmetic and algebraic computations";
license = stdenv.lib.licenses.cecill-b;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;

View file

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = {
inherit version;
description = ''A C++ library for arithmetic and algebraic computations'';
description = "A C++ library for arithmetic and algebraic computations";
license = stdenv.lib.licenses.cecill-b;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.unix;

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw";
};
meta = {
description = ''Tubing and extrusion library'';
description = "Tubing and extrusion library";
license = stdenv.lib.licenses.gpl2 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;

View file

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = ''Qt installer framework'';
description = "Qt installer framework";
inherit (qtbase.meta) platforms license homepage;
};
}

View file

@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
'';
meta = {
inherit version;
description = ''A Parallel / Multiprocessor Ray Tracing System'';
description = "A Parallel / Multiprocessor Ray Tracing System";
license = stdenv.lib.licenses.bsd3;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = with stdenv.lib.platforms; linux ++ cygwin ++ darwin;

View file

@ -33,7 +33,7 @@ stdenv.mkDerivation {
'';
meta = {
inherit (s) version;
description = ''Standard software-system definition library for Common Lisp'';
description = "Standard software-system definition library for Common Lisp";
license = stdenv.lib.licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;

View file

@ -32,7 +32,7 @@ stdenv.mkDerivation {
'';
meta = {
inherit (s) version;
description = ''Standard software-system definition library for Common Lisp'';
description = "Standard software-system definition library for Common Lisp";
license = stdenv.lib.licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.unix;

View file

@ -33,7 +33,7 @@ stdenv.mkDerivation {
'';
meta = {
inherit (s) version;
description = ''Standard software-system definition library for Common Lisp'';
description = "Standard software-system definition library for Common Lisp";
license = stdenv.lib.licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.unix;

View file

@ -51,7 +51,7 @@ stdenv.mkDerivation {
};
meta = {
description = ''Script used to wrap Common Lisp implementations'';
description = "Script used to wrap Common Lisp implementations";
maintainers = [stdenv.lib.maintainers.raskin];
};
}

View file

@ -85,7 +85,7 @@ let lispPackages = rec {
buildSystems = [ "clx-truetype" ];
parasites = [ "clx-truetype-test" ];
description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.'';
description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.";
deps = with pkgs.lispPackages; [
alexandria bordeaux-threads cl-aa cl-fad cl-paths cl-paths-ttf cl-store
cl-vectors clx trivial-features zpb-ttf

View file

@ -24,7 +24,7 @@ buildPerlPackage rec {
'';
meta = with lib; {
description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.'';
description = "Collection of advanced command-line tools to perform a variety of MySQL and system tasks.";
homepage = "https://www.percona.com/software/database-tools/percona-toolkit";
license = with licenses; [ gpl2 ];
maintainers = with maintainers; [ izorkin ];

View file

@ -0,0 +1,49 @@
{ lib, buildPythonPackage, fetchPypi, nose }:
let
lark-parser = buildPythonPackage rec {
pname = "lark-parser";
version = "0.7.8";
src = fetchPypi {
inherit pname version;
sha256 = "JiFeuxV+b7LudDGapERbnzt+RW4mviFc4Z/aqpAcIKQ=";
};
doCheck = true;
};
in
buildPythonPackage rec {
pname = "bc-python-hcl2";
version = "0.3.11";
src = fetchPypi {
inherit pname version;
sha256 = "VZhI1oJ2EDZGyz3iI6/KYvJq4BGafzR+rcSgHqlUDrA=";
};
# Nose is required during build process, so can not use `checkInputs`.
buildInputs = [
nose
];
propagatedBuildInputs = [
lark-parser
];
pythonImportsCheck = [ "hcl2" ];
meta = with lib; {
description = "A parser for HCL2 written in Python using Lark";
longDescription = ''
A parser for HCL2 written in Python using Lark.
This parser only supports HCL2 and isn't backwards compatible with HCL v1.
It can be used to parse any HCL2 config file such as Terraform.
'';
# Although this is the main homepage from PyPi but it is also a homepage
# of another PyPi package (python-hcl2). But these two are different.
homepage = "https://github.com/amplify-education/python-hcl2";
license = licenses.mit;
maintainers = [ maintainers.anhdle14 ];
};
}

View file

@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, nose }:
buildPythonPackage rec {
pname = "deep_merge";
version = "0.0.4";
src = fetchPypi {
inherit pname version;
sha256 = "tUQV+Qk0xC4zQRTihky01OczWzStOW41rYYQyWBlpH4=";
};
checkInputs = [
nose
];
doCheck = false;
meta = with lib; {
description = "This library contains a simple utility for deep-merging dictionaries and the data structures they contain";
homepage = "https://github.com/halfak/deep_merge";
license = licenses.mit;
maintainers = [ maintainers.anhdle14 ];
};
}

View file

@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "2.1.0";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "0mkkx6l3cbwfwng12zpisbv6m919fkhdb48xk24ayc19193bi86n";
sha256 = "060c53bc6f541660a2fe868fd83a695207d4e7b050e04fe103d1e77634b813c7";
};
postPatch = ''

View file

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "ipyvue";
version = "1.4.1";
version = "1.5.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "5b59cf92a1eb7fbef4f2d02be49ac562a721a6cf34f991ac963222cf4c8885a1";
sha256 = "e8549a7ac7dc45948a5f2735e17f97622313c7fea24ea3c1bd4a5ebf02bf5638";
};
propagatedBuildInputs = [ ipywidgets ];

View file

@ -1,44 +0,0 @@
{ stdenv
, fetchFromGitHub
, pkgs
, buildPythonPackage
, intervaltree
, numpy
, openpyxl
, parse
, progressbar
, pyjson5
, pyyaml
, simplejson
, symbiflow-fasm
, textx
}:
buildPythonPackage rec {
pname = "python-prjxray";
version = pkgs.prjxray-tools.version;
src = pkgs.prjxray-tools.src;
propagatedBuildInputs = [
intervaltree
numpy
openpyxl
parse
progressbar
pyjson5
pyyaml
simplejson
symbiflow-fasm
textx
];
doCheck = false;
meta = with stdenv.lib; {
description = "Documenting the Xilinx 7-series bit-stream format";
homepage = "https://github.com/SymbiFlow/prjxray";
license = licenses.isc;
maintainers = with maintainers; [ mcaju ];
};
}

View file

@ -18,7 +18,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ click ];
meta = with lib; {
description = ''An Early-Algorithm Context-free grammar Parser'';
description = "An Early-Algorithm Context-free grammar Parser";
homepage = "https://github.com/rocky/python-spark";
license = licenses.mit;
maintainers = with maintainers; [raskin];

View file

@ -1,27 +0,0 @@
{ stdenv
, pkgs
, fetchFromGitHub
, buildPythonPackage
, textx
}:
buildPythonPackage rec {
pname = "symbiflow-fasm";
version = "0.0.1-g4857dde";
src = fetchFromGitHub {
owner = "SymbiFlow";
repo = "fasm";
rev = "4857dde757edd88688c2faf808774d85bdbe3900";
sha256 = "1za7f8slf8wvp1mfbfc3vdv61115p49k0vwngs4db6ips1qg1435";
};
propagatedBuildInputs = [ textx ];
meta = with stdenv.lib; {
description = "FPGA Assembly (FASM) Parser and Generation library";
homepage = "https://github.com/SymbiFlow/fasm";
license = licenses.isc;
maintainers = with maintainers; [ mcaju ];
};
}

View file

@ -1,36 +0,0 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, arpeggio
, click
, jinja2
}:
buildPythonPackage rec {
pname = "textX";
version = "2.2.0";
src = fetchPypi {
inherit pname;
inherit version;
sha256 = "00mwd588ms96qp27m5vpjkzk30wfw53hnmv8y77slxca8lw9vq82";
};
checkInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "tests/functional" ];
propagatedBuildInputs = [
arpeggio
click
jinja2
];
meta = with stdenv.lib; {
description = "textX is a meta-language for building Domain-Specific Languages (DSLs) in Python";
homepage = "https://textx.github.io";
license = licenses.mit;
maintainers = with maintainers; [ mcaju ];
};
}

View file

@ -1,45 +0,0 @@
{ stdenv
, fetchFromGitHub
, buildPythonPackage
, pytestCheckHook
, simplejson
, intervaltree
, python-prjxray
, symbiflow-fasm
, textx
}:
buildPythonPackage rec {
pname = "xc-fasm";
version = "0.0.1-g0ddd9516";
src = fetchFromGitHub {
owner = "SymbiFlow";
repo = "xc-fasm";
rev = "0ddd951602d47d5b95f2072f8aa751af5e81e577";
sha256 = "15bzw92sx99s0zldr48na4yhrnp7b90nxsd8ya6ag1pvvijp2al4";
};
propagatedBuildInputs = [
simplejson
intervaltree
python-prjxray
symbiflow-fasm
textx
];
# Pip will check for and then install missing dependecies.
# Because some of them are installed from git, it will try
# to download them even if they're present in
# propagatedBuildInputs.
pipInstallFlags = [ "--no-deps" ];
checkInputs = [ pytestCheckHook ];
meta = with stdenv.lib; {
description = "XC FASM libraries";
homepage = "https://github.com/SymbiFlow/xc-fasm";
license = licenses.isc;
maintainers = with maintainers; [ mcaju ];
};
}

View file

@ -0,0 +1,77 @@
{ stdenv, pkgs, lib, python3, fetchFromGitHub }:
let
pname = "checkov";
version = "1.0.674";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
sha256 = "/S8ic5ZVxA2vd/rjRPX5gslbmnULL7BSx34vgWIsheQ=";
};
disabled = pkgs.python3Packages.pythonOlder "3.7";
# CheckOV only work with `dpath 1.5.0`
dpath = pkgs.python3Packages.buildPythonPackage rec {
pname = "dpath";
version = "1.5.0";
src = pkgs.python3Packages.fetchPypi {
inherit pname version;
sha256 = "SWYVtOqEI20Y4NKGEi3nSGmmDg+H4sfsZ4f/KGxINhs=";
};
doCheck = false;
};
in
python3.pkgs.buildPythonPackage rec {
inherit pname version disabled src;
nativeBuildInputs = with python3.pkgs; [ setuptools_scm ];
propagatedBuildInputs = with python3.pkgs; [
pytest
coverage
bandit
bc-python-hcl2
deep_merge
tabulate
colorama
termcolor
junit-xml
dpath
pyyaml
boto3
GitPython
six
jmespath
tqdm
update_checker
semantic-version
packaging
];
# Both of these tests are pulling from external srouces (https://github.com/bridgecrewio/checkov/blob/f03a4204d291cf47e3753a02a9b8c8d805bbd1be/.github/workflows/build.yml)
preCheck = ''
rm -rf integration_tests/*
rm -rf tests/terraform/*
'';
# Wrap the executable so that the python packages are available
# it's just a shebang script which calls `python -m checkov "$@"`
postFixup = ''
wrapProgram $out/bin/checkov \
--set PYTHONPATH $PYTHONPATH
'';
meta = with lib; {
homepage = "https://github.com/bridgecrewio/checkov";
description = "Static code analysis tool for infrastructure-as-code";
longDescription = ''
Prevent cloud misconfigurations during build-time for Terraform, Cloudformation, Kubernetes, Serverless framework and other infrastructure-as-code-languages with Checkov by Bridgecrew.
'';
license = licenses.asl20;
maintainers = with maintainers; [ anhdle14 ];
};
}

View file

@ -16,6 +16,7 @@
tree-sitter-json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json));
tree-sitter-julia = (builtins.fromJSON (builtins.readFile ./tree-sitter-julia.json));
tree-sitter-lua = (builtins.fromJSON (builtins.readFile ./tree-sitter-lua.json));
tree-sitter-nix = (builtins.fromJSON (builtins.readFile ./tree-sitter-nix.json));
tree-sitter-ocaml = (builtins.fromJSON (builtins.readFile ./tree-sitter-ocaml.json));
tree-sitter-php = (builtins.fromJSON (builtins.readFile ./tree-sitter-php.json));
tree-sitter-python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json));

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
"rev": "b8bff2a389ecc098dbb7e8abee492816a5eb42db",
"date": "2020-11-15T07:54:17+00:00",
"path": "/nix/store/h5p71g661hbyzcdcj6xff8y5pcsivpa4-tree-sitter-c-sharp",
"sha256": "0x78s2wgd8b6pwjzbmc9fgp0ivdmxv39wikig1m55slai6yq51wh",
"rev": "aae8ab2b681082ce7a35d8d5fdf75ffcf7f994e5",
"date": "2021-01-08T13:18:05+00:00",
"path": "/nix/store/fpx44l1j2dz3drnvfb7746d8zxn37gwi-tree-sitter-c-sharp",
"sha256": "107bxz9bhyixdla3xli06ism8rnkha7pa79hi7lyx00sfnjmgcc8",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -0,0 +1,10 @@
{
"url": "https://github.com/cstrahan/tree-sitter-nix",
"rev": "791b5ff0e4f0da358cbb941788b78d436a2ca621",
"date": "2019-05-10T15:57:43-05:00",
"path": "/nix/store/5gcddcxf6jfr4f0p203jnbjc0zxk207d-tree-sitter-nix",
"sha256": "1y5b3wh3fcmbgq8r2i97likzfp1zp02m58zacw5a1cjqs5raqz66",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-python",
"rev": "65b486b42fe0188e4be344092151042bf1bc6d9a",
"date": "2020-12-15T09:33:20-08:00",
"path": "/nix/store/k9jziqzyxq2bv55pwl03jcmmca83fjyp-tree-sitter-python",
"sha256": "1yxqdlmp0jybm7vvza1ni5a320vrviqkd14pnpcrg9ilzq23mlsh",
"rev": "f568dfabf7c4611077467a9cd13297fa0658abb6",
"date": "2021-01-06T13:32:39-08:00",
"path": "/nix/store/5g256n8ym3ll2kp9jlmnkaxpnyf6rpk3-tree-sitter-python",
"sha256": "1lxmzrkw4k9pba4xywnbd1pk2x5s99qa4skgqvgy3imgbhy7ilkh",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ruby",
"rev": "bb572f60e9538bd11fbde95a54f97522073f1e06",
"date": "2020-12-20T12:25:50-08:00",
"path": "/nix/store/hkjgvxh8l4drk1z4zkhmd0wcj876x5y1-tree-sitter-ruby",
"sha256": "198sfmrb3mxvpfmlwmwfmb3qs075ih0bjmr0ffrdy4nqm4a00cb8",
"rev": "f86d90cce578e28c824afdcdbdca7d031b88c0b0",
"date": "2020-11-02T20:49:49-08:00",
"path": "/nix/store/gs0hhb1dlgmv0y60zyyz7ki30yvpddfx-tree-sitter-ruby",
"sha256": "1n1irdjfmv27p5ia2vqzv8zfsq19pxi0as0wrkb7z7s1lqr1gwrb",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-rust",
"rev": "8746bd4b584b8063ee8e445bf31015e887417d33",
"date": "2020-11-23T17:16:42-08:00",
"path": "/nix/store/1zzxvza23wsdyazw47lhjvrs0za6wjpn-tree-sitter-rust",
"sha256": "0bhxfyq8ycnp90pqvr6cf3gpq1vax8a34kaq85dmbrc6ar8a7ap6",
"rev": "2beedf23bedbd7b02b416518693e8eed3944d4a0",
"date": "2021-01-05T10:00:48-08:00",
"path": "/nix/store/2igv1zlnl535b86zj8s9s3ir4q85933x-tree-sitter-rust",
"sha256": "0iicwhxf1f56zqpsagbm8nr30fpssi970mi9i47az206dbs506ly",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-typescript",
"rev": "a3a4becef889692724bb1c2191f8fc4bce6573f9",
"date": "2020-12-15T13:34:55-08:00",
"path": "/nix/store/dra5wbhgxkkhphm1mhgv87hsfw0g18nw-tree-sitter-typescript",
"sha256": "0ir7lmzwnbf1zwbl4bfsib1jilg8pvfc1nabaq2n2rixvghlvf3d",
"rev": "2d1c7d5c10c33cb444d1781fa76f2936810afec4",
"date": "2021-01-07T09:49:56-08:00",
"path": "/nix/store/s65bv25523lwa9yrqbj9hsh0k4ig6pbx-tree-sitter-typescript",
"sha256": "09bv44n181az5rqjd43wngj9bghwy0237gpvs6xkjf9j19kvy0yi",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -63,6 +63,10 @@ let
# If you need a grammar that already exists in the official orga,
# make sure to give it a different name.
otherGrammars = {
"tree-sitter-nix" = {
orga = "cstrahan";
repo = "tree-sitter-nix";
};
"tree-sitter-lua" = {
orga = "nvim-treesitter";
repo = "tree-sitter-lua";

View file

@ -0,0 +1,14 @@
{ substituteAll, runtimeShell, jq, nix, lib }:
let
fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix;
in substituteAll {
name = "nixos-rebuild";
src = ./nixos-rebuild.sh;
dir = "bin";
isExecutable = true;
inherit runtimeShell nix;
nix_x86_64_linux = fallback.x86_64-linux;
nix_i686_linux = fallback.i686-linux;
path = lib.makeBinPath [ jq ];
}

View file

@ -27,7 +27,7 @@ stdenv.mkDerivation {
;
meta = {
inherit (s) version;
description = ''A very minimal Linux init implementation from suckless.org'';
description = "A very minimal Linux init implementation from suckless.org";
license = stdenv.lib.licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;

View file

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = ''A set of scripts to serve the Nix store as a binary cache'';
description = "A set of scripts to serve the Nix store as a binary cache";
longDescription = ''
This package installs a CGI script that serves Nix store path in the
binary cache format. It also installs a launcher called

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mtail";
version = "3.0.0-rc38";
version = "3.0.0-rc41";
src = fetchFromGitHub {
owner = "google";
repo = "mtail";
rev = "v${version}";
sha256 = "0a9xwv8c4ivpyh1hm3nzssnqpr4c6br0qb27mz3sy6fp2p46c0ms";
sha256 = "0651p4ypy1m5m15rfmlbjywq2968hjh6lc2cbgq7grkdsad6lrgx";
};
vendorSha256 = "03hicp3h4jrq7ihirpcmgkk5siiny3w2wnwhibaf36j9xllmf57f";
vendorSha256 = "0zymch6xfnyzjzizrjljmscqf8m99580zxjwc2rb9hn0324shcwq";
doCheck = false;

View file

@ -26,7 +26,7 @@ stdenv.mkDerivation {
'';
meta = {
inherit (s) version;
description = ''RDF database'';
description = "RDF database";
license = lib.licenses.asl20;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;

View file

@ -30,7 +30,7 @@ stdenv.mkDerivation {
'';
meta = {
inherit (s) version;
description = ''SPARQL server'';
description = "SPARQL server";
license = lib.licenses.asl20;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;

View file

@ -3,13 +3,13 @@
mkYarnPackage rec {
name = "hedgedoc";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "hedgedoc";
repo = "hedgedoc";
rev = version;
sha256 = "0axad5581v25pynfj6pgy0h1xp92dyllnc7mk42z6hxbs4sgkrw1";
sha256 = "1w3si1k27c8d9yka2v91883dlz57n0wasan4agi6gw17h9dzb1l6";
};
nativeBuildInputs = [ which makeWrapper ];

View file

@ -1,6 +1,6 @@
{
"name": "HedgeDoc",
"version": "1.7.1",
"version": "1.7.2",
"description": "The best platform to write and share markdown.",
"main": "app.js",
"license": "AGPL-3.0",

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -24,7 +24,7 @@ stdenv.mkDerivation {
];
meta = {
inherit (s) version;
description = ''A minimalistic X11 menu creator'';
description = "A minimalistic X11 menu creator";
license = lib.licenses.free ; # 9menu derivative with 9menu license
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';
meta = {
inherit version;
description = ''Expose-style compositing-based standalone window switcher'';
description = "Expose-style compositing-based standalone window switcher";
license = lib.licenses.gpl2Plus ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
version = "2020.11.07";
version = "2020.12.10";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
sha256 = "0zwzgqy1wa7yd2cm6spq11lw21mdn92lx8qzrxpk9kxcl03mv5jd";
sha256 = "0r9jwjwmdyyfq882mq7gkc2hjrv4ljnidxzlyycjipzndb1gv1ls";
};
# There is also a file called "makefile" which seems to be preferred by the standard build phase

View file

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "1password";
version = "0.9.7";
version = "0.9.8";
src = fetchurl {
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
hash = "sha256-JaYFJL24Pgwh5CrsKjJPL8u0fx1x0beFTK+EGNT1iqA=";
hash = "sha256-XAeWcGy1moFp1v0djYwYwKlzdX0UA8cqwtTNWBKLazc=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -182,6 +182,8 @@ in
cereal = callPackage ../development/libraries/cereal { };
checkov = callPackage ../development/tools/analysis/checkov {};
chrysalis = callPackage ../applications/misc/chrysalis { };
clj-kondo = callPackage ../development/tools/clj-kondo { };
@ -10722,12 +10724,6 @@ in
swift = callPackage ../development/compilers/swift { };
symbiflow-vtr = callPackage ../development/compilers/symbiflow-vtr { };
symbiflow-yosys = callPackage ../development/compilers/symbiflow-yosys { };
symbiflow-yosys-plugins = callPackage ../development/compilers/symbiflow-yosys-plugins { };
swiProlog = callPackage ../development/compilers/swi-prolog {
inherit (darwin.apple_sdk.frameworks) Security;
jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
@ -10840,6 +10836,8 @@ in
yasm = callPackage ../development/compilers/yasm { };
yosys = callPackage ../development/compilers/yosys { };
yosys-bluespec = callPackage ../development/compilers/yosys/plugins/bluespec.nix { };
yosys-ghdl = callPackage ../development/compilers/yosys/plugins/ghdl.nix { };
z88dk = callPackage ../development/compilers/z88dk { };
@ -11098,8 +11096,6 @@ in
polyml56 = callPackage ../development/compilers/polyml/5.6.nix { };
polyml57 = callPackage ../development/compilers/polyml/5.7.nix { };
prjxray-tools = callPackage ../development/compilers/prjxray-tools { };
pure = callPackage ../development/interpreters/pure {
/*llvm = llvm_35;*/
};
@ -20432,8 +20428,6 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
prjxray-db = callPackage ../data/misc/prjxray-db { };
profont = callPackage ../data/fonts/profont
{ inherit (buildPackages.xorg) mkfontscale; };
@ -20469,8 +20463,6 @@ in
sweet = callPackage ../data/themes/sweet { };
symbiflow-arch-defs = callPackage ../data/misc/symbiflow-arch-defs { };
mime-types = callPackage ../data/misc/mime-types { };
shared-mime-info = callPackage ../data/misc/shared-mime-info { };
@ -20862,7 +20854,9 @@ in
audacious = libsForQt5.callPackage ../applications/audio/audacious { };
audaciousQt5 = audacious;
audacity = callPackage ../applications/audio/audacity { };
audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; };
audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; };
audacity = audacity-gtk2;
audio-recorder = callPackage ../applications/audio/audio-recorder { };
@ -28687,6 +28681,8 @@ in
nixos-generators = callPackage ../tools/nix/nixos-generators { };
nixos-rebuild = callPackage ../os-specific/linux/nixos-rebuild { };
norwester-font = callPackage ../data/fonts/norwester {};
nut = callPackage ../applications/misc/nut { };

View file

@ -854,6 +854,8 @@ in {
bayespy = callPackage ../development/python-modules/bayespy { };
bc-python-hcl2 = callPackage ../development/python-modules/bc-python-hcl2 { };
bcdoc = callPackage ../development/python-modules/bcdoc { };
bcrypt = if pythonOlder "3.6" then
@ -1613,6 +1615,8 @@ in {
decorator = callPackage ../development/python-modules/decorator { };
deep_merge = callPackage ../development/python-modules/deep_merge { };
deepdiff = callPackage ../development/python-modules/deepdiff { };
deepmerge = callPackage ../development/python-modules/deepmerge { };
@ -4812,8 +4816,6 @@ in {
python-openems = callPackage ../development/python-modules/python-openems { };
python-prjxray = callPackage ../development/python-modules/python-prjxray { };
python-tado = callPackage ../development/python-modules/python-tado { };
pkutils = callPackage ../development/python-modules/pkutils { };
@ -7407,8 +7409,6 @@ in {
sybil = callPackage ../development/python-modules/sybil { };
symbiflow-fasm = callPackage ../development/python-modules/symbiflow-fasm { };
symengine = callPackage ../development/python-modules/symengine { symengine = pkgs.symengine; };
sympy = if isPy3k then
@ -7526,8 +7526,6 @@ in {
textfsm = callPackage ../development/python-modules/textfsm { };
textx = callPackage ../development/python-modules/textx { };
testpath = callPackage ../development/python-modules/testpath { };
testrepository = callPackage ../development/python-modules/testrepository { };
@ -8179,8 +8177,6 @@ in {
xattr = callPackage ../development/python-modules/xattr { };
xc-fasm = callPackage ../development/python-modules/xc-fasm { };
xcaplib = callPackage ../development/python-modules/xcaplib { };
xcffib = callPackage ../development/python-modules/xcffib { };