ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-12-03 18:01:12 +00:00 committed by GitHub
commit 904ed45698
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
47 changed files with 341 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -5972,6 +5972,12 @@
githubId = 3831860;
name = "Arnold Krille";
};
kanashimia = {
email = "chad@redpilled.dev";
github = "kanashimia";
githubId = 56224949;
name = "Mia Kanashi";
};
karantan = {
name = "Gasper Vozel";
email = "karantan@gmail.com";

9
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -57,6 +57,15 @@
new versions will release.
</para>
</listitem>
<listitem>
<para>
The <literal>wafHook</literal> hook now honors
<literal>NIX_BUILD_CORES</literal> when
<literal>enableParallelBuilding</literal> is not set
explicitly. Packages can restore the old behaviour by setting
<literal>enableParallelBuilding=false</literal>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-notable-changes">

6
nixos/doc/manual/release-notes/rl-2205.section.md
View File

@ -10,7 +10,7 @@ In addition to numerous new and upgraded packages, this release has the followin
## Backward Incompatibilities {#sec-release-22.05-incompatibilities}
* `pkgs.ghc` now refers to `pkgs.targetPackages.haskellPackages.ghc`.
- `pkgs.ghc` now refers to `pkgs.targetPackages.haskellPackages.ghc`.
This *only* makes a difference if you are cross-compiling and will
ensure that `pkgs.ghc` always runs on the host platform and compiles
for the target platform (similar to `pkgs.gcc` for example).
@ -22,9 +22,11 @@ In addition to numerous new and upgraded packages, this release has the followin
instead to ensure cross compilation keeps working (or switch to
`haskellPackages.callPackage`).
* `pkgs.emacsPackages.orgPackages` is removed because org elpa is deprecated.
- `pkgs.emacsPackages.orgPackages` is removed because org elpa is deprecated.
The packages in the top level of `pkgs.emacsPackages`, such as org and
org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and
`pkgs.emacsPackages.nongnuPackages` where the new versions will release.
- The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`.
## Other Notable Changes {#sec-release-22.05-notable-changes}

3
nixos/modules/services/networking/lxd-image-server.nix
View File

@ -55,9 +55,8 @@ in
path = "/var/log/lxd-image-server/lxd-image-server.log";
frequency = "daily";
keep = 21;
user = "lxd-image-server";
group = cfg.group;
extraConfig = ''
create 755 lxd-image-server ${cfg.group}
missingok
compress
delaycompress

14
nixos/modules/services/networking/nix-serve.nix
View File

@ -37,8 +37,6 @@ in
nix-store --generate-binary-cache-key key-name secret-key-file public-key-file
```
Make sure user `nix-serve` has read access to the private key file.
For more details see <citerefentry><refentrytitle>nix-store</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
'';
};
@ -61,16 +59,22 @@ in
path = [ config.nix.package.out pkgs.bzip2.bin ];
environment.NIX_REMOTE = "daemon";
environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile;
script = ''
${lib.optionalString (cfg.secretKeyFile != null) ''
export NIX_SECRET_KEY_FILE="$CREDENTIALS_DIRECTORY/NIX_SECRET_KEY_FILE"
''}
exec ${pkgs.nix-serve}/bin/nix-serve --listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}
'';
serviceConfig = {
Restart = "always";
RestartSec = "5s";
ExecStart = "${pkgs.nix-serve}/bin/nix-serve " +
"--listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}";
User = "nix-serve";
Group = "nix-serve";
DynamicUser = true;
LoadCredential = lib.optionalString (cfg.secretKeyFile != null)
"NIX_SECRET_KEY_FILE:${cfg.secretKeyFile}";
};
};
};

19
nixos/modules/services/networking/shairport-sync.nix
View File

@ -53,6 +53,15 @@ in
'';
};
group = mkOption {
type = types.str;
default = "shairport";
description = ''
Group account name under which to run shairport-sync. The account
will be created.
'';
};
};
};
@ -66,14 +75,17 @@ in
services.avahi.publish.enable = true;
services.avahi.publish.userServices = true;
users.users.${cfg.user} =
{ description = "Shairport user";
users = {
users.${cfg.user} = {
description = "Shairport user";
isSystemUser = true;
createHome = true;
home = "/var/lib/shairport-sync";
group = cfg.group;
extraGroups = [ "audio" ] ++ optional config.hardware.pulseaudio.enable "pulse";
};
groups.${cfg.group} = {};
};
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ 5000 ];
@ -87,6 +99,7 @@ in
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = cfg.user;
Group = cfg.group;
ExecStart = "${pkgs.shairport-sync}/bin/shairport-sync ${cfg.arguments}";
RuntimeDirectory = "shairport-sync";
};

2
nixos/modules/services/x11/display-managers/lightdm.nix
View File

@ -312,7 +312,7 @@ in
};
systemd.tmpfiles.rules = [
"d /run/lightdm 0711 lightdm lightdm 0"
"d /run/lightdm 0711 lightdm lightdm -"
"d /var/cache/lightdm 0711 root lightdm -"
"d /var/lib/lightdm 1770 lightdm lightdm -"
"d /var/lib/lightdm-data 1775 lightdm lightdm -"

4
nixos/modules/tasks/snapraid.nix
View File

@ -193,7 +193,6 @@ in
LockPersonality = true;
MemoryDenyWriteExecute = true;
NoNewPrivileges = true;
PrivateDevices = true;
PrivateTmp = true;
ProtectClock = true;
ProtectControlGroups = true;
@ -208,7 +207,8 @@ in
SystemCallArchitectures = "native";
SystemCallFilter = "@system-service";
SystemCallErrorNumber = "EPERM";
CapabilityBoundingSet = "CAP_DAC_OVERRIDE";
CapabilityBoundingSet = "CAP_DAC_OVERRIDE" ++
lib.optionalString cfg.touchBeforeSync " CAP_FOWNER";
ProtectSystem = "strict";
ProtectHome = "read-only";

9
nixos/modules/virtualisation/waydroid.nix
View File

@ -18,7 +18,8 @@ let
/dev/hwbinder = hidl
'';
in {
in
{
options.virtualisation.waydroid = {
enable = mkEnableOption "Waydroid";
@ -36,6 +37,12 @@ in {
(isEnabled "ASHMEM")
];
/* NOTE: we always enable this flag even if CONFIG_PSI_DEFAULT_DISABLED is not on
as reading the kernel config is not always possible and on kernels where it's
already on it will be no-op
*/
boot.kernelParams = [ "psi=1" ];
environment.etc."gbinder.d/waydroid.conf".source = waydroidGbinderConf;
environment.systemPackages = with pkgs; [ waydroid ];

4
nixos/tests/all-tests.nix
View File

@ -315,8 +315,8 @@ in
nginx-sso = handleTest ./nginx-sso.nix {};
nginx-variants = handleTest ./nginx-variants.nix {};
nitter = handleTest ./nitter.nix {};
nix-serve = handleTest ./nix-ssh-serve.nix {};
nix-ssh-serve = handleTest ./nix-ssh-serve.nix {};
nix-serve = handleTest ./nix-serve.nix {};
nix-serve-ssh = handleTest ./nix-serve-ssh.nix {};
nixops = handleTest ./nixops/default.nix {};
nixos-generate-config = handleTest ./nixos-generate-config.nix {};
node-red = handleTest ./node-red.nix {};

2
nixos/tests/nix-ssh-serve.nix → nixos/tests/nix-serve-ssh.nix
View File

@ -35,7 +35,7 @@ in
client.fail("diff /root/other-store$(cat mach-id-path) /etc/machine-id")
# Currently due to shared store this is a noop :(
client.succeed("nix copy --to ssh-ng://nix-ssh@server $(cat mach-id-path)")
client.succeed("nix copy --experimental-features 'nix-command' --to ssh-ng://nix-ssh@server $(cat mach-id-path)")
client.succeed(
"nix-store --realise $(cat mach-id-path) --store /root/other-store --substituters ssh-ng://nix-ssh@server"
)

34
pkgs/applications/audio/qpwgraph/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib, mkDerivation, fetchFromGitLab
, cmake, pkg-config
, alsa-lib, pipewire
}:
mkDerivation rec {
pname = "qpwgraph";
version = "0.0.9";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "rncbc";
repo = "qpwgraph";
rev = "v${version}";
sha256 = "WC2SB6gisRSZxG9WZtMVBzwkEJtPEGZRmezElLAG0ns=";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ alsa-lib pipewire ];
meta = with lib; {
description = "Qt graph manager for PipeWire, similar to QjackCtl.";
longDescription = ''
qpwgraph is a graph manager dedicated for PipeWire,
using the Qt C++ framework, based and pretty much like
the same of QjackCtl.
'';
homepage = "https://gitlab.freedesktop.org/rncbc/qpwgraph";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ kanashimia ];
};
}

2
pkgs/applications/editors/neovim/utils.nix
View File

@ -177,7 +177,7 @@ let
assert withPython -> throw "Python2 support has been removed from neovim, please remove withPython and extraPythonPackages.";
wrapNeovimUnstable neovim (res // {
wrapperArgs = lib.escapeShellArgs res.wrapperArgs + extraMakeWrapperArgs;
wrapperArgs = lib.escapeShellArgs res.wrapperArgs + " " + extraMakeWrapperArgs;
wrapRc = (configure != {});
});
in

24
pkgs/applications/misc/tootle/default.nix
View File

@ -1,8 +1,9 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, fetchpatch
, vala_0_52
, vala
, meson
, ninja
, pkg-config
@ -30,14 +31,27 @@ stdenv.mkDerivation rec {
sha256 = "NRM7GiJA8c5z9AvXpGXtMl4ZaYN2GauEIbjBmoY4pdo=";
};
patches = [
# Adhere to GLib.Object naming conventions for properties
# https://github.com/bleakgrey/tootle/pull/339
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/community/tootle/0001-Adhere-to-GLib.Object-naming-conventions-for-propert.patch?id=001bf1ce9695ddb0bbb58b44433d54207c15b0b5";
sha256 = "sha256-B62PhMRkU8P3jmnIUq1bYWztLtO2oNcDsXnAYbJGpso=";
})
# Use reason_phrase instead of get_phrase
# https://github.com/bleakgrey/tootle/pull/336
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/community/tootle/0002-Use-reason_phrase-instead-of-get_phrase.patch?id=001bf1ce9695ddb0bbb58b44433d54207c15b0b5";
sha256 = "sha256-rm5NFLeAL2ilXpioywgCR9ppoq+MD0MLyVaBmdzVkqU=";
})
];
nativeBuildInputs = [
meson
ninja
pkg-config
python3
# Does not build with vala 0.54
# https://github.com/bleakgrey/tootle/issues/337
vala_0_52
vala
wrapGAppsHook
];

6
pkgs/applications/networking/cluster/argocd/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "argocd";
version = "2.1.6";
commit = "a346cf933e10d872eae26bff8e58c5e7ac40db25";
version = "2.1.7";
commit = "a408e299ffa743213df3aa9135bf7945644ec936";
tag = "v${version}";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = tag;
sha256 = "sha256-8DeVO7Wr1bFZXTp2kaEPizDwNU5ZsA1fykccaDUivh8=";
sha256 = "sha256-c6WUqD7x8/P+W64fWs4cw1RiUFepevIJCPpWSzNfIMc=";
};
vendorSha256 = "sha256-N45yRlBGZ/c9ve2YPcWA26pylV8hzxjPh6evKtkgnoc=";

12
pkgs/applications/networking/cluster/k9s/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
version = "0.24.15";
version = "0.25.7";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
sha256 = "sha256-ws5JC2/WkgwxKwYtP9xtFELRhztzL6tNSvopyeC6H0Q=";
sha256 = "sha256-CFXPo8dpefrrBxCGpcGtZfLdfMYCBL/eQhHqZggK/yA=";
};
ldflags = [
@ -17,14 +17,16 @@ buildGoModule rec {
"-X github.com/derailed/k9s/cmd.commit=${src.rev}"
];
vendorSha256 = "sha256-T9khJeg5XPhVyUiu4gEEHZR6RgJF4P8LYFycqJglms8=";
vendorSha256 = "sha256-v4cd+f2GSE2ad0wWrW9x6/U6RREhFV83wVNFUMfWaA4=";
doCheck = false;
preCheck = "export HOME=$(mktemp -d)";
doCheck = true;
meta = with lib; {
description = "Kubernetes CLI To Manage Your Clusters In Style";
homepage = "https://github.com/derailed/k9s";
license = licenses.asl20;
maintainers = with maintainers; [ Gonzih markus1189 ];
maintainers = with maintainers; [ Gonzih markus1189 bryanasdev000 ];
};
}

9
pkgs/applications/networking/cluster/velero/default.nix
View File

@ -2,26 +2,23 @@
buildGoModule rec {
pname = "velero";
# When updating, change the commit underneath
version = "1.7.0";
commit = "9e52260568430ecb77ac38a677ce74267a8c2176";
version = "1.7.1";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "velero";
rev = "v${version}";
sha256 = "sha256-n5Rk+Fyb6yAI5sRZi+WE1KyQZyGryZSP4yd/gmmsQxw=";
sha256 = "sha256-Jz3Tp5FqpmPuBscRB0KleQxtCvB43qmeLZNtGPnjuL0=";
};
ldflags = [
"-s" "-w"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit}"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean"
];
vendorSha256 = "sha256-qsRbwLKNnuQRIsx0+sfOfR2OQ0+el0vptxz7mMew7zY=";
vendorSha256 = "sha256-fX9FeoIkxxSi3dl5W2MZLz5vN1VHkPNpTBGRxGP5Qx8=";
excludedPackages = [ "issue-template-gen" "crd-gen" "release-tools" "velero-restic-restore-helper" "v1" "v1beta1" ];

19
pkgs/applications/radio/gqrx/default.nix
View File

@ -14,9 +14,13 @@
, rtl-sdr
, hackrf
, pulseaudioSupport ? true, libpulseaudio
, portaudioSupport ? false, portaudio
}:
assert pulseaudioSupport -> libpulseaudio != null;
assert portaudioSupport -> portaudio != null;
# audio backends are mutually exclusive
assert !(pulseaudioSupport && portaudioSupport);
gnuradio3_8Minimal.pkgs.mkDerivation rec {
pname = "gqrx";
@ -49,7 +53,20 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec {
] ++ lib.optionals (gnuradio3_8Minimal.hasFeature "gr-ctrlport") [
thrift
gnuradio3_8Minimal.unwrapped.python.pkgs.thrift
] ++ lib.optionals pulseaudioSupport [ libpulseaudio ];
] ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
++ lib.optionals portaudioSupport [ portaudio ];
cmakeFlags =
let
audioBackend =
if pulseaudioSupport
then "Pulseaudio"
else if portaudioSupport
then "Portaudio"
else "Gr-audio";
in [
"-DLINUX_AUDIO_BACKEND=${audioBackend}"
];
postInstall = ''
install -vD $src/gqrx.desktop -t "$out/share/applications/"

12
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,14 +1,14 @@
{
"version": "14.5.0",
"repo_hash": "sha256-HKm2zxr9jHN5NvoKoR0YnEsna84oz+ax6BYmDiWrODc=",
"version": "14.5.1",
"repo_hash": "0c9ih7dr5lgvdhij75bpcj9vlyljnprzbv0k90k4rjajfyd0lhad",
"yarn_hash": "081c06ds723mv95ivpnlh3ida2ra3brrm1lzfh2pmlg5wz9vi1cs",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v14.5.0-ee",
"rev": "v14.5.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "14.5.0",
"GITALY_SERVER_VERSION": "14.5.1",
"GITLAB_PAGES_VERSION": "1.48.0",
"GITLAB_SHELL_VERSION": "13.22.0",
"GITLAB_WORKHORSE_VERSION": "14.5.0"
"GITLAB_SHELL_VERSION": "13.22.1",
"GITLAB_WORKHORSE_VERSION": "14.5.1"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -33,7 +33,7 @@ let
};
};
version = "14.5.0";
version = "14.5.1";
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
in
@ -45,7 +45,7 @@ buildGoModule {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-DbyxZKxW+S2u23+F8VQxkDXWp+L1WeISs6OEBb5DavA=";
sha256 = "sha256-AWY/jUIytK/8nrCH2EMrzQ9e0dc9VpZFkO7NhrrqoGg=";
};
vendorSha256 = "sha256-ZLd4E3+e25Hqmd6ZyF3X6BveMEg7OF0FX9IvNBWn3v0=";

4
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
View File

@ -2,12 +2,12 @@
buildGoModule rec {
pname = "gitlab-shell";
version = "13.22.0";
version = "13.22.1";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "sha256-jMFTNyGdegdBO+f6Pw36iuhvyzcM8rCbnfSyLSOiEjY=";
sha256 = "sha256-uqdKiBZ290mG0JNi17EjimfES6bN3q1hF6LXs3URTZ8=";
};
buildInputs = [ ruby ];

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "14.5.0";
version = "14.5.1";
src = fetchFromGitLab {
owner = data.owner;

9
pkgs/desktops/gnome/core/caribou/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2
, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook
, wrapGAppsHook, libgee, vala_0_40 }:
, wrapGAppsHook, libgee, vala }:
let
pname = "caribou";
@ -21,6 +21,11 @@ in stdenv.mkDerivation rec {
url = "https://bugzilla.gnome.org/attachment.cgi?id=364774";
sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd";
})
# Stop patching the generated GIR, fixes build with latest vala
(fetchurl {
url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/c52ce71c49dc8d6109a58d16cc8d491d7bd1d781.patch";
sha256 = "sha256-jbF1Ygp8Q0ENN/5aEpROuK5zkufIfn6cGW8dncl7ET4=";
})
(fetchurl {
name = "fix-build-modern-vala.patch";
url = "https://gitlab.gnome.org/GNOME/caribou/-/commit/76fbd11575f918fc898cb0f5defe07f67c11ec38.patch";
@ -33,7 +38,7 @@ in stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook vala_0_40 ];
nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook vala ];
buildInputs = [
glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3

4
pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
View File

@ -7,7 +7,7 @@
, keybinder3
, pkg-config
, python3Packages
, vala_0_48
, vala
, wafHook
, wrapGAppsHook
, xfce
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
gobject-introspection
pkg-config
python3Packages.wrapPython
vala_0_48
vala
wafHook
wrapGAppsHook
];

10
pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala_0_46
{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala_0_40
, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce }:
stdenv.mkDerivation rec {
@ -12,7 +12,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-aKrJzf9rwCyXAJsRIXdBzmJBASuXD5I5kZrp+atx4FA=";
};
nativeBuildInputs = [ pkg-config vala_0_46 wafHook python3 ];
# Does not build with vala 0.48 or later
# Upstream has no activity for a while
# libxfce4panel-2.0.vapi:92.3-92.41: error: overriding method `Xfce.PanelPlugin.remote_event' is incompatible
# with base method `bool Xfce.PanelPluginProvider.remote_event (string, GLib.Value, uint)': too few parameters.
# public virtual signal bool remote_event (string name, GLib.Value value);
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
nativeBuildInputs = [ pkg-config vala_0_40 wafHook python3 ];
buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ];
postPatch = ''

7
pkgs/development/compilers/llvm/13/default.nix
View File

@ -244,7 +244,12 @@ let
inherit llvm_meta;
stdenv = if stdenv.hostPlatform.useLLVM or false
then overrideCC stdenv buildLlvmTools.clangNoLibcxx
else stdenv;
else (
# libcxx >= 13 does not build on gcc9
if stdenv.cc.isGNU && lib.versionOlder stdenv.cc.version "10"
then pkgs.gcc10Stdenv
else stdenv
);
};
libcxxabi = let

28
pkgs/development/compilers/vala/default.nix
View File

@ -28,18 +28,8 @@ let
# 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch
"0.40" = ./disable-graphviz-0.40.12.patch;
# NOTE: the openembedded-core project doesn't have a patch for 0.44.1
# We've reverted the addition of the "--disable-valadoc" option
# and then applied the following patch.
# 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch
"0.44" = ./disable-graphviz-0.44.3.patch;
"0.46" = ./disable-graphviz-0.46.1.patch;
"0.48" = ./disable-graphviz-0.46.1.patch;
"0.50" = ./disable-graphviz-0.46.1.patch;
"0.52" = ./disable-graphviz-0.46.1.patch;
"0.54" = ./disable-graphviz-0.46.1.patch;
@ -113,24 +103,14 @@ in rec {
sha256 = "1pxpack8rrmywlf47v440hc6rv3vi8q9c6niwqnwikxvb2pwf3w7";
};
vala_0_46 = generic {
version = "0.46.13";
sha256 = "0d7l4vh2xra3q75kw3sy2d9bn5p6s3g3r7j37bdn6ir8l3wp2ivs";
};
vala_0_48 = generic {
version = "0.48.19";
sha256 = "sha256-gLdlijfZhE/NG0Mdr8WATeYWpYGW5PHxGeWyrraLSgE=";
};
vala_0_50 = generic {
version = "0.50.10";
sha256 = "sha256-vnIf8/AYHqttM+zKzygfZvMI+qHl5VTwj99nFZpFlRU=";
version = "0.48.20";
sha256 = "sha256-RrHIF/dIUfvMOV/E+eoRlQLPh7kzPMllbhzczAvTN24=";
};
vala_0_52 = generic {
version = "0.52.7";
sha256 = "sha256-C7WptPbRdUmewKWAJK3ANapRcAgPUzwo2cNY0aMsU2o=";
version = "0.52.8";
sha256 = "sha256-d3t9HLVnFewyJUXQEw5/9Y2eem0b2WtuKX6eYOgRh5M=";
};
vala_0_54 = generic {

261
pkgs/development/compilers/vala/disable-graphviz-0.44.3.patch
View File

@ -1,261 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index f70234759..b3d6c3833 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,19 +13,9 @@ SUBDIRS = \
doc \
gobject-introspection \
vapigen \
- $(NULL)
-
-if ENABLE_VALADOC
-SUBDIRS += \
libvaladoc \
valadoc \
$(NULL)
-endif
-
-DISTCHECK_CONFIGURE_FLAGS = \
- --enable-valadoc \
- --enable-unversioned \
- $(NULL)
if ENABLE_UNVERSIONED
aclocaldir = $(datadir)/aclocal
diff --git a/configure.ac b/configure.ac
index 504db13aa..622397747 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,10 +157,11 @@ AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
AC_ARG_WITH(cgraph, AS_HELP_STRING([--with-cgraph], [Required flag for cross-compilation to define capability of graphviz]), [], with_cgraph=check)
-AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes)
-if test x$enable_valadoc = xyes; then
+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
+if test x$enable_graphviz = xyes; then
PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
AC_MSG_CHECKING([for CGRAPH])
+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
cgraph_tmp_LIBADD="$LIBADD"
cgraph_tmp_CFLAGS="$CFLAGS"
LIBADD="$LIBADD $LIBGVC_LIBS"
@@ -198,8 +199,8 @@ if test x$enable_valadoc = xyes; then
LIBADD="$cgraph_tmp_LIBADD"
CFLAGS="$cgraph_tmp_CFLAGS"
fi
+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
-AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes)
AC_PATH_PROG([XSLTPROC], [xsltproc], :)
AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d2684a0e0..b343c7c10 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,16 +6,11 @@ SUBDIRS = \
dist_man_MANS = \
valac.1 \
+ valadoc.1 \
vala-gen-introspect.1 \
vapigen.1 \
$(NULL)
-if ENABLE_VALADOC
-dist_man_MANS += \
- valadoc.1 \
- $(NULL)
-endif
-
EXTRA_DIST = \
valac.h2m \
valadoc.h2m \
@@ -24,11 +19,7 @@ EXTRA_DIST = \
$(NULL)
if HAVE_HELP2MAN
-if ENABLE_VALADOC
manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1
-else
-manpages: valac.1 vala-gen-introspect.1 vapigen.1
-endif
@rm $^
$(MAKE) $(AM_MAKEFLAGS) $^
@@ -37,13 +28,11 @@ valac.1:
--include $(srcdir)/valac.h2m \
--libtool --no-info \
--output=$@
-if ENABLE_VALADOC
valadoc.1:
$(HELP2MAN) $(top_builddir)/valadoc/valadoc \
--include $(srcdir)/valadoc.h2m \
--libtool --no-info \
--output=$@
-endif
vala-gen-introspect.1:
$(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \
--include $(srcdir)/vala-gen-introspect.h2m \
@@ -60,15 +49,12 @@ endif
if ENABLE_UNVERSIONED
install-data-hook:
cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1
-if ENABLE_VALADOC
cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1
-endif
cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1
cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1
endif
-if ENABLE_VALADOC
COMMON_VALADOCFLAGS = \
--force \
--verbose \
@@ -150,7 +136,6 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen
@touch $@
internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc
-endif
clean-local:
rm -rf $(builddir)/internal-apis
diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
index 7456fb836..107338e91 100644
--- a/libvaladoc/Makefile.am
+++ b/libvaladoc/Makefile.am
@@ -119,10 +119,6 @@ libvaladoc_la_VALASOURCES = \
content/tablerow.vala \
content/taglet.vala \
content/text.vala \
- charts/chart.vala \
- charts/chartfactory.vala \
- charts/hierarchychart.vala \
- charts/simplechartfactory.vala \
parser/manyrule.vala \
parser/oneofrule.vala \
parser/optionalrule.vala \
@@ -149,13 +145,24 @@ libvaladoc_la_VALASOURCES = \
highlighter/codetoken.vala \
highlighter/highlighter.vala \
html/basicdoclet.vala \
- html/htmlchartfactory.vala \
html/linkhelper.vala \
html/cssclassresolver.vala \
html/htmlmarkupwriter.vala \
html/htmlrenderer.vala \
$(NULL)
+if ENABLE_GRAPHVIZ
+libvaladoc_la_VALASOURCES += \
+ charts/chart.vala \
+ charts/chartfactory.vala \
+ charts/hierarchychart.vala \
+ charts/simplechartfactory.vala \
+ html/htmlchartfactory.vala \
+ $(NULL)
+
+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
+endif
+
libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
libvaladoc.vala.stamp \
$(libvaladoc_la_VALASOURCES:.vala=.c) \
@@ -175,11 +182,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
--library valadoc \
--vapi valadoc@PACKAGE_SUFFIX@.vapi \
--vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
- --vapidir $(top_srcdir)/vapi --pkg libgvc \
--vapidir $(top_srcdir)/gee --pkg gee \
--vapidir $(top_srcdir)/vala --pkg vala \
--vapidir $(top_srcdir)/ccode --pkg ccode \
--vapidir $(top_srcdir)/codegen --pkg codegen \
+ $(LIBGVC_PKG) \
--pkg config \
$(filter %.vala %.c,$^)
touch $@
@@ -207,6 +214,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
cp $< $@
+if !ENABLE_GRAPHVIZ
+ sed -i "s/libgvc //g" $@
+endif
vapidir = $(datadir)/vala/vapi
dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
@@ -214,6 +224,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
cp $< $@
+if !ENABLE_GRAPHVIZ
+ sed -i "s/libgvc//g" $@
+endif
EXTRA_DIST = \
$(libvaladoc_la_VALASOURCES) \
diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala
index 46578c28f..f6ce7097c 100644
--- a/libvaladoc/html/basicdoclet.vala
+++ b/libvaladoc/html/basicdoclet.vala
@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
protected HtmlRenderer _renderer;
protected Html.MarkupWriter writer;
protected Html.CssClassResolver cssresolver;
+#if HAVE_GRAPHVIZ
protected Charts.Factory image_factory;
+#else
+ protected void* image_factory;
+#endif
protected ErrorReporter reporter;
protected string package_list_link = "../index.html";
@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
this.linker = new LinkHelper ();
_renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
+#if HAVE_GRAPHVIZ
this.image_factory = new SimpleChartFactory (settings, linker);
+#endif
}
@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
}
protected void write_image_block (Api.Node element) {
+#if HAVE_GRAPHVIZ
if (element is Class || element is Interface || element is Struct) {
unowned string format = (settings.use_svg_images ? "svg" : "png");
var chart = new Charts.Hierarchy (image_factory, element);
@@ -1044,6 +1051,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
this.get_img_path_html (element, format)});
writer.add_usemap (chart);
}
+#endif
}
public void write_namespace_content (Namespace node, Api.Node? parent) {
diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala
index 5aa4afdea..e79b0b8f5 100644
--- a/libvaladoc/html/htmlmarkupwriter.vala
+++ b/libvaladoc/html/htmlmarkupwriter.vala
@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
}
}
+#if HAVE_GRAPHVIZ
public unowned MarkupWriter add_usemap (Charts.Chart chart) {
string? buf = (string?) chart.write_buffer ("cmapx");
if (buf != null) {
raw_text ("\n");
raw_text ((!) buf);
}
+#else
+ public unowned MarkupWriter add_usemap (void* chart) {
+#endif
return this;
}

7
pkgs/development/libraries/libcamera/default.nix
View File

@ -31,10 +31,11 @@ stdenv.mkDerivation {
patchShebangs utils/
'';
strictDeps = true;
buildInputs = [
# IPA and signing
gnutls
openssl
boost
# gstreamer integration
@ -46,6 +47,8 @@ stdenv.mkDerivation {
# lttng tracing
lttng-ust
gtest
];
nativeBuildInputs = [
@ -57,9 +60,9 @@ stdenv.mkDerivation {
python3Packages.pyyaml
python3Packages.ply
python3Packages.sphinx
gtest
graphviz
doxygen
openssl
];
mesonFlags = [ "-Dv4l2=true" "-Dqcam=disabled" ];

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

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "awkward";
version = "1.5.1";
version = "1.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "c0357c62223fefcfc7a7565389dbd4db900623bf10eccf2bc8e87586ec59b38d";
sha256 = "e4e642dfe496d2acb245c90e37dc18028e25d5e936421e7371ea6ba0fde6435a";
};
nativeBuildInputs = [ cmake ];

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

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "kubernetes";
version = "18.20.0";
version = "20.13.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "kubernetes-client";
repo = "python";
rev = "v${version}";
sha256 = "1sawp62j7h0yksmg9jlv4ik9b9i1a1w9syywc9mv8x89wibf5ql1";
sha256 = "sha256-zZb5jEQEluY1dfa7UegW+P7MV86ESqOey7kkC74ETlM=";
fetchSubmodules = true;
};

6
pkgs/development/tools/faas-cli/default.nix
View File

@ -10,14 +10,14 @@ in
buildGoModule rec {
pname = "faas-cli";
# When updating version change rev.
version = "0.13.15";
rev = "b562392b12a78a11bcff9c6fca5a47146ea2ba0a";
version = "0.14.1";
rev = "d94600d2d2be52a66e0a15c219634f3bcac27318";
src = fetchFromGitHub {
owner = "openfaas";
repo = "faas-cli";
rev = version;
sha256 = "15kjxn0p8nz8147vsm9q5q6wr2w5ssybvn247kynj2n7139iva2f";
sha256 = "132m9kv7a4vv65n8y3sq1drks6n1pci9fhvq0s637imf2vxccxqr";
};
CGO_ENABLED = 0;

4
pkgs/development/tools/misc/lit/default.nix
View File

@ -2,11 +2,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "lit";
version = "0.10.0";
version = "13.0.0";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "13s8v9s2f284fnh47xdyc75gq2i9pndl39q8v4wl7v7lwri2hv8r";
sha256 = "4da976f3d114e4ba6ba06cbe660ce1393230f4519c4df15b90bc1840f00e4195";
};
passthru = {

12
pkgs/development/tools/rust/cargo-generate/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-generate";
version = "0.5.3";
version = "0.11.0";
src = fetchFromGitHub {
owner = "ashleygwilliams";
repo = "cargo-generate";
rev = "v${version}";
sha256 = "sha256-RrDwq5VufMDsPlqRmBP3x2RUWU740L0L18noByO1IDY=";
sha256 = "sha256-082rFxC/p68X8g58I7Q7Of70ymq7VsLhkQpcqVx0u/A=";
};
cargoSha256 = "sha256-/0pxEQFhovPRI4Knv5xq6+PHRuGN6+tF8CdK5X30LKI=";
cargoSha256 = "sha256-1yTH5FvalzBD13FXh/X1jmZhVyWU3thrjNSsrHUfBNE=";
nativeBuildInputs = [ pkg-config ];
@ -24,6 +24,12 @@ rustPlatform.buildRustPackage rec {
git config --global user.email nixbld@localhost.localnet
'';
# Exclude some tests that don't work in sandbox:
# - favorites_default_to_git_if_not_defined: requires network access to github.com
# - should_canonicalize: the test assumes that it will be called from the /Users/<project_dir>/ folder on darwin variant.
checkFlags = [ "--skip favorites::favorites_default_to_git_if_not_defined" ]
++ lib.optionals stdenv.isDarwin [ "--skip git::should_canonicalize" ];
meta = with lib; {
description = "cargo, make me a project";
homepage = "https://github.com/ashleygwilliams/cargo-generate";

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

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-wipe";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitHub {
owner = "mihai-dinculescu";
repo = "cargo-wipe";
rev = "v${version}";
sha256 = "sha256-sVekfGHg2wspP5/zJzXTXupspwJr4hQBucY5+8iUjUQ=";
sha256 = "sha256-AlmXq2jbU8mQ23Q64a8QiKXwiWkIfr98vAoq7FLImhA=";
};
cargoSha256 = "sha256-EoXgsWg1Rh7C+fIqvefkLdck4Yj3kox2ZAU3kn6nH8Q=";
cargoSha256 = "sha256-vsN4cM4Q9LX1ZgAA5x7PupOTh0IcjI65xzuCPjy8YOs=";
passthru = {
updateScript = nix-update-script {

72
pkgs/misc/vim-plugins/generated.nix
View File

@ -4354,6 +4354,18 @@ final: prev:
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
nvim-jqx = buildVimPluginFrom2Nix {
pname = "nvim-jqx";
version = "2021-11-25";
src = fetchFromGitHub {
owner = "gennaro-tedesco";
repo = "nvim-jqx";
rev = "433040c73b68796e2ebed049075b8c46d2222ac2";
sha256 = "1dh4yb6rr593nx8kbhskpbb50l211b9z47rvhxd1n07d31bc0lmc";
};
meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/";
};
nvim-lightbulb = buildVimPluginFrom2Nix {
pname = "nvim-lightbulb";
version = "2021-11-13";
@ -4414,6 +4426,30 @@ final: prev:
meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/";
};
nvim-metals = buildVimPluginFrom2Nix {
pname = "nvim-metals";
version = "2021-11-29";
src = fetchFromGitHub {
owner = "scalameta";
repo = "nvim-metals";
rev = "25d148b6b03c7aeea917f296a5c2a60829810eb3";
sha256 = "1b7h5h6n1b2mpqnqpkmha689bpy6k85w40s65c2v7cbj7zn92ycw";
};
meta.homepage = "https://github.com/scalameta/nvim-metals/";
};
nvim-neoclip-lua = buildVimPluginFrom2Nix {
pname = "nvim-neoclip.lua";
version = "2021-11-06";
src = fetchFromGitHub {
owner = "AckslD";
repo = "nvim-neoclip.lua";
rev = "cb4eff8bb7bb4bbb3d1629178a7dc62322773e05";
sha256 = "1szwg804gajq84icl39gsmbqkaxh3yffdb50wh0pcgj86b4w5hda";
};
meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";
};
nvim-nonicons = buildVimPluginFrom2Nix {
pname = "nvim-nonicons";
version = "2021-10-25";
@ -6051,6 +6087,18 @@ final: prev:
meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/";
};
telescope-lsp-handlers-nvim = buildVimPluginFrom2Nix {
pname = "telescope-lsp-handlers.nvim";
version = "2021-09-07";
src = fetchFromGitHub {
owner = "gbrlsnchs";
repo = "telescope-lsp-handlers.nvim";
rev = "d6d5983b0131ee2c386ca9e349f6621e12d971cb";
sha256 = "1x51mlj1c3cwmcjqssh89049q91423jxm3rv8s25pcw493zb2x6b";
};
meta.homepage = "https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/";
};
telescope-project-nvim = buildVimPluginFrom2Nix {
pname = "telescope-project.nvim";
version = "2021-11-20";
@ -6075,6 +6123,18 @@ final: prev:
meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/";
};
telescope-vim-bookmarks-nvim = buildVimPluginFrom2Nix {
pname = "telescope-vim-bookmarks.nvim";
version = "2021-08-12";
src = fetchFromGitHub {
owner = "tom-anders";
repo = "telescope-vim-bookmarks.nvim";
rev = "b7a436eba6102c2bc73f49766a12e79d24ab8fb5";
sha256 = "0lak83b8y963hv61z2yfi1nyaapvq2hnhpcx7bc6h8v4jzyjis0n";
};
meta.homepage = "https://github.com/tom-anders/telescope-vim-bookmarks.nvim/";
};
telescope-z-nvim = buildVimPluginFrom2Nix {
pname = "telescope-z.nvim";
version = "2021-10-10";
@ -6448,6 +6508,18 @@ final: prev:
meta.homepage = "https://github.com/KabbAmine/vCoolor.vim/";
};
venn-nvim = buildVimPluginFrom2Nix {
pname = "venn.nvim";
version = "2021-10-19";
src = fetchFromGitHub {
owner = "jbyuki";
repo = "venn.nvim";
rev = "d5a9c73fe7772c11414fc52acbb1d1bdb1ebc70f";
sha256 = "1mzxvx1vqnm89yzzy6n3s30y9w7s38lbjhnwdf4diy0kdzyq8x06";
};
meta.homepage = "https://github.com/jbyuki/venn.nvim/";
};
verilog_systemverilog-vim = buildVimPluginFrom2Nix {
pname = "verilog_systemverilog.vim";
version = "2021-01-16";

4
pkgs/misc/vim-plugins/overrides.nix
View File

@ -483,6 +483,10 @@ self: super: {
dependencies = with self; [ popfix ];
});
nvim-metals = super.nvim-metals.overrideAttrs (old: {
dontBuild = true;
});
nvim-spectre = super.nvim-spectre.overrideAttrs (old: {
dependencies = with self; [ plenary-nvim ];
});

6
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -1,5 +1,6 @@
907th/vim-auto-save
aca/completion-tabnine
AckslD/nvim-neoclip.lua@main
AckslD/nvim-whichkey-setup.lua@main
ackyshake/Spacegray.vim@main
ahmedkhalf/lsp-rooter.nvim@main
@ -179,9 +180,11 @@ fruit-in/brainfuck-vim
fruit-in/vim-nong-theme
fsharp/vim-fsharp
garbas/vim-snipmate
gbrlsnchs/telescope-lsp-handlers.nvim@trunk
gcmt/taboo.vim
gcmt/wildfire.vim
gelguy/wilder.nvim
gennaro-tedesco/nvim-jqx
gennaro-tedesco/nvim-peekup
gentoo/gentoo-syntax
GEverding/vim-hocon
@ -272,6 +275,7 @@ jaredgorski/SpaceCamp
jasonccox/vim-wayland-clipboard
jaxbot/semantic-highlight.vim
JazzCore/ctrlp-cmatcher
jbyuki/venn.nvim@main
jc-doyle/cmp-pandoc-references
jceb/vim-hier
jceb/vim-orgmode
@ -680,6 +684,7 @@ sakhnik/nvim-gdb
saltstack/salt-vim
samoshkin/vim-mergetool
sbdchd/neoformat
scalameta/nvim-metals@main
sdiehl/vim-ormolu
sebastianmarkow/deoplete-rust
SevereOverfl0w/deoplete-github
@ -774,6 +779,7 @@ tmhedberg/SimpylFold
tmsvg/pear-tree
tmux-plugins/vim-tmux
tmux-plugins/vim-tmux-focus-events
tom-anders/telescope-vim-bookmarks.nvim@main
tomasiser/vim-code-dark
tomasr/molokai
tomlion/vim-solidity

18
pkgs/os-specific/linux/mxu11x0/default.nix
View File

@ -1,13 +1,15 @@
{ lib, stdenv, fetchurl, kernel }:
stdenv.mkDerivation {
let
srcs = import (./srcs.nix) { inherit fetchurl; };
in
stdenv.mkDerivation rec {
pname = "mxu11x0";
version = "1.4-${kernel.version}";
src = fetchurl {
url = "https://www.moxa.com/Moxa/media/PDIM/S100000385/moxa-uport-1000-series-linux-3.x-and-4.x-for-uport-11x0-series-driver-v1.4.tgz";
sha256 = "1hz9ygabbp8pv49k1j4qcsr0v3zw9xy0bh1akqgxp5v29gbdgxjl";
};
src = if lib.versionAtLeast kernel.version "5.0" then srcs.mxu11x0_5.src else srcs.mxu11x0_4.src;
mxu_version = if lib.versionAtLeast kernel.version "5.0" then srcs.mxu11x0_5.version else srcs.mxu11x0_4.version;
version = mxu_version + "-${kernel.version}";
preBuild = ''
sed -i -e "s/\$(uname -r).*/${kernel.modDirVersion}/g" driver/mxconf
@ -33,6 +35,8 @@ stdenv.mkDerivation {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ uralbash ];
platforms = platforms.linux;
broken = kernel.kernelAtLeast "5.4";
# broken due to API change in write_room() > v5.14-rc1
# https://github.com/torvalds/linux/commit/94cc7aeaf6c0cff0b8aeb7cb3579cee46b923560
broken = kernel.kernelAtLeast "5.14";
};
}

18
pkgs/os-specific/linux/mxu11x0/srcs.nix Normal file
View File

@ -0,0 +1,18 @@
{ fetchurl }:
{
mxu11x0_4 = {
version = "4.1";
src = fetchurl {
url = "https://www.moxa.com/getmedia/b152d8c2-b9d6-4bc7-b0f4-420633b4bc2d/moxa-uport-1100-series-linux-kernel-4.x-driver-v4.1.tgz";
sha256 = "sha256-sbq5M5FQjrrORtSS07PQHf+MAZArxFcUDN5wszBwbnc=";
};
};
mxu11x0_5 = {
version = "5.1";
src = fetchurl {
url = "https://www.moxa.com/getmedia/57dfa4c1-8a2a-4da6-84c1-a36944ead74d/moxa-uport-1100-series-linux-kernel-5.x-driver-v5.1.tgz";
sha256 = "sha256-pdFIiD5naSDdYwRz8ww8Mg8z1gDOfZ/OeO6Q5n+kjDQ=";
};
};
}

3
pkgs/servers/sql/postgresql/default.nix
View File

@ -71,7 +71,8 @@ let
(if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid")
] ++ lib.optionals icuEnabled [ "--with-icu" ]
++ lib.optionals lz4Enabled [ "--with-lz4" ]
++ lib.optionals gssSupport [ "--with-gssapi" ];
++ lib.optionals gssSupport [ "--with-gssapi" ]
++ lib.optionals stdenv.hostPlatform.isRiscV [ "--disable-spinlocks" ];
patches =
[ (if atLeast "9.4" then ./patches/disable-resolve_symlinks-94.patch else ./patches/disable-resolve_symlinks.patch)

4
pkgs/tools/misc/mongodb-compass/default.nix
View File

@ -34,7 +34,7 @@ xorg,
}:
let
version = "1.29.4";
version = "1.29.5";
rpath = lib.makeLibraryPath [
alsa-lib
@ -84,7 +84,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
sha256 = "sha256-CqC6BrRhMfjxamSwC6ub1u3+FtDuIq3/OMNdUZgpCAQ=";
sha256 = "sha256-2nzbWflONhBzzxsk+uxFP4/E2fORJatwNcbrG3xhaPc=";
}
else
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";

4
pkgs/tools/networking/isync/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "isync";
version = "1.4.3";
version = "1.4.4";
src = fetchurl {
url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz";
sha256 = "024p3glj4p7fhrssw5sr55arls9zna1igxxrspxlfd6sbds21ixl";
sha256 = "1zq0wwvmqsl9y71546dr0aygzn9gjjfiw19hlcq87s929y4p6ckw";
};
nativeBuildInputs = [ pkg-config perl ];

5
pkgs/tools/package-management/nix-serve/default.nix
View File

@ -37,7 +37,10 @@ stdenv.mkDerivation {
--add-flags $out/libexec/nix-serve/nix-serve.psgi
'';
passthru.tests.nix-serve = nixosTests.nix-serve;
passthru.tests = {
nix-serve = nixosTests.nix-serve;
nix-serve-ssh = nixosTests.nix-serve-ssh;
};
meta = {
homepage = "https://github.com/edolstra/nix-serve";

10
pkgs/tools/system/openipmi/default.nix
View File

@ -2,19 +2,13 @@
stdenv.mkDerivation rec {
pname = "OpenIPMI";
version = "2.0.31";
version = "2.0.32";
src = fetchurl {
url = "mirror://sourceforge/openipmi/OpenIPMI-${version}.tar.gz";
sha256 = "05wpkn74nxqp5p6sa2yaf2ajrh8b0gfkb7y4r86lnigz4rvz6lkh";
sha256 = "sha256-9tD9TAp0sF+AkHIp0LJw9UyiMpS8wRl5+LjRJ2Z4aUU=";
};
patches = [
# fix assertion when used as a library in collectd
# taken from https://sourceforge.net/p/openipmi/code/ci/d613d279dbce2d5e4594f6fed39653d83af0d99b/
./fix-collectd-assertion.diff
];
buildInputs = [ ncurses popt python3 readline ];
outputs = [ "out" "lib" "dev" "man" ];

11
pkgs/tools/system/openipmi/fix-collectd-assertion.diff
View File

@ -1,11 +0,0 @@
--- a/unix/posix_thread_os_hnd.c
+++ b/unix/posix_thread_os_hnd.c
@@ -140,8 +140,6 @@
fd_data->data_ready = data_ready;
fd_data->handler = handler;
fd_data->freed = freed;
- sel_set_fd_write_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED);
- sel_set_fd_except_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED);
rv = sel_set_fd_handlers(posix_sel, fd, fd_data, fd_handler, NULL, NULL,
free_fd_data);
if (rv) {

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

@ -13082,9 +13082,7 @@ with pkgs;
inherit (callPackage ../development/compilers/vala { })
vala_0_40
vala_0_46
vala_0_48
vala_0_50
vala_0_52
vala_0_54
vala;
@ -25138,6 +25136,14 @@ with pkgs;
gpx = callPackage ../applications/misc/gpx { };
gqrx = callPackage ../applications/radio/gqrx { };
gqrx-portaudio = callPackage ../applications/radio/gqrx {
portaudioSupport = true;
pulseaudioSupport = false;
};
gqrx-gr-audio = callPackage ../applications/radio/gqrx {
portaudioSupport = false;
pulseaudioSupport = false;
};
gpx-viewer = callPackage ../applications/misc/gpx-viewer { };
@ -27530,8 +27536,6 @@ with pkgs;
pdfgrep = callPackage ../tools/typesetting/pdfgrep { };
pdfpc = callPackage ../applications/misc/pdfpc {
# https://github.com/pdfpc/pdfpc/issues/594
vala = vala_0_50;
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav;
};
@ -27819,6 +27823,8 @@ with pkgs;
qnotero = libsForQt5.callPackage ../applications/office/qnotero { };
qpwgraph = libsForQt5.callPackage ../applications/audio/qpwgraph { };
qrcode = callPackage ../tools/graphics/qrcode {};
qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };