b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-02-02 12:24:27 +00:00 committed by GitHub
parent efee2df4c4 303df67db6
commit 1d1ce08e2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 220 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nixos/modules/services/cluster/kubernetes/kubelet.nix
View file

@ -241,7 +241,17 @@ in
description = "Kubernetes Kubelet Service";
wantedBy = [ "kubernetes.target" ];
after = [ "network.target" "docker.service" "kube-apiserver.service" ];
path = with pkgs; [ gitMinimal openssh docker util-linux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path;
path = with pkgs; [
gitMinimal
openssh
docker
util-linux
iproute
ethtool
thin-provisioning-tools
iptables
socat
] ++ lib.optional config.boot.zfs.enabled config.boot.zfs.package ++ top.path;
preStart = ''
${concatMapStrings (img: ''
echo "Seeding docker image: ${img}"

78
nixos/modules/tasks/filesystems/zfs.nix
View file

@ -17,20 +17,8 @@ let
inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems;
inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems;
enableZfs = inInitrd || inSystem;
kernel = config.boot.kernelPackages;
packages = if config.boot.zfs.enableUnstable then {
zfs = kernel.zfsUnstable;
zfsUser = pkgs.zfsUnstable;
} else {
zfs = kernel.zfs;
zfsUser = pkgs.zfs;
};
autosnapPkg = pkgs.zfstools.override {
zfs = packages.zfsUser;
zfs = cfgZfs.package;
};
zfsAutoSnap = "${autosnapPkg}/bin/zfs-auto-snapshot";
@ -111,6 +99,20 @@ in
options = {
boot.zfs = {
package = mkOption {
readOnly = true;
type = types.package;
default = if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs;
description = "Configured ZFS userland tools package.";
};
enabled = mkOption {
readOnly = true;
type = types.bool;
default = inInitrd || inSystem;
description = "True if ZFS filesystem support is enabled";
};
enableUnstable = mkOption {
type = types.bool;
default = false;
@ -354,7 +356,7 @@ in
###### implementation
config = mkMerge [
(mkIf enableZfs {
(mkIf cfgZfs.enabled {
assertions = [
{
assertion = config.networking.hostId != null;
@ -366,20 +368,24 @@ in
}
];
virtualisation.lxd.zfsSupport = true;
boot = {
kernelModules = [ "zfs" ];
extraModulePackages = with packages; [ zfs ];
extraModulePackages = [
(if config.boot.zfs.enableUnstable then
config.boot.kernelPackages.zfsUnstable
else
config.boot.kernelPackages.zfs)
];
};
boot.initrd = mkIf inInitrd {
kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl";
extraUtilsCommands =
''
copy_bin_and_libs ${packages.zfsUser}/sbin/zfs
copy_bin_and_libs ${packages.zfsUser}/sbin/zdb
copy_bin_and_libs ${packages.zfsUser}/sbin/zpool
copy_bin_and_libs ${cfgZfs.package}/sbin/zfs
copy_bin_and_libs ${cfgZfs.package}/sbin/zdb
copy_bin_and_libs ${cfgZfs.package}/sbin/zpool
'';
extraUtilsCommandsTest = mkIf inInitrd
''
@ -433,7 +439,7 @@ in
services.zfs.zed.settings = {
ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail";
PATH = lib.makeBinPath [
packages.zfsUser
cfgZfs.package
pkgs.coreutils
pkgs.curl
pkgs.gawk
@ -461,18 +467,18 @@ in
"vdev_clear-led.sh"
]
)
(file: { source = "${packages.zfsUser}/etc/${file}"; })
(file: { source = "${cfgZfs.package}/etc/${file}"; })
// {
"zfs/zed.d/zed.rc".text = zedConf;
"zfs/zpool.d".source = "${packages.zfsUser}/etc/zfs/zpool.d/";
"zfs/zpool.d".source = "${cfgZfs.package}/etc/zfs/zpool.d/";
};
system.fsPackages = [ packages.zfsUser ]; # XXX: needed? zfs doesn't have (need) a fsck
environment.systemPackages = [ packages.zfsUser ]
system.fsPackages = [ cfgZfs.package ]; # XXX: needed? zfs doesn't have (need) a fsck
environment.systemPackages = [ cfgZfs.package ]
++ optional cfgSnapshots.enable autosnapPkg; # so the user can run the command to see flags
services.udev.packages = [ packages.zfsUser ]; # to hook zvol naming, etc.
systemd.packages = [ packages.zfsUser ];
services.udev.packages = [ cfgZfs.package ]; # to hook zvol naming, etc.
systemd.packages = [ cfgZfs.package ];
systemd.services = let
getPoolFilesystems = pool:
@ -506,8 +512,8 @@ in
environment.ZFS_FORCE = optionalString cfgZfs.forceImportAll "-f";
script = (importLib {
# See comments at importLib definition.
zpoolCmd="${packages.zfsUser}/sbin/zpool";
awkCmd="${pkgs.gawk}/bin/awk";
zpoolCmd = "${cfgZfs.package}/sbin/zpool";
zfsCmd = "${cfgZfs.package}/sbin/zfs";
inherit cfgZfs;
}) + ''
poolImported "${pool}" && exit
@ -561,7 +567,7 @@ in
RemainAfterExit = true;
};
script = ''
${packages.zfsUser}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}"
${cfgZfs.package}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}"
'';
};
createZfsService = serv:
@ -587,7 +593,7 @@ in
systemd.targets.zfs.wantedBy = [ "multi-user.target" ];
})
(mkIf (enableZfs && cfgSnapshots.enable) {
(mkIf (cfgZfs.enabled && cfgSnapshots.enable) {
systemd.services = let
descr = name: if name == "frequent" then "15 mins"
else if name == "hourly" then "hour"
@ -625,7 +631,7 @@ in
}) snapshotNames);
})
(mkIf (enableZfs && cfgScrub.enable) {
(mkIf (cfgZfs.enabled && cfgScrub.enable) {
systemd.services.zfs-scrub = {
description = "ZFS pools scrubbing";
after = [ "zfs-import.target" ];
@ -633,11 +639,11 @@ in
Type = "oneshot";
};
script = ''
${packages.zfsUser}/bin/zpool scrub ${
${cfgZfs.package}/bin/zpool scrub ${
if cfgScrub.pools != [] then
(concatStringsSep " " cfgScrub.pools)
else
"$(${packages.zfsUser}/bin/zpool list -H -o name)"
"$(${cfgZfs.package}/bin/zpool list -H -o name)"
}
'';
};
@ -652,11 +658,11 @@ in
};
})
(mkIf (enableZfs && cfgTrim.enable) {
(mkIf (cfgZfs.enabled && cfgTrim.enable) {
systemd.services.zpool-trim = {
description = "ZFS pools trim";
after = [ "zfs-import.target" ];
path = [ packages.zfsUser ];
path = [ cfgZfs.package ];
startAt = cfgTrim.interval;
# By default we ignore errors returned by the trim command, in case:
# - HDDs are mixed with SSDs

24
nixos/modules/virtualisation/lxd.nix
View file

@ -5,13 +5,12 @@
with lib;
let
cfg = config.virtualisation.lxd;
zfsCfg = config.boot.zfs;
in {
imports = [
(mkRemovedOptionModule [ "virtualisation" "lxd" "zfsPackage" ] "Override zfs in an overlay instead to override it globally")
];
in
{
###### interface
options = {
@ -51,18 +50,10 @@ in
'';
};
zfsPackage = mkOption {
type = types.package;
default = with pkgs; if zfsCfg.enableUnstable then zfsUnstable else zfs;
defaultText = "pkgs.zfs";
description = ''
The ZFS package to use with LXD.
'';
};
zfsSupport = mkOption {
type = types.bool;
default = false;
default = config.boot.zfs.enabled;
defaultText = "config.boot.zfs.enabled";
description = ''
Enables lxd to use zfs as a storage for containers.
@ -87,7 +78,6 @@ in
};
###### implementation
config = mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
@ -110,7 +100,7 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "systemd-udev-settle.service" ];
path = lib.optional cfg.zfsSupport cfg.zfsPackage;
path = lib.optional config.boot.zfs.enabled config.boot.zfs.package;
preStart = ''
mkdir -m 0755 -p /var/lib/lxc/rootfs

58
pkgs/applications/audio/tageditor/default.nix Normal file
View file

@ -0,0 +1,58 @@
{ stdenv
, pkgs
, fetchFromGitHub
, pkg-config
, cmake
, cpp-utilities
, qtutilities
, mp4v2
, libid3tag
, qtbase
, qttools
, qtwebengine
, qtx11extras
, tagparser
, wrapQtAppsHook
}:
stdenv.mkDerivation rec {
pname = "tageditor";
version = "3.3.10";
src = fetchFromGitHub {
owner = "martchus";
repo = "tageditor";
rev = "v${version}";
sha256 = "16cmq7dyalcwc8gx1y9acngw5imjh8ydp4prxy7qpzk4fj3kpsak";
};
nativeBuildInputs = [
pkg-config
cmake
wrapQtAppsHook
];
buildInputs = [
mp4v2
libid3tag
pkg-config
qtbase
qttools
qtx11extras
qtwebengine
cpp-utilities
qtutilities
tagparser
];
enableParallelBuilding = true;
meta = with pkgs.lib; {
homepage = "https://github.com/Martchus/tageditor";
description = "A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska";
license = licenses.gpl2;
maintainers = [ maintainers.matthiasbeyer ];
platforms = platforms.linux;
};
}

4
pkgs/applications/misc/fuzzel/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "fuzzel";
version = "1.5.0";
version = "1.5.1";
src = fetchzip {
url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz";
sha256 = "091vlhj1kirdy5p3qza9hwhj7js3ci5xxvlp9d7as9bwlh58w2lw";
sha256 = "0zy0icd3647jyq4xflp35vwn52yxgj3zz4n30br657xjq1l5afzl";
};
nativeBuildInputs = [ pkg-config meson ninja scdoc git ];

4
pkgs/applications/misc/keepassx/community.nix
View file

@ -40,13 +40,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "keepassxc";
version = "2.6.3";
version = "2.6.4";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = version;
sha256 = "1jd2mvafyn095crfs2hnfprqiy8yqsvfybwbjq8n0agapnz4bl5h";
sha256 = "02ajfkw818cmalvkl0kqvza85rgdgs59kw2v7b3c4v8kv00c41j3";
};
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [

79
pkgs/applications/office/planner/default.nix
View file

@ -1,79 +0,0 @@
{ lib, stdenv
, fetchFromGitLab
, pkg-config
, intltool
, automake111x
, autoconf
, libtool
, gnome2
, libxslt
, python2
}:
let version = "unstable-2019-02-13";
in stdenv.mkDerivation {
pname = "planner";
inherit version;
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "planner";
rev = "76d31defae4979aa51dd37e8888f61e9a6a51367";
sha256 = "0lbch4drg6005216hgcys93rq92p7zd20968x0gk254kckd9ag5w";
};
nativeBuildInputs = with gnome2; [
pkg-config
intltool
automake111x
autoconf
libtool
gnome-common
gtk-doc
scrollkeeper
];
buildInputs = with gnome2; [
GConf
gtk
libgnomecanvas
libgnomeui
libglade
libxslt
python2.pkgs.pygtk
];
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
preConfigure = "./autogen.sh";
configureFlags = [
"--enable-python"
"--enable-python-plugin"
];
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://wiki.gnome.org/Apps/Planner";
description = "Project management application for GNOME";
longDescription = ''
Planner is the GNOME project management tool.
Its goal is to be an easy-to-use no-nonsense cross-platform
project management application.
Planner is a GTK application written in C and licensed under the
GPLv2 or any later version. It can store its data in either xml
files or in a postgresql database. Projects can also be printed
to PDF or exported to HTML for easy viewing from any web browser.
Planner was originally created by Richard Hult and Mikael Hallendal
at Imendio.
'';
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ rasendubi amiloradovsky ];
};
}

4
pkgs/applications/version-management/gitea/default.nix
View file

@ -9,11 +9,11 @@ with lib;
buildGoPackage rec {
pname = "gitea";
version = "1.13.1";
version = "1.13.2";
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "sha256-tah7ciq+jkkROJq/V+yPRtWPuWaSnf5hKndjnifsQYc=";
sha256 = "sha256-uezg8GdNqgKVHgJj9rTqHFLWuLdyDp63fzr7DMslOII=";
};
unpackPhase = ''

4
pkgs/applications/virtualization/singularity/default.nix
View file

@ -16,11 +16,11 @@ with lib;
buildGoPackage rec {
pname = "singularity";
version = "3.7.0";
version = "3.7.1";
src = fetchurl {
url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
sha256 = "0y6lm23g6a2ljm78w8iyak7yivxvpj3i55fjbd56m9b2ykssm5pv";
sha256 = "sha256-gtLGUGNWAZXsNFUZMb48MluV6OIAnpJ1X9farTRuCDw=";
};
goPackagePath = "github.com/sylabs/singularity";

33
pkgs/development/libraries/tagparser/default.nix Normal file
View file

@ -0,0 +1,33 @@
{ stdenv
, pkgs
, fetchFromGitHub
, cmake
, cpp-utilities
, zlib
}:
stdenv.mkDerivation rec {
pname = "tagparser";
version = "9.4.0";
src = fetchFromGitHub {
owner = "Martchus";
repo = "tagparser";
rev = "v${version}";
sha256 = "097dq9di19d3mvnlrav3fm78gzjni5babswyv10xnrxfhnf14f6x";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
cpp-utilities zlib
];
meta = with pkgs.lib; {
homepage = "https://github.com/Martchus/tagparser";
description = "C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags";
license = licenses.gpl2;
maintainers = [ maintainers.matthiasbeyer ];
};
}

20
pkgs/development/ocaml-modules/semaphore-compat/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ lib, buildDunePackage, fetchurl }:
buildDunePackage rec {
pname = "semaphore-compat";
version = "1.0.1";
src = fetchurl {
url = "https://github.com/mirage/semaphore-compat/releases/download/${version}/semaphore-compat-${version}.tbz";
sha256 = "139c5rxdp4dg1jcwyyxvhxr8213l1xdl2ab0mc288rfcppsiyxrb";
};
useDune2 = true;
meta = with lib; {
description = "Compatibility Semaphore module";
homepage = "https://github.com/mirage/semaphore-compat";
license = licenses.lgpl21Only;
maintainers = [ maintainers.sternenseemann ];
};
}

35
pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
View file

@ -1,5 +1,5 @@
diff --git a/data/meson.build b/data/meson.build
index 14454458..12a798c0 100644
index 50154569..f8058a8e 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -17,7 +17,7 @@ endif
@ -73,10 +73,10 @@ index 826a3c1d..b78db663 100644
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build
index a6fb55dd..aedb7530 100644
index b075ca89..8d504d3c 100644
--- a/meson.build
+++ b/meson.build
@@ -183,6 +183,12 @@ endif
@@ -194,6 +194,12 @@ endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
@ -90,7 +90,7 @@ index a6fb55dd..aedb7530 100644
gio = dependency('gio-2.0', version : '>= 2.45.8')
giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false)
diff --git a/meson_options.txt b/meson_options.txt
index 0a0e2853..198ae930 100644
index bc76c0ab..8a67d012 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
@ -98,19 +98,6 @@ index 0a0e2853..198ae930 100644
option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type')
option('agent', type : 'boolean', value : true, description : 'enable the fwupd agent')
option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')
diff --git a/plugins/ata/meson.build b/plugins/ata/meson.build
index f32b97fe..679ccc7b 100644
--- a/plugins/ata/meson.build
+++ b/plugins/ata/meson.build
@@ -7,7 +7,7 @@ install_data([
)
install_data(['ata.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
)
shared_module('fu_plugin_ata',
diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
index ed4eee70..76dbdb1d 100644
--- a/plugins/dell-esrt/meson.build
@ -123,10 +110,10 @@ index ed4eee70..76dbdb1d 100644
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
index 92762791..08bb37ea 100644
index 205d1394..3223f404 100644
--- a/plugins/redfish/meson.build
+++ b/plugins/redfish/meson.build
@@ -26,7 +26,7 @@ shared_module('fu_plugin_redfish',
@@ -27,7 +27,7 @@ shared_module('fu_plugin_redfish',
)
install_data(['redfish.conf'],
@ -148,14 +135,14 @@ index 6b2368fb..2bd06fed 100644
)
# we use functions from 2.52 in the tests
if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')
diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build
index 2d1b2d22..c4217a72 100644
--- a/plugins/uefi/meson.build
+++ b/plugins/uefi/meson.build
diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build
index 0b793a07..ebd3e5ea 100644
--- a/plugins/uefi-capsule/meson.build
+++ b/plugins/uefi-capsule/meson.build
@@ -97,7 +97,7 @@ if get_option('man')
endif
install_data(['uefi.conf'],
install_data(['uefi_capsule.conf'],
- install_dir: join_paths(sysconfdir, 'fwupd')
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
)

9
pkgs/os-specific/linux/firmware/fwupd/default.nix
View file

@ -30,6 +30,7 @@
, docbook-xsl-nons
, ninja
, gcab
, gnutls
, python3
, wrapGAppsHook
, json-glib
@ -87,7 +88,7 @@ let
self = stdenv.mkDerivation rec {
pname = "fwupd";
version = "1.5.3";
version = "1.5.5";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@ -96,7 +97,7 @@ let
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "005y5wicmm6f2v8i9m3axx7ivgj3z8mbqps4v9m71bsqmq298j86";
sha256 = "0c2m9qz1g7zxqc6w90w9hksf8y9hvlh0vyvx06q01x893j5hzxh6";
};
patches = [
@ -129,6 +130,7 @@ let
shared-mime-info
valgrind
gcab
gnutls
docbook_xml_dtd_43
docbook-xsl-nons
help2man
@ -274,7 +276,6 @@ let
passthru = {
filesInstalledToEtc = [
"fwupd/ata.conf"
"fwupd/daemon.conf"
"fwupd/redfish.conf"
"fwupd/remotes.d/lvfs-testing.conf"
@ -283,7 +284,7 @@ let
"fwupd/remotes.d/vendor-directory.conf"
"fwupd/thunderbolt.conf"
"fwupd/upower.conf"
"fwupd/uefi.conf"
"fwupd/uefi_capsule.conf"
"pki/fwupd/GPG-KEY-Hughski-Limited"
"pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
"pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"

12
pkgs/os-specific/linux/nvidia-x11/nvidia-setttings-parallel-build.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/src/Makefile b/src/Makefile
index acbb1b8..fe97103 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -242,6 +242,7 @@ endif
define BINARY_DATA_HEADER_RULE
$$(OUTPUTDIR)/$(notdir $(1)).h:
+ $(at_if_quiet)$(MKDIR) $$(OUTPUTDIR)
$(at_if_quiet){ \
$$(PRINTF) "extern const char _binary_$(subst .,_,$(notdir $(1)))_start[];\n"; \
$$(PRINTF) "extern const char _binary_$(subst .,_,$(notdir $(1)))_end[];\n"; \

6
pkgs/os-specific/linux/nvidia-x11/settings.nix
View file

@ -45,6 +45,12 @@ stdenv.mkDerivation {
version = nvidia_x11.settingsVersion;
inherit src;
patches = [
# Fix a race condition in parallel builds.
# https://github.com/NVIDIA/nvidia-settings/issues/59#issuecomment-770302032
./nvidia-setttings-parallel-build.patch
];
nativeBuildInputs = [ pkg-config m4 ];
buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ]

1
pkgs/top-level/aliases.nix
View file

@ -491,6 +491,7 @@ mapAliases ({
piwik = matomo; # added 2018-01-16
pkgconfig = pkg-config; # added 2018-02-02, moved to aliases.nix 2021-01-18
pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02
planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK."; # added 2021-02-02
pltScheme = racket; # just to be sure
plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22
pmtools = acpica-tools; # added 2018-11-01

6
pkgs/top-level/all-packages.nix
View file

@ -16819,6 +16819,8 @@ in
inherit (darwin.apple_sdk.frameworks) Carbon;
};
tageditor = libsForQt5.callPackage ../applications/audio/tageditor { };
taglib = callPackage ../development/libraries/taglib { };
taglib_extras = callPackage ../development/libraries/taglib-extras { };
@ -16827,6 +16829,8 @@ in
talloc = callPackage ../development/libraries/talloc { };
tagparser = callPackage ../development/libraries/tagparser { };
tclap = callPackage ../development/libraries/tclap {};
tcllib = callPackage ../development/libraries/tcllib { };
@ -23753,8 +23757,6 @@ in
plank = callPackage ../applications/misc/plank { };
planner = callPackage ../applications/office/planner { };
playonlinux = callPackage ../applications/misc/playonlinux {
stdenv = stdenv_32bit;
};

2
pkgs/top-level/ocaml-packages.nix
View file

@ -1053,6 +1053,8 @@ let
sedlex_2 = callPackage ../development/ocaml-modules/sedlex/2.nix { };
semaphore-compat = callPackage ../development/ocaml-modules/semaphore-compat { };
sodium = callPackage ../development/ocaml-modules/sodium { };
spelll = callPackage ../development/ocaml-modules/spelll { };