Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-06-16 18:04:48 +00:00 committed by GitHub
commit 8b9fa8d446
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
95 changed files with 1477 additions and 542 deletions

View file

@ -46,9 +46,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration
system, [Hydra](https://hydra.nixos.org/).
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for the NixOS 20.09 release](https://hydra.nixos.org/jobset/nixos/release-20.09)
* [Continuous package builds for the NixOS 21.05 release](https://hydra.nixos.org/jobset/nixos/release-21.05)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Tests for the NixOS 20.09 release](https://hydra.nixos.org/job/nixos/release-20.09/tested#tabs-constituents)
* [Tests for the NixOS 21.05 release](https://hydra.nixos.org/job/nixos/release-21.05/tested#tabs-constituents)
Artifacts successfully built with Hydra are published to cache at
https://cache.nixos.org/. When successful build and test criteria are

View file

@ -8,12 +8,30 @@ Programs in the GNOME universe are written in various languages but they all use
[GSettings](https://developer.gnome.org/gio/stable/GSettings.html) API is often used for storing settings. GSettings schemas are required, to know the type and other metadata of the stored values. GLib looks for `glib-2.0/schemas/gschemas.compiled` files inside the directories of `XDG_DATA_DIRS`.
On Linux, GSettings API is implemented using [dconf](https://wiki.gnome.org/Projects/dconf) backend. You will need to add `dconf` GIO module to `GIO_EXTRA_MODULES` variable, otherwise the `memory` backend will be used and the saved settings will not be persistent.
On Linux, GSettings API is implemented using [dconf](https://wiki.gnome.org/Projects/dconf) backend. You will need to add `dconf` [GIO module](#ssec-gnome-gio-modules) to `GIO_EXTRA_MODULES` variable, otherwise the `memory` backend will be used and the saved settings will not be persistent.
Last you will need the dconf database D-Bus service itself. You can enable it using `programs.dconf.enable`.
Some applications will also require `gsettings-desktop-schemas` for things like reading proxy configuration or user interface customization. This dependency is often not mentioned by upstream, you should grep for `org.gnome.desktop` and `org.gnome.system` to see if the schemas are needed.
### GIO modules {#ssec-gnome-gio-modules}
GLibs [GIO](https://developer.gnome.org/gio/stable/ch01.html) library supports several [extension points](https://developer.gnome.org/gio/stable/extending-gio.html). Notably, they allow:
* implementing settings backends (already [mentioned](#ssec-gnome-settings))
* adding TLS support
* proxy settings
* virtual file systems
The modules are typically installed to `lib/gio/modules/` directory of a package and you need to add them to `GIO_EXTRA_MODULES` if you need any of those features.
In particular, we recommend:
* adding `dconf.lib` for any software on Linux that reads [GSettings](#ssec-gnome-settings) (even transitivily through e.g. GTKs file manager)
* adding `glib-networking` for any software that accesses network using GIO or libsoup glib-networking contains a module that implements TLS support and loads system-wide proxy settings
To allow software to use various virtual file systems, `gvfs` package can be also added. But that is usually an optional feature so we typically use `gvfs` from the system (e.g. installed globally using NixOS module).
### GdkPixbuf loaders {#ssec-gnome-gdk-pixbuf-loaders}
GTK applications typically use [GdkPixbuf](https://developer.gnome.org/gdk-pixbuf/stable/) to load images. But `gdk-pixbuf` package only supports basic bitmap formats like JPEG, PNG or TIFF, requiring to use third-party loader modules for other formats. This is especially painful since GTK itself includes SVG icons, which cannot be rendered without a loader provided by `librsvg`.

View file

@ -7281,6 +7281,11 @@
githubId = 628342;
name = "Tim Steinbach";
};
nessdoor = {
name = "Tomas Antonio Lopez";
email = "entropy.overseer@protonmail.com";
githubId = 25993494;
};
netcrns = {
email = "jason.wing@gmx.de";
github = "netcrns";

View file

@ -973,7 +973,7 @@ def subtest(name: str) -> Iterator[None]:
if __name__ == "__main__":
arg_parser = argparse.ArgumentParser()
arg_parser = argparse.ArgumentParser(prog="nixos-test-driver")
arg_parser.add_argument(
"-K",
"--keep-vm-state",

View file

@ -16,13 +16,19 @@ rec {
inherit pkgs;
mkTestDriver =
# Reifies and correctly wraps the python test driver for
# the respective qemu version and with or without ocr support
pythonTestDriver = {
qemu_pkg ? pkgs.qemu_test
, enableOCR ? false
}:
let
testDriverScript = ./test-driver/test-driver.py;
in
qemu_pkg: stdenv.mkDerivation {
name = "nixos-test-driver";
testDriverScript = ./test-driver/test-driver.py;
ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; };
imagemagick_tiff = imagemagick_light.override { inherit libtiff; };
in stdenv.mkDerivation {
inherit name;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ (python3.withPackages (p: [ p.ptpython p.colorama ])) ];
@ -35,7 +41,7 @@ rec {
buildPhase = ''
python <<EOF
from pydoc import importfile
with open('driver-exports', 'w') as fp:
with open('driver-symbols', 'w') as fp:
fp.write(','.join(dir(importfile('${testDriverScript}'))))
EOF
'';
@ -57,20 +63,17 @@ rec {
# TODO: copy user script part into this file (append)
wrapProgram $out/bin/nixos-test-driver \
--argv0 ${name} \
--prefix PATH : "${lib.makeBinPath [ qemu_pkg vde2 netpbm coreutils ]}" \
${lib.optionalString enableOCR
"--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \
install -m 0644 -vD driver-exports $out/nix-support/driver-exports
install -m 0644 -vD driver-symbols $out/nix-support/driver-symbols
'';
};
# Run an automated test suite in the given virtual network.
runTests = {
# the script that runs the network
driver,
# a source position in the format of builtins.unsafeGetAttrPos
# for meta.position
pos,
}:
runTests = { driver, pos }:
stdenv.mkDerivation {
name = "vm-test-run-${driver.testName}";
@ -87,10 +90,99 @@ rec {
inherit driver;
};
inherit pos;
inherit pos; # for better debugging
};
# Generate convenience wrappers for running the test driver
# has vlans, vms and test script defaulted through env variables
# also instantiates test script with nodes, if it's a function (contract)
setupDriverForTest = {
testScript
, testName
, nodes
, qemu_pkg ? pkgs.qemu_test
, enableOCR ? false
, skipLint ? false
, passthru ? {}
}:
let
# FIXME: get this pkg from the module system
testDriver = pythonTestDriver { inherit qemu_pkg enableOCR;};
testDriverName =
let
# A standard store path to the vm monitor is built like this:
# /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor
# The max filename length of a unix domain socket is 108 bytes.
# This means $name can at most be 50 bytes long.
maxTestNameLen = 50;
testNameLen = builtins.stringLength testName;
in with builtins;
if testNameLen > maxTestNameLen then
abort
("The name of the test '${testName}' must not be longer than ${toString maxTestNameLen} " +
"it's currently ${toString testNameLen} characters long.")
else
"nixos-test-driver-${testName}";
vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);
vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
nodeHostNames = map (c: c.config.system.name) (lib.attrValues nodes);
invalidNodeNames = lib.filter
(node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null)
(builtins.attrNames nodes);
testScript' =
# Call the test script with the computed nodes.
if lib.isFunction testScript
then testScript { inherit nodes; }
else testScript;
in
if lib.length invalidNodeNames > 0 then
throw ''
Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
All machines are referenced as python variables in the testing framework which will break the
script when special characters are used.
Please stick to alphanumeric chars and underscores as separation.
''
else lib.warnIf skipLint "Linting is disabled" (runCommand testDriverName
{
inherit testName;
nativeBuildInputs = [ makeWrapper ];
testScript = testScript';
preferLocalBuild = true;
passthru = passthru // {
inherit nodes;
};
}
''
mkdir -p $out/bin
echo -n "$testScript" > $out/test-script
${lib.optionalString (!skipLint) ''
PYFLAKES_BUILTINS="$(
echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)},
< ${lib.escapeShellArg "${testDriver}/nix-support/driver-symbols"}
)" ${python3Packages.pyflakes}/bin/pyflakes $out/test-script
''}
ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))
wrapProgram $out/bin/nixos-test-driver \
--add-flags "''${vms[*]}" \
--run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \
--set VLANS '${toString vlans}'
ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
wrapProgram $out/bin/nixos-run-vms \
--add-flags "''${vms[*]}" \
--set tests 'start_all(); join_all();' \
--set VLANS '${toString vlans}'
'');
# Make a full-blown test
makeTest =
{ testScript
, enableOCR ? false
@ -106,128 +198,47 @@ rec {
, ...
} @ t:
let
# A standard store path to the vm monitor is built like this:
# /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor
# The max filename length of a unix domain socket is 108 bytes.
# This means $name can at most be 50 bytes long.
maxTestNameLen = 50;
testNameLen = builtins.stringLength name;
ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; };
imagemagick_tiff = imagemagick_light.override { inherit libtiff; };
# Generate convenience wrappers for running the test driver
# interactively with the specified network, and for starting the
# VMs from the command line.
mkDriver = qemu_pkg:
nodes = qemu_pkg:
let
build-vms = import ./build-vms.nix {
inherit system pkgs minimal specialArgs;
extraConfigurations = extraConfigurations ++ (pkgs.lib.optional (qemu_pkg != null)
extraConfigurations = extraConfigurations ++ [(
{
virtualisation.qemu.package = qemu_pkg;
}
) ++ [(
{
# Ensure we do not use aliases. Ideally this is only set
# when the test framework is used by Nixpkgs NixOS tests.
nixpkgs.config.allowAliases = false;
}
)];
};
# FIXME: get this pkg from the module system
testDriver = mkTestDriver (if qemu_pkg == null then pkgs.qemu_test else qemu_pkg);
nodes = build-vms.buildVirtualNetwork (
t.nodes or (if t ? machine then { machine = t.machine; } else { })
);
vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);
vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
testScript' =
# Call the test script with the computed nodes.
if lib.isFunction testScript
then testScript { inherit nodes; }
else testScript;
testDriverName = with builtins;
if testNameLen > maxTestNameLen then
abort
("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " +
"it's currently ${toString testNameLen} characters long.")
else
"nixos-test-driver-${name}";
in
lib.warnIf skipLint "Linting is disabled" (runCommand testDriverName
{
nativeBuildInputs = [ makeWrapper ];
testScript = testScript';
preferLocalBuild = true;
testName = name;
passthru = passthru // {
inherit nodes;
};
}
''
mkdir -p $out/bin
build-vms.buildVirtualNetwork (
t.nodes or (if t ? machine then { machine = t.machine; } else { })
);
echo -n "$testScript" > $out/test-script
${lib.optionalString (!skipLint) ''
PYFLAKES_BUILTINS="$(
echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)},
< ${lib.escapeShellArg "${testDriver}/nix-support/driver-exports"}
)" ${python3Packages.pyflakes}/bin/pyflakes $out/test-script
''}
ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))
wrapProgram $out/bin/nixos-test-driver \
--add-flags "''${vms[*]}" \
${lib.optionalString enableOCR
"--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \
--run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \
--set VLANS '${toString vlans}'
ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
wrapProgram $out/bin/nixos-run-vms \
--add-flags "''${vms[*]}" \
${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
--set tests 'start_all(); join_all();' \
--set VLANS '${toString vlans}'
''); # "
passMeta = drv: drv // lib.optionalAttrs (t ? meta) {
meta = (drv.meta or { }) // t.meta;
driver = setupDriverForTest {
inherit testScript enableOCR skipLint;
testName = name;
qemu_pkg = pkgs.qemu_test;
nodes = nodes pkgs.qemu_test;
};
driverInteractive = setupDriverForTest {
inherit testScript enableOCR skipLint;
testName = name;
qemu_pkg = pkgs.qemu;
nodes = nodes pkgs.qemu;
};
driver = mkDriver null;
driverInteractive = mkDriver pkgs.qemu;
test = passMeta (runTests { inherit driver pos; });
nodeNames = builtins.attrNames driver.nodes;
invalidNodeNames = lib.filter
(node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null)
nodeNames;
nodeHostNames = map (c: c.config.system.name) (lib.attrValues driver.nodes);
test =
let
passMeta = drv: drv // lib.optionalAttrs (t ? meta) {
meta = (drv.meta or { }) // t.meta;
};
in passMeta (runTests { inherit driver pos; });
in
if lib.length invalidNodeNames > 0 then
throw ''
Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
All machines are referenced as python variables in the testing framework which will break the
script when special characters are used.
Please stick to alphanumeric chars and underscores as separation.
''
else
test // {
inherit test driver driverInteractive;
inherit (driver) nodes;
inherit test driver driverInteractive nodes;
};
runInMachine =
@ -235,7 +246,7 @@ rec {
, machine
, preBuild ? ""
, postBuild ? ""
, qemu ? pkgs.qemu_test
, qemu_pkg ? pkgs.qemu_test
, ... # ???
}:
let
@ -272,6 +283,8 @@ rec {
client.succeed("sync") # flush all data before pulling the plug
'';
testDriver = pythonTestDriver { inherit qemu_pkg; };
vmRunCommand = writeText "vm-run" ''
xchg=vm-state-client/xchg
${coreutils}/bin/mkdir $out
@ -290,7 +303,7 @@ rec {
unset xchg
export tests='${testScript}'
${mkTestDriver qemu}/bin/nixos-test-driver --keep-vm-state ${vm.config.system.build.vm}/bin/run-*-vm
${testDriver}/bin/nixos-test-driver --keep-vm-state ${vm.config.system.build.vm}/bin/run-*-vm
''; # */
in

View file

@ -143,6 +143,13 @@ in {
List of additional Matrix plugins to make available.
'';
};
withJemalloc = mkOption {
type = types.bool;
default = false;
description = ''
Whether to preload jemalloc to reduce memory fragmentation and overall usage.
'';
};
no_tls = mkOption {
type = types.bool;
default = false;
@ -720,7 +727,11 @@ in {
--keys-directory ${cfg.dataDir} \
--generate-keys
'';
environment.PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ];
environment = {
PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ];
} // optionalAttrs (cfg.withJemalloc) {
LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so";
};
serviceConfig = {
Type = "notify";
User = "matrix-synapse";

View file

@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "helvum";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "ryuukyu";
repo = pname;
rev = version;
sha256 = "sha256-sQ4epL3QNOLHuR/dr/amHgiaxV/1SWeb3eijnjAAR3w=";
sha256 = "sha256-ZnpdGXK8N8c/s4qC2NXcn0Pdqrqr47iOWvVwXD9pn1A=";
};
cargoSha256 = "sha256-uNTSU06Fz/ud04K40e98rb7o/uAht0DsiJOXeHX72vw=";
cargoSha256 = "sha256-2v2L20rUWftXdhhuE3wiRrDIuSg6VFxfpWYMRaMUyTU=";
nativeBuildInputs = [ clang copyDesktopItems pkg-config ];
buildInputs = [ glib gtk4 pipewire ];

View file

@ -4,6 +4,7 @@
, fetchFromGitHub
, nix-update-script
, qmake
, pkg-config
, qtbase
, qtmultimedia
, libvorbis
@ -12,21 +13,16 @@
mkDerivation rec {
pname = "ptcollab";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "yuxshao";
repo = "ptcollab";
rev = "v${version}";
sha256 = "1yfnf47saxxj17x0vyxihr343kp7gz3fashzky79j80sqlm6ng85";
sha256 = "sha256-98v9it9M5FXCsOpWvO10uKYmEH15v1FEH1hH73XHa7w=";
};
postPatch = ''
substituteInPlace src/editor.pro \
--replace '/usr/include/rtmidi' '${rtmidi}/include/rtmidi'
'';
nativeBuildInputs = [ qmake ];
nativeBuildInputs = [ qmake pkg-config ];
buildInputs = [ qtbase qtmultimedia libvorbis rtmidi ];

View file

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, nix-update-script
, autoreconfHook
, perl
, pkg-config
@ -15,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "sidplayfp";
version = "2.1.1";
version = "2.2.0";
src = fetchFromGitHub {
owner = "libsidplayfp";
repo = "sidplayfp";
rev = "v${version}";
sha256 = "0s3xmg3yzfqbsnlh2y46w7b5jim5zq7mshs6hx03q8wdr75cvwh4";
sha256 = "sha256-hN7225lhuYyo4wPDiiEc9FaPg90pZ13mLw93V8tb/P0=";
};
nativeBuildInputs = [ autoreconfHook perl pkg-config ];
@ -37,6 +38,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; {
description = "A SID player using libsidplayfp";
homepage = "https://github.com/libsidplayfp/sidplayfp";

View file

@ -4,6 +4,7 @@ let
# A list of binaries to put into separate outputs
bins = [
"geth"
"clef"
];
in buildGoModule rec {

View file

@ -19,11 +19,11 @@ let
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
in stdenv.mkDerivation rec {
pname = "poke";
version = "1.2";
version = "1.3";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
hash = "sha256-9hz42ltkwBoTWTc3JarRyiV/NcHJJp5NUN0GZBg932I=";
hash = "sha256-unhjA0obCABLDuj4i9qUFgcH6aeB1VVvVVtQdYPPDxs=";
};
postPatch = ''

View file

@ -10,11 +10,11 @@
mkDerivation rec {
pname = "krita";
version = "4.4.3";
version = "4.4.5";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl";
sha256 = "sha256-S/1ygIcNEGCgDREj2Db8Gltb+KAoZ2Z58CaM1ef7dWg=";
};
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ];

View file

@ -0,0 +1,66 @@
{ lib, stdenv, fetchurl, copyDesktopItems, makeDesktopItem, unzip, jre8 }:
stdenv.mkDerivation rec {
pname = "jquake";
version = "1.6.1";
src = fetchurl {
url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip";
sha256 = "0nw6xjc3i1b8rk15arc5d0ji2bycc40rz044qd03vzxvh0h8yvgl";
};
nativeBuildInputs = [ unzip copyDesktopItems ];
sourceRoot = ".";
postPatch = ''
# JQuake emits a lot of debug-like messages in console, but I
# don't think it's in our interest to void them by default. Log them at
# the appropriate level.
sed -i "/^java/ s/$/\ | logger -p user.debug/" JQuake.sh
# By default, an 'errors.log' file is created in the current directory.
# cd into a temporary directory and let it be created there.
substituteInPlace JQuake.sh \
--replace "java -jar " "exec ${jre8.outPath}/bin/java -jar $out/lib/" \
--replace "[JAR FOLDER]" "\$(mktemp -p /tmp -d jquake-errlog-XXX)"
'';
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
chmod +x JQuake.sh
mkdir -p $out/{bin,lib}
mv JQuake.sh $out/bin/JQuake
mv {JQuake.jar,JQuake_lib} $out/lib
mv sounds $out/lib
mkdir -p $out/share/licenses/jquake
mv LICENSE* $out/share/licenses/jquake
runHook postInstall
'';
desktopItems = [
(makeDesktopItem {
name = "JQuake";
desktopName = "JQuake";
exec = "JQuake";
comment = "Real-time earthquake map of Japan";
})
];
meta = with lib; {
description = "Real-time earthquake map of Japan";
homepage = "http://jquake.net";
downloadPage = "https://jquake.net/?down";
changelog = "https://jquake.net/?docu";
maintainers = with maintainers; [ nessdoor ];
license = licenses.unfree;
platforms = platforms.linux;
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.1.3";
version = "0.1.8";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "1akg3xjbh01nb7l06qpvz3xsjj64kf042xjnapn60jlgg5y34vbm";
sha256 = "0q8lci72rzzc04wnfqry31zav07srw0iymjlq5mxygsq4h9bcq01";
name = "${pname}-${version}.AppImage";
};

View file

@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.25.68";
version = "1.25.72";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "OBf42L6pctflNLjtcbnw2wKo7TisRSMF3SriDPFlB6I=";
sha256 = "7bvcLKc/ZyVSTGOsRIO9qgHc8dSYOJaoEHJw7V2Vl/M=";
};
dontConfigure = true;

View file

@ -31,15 +31,15 @@
}
},
"dev": {
"version": "93.0.4535.3",
"sha256": "19iy4p59n0pg9s39g614y4yxh5f6h86bcp471qdnm6fvzmzcxd18",
"sha256bin64": "16q9s8l20bmr2n0y3pi505l5hbhbmpi8kh47aylj5gzk1nr30a8r",
"version": "93.0.4542.2",
"sha256": "0sfyi52kaxg5mllcvn61285fjnj72vglv9fjf36ri93v6gh34rgw",
"sha256bin64": "0hk31b9nk834gykv977dv7f1hyl7jp527bx5ldxhwcy27333h1hr",
"deps": {
"gn": {
"version": "2021-05-07",
"version": "2021-06-11",
"url": "https://gn.googlesource.com/gn",
"rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
"sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
"rev": "e0c476ffc83dc10897cb90b45c03ae2539352c5c",
"sha256": "01p5w57kksihzg9nb5096a74cw2rp8zzgdjcjm1pgrqvd1mxpjm4"
}
}
},

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kube3d";
version = "4.4.5";
version = "4.4.6";
src = fetchFromGitHub {
owner = "rancher";
repo = "k3d";
rev = "v${version}";
sha256 = "sha256-nT/17R1Gky9509U077tgwS7iQKRMJUk8rwQiHSHcP+s=";
sha256 = "sha256-gId7zDrtkTjFN59yaFyeYwrDZV24hkkV+4dPr8Jr22E=";
};
vendorSha256 = null;

View file

@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
version = "0.0.124";
version = "0.0.125";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "060ypr9rn5yl8iwh4v3ax1v6501yaq72sx50q47sm0wyxn7gpv91";
sha256 = "0ly5a6l7rvl54mc39xma14jrcrf11q3ndnkkr16by5hy3palmz9g";
};
};
}.${branch}

View file

@ -0,0 +1,62 @@
{ mkDerivation
, lib
, fetchFromGitLab
, cmake
, extra-cmake-modules
, pkg-config
, qtquickcontrols2
, qtmultimedia
, qtlocation
, qqc2-desktop-style
, kirigami2
, knotifications
, zxing-cpp
, qxmpp
, gst_all_1
}:
mkDerivation rec {
pname = "kaidan";
version = "0.8.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "network";
repo = pname;
rev = "v${version}";
sha256 = "070njci5zyzahmz3nqyp660chxnqx1mxp31w17syfllvrw403qmg";
};
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
buildInputs = with gst_all_1; [
qtquickcontrols2
qtmultimedia
qtlocation
qqc2-desktop-style
kirigami2
knotifications
zxing-cpp
qxmpp
gstreamer
gst-plugins-bad
gst-plugins-base
gst-plugins-good
];
postInstall = ''
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
'';
meta = with lib; {
description = "User-friendly and modern chat app, using XMPP";
homepage = "https://www.kaidan.im";
license = with licenses; [
gpl3Plus
mit
asl20
cc-by-sa-40
];
maintainers = with maintainers; [ astro ];
platforms = with platforms; linux;
};
}

View file

@ -13,13 +13,13 @@
mkDerivation rec {
pname = "kdeltachat";
version = "unstable-2021-06-06";
version = "unstable-2021-06-14";
src = fetchFromSourcehut {
owner = "~link2xt";
repo = "kdeltachat";
rev = "321c19b7415e837acc4e66d535e82518618bc096";
sha256 = "19py9mxpjz09fhyyvxf75s77nq0jwwfiljq9289192p61grk6625";
rev = "25da4228768e260ea9f67d5aa10558e7cf9cf7ee";
sha256 = "17igh34cbd0w5mzra4k779nxc5s8hk6sj25h308w079y0b21lf7w";
};
nativeBuildInputs = [

View file

@ -28,7 +28,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.4.1"; # Please backport all updates to the stable channel.
version = "5.5.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1f1narpqj8gcyi4r574nqm1cbyi3azk1y7d1j300scr51gk74fq6";
sha256 = "0l12hwwv0ks2hgp1xc5nmn5rcqzwxdpjqhwysix550m26bz4jczp";
};
nativeBuildInputs = [

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, gtk2, openssl ? null, gpgme ? null
, gpgSupport ? true, sslSupport ? true }:
, gpgSupport ? true, sslSupport ? true, fetchpatch }:
assert gpgSupport -> gpgme != null;
assert sslSupport -> openssl != null;
@ -15,6 +15,17 @@ stdenv.mkDerivation rec {
sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd";
};
patches = [
(fetchpatch {
# patch upstream bug https://sylpheed.sraoss.jp/redmine/issues/306
name = "patch-libsylph_ssl_c.patch";
url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/mail/sylpheed/patches/patch-libsylph_ssl_c?rev=1.4&content-type=text/plain";
sha256 = "sha256-k9OwPtHrEjaxXdH0trNqXgJMhR8kjgtei9pi6OFvILk=";
})
];
patchFlags = [ "-p0" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 ]

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glab";
version = "1.18.0";
version = "1.18.1";
src = fetchFromGitHub {
owner = "profclems";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/WKfMmaFjnzRWCJZEZF/CguU0K7FOtgvKNMSQGvjODQ=";
sha256 = "sha256-ahP5y5i0SMj2+mP4RYc7MLZGElX5eLgKwiVhBYGOX2g=";
};
vendorSha256 = "sha256-PCkVjLdOdOhJGNSkVPFK/ONRdJT7MS0COjYgPNT5dNw=";
vendorSha256 = "sha256-ssVmqcJ/DxUqAkHm9tn4RwWuKzTHvxoqJquXPIRy4b8=";
runVend = true;
# Tests are trying to access /homeless-shelter

View file

@ -15,11 +15,11 @@ with lib;
buildGoPackage rec {
pname = "singularity";
version = "3.7.4";
version = "3.8.0";
src = fetchurl {
url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
sha256 = "sha256-wmY2movydH9E4HWYWMP8OyMluXWogYsmaPC5exJNAWQ=";
sha256 = "sha256-6WCLDgqMgFIYu+eV6RdkhIN7L3/LleVGm4U7OAmiQS4=";
};
goPackagePath = "github.com/sylabs/singularity";

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "i3-balance-workspace";
version = "1.8.4";
version = "1.8.5";
src = fetchPypi {
inherit pname version;
sha256 = "bb220eb373e290312b0aafe3d7b1cc1cca34c93189a4fca5bee93ef39aafbe3d";
sha256 = "7b5d72b756f79878a058484825bb343b100433e00a01f80c9c6d1ccc9f4af57a";
};
propagatedBuildInputs = [ i3ipc ];

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, git
{ lib, stdenv, fetchurl, meson, ninja, pkg-config
, cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland
, wayland-protocols, wf-config, wlroots, mesa
}:

View file

@ -30,13 +30,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "gnome-music";
version = "40.0";
version = "40.1.1";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "1djqhd4jccvk352hwxjhiwjgbnv1qnpv450f2c6w6581vcn9pq38";
sha256 = "IMtnPhHC8xQ9NYjPyrmhInkQgOun3GASypTBhglVjVE=";
};
nativeBuildInputs = [

View file

@ -44,13 +44,13 @@
stdenv.mkDerivation rec {
pname = "evince";
version = "40.1";
version = "40.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "0bfg7prmjk3z8irx1nfkkqph3igg3cy4pwd7pcxjxbshqdin6rks";
sha256 = "D/fseTdqipesTNJ00y6ATH4jbvLS1dP2Rt5uuIKmPHc=";
};
postPatch = ''

View file

@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extensions";
version = "40.1";
version = "40.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "T7/OCtQ1e+5zrn3Bjqoe9MqnOF5PlPavuN/HJR/RqL8=";
sha256 = "qFGN1Mg6eE+o05pe1gC/gdY3oY7r5ZDjticYPgv5FPg=";
};
patches = [

View file

@ -15,7 +15,7 @@ let
x86_64-linux = "x64/libbass.so";
};
urlpath = "bass24-linux.zip";
sha256 = "1z01im0l2ydi608vc0n0c1cfyp1vrh6681zn2zkhg98vvs20y805";
sha256 = "1ycvpfa7yyi1qxgflpfzcw1q32f0isd14m9cf351pk8zwndkmp4q";
};
bass_fx = {

View file

@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
tampering, or message forgery."
'';
homepage = "https://www.gnu.org/software/gnutls/";
homepage = "https://gnutls.org/";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ eelco fpletz ];
platforms = platforms.all;

View file

@ -0,0 +1,61 @@
{ stdenv
, lib
, fetchFromGitHub
, perl
, boost
, rdkafka
, jansson
, curl
, avro-c
, avro-cpp }:
stdenv.mkDerivation rec {
pname = "libserdes";
version = "6.2.0";
src = fetchFromGitHub {
owner = "confluentinc";
repo = pname;
rev = "v${version}";
sha256 = "194ras18xw5fcnjgg1isnb24ydx9040ndciniwcbdb7w7wd901gc";
};
outputs = [ "dev" "out" ];
nativeBuildInputs = [ perl ];
buildInputs = [ boost rdkafka jansson curl avro-c avro-cpp ];
makeFlags = [ "GEN_PKG_CONFIG=y" ];
postPatch = ''
patchShebangs configure lds-gen.pl
'';
# Has a configure script but its not Autoconf so steal some bits from multiple-outputs.sh:
setOutputFlags = false;
preConfigure = ''
configureFlagsArray+=(
"--libdir=''${!outputLib}/lib"
"--includedir=''${!outputInclude}/include"
)
'';
preInstall = ''
installFlagsArray+=("pkgconfigdir=''${!outputDev}/lib/pkgconfig")
'';
# Header files get installed with executable bit for some reason; get rid of it.
postInstall = ''
chmod -x ''${!outputInclude}/include/libserdes/*.h
'';
meta = with lib; {
description = "A schema-based serializer/deserializer C/C++ library with support for Avro and the Confluent Platform Schema Registry";
homepage = "https://github.com/confluentinc/libserdes";
license = licenses.asl20;
maintainers = with maintainers; [ liff ];
platforms = platforms.all;
};
}

View file

@ -1,7 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, nix-update-script
, autoreconfHook
, pkg-config
, perl
@ -16,29 +16,16 @@
stdenv.mkDerivation rec {
pname = "libsidplayfp";
version = "2.1.1";
version = "2.2.0";
src = fetchFromGitHub {
owner = "libsidplayfp";
repo = "libsidplayfp";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0487gap2b0ypikyra74lk1qwqwr0vncldamk5xb1db2x97v504fd";
sha256 = "sha256-lDM4nJozZF8Rt+XWnM41hBAYatZVsmvvQajgHLI9uy0=";
};
# https://github.com/libsidplayfp/libsidplayfp/issues/13
# Remove on next version bump
patches = [
(fetchpatch {
url = "https://github.com/libsidplayfp/libsidplayfp/commit/84f5498f5653261ed84328e1b5676c31e3ba9e6e.patch";
sha256 = "1vysbl4fkdzm11k40msng2ag6i6mb6z9jsw32vyj9calcfha5957";
})
(fetchpatch {
url = "https://github.com/libsidplayfp/libsidplayfp/commit/c1a1b732cc2e791d910522d58f47c6d094493c6d.patch";
sha256 = "1d3sgdly0q9dysgkx5afxbwfas6p0m8n3lw1hmj4n6wm3j9sdz4g";
})
];
postPatch = ''
patchShebangs .
'';
@ -72,6 +59,12 @@ stdenv.mkDerivation rec {
mv docs/html $doc/share/doc/libsidplayfp/
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; {
description = "A library to play Commodore 64 music derived from libsidplay2";
longDescription = ''

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }:
let
version = "5.1.4";
version = "5.1.5";
in stdenv.mkDerivation {
pname = "libxc";
@ -11,7 +11,7 @@ in stdenv.mkDerivation {
owner = "libxc";
repo = "libxc";
rev = version;
sha256 = "0rs6v72zz3jr22r29zxxdk8wdsfv6wid6cx2661974z09dbvbr1f";
sha256 = "0cy3x2zn1bldc5i0rzislfbc8h4nqgds445jkfqjv0d1shvdy0zn";
};
buildInputs = [ gfortran ];

View file

@ -0,0 +1,46 @@
{ mkDerivation
, lib
, fetchFromGitHub
, cmake
, pkg-config
, withGstreamer ? true
, gst_all_1
}:
mkDerivation rec {
pname = "qxmpp";
version = "1.4.0";
src = fetchFromGitHub {
owner = "qxmpp-project";
repo = pname;
rev = "v${version}";
sha256 = "1knpq1jkwk0lxdwczbmzf7qrjvlxba9yr40nbq9s5nqkcx6q1c3i";
};
nativeBuildInputs = [
cmake
] ++ lib.optionals withGstreamer [
pkg-config
];
buildInputs = lib.optionals withGstreamer (with gst_all_1; [
gstreamer
gst-plugins-bad
gst-plugins-base
gst-plugins-good
]);
cmakeFlags = [
"-DBUILD_EXAMPLES=false"
"-DBUILD_TESTS=false"
] ++ lib.optionals withGstreamer [
"-DWITH_GSTREAMER=ON"
];
meta = with lib; {
description = "Cross-platform C++ XMPP client and server library";
homepage = "https://github.com/qxmpp-project/qxmpp";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ astro ];
platforms = with platforms; linux;
};
}

View file

@ -76,6 +76,15 @@ stdenv.mkDerivation rec {
sha256 = "1jdw2i1rq06zqd6aabh7bbm0avsg4pygnfmd7gviv0blhih9054l";
};
patches = [
# TODO: remove on the next version bump
(fetchpatch {
name = "include-schema-conversion-utils-source.patch";
url = "https://github.com/tensorflow/tensorflow/commit/f3c4f4733692150fd6174f2cd16438cfaba2e5ab.patch";
sha256 = "0zx4hbz679kn79f30159rl1mq74dg45cvaawii0cyv48z472yy4k";
})
];
buildInputs = [ zlib flatbuffers ];
dontConfigure = true;

View file

@ -0,0 +1,11 @@
{ re, reason, pastel, ... }:
{
pname = "cli";
buildInputs = [
re
reason
pastel
];
}

View file

@ -0,0 +1,21 @@
{ buildDunePackage, callPackage, reason, console, ... }:
{
pname = "console";
buildInputs = [
reason
];
passthru.tests = {
console = callPackage ./tests/console {
inherit buildDunePackage reason console;
};
};
meta = {
description = "A library providing a web-influenced polymorphic console API for native Console.log(anything) with runtime printing";
downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/console";
homepage = "https://reason-native.com/docs/console/";
};
}

View file

@ -0,0 +1,43 @@
{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native }:
let
generic = (somePath:
let
prepkg = import somePath {
inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason;
inherit (reason-native) console file-context-printer fp pastel rely;
};
in
buildDunePackage
({
version = "2021-16-16-aec0ac6";
src = fetchFromGitHub {
owner = "reasonml";
repo = "reason-native";
rev = "aec0ac681be7211b4d092262281689c46deb63e1";
sha256 = "sha256-QoyI50MBY3RJBmM1y90n7oXrLmHe0CQxKojv+7YbegE=";
};
useDune2 = true;
meta = with lib; {
description = "Libraries for building and testing native Reason programs";
downloadPage = "https://github.com/reasonml/reason-native";
homepage = "https://reason-native.com/";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
} // (prepkg.meta or {});
} // prepkg)
);
cli = generic ./cli.nix; # Used only by Rely.
in
lib.makeScope newScope (self: with self; {
console = generic ./console.nix;
dir = generic ./dir.nix;
file-context-printer = generic ./file-context-printer.nix;
fp = generic ./fp.nix;
pastel = generic ./pastel.nix;
pastel-console = generic ./pastel-console.nix;
qcheck-rely = generic ./qcheck-rely.nix;
refmterr = generic ./refmterr.nix;
rely = generic ./rely.nix;
rely-junit-reporter = generic ./rely-junit-reporter.nix;
})

View file

@ -0,0 +1,18 @@
{ reason, fp, ... }:
{
pname = "dir";
buildInputs = [
reason
];
propagatedBuildInputs = [
fp
];
meta = {
description = "A library that provides a consistent API for common system, user and application directories consistently on all platforms";
downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/dir";
};
}

View file

@ -0,0 +1,20 @@
{ reason, re, pastel, ... }:
{
pname = "file-context-printer";
buildInputs = [
reason
];
propagatedBuildInputs = [
re
pastel
];
meta = {
description = "Utility for displaying snippets of files on the command line";
downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/file-context-printer";
homepage = "https://reason-native.com/docs/file-context-printer/";
};
}

View file

@ -0,0 +1,14 @@
{ reason, ... }:
{
pname = "fp";
buildInputs = [
reason
];
meta = {
description = "A library for creating and operating on file paths consistently on multiple platforms";
downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fp";
};
}

View file

@ -0,0 +1,20 @@
{ reason, console, pastel, ... }:
{
pname = "pastel-console";
buildInputs = [
reason
];
propagatedBuildInputs = [
console
pastel
];
meta = {
description = "Small library for pretty coloring to Console output";
downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel-console";
homepage = "https://reason-native.com/docs/pastel/console";
};
}

View file

@ -0,0 +1,20 @@
{ reason, re, ... }:
{
pname = "pastel";
minimalOCamlVersion = "4.05";
buildInputs = [
reason
];
propagatedBuildInputs = [
re
];
meta = {
description = "A text formatting library that harnesses Reason JSX to provide intuitive terminal output. Like React but for CLI";
downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel";
homepage = "https://reason-native.com/docs/pastel/";
};
}

View file

@ -0,0 +1,20 @@
{ qcheck-core, reason, console, rely, ... }:
{
pname = "qcheck-rely";
buildInputs = [
reason
];
propagatedBuildInputs = [
qcheck-core
console
rely
];
meta = {
description = "A library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'";
downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely";
};
}

View file

@ -0,0 +1,21 @@
{ atdgen, re, reason, pastel, ... }:
{
pname = "refmterr";
buildInputs = [
reason
];
propagatedBuildInputs = [
atdgen
re
pastel
];
meta = {
description = "An error formatter tool for Reason and OCaml. Takes raw error output from compiler and converts to pretty output";
downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/refmterr";
homepage = "https://reason-native.com/docs/refmterr/";
};
}

View file

@ -0,0 +1,23 @@
{ atdgen, junit, re, reason, pastel, rely, ... }:
{
pname = "rely-junit-reporter";
buildInputs = [
atdgen
reason
];
propagatedBuildInputs = [
junit
re
pastel
rely
];
meta = {
description = "A tool providing JUnit Reporter for Rely Testing Framework";
downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely-junit-reporter";
homepage = "https://reason-native.com/docs/rely/";
};
}

View file

@ -0,0 +1,22 @@
{ re, reason, cli, file-context-printer, pastel, ... }:
{
pname = "rely";
buildInputs = [
reason
];
propagatedBuildInputs = [
re
cli
file-context-printer
pastel
];
meta = {
description = "A Jest-inspired testing framework for native OCaml/Reason";
downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely";
homepage = "https://reason-native.com/docs/rely/";
};
}

View file

@ -0,0 +1 @@
Console.log(Some("Hello fellow Nixer!")); /* {"Hello fellow Nixer!"} */

View file

@ -0,0 +1,20 @@
{ lib, buildDunePackage, reason, console }:
buildDunePackage rec {
pname = "console-test";
version = "1";
src = ./.;
useDune2 = true;
buildInputs = [
reason
console
];
doInstallCheck = true;
postInstallCheck = ''
$out/bin/console-test | grep -q "{\"Hello fellow Nixer!\"}" > /dev/null
'';
}

View file

@ -0,0 +1,4 @@
(executable
(name console-test)
(public_name console-test)
(libraries reason console.lib))

View file

@ -0,0 +1,51 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, aiohttp
, attrs
, defusedxml
, pytest-aiohttp
, pytest-mock
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "arcam-fmj";
version = "0.7.0";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "elupus";
repo = "arcam_fmj";
rev = version;
sha256 = "0y4wvvbcsizjd9qz6iw4gjhq5qf0qcqs27hpx1cd90vhy6rclxm0";
};
propagatedBuildInputs = [
aiohttp
attrs
defusedxml
];
checkInputs = [
pytest-aiohttp
pytest-mock
pytestCheckHook
];
pythonImportsCheck = [
"arcam.fmj"
"arcam.fmj.client"
"arcam.fmj.state"
"arcam.fmj.utils"
];
meta = with lib; {
description = "Python library for speaking to Arcam receivers";
homepage = "https://github.com/elupus/arcam_fmj";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, pbr
, requests
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "bimmer-connected";
version = "0.7.15";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = version;
sha256 = "193m16rrq7mfvzjcq823icdr9fp3i8grqqn3ci8zhcsq6w3vnb90";
};
nativeBuildInputs = [
pbr
];
PBR_VERSION = version;
propagatedBuildInputs = [
requests
];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Library to read data from the BMW Connected Drive portal";
homepage = "https://github.com/bimmerconnected/bimmer_connected";
license = licenses.asl20;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pillow
}:
buildPythonPackage rec {
pname = "colorthief";
version = "0.2.1";
src = fetchFromGitHub {
owner = "fengsp";
repo = "color-thief-py";
rev = version;
sha256 = "0lzpflal1iqbj4k7hayss5z024qf2sn8c3wxw03a0mgxg06ca2hm";
};
propagatedBuildInputs = [
pillow
];
# no tests implemented
doCheck = false;
pythonImportsCheck = [ "colorthief" ];
meta = with lib; {
description = "Python module for grabbing the color palette from an image";
homepage = "https://github.com/fengsp/color-thief-py";
license = licenses.bsd3;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, aiohttp
, ratelimit
}:
buildPythonPackage rec {
pname = "goalzero";
version = "0.1.7";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "1f6a2755a745ea14e65d6bf3e56bd090a508bf6f63ccb76b9b89ce3d844a2160";
};
propagatedBuildInputs = [
aiohttp
ratelimit
];
# no tests implemented
doCheck = false;
pythonImportsCheck = [ "goalzero" ];
meta = with lib; {
description = "Goal Zero Yeti REST Api Library";
homepage = "https://github.com/tkdrob/goalzero";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -0,0 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "libpyfoscam";
version = "1.1";
src = fetchPypi {
inherit pname version;
sha256 = "c274cafd2c6493ab397fe9f0f8aae0b2c35c7c661fe76dde3bd2f1cd56b8fc32";
};
# tests need access to a camera
doCheck = false;
pythonImportsCheck = [ "libpyfoscam" ];
meta = with lib; {
description = "Python Library for Foscam IP Cameras";
homepage = "https://github.com/viswa-swami/python-foscam";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, aiohttp
, xmltodict
}:
buildPythonPackage rec {
pname = "pycontrol4";
version = "0.1.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "lawtancool";
repo = "pyControl4";
rev = "v${version}";
sha256 = "0idw9kv6yxrbp0r33vb1jlzgil20m2rjjfrxhcwxmbjjqv93zn6d";
};
propagatedBuildInputs = [
aiohttp
xmltodict
];
# tests access network
doCheck = false;
pythonImportsCheck = [
"pyControl4.account"
"pyControl4.alarm"
"pyControl4.director"
"pyControl4.light"
];
meta = with lib; {
description = "Python 3 asyncio package for interacting with Control4 systems";
homepage = "https://github.com/lawtancool/pyControl4";
license = licenses.asl20;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "pycoolmasternet-async";
version = "0.1.2";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "OnFreund";
repo = "pycoolmasternet-async";
rev = "v${version}";
sha256 = "0qzdk18iqrvin8p8zrydf69d6pii3j47j11h7ymmsx08gh7c176g";
};
# no tests implemented
doCheck = false;
pythonImportsCheck = [ "pycoolmasternet_async" ];
meta = with lib; {
description = "Python library to control CoolMasterNet HVAC bridges over asyncio";
homepage = "https://github.com/OnFreund/pycoolmasternet-async";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "dotenv-linter";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitHub {
owner = "dotenv-linter";
repo = "dotenv-linter";
rev = "v${version}";
sha256 = "sha256-3Lj5GtWGyWDkZPhxYQu7UWzmh7TO5wk1UJ0lek1jTto=";
sha256 = "sha256-hhaMI2Z97aT/8FxxtWpn+o3BSo26iyBP+ucpO3x4AbQ=";
};
cargoSha256 = "sha256-FDkxJuZPzDrgLJgefkRUPS+0Ys3DaBOD3XAuS/Z6TtI=";
cargoSha256 = "sha256-F9Xyg8/qp0j0+jyd5EVe2idocubzu+Cj6yAwrHuabvM=";
meta = with lib; {
description = "Lightning-fast linter for .env files. Written in Rust";

View file

@ -0,0 +1,30 @@
{ buildGoModule
, fetchFromGitHub
, lib
}:
buildGoModule rec {
pname = "litestream";
version = "0.3.5";
src = fetchFromGitHub {
owner = "benbjohnson";
repo = pname;
rev = "v${version}";
sha256 = "sha256-OQ8j0FOUWU5TfCl4AZpmX5tuhtHAbrhvzT6ve6AJNn0=";
};
ldflags = [
"-s"
"-w"
"-X main.Version=${version}"
];
vendorSha256 = "sha256-ScG8cukUuChOvN9r0HvVJsYnu1X9DSO7aD32iu55jIM=";
meta = with lib; {
description = "Streaming replication for SQLite";
license = licenses.asl20;
homepage = "https://litestream.io/";
maintainers = with maintainers; [ fbrs ];
};
}

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "packer";
version = "1.7.2";
version = "1.7.3";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
sha256 = "sha256-Ey1gkld7WosJgoqnNp4Lz2x3PTI+w5p+A8Cwv4+uUZw=";
sha256 = "sha256-k5GCUFzjf0mipIQlnf7VCUS2j7cFwoGCeM7T6qgGnJA=";
};
vendorSha256 = null;
vendorSha256 = "sha256-5Wb7WAUGXJ7VMWiQyboH3PXJazsqitD9N0Acd+WItaY=";
subPackages = [ "." ];

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
"rev": "5b6bfbdcdbdda7da4839d7163ce579ed98410282",
"date": "2021-05-21T15:22:56+02:00",
"path": "/nix/store/msyjbgxf3y3rj6m3w2apd65cvr9x523r-tree-sitter-c-sharp",
"sha256": "0ls2qic3jb20zv4m5pdrc3ikfb66afay3krvc6gsq1fi9hbxrmvv",
"rev": "aa429589525bb849189a0c5ddb52267ce578f988",
"date": "2021-06-07T18:47:38+02:00",
"path": "/nix/store/mclvpa5kfbl9g5ij3xjdhnqc6bqzqcj6-tree-sitter-c-sharp",
"sha256": "07alycp4bclr0ycn44dj2481xag0s10nwgyrdxar3j91hphd966s",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c",
"rev": "f05e279aedde06a25801c3f2b2cc8ac17fac52ae",
"date": "2021-03-28T09:12:10-07:00",
"path": "/nix/store/4bcxsfrgrcpjy3f6dsmqli2xawjpyz44-tree-sitter-c",
"sha256": "1rismmgaqii1sdnri66h75sgw3mky4aha9hff6fan1qzll4f3hif",
"rev": "008008e30a81849fca0c79291e2b480855e0e02c",
"date": "2021-05-26T09:13:01-07:00",
"path": "/nix/store/vkps4991ip8dhgjqwfw7mamnmnizw31m-tree-sitter-c",
"sha256": "1mw4vma7kl504qn91f6janiqk9i05849rizqkqhyagb3glfbkrx2",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-haskell",
"rev": "2e33ffa3313830faa325fe25ebc3769896b3a68b",
"date": "2021-04-19T23:45:03+02:00",
"path": "/nix/store/75mc2mfs4sm21c871s5lm9djnjk90r7n-tree-sitter-haskell",
"sha256": "0np7mzi1na1qscdxsjpyw314iwcmpzzrx1v7fk3yxc70qwzjcpp1",
"rev": "237f4eb4417c28f643a29d795ed227246afb66f9",
"date": "2021-06-05T13:41:42+02:00",
"path": "/nix/store/wwi86c3ix0zq8czwljxxypw5w2mxnz5h-tree-sitter-haskell",
"sha256": "0gx6mr6yg053i5mif8i8qwkk9h57laf9riw5r24av1y7cal7sszd",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-javascript",
"rev": "6c8cfae935f67dd9e3a33982e5e06be0ece6399a",
"date": "2021-05-11T09:51:32-07:00",
"path": "/nix/store/dhh1gz45l3h3p31jfg5fgy1kns1lbw6d-tree-sitter-javascript",
"sha256": "1mw6miw4yp6s1i0b08hflamfvrjdim4fnnj6fy461n05jp1s1i78",
"rev": "45b9ce2a2588c0e6d616b0ee2a710b1fcb99c5b5",
"date": "2021-06-09T14:12:41-07:00",
"path": "/nix/store/j6r7z3m4wk6baz70qg2xn2mq3jlnyq6f-tree-sitter-javascript",
"sha256": "0rzpyxbh1j9l12jxyryc06f8jhbd5ci18lfb7bw2msc685b2ckcx",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/Azganoth/tree-sitter-lua",
"rev": "a943944ec09c5e96f455bb166079de4ef3534457",
"date": "2020-12-27T00:15:24-03:00",
"path": "/nix/store/6glr8p3x58pva0nn586dk5jwb3bpgqrj-tree-sitter-lua",
"sha256": "0pm6wwb3kv73bfvvshdmvazcb1is5x1z6jwr31gz0niln18nqvpb",
"url": "https://github.com/nvim-treesitter/tree-sitter-lua",
"rev": "b6d4e9e10ccb7b3afb45018fbc391b4439306b23",
"date": "2021-03-05T14:55:53+01:00",
"path": "/nix/store/mlvnfmm5q67810qdim11qs4ivq54jrmr-tree-sitter-lua",
"sha256": "17kf1m2qpflqv7xng6ls4v1qxfgdlpgxs4qjwb6rcc8nbcdsj4ms",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-php",
"rev": "6a271f4075e11815e787df9055a950fb844ee63b",
"date": "2021-05-13T12:41:22+02:00",
"path": "/nix/store/n6hycd1scxa990xchk5h09ilxi7w18f5-tree-sitter-php",
"sha256": "1ijxc6brd0d35hr89ic8k5ispc6sj4mxln7bznd9n6zrgjvfdjqb",
"rev": "b065fc4ded84c30aff14c07ec6e7cf449e222b04",
"date": "2021-06-01T20:33:20+02:00",
"path": "/nix/store/czdqn2nz8pgrd64w74yskx6vl233phxn-tree-sitter-php",
"sha256": "1qr2byy344haqybd0zz2hazncay7zndkp4p3317ck50xrs05z086",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ql",
"rev": "965948cce9a94a710b1339851e0919471ad5ee2c",
"date": "2021-03-04T14:34:34-08:00",
"path": "/nix/store/4hi59c856ii2b79nv2wjib6qbp3hk24i-tree-sitter-ql",
"sha256": "01y1fzclwlaffx0rzg49h7kyvhhm25fba0w362n2y8hgjp3imgmg",
"rev": "8e7fd7e638d4a0ec7a792ee16b19dbc6407aa810",
"date": "2021-06-02T18:46:47+02:00",
"path": "/nix/store/yhyi9y09shv1fm87gka43vnv9clvyd92-tree-sitter-ql",
"sha256": "0x5f9989ymqvw3g8acckyk4j7zpmnc667qishbgly9icl9rkmv7w",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-ruby",
"rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd",
"date": "2021-03-03T16:54:30-08:00",
"path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby",
"sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v",
"rev": "391269d74d20154bbd0ac9be20b35eced6920290",
"date": "2021-05-04T14:02:32-07:00",
"path": "/nix/store/hamsaml0yzi13qd61abypjwbv33rd824-tree-sitter-ruby",
"sha256": "0biyhydfzybz3g6hhdd0rk6yav7xsk61j8lnmpsi60vaxabdsaiv",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/Himujjal/tree-sitter-svelte",
"rev": "c696a13a587b0595baf7998f1fb9e95c42750263",
"date": "2021-03-20T16:45:11+05:30",
"path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte",
"sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3",
"rev": "10c113001acf9852817150acb3031a5e68d2b4cf",
"date": "2021-05-02T10:05:14+05:30",
"path": "/nix/store/mpfr56mfiizhwr4hq7h422glmdc4hg48-tree-sitter-svelte",
"sha256": "1n7addsnin6czm5hrbhaaqqgf0c3nz3mpcdysm2z4icgn7fjq281",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false

View file

@ -75,7 +75,7 @@ let
repo = "tree-sitter-nix";
};
"tree-sitter-lua" = {
orga = "Azganoth";
orga = "nvim-treesitter";
repo = "tree-sitter-lua";
};
"tree-sitter-fennel" = {

View file

@ -2,20 +2,19 @@
buildGoPackage rec {
pname = "protoc-gen-twirp";
version = "8.0.0";
version = "8.1.0";
src = fetchFromGitHub {
owner = "twitchtv";
repo = "twirp";
rev = "v${version}";
sha256 = "sha256-lwozRwH96nh4Zlf6ggOF+FuUEfxkN38wxygg5HXw/M0=";
sha256 = "sha256-ezSNrDfOE1nj4FlX7E7Z7/eGfQw1B7NP34aj8ml5pDk=";
};
goPackagePath = "github.com/twitchtv/twirp";
subPackages = [
"protoc-gen-twirp"
"protoc-gen-twirp_python"
];
doCheck = true;

View file

@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.11.0";
version = "1.11.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rsQ9MdMgYPqnLzMfW4rwDpx5QKVDm6TMCCHqJzvTpjw=";
sha256 = "sha256-+EXkWtqJihNx5wvEhRycVpPDs1QxfoqcbMW5aLrofI8=";
};
cargoSha256 = "sha256-nKbc73bEKb0XzuBZApu21E1OzkgU9sqbCaaWhUMiWdQ=";
cargoSha256 = "sha256-j/1NJlGRq1MuE+EU7VstwSMmRYfudBmv3nAe3bAyv+U=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];

View file

@ -16,13 +16,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
version = "2021.602.0";
version = "2021.612.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
sha256 = "t9Byn3eAAkxnBQBfdvz2CGGXu8d3JzTnSz7I68Ntp3A=";
sha256 = "1hrk8sfg4bdrrrqpwb5a8dhpy0lfnrx575z3l2jygzbwgqgr4jy4";
};
patches = [ ./bypass-tamper-detection.patch ];

View file

@ -301,8 +301,8 @@
})
(fetchNuGet {
name = "Markdig";
version = "0.22.1";
sha256 = "1m62kjwz93h323w8qvwmld2g8dy17a3ny5wyy29pwqj7ig4y8ymj";
version = "0.24.0";
sha256 = "03i0mw9717xwf3pffr8ar7k7fmyhgdw222j58l4x0xr4slpg94l7";
})
(fetchNuGet {
name = "MessagePack";
@ -374,6 +374,11 @@
version = "1.0.0";
sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh";
})
(fetchNuGet {
name = "Microsoft.Bcl.AsyncInterfaces";
version = "1.1.0";
sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1";
})
(fetchNuGet {
name = "Microsoft.Bcl.AsyncInterfaces";
version = "5.0.0";
@ -446,13 +451,13 @@
})
(fetchNuGet {
name = "Microsoft.Diagnostics.NETCore.Client";
version = "0.2.61701";
sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1";
version = "0.2.221401";
sha256 = "1k55l60bg8lj5ayl3kixbzvx2684xd7a9nzha5fiqjgp85cimb3r";
})
(fetchNuGet {
name = "Microsoft.Diagnostics.Runtime";
version = "2.0.222201";
sha256 = "1vsa6xbqi4f2mx85rjmq641r9zgssj0bbfcsqlsa5nx6lqh2rf2q";
version = "2.0.226801";
sha256 = "1w8ahqkv8nbq2ch17aa9axhqqnybmc9bsxpdhpiy52ix70mr72w1";
})
(fetchNuGet {
name = "Microsoft.DotNet.PlatformAbstractions";
@ -571,8 +576,8 @@
})
(fetchNuGet {
name = "Microsoft.Extensions.ObjectPool";
version = "5.0.5";
sha256 = "0hh0xm14hp479dsd0gb9igz0vbbn3sak27v39phpyilxvk7ky5z1";
version = "5.0.6";
sha256 = "0kwhcnsagwn3x9ms2sfy5js25gfnipkrakqgn7bbg0a1k35qa5xx";
})
(fetchNuGet {
name = "Microsoft.Extensions.Options";
@ -751,13 +756,13 @@
})
(fetchNuGet {
name = "ppy.LocalisationAnalyser";
version = "2021.525.0";
sha256 = "1h8p8d1xk03904fifhi77zrjkh4sknp4mxjqd3nbpfyikd8f7c8p";
version = "2021.608.0";
sha256 = "1lsb7nr2gynz7llbl22f5mrd9hlxaq48gssfcn5qfji7afv8kwql";
})
(fetchNuGet {
name = "ppy.osu.Framework";
version = "2021.601.0";
sha256 = "0y17s60r4q0c05gm67fmp700zwb7k74xdi45hprblyxsplnbkmi0";
version = "2021.611.0";
sha256 = "14a2032khf2ys51rp6qs3ikp0lvqxgdqh0hbvchj34q0l3g40yv0";
})
(fetchNuGet {
name = "ppy.osu.Framework.NativeLibs";
@ -766,8 +771,8 @@
})
(fetchNuGet {
name = "ppy.osu.Game.Resources";
version = "2021.525.0";
sha256 = "15ksxv5fasfzdkmwikjbn17c1d4rssjfm2vp71b7m834ghm6pnbd";
version = "2021.611.0";
sha256 = "01pbxccfrwzn47xg9xgjn91l6w3d0d3gqkkx53ak7ynxbbvx9q07";
})
(fetchNuGet {
name = "ppy.osuTK.NS20";
@ -1009,11 +1014,6 @@
version = "1.5.0";
sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06";
})
(fetchNuGet {
name = "System.Collections.Immutable";
version = "1.7.1";
sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq";
})
(fetchNuGet {
name = "System.Collections.Immutable";
version = "5.0.0";
@ -1379,11 +1379,6 @@
version = "4.3.0";
sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq";
})
(fetchNuGet {
name = "System.Reflection.Metadata";
version = "1.8.1";
sha256 = "17xxl3m99wa4hcpqy42vl8qb1jk2jfq32rj3sfjc1a46hi2si5jj";
})
(fetchNuGet {
name = "System.Reflection.Metadata";
version = "5.0.0";
@ -1444,11 +1439,6 @@
version = "4.5.3";
sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln";
})
(fetchNuGet {
name = "System.Runtime.CompilerServices.Unsafe";
version = "4.7.1";
sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j";
})
(fetchNuGet {
name = "System.Runtime.CompilerServices.Unsafe";
version = "5.0.0";
@ -1699,6 +1689,11 @@
version = "4.3.0";
sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z";
})
(fetchNuGet {
name = "System.Threading.Tasks.Extensions";
version = "4.5.2";
sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj";
})
(fetchNuGet {
name = "System.Threading.Tasks.Extensions";
version = "4.5.3";

View file

@ -17,13 +17,13 @@
mkDerivation rec {
pname = "punes";
version = "unstable-2021-04-25";
version = "unstable-2021-06-05";
src = fetchFromGitHub {
owner = "punesemu";
repo = "puNES";
rev = "4b4c3495a56d3989544cb56079ce641da8aa9b35";
sha256 = "1wszvdgm38513v26p14k58shbkxn1qhkn8l0hsqi04vviicad59s";
rev = "07fd123f62b2d075894a0cc966124db7b427b791";
sha256 = "1wxff7b397ayd2s2v14w6a0zfgklc7y0kv3mkz1gg5x47mnll24l";
};
postPatch = ''

File diff suppressed because it is too large Load diff

View file

@ -621,7 +621,7 @@ self: super: {
libiconv
];
cargoSha256 = "sha256-/ALOjJayCmLpMV8zC9ryEofUxYdvqj4Cn+sY1qRuqcs=";
cargoSha256 = "sha256-IKSnXNFdtykuajOxpw5CYsw2q/mkVLkRtPC49hiXsPc=";
};
in
''

View file

@ -20,7 +20,7 @@ AndrewRadev/sideways.vim@main
AndrewRadev/splitjoin.vim@main
andsild/peskcolor.vim
andviro/flake8-vim
andweeb/presence.nvim
andweeb/presence.nvim@main
andymass/vim-matchup
andys8/vim-elm-syntax
antoinemadec/coc-fzf
@ -158,6 +158,7 @@ gennaro-tedesco/nvim-peekup
gentoo/gentoo-syntax
GEverding/vim-hocon
gfanto/fzf-lsp.nvim@main
ggandor/lightspeed.nvim@main
gibiansky/vim-textobj-haskell
gioele/vim-autoswap
gleam-lang/gleam.vim

View file

@ -1,4 +1,4 @@
{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq }:
{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck }:
let
inherit (vscode-utils) buildVscodeMarketplaceExtension;
@ -120,7 +120,6 @@ let
sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8=";
};
nativeBuildInputs = [ jq ];
buildInputs = [ nixpkgs-fmt ];
postInstall = ''
cd "$out/$installPrefix"
tmp_package_json=$(mktemp)
@ -1165,9 +1164,16 @@ let
mktplcRef = {
name = "shellcheck";
publisher = "timonwong";
version = "0.12.3";
sha256 = "1i9rszgnac2z1kyahmgxmz05ib7z14s458fvvjlzmvl64fa1fdvf";
version = "0.14.1";
sha256 = "sha256-X3ihMxANcqNLWl9oTZjCgwRt1uBsSN2BmC2D4dPRFLE=";
};
nativeBuildInputs = [ jq ];
postInstall = ''
cd "$out/$installPrefix"
tmp_package_json=$(mktemp)
jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json > "$tmp_package_json"
mv "$tmp_package_json" package.json
'';
meta = {
license = lib.licenses.mit;
};

View file

@ -7,14 +7,14 @@
stdenv.mkDerivation rec {
pname = "ell";
version = "0.40";
version = "0.41";
outputs = [ "out" "dev" ];
src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
rev = version;
sha256 = "sha256-Yr08Kb8YU7xqBnhhS8rn+GFXAV68Hgj4aY26eptb9/8=";
sha256 = "sha256-UCE+PgGmbePlOoAc8jXxCX6fHr16qf1AQMKxizfSTJM=";
};
nativeBuildInputs = [

View file

@ -12,12 +12,12 @@
stdenv.mkDerivation rec {
pname = "iwd";
version = "1.14";
version = "1.15";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
rev = version;
sha256 = "sha256-uGe4TO1/bs8k2z3wOJqaZgT6u6yX/7wx4HMSS2hN4XE=";
sha256 = "sha256-qGQDIzJfeBT9VLwr9Ci9vXcM0ZvFvjL2E9PcKoZ8E94=";
};
outputs = [ "out" "man" ]

View file

@ -45,7 +45,7 @@
"aprs" = ps: with ps; [ aprslib geopy ];
"aqualogic" = ps: with ps; [ aqualogic ];
"aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc
"arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj
"arcam_fmj" = ps: with ps; [ arcam-fmj ];
"arduino" = ps: with ps; [ ]; # missing inputs: PyMata
"arest" = ps: with ps; [ ];
"arlo" = ps: with ps; [ ha-ffmpeg pyarlo ];
@ -94,7 +94,7 @@
"bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
"bme680" = ps: with ps; [ bme680 smbus-cffi ];
"bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280
"bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected
"bmw_connected_drive" = ps: with ps; [ bimmer-connected ];
"bond" = ps: with ps; [ bond-api ];
"bosch_shc" = ps: with ps; [ aiohttp-cors boschshcpy ifaddr zeroconf ];
"braviatv" = ps: with ps; [ bravia-tv ];
@ -130,7 +130,7 @@
"cmus" = ps: with ps; [ ]; # missing inputs: pycmus
"co2signal" = ps: with ps; [ ]; # missing inputs: co2signal
"coinbase" = ps: with ps; [ ]; # missing inputs: coinbase
"color_extractor" = ps: with ps; [ ]; # missing inputs: colorthief
"color_extractor" = ps: with ps; [ colorthief ];
"comed_hourly_pricing" = ps: with ps; [ ];
"comfoconnect" = ps: with ps; [ pycomfoconnect ];
"command_line" = ps: with ps; [ ];
@ -138,9 +138,9 @@
"concord232" = ps: with ps; [ ]; # missing inputs: concord232
"config" = ps: with ps; [ aiohttp-cors ];
"configurator" = ps: with ps; [ ];
"control4" = ps: with ps; [ ]; # missing inputs: pyControl4
"control4" = ps: with ps; [ pycontrol4 ];
"conversation" = ps: with ps; [ aiohttp-cors ];
"coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet-async
"coolmaster" = ps: with ps; [ pycoolmasternet-async ];
"coronavirus" = ps: with ps; [ coronavirus ];
"counter" = ps: with ps; [ ];
"cover" = ps: with ps; [ ];
@ -278,7 +278,7 @@
"foobot" = ps: with ps; [ foobot-async ];
"forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java
"fortios" = ps: with ps; [ fortiosapi ];
"foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam
"foscam" = ps: with ps; [ libpyfoscam ];
"foursquare" = ps: with ps; [ aiohttp-cors ];
"free_mobile" = ps: with ps; [ ]; # missing inputs: freesms
"freebox" = ps: with ps; [ freebox-api ];
@ -312,7 +312,7 @@
"glances" = ps: with ps; [ glances-api ];
"gntp" = ps: with ps; [ gntp ];
"goalfeed" = ps: with ps; [ ]; # missing inputs: pysher
"goalzero" = ps: with ps; [ ]; # missing inputs: goalzero
"goalzero" = ps: with ps; [ goalzero ];
"gogogate2" = ps: with ps; [ ismartgate ];
"google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ];
"google_assistant" = ps: with ps; [ aiohttp-cors ];

View file

@ -292,6 +292,7 @@ in with py.pkgs; buildPythonApplication rec {
"apple_tv"
"apprise"
"aprs"
"arcam_fmj"
"arlo"
"asuswrt"
"atag"
@ -310,6 +311,7 @@ in with py.pkgs; buildPythonApplication rec {
"blink"
"blueprint"
"bluetooth_le_tracker"
"bmw_connected_drive"
"bond"
"bosch_shc"
"braviatv"
@ -327,12 +329,15 @@ in with py.pkgs; buildPythonApplication rec {
"climate"
"cloud"
"cloudflare"
"color_extractor"
"comfoconnect"
"command_line"
"compensation"
"config"
"configurator"
"control4"
"conversation"
"coolmaster"
"coronavirus"
"counter"
"cover"
@ -386,6 +391,7 @@ in with py.pkgs; buildPythonApplication rec {
"folder"
"folder_watcher"
"foobot"
"foscam"
"freebox"
"freedns"
"fritz"
@ -405,6 +411,7 @@ in with py.pkgs; buildPythonApplication rec {
"geonetnz_volcano"
"gios"
"glances"
"goalzero"
"gogogate2"
"google"
"google_assistant"

View file

@ -0,0 +1,11 @@
--- a/hdf/src/hdfi.h 2021-06-16 16:31:31.000000000 +1200
+++ b/hdf/src/hdfi.h 2021-06-16 16:42:26.000000000 +1200
@@ -1343,7 +1343,7 @@
#endif /* IA64 */
/* Linux AArch64 */
-#if defined __aarch64__
+#if defined __aarch64__ && !defined __APPLE__
#ifdef GOT_MACHINE
If you get an error on this line more than one machine type has been defined.

View file

@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-aarch64.patch";
sha256 = "112svcsilk16ybbsi8ywnxfl2p1v44zh3rfn4ijnl8z08vfqrvvs";
})
./darwin-aarch64.patch
];
nativeBuildInputs = [

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lf";
version = "22";
version = "23";
src = fetchFromGitHub {
owner = "gokcehan";
repo = "lf";
rev = "r${version}";
sha256 = "10zmac9xza2v7l13zkavmc34ppcpmb82v8dxvrv4ggm261ns1abr";
sha256 = "sha256-rwKTumletIN4OzvA2VzYh++vioUftvtKYAZoaEL5P7U=";
};
vendorSha256 = "1yjsig2x6zrxdjnds6nqqq3r3g5lq8g9dvmz60nbifqhcx112bcw";
vendorSha256 = "sha256-ujQh4aE++K/fn3PJqkAbTtwRyJPSI9TJQ1DvwLF9etU=";
nativeBuildInputs = [ installShellFiles ];
@ -35,6 +35,6 @@ buildGoModule rec {
changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -2,13 +2,14 @@
buildGoModule rec {
pname = "tfk8s";
version = "0.1.3";
version = "0.1.4";
tag = "v${version}";
src = fetchFromGitHub {
owner = "jrhouston";
repo = "tfk8s";
rev = "v${version}";
sha256 = "sha256-3iI5gYfpkxfVylBgniaMeQ73uR8dAjVrdg/eBLRxUR4";
rev = tag;
sha256 = "sha256-Ha/F8rCGZqFYqJzfemmKRyEBI5khaSIerJxvf2Pf2ao=";
};
vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE=";
@ -18,12 +19,19 @@ buildGoModule rec {
"-ldflags="
"-s"
"-w"
"-X main.toolVersion=${version}"
"-X main.toolVersion=${tag}"
"-X main.builtBy=nixpkgs"
];
doCheck = true;
doInstallCheck = true;
installCheckPhase = ''
$out/bin/tfk8s --version | grep ${tag} > /dev/null
'';
meta = with lib; {
description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format.";
description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format";
license = licenses.mit;
longDescription = ''
tfk8s is a tool that makes it easier to work with the Terraform Kubernetes Provider.

View file

@ -3,13 +3,13 @@
gcc9Stdenv.mkDerivation rec {
pname = "libdnf";
version = "0.62.0";
version = "0.63.0";
src = fetchFromGitHub {
owner = "rpm-software-management";
repo = pname;
rev = version;
sha256 = "sha256-Se15VmBbzt/NASjrA25RdpHDVIG/GOSqn6ibpBe752g=";
sha256 = "sha256-+D1KosfeoEzRgAE6WheO0Vo/1oq7+1tWPa7rRemyZYo=";
};
nativeBuildInputs = [

View file

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "reuse";
version = "0.12.1";
version = "0.13.0";
src = fetchFromGitHub {
owner = "fsfe";
repo = "reuse-tool";
rev = "v${version}";
sha256 = "0ql0krnz0fmq405r2qrm9ysm3cvmqfw14j06pny6na7qshibj78z";
sha256 = "0didqsbvrn06aylp71jl3hqb4rd95d8s613xz6jw6mngyjqv0hq2";
};
propagatedBuildInputs = with python3Packages; [

View file

@ -5,23 +5,24 @@
buildGoModule rec {
pname = "kubesec";
version = "2.11.1";
version = "2.11.2";
src = fetchFromGitHub {
owner = "controlplaneio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vT+SiSt9QoOkGbnPdKkzE8yehNJMa/3jYC+4h4QeNmw=";
sha256 = "sha256-W9c3L8lYjF1W0kwSODhMldlqX1h+2mZIRtElZ20skn4=";
};
vendorSha256 = "sha256-zfQu1EdwvR+LGmsbE8RA4pcOGgsukG1TMTCgPyNoVsc=";
# Tests wants to download additional files
# Tests wants to download the kubernetes schema for use with kubeval
doCheck = false;
meta = with lib; {
description = "Security risk analysis tool for Kubernetes resources";
homepage = "https://github.com/controlplaneio/kubesec";
changelog = "https://github.com/controlplaneio/kubesec/blob/v${version}/CHANGELOG.md";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};

View file

@ -946,9 +946,7 @@ in
flavour = "git";
};
logseq = callPackage ../applications/misc/logseq {
electron = electron_12;
};
logseq = callPackage ../applications/misc/logseq { };
lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
@ -13663,6 +13661,8 @@ in
litecli = callPackage ../development/tools/database/litecli {};
litestream = callPackage ../development/tools/database/litestream {};
lsof = callPackage ../development/tools/misc/lsof { };
ltrace = callPackage ../development/tools/misc/ltrace { };
@ -15291,6 +15291,8 @@ in
qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { };
qxmpp = libsForQt5.callPackage ../development/libraries/qxmpp {};
gnet = callPackage ../development/libraries/gnet { };
gnu-config = callPackage ../development/libraries/gnu-config { };
@ -16226,6 +16228,8 @@ in
libsecret = callPackage ../development/libraries/libsecret { };
libserdes = callPackage ../development/libraries/libserdes { };
libserialport = callPackage ../development/libraries/libserialport { };
libsignal-protocol-c = callPackage ../development/libraries/libsignal-protocol-c { };
@ -24779,6 +24783,8 @@ in
kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };
kaidan = libsForQt5.callPackage ../applications/networking/instant-messengers/kaidan { };
kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { };
kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
@ -30638,6 +30644,8 @@ in
j2cli = with python3Packages; toPythonApplication j2cli;
jquake = callPackage ../applications/misc/jquake { };
jstest-gtk = callPackage ../tools/misc/jstest-gtk { };
keynav = callPackage ../tools/X11/keynav { };

View file

@ -1144,6 +1144,8 @@ let
reason = callPackage ../development/compilers/reason { };
reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { });
rope = callPackage ../development/ocaml-modules/rope { };
rpclib = callPackage ../development/ocaml-modules/rpclib { };

View file

@ -499,6 +499,8 @@ in {
arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { };
arcam-fmj = callPackage ../development/python-modules/arcam-fmj { };
archinfo = callPackage ../development/python-modules/archinfo { };
area = callPackage ../development/python-modules/area { };
@ -1055,6 +1057,8 @@ in {
billiard = callPackage ../development/python-modules/billiard { };
bimmer-connected = callPackage ../development/python-modules/bimmer-connected { };
binaryornot = callPackage ../development/python-modules/binaryornot { };
binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { };
@ -1563,6 +1567,8 @@ in {
colorspacious = callPackage ../development/python-modules/colorspacious { };
colorthief = callPackage ../development/python-modules/colorthief { };
colour = callPackage ../development/python-modules/colour { };
commandparse = callPackage ../development/python-modules/commandparse { };
@ -2866,6 +2872,8 @@ in {
gnureadline = callPackage ../development/python-modules/gnureadline { };
goalzero = callPackage ../development/python-modules/goalzero { };
goobook = callPackage ../development/python-modules/goobook { };
goocalendar = callPackage ../development/python-modules/goocalendar { };
@ -3962,6 +3970,8 @@ in {
libpurecool = callPackage ../development/python-modules/libpurecool { };
libpyfoscam = callPackage ../development/python-modules/libpyfoscam { };
libredwg = toPythonModule (pkgs.libredwg.override {
enablePython = true;
inherit (self) python libxml2;
@ -5222,6 +5232,10 @@ in {
pyatag = callPackage ../development/python-modules/pyatag { };
pycontrol4 = callPackage ../development/python-modules/pycontrol4 { };
pycoolmasternet-async = callPackage ../development/python-modules/pycoolmasternet-async { };
pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { };
pyflick = callPackage ../development/python-modules/pyflick { };