Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-03-22 12:26:55 +00:00 committed by GitHub
commit feda7be375
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 356 additions and 183 deletions

View file

@ -26,7 +26,11 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: ***
<prompt># </prompt>mkfs.ext4 /dev/mapper/<replaceable>crypted</replaceable> <prompt># </prompt>mkfs.ext4 /dev/mapper/<replaceable>crypted</replaceable>
</screen> </screen>
To ensure that this file system is automatically mounted at boot time as The LUKS volume should be automatically picked up by
<command>nixos-generate-config</command>, but you might want to verify that your
<filename>hardware-configuration.nix</filename> looks correct.
To manually ensure that the system is automatically mounted at boot time as
<filename>/</filename>, add the following to <filename>/</filename>, add the following to
<filename>configuration.nix</filename>: <filename>configuration.nix</filename>:
<programlisting> <programlisting>

View file

@ -38,13 +38,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cudatext"; pname = "cudatext";
version = "1.122.3"; version = "1.129.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Alexey-T"; owner = "Alexey-T";
repo = "CudaText"; repo = "CudaText";
rev = version; rev = version;
sha256 = "1h56hj433z0n4l97zl1cwkjv0qvz4qmvf469zzjzf1nj4zj8px2b"; sha256 = "1sg9wg6w3w0phrnnzpj7h2g22y0x7a3dl57djzydayxmg8fnn2ys";
}; };
postPatch = '' postPatch = ''
@ -91,7 +91,12 @@ stdenv.mkDerivation rec {
install -Dm644 setup/debfiles/cudatext-512.png -t $out/share/pixmaps install -Dm644 setup/debfiles/cudatext-512.png -t $out/share/pixmaps
install -Dm644 setup/debfiles/cudatext.desktop -t $out/share/applications install -Dm644 setup/debfiles/cudatext.desktop -t $out/share/applications
'' + lib.concatMapStringsSep "\n" (lexer: '' '' + lib.concatMapStringsSep "\n" (lexer: ''
install -Dm644 CudaText-lexers/${lexer}/*.{cuda-lexmap,lcf} $out/share/cudatext/data/lexlib if [ -d "CudaText-lexers/${lexer}" ]; then
install -Dm644 CudaText-lexers/${lexer}/*.{cuda-lexmap,lcf} $out/share/cudatext/data/lexlib
else
echo "${lexer} lexer not found"
exit 1
fi
'') additionalLexers; '') additionalLexers;
meta = with lib; { meta = with lib; {

View file

@ -6,38 +6,38 @@
}, },
"ATBinHex-Lazarus": { "ATBinHex-Lazarus": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2020.11.22", "rev": "2021.02.13",
"sha256": "0dkvzm32ls03pfp40fxvsyrkfmyznc5yrj65cp4a8pp9kpkvzlz7" "sha256": "1p2r2q1al6rcsdbbg8ilm4xn6w48bj348khxdmpak7vfwx9741h8"
}, },
"ATFlatControls": { "ATFlatControls": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2021.01.12", "rev": "2021.03.05",
"sha256": "1mavv3krs4srdp362prf4sncssxjh11la5j4lkx0wk5csrmd1pc9" "sha256": "1p2pzha5dd4p23j2bv6jxphj596dlb5v8ixjzg4x2zglz2hir6yz"
}, },
"ATSynEdit": { "ATSynEdit": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2021.01.19", "rev": "2021.03.16",
"sha256": "0lpgfwljwh9mypscbpj5c7fivhza0hizjgqypval3v0209cx38d1" "sha256": "1sq9j2zaif019gl6nf391lyp8k9s38f5s6ci7k3z5v90hkz1dcql"
}, },
"ATSynEdit_Cmp": { "ATSynEdit_Cmp": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2021.01.17", "rev": "2021.03.08",
"sha256": "14i4jdpbmh6sjpvbwipdvvmmqqw8wg592b34a9wdf2f9qxq2p4ly" "sha256": "0xvnvx4qzp6nxi912i4zlnal91k6vbcsyfbz05ib73sz68xqd5qv"
}, },
"EControl": { "EControl": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2021.01.12", "rev": "2021.03.16",
"sha256": "107zyd65vc72fl4mvyirhv2a9m47l9bs6gwqiwar7hrn02zns6bq" "sha256": "159s1rpl829bmaa4bllqhjm8z0vji1ncsd6hw2s8z8hz28n905k8"
}, },
"ATSynEdit_Ex": { "ATSynEdit_Ex": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2020.10.04", "rev": "2021.03.16",
"sha256": "0z66cm9pgdi7whqaim6hva4aa08zrr1881n1fal7lnz6wlla824k" "sha256": "1a4mxcwjm9naxh4piqm5y93w2xd5rgl0vcn108wy1pkr221agg2q"
}, },
"Python-for-Lazarus": { "Python-for-Lazarus": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2021.01.16", "rev": "2021.02.18",
"sha256": "07qv3x1cm3r12gxfnqzxly6nff39bghwwgxzl2lxi1qbpqhcs2l5" "sha256": "0fy6bmpdcl2aa8pb7zban6midkfwdj99x14hdghrv7cp8l4gcsg5"
}, },
"Emmet-Pascal": { "Emmet-Pascal": {
"owner": "Alexey-T", "owner": "Alexey-T",
@ -46,8 +46,8 @@
}, },
"CudaText-lexers": { "CudaText-lexers": {
"owner": "Alexey-T", "owner": "Alexey-T",
"rev": "2021.01.16", "rev": "2021.02.01",
"sha256": "13zyg0cm1c1662l3f7sy462pbc39l1cwm5214nx8ijngf8kgn2zh" "sha256": "051jnrhfpl9n5pgrssf68lj732zxhvjbvna4746ngmdyxvw6dqfd"
}, },
"bgrabitmap": { "bgrabitmap": {
"owner": "bgrabitmap", "owner": "bgrabitmap",

View file

@ -21,6 +21,5 @@ buildGoPackage rec {
longDescription = "The Hex Editor From Hell!"; longDescription = "The Hex Editor From Hell!";
license = with licenses; [ mit ]; license = with licenses; [ mit ];
maintainers = with maintainers; [ ramkromberg ]; maintainers = with maintainers; [ ramkromberg ];
platforms = with platforms; linux;
}; };
} }

View file

@ -57,6 +57,6 @@ python3Packages.buildPythonApplication rec {
''; '';
license = lib.licenses.gpl3; license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.steveej ]; maintainers = [ lib.maintainers.steveej ];
platforms = lib.platforms.linux; platforms = lib.platforms.unix;
}; };
} }

View file

@ -0,0 +1,43 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
, msgpack, neovim, pythonPackages, qtbase }:
mkDerivation rec {
pname = "neovim-qt-unwrapped";
version = "0.2.16.1";
src = fetchFromGitHub {
owner = "equalsraf";
repo = "neovim-qt";
rev = "v${version}";
sha256 = "0x5brrim3f21bzdmh6wyrhrislwpx1248wbx56csvic6v78hzqny";
};
cmakeFlags = [
"-DUSE_SYSTEM_MSGPACK=1"
"-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found
];
buildInputs = [
neovim.unwrapped # only used to generate help tags at build time
qtbase
] ++ (with pythonPackages; [
jinja2 python msgpack
]);
nativeBuildInputs = [ cmake doxygen ];
preCheck = ''
# The GUI tests require a running X server, disable them
sed -i ../test/CMakeLists.txt -e '/^add_xtest_gui/d'
'';
doCheck = true;
meta = with lib; {
description = "Neovim client library and GUI, in Qt5";
homepage = "https://github.com/equalsraf/neovim-qt";
license = licenses.isc;
maintainers = with maintainers; [ peterhoeg ];
inherit (neovim.meta) platforms;
};
}

View file

@ -1,79 +1,38 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper { lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
, msgpack, neovim, pythonPackages, qtbase }: , msgpack, neovim, pythonPackages, qtbase, neovim-qt-unwrapped }:
let let
unwrapped = mkDerivation rec { unwrapped = neovim-qt-unwrapped;
pname = "neovim-qt-unwrapped";
version = "0.2.16.1";
src = fetchFromGitHub {
owner = "equalsraf";
repo = "neovim-qt";
rev = "v${version}";
sha256 = "0x5brrim3f21bzdmh6wyrhrislwpx1248wbx56csvic6v78hzqny";
};
cmakeFlags = [
"-DUSE_SYSTEM_MSGPACK=1"
"-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found
];
buildInputs = [
neovim.unwrapped # only used to generate help tags at build time
qtbase
] ++ (with pythonPackages; [
jinja2 python msgpack
]);
nativeBuildInputs = [ cmake doxygen ];
preCheck = ''
# The GUI tests require a running X server, disable them
sed -i ../test/CMakeLists.txt \
-e '/^add_xtest_gui/d'
'';
doCheck = true;
meta = with lib; {
description = "Neovim client library and GUI, in Qt5";
homepage = "https://github.com/equalsraf/neovim-qt";
license = licenses.isc;
maintainers = with maintainers; [ peterhoeg ];
inherit (neovim.meta) platforms;
inherit version;
};
};
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "neovim-qt"; pname = "neovim-qt";
version = unwrapped.version; version = unwrapped.version;
buildCommand = if stdenv.isDarwin then '' buildCommand = if stdenv.isDarwin then ''
mkdir -p $out/Applications mkdir -p $out/Applications
cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications
chmod -R a+w "$out/Applications/nvim-qt.app/Contents/MacOS" chmod -R a+w $out/Applications/nvim-qt.app/Contents/MacOS
wrapProgram "$out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt" \ wrapProgram $out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt \
--prefix PATH : "${neovim}/bin" --prefix PATH : ${neovim}/bin
'' else '' '' else ''
makeWrapper '${unwrapped}/bin/nvim-qt' "$out/bin/nvim-qt" \ makeWrapper ${unwrapped}/bin/nvim-qt $out/bin/nvim-qt \
--prefix PATH : "${neovim}/bin" --prefix PATH : ${neovim}/bin
# link .desktop file # link .desktop file
mkdir -p "$out/share/pixmaps" mkdir -p $out/share/pixmaps
ln -s '${unwrapped}/share/applications' "$out/share/applications" ln -s ${unwrapped}/share/applications $out/share/applications
ln -s '${unwrapped}/share/pixmaps/nvim-qt.png' "$out/share/pixmaps/nvim-qt.png" ln -s ${unwrapped}/share/pixmaps/nvim-qt.png $out/share/pixmaps/nvim-qt.png
''; '';
preferLocalBuild = true; preferLocalBuild = true;
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
]; ];
passthru = { passthru = {
inherit unwrapped; inherit unwrapped;
}; };
inherit (unwrapped) meta; inherit (unwrapped) meta;
} }

View file

@ -33,6 +33,10 @@ in python3.pkgs.buildPythonApplication {
paths = map (path: "${path}/lib/aspell") enchantAspellDicts; paths = map (path: "${path}/lib/aspell") enchantAspellDicts;
}}" }}"
) )
substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \
--replace "Exec=ReText-${version}.data/scripts/retext %F" "Exec=$out/bin/retext %F" \
--replace "Icon=ReText-${version}.data/data/share/retext/icons/retext.svg" "Icon=$out/share/retext/icons/retext.svg"
''; '';
meta = with lib; { meta = with lib; {

View file

@ -1,7 +1,6 @@
{ mkDerivation { mkDerivation
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, libGLU , libGLU
, qtbase , qtbase
, qtscript , qtscript
@ -19,13 +18,13 @@
mkDerivation rec { mkDerivation rec {
pname = "meshlab"; pname = "meshlab";
version = "2020.07"; version = "2020.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cnr-isti-vclab"; owner = "cnr-isti-vclab";
repo = "meshlab"; repo = "meshlab";
rev = "Meshlab-${version}"; rev = "Meshlab-${version}";
sha256 = "0vj849b57zk3k6lx35zzcjhr9gdy4hxqnnkb8chwy7hw262cm3ri"; sha256 = "QrnqXEVqI1ADUYWalZ0h/0+xS+gDZTinm0weT39onw0=";
fetchSubmodules = true; # for vcglib fetchSubmodules = true; # for vcglib
}; };
@ -46,17 +45,11 @@ mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
patches = [
# Make cmake use the system qhull. The next meshlab will not need this patch because it is already in master.
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/cnr-isti-vclab/meshlab/pull/747.patch";
sha256 = "0wx9f6zn458xz3lsqcgvsbwh1pgi3g0lah93nlbsb0sagng7n565";
})
];
preConfigure = '' preConfigure = ''
substituteAll ${./meshlab.desktop} install/linux/resources/meshlab.desktop substituteAll ${./meshlab.desktop} scripts/Linux/resources/meshlab.desktop
cd src cmakeDir=$PWD/src
mkdir ../build
cd ../build
''; '';
cmakeFlags = [ cmakeFlags = [
@ -75,19 +68,12 @@ mkDerivation rec {
postFixup = '' postFixup = ''
patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlabserver-wrapped
''; '';
# Meshlab is not format-security clean; without disabling hardening, we get:
# src/common/GLLogStream.h:61:37: error: format not a string literal and no format arguments [-Werror=format-security]
# 61 | int chars_written = snprintf(buf, buf_size, f, std::forward<Ts>(ts)...);
# |
hardeningDisable = [ "format" ];
meta = { meta = {
description = "A system for processing and editing 3D triangular meshes"; description = "A system for processing and editing 3D triangular meshes";
homepage = "https://www.meshlab.net/"; homepage = "https://www.meshlab.net/";
license = lib.licenses.gpl3; license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ viric ]; maintainers = with lib.maintainers; [ viric ];
platforms = with lib.platforms; linux; platforms = with lib.platforms; linux;
}; };

View file

@ -10,20 +10,20 @@
buildGoModule rec { buildGoModule rec {
pname = "nerdctl"; pname = "nerdctl";
version = "0.7.1"; version = "0.7.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AkihiroSuda"; owner = "containerd";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-tMzob+ljGBKkfbxwMqy+8bqVp51Eqyx4kXhsj/LRfzQ="; sha256 = "sha256-0q3UmlXzW0fGYPc1IptuIbCMnKW4pyDm1KxkRqU2voA=";
}; };
vendorSha256 = "sha256-zUX/kneVz8uXmxly8yqmcttK3Wj4EmBaT8gmg3hDms4="; vendorSha256 = "sha256-QVvID9rrOFngL94LWN75HSnyTgh3F0KaScWxMIKUqDM=";
nativeBuildInputs = [ makeWrapper installShellFiles ]; nativeBuildInputs = [ makeWrapper installShellFiles ];
preBuild = let t = "github.com/AkihiroSuda/nerdctl/pkg/version"; in preBuild = let t = "github.com/containerd/nerdctl/pkg/version"; in
'' ''
buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.Revision=<unknown>") buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.Revision=<unknown>")
''; '';
@ -36,9 +36,6 @@ buildGoModule rec {
--prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \ --prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \
--prefix CNI_PATH : "${cni-plugins}/bin" --prefix CNI_PATH : "${cni-plugins}/bin"
# nerdctl panics without XDG_RUNTIME_DIR set
export XDG_RUNTIME_DIR=$TMPDIR
installShellCompletion --cmd nerdctl \ installShellCompletion --cmd nerdctl \
--bash <($out/bin/nerdctl completion bash) --bash <($out/bin/nerdctl completion bash)
''; '';
@ -52,8 +49,8 @@ buildGoModule rec {
''; '';
meta = with lib; { meta = with lib; {
homepage = "https://github.com/AkihiroSuda/nerdctl/"; homepage = "https://github.com/containerd/nerdctl/";
changelog = "https://github.com/AkihiroSuda/nerdctl/releases/tag/v${version}"; changelog = "https://github.com/containerd/nerdctl/releases/tag/v${version}";
description = "A Docker-compatible CLI for containerd"; description = "A Docker-compatible CLI for containerd";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ jk ]; maintainers = with maintainers; [ jk ];

View file

@ -3,27 +3,23 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "newsboat"; pname = "newsboat";
version = "2.22.1"; version = "2.23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "newsboat"; owner = "newsboat";
repo = "newsboat"; repo = "newsboat";
rev = "r${version}"; rev = "r${version}";
sha256 = "1j3z34dhqw0f1v6v2lfwcvzqnm2kr2940bgxibfi0npacp74izh3"; sha256 = "0a0g9km515kipqmz6c09aj3lgy3nkzqwgnp87fh8f2vr098fn144";
}; };
cargoSha256 = "08ywaka1lib8yrqjmfx1i37f7b33y3i6jj7f50pwhw8n6lr9f7lc"; cargoSha256 = "11dn1ixc7i29cv8kpqfkmikdqzr2v79vlyfxcvjwhgd0r34w4xhn";
postPatch = '' # TODO: Check if that's still needed
substituteInPlace Makefile --replace "|| true" "" postPatch = lib.optionalString stdenv.isDarwin ''
'' # Allow other ncurses versions on Darwin
# TODO: Check if that's still needed substituteInPlace config.sh \
+ lib.optionalString stdenv.isDarwin '' --replace "ncurses5.4" "ncurses"
# Allow other ncurses versions on Darwin '';
substituteInPlace config.sh \
--replace "ncurses5.4" "ncurses"
''
;
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View file

@ -0,0 +1,68 @@
{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal,
git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg,
libpng, libtiff, openscenegraph , proj, python3, python37Packages,
stdenv, swig, xercesc, xorg, zlib }:
stdenv.mkDerivation rec {
pname = "sumo";
version = "1.8.0";
src = fetchFromGitHub {
owner = "eclipse";
repo = "sumo";
rev = "v${lib.replaceStrings ["."] ["_"] version}";
sha256 = "1w9im1zz8xnkdwmv4v11kn1xcqm889268g1fw4y2s9f6shi41mxx";
fetchSubmodules = true;
};
nativeBuildInputs = [
cmake
git
swig
];
buildInputs = [
bzip2
eigen
ffmpeg
fox_1_6
gdal
gl2ps
gpp
gtest
jdk
libGL
libGLU
libX11
libjpeg
libpng
libtiff
openscenegraph
proj
python37Packages.setuptools
xercesc
zlib
python3
] ++ (with xorg; [
libXcursor
libXext
libXfixes
libXft
libXrandr
libXrender
]);
meta = with lib; {
description = "The SUMO traffic simulator";
longDescription = ''
Eclipse SUMO is an open source, highly
portable, microscopic and continuous traffic simulation package
designed to handle large networks. It allows for intermodal
simulation including pedestrians and comes with a large set of
tools for scenario creation.
'';
homepage = "https://github.com/eclipse/sumo";
license = licenses.epl20;
maintainers = with maintainers; [ mtreca ];
};
}

View file

@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
homepage = "https://help.gnome.org/users/gnome-help/"; homepage = "https://help.gnome.org/users/gnome-help/";
license = licenses.cc-by-30; license = licenses.cc-by-30;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
platforms = platforms.linux; platforms = platforms.all;
}; };
} }

View file

@ -53,6 +53,7 @@ stdenv.mkDerivation {
description = "Yet another Lisp variant which compiles to Lua"; description = "Yet another Lisp variant which compiles to Lua";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ CrazedProgrammer ]; maintainers = with maintainers; [ CrazedProgrammer ];
platforms = platforms.all;
}; };
passthru = { passthru = {

View file

@ -14,7 +14,7 @@ in mkCoqDerivation {
defaultVersion = lib.switch coq.coq-version [ defaultVersion = lib.switch coq.coq-version [
{ case = "8.13"; out = "1.9.4"; } { case = "8.13"; out = "1.9.4"; }
{ case = "8.12"; out = "1.8.0"; } { case = "8.12"; out = "1.8.0"; }
{ case = "8.11"; out = "1.6.0_8.11"; } { case = "8.11"; out = "1.6.1_8.11"; }
] null; ] null;
release."1.9.4".sha256 = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq"; release."1.9.4".sha256 = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq";
release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z"; release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z";
@ -22,7 +22,10 @@ in mkCoqDerivation {
release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r"; release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r";
release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1"; release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1";
release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8"; release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8";
release."1.6.1_8.11".sha256 = "0yyyh35i1nb3pg4hw7cak15kj4y6y9l84nwar9k1ifdsagh5zq53";
release."1.6.1_8.11".version = "1.6.1";
release."1.6.0_8.11".sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq"; release."1.6.0_8.11".sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq";
release."1.6.0_8.11".version = "1.6.0";
release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b";
releaseRev = v: "v${v}"; releaseRev = v: "v${v}";

View file

@ -26,5 +26,6 @@ stdenv.mkDerivation {
description = "A lightweight IDE for Clojure"; description = "A lightweight IDE for Clojure";
homepage = "https://github.com/arthuredelstein/clooj"; homepage = "https://github.com/arthuredelstein/clooj";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
platforms = lib.platforms.all;
}; };
} }

View file

@ -37,14 +37,16 @@ stdenv.mkDerivation rec {
url = "https://github.com/thestk/rtmidi/pull/230/commits/7a32e23e3f6cb43c0d2d58443ce205d438e76f44.patch"; url = "https://github.com/thestk/rtmidi/pull/230/commits/7a32e23e3f6cb43c0d2d58443ce205d438e76f44.patch";
sha256 = "06im8mb05wah6bnkadw2gpkhmilxb8p84pxqr50b205cchpq304w"; sha256 = "06im8mb05wah6bnkadw2gpkhmilxb8p84pxqr50b205cchpq304w";
}) })
(fetchpatch {
name = "RtMidi-Adjust-public-header-installs-to-match-autotools.patch";
url = "https://github.com/thestk/rtmidi/pull/230/commits/892fe5492f0e787484fa4a37027b08c265ce001f.patch";
sha256 = "0ca9m42xa3gmycimzvzvl67wa266xq9pfp1b4v555rh2fp52kbcj";
})
]; ];
postPatch = '' postPatch = ''
substituteInPlace rtmidi.pc.in \ substituteInPlace rtmidi.pc.in \
--replace 'Requires:' 'Requires.private:' --replace 'Requires:' 'Requires.private:'
substituteInPlace CMakeLists.txt \
--replace 'PUBLIC_HEADER RtMidi.h' 'PUBLIC_HEADER "RtMidi.h;rtmidi_c.h"' \
--replace 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}' 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}/rtmidi'
''; '';
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

View file

@ -0,0 +1,61 @@
{ lib, stdenv, fetchurl }:
let
version = "0.6";
sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7";
in
stdenv.mkDerivation {
pname = "bearssl";
inherit version;
src = fetchurl {
url = "https://www.bearssl.org/bearssl-${version}.tar.gz";
inherit sha256;
};
outputs = [ "bin" "lib" "dev" "out" ];
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
install -D build/brssl $bin/brssl
install -D build/testcrypto $bin/testcrypto
install -Dm644 build/libbearssl.so $lib/lib/libbearssl.so
install -Dm644 build/libbearssl.a $lib/lib/libbearssl.a
install -Dm644 -t $dev/include inc/*.h
touch $out
runHook postInstall
'';
meta = {
homepage = "https://www.bearssl.org/";
description = "An implementation of the SSL/TLS protocol written in C";
longDescription = ''
BearSSL is an implementation of the SSL/TLS protocol (RFC 5246)
written in C. It aims at offering the following features:
* Be correct and secure. In particular, insecure protocol versions and
choices of algorithms are not supported, by design; cryptographic
algorithm implementations are constant-time by default.
* Be small, both in RAM and code footprint. For instance, a minimal
server implementation may fit in about 20 kilobytes of compiled code
and 25 kilobytes of RAM.
* Be highly portable. BearSSL targets not only big operating systems
like Linux and Windows, but also small embedded systems and even
special contexts like bootstrap code.
* Be feature-rich and extensible. SSL/TLS has many defined cipher
suites and extensions; BearSSL should implement most of them, and
allow extra algorithm implementations to be added afterwards,
possibly from third parties.
'';
license = lib.licenses.mit;
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.Profpatsch ];
};
}

View file

@ -2,15 +2,17 @@
buildDunePackage rec { buildDunePackage rec {
pname = "npy"; pname = "npy";
version = "unstable-2019-04-02"; version = "0.0.9";
useDune2 = true;
minimumOCamlVersion = "4.06"; minimumOCamlVersion = "4.06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "LaurentMazare"; owner = "LaurentMazare";
repo = "${pname}-ocaml"; repo = "${pname}-ocaml";
rev = "c051086bfea6bee58208098bcf1c2f725a80a1fb"; rev = version;
sha256 = "06mgrnm7xiw2lhqvbdv2zmd65sqfdnjd7j4qmcswanmplm17yhvb"; sha256 = "1fryglkm20h6kdqjl55b7065b34bdg3g3p6j0jv33zvd1m5888m1";
}; };
propagatedBuildInputs = [ camlzip ]; propagatedBuildInputs = [ camlzip ];

View file

@ -1,4 +1,4 @@
{ buildDunePackage, jsonrpc, lsp }: { buildDunePackage, jsonrpc, lsp, makeWrapper, dot-merlin-reader }:
buildDunePackage { buildDunePackage {
pname = "ocaml-lsp-server"; pname = "ocaml-lsp-server";
@ -9,6 +9,12 @@ buildDunePackage {
buildInputs = lsp.buildInputs ++ [ lsp ]; buildInputs = lsp.buildInputs ++ [ lsp ];
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/ocamllsp --prefix PATH : ${dot-merlin-reader}/bin
'';
meta = jsonrpc.meta // { meta = jsonrpc.meta // {
description = "OCaml Language Server Protocol implementation"; description = "OCaml Language Server Protocol implementation";
}; };

View file

@ -62,6 +62,7 @@ let
srcs.rules_cc srcs.rules_cc
srcs.rules_java srcs.rules_java
srcs.rules_proto srcs.rules_proto
srcs.com_google_protobuf
]); ]);
distDir = runCommand "bazel-deps" {} '' distDir = runCommand "bazel-deps" {} ''
@ -527,6 +528,13 @@ stdenv.mkDerivation rec {
--output=./bazel_src/output/bazel-complete.bash \ --output=./bazel_src/output/bazel-complete.bash \
--prepend=./bazel_src/scripts/bazel-complete-header.bash \ --prepend=./bazel_src/scripts/bazel-complete-header.bash \
--prepend=./bazel_src/scripts/bazel-complete-template.bash --prepend=./bazel_src/scripts/bazel-complete-template.bash
# need to change directory for bazel to find the workspace
cd ./bazel_src
# build execlog tooling
export HOME=$(mktemp -d)
./output/bazel build src/tools/execlog:parser_deploy.jar
cd -
''; '';
installPhase = '' installPhase = ''
@ -537,7 +545,15 @@ stdenv.mkDerivation rec {
# The binary _must_ exist with this naming if your project contains a .bazelversion # The binary _must_ exist with this naming if your project contains a .bazelversion
# file. # file.
cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
mkdir $out/share
cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar
mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
cat <<EOF > $out/bin/bazel-execlog
#!${runtimeShell} -e
${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@
EOF
chmod +x $out/bin/bazel-execlog
# shell completion files # shell completion files
installShellCompletion --bash \ installShellCompletion --bash \

View file

@ -560,6 +560,13 @@ stdenv.mkDerivation rec {
${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \ ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \
--bazel=./bazel_src/output/bazel \ --bazel=./bazel_src/output/bazel \
--output=./bazel_src/output/bazel-complete.fish --output=./bazel_src/output/bazel-complete.fish
# need to change directory for bazel to find the workspace
cd ./bazel_src
# build execlog tooling
export HOME=$(mktemp -d)
./output/bazel build src/tools/execlog:parser_deploy.jar
cd -
''; '';
installPhase = '' installPhase = ''
@ -572,6 +579,14 @@ stdenv.mkDerivation rec {
cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
mkdir $out/share
cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar
cat <<EOF > $out/bin/bazel-execlog
#!${runtimeShell} -e
${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@
EOF
chmod +x $out/bin/bazel-execlog
# shell completion files # shell completion files
installShellCompletion --bash \ installShellCompletion --bash \
--name bazel.bash \ --name bazel.bash \

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "go-protobuf"; pname = "go-protobuf";
version = "1.4.3"; version = "1.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "golang"; owner = "golang";
repo = "protobuf"; repo = "protobuf";
rev = "v${version}"; rev = "v${version}";
sha256 = "1kf1d7xmyjvy0z6j5czp6nqyvj9zrk6liv6znif08927xqfrzyln"; sha256 = "sha256-TYx7nAyUE70hoCNKnR74FzWhrQyWG17VPoKH3vR+qOM=";
}; };
vendorSha256 = "04w9vhkrwb2zfqk73xmhignjyvjqmz1j93slkqp7v8jj2dhyla54"; vendorSha256 = "sha256-CcJjFMslSUiZMM0LLMM3BR53YMxyWk8m7hxjMI9tduE=";
doCheck = false; doCheck = false;

View file

@ -1,6 +1,4 @@
{ lib, fetchurl, ocamlPackages }: { lib, fetchurl, yojson, csexp, result, buildDunePackage }:
with ocamlPackages;
buildDunePackage rec { buildDunePackage rec {
pname = "dot-merlin-reader"; pname = "dot-merlin-reader";

View file

@ -15,15 +15,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "deno"; pname = "deno";
version = "1.8.1"; version = "1.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "denoland"; owner = "denoland";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-tyqZ/vjQ9gjLoK+Juj30It3H6+2sT9Fj/s0kEv0HRwI="; sha256 = "sha256-fZuhI+ZvYsFz2gDpHkRRqmmHRyEiEO+vWfqKYdeNtaU=";
}; };
cargoSha256 = "sha256-LpBQztMqw7IbgTJkfiD+6Fcy5XXmN58HO/zhVen3oCI="; cargoSha256 = "sha256-us0Kzst7iq+H/WBAlSBQJSpnirsl4zImse2bFREoW4I=";
# Install completions post-install # Install completions post-install
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -11,11 +11,11 @@ let
}; };
in in
fetch_librusty_v8 { fetch_librusty_v8 {
version = "0.20.0"; version = "0.21.0";
shas = { shas = {
x86_64-linux = "sha256-pTWNYQzChyYJh+afn1AMw/MxUE+Cv4k2FnM3+KDYCvg="; x86_64-linux = "sha256-oxGCM6jlqafjAfTtFwARxBv/8tiUaD9A2TlLyj/3LlQ=";
aarch64-linux = "sha256-SPRtQO0tnuEf49GuSsuo403QO0Y6ioRkOp4cjohXRhw="; aarch64-linux = "sha256-yeDcrxEp3qeE6/NWEc1v7VoHjlgppIOkcHTNVksXNsM=";
x86_64-darwin = "sha256-k0kS5NiITqW/WEFWe/Bnt7Z9HZp2YN19L7DvVlptrj4="; x86_64-darwin = "sha256-QqdBa59xPxM8eDRzvPxvv9HFVgp2rt+5jiwIOgsi8JE=";
aarch64-darwin = "sha256-CDGxSv7fPR+5kF3+5NVTOH8ugLaM07Kv5mjoEW6/g/8="; aarch64-darwin = "sha256-aq2Kjn8QSDMhNg8pEbXkJCHUKmDTNnitq42SDDVyRd4=";
}; };
} }

View file

@ -58,7 +58,7 @@ in
}; };
bird2 = generic { bird2 = generic {
version = "2.0.7"; version = "2.0.8";
sha256 = "0rhhbfmfw2d93rvhglv03rdzxsq2disw6s1wm8d6bgdxmrc2n7b3"; sha256 = "1xp7f0im1v8pqqx3xqyfkd1nsxk8vnbqgrdrwnwhg8r5xs1xxlhr";
}; };
} }

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "disfetch"; pname = "disfetch";
version = "1.20"; version = "1.21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "llathasa-veleth"; owner = "llathasa-veleth";
repo = "disfetch"; repo = "disfetch";
rev = version; rev = version;
sha256 = "sha256-P5Sq8ld6pPACHn7iOJ9Uk+zR8ZLxHVvnRyFfkfGGv6I="; sha256 = "sha256-AAfpv1paEnHu1S2B8yC0hyYOj5deKTkCyLGvp6Roz64=";
}; };
dontBuild = true; dontBuild = true;

View file

@ -2,26 +2,28 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "fet-sh"; pname = "fet-sh";
version = "1.8"; version = "1.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "6gk"; owner = "6gk";
repo = "fet.sh"; repo = "fet.sh";
rev = "v${version}"; rev = "v${version}";
sha256 = "1czjsyagwzbf8l023l1saz9ssb1hc245a64nfwc8wl0cn4h9byky"; sha256 = "sha256-xhX2nVteC3T3IjQh++mYlm0btDJQbyQa6b8sGualV0E=";
}; };
dontBuild = true; postPatch = ''
patchShebangs fet.sh
'';
installPhase = '' installPhase = ''
install -m755 -D ./fet.sh $out/bin/fet.sh install -m755 -D fet.sh $out/bin/fet.sh
''; '';
meta = with lib; { meta = with lib; {
description = "A fetch written in posix shell without any external commands (linux only)"; description = "A fetch written in posix shell without any external commands";
homepage = "https://github.com/6gk/fet.sh"; homepage = "https://github.com/6gk/fet.sh";
license = licenses.isc; license = licenses.isc;
platforms = platforms.linux; platforms = platforms.all;
maintainers = with maintainers; [ elkowar ]; maintainers = with maintainers; [ elkowar ];
}; };

View file

@ -31,7 +31,7 @@ buildPythonApplication rec {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/kubespray/kargo-cli"; homepage = "https://github.com/kubespray/kargo-cli";
description = "A tool helps to deploy a kubernetes cluster with Ansible"; description = "A tool helps to deploy a kubernetes cluster with Ansible";
platforms = platforms.linux; platforms = platforms.all;
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
}; };

View file

@ -29,6 +29,6 @@ python3Packages.buildPythonApplication {
homepage = "https://blog.didierstevens.com/programs/pdf-tools/"; homepage = "https://blog.didierstevens.com/programs/pdf-tools/";
license = licenses.publicDomain; license = licenses.publicDomain;
maintainers = [ maintainers.lightdiscord ]; maintainers = [ maintainers.lightdiscord ];
platforms = platforms.linux; platforms = platforms.all;
}; };
} }

View file

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
''; '';
homepage = "https://github.com/graysky2/profile-cleaner"; homepage = "https://github.com/graysky2/profile-cleaner";
license = lib.licenses.mit; license = lib.licenses.mit;
platforms = lib.platforms.linux; platforms = lib.platforms.all;
maintainers = [ lib.maintainers.devhell ]; maintainers = [ lib.maintainers.devhell ];
}; };
} }

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper { lib, stdenvNoCC, fetchFromGitHub, makeWrapper
, trash-cli, coreutils, which, getopt }: , trash-cli, coreutils, which, getopt }:
stdenv.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "rmtrash"; pname = "rmtrash";
version = "1.14"; version = "1.14";
@ -12,9 +12,6 @@ stdenv.mkDerivation rec {
sha256 = "0wfb2ykzlsxyqn9krfsis9jxhaxy3pxl71a4f15an1ngfndai694"; sha256 = "0wfb2ykzlsxyqn9krfsis9jxhaxy3pxl71a4f15an1ngfndai694";
}; };
dontConfigure = true;
dontBuild = true;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
installPhase = '' installPhase = ''
@ -35,5 +32,6 @@ stdenv.mkDerivation rec {
''; '';
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ peelz ]; maintainers = with maintainers; [ peelz ];
platforms = platforms.all;
}; };
} }

View file

@ -1,9 +1,8 @@
{ lib, stdenv, skawarePackages { lib, stdenv, skawarePackages
# Whether to build the TLS/SSL tools and what library to use # Whether to build the TLS/SSL tools and what library to use
# acceptable values: "libressl", false # acceptable values: "bearssl", "libressl", false
# TODO: add bearssl , sslSupport ? "bearssl" , libressl, bearssl
, sslSupport ? "libressl" , libressl
}: }:
with skawarePackages; with skawarePackages;
@ -11,6 +10,7 @@ let
sslSupportEnabled = sslSupport != false; sslSupportEnabled = sslSupport != false;
sslLibs = { sslLibs = {
libressl = libressl; libressl = libressl;
bearssl = bearssl;
}; };
in in
@ -58,7 +58,7 @@ buildPackage {
# remove all s6 executables from build directory # remove all s6 executables from build directory
rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable)
rm minidentd rm minidentd
rm libs6net.* libstls.* libs6tls.* rm libs6net.* libstls.* libs6tls.* libsbearssl.*
mv doc $doc/share/doc/s6-networking/html mv doc $doc/share/doc/s6-networking/html
''; '';

View file

@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ makefu ]; maintainers = with maintainers; [ makefu ];
broken = stdenv.isAarch64; broken = stdenv.isAarch64;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

View file

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Command line interface for processing media filmed on GoPro HERO 3, 4, 5, 6, and 7 cameras"; description = "Command line interface for processing media filmed on GoPro HERO 3, 4, 5, 6, and 7 cameras";
homepage = "https://github.com/KonradIT/gopro-linux"; homepage = "https://github.com/KonradIT/gopro-linux";
platforms = platforms.linux; platforms = platforms.unix;
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ jonringer ]; maintainers = with maintainers; [ jonringer ];
}; };

View file

@ -2240,7 +2240,7 @@ in
dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { }; dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { };
dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; inherit (ocamlPackages) dot-merlin-reader;
dozenal = callPackage ../applications/misc/dozenal { }; dozenal = callPackage ../applications/misc/dozenal { };
@ -13503,6 +13503,8 @@ in
bctoolbox = callPackage ../development/libraries/bctoolbox { }; bctoolbox = callPackage ../development/libraries/bctoolbox { };
bearssl = callPackage ../development/libraries/bearssl { };
beecrypt = callPackage ../development/libraries/beecrypt { }; beecrypt = callPackage ../development/libraries/beecrypt { };
belcard = callPackage ../development/libraries/belcard { }; belcard = callPackage ../development/libraries/belcard { };
@ -25955,6 +25957,7 @@ in
neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; neovimUtils = callPackage ../applications/editors/neovim/utils.nix { };
neovim = wrapNeovim neovim-unwrapped { }; neovim = wrapNeovim neovim-unwrapped { };
neovim-qt-unwrapped = libsForQt5.callPackage ../applications/editors/neovim/neovim-qt.nix { };
neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { };
olifant = callPackage ../applications/misc/olifant { }; olifant = callPackage ../applications/misc/olifant { };
@ -28881,6 +28884,8 @@ in
simgrid = callPackage ../applications/science/misc/simgrid { }; simgrid = callPackage ../applications/science/misc/simgrid { };
sumo = callPackage ../applications/science/networking/sumo { };
spyder = with python3.pkgs; toPythonApplication spyder; spyder = with python3.pkgs; toPythonApplication spyder;
openspace = callPackage ../applications/science/astronomy/openspace { }; openspace = callPackage ../applications/science/astronomy/openspace { };

View file

@ -624,6 +624,8 @@ let
merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { }; merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { };
dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { };
metrics = callPackage ../development/ocaml-modules/metrics { }; metrics = callPackage ../development/ocaml-modules/metrics { };
metrics-influx = callPackage ../development/ocaml-modules/metrics/influx.nix { }; metrics-influx = callPackage ../development/ocaml-modules/metrics/influx.nix { };