JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Martin Weinelt 2021-06-09 14:18:55 +02:00 committed by GitHub
commit 3da00fa467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
92 changed files with 1463 additions and 743 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/CODEOWNERS vendored
View File

@ -196,12 +196,12 @@
/nixos/tests/prometheus-exporters.nix @WilliButz
# PHP interpreter, packages, extensions, tests and documentation
/doc/languages-frameworks/php.section.md @NixOS/php
/nixos/tests/php @NixOS/php
/pkgs/build-support/build-pecl.nix @NixOS/php
/pkgs/development/interpreters/php @NixOS/php @jtojnar
/pkgs/development/php-packages @NixOS/php
/pkgs/top-level/php-packages.nix @NixOS/php @jtojnar
/doc/languages-frameworks/php.section.md @NixOS/php @aanderse @etu @globin @ma27 @talyz
/nixos/tests/php @NixOS/php @aanderse @etu @globin @ma27 @talyz
/pkgs/build-support/build-pecl.nix @NixOS/php @aanderse @etu @globin @ma27 @talyz
/pkgs/development/interpreters/php @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz
/pkgs/development/php-packages @NixOS/php @aanderse @etu @globin @ma27 @talyz
/pkgs/top-level/php-packages.nix @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz
# Podman, CRI-O modules and related
/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq

9
.github/CONTRIBUTING.md vendored
View File

@ -59,6 +59,15 @@ Follow these steps to backport a change into a release branch in compliance with
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`.
6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier.
## Criteria for Backporting changes
Anything that does not cause user or downstream dependency regressions can be backported. This includes:
- New Packages / Modules
- Security / Patch updates
- Version updates which include new functionality (but no breaking changes)
- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`)
- Security critical applications (E.g. `firefox`)
## Generating 21.11 Release Notes
Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document.

11
doc/contributing/submitting-changes.chapter.md
View File

@ -269,3 +269,14 @@ Other examples of reasons are:
- Previously the build would fail due to, e.g., `getaddrinfo` not being defined
- The previous download links were all broken
- Crash when starting on some X11 systems
#### Acceptable backport criteria
The stable branch does have some changes which cannot be backported. Most notable are breaking changes. The desire is to have stable users be uninterrupted when updating packages.
However, many changes are able to be backported, including:
- New Packages / Modules
- Security / Patch updates
- Version updates which include new functionality (but no breaking changes)
- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`)
- Security critical applications (E.g. `firefox`)

12
maintainers/maintainer-list.nix
View File

@ -4821,6 +4821,12 @@
githubId = 587870;
name = "Jonathan Mettes";
};
jo1gi = {
email = "joakimholm@protonmail.com";
github = "jo1gi";
githubId = 26695750;
name = "Joakim Holm";
};
joachifm = {
email = "joachifm@fastmail.fm";
github = "joachifm";
@ -8595,6 +8601,12 @@
githubId = 6047658;
name = "Ryan Horiguchi";
};
ribose-jeffreylau = {
name = "Jeffrey Lau";
email = "jeffrey.lau@ribose.com";
github = "ribose-jeffreylau";
githubId = 2649467;
};
richardipsum = {
email = "richardipsum@fastmail.co.uk";
github = "richardipsum";

72
nixos/modules/services/misc/bees.nix
View File

@ -57,7 +57,7 @@ let
};
options.extraOptions = mkOption {
type = listOf str;
default = [];
default = [ ];
description = ''
Extra command-line options passed to the daemon. See upstream bees documentation.
'';
@ -67,7 +67,8 @@ let
};
};
in {
in
{
options.services.beesd = {
filesystems = mkOption {
@ -87,37 +88,42 @@ in {
};
};
config = {
systemd.services = mapAttrs' (name: fs: nameValuePair "beesd@${name}" {
description = "Block-level BTRFS deduplication for %i";
after = [ "sysinit.target" ];
systemd.services = mapAttrs'
(name: fs: nameValuePair "beesd@${name}" {
description = "Block-level BTRFS deduplication for %i";
after = [ "sysinit.target" ];
serviceConfig = let
configOpts = [
fs.spec
"verbosity=${toString fs.verbosity}"
"idxSizeMB=${toString fs.hashTableSizeMB}"
"workDir=${fs.workDir}"
];
configOptsStr = escapeShellArgs configOpts;
in {
# Values from https://github.com/Zygo/bees/blob/v0.6.1/scripts/beesd%40.service.in
ExecStart = "${pkgs.bees}/bin/bees-service-wrapper run ${configOptsStr} -- --no-timestamps ${escapeShellArgs fs.extraOptions}";
ExecStopPost = "${pkgs.bees}/bin/bees-service-wrapper cleanup ${configOptsStr}";
CPUAccounting = true;
CPUWeight = 12;
IOSchedulingClass = "idle";
IOSchedulingPriority = 7;
IOWeight = 10;
KillMode = "control-group";
KillSignal = "SIGTERM";
MemoryAccounting = true;
Nice = 19;
Restart = "on-abnormal";
StartupCPUWeight = 25;
StartupIOWeight = 25;
SyslogIdentifier = "bees"; # would otherwise be "bees-service-wrapper"
};
wantedBy = ["multi-user.target"];
}) cfg.filesystems;
serviceConfig =
let
configOpts = [
fs.spec
"verbosity=${toString fs.verbosity}"
"idxSizeMB=${toString fs.hashTableSizeMB}"
"workDir=${fs.workDir}"
];
configOptsStr = escapeShellArgs configOpts;
in
{
# Values from https://github.com/Zygo/bees/blob/v0.6.5/scripts/beesd@.service.in
ExecStart = "${pkgs.bees}/bin/bees-service-wrapper run ${configOptsStr} -- --no-timestamps ${escapeShellArgs fs.extraOptions}";
ExecStopPost = "${pkgs.bees}/bin/bees-service-wrapper cleanup ${configOptsStr}";
CPUAccounting = true;
CPUSchedulingPolicy = "batch";
CPUWeight = 12;
IOSchedulingClass = "idle";
IOSchedulingPriority = 7;
IOWeight = 10;
KillMode = "control-group";
KillSignal = "SIGTERM";
MemoryAccounting = true;
Nice = 19;
Restart = "on-abnormal";
StartupCPUWeight = 25;
StartupIOWeight = 25;
SyslogIdentifier = "beesd"; # would otherwise be "bees-service-wrapper"
};
wantedBy = [ "multi-user.target" ];
})
cfg.filesystems;
};
}

1
nixos/tests/kernel-generic.nix
View File

@ -31,7 +31,6 @@ with pkgs; {
linux_4_19 = makeKernelTest "4.19" linuxPackages_4_19;
linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4;
linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10;
linux_5_11 = makeKernelTest "5.11" linuxPackages_5_11;
linux_5_12 = makeKernelTest "5.12" linuxPackages_5_12;
linux_testing = makeKernelTest "testing" linuxPackages_testing;

22
pkgs/applications/misc/base16-universal-manager/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "base16-universal-manager";
version = "1.0";
src = fetchFromGitHub {
owner = "pinpox";
repo = "base16-universal-manager";
rev = "v${version}";
sha256 = "11kal7x0lajzydbc2cvbsix9ympinsiqzfib7dg4b3xprqkyb9zl";
};
vendorSha256 = "19rba689319w3wf0b10yafydyz01kqg8b051vnijcyjyk0khwvsk";
meta = with lib; {
description = "A universal manager to set base16 themes for any supported application";
homepage = "https://github.com/pinpox/base16-universal-manager";
license = licenses.mit;
maintainers = with maintainers; [ jo1gi ];
};
}

6
pkgs/applications/misc/jotta-cli/default.nix
View File

@ -5,10 +5,10 @@ let
in
stdenv.mkDerivation rec {
pname = "jotta-cli";
version = "0.9.39536";
version = "0.11.44593";
src = fetchzip {
url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
sha256 = "sha256-JZtc6Si3ZQoRG3q+ctzPPQm7WbMYRailIuq/Y5Avd2s=";
sha256 = "1f06zmcpvm0f3phwc43ai6v4ykhkrd4f3br2j89nx9bfmj6ss2ic";
stripRoot = false;
};
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
postFixup = ''
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jotta-cli
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jottad
$out/bin/jotta-cli completion > $out/share/bash-completion/completions/jotta-cli.bash
$out/bin/jotta-cli completion bash > $out/share/bash-completion/completions/jotta-cli.bash
'';
meta = with lib; {

12
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -54,9 +54,9 @@ let
# source tree.
extraAttrs = buildFun base;
githubPatch = commit: sha256: fetchpatch {
githubPatch = { commit, sha256, revert ? false }: fetchpatch {
url = "https://github.com/chromium/chromium/commit/${commit}.patch";
inherit sha256;
inherit sha256 revert;
};
mkGnFlags =
@ -166,6 +166,14 @@ let
# Fix the build by adding a missing dependency (s. https://crbug.com/1197837):
./patches/fix-missing-atspi2-dependency.patch
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
] ++ lib.optionals (chromiumVersionAtLeast "93") [
# We need to revert this patch to build M93 with LLVM 12.
(githubPatch {
# Reland "Replace 'blacklist' with 'ignorelist' in ./tools/msan/."
commit = "9d080c0934b848ee4a05013c78641e612fcc1e03";
sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c";
revert = true;
})
];
postPatch = ''

12
pkgs/applications/networking/instant-messengers/signald/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchgit, jre, coreutils, gradle_6, git, perl
{ lib, stdenv, fetchurl, fetchgit, jre_headless, coreutils, gradle_6, git, perl
, makeWrapper }:
let
@ -52,20 +52,28 @@ in stdenv.mkDerivation rec {
inherit pname src version postPatch patches;
buildPhase = ''
runHook preBuild
export GRADLE_USER_HOME=$(mktemp -d)
# Use the local packages from -deps
sed -i -e 's|mavenCentral()|mavenLocal(); maven { url uri("${deps}") }|' build.gradle
gradle --offline --no-daemon distTar
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out
tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/
wrapProgram $out/bin/signald \
--prefix PATH : ${lib.makeBinPath [ coreutils ]} \
--set JAVA_HOME "${jre}"
--set JAVA_HOME "${jre_headless}"
runHook postInstall
'';
nativeBuildInputs = [ git gradle_6 makeWrapper ];

4
pkgs/applications/networking/remote/anydesk/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript
, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip
, lsb-release, freetype, fontconfig, polkit, polkit_gnome
, lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils
, pulseaudio }:
let
@ -76,7 +76,7 @@ in stdenv.mkDerivation rec {
$out/bin/anydesk
wrapProgram $out/bin/anydesk \
--prefix PATH : ${lib.makeBinPath [ lsb-release ]}
--prefix PATH : ${lib.makeBinPath [ lsb-release pciutils ]}
substituteInPlace $out/share/applications/*.desktop \
--subst-var out

4
pkgs/applications/science/math/mathematica/l10ns.nix
View File

@ -8,10 +8,10 @@ let allVersions = with lib; flip map
# N.B. Versions in this list should be ordered from newest to oldest.
[
{
version = "12.2.0";
version = "12.3.0";
lang = "en";
language = "English";
sha256 = "3b6676a203c6adb7e9c418a5484b037974287b5be09c64e7dfea74ddc0e400d7";
sha256 = "045df045f6e796ded59f64eb2e0f1949ac88dcba1d5b6e05fb53ea0a4aed7215";
}
{
version = "11.3.0";

4
pkgs/applications/version-management/git-and-tools/git-vendor/default.nix
View File

@ -2,8 +2,8 @@
}:
let
version = "1.2.0";
sha256 = "1z9fmrfxqi56pj7f1506q2z41crz702jk88gv57baf6fz63m93v2";
version = "1.2.1";
sha256 = "sha256-sm5SmckaXVjF3odqzYrbC46E1nPzQ9cuNJnNSAa7RWY=";
in stdenv.mkDerivation {
pname = "git-vendor";

2
pkgs/applications/video/mpv/scripts/youtube-quality.nix
View File

@ -5,7 +5,7 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "mpv-playlistmanager";
pname = "mpv-youtube-quality";
version = "unstable-2020-02-11";
src = fetchFromGitHub {

8
pkgs/applications/window-managers/river/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "river";
version = "unstable-2021-05-07";
version = "unstable-2021-06-06";
src = fetchFromGitHub {
owner = "ifreund";
repo = pname;
rev = "7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d";
sha256 = "1z5qjid73lfn654f2k74nwgvpr88fpdfpbzhihybx9cyy1mqfz7j";
rev = "0e9dc089d14e2b5c923d483c62d342af29493cf0";
sha256 = "sha256-2rIZYr9Y+IBrox5MVrPpHeI8OVSXHsMZmcCagsX56lU=";
fetchSubmodules = true;
};
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
zig build -Drelease-safe -Dtarget=${stdenv.hostPlatform.parsed.cpu.name}-native -Dxwayland -Dman-pages --prefix $out install
zig build -Drelease-safe -Dcpu=baseline -Dxwayland -Dman-pages --prefix $out install
runHook postInstall
'';

10
pkgs/data/themes/vimix/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "vimix-gtk-themes";
version = "2020-11-28";
version = "2021-04-25";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "1m84p4cs9dfwc27zfjnwgkfdnfmlzbimq3g5z4mhz23cijm178rf";
sha256 = "0ak763vs27h5z2pgcqpz1g1hypn5gl0p0ylffawc9zdi1wp2mpxb";
};
buildInputs = [ gtk_engines ];
@ -16,16 +16,18 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
installPhase = ''
runHook preInstall
patchShebangs .
mkdir -p $out/share/themes
name= ./install.sh -d $out/share/themes
name= ./install.sh --all --dest $out/share/themes
rm $out/share/themes/*/{AUTHORS,LICENSE}
runHook postInstall
'';
meta = with lib; {
description = "Flat Material Design theme for GTK based desktop environments";
homepage = "https://github.com/vinceliuice/vimix-gtk-themes";
license = licenses.gpl3;
license = licenses.gpl3Only;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};

6
pkgs/development/compilers/gcc/10/default.nix
View File

@ -282,11 +282,7 @@ stdenv.mkDerivation ({
maintainers = lib.teams.gcc.members;
platforms =
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
platforms = lib.platforms.unix;
};
}

6
pkgs/development/compilers/gcc/11/default.nix
View File

@ -287,11 +287,7 @@ stdenv.mkDerivation ({
maintainers = lib.teams.gcc.members;
platforms =
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
platforms = lib.platforms.unix;
};
}

6
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -309,11 +309,7 @@ stdenv.mkDerivation ({
maintainers = with lib.maintainers; [ peti veprbl ];
platforms =
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
platforms = lib.platforms.unix;
badPlatforms = [ "x86_64-darwin" ];
};
}

6
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -321,11 +321,7 @@ stdenv.mkDerivation ({
maintainers = with lib.maintainers; [ peti veprbl ];
platforms =
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
platforms = lib.platforms.unix;
badPlatforms = [ "x86_64-darwin" ];
};
}

6
pkgs/development/compilers/gcc/6/default.nix
View File

@ -343,11 +343,7 @@ stdenv.mkDerivation ({
maintainers = with lib.maintainers; [ peti ];
platforms =
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
platforms = lib.platforms.unix;
};
}

6
pkgs/development/compilers/gcc/7/default.nix
View File

@ -296,11 +296,7 @@ stdenv.mkDerivation ({
maintainers = lib.teams.gcc.members;
platforms =
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
platforms = lib.platforms.unix;
};
}

6
pkgs/development/compilers/gcc/8/default.nix
View File

@ -278,11 +278,7 @@ stdenv.mkDerivation ({
maintainers = lib.teams.gcc.members;
platforms =
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
platforms = lib.platforms.unix;
};
}

6
pkgs/development/compilers/gcc/9/default.nix
View File

@ -297,11 +297,7 @@ stdenv.mkDerivation ({
maintainers = lib.teams.gcc.members;
platforms =
lib.platforms.linux ++
lib.platforms.freebsd ++
lib.platforms.illumos ++
lib.platforms.darwin;
platforms = lib.platforms.unix;
};
}

4
pkgs/development/compilers/koka/default.nix
View File

@ -4,12 +4,12 @@
, parsec, process, regex-compat, text, time }:
let
version = "2.1.1";
version = "2.1.4";
src = fetchFromGitHub {
owner = "koka-lang";
repo = "koka";
rev = "v${version}";
sha256 = "sha256-cq+dljfTKJh5NgwQfxQQP9jRcg2PQxxBVEgQ59ll36o=";
sha256 = "sha256-MPMA8ZErEKv1SrkliLsy35k88GrdsPqIK6yokQreIjE=";
fetchSubmodules = true;
};
kklib = stdenv.mkDerivation {

26
pkgs/development/libraries/flatbuffers/1.12.nix Normal file
View File

@ -0,0 +1,26 @@
{ callPackage, fetchpatch, lib, stdenv }:
callPackage ./generic.nix {
version = "1.12.0";
sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g";
patches = [
(fetchpatch {
# Fixed a compilation error with GCC 10.0 to 11.0. June 1, 2020.
# Should be included in the next release after 1.12.0
url = "https://github.com/google/flatbuffers/commit/988164f6e1675bbea9c852e2d6001baf4d1fcf59.patch";
sha256 = "0d8c2bywqmkhdi0a41cry85wy4j58pl0vd6h5xpfqm3fr8w0mi9s";
excludes = [ "src/idl_gen_cpp.cpp" ];
})
(fetchpatch {
# Fixed a compilation error with GCC 10.0 to 11.0. July 6, 2020.
# Should be included in the next release after 1.12.0
url = "https://github.com/google/flatbuffers/pull/6020/commits/44c7a4cf439b0a298720b5a448bcc243a882b0c9.patch";
sha256 = "126xwkvnlc4ignjhxv9jygfd9j6kr1jx39hyk0ddpcmvzfqsccf4";
})
];
preConfigure = lib.optional stdenv.buildPlatform.isDarwin ''
rm BUILD
'';
}

6
pkgs/development/libraries/flatbuffers/2.0.nix Normal file
View File

@ -0,0 +1,6 @@
{ callPackage }:
callPackage ./generic.nix {
version = "2.0.0";
sha256 = "1zbf6bdpps8369r1ql00irxrp58jnalycc8jcapb8iqg654vlfz8";
}

55
pkgs/development/libraries/flatbuffers/default.nix
View File

@ -1,55 +0,0 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
stdenv.mkDerivation rec {
pname = "flatbuffers";
version = "1.12.0";
src = fetchFromGitHub {
owner = "google";
repo = "flatbuffers";
rev = "v${version}";
sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g";
};
patches = [
(fetchpatch {
# Fixed a compilation error with GCC 10.0 to 11.0. June 1, 2020.
# Should be included in the next release after 1.12.0
url = "https://github.com/google/flatbuffers/commit/988164f6e1675bbea9c852e2d6001baf4d1fcf59.patch";
sha256 = "0d8c2bywqmkhdi0a41cry85wy4j58pl0vd6h5xpfqm3fr8w0mi9s";
excludes = [ "src/idl_gen_cpp.cpp" ];
})
(fetchpatch {
# Fixed a compilation error with GCC 10.0 to 11.0. July 6, 2020.
# Should be included in the next release after 1.12.0
url = "https://github.com/google/flatbuffers/pull/6020/commits/44c7a4cf439b0a298720b5a448bcc243a882b0c9.patch";
sha256 = "126xwkvnlc4ignjhxv9jygfd9j6kr1jx39hyk0ddpcmvzfqsccf4";
})
];
preConfigure = lib.optional stdenv.buildPlatform.isDarwin ''
rm BUILD
'';
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" ];
# tests fail to compile
doCheck = false;
# doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
checkTarget = "test";
meta = with lib; {
description = "Memory Efficient Serialization Library";
longDescription = ''
FlatBuffers is an efficient cross platform serialization library for
games and other memory constrained apps. It allows you to directly
access serialized data without unpacking/parsing it first, while still
having great forwards/backwards compatibility.
'';
maintainers = [ maintainers.teh ];
license = licenses.asl20;
platforms = platforms.unix;
homepage = "https://google.github.io/flatbuffers/";
};
}

46
pkgs/development/libraries/flatbuffers/generic.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, version
, sha256
, patches ? [ ]
, preConfigure ? null
}:
stdenv.mkDerivation rec {
pname = "flatbuffers";
inherit version;
src = fetchFromGitHub {
owner = "google";
repo = "flatbuffers";
rev = "v${version}";
inherit sha256;
};
inherit patches preConfigure;
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
];
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
checkTarget = "test";
meta = with lib; {
description = "Memory Efficient Serialization Library";
longDescription = ''
FlatBuffers is an efficient cross platform serialization library for
games and other memory constrained apps. It allows you to directly
access serialized data without unpacking/parsing it first, while still
having great forwards/backwards compatibility.
'';
maintainers = [ maintainers.teh ];
license = licenses.asl20;
platforms = platforms.unix;
homepage = "https://google.github.io/flatbuffers/";
};
}

35
pkgs/development/libraries/pico-sdk/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "pico-sdk";
version = "1.2.0";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = pname;
rev = version;
sha256 = "00z160f7ypws5pzp1ql7xrs3gmjcbw6gywnnq2fiwl47940balns";
};
nativeBuildInputs = [ cmake ];
# SDK contains libraries and build-system to develop projects for RP2040 chip
# We only need to compile pioasm binary
sourceRoot = "source/tools/pioasm";
installPhase = ''
runHook preInstall
mkdir -p $out/lib/pico-sdk
cp -a ../../../* $out/lib/pico-sdk/
chmod 755 $out/lib/pico-sdk/tools/pioasm/build/pioasm
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/raspberrypi/picotool";
description = "SDK provides the headers, libraries and build system necessary to write programs for the RP2040-based devices";
license = licenses.bsd3;
maintainers = with maintainers; [ musfay ];
platforms = platforms.unix;
};
}

4
pkgs/development/ocaml-modules/lwt/default.nix
View File

@ -8,13 +8,13 @@ let inherit (lib) optional versionAtLeast; in
buildDunePackage rec {
pname = "lwt";
version = "5.4.0";
version = "5.4.1";
useDune2 = true;
src = fetchzip {
url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz";
sha256 = "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d";
sha256 = "0cq2qy23sa1a5zk6nja3c652mp29i84yfrkcwks6i8sdqwli36jy";
};
nativeBuildInputs = [ pkg-config ];

7
pkgs/development/php-packages/apcu/default.nix
View File

@ -13,5 +13,10 @@ buildPecl {
makeFlags = [ "phpincludedir=$(dev)/include" ];
outputs = [ "out" "dev" ];
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "Userland cache for PHP";
license = licenses.php301;
homepage = "https://pecl.php.net/package/APCu";
maintainers = teams.php.members;
};
}

9
pkgs/development/php-packages/apcu_bc/default.nix
View File

@ -14,6 +14,11 @@ buildPecl {
mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so
'';
meta.maintainers = lib.teams.php.members;
meta.broken = lib.versionAtLeast php.version "8";
meta = with lib; {
description = "APCu Backwards Compatibility Module";
license = licenses.php301;
homepage = "https://pecl.php.net/package/apcu_bc";
maintainers = teams.php.members;
broken = versionAtLeast php.version "8";
};
}

7
pkgs/development/php-packages/ast/default.nix
View File

@ -6,5 +6,10 @@ buildPecl {
version = "1.0.10";
sha256 = "13s5r1szd80g1mqickghdd38mvjkwss221322mmbrykcfgp4fs30";
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "Exposes the abstract syntax tree generated by PHP";
license = licenses.bsd3;
homepage = "https://pecl.php.net/package/ast";
maintainers = teams.php.members;
};
}

9
pkgs/development/php-packages/couchbase/default.nix
View File

@ -44,6 +44,11 @@ buildPecl {
'')
];
meta.broken = lib.versionAtLeast php.version "8.0";
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "Couchbase Server PHP extension";
license = licenses.asl20;
homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html";
maintainers = teams.php.members;
broken = versionAtLeast php.version "8.0";
};
}

7
pkgs/development/php-packages/igbinary/default.nix
View File

@ -10,5 +10,10 @@ buildPecl {
makeFlags = [ "phpincludedir=$(dev)/include" ];
outputs = [ "out" "dev" ];
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "Binary serialization for PHP";
license = licenses.bsd3;
homepage = "https://github.com/igbinary/igbinary/";
maintainers = teams.php.members;
};
}

7
pkgs/development/php-packages/imagick/default.nix
View File

@ -23,5 +23,10 @@ buildPecl {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pcre2 ];
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "Imagick is a native php extension to create and modify images using the ImageMagick API";
license = licenses.php301;
homepage = "https://pecl.php.net/package/imagick";
maintainers = teams.php.members;
};
}

7
pkgs/development/php-packages/mailparse/default.nix
View File

@ -11,5 +11,10 @@ buildPecl {
echo "#define HAVE_MBSTRING 1" >> config.h
'';
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "Mailparse is an extension for parsing and working with email messages";
license = licenses.php301;
homepage = "https://pecl.php.net/package/mailparse";
maintainers = lib.teams.php.members;
};
}

1
pkgs/development/php-packages/maxminddb/default.nix
View File

@ -19,6 +19,7 @@ buildPecl {
meta = with lib; {
description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader";
license = with licenses; [ asl20 ];
homepage = "https://github.com/maxmind/MaxMind-DB-Reader-php";
maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members;
};
}

7
pkgs/development/php-packages/memcached/default.nix
View File

@ -26,5 +26,10 @@ buildPecl {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ cyrus_sasl zlib ];
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "PHP extension for interfacing with memcached via libmemcached library";
license = licenses.php301;
homepage = "https://github.com/php-memcached-dev/php-memcached";
maintainers = teams.php.members;
};
}

7
pkgs/development/php-packages/mongodb/default.nix
View File

@ -17,5 +17,10 @@ buildPecl {
pcre2
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "MongoDB driver for PHP";
license = licenses.asl20;
homepage = "https://docs.mongodb.com/drivers/php/";
maintainers = teams.php.members;
};
}

7
pkgs/development/php-packages/oci8/default.nix
View File

@ -11,5 +11,10 @@ buildPecl {
sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${oracle-instantclient.dev}/include"|' config.m4
'';
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "Extension for Oracle Database";
license = licenses.php301;
homepage = "https://pecl.php.net/package/oci8";
maintainers = teams.php.members;
};
}

7
pkgs/development/php-packages/pcov/default.nix
View File

@ -8,5 +8,10 @@ buildPecl {
buildInputs = [ pcre2 ];
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "A self contained php-code-coverage compatible driver for PHP.";
license = licenses.php301;
homepage = "https://github.com/krakjoe/pcov";
maintainers = teams.php.members;
};
}

1
pkgs/development/php-packages/pdlib/default.nix
View File

@ -19,6 +19,7 @@ buildPecl {
meta = with lib; {
description = "A PHP extension for Dlib";
license = with licenses; [ mit ];
homepage = "https://github.com/goodspb/pdlib";
maintainers = lib.teams.php.members;
};
}

7
pkgs/development/php-packages/pdo_sqlsrv/default.nix
View File

@ -10,5 +10,10 @@ buildPecl {
buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "Microsoft Drivers for PHP for SQL Server";
license = licenses.mit;
homepage = "https://github.com/Microsoft/msphpsql";
maintainers = teams.php.members;
};
}

9
pkgs/development/php-packages/php_excel/default.nix
View File

@ -20,6 +20,11 @@ buildPecl {
"--with-libxl-libdir=${libxl}/lib"
];
meta.broken = lib.versionAtLeast php.version "8.0";
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "PHP Extension interface to the Excel writing/reading library";
license = licenses.php301;
homepage = "https://github.com/iliaal/php_excel";
maintainers = lib.teams.php.members;
broken = lib.versionAtLeast php.version "8.0";
};
}

4
pkgs/development/php-packages/phpmd/default.nix
View File

@ -2,8 +2,6 @@
let
pname = "phpmd";
version = "2.8.2";
isPhp74 = lib.versionAtLeast php.version "7.4";
in
mkDerivation {
inherit pname version;
@ -28,6 +26,6 @@ mkDerivation {
license = licenses.bsd3;
homepage = "https://phpmd.org/";
maintainers = teams.php.members;
broken = !isPhp74;
broken = versionAtLeast php.version "7.4";
};
}

1
pkgs/development/php-packages/pinba/default.nix
View File

@ -17,6 +17,7 @@ buildPecl {
Pinba is a MySQL storage engine that acts as a realtime monitoring and
statistics server for PHP using MySQL as a read-only interface.
'';
license = licenses.lgpl2Plus;
homepage = "http://pinba.org/";
maintainers = teams.php.members;
};

1
pkgs/development/php-packages/rdkafka/default.nix
View File

@ -15,6 +15,7 @@ buildPecl {
meta = with lib; {
description = "Kafka client based on librdkafka";
license = licenses.mit;
homepage = "https://github.com/arnaud-lb/php-rdkafka";
maintainers = teams.php.members;
};

7
pkgs/development/php-packages/redis/default.nix
View File

@ -14,5 +14,10 @@ buildPecl {
hash
];
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "PHP extension for interfacing with Redis";
license = licenses.php301;
homepage = "https://github.com/phpredis/phpredis/";
maintainers = teams.php.members;
};
}

7
pkgs/development/php-packages/smbclient/default.nix
View File

@ -10,5 +10,10 @@ buildPecl {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ samba ];
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "PHP wrapper for libsmbclient";
license = licenses.bsd2;
homepage = "https://github.com/eduardok/libsmbclient-php";
maintainers = teams.php.members;
};
}

7
pkgs/development/php-packages/sqlsrv/default.nix
View File

@ -10,5 +10,10 @@ buildPecl {
unixODBC
] ++ lib.optionals stdenv.isDarwin [ libiconv ];
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "Microsoft Drivers for PHP for SQL Server";
license = licenses.mit;
homepage = "https://github.com/Microsoft/msphpsql";
maintainers = teams.php.members;
};
}

7
pkgs/development/php-packages/xdebug/default.nix
View File

@ -11,5 +11,10 @@ buildPecl {
zendExtension = true;
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "Provides functions for function traces and profiling";
license = licenses.php301;
homepage = "https://xdebug.org/";
maintainers = teams.php.members;
};
}

7
pkgs/development/php-packages/yaml/default.nix
View File

@ -10,5 +10,10 @@ buildPecl {
nativeBuildInputs = [ pkg-config ];
meta.maintainers = lib.teams.php.members;
meta = with lib; {
description = "YAML-1.1 parser and emitter";
license = licenses.mit;
homepage = "http://bd808.com/pecl-file_formats-yaml/";
maintainers = teams.php.members;
};
}

19
pkgs/development/python-modules/aioguardian/default.nix
View File

@ -5,7 +5,7 @@
, asynctest
, buildPythonPackage
, fetchFromGitHub
, poetry
, poetry-core
, pytest-aiohttp
, pytest-asyncio
, pytestCheckHook
@ -27,7 +27,9 @@ buildPythonPackage rec {
format = "pyproject";
nativeBuildInputs = [ poetry ];
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
@ -44,8 +46,17 @@ buildPythonPackage rec {
pytestCheckHook
];
# Ignore the examples as they are prefixed with test_
pytestFlagsArray = [ "--ignore examples/" ];
postPatch = ''
# https://github.com/bachya/aioguardian/pull/66
substituteInPlace pyproject.toml \
--replace 'asyncio_dgram = "^1.0.1"' 'asyncio_dgram = "^2.0.0"'
# https://github.com/bachya/aioguardian/pull/67
substituteInPlace pyproject.toml \
--replace "poetry>=0.12" "poetry-core"
'';
disabledTestPaths = [ "examples/" ];
pythonImportsCheck = [ "aioguardian" ];
meta = with lib; {

4
pkgs/development/python-modules/asyncio-dgram/default.nix
View File

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "asyncio-dgram";
version = "1.2.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "jsbronder";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wgcL/BdNjzitkkaGyRUQbW1uv1enLDnHk30YHClK58o=";
sha256 = "sha256-EL3iOoCfLAtfdMI1J2XMf4izOEo9+a+0PNQs+4HuEfo=";
};
# OSError: AF_UNIX path too long

4
pkgs/development/python-modules/mcstatus/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "mcstatus";
version = "5.2.0";
version = "6.0.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Dinnerbone";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RlqzeixaHgyIl/7mMRkZAEsqJEP79Bz1bDGAU8PIetU=";
sha256 = "sha256-YBtVWcOZDt2jQB9bHDrSCP9f2OC+IHzJKlBBGorLnZU=";
};
propagatedBuildInputs = [

18
pkgs/development/python-modules/pipx/default.nix
View File

@ -6,13 +6,12 @@
, argcomplete
, packaging
, importlib-metadata
, colorama
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pipx";
version = "0.16.2.1";
version = "0.16.3";
disabled = pythonOlder "3.6";
@ -21,14 +20,13 @@ buildPythonPackage rec {
owner = "pipxproject";
repo = pname;
rev = version;
sha256 = "1agdp8j4lw6z0lk2vv1m8d49r5vwfkpal3hdgq67vnjyp9904pf6";
sha256 = "1w5pzn5mgl9rr9zbmqza5is4mvjvcgjps1q9qa1mvbnyvakdkr4c";
};
propagatedBuildInputs = [
userpath
argcomplete
packaging
colorama
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
@ -39,9 +37,17 @@ buildPythonPackage rec {
export HOME=$(mktemp -d)
'';
# disable tests, which require internet connection
pytestFlagsArray = [ "--ignore=tests/test_install_all_packages.py" ];
pytestFlagsArray = [
"--ignore=tests/test_install_all_packages.py"
# start local pypi server and use in tests
"--net-pypiserver"
];
disabledTests = [
# disable tests which are difficult to emulate due to shell manipulations
"path_warning"
"script_from_internet"
"ensure_null_pythonpath"
# disable tests, which require internet connection
"install"
"inject"
"ensure_null_pythonpath"

4
pkgs/development/python-modules/pylutron-caseta/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pylutron-caseta";
version = "0.10.0";
version = "0.11.0";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "gurumitts";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wKnca9sMdjvxxAW5YwLZFK/skmE6QMZG99HZRR3BIzw=";
sha256 = "sha256-2w8kRSZK9Bq3O6r6i0CJgxEXGo8KsWah9bMLlDNzMGk=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/skytemple-dtef/default.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "skytemple-dtef";
version = "1.1.2";
version = "1.1.3";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
rev = version;
sha256 = "177ydif01fai6z5yhgpa27pzfgabblzhl8nsczczcmw74vxqwzyc";
sha256 = "0hisg7gq6ph0as9vvx2p1h104bn6x2kx8y477p9zcqc71f3yrx82";
};
propagatedBuildInputs = [ skytemple-files ];

4
pkgs/development/tools/esbuild/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.12.6";
version = "0.12.7";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-ncRHsYxG4XVT7TUJv+VgXMsLmQ52+/dXUlgMy8QnzNc=";
sha256 = "sha256-LHM3dlVfwgA1HJPg/77Er/RWEDVmmQuuhrS5KzTAtV0=";
};
vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";

23
pkgs/development/tools/just/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rcHS0QchUzgcSVIw01x0p1lU/q2CqC5QAwLSFuBTPtE=";
sha256 = "sha256-C0W5oMnKlQ5hg/0YLKZKiQfLghJ7yAJYW6k0G6eOFQE=";
};
cargoSha256 = "sha256-LZL95AFzbWhdWPGjJr7lZORtVOUdz8lno0T8xSkblHU=";
cargoSha256 = "sha256-TqvUunBFpKIog0pG85M/JLz8orncgbRqnQolseXYSo4=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec {
# USER must not be empty
export USER=just-user
export USERNAME=just-user
export JUST_CHOOSER="${coreutils}/bin/cat"
# Prevent string.rs from being changed
cp tests/string.rs $TMPDIR/string.rs
@ -38,22 +39,22 @@ rustPlatform.buildRustPackage rec {
sed -i src/justfile.rs \
-i tests/*.rs \
-e "s@/bin/echo@${coreutils}/bin/echo@g" \
-e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \
-e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" \
-e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g"
-e "s@/usr/bin/env@${coreutils}/bin/env@g"
# Return unchanged string.rs
cp $TMPDIR/string.rs tests/string.rs
'';
# Skip "edit" when running "cargo test", since this test case needs "cat" and "vim".
# Skip "choose" when running "cargo test", since this test case needs "fzf".
checkFlags = [ "--skip=choose" "--skip=edit" ];
checkFlags = [
"--skip=edit" # trying to run "vim" fails as there's no /usr/bin/env or which in the sandbox to find vim and the dependency is not easily patched
"--skip=run_shebang" # test case very rarely fails with "Text file busy"
];
meta = with lib; {
description = "A handy way to save and run project-specific commands";
homepage = "https://github.com/casey/just";
changelog = "https://github.com/casey/just/blob/v${version}/CHANGELOG.md";
description = "A handy way to save and run project-specific commands";
license = licenses.cc0;
maintainers = with maintainers; [ xrelkd ];
maintainers = with maintainers; [ xrelkd jk ];
};
}

31
pkgs/development/tools/picotool/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1, pico-sdk }:
stdenv.mkDerivation rec {
pname = "picotool";
version = "1.0.1";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = pname;
rev = version;
sha256 = "1k5j742sj91akdrgnd3wa5csqb638dgaz0c09zsr22fcqz0qhzig";
};
buildInputs = [ libusb1 pico-sdk ];
nativeBuildInputs = [ cmake pkg-config ];
cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ];
installPhase = ''
runHook preInstall
install -Dm755 ./picotool -t $out/bin
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/raspberrypi/picotool";
description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary";
license = licenses.bsd3;
maintainers = with maintainers; [ musfay ];
platforms = platforms.unix;
};
}

6
pkgs/development/tools/rust/rust-analyzer/default.nix
View File

@ -6,14 +6,14 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2021-05-31";
cargoSha256 = "sha256-atfpcP3esMQQ2lOFTKksQH1nV78KAic51XZi+R++vHg=";
version = "2021-06-07";
cargoSha256 = "sha256-TyoCu2Q4Tr2EIWxQcjSxASni4dkeEVsfrF5UN7IVxSs=";
src = fetchFromGitHub {
owner = "rust-analyzer";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-v2zS9qnvNrImQ3UqU80YagwLJKkVxwvwMMISimFbMOI=";
sha256 = "sha256-f8jdBL42+bU8KKchkW4fF6+kDBjgpoOZyP5yOYsebBk=";
};
buildAndTestSubdir = "crates/rust-analyzer";

917
pkgs/development/tools/wasm-bindgen-cli/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

18
pkgs/development/tools/wasm-bindgen-cli/default.nix
View File

@ -1,10 +1,17 @@
{ rustPlatform, fetchFromGitHub, lib, openssl, pkg-config, stdenv, curl, Security
{ rustPlatform
, fetchFromGitHub
, lib
, openssl
, pkg-config
, stdenv
, curl
, Security
, runCommand
}:
rustPlatform.buildRustPackage rec {
pname = "wasm-bindgen-cli";
version = "0.2.73";
version = "0.2.74";
src =
let
@ -12,9 +19,10 @@ rustPlatform.buildRustPackage rec {
owner = "rustwasm";
repo = "wasm-bindgen";
rev = version;
sha256 = "sha256-JrfS9Z/ZqhoZXJxrxMSLpl2NiktTUkjW6q3xN9AU2zw=";
hash = "sha256-GsraYfWzUZjFpPpufTyXF0i2llBzjh04iTKio6m4NRA=";
};
in runCommand "source" { } ''
in
runCommand "source" { } ''
cp -R ${tarball} $out
chmod -R +w $out
cp ${./Cargo.lock} $out/Cargo.lock
@ -23,7 +31,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "sha256-GUdoOms4FrNmPkELFX1PXcU/ww7CSN8JGHoCvnm73PQ=";
cargoHash = "sha256-djeI7kSGRHMpXnsbVlM2CDek02u5tFAsyAdHwbKC0y8=";
cargoBuildFlags = [ "-p" pname ];
meta = with lib; {

2
pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
View File

@ -228,6 +228,7 @@ in rec {
yarnNix ? mkYarnNix { inherit yarnLock; },
yarnFlags ? defaultYarnFlags,
yarnPreBuild ? "",
yarnPostBuild ? "",
pkgConfig ? {},
extraBuildInputs ? [],
publishBinsFor ? null,
@ -249,6 +250,7 @@ in rec {
deps = mkYarnModules {
name = "${safeName}-modules-${version}";
preBuild = yarnPreBuild;
postBuild = yarnPostBuild;
workspaceDependencies = workspaceDependenciesTransitive;
inherit packageJSON pname version yarnLock yarnNix yarnFlags pkgConfig;
};

4
pkgs/development/web/cypress/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cypress";
version = "7.4.0";
version = "7.5.0";
src = fetchzip {
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
sha256 = "1xhjmn6cwpdph12k4gbl2f1v72bp689779l5i16i90i01m31kwjp";
sha256 = "07i475b17v8qazdq6qzjqsdfpvhg1b8x1p5a51hwhcxaym3p5njj";
};
passthru.updateScript = ./update.sh;

6
pkgs/games/rpg-cli/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rpg-cli";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "facundoolano";
repo = pname;
rev = version;
sha256 = "sha256-pcVxUX6CPIE5GJniXbAiwZQjwv2eer8LevFl6gASKmM=";
sha256 = "0rbj27zd7ydkvnyszd56hazj64aqqrwn34fsy4jymk50lvicwxjg";
};
cargoSha256 = "sha256-4DB3Zj9awmKX5t1zCgWxetz/+tl6ojpCEKxWpZFlMcw=";
cargoSha256 = "sha256-VftJgRqrFwTElp2/e+zQYZOLZPjbc9C8SZ4DlBEtRvQ=";
# tests assume the authors macbook, and thus fail
doCheck = false;

6
pkgs/games/shattered-pixel-dungeon/default.nix
View File

@ -10,15 +10,15 @@
let
pname = "shattered-pixel-dungeon";
version = "0.9.2b";
version = "0.9.3";
src = fetchFromGitHub {
owner = "00-Evan";
repo = "shattered-pixel-dungeon";
# NOTE: always use the commit sha, not the tag. Tags _will_ disappear!
# https://github.com/00-Evan/shattered-pixel-dungeon/issues/596
rev = "eba806ef561921b86637cf26818e095556edec0d";
sha256 = "05m4sfchccr437pxjvgzjk6nd9r3n4c4p3q8lxcc5pj6qrppk49j";
rev = "785c869f2b61013a15fddbf5f0c65d67fe900e80";
sha256 = "sha256-d7Fc1IPOW/0RwLYe9vwaD3gFw6div2/J0DOFdWYDXWY=";
};
postPatch = ''

28
pkgs/games/xsnow/default.nix
View File

@ -1,26 +1,26 @@
{ lib, stdenv, fetchurl, libXt, libXpm, libXext, imake, gccmakedep }:
{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3-x11, libXt, libXpm }:
stdenv.mkDerivation rec {
version = "1.42";
pname = "xsnow";
version = "3.3.0";
src = fetchurl {
url = "https://janswaal.home.xs4all.nl/Xsnow/${pname}-${version}.tar.gz";
sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh";
url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz";
sha256 = "1xnpqbamhglv7xsxzlrlpvsz6bbzlrvdpn5x2n9baww9kcrkbwjg";
};
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [
libXt libXpm libXext
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk3-x11 libxml2 libXt libXpm ];
makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
makeFlags = [ "gamesdir=$(out)/bin" ];
meta = {
enableParallelBuilding = true;
meta = with lib; {
description = "An X-windows application that will let it snow on the root, in between and on windows";
homepage = "http://janswaal.home.xs4all.nl/Xsnow/";
license = lib.licenses.unfree;
maintainers = [ lib.maintainers.robberer ];
homepage = "https://ratrabbit.nl/ratrabbit/xsnow/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ robberer ];
platforms = platforms.unix;
};
}

4
pkgs/misc/vscode-extensions/terraform/default.nix
View File

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

4
pkgs/os-specific/linux/cpufrequtils/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tools to display or change the CPU governor settings";
homepage = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html";
license = licenses.gpl2;
platforms = platforms.linux;
license = licenses.gpl2Only;
platforms = [ "x86_64-linux" ];
};
}

9
pkgs/os-specific/linux/iio-sensor-proxy/default.nix
View File

@ -1,15 +1,16 @@
{ lib, stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake
{ lib, stdenv, fetchFromGitLab, autoconf-archive, gettext, libtool, intltool, autoconf, automake
, glib, gtk3, gtk-doc, libgudev, pkg-config, systemd }:
stdenv.mkDerivation rec {
pname = "iio-sensor-proxy";
version = "2.8";
version = "3.0";
src = fetchFromGitHub {
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "hadess";
repo = pname;
rev = version;
sha256 = "07rzm1z2p6lh4iv5pyp0p2x5805m9gsh19kcsjls3fi25p3a2c00";
sha256 = "0ngbz1vkbjci3ml6p47jh6c6caipvbkm8mxrc8ayr6vc2p9l1g49";
};
configurePhase = ''

34
pkgs/os-specific/linux/veikk-linux-driver/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib, stdenv, fetchFromGitHub, kernel }:
stdenv.mkDerivation rec {
pname = "veikk-linux-driver";
version = "2.0";
src = fetchFromGitHub {
owner = "jlam55555";
repo = pname;
rev = "v${version}";
sha256 = "11mg74ds58jwvdmi3i7c4chxs6v9g09r9ll22pc2kbxjdnrp8zrn";
};
nativeBuildInputs = kernel.moduleBuildDependencies;
buildInputs = [ kernel ];
buildPhase = ''
make BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
'';
installPhase = ''
mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/veikk
install -Dm755 veikk.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/veikk
'';
meta = with lib; {
description = "Linux driver for VEIKK-brand digitizers";
homepage = "https://github.com/jlam55555/veikk-linux-driver/";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ nicbk ];
};
}

13
pkgs/servers/gemini/agate/default.nix
View File

@ -2,26 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "agate";
version = "3.0.3";
version = "3.1.0";
src = fetchFromGitHub {
owner = "mbrubeck";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0sh9OuX52kvhTt681uZesOUttrxH8ZMxn6mTILQDQuU=";
sha256 = "sha256-miIMz4Lk4R5So96Ceqe1Fl5ozpf47qWq0GgtKFDDCCA=";
};
cargoSha256 = "sha256-JBmSa2sc/eor0bCcIMhGGLmcJN+wCloP0Ao9DBybQbc=";
cargoSha256 = "sha256-NZpqCl37dZUvXmn4Q1Pvbz3LSxk1s0s5x1CBO0POA/4=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
checkFlags = [
# Username and Password use the same ports and causes collision
# https://github.com/mbrubeck/agate/issues/50
"--skip username"
"--skip password"
];
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck

4
pkgs/servers/monitoring/grafana-image-renderer/default.nix
View File

@ -10,13 +10,13 @@
mkYarnPackage rec {
name = "grafana-image-renderer";
version = "2.1.0";
version = "3.0.0";
src = fetchFromGitHub {
owner = "grafana";
repo = "grafana-image-renderer";
rev = "v${version}";
sha256 = "sha256-loWLbeu8h0fhMcUzmeYVSw4x6R0GVfqwb/vHwCNT/fM=";
sha256 = "sha256-wg+cMAMqj4JORh5LPJnNELgsJYAxVgz2YPOl87WWda4=";
};
buildPhase = ''

1
pkgs/servers/monitoring/grafana-image-renderer/package.json
View File

@ -21,6 +21,7 @@
"@grpc/grpc-js": "^1.0",
"@grpc/proto-loader": "^0.5.4",
"@hapi/boom": "^9.1.0",
"chokidar": "^3.5.1",
"eslint": "^7.13.0",
"express": "^4.16.3",
"express-prom-bundle": "^5.1.5",

69
pkgs/servers/monitoring/grafana-image-renderer/yarn.lock
View File

@ -373,6 +373,14 @@ any-observable@^0.3.0:
resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
anymatch@~3.1.1:
version "3.1.2"
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
dependencies:
normalize-path "^3.0.0"
picomatch "^2.0.4"
aproba@^1.0.3:
version "1.2.0"
resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@ -442,6 +450,11 @@ basic-auth@~2.0.1:
dependencies:
safe-buffer "5.1.2"
binary-extensions@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
bintrees@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524"
@ -480,7 +493,7 @@ brace-expansion@^1.1.7:
balanced-match "^1.0.0"
concat-map "0.0.1"
braces@^3.0.1:
braces@^3.0.1, braces@~3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@ -557,6 +570,21 @@ chalk@^4.0.0, chalk@^4.1.0:
ansi-styles "^4.1.0"
supports-color "^7.1.0"
chokidar@^3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
dependencies:
anymatch "~3.1.1"
braces "~3.0.2"
glob-parent "~5.1.0"
is-binary-path "~2.1.0"
is-glob "~4.0.1"
normalize-path "~3.0.0"
readdirp "~3.5.0"
optionalDependencies:
fsevents "~2.3.1"
chownr@^1.1.1:
version "1.1.4"
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@ -1281,6 +1309,11 @@ fs.realpath@^1.0.0:
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
fsevents@~2.3.1:
version "2.3.2"
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
function-bind@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@ -1327,7 +1360,7 @@ github-from-package@0.0.0:
resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
glob-parent@^5.0.0, glob-parent@^5.1.0:
glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
version "5.1.2"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@ -1570,6 +1603,13 @@ is-arrayish@^0.3.1:
resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
is-binary-path@~2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
dependencies:
binary-extensions "^2.0.0"
is-core-module@^2.2.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887"
@ -1604,7 +1644,7 @@ is-fullwidth-code-point@^3.0.0:
resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
is-glob@^4.0.0, is-glob@^4.0.1:
is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@ -2046,7 +2086,7 @@ noop-logger@^0.1.1:
resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=
normalize-path@^3.0.0:
normalize-path@^3.0.0, normalize-path@~3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@ -2229,9 +2269,9 @@ path-key@^3.0.0, path-key@^3.1.0:
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
path-parse@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
version "1.0.7"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
path-to-regexp@0.1.7:
version "0.1.7"
@ -2255,7 +2295,7 @@ pend@~1.2.0:
resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
picomatch@^2.2.1, picomatch@^2.2.3:
picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
version "2.2.3"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
@ -2492,6 +2532,13 @@ readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
string_decoder "^1.1.1"
util-deprecate "^1.0.1"
readdirp@~3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
dependencies:
picomatch "^2.2.1"
regexpp@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
@ -3129,9 +3176,9 @@ wrappy@1:
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
ws@^7.2.3:
version "7.4.5"
resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
version "7.4.6"
resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
y18n@^5.0.5:
version "5.0.8"

64
pkgs/servers/monitoring/grafana-image-renderer/yarn.nix
View File

@ -457,6 +457,14 @@
sha1 = "af933475e5806a67d0d7df090dd5e8bef65d119b";
};
}
{
name = "anymatch___anymatch_3.1.2.tgz";
path = fetchurl {
name = "anymatch___anymatch_3.1.2.tgz";
url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz";
sha1 = "c0557c096af32f106198f4f4e2a383537e378716";
};
}
{
name = "aproba___aproba_1.2.0.tgz";
path = fetchurl {
@ -553,6 +561,14 @@
sha1 = "b998279bf47ce38344b4f3cf916d4679bbf51e3a";
};
}
{
name = "binary_extensions___binary_extensions_2.2.0.tgz";
path = fetchurl {
name = "binary_extensions___binary_extensions_2.2.0.tgz";
url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz";
sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d";
};
}
{
name = "bintrees___bintrees_1.0.1.tgz";
path = fetchurl {
@ -673,6 +689,14 @@
sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad";
};
}
{
name = "chokidar___chokidar_3.5.1.tgz";
path = fetchurl {
name = "chokidar___chokidar_3.5.1.tgz";
url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz";
sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a";
};
}
{
name = "chownr___chownr_1.1.4.tgz";
path = fetchurl {
@ -1473,6 +1497,14 @@
sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
};
}
{
name = "fsevents___fsevents_2.3.2.tgz";
path = fetchurl {
name = "fsevents___fsevents_2.3.2.tgz";
url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz";
sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a";
};
}
{
name = "function_bind___function_bind_1.1.1.tgz";
path = fetchurl {
@ -1801,6 +1833,14 @@
sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03";
};
}
{
name = "is_binary_path___is_binary_path_2.1.0.tgz";
path = fetchurl {
name = "is_binary_path___is_binary_path_2.1.0.tgz";
url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz";
sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09";
};
}
{
name = "is_core_module___is_core_module_2.3.0.tgz";
path = fetchurl {
@ -2626,11 +2666,11 @@
};
}
{
name = "path_parse___path_parse_1.0.6.tgz";
name = "path_parse___path_parse_1.0.7.tgz";
path = fetchurl {
name = "path_parse___path_parse_1.0.6.tgz";
url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz";
sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c";
name = "path_parse___path_parse_1.0.7.tgz";
url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz";
sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735";
};
}
{
@ -2881,6 +2921,14 @@
sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198";
};
}
{
name = "readdirp___readdirp_3.5.0.tgz";
path = fetchurl {
name = "readdirp___readdirp_3.5.0.tgz";
url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz";
sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e";
};
}
{
name = "regexpp___regexpp_3.1.0.tgz";
path = fetchurl {
@ -3658,11 +3706,11 @@
};
}
{
name = "ws___ws_7.4.5.tgz";
name = "ws___ws_7.4.6.tgz";
path = fetchurl {
name = "ws___ws_7.4.5.tgz";
url = "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz";
sha1 = "a484dd851e9beb6fdb420027e3885e8ce48986c1";
name = "ws___ws_7.4.6.tgz";
url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz";
sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c";
};
}
{

6
pkgs/shells/zsh/zsh-prezto/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zsh-prezto";
version = "unstable-2021-01-19";
version = "unstable-2021-06-02";
src = fetchFromGitHub {
owner = "sorin-ionescu";
repo = "prezto";
rev = "704fc46c3f83ca1055becce65fb513a533f48982";
sha256 = "0rkbx6hllf6w6x64mggbhvm1fvbq5sr5kvf06sarfkpz5l0a5wh3";
rev = "6833fcd2f2afbc7396ea7a5fa9eb3b49f4678242";
sha256 = "1a8gndj1f8sjnq7clc742lm4qyhp1a2zid6g6lmfr1axhcbn38v6";
fetchSubmodules = true;
};

41
pkgs/stdenv/darwin/fixed-xnu-python3.patch Normal file
View File

@ -0,0 +1,41 @@
diff --git a/bsd/kern/makekdebugevents.py b/bsd/kern/makekdebugevents.py
index 73b2db4..d354ba0 100755
--- a/bsd/kern/makekdebugevents.py
+++ b/bsd/kern/makekdebugevents.py
@@ -5,7 +5,7 @@
# named kd_events[] or these mappings.
# Required to generate a header file used by DEVELOPMENT and DEBUG kernels.
#
-
+
import sys
import re
@@ -21,18 +21,18 @@ code_table = []
# scan file to generate internal table
with open(trace_code_file, 'rt') as codes:
for line in codes:
- m = id_name_pattern.match(line)
- if m:
+ m = id_name_pattern.match(line)
+ if m:
code_table += [(int(m.group(1),base=16), m.group(2))]
# emit typedef:
-print "typedef struct {"
-print " uint32_t id;"
-print " const char *name;"
-print "} kd_event_t;"
+print("typedef struct {")
+print(" uint32_t id;")
+print(" const char *name;")
+print("} kd_event_t;")
# emit structure declaration and sorted initialization:
-print "kd_event_t kd_events[] = {"
+print("kd_event_t kd_events[] = {")
for mapping in sorted(code_table, key=lambda x: x[0]):
- print " {0x%x, \"%s\"}," % mapping
-print "};"
+ print(" {0x%x, \"%s\"}," % mapping)
+print("};")

74
pkgs/stdenv/darwin/make-bootstrap-tools.nix
View File

@ -1,14 +1,20 @@
{ pkgspath ? ../../.., test-pkgspath ? pkgspath, system ? builtins.currentSystem, crossSystem ? null }:
{ pkgspath ? ../../.., test-pkgspath ? pkgspath
, system ? builtins.currentSystem, crossSystem ? null, bootstrapFiles ? null
}:
let cross = if crossSystem != null
then { inherit crossSystem; }
else {};
custom-bootstrap = if bootstrapFiles != null
then { stdenvStages = args:
let args' = args // { bootstrapFiles = bootstrapFiles; };
in (import "${pkgspath}/pkgs/stdenv/darwin" args').stagesDarwin;
}
else {};
in with import pkgspath ({ inherit system; } // cross // custom-bootstrap);
let
pkgs = import pkgspath ({ inherit system; } // (if (crossSystem != null) then { inherit crossSystem; } else {}));
in
with pkgs;
let
llvmPackageSet = if stdenv.hostPlatform.isAarch64 then "llvmPackages_11" else "llvmPackages_7";
llvmPackages = pkgs."${llvmPackageSet}";
llvmPackages = llvmPackages_11;
storePrefixLen = builtins.stringLength builtins.storeDir;
in rec {
coreutils_ = coreutils.override (args: {
@ -26,6 +32,50 @@ in rec {
# Avoid messing with libkrb5 and libnghttp2.
curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; });
# Avoid stdenv rebuild.
Libsystem_ = (darwin.Libsystem.override (args:
{ xnu = darwin.xnu.overrideAttrs (oldAttrs:
{ patches = [ ./fixed-xnu-python3.patch ]; });
})).overrideAttrs (oldAttrs:
{ installPhase = oldAttrs.installPhase + ''
cat <<EOF > $out/include/TargetConditionals.h
#ifndef __TARGETCONDITIONALS__
#define __TARGETCONDITIONALS__
#define TARGET_OS_MAC 1
#define TARGET_OS_WIN32 0
#define TARGET_OS_UNIX 0
#define TARGET_OS_OSX 1
#define TARGET_OS_IPHONE 0
#define TARGET_OS_IOS 0
#define TARGET_OS_WATCH 0
#define TARGET_OS_BRIDGE 0
#define TARGET_OS_TV 0
#define TARGET_OS_SIMULATOR 0
#define TARGET_OS_EMBEDDED 0
#define TARGET_OS_EMBEDDED_OTHER 0 /* Used in configd */
#define TARGET_IPHONE_SIMULATOR TARGET_OS_SIMULATOR /* deprecated */
#define TARGET_OS_NANO TARGET_OS_WATCH /* deprecated */
#define TARGET_CPU_PPC 0
#define TARGET_CPU_PPC64 0
#define TARGET_CPU_68K 0
#define TARGET_CPU_X86 0
#define TARGET_CPU_X86_64 1
#define TARGET_CPU_ARM 0
#define TARGET_CPU_ARM64 0
#define TARGET_CPU_MIPS 0
#define TARGET_CPU_SPARC 0
#define TARGET_CPU_ALPHA 0
#define TARGET_RT_MAC_CFM 0
#define TARGET_RT_MAC_MACHO 1
#define TARGET_RT_LITTLE_ENDIAN 1
#define TARGET_RT_BIG_ENDIAN 0
#define TARGET_RT_64_BIT 1
#endif /* __TARGETCONDITIONALS__ */
EOF
'';
});
build = stdenv.mkDerivation {
name = "stdenv-bootstrap-tools";
@ -37,12 +87,12 @@ in rec {
${lib.optionalString stdenv.targetPlatform.isx86_64 ''
# Copy libSystem's .o files for various low-level boot stuff.
cp -d ${darwin.Libsystem}/lib/*.o $out/lib
cp -d ${Libsystem_}/lib/*.o $out/lib
# Resolv is actually a link to another package, so let's copy it properly
cp -L ${darwin.Libsystem}/lib/libresolv.9.dylib $out/lib
cp -L ${Libsystem_}/lib/libresolv.9.dylib $out/lib
cp -rL ${darwin.Libsystem}/include $out
cp -rL ${Libsystem_}/include $out
chmod -R u+w $out/include
cp -rL ${darwin.ICU}/include* $out/include
cp -rL ${libiconv}/include/* $out/include

6
pkgs/tools/X11/opentabletdriver/default.nix
View File

@ -23,18 +23,18 @@
stdenv.mkDerivation rec {
pname = "OpenTabletDriver";
version = "0.5.3.1";
version = "0.5.3.2";
src = fetchFromGitHub {
owner = "InfinityGhost";
repo = "OpenTabletDriver";
rev = "v${version}";
sha256 = "OT8/c+6wNpZyq/q7uMxIqmyJKNAq0B4ynEAqFF0GWyo=";
sha256 = "qRc/9Edp3x7/XVEWgBbPush76MSQz4biYSk+E9Gt68w=";
};
debPkg = fetchurl {
url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb";
sha256 = "0nm0v1xhphl6g6rz3li4rbdp7408g6sf9l4nh3mbbif5042xa0qh";
sha256 = "14k06iyc642x42yadyfmmf8ky84y8rc6kgd63b4ipskkcxyl1gvl";
};
nativeBuildInputs = [

37
pkgs/tools/X11/opentabletdriver/deps.nix generated
View File

@ -1,43 +1,48 @@
{ fetchNuGet }: [
(fetchNuGet {
name = "AtkSharp";
version = "3.22.25.74";
sha256 = "04zjpjrddw5clac0mjpk0q00rbmv45bh1bsqa4s3pc5pb7fm9cd9";
version = "3.24.24.34";
sha256 = "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs";
})
(fetchNuGet {
name = "CairoSharp";
version = "3.22.25.74";
sha256 = "0sx7vmwcrfbkg3g887v051iklcdmdhh43ndp96nk4bccjimmmwl6";
version = "3.24.24.34";
sha256 = "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz";
})
(fetchNuGet {
name = "Eto.Forms";
version = "2.5.10";
sha256 = "1d71wglk4ixfqfbm6sxmj753x5iwbar8i9zzjy3bh64fy1dn8lz7";
})
(fetchNuGet {
name = "Eto.Forms";
version = "2.5.11";
sha256 = "0h86jc19wy3ssj7pb34w1h02v92mg29gdipszwjs3y15piy66z3s";
})
(fetchNuGet {
name = "Eto.Platform.Gtk";
version = "2.5.10";
sha256 = "1pkqvlfx7bzracnw19bl50i9jg4ym376vihmy9qq7m5z5nfdqn4g";
version = "2.5.11";
sha256 = "1s9njz7l9zghrbzli7lbiav5ss3glqf17npj07f3jldd933nb95j";
})
(fetchNuGet {
name = "GdkSharp";
version = "3.22.25.74";
sha256 = "07sdfvqk2jmyjj7fyd0mikhnzsk52zd3g2dhip8kz3006cczqm81";
version = "3.24.24.34";
sha256 = "0r0x0yib7chwsyrbpvicrfwldwqx5lyqq4p86zaxpmzd6zdaj0x5";
})
(fetchNuGet {
name = "GioSharp";
version = "3.22.25.74";
sha256 = "01l4216bm5jxbxypkkq4d2527c6zd68kbywr3h1lr1darc9nf1d1";
version = "3.24.24.34";
sha256 = "02hxvgjd4w9jpzbkk7qf9q9bkvyp5hfzwxfqp10vg5lpl9yl3xpx";
})
(fetchNuGet {
name = "GLibSharp";
version = "3.22.25.74";
sha256 = "0k2p79z4wcswi528v0ykc37rsqfqi6xd6pl0j4csdj9zf19svgx2";
version = "3.24.24.34";
sha256 = "0kvp033fgdwc8p2abfp5z9pzq66cvwbnjfvr4v4bkpy5s5h181kq";
})
(fetchNuGet {
name = "GtkSharp";
version = "3.22.25.74";
sha256 = "0vazfvkjyzppcynqa1h70s1jmp4vq2j30v5x2scg8n2c5dxaj0k3";
version = "3.24.24.34";
sha256 = "0028hzmmqyfx87qqmaf9cgb5psn7gkbmqvixcid67x1d6mzxjicb";
})
(fetchNuGet {
name = "HidSharpCore";
@ -126,8 +131,8 @@
})
(fetchNuGet {
name = "PangoSharp";
version = "3.22.25.74";
sha256 = "172i1hjpz4rgqlilir8a57kgmciw9x0shz4zwbhhlr59mndvqbih";
version = "3.24.24.34";
sha256 = "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw";
})
(fetchNuGet {
name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl";

34
pkgs/tools/filesystems/bees/default.nix
View File

@ -1,26 +1,35 @@
{ lib, stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils
, python3Packages, util-linux, nixosTests }:
{ lib
, stdenv
, runCommand
, fetchFromGitHub
, bash
, btrfs-progs
, coreutils
, python3Packages
, util-linux
, nixosTests
}:
let
bees = stdenv.mkDerivation rec {
pname = "bees";
version = "0.6.3";
version = "0.6.5";
src = fetchFromGitHub {
owner = "Zygo";
repo = "bees";
rev = "v${version}";
sha256 = "sha256-brEjr7lhmKDCIDeLq+XP+ZTxv1RvwoUlszMSEYygxv8=";
sha256 = "11ppbf23b8ngzfy02am0skxlybzmgsp6kna21jimb01x9pp1q7l7";
};
buildInputs = [
btrfs-progs # for btrfs/ioctl.h
util-linux # for uuid.h
btrfs-progs # for btrfs/ioctl.h
util-linux # for uuid.h
];
nativeBuildInputs = [
python3Packages.markdown # documentation build
python3Packages.markdown # documentation build
];
preBuild = ''
@ -56,11 +65,12 @@ let
in
(runCommand "bees-service" {
inherit bash bees coreutils;
utillinux = util-linux; # needs to be a valid shell variable name
btrfsProgs = btrfs-progs; # needs to be a valid shell variable name
} ''
(runCommand "bees-service"
{
inherit bash bees coreutils;
utillinux = util-linux; # needs to be a valid shell variable name
btrfsProgs = btrfs-progs; # needs to be a valid shell variable name
} ''
mkdir -p -- "$out/bin"
substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper
chmod +x "$out"/bin/bees-service-wrapper

2
pkgs/tools/misc/veikk-linux-driver-gui/default.nix
View File

@ -25,7 +25,7 @@ mkDerivation rec {
meta = with lib; {
description = "Configuration tool for the VEIKK Linux driver";
homepage = "https://github.com/jlam55555/veikk-linux-driver-gui/";
license = licenses.unfree;
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ nicbk ];
};

37
pkgs/tools/networking/notemap/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ lib
, stdenv
, fetchzip
, pkg-config
, libressl
}:
stdenv.mkDerivation rec {
pname = "notemap";
version = "1.3";
src = fetchzip {
url = "https://git.causal.agency/notemap/snapshot/notemap-${version}.tar.gz";
sha256 = "0s9c1xx0iggyzclqw3294bjv7qgvd5l5zgbryks4hvfibr73r6ps";
};
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libressl
];
meta = {
description = "Mirror notes to IMAP";
longDescription = ''
notemap(1) mirrors text files to an IMAP mailbox in a format compatible with the iOS
Notes app. It's intended to make notes managed in git(1) easily accessible
from the phone.
'';
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sternenseemann ];
homepage = "https://git.causal.agency/notemap/about/";
platforms = lib.platforms.unix;
};
}

6
pkgs/tools/security/eid-mw/default.nix
View File

@ -21,11 +21,11 @@
stdenv.mkDerivation rec {
pname = "eid-mw";
# NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.
version = "5.0.21";
version = "5.0.23";
src = fetchFromGitHub {
rev = "v${version}";
sha256 = "1sz7996q6gd6vbdxqgyx1jwjznpki1k9zbgaj1j1a51y6w0g0kdh";
sha256 = "0annkm0hqhkpjmfa6ywvzgn1n9619baqdzdbhjfhzfi4hf7mml1d";
repo = "eid-mw";
owner = "Fedict";
};
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Belgian electronic identity card (eID) middleware";
homepage = "https://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/";
license = licenses.lgpl3;
license = licenses.lgpl3Only;
longDescription = ''
Allows user authentication and digital signatures with Belgian ID cards.
Also requires a running pcscd service and compatible card reader.

56
pkgs/tools/security/rnp/default.nix Normal file
View File

@ -0,0 +1,56 @@
{ lib
, stdenv
, asciidoctor
, botan2
, bzip2
, cmake
, fetchFromGitHub
, gnupg
, gtest
, json_c
, pkg-config
, python3
, zlib
}:
stdenv.mkDerivation rec {
pname = "rnp";
version = "0.15.1";
src = fetchFromGitHub {
owner = "rnpgp";
repo = "rnp";
rev = "v${version}";
sha256 = "1l7y99rcss5w24lil6nqwr0dzh2jvq0qxmdvq7j5yx3fdssd5xsv";
};
buildInputs = [ zlib bzip2 json_c botan2 ];
cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
"-DBUILD_SHARED_LIBS=on"
"-DBUILD_TESTING=on"
"-DDOWNLOAD_GTEST=off"
"-DDOWNLOAD_RUBYRNP=off"
];
nativeBuildInputs = [ asciidoctor cmake gnupg gtest pkg-config python3 ];
# NOTE: check-only inputs should ideally be moved to checkInputs, but it
# would fail during buildPhase.
# checkInputs = [ gtest python3 ];
outputs = [ "out" "lib" "dev" ];
preConfigure = ''
echo "v${version}" > version.txt
'';
meta = with lib; {
homepage = "https://github.com/rnpgp/rnp";
description = "High performance C++ OpenPGP library, fully compliant to RFC 4880";
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ ribose-jeffreylau ];
};
}

19
pkgs/tools/system/zenith/default.nix
View File

@ -1,4 +1,11 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, IOKit }:
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, IOKit
, nvidiaSupport ? false
, makeWrapper
}:
rustPlatform.buildRustPackage rec {
pname = "zenith";
@ -11,12 +18,20 @@ rustPlatform.buildRustPackage rec {
sha256 = "1bn364rmp0q86rd7vgv4n7x09cdf9m4njcaq92jnk85ni6h147ax";
};
cargoBuildFlags = lib.optionals nvidiaSupport [ "--features" "nvidia" ];
cargoSha256 = "0c2mk2bcz4qjyqmf11yqhnhy4pqxr77b3c1gvr5jfmjshx4ff7v2";
nativeBuildInputs = lib.optional nvidiaSupport makeWrapper;
buildInputs = lib.optionals stdenv.isDarwin [ IOKit ];
postInstall = lib.optionalString nvidiaSupport ''
wrapProgram $out/bin/zenith \
--suffix LD_LIBRARY_PATH : "/run/opengl-driver/lib"
'';
meta = with lib; {
description = "Sort of like top or htop but with zoom-able charts, network, and disk usage";
description = "Sort of like top or htop but with zoom-able charts, network, and disk usage"
+ lib.optionalString nvidiaSupport ", and NVIDIA GPU usage";
homepage = "https://github.com/bvaisvil/zenith";
license = licenses.mit;
maintainers = with maintainers; [ bbigras ];

23
pkgs/top-level/all-packages.nix
View File

@ -1275,6 +1275,8 @@ in
barman = python3Packages.callPackage ../tools/misc/barman { };
base16-universal-manager = callPackage ../applications/misc/base16-universal-manager { };
bashate = python3Packages.callPackage ../development/tools/bashate { };
bash-my-aws = callPackage ../tools/admin/bash-my-aws { };
@ -3033,6 +3035,8 @@ in
nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools;
notemap = callPackage ../tools/networking/notemap { };
noteshrink = callPackage ../tools/misc/noteshrink { };
noti = callPackage ../tools/misc/noti {
@ -8314,6 +8318,8 @@ in
rnnoise-plugin = callPackage ../development/libraries/rnnoise-plugin {};
rnp = callPackage ../tools/security/rnp { };
rnv = callPackage ../tools/text/xml/rnv { };
rosie = callPackage ../tools/text/rosie { };
@ -10109,6 +10115,13 @@ in
inherit (darwin.apple_sdk.frameworks) IOKit;
};
# Nvidia support does not require any propietary libraries, so CI can build it.
# Note that when enabling this unconditionally, non-nvidia users will always have an empty "GPU" section.
zenith-nvidia = callPackage ../tools/system/zenith {
inherit (darwin.apple_sdk.frameworks) IOKit;
nvidiaSupport = true;
};
zerotierone = callPackage ../tools/networking/zerotierone { };
zerofree = callPackage ../tools/filesystems/zerofree { };
@ -13748,6 +13761,8 @@ in
phantomjs2 = libsForQt514.callPackage ../development/tools/phantomjs2 { };
picotool = callPackage ../development/tools/picotool { };
pmccabe = callPackage ../development/tools/misc/pmccabe { };
pkgconf-unwrapped = callPackage ../development/tools/misc/pkgconf {};
@ -17520,6 +17535,8 @@ in
physfs_2
physfs;
pico-sdk = callPackage ../development/libraries/pico-sdk { };
pipelight = callPackage ../tools/misc/pipelight {
stdenv = stdenv_32bit;
wine-staging = pkgsi686Linux.wine-staging;
@ -17614,7 +17631,9 @@ in
protozero = callPackage ../development/libraries/protozero { };
flatbuffers = callPackage ../development/libraries/flatbuffers { };
flatbuffers = flatbuffers_2_0;
flatbuffers_2_0 = callPackage ../development/libraries/flatbuffers/2.0.nix { };
flatbuffers_1_12 = callPackage ../development/libraries/flatbuffers/1.12.nix { };
nanopb = callPackage ../development/libraries/nanopb { };
@ -20803,6 +20822,8 @@ in
v86d = callPackage ../os-specific/linux/v86d { };
veikk-linux-driver = callPackage ../os-specific/linux/veikk-linux-driver { };
vendor-reset = callPackage ../os-specific/linux/vendor-reset { };
vhba = callPackage ../misc/emulators/cdemu/vhba.nix { };