Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
204a4ef360
36 changed files with 182 additions and 83 deletions
|
|
@ -580,6 +580,12 @@
|
|||
githubId = 3808928;
|
||||
name = "Anders Sildnes";
|
||||
};
|
||||
andys8 = {
|
||||
email = "andys8@users.noreply.github.com";
|
||||
github = "andys8";
|
||||
githubId = 13085980;
|
||||
name = "Andy";
|
||||
};
|
||||
aneeshusa = {
|
||||
email = "aneeshusa@gmail.com";
|
||||
github = "aneeshusa";
|
||||
|
|
@ -7379,6 +7385,12 @@
|
|||
githubId = 816465;
|
||||
name = "Redvers Davies";
|
||||
};
|
||||
reedrw = {
|
||||
email = "reedrw5601@gmail.com";
|
||||
github = "reedrw";
|
||||
githubId = 21069876;
|
||||
name = "Reed Williams";
|
||||
};
|
||||
refnil = {
|
||||
email = "broemartino@gmail.com";
|
||||
github = "refnil";
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ assert stdenv ? glibc;
|
|||
# find the downloads needed for new versions
|
||||
#
|
||||
# to test:
|
||||
# $ for e in cpp modeling platform sdk java committers; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done
|
||||
# $ for e in cpp modeling platform sdk java committers rcp rust; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done
|
||||
|
||||
let
|
||||
platform_major = "4";
|
||||
platform_minor = "17";
|
||||
platform_minor = "18";
|
||||
year = "2020";
|
||||
month = "09";
|
||||
month = "12";
|
||||
timestamp = "${year}${month}021800";
|
||||
gtk = gtk3;
|
||||
in rec {
|
||||
|
|
@ -37,7 +37,7 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "270pk7vvfvanig49xkrail01nf967zlp7xf8rvyh2ya7s0y0akj2bi0y4yms4gwijmingm8y2ir9qynd360mzwl8mnc1c31ykf9l3lh";
|
||||
sha512 = "MR6ddNmBKyXCyVGlGPfq6K2zJRywy4I5QDXji3rh81eJQ6zkEguo+VvD75i/szg/+FbCVA09vDVV06JgL4SHwQ==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -49,7 +49,7 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "26bb6cbnw94ml585aqrs8wpfksd2883njlqi48klpbn5n1bwpnpwvymx9q46i49piiyp0r1pa8ghdcgiwcakvri5nzldlh522fs7h5y";
|
||||
sha512 = "hSi3IL+fWhlUfEJYv4LFO7WNbZpiofAgNGZbEOIBS0VpeHfJ5Y6UKMKMLfQlG3hlkAL5jg/cEJKb/ad4DxHbjQ==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "2i3gjxmq1i4p70q2l5749b96z1r4nv15dii17fywbyby3kbggwhfvaydizy7z5p6kn0y91dw13p7gmg3qpr9d46mb8f8h3sxks7fyl9";
|
||||
sha512 = "cPRa7ICogpcuwzOlzSSCEcWpwpUhQuIv6lGBKuAu9mOwj7Nz0TPaWVWNqN1541uVRXVTzcWX+mwc2UBPzWUPxg==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "1c29r7qwjrjv86q2c4bhlrmmh50690lrq164jzrlisys9vnxb6wii0gwb34p9m1xqr3lgba1zhffb4jx18prrk0x8xbd78mp0lvya3k";
|
||||
sha512 = "iN6z5iSJ2bhE1IH3uJj7aiaF/nSIgIAqadvaTBpE4gkgLAXgtfraFAzgcw0zJr5m2u5mULfW45hLkmIXselniQ==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "3rkpngrk6423i2pcf241wbr9jfzwxm2qwm57ipjpjw6705w1rapcws4bibqjznlf34lqvnynkw2wihy51j1ryw25z9fc2jsvyj67c1q";
|
||||
sha512 = "HVqsWUVNNRdcaziGdNI96R9F2VMUE4nYK1VX1G3pK+srFDlkJ7+rj2sZjtWL7WcJR1XSbT03nJJzPyp01RsCvQ==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -110,7 +110,7 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "3gnqamrn3x2gr4dfcgl7ppxpyi1q422l0sm7sh0vmipbs9l1c58plm3p14j9rjsyjlly2xjci6dg7sb9mj6259vc640wafnzcs89ii1";
|
||||
sha512 = "UtI4piLNRM3TsM9PzbGgsPqTkiurJ+7Q7jVra45an4YJHtfWcGTxxwUNnRzay6cHT49AjrWtVf1bovWSDXMiQA==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -122,7 +122,19 @@ in rec {
|
|||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "216g805fgpb7vwbgk36xkf467vijvaa3x0gk4d94pi92d9wdh5dph6wjjr4ka9rvg0pzxxr8y3sgbfqqzqpc82bgiz5qqr93sprh9bj";
|
||||
sha512 = "9DqNjSx1Ypdzpt1jIOJ9KFx8y+cG55K6bqkWTqnGjjDr4h4mWSzvGjHGUtFrKl92WRzQZKjNPxzVreDMcUkc/g==";
|
||||
};
|
||||
};
|
||||
|
||||
### Eclipse IDE for Rust Developers
|
||||
|
||||
eclipse-rust = buildEclipse {
|
||||
name = "eclipse-rust-${platform_major}.${platform_minor}";
|
||||
description = "Eclipse IDE for Rust Developers";
|
||||
src =
|
||||
fetchurl {
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rust-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||
sha512 = "QbaG1knCMFnVQkPeApcIamJMXPyL8zUQa0ZsTJOuTgU/fD1RiHN7/WS6ax5azzIJhpjEtj2LMU4XV+MwkzResw==";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -255,12 +255,12 @@ rec {
|
|||
cdt = buildEclipseUpdateSite rec {
|
||||
name = "cdt-${version}";
|
||||
# find current version at https://www.eclipse.org/cdt/downloads.php
|
||||
version = "10.0.1";
|
||||
version = "10.1.0";
|
||||
|
||||
src = fetchzip {
|
||||
stripRoot = false;
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.0/${name}/${name}.zip";
|
||||
sha256 = "1smi1yc4l627bb01zp0pcilm6d0hysxk440hy4n55gz3jxilygx5";
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.1/${name}/${name}.zip";
|
||||
sha256 = "q0O6OE2u0bdz1+nOkzXDrrOOzoEbVaXnejx4lX7uZgk=";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -472,12 +472,12 @@ rec {
|
|||
|
||||
jdt = buildEclipseUpdateSite rec {
|
||||
name = "jdt-${version}";
|
||||
version = "4.17";
|
||||
version = "4.18";
|
||||
|
||||
src = fetchzip {
|
||||
stripRoot = false;
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202009021800/org.eclipse.jdt-${version}.zip";
|
||||
sha256 = "16vb88ywqfh0rix5krp2g39yhisv4i797g9c03aayzy5lynqm3ky";
|
||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202012021800/org.eclipse.jdt-${version}.zip";
|
||||
sha256 = "q0O6OE2u0bdz1+nOkzXDrrOOzoEbVaXnejx4lX7uZgk=";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "geoipupdate";
|
||||
version = "4.5.0";
|
||||
version = "4.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxmind";
|
||||
repo = "geoipupdate";
|
||||
rev = "v${version}";
|
||||
sha256 = "0lhz7i4lprsik3s41y19vphsyc29vz6cbxikmvkmy6xjn40khjfr";
|
||||
sha256 = "1rzc8kidm8nr9pbcbq96kax3cbf39afrk5vzpl04lzpw3jbbakjq";
|
||||
};
|
||||
|
||||
vendorSha256 = "1f858k8cl0dgiw124jv0p9jhi9aqxnc3nmc7hksw70fla2nzjrv0";
|
||||
|
|
|
|||
24
pkgs/applications/misc/tty-share/default.nix
Normal file
24
pkgs/applications/misc/tty-share/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
# Upstream has a `./vendor` directory with all deps which we rely upon.
|
||||
buildGoPackage rec {
|
||||
pname = "tty-share";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elisescu";
|
||||
repo = "tty-share";
|
||||
rev = "v${version}";
|
||||
sha256 = "1d2vd3d1lb4n0jq4s0p5mii1vz4r3z36hykr5mnx53srsni1wsj5";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/elisescu/tty-share";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://tty-share.com";
|
||||
description = "Share terminal via browser for remote work or shared sessions";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ andys8 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, mkDerivation, fetchFromGitHub
|
||||
{ stdenv, mkDerivation, fetchFromGitHub
|
||||
, qmake, pkgconfig, olm, wrapQtAppsHook
|
||||
, qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects
|
||||
, python3Packages, pyotherside
|
||||
, python3Packages, pyotherside, libXScrnSaver
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -13,13 +13,13 @@ let
|
|||
in
|
||||
mkDerivation rec {
|
||||
pname = "mirage";
|
||||
version = "0.5.2";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mirukana";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0i891fafdncdz1xg6nji80jb86agsrbdvai9nwf1yy126q7piryv";
|
||||
sha256 = "15x0x2rf4fzsd0zr84fq3j3ddzkgc5il8s54jpxk8wl4ah03g4nv";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -30,13 +30,14 @@ mkDerivation rec {
|
|||
qtquickcontrols2
|
||||
qtkeychain qtgraphicaleffects
|
||||
olm pyotherside
|
||||
libXScrnSaver
|
||||
];
|
||||
|
||||
propagatedBuildInputs = pypkgs;
|
||||
|
||||
pythonPath = pypkgs;
|
||||
|
||||
qmakeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=qtquickcompiler" ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
postInstall = ''
|
||||
|
|
@ -46,11 +47,12 @@ mkDerivation rec {
|
|||
"''${qtWrapperArgs[@]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = with stdenv.lib; {
|
||||
description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication";
|
||||
homepage = "https://github.com/mirukana/mirage";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ colemickens ];
|
||||
broken = stdenv.isDarwin;
|
||||
inherit (qtbase.meta) platforms;
|
||||
inherit version;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }:
|
||||
{ stdenv, fetchurl, fetchpatch, intltool, libtorrent-rasterbar, pythonPackages }:
|
||||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
pname = "deluge";
|
||||
|
|
@ -19,7 +19,7 @@ pythonPackages.buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity
|
||||
libtorrentRasterbar.dev libtorrentRasterbar.python setuptools
|
||||
libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ intltool ];
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages
|
||||
{ stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages
|
||||
, gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }:
|
||||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
|
|
@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
twisted Mako chardet pyxdg pyopenssl service-identity
|
||||
libtorrentRasterbar.dev libtorrentRasterbar.python setuptools
|
||||
libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools
|
||||
setproctitle pillow rencode six zope_interface
|
||||
dbus-python pygobject3 pycairo
|
||||
gtk3 gobject-introspection librsvg
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig
|
||||
, boost, libtorrentRasterbar, qtbase, qttools, qtsvg
|
||||
, boost, libtorrent-rasterbar, qtbase, qttools, qtsvg
|
||||
, debugSupport ? false
|
||||
, guiSupport ? true, dbus ? null # GUI (disable to run headless)
|
||||
, webuiSupport ? true # WebUI
|
||||
|
|
@ -24,7 +24,7 @@ mkDerivation rec {
|
|||
# NOTE: 2018-05-31: CMake is working but it is not officially supported
|
||||
nativeBuildInputs = [ makeWrapper pkgconfig ];
|
||||
|
||||
buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ]
|
||||
buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ]
|
||||
++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support
|
||||
++ optional trackerSearch python3;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
pythonPath = [
|
||||
python3Packages.libtorrentRasterbar
|
||||
python3Packages.libtorrent-rasterbar
|
||||
python3Packages.twisted
|
||||
python3Packages.netifaces
|
||||
python3Packages.pycrypto
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ qtserialport,
|
|||
qtwebsockets,
|
||||
rtl-sdr,
|
||||
serialdv,
|
||||
soapysdr-with-plugins,
|
||||
uhd
|
||||
}:
|
||||
|
||||
|
|
@ -46,7 +47,7 @@ mkDerivation rec {
|
|||
glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio
|
||||
qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf
|
||||
fftwFloat codec2 cm256cc serialdv qtserialport
|
||||
libbladeRF uhd
|
||||
libbladeRF uhd soapysdr-with-plugins
|
||||
];
|
||||
cmakeFlags = [
|
||||
"-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pijul";
|
||||
version = "1.0.0-alpha.21";
|
||||
version = "1.0.0-alpha.24";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "0csa2a8ci6b9vgq57hyz2ng0x8pv1p1ilw72z2b8rrpacdrzb633";
|
||||
sha256 = "1h1vgx0zlymnhalqsgmp9gv6sxbizmyryldx5vzl6djl23dvzd6s";
|
||||
};
|
||||
|
||||
cargoSha256 = "05z5iqs63s6cvaq4sjfxhcg5ka3rwn6ikcjs26jyqcbkp2bd9z88";
|
||||
cargoSha256 = "1yx7qqfyabhrf6mcca4frdcp9a426khp90nznhshhm71liqr9y44";
|
||||
|
||||
cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git";
|
||||
|
||||
|
|
|
|||
|
|
@ -467,7 +467,7 @@ let self = rec {
|
|||
propagatedBuildInputs = [
|
||||
simpleplugin
|
||||
python2Packages.requests
|
||||
python2Packages.libtorrentRasterbar
|
||||
python2Packages.libtorrent-rasterbar
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -9,20 +9,25 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conmon";
|
||||
version = "2.0.21";
|
||||
version = "2.0.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "13g436s00bcwzs31qsx5rpgkbbyxd4zvx8mbkq10gkrsv4r04q23";
|
||||
sha256 = "07wd3pns6x25dcnc1r84cwmrzg8xgzsfmidkclcpcagf97ad7jmc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ glib systemd ]
|
||||
++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
# manpage requires building the vendored go-md2man
|
||||
makeFlags = [ "bin/conmon" ];
|
||||
|
||||
installPhase = ''
|
||||
install -D bin/conmon -t $out/bin
|
||||
'';
|
||||
|
||||
passthru.tests = { inherit (nixosTests) cri-o podman; };
|
||||
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ then
|
|||
done
|
||||
fi
|
||||
|
||||
if [[ "$link32" = "0" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynamic-linker-m32" ]]; then
|
||||
if [[ "$link32" = "1" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynamic-linker-m32" ]]; then
|
||||
# We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's
|
||||
# use it.
|
||||
extraAfter+=(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, ocaml, findlib, dune, dune_2, opaline }:
|
||||
{ stdenv, ocaml, findlib, dune, dune_2 }:
|
||||
|
||||
{ pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args:
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation ({
|
|||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR
|
||||
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with stdenv.lib; {
|
||||
description = "Free and open source C++ spell checking library";
|
||||
homepage = "https://nuspell.github.io/";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
license = licenses.lgpl3Plus;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,19 +6,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hstspreload";
|
||||
version = "2020.6.9";
|
||||
version = "2020.11.21";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sethmlarson";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "12js2xcj4979jklc19hjmv5p2b6689p18p4w9swhjc6cgcwm4jy2";
|
||||
sha256 = "0z2bq51dw1zak13558s2vj7pdnwad402f3ia5j2an0r678rwhsij";
|
||||
};
|
||||
|
||||
# tests require network connection
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "hstspreload" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Chromium HSTS Preload list as a Python package and updated daily";
|
||||
homepage = "https://github.com/sethmlarson/hstspreload";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "bazel-buildtools";
|
||||
version = "3.3.0";
|
||||
version = "3.5.0";
|
||||
|
||||
goPackagePath = "github.com/bazelbuild/buildtools";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
owner = "bazelbuild";
|
||||
repo = "buildtools";
|
||||
rev = version;
|
||||
sha256 = "0g411gjbm02qd5b50iy6kk81kx2n5zw5x1m6i6g7nrmh38p3pn9k";
|
||||
sha256 = "179k0kwh7i2azkhk8dw7ac50a05q7n3i29pqaf69yw7jrpbf8k85";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "kcc";
|
||||
|
||||
version = "4.0.0";
|
||||
version = "4.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KnightOS";
|
||||
repo = "kcc";
|
||||
rev = version;
|
||||
sha256 = "1cd226nqbxq32mppkljavq1kb74jqfqns9r7fskszr42hbygynk4";
|
||||
sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake bison flex ];
|
||||
|
|
|
|||
|
|
@ -1,27 +1,25 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, imagemagick }:
|
||||
{ stdenv, fetchFromGitHub, cmake, asciidoc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kimg";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KnightOS";
|
||||
repo = "kimg";
|
||||
rev = version;
|
||||
sha256 = "00gj420m0jvhgm8kkslw8r69nl7r73bxrh6gqs2mx16ymcpkanpk";
|
||||
sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake asciidoc pkg-config ];
|
||||
|
||||
buildInputs = [ imagemagick ];
|
||||
nativeBuildInputs = [ cmake asciidoc ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://knightos.org/";
|
||||
description = "Converts image formats supported by ImageMagick to the KnightOS image format";
|
||||
description = "Converts image formats supported by stb_image to the KnightOS image format";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
34
pkgs/games/r2mod_cli/default.nix
Normal file
34
pkgs/games/r2mod_cli/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ fetchFromGitHub
|
||||
, jq
|
||||
, makeWrapper
|
||||
, p7zip
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "r2mod_cli";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Foldex";
|
||||
repo = "r2mod_cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "1g64f8ms7yz4rzm6xb93agc08kh9sbwkhvq35dpfhvi6v59j3n5m";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/r2mod --prefix PATH : "${stdenv.lib.makeBinPath [ jq p7zip ]}";
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Risk of Rain 2 Mod Manager in Bash";
|
||||
homepage = "https://github.com/foldex/r2mod_cli";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ maintainers.reedrw ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar
|
||||
{ stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrent-rasterbar
|
||||
, libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring
|
||||
, makeWrapper, glib, minizip, alure, pcre, jsoncpp }:
|
||||
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake pkgconfig gettext doxygen makeWrapper ];
|
||||
buildInputs = [
|
||||
wxGTK30 openal curl libtorrentRasterbar pcre jsoncpp
|
||||
wxGTK30 openal curl libtorrent-rasterbar pcre jsoncpp
|
||||
boost libpng libX11 libnotify gtk2 glib minizip alure
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
|
||||
, python3, boost, fuse, libtorrentRasterbar, curl }:
|
||||
, python3, boost, fuse, libtorrent-rasterbar, curl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btfs";
|
||||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [
|
||||
boost fuse libtorrentRasterbar curl python3
|
||||
boost fuse libtorrent-rasterbar curl python3
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evdi";
|
||||
version = "unstable-20200416";
|
||||
version = "v1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DisplayLink";
|
||||
repo = pname;
|
||||
rev = "dc595db636845aef39490496bc075f6bf067106c";
|
||||
sha256 = "1yrny6jj9403z0rxbd3nxf49xc4w0rfpl7xsq03pq32pb3vlbqw7";
|
||||
rev = version;
|
||||
sha256 = "074j0xh037n8mc4isihfz9lap57wvxaxib32pvy6jhjl3wyik632";
|
||||
};
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tomb";
|
||||
version = "2.8";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dyne";
|
||||
repo = "Tomb";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bmkUwj0FFq51MUPbNK7xsyyq4swjZcwFeMwOO3fXCzA=";
|
||||
sha256 = "03zj9az5626kjg96rkqr5sjydqwlrzhz0gq35r62sajv6mn2qm6s";
|
||||
};
|
||||
|
||||
buildInputs = [ sudo zsh pinentry ];
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/muesli/duf/";
|
||||
description = "Disk Usage/Free Utility";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ petabyteboy penguwin ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sudo";
|
||||
version = "1.9.4";
|
||||
version = "1.9.4p1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
|
||||
sha256 = "1w03257akspgkkl757vmpq3p30sb2n6y61hll038mw9sqwnbv4cb";
|
||||
sha256 = "EXIJnfzdL6SX4To8J0qfWSCr02rn0veqrNa8a8kv1nc=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [
|
||||
edwtjo
|
||||
];
|
||||
platforms = jre.meta.platforms;
|
||||
description = "A proofreading program for English, French German, Polish, and more";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -700,6 +700,10 @@ mapAliases ({
|
|||
gnome_user_docs = gnome-user-docs; # added 2019-11-20
|
||||
# spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell
|
||||
spidermonkey = spidermonkey_78; # added 2020-10-09
|
||||
libtorrentRasterbar = libtorrent-rasterbar; # added 2020-12-20
|
||||
libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # added 2020-12-20
|
||||
libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # added 2020-12-20
|
||||
libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # added 2020-12-20
|
||||
|
||||
# TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03
|
||||
# branch-off
|
||||
|
|
|
|||
|
|
@ -3339,13 +3339,13 @@ in
|
|||
|
||||
ddrutility = callPackage ../tools/system/ddrutility { };
|
||||
|
||||
deluge-2_x = callPackage ../applications/networking/p2p/deluge/2 {
|
||||
deluge-2_x = callPackage ../applications/networking/p2p/deluge {
|
||||
pythonPackages = python3Packages;
|
||||
libtorrentRasterbar = libtorrentRasterbar-1_2_x.override { python = python3; };
|
||||
libtorrent-rasterbar = libtorrent-rasterbar-1_2_x.override { python = python3; };
|
||||
};
|
||||
deluge-1_x = callPackage ../applications/networking/p2p/deluge/1 {
|
||||
deluge-1_x = callPackage ../applications/networking/p2p/deluge/1.nix {
|
||||
pythonPackages = python2Packages;
|
||||
libtorrentRasterbar = libtorrentRasterbar-1_1_x;
|
||||
libtorrent-rasterbar = libtorrent-rasterbar-1_1_x;
|
||||
};
|
||||
deluge = deluge-2_x;
|
||||
|
||||
|
|
@ -7913,6 +7913,8 @@ in
|
|||
|
||||
tty-clock = callPackage ../tools/misc/tty-clock { };
|
||||
|
||||
tty-share = callPackage ../applications/misc/tty-share { };
|
||||
|
||||
ttyplot = callPackage ../tools/misc/ttyplot { };
|
||||
|
||||
ttyrec = callPackage ../tools/misc/ttyrec { };
|
||||
|
|
@ -9772,7 +9774,6 @@ in
|
|||
|
||||
knightos-kimg = callPackage ../development/tools/knightos/kimg {
|
||||
asciidoc = asciidoc-full;
|
||||
imagemagick = imagemagick7Big;
|
||||
};
|
||||
|
||||
knightos-kpack = callPackage ../development/tools/knightos/kpack { };
|
||||
|
|
@ -14734,18 +14735,18 @@ in
|
|||
|
||||
libtomcrypt = callPackage ../development/libraries/libtomcrypt { };
|
||||
|
||||
libtorrentRasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar/2.0 {
|
||||
libtorrent-rasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar {
|
||||
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
|
||||
python = python3;
|
||||
};
|
||||
|
||||
libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 {
|
||||
libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
|
||||
};
|
||||
|
||||
libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { };
|
||||
libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { };
|
||||
|
||||
libtorrentRasterbar = libtorrentRasterbar-2_0_x;
|
||||
libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;
|
||||
|
||||
# this is still the new version of the old API
|
||||
libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };
|
||||
|
|
@ -26146,6 +26147,8 @@ in
|
|||
|
||||
quantumminigolf = callPackage ../games/quantumminigolf {};
|
||||
|
||||
r2mod_cli = callPackage ../games/r2mod_cli { };
|
||||
|
||||
racer = callPackage ../games/racer { };
|
||||
|
||||
redeclipse = callPackage ../games/redeclipse { };
|
||||
|
|
|
|||
|
|
@ -12558,10 +12558,10 @@ let
|
|||
|
||||
MetaCPANClient = buildPerlPackage {
|
||||
pname = "MetaCPAN-Client";
|
||||
version = "2.028000";
|
||||
version = "2.029000";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.028000.tar.gz";
|
||||
sha256 = "1fcafd1504e838ea37fa1769c751e096fe6ac7bba41c5f62959b156ea27d319a";
|
||||
url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.029000.tar.gz";
|
||||
sha256 = "0z75qzrr6r9ijp469majavq8la2jbgn1dq02vdm5m6ip7f887n65";
|
||||
};
|
||||
|
||||
# Most tests are online, so we only include offline tests
|
||||
|
|
|
|||
|
|
@ -3514,10 +3514,10 @@ in {
|
|||
|
||||
libtmux = callPackage ../development/python-modules/libtmux { };
|
||||
|
||||
libtorrentRasterbar = if isPy27 then
|
||||
(toPythonModule (pkgs.libtorrentRasterbar-1_2_x.override { inherit python; })).python
|
||||
libtorrent-rasterbar = if isPy27 then
|
||||
(toPythonModule (pkgs.libtorrent-rasterbar-1_2_x.override { inherit python; })).python
|
||||
else
|
||||
(toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python;
|
||||
(toPythonModule (pkgs.libtorrent-rasterbar.override { inherit python; })).python;
|
||||
|
||||
libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue