Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-03-14 06:17:28 +00:00 committed by GitHub
commit 3b97019142
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 407 additions and 100 deletions

View file

@ -17,6 +17,6 @@ in
''
machine.wait_for_unit("multi-user.target")
output = machine.succeed("spike -m64 $(which pk) $(which hello)")
assert output == "Hello, world!\n"
assert "Hello, world!" in output
'';
})

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glow";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "glow";
rev = "v${version}";
sha256 = "1y5cdqmyc2z2qk74l0r2c4mnw0jfibrf2ry7qcnmh96nhalq9m7j";
sha256 = "13ip29yxjc2fhsk12m6hj6mswrgc9a4m8gf0hiffd1nh5313mqxi";
};
vendorSha256 = "11x6hshbqg1a39a1hwpfivgrhyk7ykw2aqylira3dqv039b1f639";
vendorSha256 = "0i49b1yq9x5n59k29yacxyif928r0w7hl6azfvr5k3rssg0y4l7f";
doCheck = false;

View file

@ -30,12 +30,12 @@ let
in stdenv.mkDerivation rec {
pname = "obsidian";
version = "0.11.3";
version = "0.11.5";
src = fetchurl {
url =
"https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";
sha256 = "brpNQiWpIbvnPuCXrNJhBjgqPlhIb3dz3LFRf0M4K0Q=";
sha256 = "FxhvRRxV8oxRwvImftoSTqrus2x5p90NfuvddZjdBNU=";
};
nativeBuildInputs = [ makeWrapper graphicsmagick ];

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "ticker";
version = "3.1.9";
version = "4.0.3";
src = fetchFromGitHub {
owner = "achannarasappa";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/OpDcsRIwuj1bvtpPyk1Qc9QZGJMLiOLj8NBfbT7hdo=";
sha256 = "sha256-YVpspFBwao/7M2nTVMw+ANc0roL0vBO4DpNUb7Thp3Q=";
};
vendorSha256 = "sha256-aUBj7ZGWBeWc71y1CWm/KCw+El5TwH29S+KxyZGH1Zo=";
vendorSha256 = "sha256-nidOIjrTL4llV5GORebXOOPGeL6TxkurDY82cIc7+mU=";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X github.com/achannarasappa/ticker/cmd.Version=v${version}")

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tickrs";
version = "0.14.1";
version = "0.14.2";
src = fetchFromGitHub {
owner = "tarkah";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FbbxkAP1RQVYL91mlAw0PcEWUDxgCrCd9QjLPE+bqmo=";
sha256 = "sha256-8m4mIXTqc6rDMIjODbHJL7ipH5Y4WwgsWcSmw/SaiIo=";
};
cargoSha256 = "sha256-94U84/UxHAf5yrCnqpxjwHi/ekFHbFBs9b7pBewKvjw=";
cargoSha256 = "sha256-ZcRFQT2CxqpO35UqK79g2Jq5SPOLZ88WiG36issC5kY=";
nativeBuildInputs = [ perl ];

View file

@ -17,14 +17,14 @@ let
};
in
stdenv.mkDerivation rec {
version = "14.31.32";
version = "14.31.34";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
sha256 = "sha256-lY4DvtSAC8VDYwzZVZVHNXnyJiSn1vo829DEsLEG/hM=";
sha256 = "sha256-i+c4qS/IdLDPHk5ZHRhjOwkdvh8srU/mhOiHIkCN5Vo=";
};
patchPhase = ''

View file

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "calc";
version = "2.12.8.2";
version = "2.12.9.0";
src = fetchurl {
urls = [
"https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
"http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
];
sha256 = "sha256-yKe4PASm7qWH/nYv8BtYbi9m3xPpA0SZ02Hahj8DJC8=";
sha256 = "sha256-334WUhPG30U72hwzpHAZRNdmr/uBleOvEhu3rW9d5dM=";
};
postPatch = ''

View file

@ -0,0 +1,75 @@
{ lib
, stdenv
, genericBranding ? false
, fetchFromGitLab
, gettext
, gnome3
, gtk3
, libhandy
, pcre2
, vte
, appstream-glib
, desktop-file-utils
, git
, meson
, ninja
, pkg-config
, python3
, sassc
, wrapGAppsHook
}:
stdenv.mkDerivation {
pname = "kgx";
version = "unstable-2021-03-13";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "ZanderBrown";
repo = "kgx";
rev = "105adb6a8d09418a3ce622442aef6ae623dee787";
sha256 = "0m34y0nbcfkyicb40iv0iqaq6f9r3f66w43lr803j3351nxqvcz2";
};
buildInputs = [
gettext
gnome3.libgtop
gnome3.nautilus
gtk3
libhandy
pcre2
vte
];
nativeBuildInputs = [
appstream-glib
desktop-file-utils
git
meson
ninja
pkg-config
python3
sassc
wrapGAppsHook
];
mesonFlags = lib.optional genericBranding "-Dgeneric=true";
postPatch = ''
chmod +x build-aux/meson/postinstall.py
patchShebangs build-aux/meson/postinstall.py
'';
preFixup = ''
substituteInPlace $out/share/applications/org.gnome.zbrown.KingsCross.desktop \
--replace "Exec=kgx" "Exec=$out/bin/kgx"
'';
meta = with lib; {
description = "Simple user-friendly terminal emulator for the GNOME desktop";
homepage = "https://gitlab.gnome.org/ZanderBrown/kgx";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ zhaofengli ];
platforms = platforms.linux;
};
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glab";
version = "1.15.0";
version = "1.16.0";
src = fetchFromGitHub {
owner = "profclems";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wOeWqgN0VYmTXPTU3z5Utau8diW18QKV7w/2y86R8U0=";
sha256 = "sha256-KkkP/qkIrwJUxmZTY8zxJKMbOiaGl8XqJhHAU7oejGs=";
};
vendorSha256 = "sha256-Ge3nwI0cY2JxRTn3EZtlal5c6A6TIKfH/CkJnQ1C6PY=";
vendorSha256 = "sha256-DO8eH0DAitxX0NOYQBs4/ME9TFQYfXedwbld1DnBWXk=";
runVend = true;
# Tests are trying to access /homeless-shelter

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, dtc, nixosTests }:
{ lib, stdenv, fetchgit, dtc, nixosTests, fetchpatch }:
stdenv.mkDerivation rec {
pname = "spike";
@ -13,7 +13,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ dtc ];
enableParallelBuilding = true;
patchPhase = ''
patches = [
# Add missing headers to fix build.
(fetchpatch {
url = "https://github.com/riscv/riscv-isa-sim/commit/b3855682c2d744c613d2ffd6b53e3f021ecea4f3.patch";
sha256 = "1v1mpp4iddf5n4h3kmj65g075m7xc31bxww7gldnmgl607ma7cnl";
})
];
postPatch = ''
patchShebangs scripts/*.sh
patchShebangs tests/ebreak.py
'';

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "orchis";
version = "2021-01-22";
version = "2021-02-28";
src = fetchFromGitHub {
repo = "Orchis-theme";
owner = "vinceliuice";
rev = version;
sha256 = "1m0wilvrscg2xnkp6a90j0iccxd8ywvfpza1345sc6xmml9gvjzc";
sha256 = "sha256-HmC2e34n1eThFGgw9OzSgp5VFJOylyozpXgk9SO84+I=";
};
nativeBuildInputs = [ gtk3 ];

View file

@ -1,8 +1,8 @@
{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection
, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr
, p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre
, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib
, glib, gtk3, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas }:
, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit
, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja
, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber
, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas, boost, protobuf }:
stdenv.mkDerivation rec {
pname = "evolution-data-server";
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
glib libsoup libxml2 gtk3 gnome-online-accounts
gcr p11-kit libgweather libgdata libaccounts-glib json-glib
icu sqlite kerberos openldap webkitgtk glib-networking
libcanberra-gtk3 pcre
libcanberra-gtk3 pcre libphonenumber boost protobuf
];
propagatedBuildInputs = [ libsecret nss nspr libical db libsoup ];
@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
"-DENABLE_INTROSPECTION=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
"-DWITH_PHONENUMBER=ON"
];
passthru = {

View file

@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "hitori";
version = "3.38.0";
version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/hitori/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0gjbbh4gym8wwa4jjg7wwifjh2h7bf6m0x23c5jjxvrf3vln9gfq";
sha256 = "Ar0sQh1OIYAmVxToVL0S79PG0Vbd8h95599gAR1OQYQ=";
};
nativeBuildInputs = [

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
version = "10.2.2";
version = "10.3.0";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
sha256 = "sha256-lClfxi7MQ3PlqWx7Yrkj/XGoHzFaqVl7KCqv2FWelDU=";
sha256 = "sha256-qx7/+lr5AAChGhmjkwL9+8XEq/b6tXipvQ6clc+B5Mc=";
};
nativeBuildInputs = [ cmake ];

View file

@ -1,6 +1,7 @@
{ fetchurl
, lib, stdenv
, pkg-config
, fetchpatch
, meson
, ninja
, glib
@ -42,6 +43,15 @@ stdenv.mkDerivation rec {
sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn";
};
patches = [
# Fix tests with e-d-s linked with libphonenumber support
# https://gitlab.gnome.org/GNOME/folks/merge_requests/40
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/folks/commit/6d443480a137f6a6ff345b21bf3cb31066eefbcd.patch";
sha256 = "D/Y2g12TT0qrcH+iJ2umu4Hmp0EJ3Hoedh0H3aWI+HY=";
})
];
mesonFlags = [
"-Ddocs=true"
"-Dtelepathy_backend=${lib.boolToString telepathySupport}"
@ -92,6 +102,13 @@ stdenv.mkDerivation rec {
doCheck = true;
# Prevents e-d-s add-contacts-stress-test from timing out
checkPhase = ''
runHook preCheck
meson test --timeout-multiplier 4
runHook postCheck
'';
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py

View file

@ -1,8 +1,8 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, autoreconfHook
, pkg-config
, meson
, ninja
, gettext
, gobject-introspection
, gtk-doc
@ -15,26 +15,19 @@
stdenv.mkDerivation rec {
pname = "gupnp-igd";
version = "0.2.5";
version = "1.2.0";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb";
sha256 = "sha256-S1EgCYqhPt0ngYup7k1/6WG/VAv1DQVv9wPGFUXgK+E=";
};
patches = [
# Add gupnp-1.2 compatibility
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e.patch";
sha256 = "0s8lkyy9fnnnnkkqwbk6gxb7795bb1kl1swk5ldjnlrzhfcy1ab2";
})
];
nativeBuildInputs = [
pkg-config
autoreconfHook
meson
ninja
gettext
gobject-introspection
gtk-doc
@ -47,8 +40,8 @@ stdenv.mkDerivation rec {
gupnp
];
configureFlags = [
"--enable-gtk-doc"
mesonFlags = [
"-Dgtk_doc=true"
];
doCheck = true;
@ -62,7 +55,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Library to handle UPnP IGD port mapping";
homepage = "http://www.gupnp.org/";
license = licenses.lgpl21;
license = licenses.lgpl21Plus;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,48 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "jasper";
version = "2.0.26";
src = fetchFromGitHub {
owner = "jasper-software";
repo = pname;
rev = "version-${version}";
hash = "sha256-zmoC8nIsQm2u2cSzu2prdyofo3JFNzJ1bjbIZ3YaAn4=";
};
nativeBuildInputs = [
cmake
pkg-config
];
meta = with lib; {
homepage = "https://jasper-software.github.io/jasper/";
description = "Image processing/coding toolkit";
longDescription = ''
JasPer is a software toolkit for the handling of image data. The software
provides a means for representing images, and facilitates the manipulation
of image data, as well as the import/export of such data in numerous
formats (e.g., JPEG-2000 JP2, JPEG, PNM, BMP, Sun Rasterfile, and
PGX). The import functionality supports the auto-detection (i.e.,
automatic determination) of the image format, eliminating the need to
explicitly identify the format of coded input data. A simple color
management engine is also provided in order to allow the accurate
representation of color. Partial support is included for the ICC color
profile file format, an industry standard for specifying color.
The JasPer software consists of a library and several application
programs. The code is written in the C programming language. This language
was chosen primarily due to the availability of C development environments
for most computing platforms when JasPer was first developed, circa 1999.
'';
license = licenses.free; # MIT-like
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,44 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, cmake
}:
stdenv.mkDerivation rec {
pname = "zxing-cpp";
version = "1.1.1";
src = fetchFromGitHub {
owner = "nu-book";
repo = pname;
rev = "v${version}";
hash = "sha256-N2FTzsjxm3EE5Wqz7xt+FS4zQ60Ow4WbdX6Eo08ktek=";
};
nativeBuildInputs = [
cmake
pkg-config
];
cmakeFlags = [
"-DBUILD_EXAMPLES=OFF"
];
meta = with lib; {
homepage = "https://github.com/nu-book/zxing-cpp";
description = "C++ port of zxing (a Java barcode image processing library)";
longDescription = ''
ZXing-C++ ("zebra crossing") is an open-source, multi-format 1D/2D barcode
image processing library implemented in C++.
It was originally ported from the Java ZXing Library but has been
developed further and now includes many improvements in terms of quality
and performance. It can both read and write barcodes in a number of
formats.
'';
license = licenses.asl20;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
};
}

View file

@ -0,0 +1,55 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, pydicom
, pyfakefs
, pytestCheckHook
, sqlalchemy
}:
buildPythonPackage rec {
pname = "pynetdicom";
version = "1.5.5";
src = fetchFromGitHub {
owner = "pydicom";
repo = pname;
rev = "v${version}";
sha256 = "0zjpscxdhlcv99py7jx5r6dw32nzbcr49isrzkdr6g3zwyxwzbfm";
};
propagatedBuildInputs = [
pydicom
];
checkInputs = [
pyfakefs
pytestCheckHook
sqlalchemy
];
disabledTests = [
# Some tests needs network capabilities
"test_str_types_empty"
"TestEchoSCP"
"TestEchoSCPCLI"
"TestStoreSCP"
"TestStoreSCPCLI"
"TestStoreSCU"
"TestStoreSCUCLI"
"TestQRGetServiceClass"
"TestQRMoveServiceClass"
];
pythonImportsCheck = [ "pynetdicom" ];
meta = with lib; {
description = "Python implementation of the DICOM networking protocol";
homepage = "https://github.com/pydicom/pynetdicom";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
# Tests are not passing on Darwin, thus it's assumed that it doesn't work
broken = stdenv.isDarwin;
};
}

View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "xknx";
version = "0.17.1";
version = "0.17.2";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "XKNX";
repo = pname;
rev = version;
sha256 = "sha256-FNI6zodwlYdJDxncCOubClG9L1U6HGkQxdEEp0LdW04=";
sha256 = "sha256-DJglvcpqGBVkycEjq+Oa9gz9Keop39+UR9SctX0lg/A=";
};
propagatedBuildInputs = [

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gofumpt";
version = "0.1.0";
version = "0.1.1";
src = fetchFromGitHub {
owner = "mvdan";
repo = pname;
rev = "v${version}";
sha256 = "0xln0a5n8na3p6b7l8im3bh4ys5rr3k413ibzk8mnp471f5h1558";
sha256 = "sha256-MHNxJ9DPBWrLkaEEfXOmRqo2h2ugwgZT/SIe7bi3J2E=";
};
vendorSha256 = "05qdwz1icl8in0j94gx9pgplidm2v29hsn4kgg5gw35bsbn1c7id";
vendorSha256 = "sha256-LR4W7NKrDP7Ke5NYDZPYorZI77upP5IksBFRFsPnDRc=";
doCheck = false;

View file

@ -48,5 +48,9 @@ rec {
version = "0.16.0";
};
ocamlformat = ocamlformat_0_16_0;
ocamlformat_0_17_0 = mkOCamlformat {
version = "0.17.0";
};
ocamlformat = ocamlformat_0_17_0;
}

View file

@ -20,6 +20,7 @@ let src =
"0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6";
"0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a";
"0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr";
"0.17.0" = "0f1lxp697yq61z8gqxjjaqd2ns8fd1vjfggn55x0gh9dx098p138";
}."${version}";
}
; in
@ -36,12 +37,33 @@ buildDunePackage rec {
pname = "ocamlformat";
inherit src version;
minimumOCamlVersion = "4.06";
minimumOCamlVersion =
if lib.versionAtLeast version "0.17.0"
then "4.08"
else "4.06";
useDune2 = true;
buildInputs =
if lib.versionAtLeast version "0.15.1"
if lib.versionAtLeast version "0.17.0"
then [
base
cmdliner
fpath
odoc
re
stdio
uuseg
uutf
fix
menhir
dune-build-info
ocaml-version
# Changed since 0.16.0:
(ppxlib.override { version = "0.22.0"; })
ocaml-migrate-parsetree-2-1
]
else if lib.versionAtLeast version "0.15.1"
then [
base
cmdliner

View file

@ -16,13 +16,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
version = "2021.226.0";
version = "2021.312.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
sha256 = "sK7FFyOb3JdsqIqvDNexhg3ZPNRpCE4hH0BADYeFHoU=";
sha256 = "xMq4KrEfSNuXpi4h+BDaHOuWBBPcWNByiKxxsR6EJwA=";
};
patches = [ ./bypass-tamper-detection.patch ];

View file

@ -299,6 +299,11 @@
version = "5.0.2";
sha256 = "0qy4wamhcpxi9aqwq9kivhsj4rvhbch2wfwv11610psygb5457vk";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.Connections.Abstractions";
version = "5.0.3";
sha256 = "1p4vzsx4q1lx93m2v1iy2z1i2dg2q5s2f6gznw5afbn5rqqqbsff";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.Http.Connections.Client";
version = "5.0.2";
@ -314,6 +319,11 @@
version = "5.0.2";
sha256 = "1rprpj1aw9z501rpb9415maqcqnk6pirbdl8yv5n9wpqgcnjizk8";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.Http.Features";
version = "5.0.3";
sha256 = "0c6c5wpwkprf7a7mp1h10bvi2gg94lkpr3lznzpry3zjb5g7mk84";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Client";
version = "5.0.2";
@ -329,6 +339,11 @@
version = "5.0.2";
sha256 = "1sbwp00hq0ng891wdj6yhah8hr9hw34zvqr1xzs86g3gpmssgcj5";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Common";
version = "5.0.3";
sha256 = "1g19vkc3g76r2fpjy7c1fkbvbihk9pfmx4wfsgpjflvydmvhqf9m";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Protocols.Json";
version = "5.0.2";
@ -336,8 +351,8 @@
})
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack";
version = "5.0.2";
sha256 = "1f0mjw0swiaxk4iqf7n598d51w40lwdbap4nlc0sv0vw3nklnlzp";
version = "5.0.3";
sha256 = "0wf53knadwxyww85wc6m82paj0wdgsq4kbg7a3v95r6vbh4pav45";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson";
@ -494,6 +509,11 @@
version = "2.2.0";
sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674";
})
(fetchNuGet {
name = "Microsoft.Extensions.Configuration.Abstractions";
version = "5.0.0";
sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k";
})
(fetchNuGet {
name = "Microsoft.Extensions.Configuration.Binder";
version = "2.2.0";
@ -546,8 +566,8 @@
})
(fetchNuGet {
name = "Microsoft.Extensions.ObjectPool";
version = "5.0.2";
sha256 = "0asbw0l5syfgk2qb26czggvdix43d6043kl25ihdqdlhghcyy806";
version = "5.0.3";
sha256 = "1slfc4ncl83dl2g1xm95qb04bkyir26zhvz26lkph1jff0ycx2wb";
})
(fetchNuGet {
name = "Microsoft.Extensions.Options";
@ -706,8 +726,8 @@
})
(fetchNuGet {
name = "ppy.osu.Framework";
version = "2021.226.0";
sha256 = "0875lcd28vmx4f40k8m957lcpg0ilkzm3da12j94xaqk88mx4j7c";
version = "2021.309.0";
sha256 = "1da0jgdcxd4zq0fzqhbm31gg66l8sgdgypis8xlch2xny1g854z6";
})
(fetchNuGet {
name = "ppy.osu.Framework.NativeLibs";
@ -841,8 +861,8 @@
})
(fetchNuGet {
name = "Sentry";
version = "3.0.1";
sha256 = "1nmqwprp2xv9d8llfncyw94nfws9nwb7zj0sqrd6lv1mfgaxraql";
version = "3.0.7";
sha256 = "1wlfia0ihyx2jd07faz4jqbldxq9bx4hv787xkfk1469h7f2vvwk";
})
(fetchNuGet {
name = "SharpCompress";
@ -851,8 +871,8 @@
})
(fetchNuGet {
name = "SharpCompress";
version = "0.27.1";
sha256 = "1lhljszs94i1ssl831ik1a51n2pshf27nsjm78acnw1y1qnkm5pd";
version = "0.28.1";
sha256 = "1h7gx7apafdd0jnv12fppca9b6cpq205kjkcipclxp1lli0i7qvw";
})
(fetchNuGet {
name = "SharpFNT";
@ -861,8 +881,8 @@
})
(fetchNuGet {
name = "SixLabors.ImageSharp";
version = "1.0.2";
sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj";
version = "1.0.3";
sha256 = "1y43zvhjgi9rhylc8451784hhdi5b551hf7fsa6187b83wgxc47g";
})
(fetchNuGet {
name = "Splat";

View file

@ -3,14 +3,14 @@
}:
mkDerivation rec {
version = "18.4";
version = "18.5";
pname = "pentobi";
src = fetchFromGitHub {
owner = "enz";
repo = "pentobi";
rev = "v${version}";
sha256 = "1wawy6s3i4pcc6n6kfspn5b4g957ds0728mgwzw19agp5yyid73b";
sha256 = "sha256-iVgG2Ee1nJWpuquX2ntFHAJrPA0u9YnutmOC+cMrgZg=";
};
nativeBuildInputs = [ cmake docbook_xsl qttools ];

View file

@ -1,15 +1,14 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, payload ? null }: let
rev = "e5846a2bc707eaa58dc8ab6a8d20a090c6ee8570";
sha256 = "1clynpp70fnbgsjgxx7xi0vrdrj1v0h8zpv0x26i324kp2gwylf4";
revCount = "438";
shortRev = "e5846a2";
in stdenv.mkDerivation {
name = "riscv-pk-0.1pre${revCount}_${shortRev}";
{ lib, stdenv, fetchFromGitHub, autoreconfHook, payload ? null }:
stdenv.mkDerivation rec {
pname = "riscv-pk";
version = "1.0.0";
src = fetchFromGitHub {
owner = "riscv";
repo = "riscv-pk";
inherit rev sha256;
rev = "v${version}";
sha256 = "1cc0rz4q3a1zw8756b8yysw8lb5g4xbjajh5lvqbjix41hbdx6xz";
};
nativeBuildInputs = [ autoreconfHook ];

View file

@ -365,8 +365,8 @@ let
mktplcRef = {
name = "todo-tree";
publisher = "Gruntfuggly";
version = "0.0.201";
sha256 = "1hjck1r2byc45rp28gn15wbmcrl1wjng7kn5lyhr6mgjjwqh5pa8";
version = "0.0.204";
sha256 = "0gqgbvr7fs5znxyi1sjd40x14ppwswgnb3v9a7fkd9ap02ak831r";
};
meta = with lib; {
license = licenses.mit;

View file

@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "terraform";
publisher = "hashicorp";
version = "2.8.1";
version = "2.8.2";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix";
sha256 = "1pdpl8diqybqf68jvfk4kq9wg4k6c38811mh8iq12j4ba31cig9s";
sha256 = "0f1ck3h8ckvr75j27w2lxjbwnr24nc6fjki0gnn715ynkqg7w9bi";
};
patches = [ ./fix-terraform-ls.patch ];

View file

@ -1,24 +1,38 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, makeWrapper }:
buildGoModule rec {
pname = "3mux";
version = "1.0.1";
version = "1.1.0";
src = fetchFromGitHub {
owner = "aaronjanse";
repo = pname;
rev = "v${version}";
sha256 = "sha256-auEMG3txO2JS/2dMFBtEujv9s5I0A80Vwts5kXjH600=";
sha256 = "sha256-QT4QXTlJf2NfTqXE4GF759EoW6Ri12lxDyodyEFc+ag=";
};
vendorSha256 = "sha256-rcbnyScD2GU1DLY6dTEPgFNXZfgkxXPn5lt6HRqa0d8=";
nativeBuildInputs = [ makeWrapper ];
vendorSha256 = "sha256-tbziQZIA1+b+ZtvA/865c8YQxn+r8HQy6Pqaac2kwcU=";
# This is a package used for internally testing 3mux. It's meant for
# use by 3mux maintainers/contributors only.
excludedPackages = [ "fuzz" ];
# 3mux needs to have itself in the path so users can run `3mux detach`.
# This ensures that, while inside 3mux, the binary in the path is the
# same version as the 3mux hosting the session. This also allows users
# to use 3mux via `nix run nixpkgs#_3mux` (otherwise they'd get "command
# not found").
postInstall = ''
wrapProgram $out/bin/3mux --prefix PATH : $out/bin
'';
meta = with lib; {
description = "Terminal multiplexer inspired by i3";
longDescription = ''
3mux is a terminal multiplexer with out-of-the-box support for search,
mouse-controlled scrollback, and i3-like keybindings. Imagine tmux with a
smaller learning curve and more sane defaults.
Terminal multiplexer with out-of-the-box support for search,
mouse-controlled scrollback, and i3-like keybindings
'';
homepage = "https://github.com/aaronjanse/3mux";
license = licenses.mit;

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "progress";
version = "0.15";
version = "0.16";
src = fetchFromGitHub {
owner = "Xfennec";
repo = "progress";
rev = "v${version}";
sha256 = "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm";
sha256 = "sha256-kkEyflyBaQ5hUVo646NUuC1u54uzLJJsVFej9pMEwT0=";
};
nativeBuildInputs = [ pkg-config which ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pspg";
version = "4.3.0";
version = "4.3.1";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = version;
sha256 = "sha256-564ZHrok5RVFR9OYPpd6WjSZKieNFhnvUbBklayGOb0=";
sha256 = "sha256-1udmtstmTmoW45tvDSVQPoMymw5YRKMls1CmWnqIaNE=";
};
nativeBuildInputs = [ pkg-config ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mark";
version = "5.2.1";
version = "5.2.2";
src = fetchFromGitHub {
owner = "kovetskiy";
repo = "mark";
rev = version;
sha256 = "sha256-eRKUoRr0FPVNUZV5WenA7GlpYPAVRNKe0uRxOzFjhVE=";
sha256 = "sha256-CS9xzRxTKvBuDM1vs+p+U7LSMP8W6+cKNb+Sd3wgwig=";
};
vendorSha256 = "sha256-l6zHsis2fais5HQJQdfsSC0sPdcF4BeWoUznpl3Fh1g=";
vendorSha256 = "sha256-nneQ0B7PyHAqiOzrmWqSssZM8B3np4VFUJLBqUvkjZE=";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];

View file

@ -303,7 +303,6 @@ mapAliases ({
inotifyTools = inotify-tools;
i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21
jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21
jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities";
jbuilder = dune_1; # added 2018-09-09
jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream";
joseki = apache-jena-fuseki; # added 2016-02-28

View file

@ -10821,7 +10821,7 @@ in
ocamlformat # latest version
ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0
ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0
ocamlformat_0_15_1 ocamlformat_0_16_0;
ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0;
orc = callPackage ../development/compilers/orc { };
@ -14657,6 +14657,8 @@ in
jansson = callPackage ../development/libraries/jansson { };
jasper = callPackage ../development/libraries/jasper { };
jbig2dec = callPackage ../development/libraries/jbig2dec { };
jcal = callPackage ../development/libraries/jcal { };
@ -29106,6 +29108,8 @@ in
keynav = callPackage ../tools/X11/keynav { };
kgx = callPackage ../applications/terminal-emulators/kgx { };
kmon = callPackage ../tools/system/kmon { };
kompose = callPackage ../applications/networking/cluster/kompose { };
@ -30003,6 +30007,8 @@ in
zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { };
zxing-cpp = callPackage ../development/libraries/zxing-cpp { };
snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { };
openmsx = callPackage ../misc/emulators/openmsx {

View file

@ -5957,6 +5957,8 @@ in {
pynest2d = callPackage ../development/python-modules/pynest2d { };
pynetdicom = callPackage ../development/python-modules/pynetdicom { };
pynisher = callPackage ../development/python-modules/pynisher { };
pynmea2 = callPackage ../development/python-modules/pynmea2 { };