Merge master into staging-next

main
github-actions[bot] 2 years ago committed by GitHub
commit c26b313084
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      lib/zip-int-bits.nix
  2. 6
      maintainers/maintainer-list.nix
  3. 2
      nixos/modules/i18n/input-method/ibus.nix
  4. 1
      nixos/modules/services/system/cachix-agent/default.nix
  5. 8
      pkgs/applications/audio/easyeffects/default.nix
  6. 40
      pkgs/applications/audio/myxer/default.nix
  7. 2
      pkgs/applications/editors/manuskript/default.nix
  8. 20
      pkgs/applications/graphics/symbolic-preview/default.nix
  9. 4
      pkgs/applications/misc/ausweisapp2/default.nix
  10. 2
      pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
  11. 2
      pkgs/applications/networking/cluster/spacegun/node-composition.nix
  12. 4
      pkgs/applications/networking/cluster/tektoncd-cli/default.nix
  13. 3
      pkgs/applications/office/todoman/default.nix
  14. 6
      pkgs/applications/version-management/gogs/default.nix
  15. 9
      pkgs/applications/virtualization/open-vm-tools/default.nix
  16. 37
      pkgs/development/libraries/cassandra-cpp-driver/default.nix
  17. 4
      pkgs/development/libraries/poppler/default.nix
  18. 9
      pkgs/development/python-modules/keyring/default.nix
  19. 9
      pkgs/development/python-modules/onlykey-solo-python/default.nix
  20. 6
      pkgs/development/python-modules/ormar/default.nix
  21. 2
      pkgs/misc/base16-builder/generate.sh
  22. 2
      pkgs/misc/base16-builder/node-packages.nix
  23. 4
      pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix
  24. 6
      pkgs/servers/tailscale/default.nix
  25. 2
      pkgs/servers/web-apps/cryptpad/generate.sh
  26. 4
      pkgs/tools/admin/exoscale-cli/default.nix
  27. 2
      pkgs/tools/inputmethods/ibus/default.nix
  28. 93
      pkgs/tools/inputmethods/ibus/wrapper.nix
  29. 12
      pkgs/tools/misc/alarm-clock-applet/default.nix
  30. 4
      pkgs/tools/misc/diffoscope/default.nix
  31. 14
      pkgs/tools/misc/fx_cast/default.nix
  32. 117
      pkgs/tools/misc/fx_cast/node-env.nix
  33. 1773
      pkgs/tools/misc/fx_cast/node-packages.nix
  34. 3755
      pkgs/tools/misc/fx_cast/package-lock.json
  35. 41
      pkgs/tools/misc/fx_cast/package.json
  36. 2
      pkgs/tools/misc/yubikey-manager/default.nix
  37. 2
      pkgs/tools/networking/airfield/deps.sh
  38. 2
      pkgs/tools/networking/airfield/node.nix
  39. 3
      pkgs/tools/networking/curl/default.nix
  40. 16
      pkgs/tools/networking/curl/netrc-regression.patch
  41. 4
      pkgs/tools/networking/go-shadowsocks2/default.nix
  42. 2
      pkgs/tools/package-management/nix/common.nix
  43. 3
      pkgs/tools/package-management/nix/default.nix
  44. 1
      pkgs/top-level/aliases.nix
  45. 9
      pkgs/top-level/all-packages.nix

@ -1,5 +1,5 @@
/* Helper function to implement a fallback for the bit operators
`bitAnd`, `bitOr` and `bitXOr` on older nix version.
`bitAnd`, `bitOr` and `bitXor` on older nix version.
See ./trivial.nix
*/
f: x: y:

@ -14796,4 +14796,10 @@
github = "jali-clarke";
githubId = 17733984;
};
npatsakula = {
email = "nikita.patsakula@gmail.com";
name = "Patsakula Nikita";
github = "npatsakula";
githubId = 23001619;
};
}

@ -23,6 +23,8 @@ let
Name=IBus
Type=Application
Exec=${ibusPackage}/bin/ibus-daemon --daemonize --xim ${impanel}
# GNOME will launch ibus using systemd
NotShowIn=GNOME;
'';
};
in

@ -47,6 +47,7 @@ in {
wantedBy = [ "multi-user.target" ];
# don't restart while changing
reloadIfChanged = true;
environment.USER = "root";
serviceConfig = {
Restart = "on-failure";
EnvironmentFile = cfg.credentialsFile;

@ -4,7 +4,7 @@
, fetchFromGitHub
, calf
, fftwFloat
, fmt
, fmt_8
, glib
, gtk4
, itstool
@ -35,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "easyeffects";
version = "6.2.4";
version = "6.2.5";
src = fetchFromGitHub {
owner = "wwmm";
repo = "easyeffects";
rev = "v${version}";
sha256 = "sha256-g/qN1Tafh71HdPLHW43Zva9MK6G+qxSnb1aRisuwdBw=";
sha256 = "sha256-LvTvNBo3aUGUD4vA04YtINFBjTplhmkxj3FlbTZDTA0=";
};
nativeBuildInputs = [
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
buildInputs = [
fftwFloat
fmt
fmt_8
glib
gtk4
libadwaita

@ -1,40 +0,0 @@
{ stdenv
, lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, libpulseaudio
, glib
, pango
, gtk3
}:
rustPlatform.buildRustPackage rec {
pname = "myxer";
version = "1.2.1";
src = fetchFromGitHub {
owner = "Aurailus";
repo = pname;
rev = version;
sha256 = "0bnhpzmx4yyasv0j7bp31q6jm20p0qwcia5bzmpkz1jhnc27ngix";
};
cargoSha256 = "1cyh0nk627sgyr78rcnhj7af5jcahvjkiv5sz7xwqfdhvx5kqsk5";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libpulseaudio glib pango gtk3 ];
# Currently no tests are implemented, so we avoid building the package twice
doCheck = false;
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
description = "A modern Volume Mixer for PulseAudio";
homepage = "https://github.com/Aurailus/Myxer";
license = licenses.gpl3Only;
maintainers = with maintainers; [ erin ];
platforms = platforms.linux;
};
}

@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec {
characters live in.
'';
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.steveej ];
maintainers = [ ];
platforms = lib.platforms.unix;
};
}

@ -1,25 +1,21 @@
{ lib, stdenv, fetchurl, wrapGAppsHook
, cargo, desktop-file-utils, meson, ninja, pkg-config, python3, rustc
, gdk-pixbuf, glib, gtk3, libhandy, libxml2
{ lib, stdenv, fetchurl, wrapGAppsHook4
, cargo, desktop-file-utils, meson, ninja, pkg-config, rustc
, glib, gtk4, libadwaita, libxml2
}:
stdenv.mkDerivation rec {
pname = "symbolic-preview";
version = "0.0.2";
version = "0.0.3";
src = fetchurl {
url = "https://gitlab.gnome.org/World/design/symbolic-preview/uploads/91fd27bb70553c8d6c3ad2a35446ff6e/symbolic-preview-${version}.tar.xz";
sha256 = "1v8l10ppwbjkrq7nvb0wqc3pid6pd8dqpki3jhmjjkmbd7rpdpkq";
url = "https://gitlab.gnome.org/World/design/symbolic-preview/uploads/df71a2eee9ea0c90b3d146e7286fec42/symbolic-preview-${version}.tar.xz";
sha256 = "08g2sbdb1x5z26mi68nmciq6xwv0chvxw6anj1qdfh7npsg0dm4c";
};
nativeBuildInputs = [
cargo desktop-file-utils meson ninja pkg-config python3 rustc wrapGAppsHook
cargo desktop-file-utils meson ninja pkg-config rustc wrapGAppsHook4
];
buildInputs = [ gdk-pixbuf glib gtk3 libhandy libxml2 ];
postPatch = ''
patchShebangs build-aux/meson_post_install.py
'';
buildInputs = [ glib gtk4 libadwaita libxml2 ];
meta = with lib; {
homepage = "https://gitlab.gnome.org/World/design/symbolic-preview";

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "AusweisApp2";
version = "1.22.5";
version = "1.22.7";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = version;
sha256 = "sha256-EuHg8JrI6ZoyTXqD3v4cfk4/NovAj4fF2NY1V2ZF64c=";
sha256 = "sha256-A6nWH/WqFxTEIfOQcTRluAX0ORMNiyxfC/XLC8fmbdI=";
};
nativeBuildInputs = [ cmake pkg-config ];

@ -6,7 +6,7 @@ curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db
curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package-lock.json -o package-lock.json
node2nix \
--nodejs-10 \
--nodejs-12 \
--node-env ../../../../development/node-packages/node-env.nix \
--development \
--input package.json \

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
let
nodeEnv = import ../../../../development/node-packages/node-env.nix {

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
version = "0.23.1";
version = "0.24.0";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-fOq67Cxtb2A9Obh2o5/aFy5bYBnyFKYQDPcpxOXMy1s=";
sha256 = "sha256-mrTtg60LZpRONrEhX53EhSYpfdfGMvPK4WhTHeAKsoQ=";
};
vendorSha256 = null;

@ -69,6 +69,8 @@ buildPythonApplication rec {
"test_missing_cache_dir"
"test_sorting_null_values"
"test_xdg_existant"
] ++ lib.optionals stdenv.isDarwin [
"test_sorting_fields"
];
pythonImportsCheck = [
@ -76,7 +78,6 @@ buildPythonApplication rec {
];
meta = with lib; {
broken = stdenv.isDarwin;
homepage = "https://github.com/pimutils/todoman";
description = "Standards-based task manager based on iCalendar";
longDescription = ''

@ -8,16 +8,16 @@ with lib;
buildGoModule rec {
pname = "gogs";
version = "0.12.6";
version = "0.12.9";
src = fetchFromGitHub {
owner = "gogs";
repo = "gogs";
rev = "v${version}";
sha256 = "sha256-nAMnsRYYS5bZhLDzPdC4sj3rv1kPjckFnLoORY1HqW8=";
sha256 = "sha256-oXIA0JY7+pfXk5RnHWCJEkU9bL+ZIc2oXQrLwa1XHMg=";
};
vendorSha256 = "sha256-U8rzYSLD9XeO5ai3p3OG74kPRI2IAlvOeZhU1Pa1BAI=";
vendorSha256 = "sha256-5AnQ7zF2UK1HNoyr6gwFdVv+KMJEGkjKPpDEpUXckUg=";
subPackages = [ "." ];

@ -2,7 +2,7 @@
, bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto
, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst
, pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which
, libdrm, udev
, libdrm, udev, util-linux
, withX ? true
}:
@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
# Make reboot work, shutdown is not in /sbin on NixOS
sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c
# Fix paths to fuse3 (we do not use fuse2 so that is not modified)
sed -i 's,/bin/fusermount3,${fuse3}/bin/fusermount3,' vmhgfs-fuse/config.c
substituteInPlace services/plugins/vix/foundryToolsDaemon.c \
--replace "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \
--replace "/bin/mount" "${util-linux}/bin/mount"
'';
configureFlags = [

@ -0,0 +1,37 @@
{ fetchFromGitHub,
lib, stdenv,
cmake, zlib, libuv, openssl,
examples ? false
}: stdenv.mkDerivation rec {
pname = "cassandra-cpp-driver";
version = "2.16.2";
src = fetchFromGitHub {
owner = "datastax";
repo = "cpp-driver";
rev = "refs/tags/${version}";
sha256 = "sha256-NAvaRLhEvFjSmXcyM039wLC6IfLws2rkeRpbE5eL/rQ=";
};
LIBUV_ROOT_DIR = "${libuv}/";
nativeBuildInputs = [ cmake ];
buildInputs = [ zlib libuv openssl.dev ];
cmakeFlags = lib.attrsets.mapAttrsToList
(name: value: "-DCASS_BUILD_${name}:BOOL=${if value then "ON" else "OFF"}") {
EXAMPLES = examples;
};
meta = with lib; {
description = "DataStax CPP cassandra driver";
longDescription = ''
A modern, feature-rich and highly tunable C/C++ client
library for Apache Cassandra 2.1+ using exclusively Cassandras
binary protocol and Cassandra Query Language v3.
'';
license = with licenses; [ asl20 ];
platforms = platforms.x86_64;
homepage = "https://docs.datastax.com/en/developer/cpp-driver/";
maintainers = [ maintainers.npatsakula ];
};
}

@ -35,13 +35,13 @@ let
in
stdenv.mkDerivation rec {
pname = "poppler-${suffix}";
version = "22.04.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
version = "22.06.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
sha256 = "sha256-gT+0uQ572mPfUyBcVIYCuucoiHpg9ASKrk29mxkn3v8=";
sha256 = "sha256-oPmqo5GLrXgQOfwwemNWUqFNGzkc1Vm2bt7Evtujxdc=";
};
nativeBuildInputs = [

@ -13,23 +13,22 @@
buildPythonPackage rec {
pname = "keyring";
version = "23.5.1";
version = "23.6.0";
disabled = pythonOlder "3.7";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-3uUCzfGKmCEb70KO6hFFajPABxiy8IUk/Vcnx/Qkv/0=";
hash = "sha256-OsAMJuTJNznhkQMJGpmGqfeWZaeM8VpN8dun6prI2i8=";
};
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
# this should be optional, however, it has a different API
importlib-metadata # see https://github.com/jaraco/keyring/issues/503#issuecomment-798973205
propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [
importlib-metadata
] ++ lib.optionals stdenv.isLinux [
jeepney
secretstorage

@ -1,6 +1,7 @@
{ buildPythonPackage
, click
, ecdsa
, fetchpatch
, fetchPypi
, fido2
, intelhex
@ -19,6 +20,14 @@ buildPythonPackage rec {
sha256 = "sha256-Mbi5So2OgeXjg4Fzg7v2gAJuh1Y7ZCYu8Lrha/7PQfY=";
};
patches = [
# https://github.com/trustcrypto/onlykey-solo-python/pull/2
(fetchpatch {
url = "https://github.com/trustcrypto/onlykey-solo-python/commit/c5a86506f940d4e8fbb670ed665ddca48779cbe9.patch";
hash = "sha256-LhCUR5QH9Je/Nr185HgQxfkCtat8W2Huv62zr5Mlrn4=";
})
];
propagatedBuildInputs = [ click ecdsa fido2 intelhex pyserial pyusb requests ];
# no tests

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "ormar";
version = "0.11.0";
version = "0.11.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -32,8 +32,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "collerek";
repo = pname;
rev = version;
hash = "sha256-I41asBWwOwmi6Yhw/JZ/EcpDWMAoPyxPIGIPiZQV+Yk=";
rev = "refs/tags/${version}";
hash = "sha256-8d27zIlvk3ngLJ0s/5GJ8xv+PcLEu/NeA5LntaVfoAA=";
};
nativeBuildInputs = [

@ -1,6 +1,6 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
exec node2nix --nodejs-10 \
exec node2nix --nodejs-12 \
--input node-packages.json \
--output node-packages-generated.nix \
--supplement-input supplement.json \

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
let
globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix {

@ -17,6 +17,10 @@ appleDerivation {
sed -i -re "s/name = ([a-zA-Z]+);/name = \1; productName = \1;/" file_cmds.xcodeproj/project.pbxproj
'';
# Workaround build failure on -fno-common toolchains:
# duplicate symbol '_chdname' in: ar_io.o tty_subs.o
NIX_CFLAGS_COMPILE = "-fcommon";
# temporary install phase until xcodebuild has "install" support
installPhase = ''
for f in Products/Release/*; do

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "tailscale";
version = "1.24.2";
version = "1.26.0";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
sha256 = "sha256-PBYxbi7KqwZedP1m3W3gbhFR+9UhvTAftGi6eTv05ro=";
sha256 = "sha256-n8g8ciK3QZYeoGdD6SUAkATlklAzjH9QYnXLyOGB1Bw=";
};
vendorSha256 = "sha256-WjAd7EV/9IbrJMGGVbmSkfEUxqmwWEPkB0Yp3rrjCRU=";
vendorSha256 = "sha256-rIYDpGrUPVrDQjiT3zsNmiojNXrIM1wV5/Ci5+lQDqc=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];

@ -6,7 +6,7 @@
cryptpadSrc=$(nix eval '(import ../../../.. {}).cryptpad.src' --raw)
echo "cryptpad src: $cryptpadSrc"
nix-shell -I nixpkgs=../../../.. -p '(nodePackages.override { nodejs = nodejs-10_x; }).bower2nix' --run "bower2nix $cryptpadSrc/bower.json bower-packages.nix"
nix-shell -I nixpkgs=../../../.. -p '(nodePackages.override { nodejs = nodejs-12_x; }).bower2nix' --run "bower2nix $cryptpadSrc/bower.json bower-packages.nix"
set -euo pipefail

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "exoscale-cli";
version = "1.54.0";
version = "1.56.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-uvPJ1cOKMpDf1KfEPkSTWMIMNojUlfpqI1ESomX1MlM=";
sha256 = "sha256-YhVMlGSpigkzwppRnm5or0OErC01Mp93i1/uZcHskcQ=";
};
vendorSha256 = null;

@ -90,6 +90,8 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs --build data/dconf/make-dconf-override-db.sh
cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make .
substituteInPlace bus/services/org.freedesktop.IBus.session.GNOME.service.in --replace "ExecStart=sh" "ExecStart=${runtimeShell}"
substituteInPlace bus/services/org.freedesktop.IBus.session.generic.service.in --replace "ExecStart=sh" "ExecStart=${runtimeShell}"
'';
preAutoreconf = "touch ChangeLog";

@ -1,26 +1,38 @@
{ lib, runCommand, makeWrapper, lndir
, dconf, hicolor-icon-theme, ibus, librsvg, plugins ? []
{ lib
, buildEnv
, makeWrapper
, dconf
, hicolor-icon-theme
, ibus
, librsvg
, plugins ? [ ]
}:
let
buildEnv {
name = "ibus-with-plugins-" + lib.getVersion ibus;
env = {
buildInputs = [ ibus ] ++ plugins;
nativeBuildInputs = [ lndir makeWrapper ];
propagatedUserEnvPackages = [ hicolor-icon-theme ];
paths = [ ibus ] ++ plugins;
inherit (ibus) meta;
};
command = ''
for dir in bin etc lib libexec share; do
mkdir -p "$out/$dir"
for pkg in $paths; do
if [ -d "$pkg/$dir" ]; then
lndir -silent "$pkg/$dir" "$out/$dir"
fi
done
done
paths = [ ibus ] ++ plugins;
pathsToLink = [
"/bin"
"/etc"
"/lib"
"/libexec"
"/share"
# Need to link contents so that the directories are writeable.
"/lib/systemd"
"/share/dbus-1/services"
"/share/systemd/user"
"/share/systemd/user/gnome-session.target.wants"
];
nativeBuildInputs = [
makeWrapper
];
buildInputs = [ ibus ] ++ plugins;
postBuild = ''
for prog in ibus; do
wrapProgram "$out/bin/$prog" \
--set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
@ -59,6 +71,45 @@ let
--suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
--add-flags "--cache=refresh"
done
ibusPackage="${ibus}"
# Update services.
for service in \
"share/dbus-1/services/org.freedesktop.IBus.service" \
"share/systemd/user/org.freedesktop.IBus.session.generic.service" \
"share/systemd/user/org.freedesktop.IBus.session.GNOME.service"
do
unlink "$out/$service"
substitute "$ibusPackage/$service" "$out/$service" --replace "$ibusPackage/bin" "$out/bin"
done
# Re-create relative symbolic links.
for link in \
"$out/share/systemd/user/gnome-session.target.wants/"*
do
target="$link"
until [[ "''${target:0:1}" != "/" ]]; do
target="$(readlink "$target")"
done
unlink "$link"
ln -s "$target" "$link"
done
# Update absolute symbolic links.
for link in \
"$out/lib/systemd/user"
do
target="$(readlink -f "$link")"
relativeTarget="''${target#$ibusPackage/}"
if [[ "$ibusPackage/$relativeTarget" != "$target" ]]; then
>&2 echo "File $link does not point to to a file in $ibusPackage"
exit 1
fi
unlink "$link"
ln -s "$out/$relativeTarget" "$link"
done
'';
in
runCommand name env command
inherit (ibus) meta;
}

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub, fetchpatch
, pkg-config
, autoconf
, automake111x
@ -28,6 +28,16 @@ stdenv.mkDerivation rec {
sha256 = "18blvgy8hmw3jidz7xrv9yiiilnzcj65m6wxhw58nrnbcqbpydwn";
};
patches = [
# Pull patch pending upstream inclusion for -fno-common toolchain support:
# https://github.com/joh/alarm-clock/pull/209
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/joh/alarm-clock/commit/969e7ba8225610cce55b14fcb599bc6f7771bd9a.patch";
sha256 = "0ajhir22b5ww9pkmzy9mlc9f2lr1q6wgvm9iqzjf4xsg4gm4jy1k";
})
];
nativeBuildInputs = [
pkg-config
intltool

@ -11,11 +11,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "214";
version = "215";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-ap+U9b+pCfQ2UwqQDTx0mQ0nvXJsl4D89Q/Ecl7w+8c=";
sha256 = "sha256-OiAuR4uY9m6322d93JMFFQrXMLv6XD3D24j7K7BRl10=";
};
outputs = [ "out" "man" ];

@ -3,14 +3,15 @@
# Update version and hash as usual.
#
# ```
# git clone https://github.com/hensm/fx_cast.git
# cd fx_cast/app
# # Add `"name": "fx_cast_bridge", "version": "...",` to package.json and package-lock.json
# nix run nixpkgs.nodePackages.node2nix -c node2nix -l package-lock.json -d
# cp -v node-*.nix package*.json ~/p/nixpkgs/pkgs/tools/misc/fx_cast/app
# nix run nixpkgs#nodePackages.node2nix -- -c node2nix -l package-lock.json -d
# cp -v node-*.nix package*.json ${nixpkgs_path:?}/pkgs/tools/misc/fx_cast/
# ```
{ pkgs, stdenv }: let
nodeEnv = import ./node-env.nix {
inherit (pkgs) nodejs stdenv lib python2 runCommand writeTextFile;
inherit (pkgs) nodejs stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs;
libtool = if stdenv.isDarwin then pkgs.darwin.cctools else null;
};
@ -22,13 +23,13 @@
in
stdenv.mkDerivation rec {
pname = "fx_cast_bridge";
version = "0.1.2";
version = "0.2.0";
src = pkgs.fetchFromGitHub {
owner = "hensm";
repo = "fx_cast";
rev = "v${version}";
hash = "sha256:1prgk9669xgwkdl39clq0l75n0gnkkpn27gp9rbgl4bafrhvmg9a";
hash = "sha256-bgoItAOIHxGow7TjlRzaMqtIefcSym1h5n6v/9fFZfc=";
};
buildInputs = with pkgs; [
@ -37,7 +38,8 @@ stdenv.mkDerivation rec {
buildPhase = ''
ln -vs ${nodePackages.nodeDependencies}/lib/node_modules app/node_modules
npm run build:app
# The temporary home solves the "failed with exit code 243"
HOME="$(mktemp -d)" npm run build:app
'';
installPhase = ''

@ -1,6 +1,6 @@
# This file originates from node2nix
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
@ -40,36 +40,22 @@ let
'';
};
includeDependencies = {dependencies}:
lib.optionalString (dependencies != [])
(lib.concatMapStrings (dependency:
''
# Bundle the dependencies of the package
mkdir -p node_modules
cd node_modules
# Only include dependencies if they don't exist. They may also be bundled in the package.
if [ ! -e "${dependency.name}" ]
then
${composePackage dependency}
fi
# Common shell logic
installPackage = writeShellScript "install-package" ''
installPackage() {
local packageName=$1 src=$2
cd ..
''
) dependencies);
local strippedName
# Recursively composes the dependencies of a package
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
DIR=$(pwd)
local DIR=$PWD
cd $TMPDIR
unpackFile ${src}
unpackFile $src
# Make the base dir in which the target dependency resides first
mkdir -p "$(dirname "$DIR/${packageName}")"
mkdir -p "$(dirname "$DIR/$packageName")"
if [ -f "${src}" ]
if [ -f "$src" ]
then
# Figure out what directory has been unpacked
packageDir="$(find . -maxdepth 1 -type d | tail -1)"
@ -79,28 +65,53 @@ let
chmod -R u+w "$packageDir"
# Move the extracted tarball into the output folder
mv "$packageDir" "$DIR/${packageName}"
elif [ -d "${src}" ]
mv "$packageDir" "$DIR/$packageName"
elif [ -d "$src" ]
then
# Get a stripped name (without hash) of the source directory.
# On old nixpkgs it's already set internally.
if [ -z "$strippedName" ]
then
strippedName="$(stripHash ${src})"
strippedName="$(stripHash $src)"
fi
# Restore write permissions to make building work
chmod -R u+w "$strippedName"
# Move the extracted directory into the output folder
mv "$strippedName" "$DIR/${packageName}"
mv "$strippedName" "$DIR/$packageName"
fi
# Unset the stripped name to not confuse the next unpack step
unset strippedName
# Change to the package directory to install dependencies
cd "$DIR/$packageName"
}
'';
# Include the dependencies of the package
cd "$DIR/${packageName}"
# Bundle the dependencies of the package
#
# Only include dependencies if they don't exist. They may also be bundled in the package.
includeDependencies = {dependencies}:
lib.optionalString (dependencies != []) (
''
mkdir -p node_modules
cd node_modules
''
+ (lib.concatMapStrings (dependency:
''
if [ ! -e "${dependency.packageName}" ]; then
${composePackage dependency}
fi
''
) dependencies)
+ ''
cd ..
''
);
# Recursively composes the dependencies of a package
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
installPackage "${packageName}" "${src}"
${includeDependencies { inherit dependencies; }}
cd ..
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
@ -246,8 +257,8 @@ let
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
if(![1, 2].includes(packageLock.lockfileVersion)) {
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
process.exit(1);
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
process.exit(1);
}
if(packageLock.dependencies !== undefined) {
@ -379,7 +390,7 @@ let
buildNodePackage =
{ name
, packageName
, version
, version ? null
, dependencies ? []
, buildInputs ? []
, production ? true
@ -391,13 +402,14 @@ let
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, meta ? {}
, ... }@args:
let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
in
stdenv.mkDerivation ({
name = "node_${name}-${version}";
name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isDarwin) libtool
@ -414,6 +426,8 @@ let
passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
installPhase = ''
source ${installPackage}
# Create and enter a root node_modules/ folder
mkdir -p $out/lib/node_modules
cd $out/lib/node_modules
@ -427,6 +441,14 @@ let
if [ -d "$out/lib/node_modules/.bin" ]
then
ln -s $out/lib/node_modules/.bin $out/bin
# Patch the shebang lines of all the executables
ls $out/bin/* | while read i
do
file="$(readlink -f "$i")"
chmod u+rwx "$file"
patchShebangs "$file"
done
fi
# Create symlinks to the deployed manual page folders, if applicable
@ -446,13 +468,18 @@ let
# Run post install hook, if provided
runHook postInstall
'';
meta = {
# default to Node.js' platforms
platforms = nodejs.meta.platforms;
} // meta;
} // extraArgs);
# Builds a node environment (a node_modules folder and a set of binaries)
buildNodeDependencies =
{ name
, packageName
, version
, version ? null
, src
, dependencies ? []
, buildInputs ? []
@ -470,7 +497,7 @@ let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
in
stdenv.mkDerivation ({
name = "node-dependencies-${name}-${version}";
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
@ -486,6 +513,8 @@ let
passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
installPhase = ''
source ${installPackage}
mkdir -p $out/${packageName}
cd $out/${packageName}
@ -498,6 +527,7 @@ let
if [ -f ${src}/package-lock.json ]
then
cp ${src}/package-lock.json .
chmod 644 package-lock.json
fi
''}
@ -520,7 +550,7 @@ let
buildNodeShell =
{ name
, packageName
, version
, version ? null
, src
, dependencies ? []
, buildInputs ? []
@ -536,9 +566,10 @@ let
let
nodeDependencies = buildNodeDependencies args;
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
in
stdenv.mkDerivation {
name = "node-shell-${name}-${version}";
stdenv.mkDerivation ({
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildCommand = ''
@ -557,7 +588,7 @@ let
export NODE_PATH=${nodeDependencies}/lib/node_modules
export PATH="${nodeDependencies}/bin:$PATH"
'';
};
} // extraArgs);
in
{
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -1,8 +1,8 @@
{
"name": "fx_cast_bridge",
"version": "0.1.2",
"version": "0.2.0",
"__applicationName": "fx_cast_bridge",
"__applicationVersion": "0.1.0",
"__applicationVersion": "0.2.0",
"__applicationDirectoryName": "fx_cast",
"__applicationExecutableName": "fx_cast_bridge",
"scripts": {
@ -12,28 +12,29 @@
"remove-manifest": "node bin/install-manifest.js --remove"
},
"dependencies": {
"@types/minimist": "^1.2.1",
"@types/ws": "^7.4.0",
"bplist-creator": "0.0.8",
"bplist-parser": "^0.2.0",
"bplist-creator": "^0.1.0",
"bplist-parser": "^0.3.1",
"castv2": "^0.1.10",
"fast-srp-hap": "^2.0.2",
"mdns": "^2.5.1",
"mime-types": "^2.1.27",
"minimist": "^1.2.5",
"node-fetch": "^2.6.0",
"fast-srp-hap": "^2.0.4",
"mdns": "^2.7.2",
"mime-types": "^2.1.35",
"minimist": "^1.2.6",
"node-fetch": "^3.2.3",
"tweetnacl": "^1.0.3",
"ws": "^7.4.3"
"ws": "^8.5.0"
},
"devDependencies": {
"@types/mdns": "0.0.33",
"@types/mime-types": "^2.1.0",
"@types/node": "^13.13.15",
"@types/node-fetch": "^2.5.7",
"fs-extra": "^9.1.0",
"mustache": "^4.0.1",
"pkg": "^4.4.9",
"typescript": "^4.1.5"
"@types/mdns": "^0.0.34",
"@types/mime-types": "^2.1.1",
"@types/minimist": "^1.2.2",
"@types/node": "^17.0.26",
"@types/node-fetch": "^2.6.1",
"@types/ws": "^8.5.3",
"fs-extra": "^10.1.0",
"mustache": "^4.2.0",
"pkg": "^5.6.0",
"tiny-typed-emitter": "^2.1.0",
"typescript": "^4.6.3"
},
"optionalDependencies": {
"rage-edit": "^1.2.0"

@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'cryptography = "^2.1 || ^3.0"' 'cryptography = "*"'
--replace 'fido2 = ">=0.9, <1.0"' 'fido2 = ">*"'
substituteInPlace "ykman/pcsc/__init__.py" \
--replace 'pkill' '${procps}/bin/pkill'
'';

@ -1,6 +1,6 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
node2nix --nodejs-10 -i deps.json \
node2nix --nodejs-12 -i deps.json \
--no-copy-node-env \
-e ../../../development/node-packages/node-env.nix -c node.nix

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {

@ -3,6 +3,7 @@
, c-aresSupport ? false, c-ares ? null
, gnutlsSupport ? false, gnutls ? null
, gsaslSupport ? false, gsasl ? null
, patchNetrcRegression ? false
, gssSupport ? with stdenv.hostPlatform; (
!isWindows &&
# disable gss becuase of: undefined reference to `k5_bcmp'
@ -77,7 +78,7 @@ stdenv.mkDerivation rec {
# quiche: support ca-fallback
# https://github.com/curl/curl/commit/fdb5e21b4dd171a96cf7c002ee77bb08f8e58021
./7.83.1-quiche-support-ca-fallback.patch
];
] ++ lib.optional patchNetrcRegression ./netrc-regression.patch;
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
separateDebugInfo = stdenv.isLinux;

@ -0,0 +1,16 @@
diff --git a/lib/url.c b/lib/url.c
index a56e4b0..9f29593 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2971,6 +2971,12 @@ static CURLcode override_login(struct Curl_easy *data,
/* don't update the user name below */
userp = NULL;
}
+ /* no user was set but a password, set a blank user */
+ if(userp && !*userp && passwdp && *passwdp) {
+ *userp = strdup("");
+ if(!*userp)
+ return CURLE_OUT_OF_MEMORY;
+ }
}
#endif

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-shadowsocks2";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitHub {
owner = "shadowsocks";
repo = "go-shadowsocks2";
rev = "v${version}";
sha256 = "sha256-ouJGrVribymak4SWaLbGhlp41iuw07VdxCypoBr1hWA=";
sha256 = "sha256-z2+5q8XlxMN7x86IOMJ0qbrW4Wrm1gp8GWew51yBRFg=";
};
vendorSha256 = "sha256-RrHksWET5kicbdQ5HRDWhNxx4rTi2zaVeaPoLdg4uQw=";

@ -1,6 +1,7 @@
{ lib, fetchFromGitHub
, version
, suffix ? ""
, curl
, sha256 ? null
, src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit sha256; }
, patches ? [ ]
@ -23,7 +24,6 @@ in
, bzip2
, callPackage
, coreutils
, curl
, editline
, flex
, gnutar

@ -1,6 +1,7 @@
{ lib
, aws-sdk-cpp
, boehmgc
, curl
, callPackage
, fetchFromGitHub
, fetchurl
@ -31,7 +32,7 @@ let
common = args:
callPackage
(import ./common.nix ({ inherit lib fetchFromGitHub; } // args))
(import ./common.nix ({ inherit lib fetchFromGitHub curl; } // args))
{
inherit Security storeDir stateDir confDir;
boehmgc = boehmgc-nix;

@ -897,6 +897,7 @@ mapAliases ({
mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15
mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative"; # Added 2021-04-15
mysqlWorkbench = throw "'mysqlWorkbench' has been renamed to/replaced by 'mysql-workbench'"; # Converted to throw 2022-02-22
myxer = throw "Myxer has been removed from nixpkgs, as it has been unmaintained since Jul 31, 2021"; # Added 2022-06-08
### N ###

@ -21609,6 +21609,8 @@ with pkgs;
};
cassandra = cassandra_3_11;
cassandra-cpp-driver = callPackage ../development/libraries/cassandra-cpp-driver/default.nix { };
apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix {
java = jre;
};
@ -28856,8 +28858,6 @@ with pkgs;
pamixer = callPackage ../applications/audio/pamixer { };
myxer = callPackage ../applications/audio/myxer { };
ncpamixer = callPackage ../applications/audio/ncpamixer { };
pan = callPackage ../applications/networking/newsreaders/pan { };
@ -29825,9 +29825,7 @@ with pkgs;
sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { };
symbolic-preview = callPackage ../applications/graphics/symbolic-preview {
libhandy = libhandy_0;
};
symbolic-preview = callPackage ../applications/graphics/symbolic-preview { };
symlinks = callPackage ../tools/system/symlinks { };
@ -34180,6 +34178,7 @@ with pkgs;
storeDir = config.nix.storeDir or "/nix/store";
stateDir = config.nix.stateDir or "/nix/var";
inherit (darwin.apple_sdk.frameworks) Security;
curl = curl.override { patchNetrcRegression = true; };
});
nix = nixVersions.stable;

Loading…
Cancel
Save