mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
5f72ed2b68
@ -14,6 +14,10 @@ with pkgs;
|
||||
let
|
||||
lib = pkgs.lib;
|
||||
|
||||
docbook_xsl_ns = pkgs.docbook-xsl-ns.override {
|
||||
withManOptDedupPatch = true;
|
||||
};
|
||||
|
||||
# We need to strip references to /nix/store/* from options,
|
||||
# including any `extraSources` if some modules came from elsewhere,
|
||||
# or else the build will fail.
|
||||
|
||||
@ -5,18 +5,6 @@ with lib;
|
||||
let
|
||||
cfg = config.networking.networkmanager;
|
||||
|
||||
basePackages = with pkgs; [
|
||||
modemmanager
|
||||
networkmanager
|
||||
networkmanager-fortisslvpn
|
||||
networkmanager-iodine
|
||||
networkmanager-l2tp
|
||||
networkmanager-openconnect
|
||||
networkmanager-openvpn
|
||||
networkmanager-vpnc
|
||||
networkmanager-sstp
|
||||
] ++ optional (!delegateWireless && !enableIwd) wpa_supplicant;
|
||||
|
||||
delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != [];
|
||||
|
||||
enableIwd = cfg.wifi.backend == "iwd";
|
||||
@ -145,6 +133,15 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
packages = [
|
||||
pkgs.modemmanager
|
||||
pkgs.networkmanager
|
||||
]
|
||||
++ cfg.plugins
|
||||
++ lib.optionals (!delegateWireless && !enableIwd) [
|
||||
pkgs.wpa_supplicant
|
||||
];
|
||||
|
||||
in {
|
||||
|
||||
meta = {
|
||||
@ -227,17 +224,33 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
packages = mkOption {
|
||||
type = types.listOf types.package;
|
||||
plugins = mkOption {
|
||||
type =
|
||||
let
|
||||
networkManagerPluginPackage = types.package // {
|
||||
description = "NetworkManager plug-in";
|
||||
check =
|
||||
p:
|
||||
lib.assertMsg
|
||||
(types.package.check p
|
||||
&& p ? networkManagerPlugin
|
||||
&& lib.isString p.networkManagerPlugin)
|
||||
''
|
||||
Package ‘${p.name}’, is not a NetworkManager plug-in.
|
||||
Those need to have a ‘networkManagerPlugin’ attribute.
|
||||
'';
|
||||
};
|
||||
in
|
||||
types.listOf networkManagerPluginPackage;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Extra packages that provide NetworkManager plugins.
|
||||
List of NetworkManager plug-ins to enable.
|
||||
Some plug-ins are enabled by the NetworkManager module by default.
|
||||
'';
|
||||
apply = list: basePackages ++ list;
|
||||
};
|
||||
|
||||
dhcp = mkOption {
|
||||
type = types.enum [ "dhclient" "dhcpcd" "internal" ];
|
||||
type = types.enum [ "dhcpcd" "internal" ];
|
||||
default = "internal";
|
||||
description = ''
|
||||
Which program (or internal library) should be used for DHCP.
|
||||
@ -380,7 +393,7 @@ in {
|
||||
</para><para>
|
||||
If you enable this option the
|
||||
<literal>networkmanager_strongswan</literal> plugin will be added to
|
||||
the <option>networking.networkmanager.packages</option> option
|
||||
the <option>networking.networkmanager.plugins</option> option
|
||||
so you don't need to to that yourself.
|
||||
'';
|
||||
};
|
||||
@ -399,6 +412,9 @@ in {
|
||||
};
|
||||
|
||||
imports = [
|
||||
(mkRenamedOptionModule
|
||||
[ "networking" "networkmanager" "packages" ]
|
||||
[ "networking" "networkmanager" "plugins" ])
|
||||
(mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ])
|
||||
(mkRemovedOptionModule ["networking" "networkmanager" "dynamicHosts"] ''
|
||||
This option was removed because allowing (multiple) regular users to
|
||||
@ -426,31 +442,12 @@ in {
|
||||
|
||||
hardware.wirelessRegulatoryDatabase = true;
|
||||
|
||||
environment.etc = with pkgs; {
|
||||
"NetworkManager/NetworkManager.conf".source = configFile;
|
||||
|
||||
"NetworkManager/VPN/nm-openvpn-service.name".source =
|
||||
"${networkmanager-openvpn}/lib/NetworkManager/VPN/nm-openvpn-service.name";
|
||||
|
||||
"NetworkManager/VPN/nm-vpnc-service.name".source =
|
||||
"${networkmanager-vpnc}/lib/NetworkManager/VPN/nm-vpnc-service.name";
|
||||
|
||||
"NetworkManager/VPN/nm-openconnect-service.name".source =
|
||||
"${networkmanager-openconnect}/lib/NetworkManager/VPN/nm-openconnect-service.name";
|
||||
|
||||
"NetworkManager/VPN/nm-fortisslvpn-service.name".source =
|
||||
"${networkmanager-fortisslvpn}/lib/NetworkManager/VPN/nm-fortisslvpn-service.name";
|
||||
|
||||
"NetworkManager/VPN/nm-l2tp-service.name".source =
|
||||
"${networkmanager-l2tp}/lib/NetworkManager/VPN/nm-l2tp-service.name";
|
||||
|
||||
"NetworkManager/VPN/nm-iodine-service.name".source =
|
||||
"${networkmanager-iodine}/lib/NetworkManager/VPN/nm-iodine-service.name";
|
||||
|
||||
"NetworkManager/VPN/nm-sstp-service.name".source =
|
||||
"${networkmanager-sstp}/lib/NetworkManager/VPN/nm-sstp-service.name";
|
||||
|
||||
environment.etc = {
|
||||
"NetworkManager/NetworkManager.conf".source = configFile;
|
||||
}
|
||||
// builtins.listToAttrs (map (pkg: nameValuePair "NetworkManager/${pkg.networkManagerPlugin}" {
|
||||
source = "${pkg}/lib/NetworkManager/${pkg.networkManagerPlugin}";
|
||||
}) cfg.plugins)
|
||||
// optionalAttrs cfg.enableFccUnlock
|
||||
{
|
||||
"ModemManager/fcc-unlock.d".source =
|
||||
@ -460,18 +457,13 @@ in {
|
||||
{
|
||||
"NetworkManager/dispatcher.d/02overridedns".source = overrideNameserversScript;
|
||||
}
|
||||
// optionalAttrs cfg.enableStrongSwan
|
||||
{
|
||||
"NetworkManager/VPN/nm-strongswan-service.name".source =
|
||||
"${pkgs.networkmanager_strongswan}/lib/NetworkManager/VPN/nm-strongswan-service.name";
|
||||
}
|
||||
// listToAttrs (lib.imap1 (i: s:
|
||||
{
|
||||
name = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}";
|
||||
value = { mode = "0544"; inherit (s) source; };
|
||||
}) cfg.dispatcherScripts);
|
||||
|
||||
environment.systemPackages = cfg.packages;
|
||||
environment.systemPackages = packages;
|
||||
|
||||
users.groups = {
|
||||
networkmanager.gid = config.ids.gids.networkmanager;
|
||||
@ -490,14 +482,13 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
systemd.packages = cfg.packages;
|
||||
systemd.packages = packages;
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /etc/NetworkManager/system-connections 0700 root root -"
|
||||
"d /etc/ipsec.d 0700 root root -"
|
||||
"d /var/lib/NetworkManager-fortisslvpn 0700 root root -"
|
||||
|
||||
"d /var/lib/dhclient 0755 root root -"
|
||||
"d /var/lib/misc 0755 root root -" # for dnsmasq.leases
|
||||
];
|
||||
|
||||
@ -534,8 +525,20 @@ in {
|
||||
useDHCP = false;
|
||||
})
|
||||
|
||||
{
|
||||
networkmanager.plugins = with pkgs; [
|
||||
networkmanager-fortisslvpn
|
||||
networkmanager-iodine
|
||||
networkmanager-l2tp
|
||||
networkmanager-openconnect
|
||||
networkmanager-openvpn
|
||||
networkmanager-vpnc
|
||||
networkmanager-sstp
|
||||
];
|
||||
}
|
||||
|
||||
(mkIf cfg.enableStrongSwan {
|
||||
networkmanager.packages = [ pkgs.networkmanager_strongswan ];
|
||||
networkmanager.plugins = [ pkgs.networkmanager_strongswan ];
|
||||
})
|
||||
|
||||
(mkIf enableIwd {
|
||||
@ -559,10 +562,10 @@ in {
|
||||
security.polkit.enable = true;
|
||||
security.polkit.extraConfig = polkitConf;
|
||||
|
||||
services.dbus.packages = cfg.packages
|
||||
services.dbus.packages = packages
|
||||
++ optional cfg.enableStrongSwan pkgs.strongswanNM
|
||||
++ optional (cfg.dns == "dnsmasq") pkgs.dnsmasq;
|
||||
|
||||
services.udev.packages = cfg.packages;
|
||||
services.udev.packages = packages;
|
||||
};
|
||||
}
|
||||
|
||||
@ -21,7 +21,11 @@ with lib;
|
||||
# way to select them anyway.
|
||||
boot.loader.grub.configurationLimit = 0;
|
||||
|
||||
fileSystems."/".device = "/dev/disk/by-label/nixos";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
autoResize = true;
|
||||
};
|
||||
|
||||
# Allow root logins only using the SSH key that the user specified
|
||||
# at instance creation time, ping client connections to avoid timeouts
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yEd";
|
||||
version = "3.21.1";
|
||||
version = "3.22";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip";
|
||||
sha256 = "1jw28hkd7p0n660gid8yh5y0kdcz6ycn4hsgjlf0pq48x9kv6w0c";
|
||||
sha256 = "sha256-GHYdvWie2k9YarS9DaA4bExswV3UQ26O8+7K/6yvtac=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "taskwarrior";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GothenburgBitFactory";
|
||||
repo = "taskwarrior";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jMZzo2cegoapEHTvfD6ThU1IsXru3iOcpyDbZxkSXzQ=";
|
||||
sha256 = "sha256-0YveqiylXJi4cdDCfnPtwCVOJbQrZYsxnXES+9B4Yfw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
, ninja
|
||||
, clang
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, wrapQtAppsHook
|
||||
, removeReferencesTo
|
||||
, extra-cmake-modules
|
||||
@ -27,7 +26,6 @@
|
||||
, tl-expected
|
||||
, hunspell
|
||||
, glibmm
|
||||
, webkitgtk
|
||||
, jemalloc
|
||||
, rnnoise
|
||||
, abseil-cpp
|
||||
@ -65,7 +63,6 @@
|
||||
, IOSurface
|
||||
, Metal
|
||||
, MetalKit
|
||||
, withWebKit ? false
|
||||
}:
|
||||
|
||||
with lib;
|
||||
@ -113,9 +110,6 @@ stdenv.mkDerivation rec {
|
||||
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
|
||||
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
|
||||
--replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
|
||||
'' + optionalString (stdenv.isLinux && withWebKit) ''
|
||||
substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \
|
||||
--replace '"libwebkit2gtk-4.0.so.37"' '"${webkitgtk}/lib/libwebkit2gtk-4.0.so.37"'
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
substituteInPlace Telegram/CMakeLists.txt \
|
||||
--replace 'COMMAND iconutil' 'COMMAND png2icns' \
|
||||
@ -124,10 +118,6 @@ stdenv.mkDerivation rec {
|
||||
--replace "\''${appicon_path}" "\''${appicon_path}/icon_16x16.png \''${appicon_path}/icon_32x32.png \''${appicon_path}/icon_128x128.png \''${appicon_path}/icon_256x256.png \''${appicon_path}/icon_512x512.png"
|
||||
'';
|
||||
|
||||
# We want to run wrapProgram manually (with additional parameters)
|
||||
dontWrapGApps = stdenv.isLinux;
|
||||
dontWrapQtApps = stdenv.isLinux && withWebKit;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
@ -139,8 +129,6 @@ stdenv.mkDerivation rec {
|
||||
# to build bundled libdispatch
|
||||
clang
|
||||
extra-cmake-modules
|
||||
] ++ optionals (stdenv.isLinux && withWebKit) [
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -166,8 +154,6 @@ stdenv.mkDerivation rec {
|
||||
glibmm
|
||||
jemalloc
|
||||
wayland
|
||||
] ++ optionals (stdenv.isLinux && withWebKit) [
|
||||
webkitgtk
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
Cocoa
|
||||
CoreFoundation
|
||||
@ -225,13 +211,6 @@ stdenv.mkDerivation rec {
|
||||
remove-references-to -t ${tg_owt.dev} $out/bin/$binName
|
||||
'';
|
||||
|
||||
postFixup = optionalString (stdenv.isLinux && withWebKit) ''
|
||||
# We also use gappsWrapperArgs from wrapGAppsHook.
|
||||
wrapProgram $out/bin/kotatogram-desktop \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
"''${qtWrapperArgs[@]}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit tg_owt;
|
||||
};
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk, makeWrapper }:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "${kotatogram-desktop.pname}-with-webkit";
|
||||
version = kotatogram-desktop.version;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r ${kotatogram-desktop}/share $out
|
||||
'';
|
||||
postFixup = ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \
|
||||
--prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \
|
||||
--prefix LD_LIBRARY_PATH : ${makeLibraryPath [ webkitgtk ]}
|
||||
'';
|
||||
meta = kotatogram-desktop.meta // {
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,29 +1,43 @@
|
||||
{ lib, fetchFromGitHub, fetchpatch, makeWrapper, python27Packages, wget, diamond, hmmer }:
|
||||
{ lib
|
||||
, autoPatchelfHook
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
, wget
|
||||
, zlib
|
||||
}:
|
||||
|
||||
python27Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "eggnog-mapper";
|
||||
version = "1.0.3";
|
||||
version = "2.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eggnogdb";
|
||||
repo = "eggnog-mapper";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1aaaflppy84bhkh2hb5gnzm4xgrz0rz0cgfpadr9w8cva8p0sqdv";
|
||||
hash = "sha256-auVD/r8m3TAB1KYMQ7Sae23eDg6LRx/daae0505cjwU=";
|
||||
};
|
||||
|
||||
patches = (fetchpatch {
|
||||
url = "https://github.com/eggnogdb/eggnog-mapper/commit/6972f601ade85b65090efca747d2302acb58507f.patch";
|
||||
sha256 = "0abnmn0bh11jihf5d3cggiild1ykawzv5f5fhb4cyyi8fvy4hcxf";
|
||||
});
|
||||
postPatch = ''
|
||||
# Not a great solution...
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "==" ">="
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
propagatedBuildInputs = [ python27Packages.biopython wget diamond hmmer ];
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
# make emapper find diamond & hmmer
|
||||
makeWrapperArgs = [
|
||||
''--prefix PATH ':' "${diamond}/bin"''
|
||||
''--prefix PATH ':' "${hmmer}/bin"''
|
||||
];
|
||||
buildInputs = [
|
||||
zlib
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
wget
|
||||
] ++ (with python3Packages; [
|
||||
biopython
|
||||
psutil
|
||||
XlsxWriter
|
||||
]);
|
||||
|
||||
# Tests rely on some of the databases being available, which is not bundled
|
||||
# with this package as (1) in total, they represent >100GB of data, and (2)
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmedcon";
|
||||
version = "0.21.2";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0svff8rc3j2p47snaq1hx9mv4ydmxawpb0hf3d165g1ccjwvmm6m";
|
||||
sha256 = "sha256-Ui7XoLSzTMPIFW/3nARCmvlGF+1l7pmcnKsnvn3NFJE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,20 +1,29 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, testVersion, git-sizer }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "git-sizer";
|
||||
version = "1.3.0";
|
||||
|
||||
goPackagePath = "github.com/github/git-sizer";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0kmyvai5xfalm56ywa6mhdvvjnacdzwcyz28bw0pz9a4gyf1mgvh";
|
||||
sha256 = "sha256-On7QBTzKfnuuzwMQ8m1odxGqfIKL+EDg5V05Kxuhmqw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-oRlsD99XiI/0ZWibjyRcycmGab+vMbXrV5hIdIyUDYg=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.BuildVersion=${version}" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests.vesion = testVersion {
|
||||
package = git-sizer;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Compute various size metrics for a Git repository";
|
||||
homepage = "https://github.com/github/git-sizer";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, substituteAll, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash }:
|
||||
{ lib, stdenv, substituteAll, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash, withManOptDedupPatch ? false }:
|
||||
|
||||
let
|
||||
|
||||
@ -36,6 +36,10 @@ let
|
||||
src = ./catalog-legacy-uris.patch;
|
||||
inherit legacySuffix suffix version;
|
||||
})
|
||||
] ++ lib.optionals withManOptDedupPatch [
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/166304
|
||||
# https://github.com/docbook/xslt10-stylesheets/pull/241
|
||||
./fix-man-options-duplication.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ findXMLCatalogs ];
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- a/manpages/lists.xsl
|
||||
+++ b/manpages/lists.xsl
|
||||
@@ -110,7 +110,7 @@
|
||||
<xsl:text>.RE </xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
-<xsl:template match="d:varlistentry/d:term"/>
|
||||
+<xsl:template match="d:varlistentry/d:term" priority="1"/>
|
||||
<xsl:template match="d:glossentry/d:glossterm"/>
|
||||
|
||||
<xsl:template match="d:variablelist[ancestor::d:listitem or ancestor::d:step or ancestor::d:glossdef]|
|
||||
15
pkgs/development/libraries/boost/1.78.nix
Normal file
15
pkgs/development/libraries/boost/1.78.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.78.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
"https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
|
||||
];
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_78_0.html
|
||||
sha256 = "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc";
|
||||
};
|
||||
})
|
||||
|
||||
@ -45,4 +45,5 @@ in {
|
||||
boost174 = makeBoost ./1.74.nix;
|
||||
boost175 = makeBoost ./1.75.nix;
|
||||
boost177 = makeBoost ./1.77.nix;
|
||||
boost178 = makeBoost ./1.78.nix;
|
||||
}
|
||||
|
||||
@ -38,13 +38,9 @@ stdenv.mkDerivation rec {
|
||||
"-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||
"-DLEVELDB_BUILD_TESTS=OFF"
|
||||
"-DLEVELDB_BUILD_BENCHMARKS=OFF"
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
|
||||
# remove shared objects from "all" target
|
||||
sed -i '/^all:/ s/$(SHARED_LIBS) $(SHARED_PROGRAMS)//' Makefile
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace "$out"/lib/cmake/leveldb/leveldbTargets.cmake \
|
||||
--replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES "'$dev'"'
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "azure-storage-azcopy";
|
||||
version = "10.13.0";
|
||||
version = "10.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-storage-azcopy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-L5gfS2hwk1uaWEygn+liupdANL9qizHAjxNz25KBwaY=";
|
||||
sha256 = "sha256-9NuX4BbQx/ZeWvyTxlZjrb7ETwSFwBpfDcSt8qvKAxE=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-ePEpc18Y99Moe/aj8n1+no6D70vZoIEjC023Uup98Uo=";
|
||||
vendorSha256 = "sha256-9ThsJySzsyS0eX/0BlAAvtaeJpPYCP0cN1YgIShYrKw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "clj-kondo";
|
||||
version = "2022.03.09";
|
||||
version = "2022.04.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-gPn3wORb30I/zTXUdxUxMesKFJx6ES7jEjUYuC/DAVI=";
|
||||
sha256 = "sha256-dZtiwePwgLgKc0WkSnxI2zW9hOWKVW5+rO905LQhgvQ=";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, makeWrapper
|
||||
, bridge-utils, iproute2, lxc, openvswitch, docker, busybox, dhcpcd, dhcp
|
||||
, bridge-utils, iproute2, lxc, openvswitch, docker, busybox, dhcpcd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||
installPhase = ''
|
||||
install -D pipework $out/bin/pipework
|
||||
wrapProgram $out/bin/pipework --prefix PATH : \
|
||||
${lib.makeBinPath [ bridge-utils iproute2 lxc openvswitch docker busybox dhcpcd dhcp ]};
|
||||
${lib.makeBinPath [ bridge-utils iproute2 lxc openvswitch docker busybox dhcpcd ]};
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "Software-Defined Networking tools for LXC";
|
||||
|
||||
@ -18,9 +18,10 @@ let
|
||||
plat = elemAt info 1;
|
||||
shas =
|
||||
{
|
||||
x86_64-linux = "1s16l95wc589cr69pfbgmkn9rkvxn6sd6jlbiqpm6p6iyxiaxd6c";
|
||||
x86_64-darwin = "05h7pvq4pb816wgcymnfklp3w6sv54x6138v2infw5219dnk8pfs";
|
||||
aarch64-linux = "0q4xnjzhlx1b2lkikca88qh9glfxaifsm419k2bxxlrfrx31zlkq";
|
||||
x86_64-linux = "1s16l95wc589cr69pfbgmkn9rkvxn6sd6jlbiqpm6p6iyxiaxd6c";
|
||||
x86_64-darwin = "05h7pvq4pb816wgcymnfklp3w6sv54x6138v2infw5219dnk8pfs";
|
||||
aarch64-linux = "0q4xnjzhlx1b2lkikca88qh9glfxaifsm419k2bxxlrfrx31zlkq";
|
||||
aarch64-darwin = "067mb1dianwiarw8cz1va4g6zfhp9ls4s174xbpkxwsknvvyhgz6";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
@ -44,7 +45,8 @@ stdenv.mkDerivation rec {
|
||||
"ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook;
|
||||
|
||||
buildInputs = [ jre_headless util-linux zlib ];
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgbouncer";
|
||||
version = "1.16.1";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1z7p3ghpmbp5qv1bz9s186jn0hfnr300dc5p0hmh6vbnwklpfx08";
|
||||
sha256 = "sha256-ZXMJt7xceoXL9wqaRBtTX3gkEjCB6rt7qG0ANJolbiM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
{ lib, stdenv, gtk, pkg-config, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dragon-drop";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mwh";
|
||||
repo = "dragon";
|
||||
rev = "v${version}";
|
||||
sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk ];
|
||||
|
||||
installPhase = ''
|
||||
install -D dragon -t $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple drag-and-drop source/sink for X";
|
||||
homepage = "https://github.com/mwh/dragon";
|
||||
maintainers = with maintainers; [ jb55 markus1189 ];
|
||||
license = licenses.gpl3;
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
@ -2,19 +2,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdragon";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mwh";
|
||||
repo = "dragon";
|
||||
rev = "v${version}";
|
||||
sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra";
|
||||
sha256 = "sha256-wqG6idlVvdN+sPwYgWu3UL0la5ssvymZibiak3KeV7M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk3 ];
|
||||
|
||||
installFlags = [ "PREFIX=${placeholder "out"}/bin" ];
|
||||
installFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
postInstall = ''
|
||||
ln -s $out/bin/dragon $out/bin/xdragon
|
||||
'';
|
||||
@ -9,22 +9,23 @@
|
||||
, nixosTests
|
||||
, Security
|
||||
, Foundation
|
||||
, Cocoa
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "starship";
|
||||
version = "1.3.0";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starship";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mqUE4JzNBhvtDpT2LM23eHX8q93wtPqA+/zr/PxEDiE=";
|
||||
sha256 = "sha256-nLzqfSRmA+D310MDvX+g8nNsoaiSixG+j+g87CPzYMs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
||||
buildInputs = [ libgit2 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation ];
|
||||
buildInputs = [ libgit2 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security Foundation Cocoa ];
|
||||
|
||||
postInstall = ''
|
||||
for shell in bash fish zsh; do
|
||||
@ -33,7 +34,7 @@ rustPlatform.buildRustPackage rec {
|
||||
done
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-hQNDiayVT4UgbxcxdXssi/evPvwgyvG/UOFyEHj7jpo=";
|
||||
cargoSha256 = "sha256-FXzAvO11NIr6dxF2OeV5XJWHG2kgZiASuBnoC6mSps8=";
|
||||
|
||||
preCheck = ''
|
||||
HOME=$TMPDIR
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tmux-mem-cpu-load";
|
||||
version = "3.5.1";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thewtex";
|
||||
repo = "tmux-mem-cpu-load";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4ZMF+RacZL9dJRCz63XPNuigTKHOW+ZcA4vB4jsnASc=";
|
||||
sha256 = "sha256-1smhlp30y0qihm+d9RcCKY1CFbPm5gzago+OIQQT5jE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,15 +1,19 @@
|
||||
{ stdenv, fetchurl, fetchpatch, perl, file, nettools, iputils, iproute2, makeWrapper
|
||||
, coreutils, gnused, openldap ? null
|
||||
, buildPackages, lib
|
||||
|
||||
# client and relay are end of life, remove after 4.4.3
|
||||
, withClient ? false
|
||||
, withRelay ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dhcp";
|
||||
version = "4.4.2-P1";
|
||||
version = "4.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.isc.org/isc/dhcp/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "06jsr0cg5rsmyibshrpcb9za0qgwvqccashdma7mlm1rflrh8pmh";
|
||||
sha256 = "sha256-Dj7GtMKgXsAUiHS82ZmmbQVRg3jXdCH2B/sLydATWBg=";
|
||||
};
|
||||
|
||||
patches =
|
||||
@ -18,20 +22,6 @@ stdenv.mkDerivation rec {
|
||||
# patch, the hostname doesn't get set properly if the old
|
||||
# hostname (i.e. before reboot) is equal to the new hostname.
|
||||
./set-hostname.patch
|
||||
|
||||
(fetchpatch {
|
||||
# upstream build fix against -fno-common compilers like >=gcc-10
|
||||
url = "https://gitlab.isc.org/isc-projects/dhcp/-/commit/6c7e61578b1b449272dbb40dd8b98d03dad8a57a.patch";
|
||||
sha256 = "1g37ix0yf9zza8ri8bg438ygcjviniblfyb20y4gzc8lysy28m8b";
|
||||
})
|
||||
|
||||
# Fix parallel build failure, the patch is pending upstream inclusion:
|
||||
# https://gitlab.isc.org/isc-projects/dhcp/-/merge_requests/76
|
||||
(fetchpatch {
|
||||
name = "parallel-make.patch";
|
||||
url = "https://gitlab.isc.org/isc-projects/dhcp/-/commit/46d101b97c5a3b19a3f63f7b60e5f88994a64e22.patch";
|
||||
sha256 = "1y3nsmqjzcg4bhp1xmqp47v7rkl3bpcildkx6mlrg255yvxapmdp";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ perl makeWrapper ];
|
||||
@ -77,6 +67,10 @@ stdenv.mkDerivation rec {
|
||||
--replace /sbin/ip ${iproute2}/sbin/ip
|
||||
wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \
|
||||
"${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin"
|
||||
'' + lib.optionalString (!withClient) ''
|
||||
rm $out/sbin/{dhclient,dhclient-script,.dhclient-script-wrapped}
|
||||
'' + lib.optionalString (!withRelay) ''
|
||||
rm $out/sbin/dhcrelay
|
||||
'';
|
||||
|
||||
preConfigure =
|
||||
@ -103,5 +97,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.isc.org/dhcp/";
|
||||
license = licenses.mpl20;
|
||||
platforms = platforms.unix;
|
||||
knownVulnerabilities = lib.optional (withClient || withRelay) "The client and relay component of the dhcp package have reached their end of life";
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
, polkit
|
||||
, gnutls
|
||||
, ppp
|
||||
, dhcp
|
||||
, dhcpcd
|
||||
, iptables
|
||||
, nftables
|
||||
, python3
|
||||
@ -96,9 +96,9 @@ stdenv.mkDerivation rec {
|
||||
"-Dresolvconf=${openresolv}/bin/resolvconf"
|
||||
|
||||
# DHCP clients
|
||||
"-Ddhclient=${dhcp}/bin/dhclient"
|
||||
# Upstream prefers dhclient, so don't add dhcpcd to the closure
|
||||
"-Ddhcpcd=no"
|
||||
# ISC DHCP client has reached it's end of life, so stop using it
|
||||
"-Ddhclient=no"
|
||||
"-Ddhcpcd=${dhcpcd}/bin/dhcpcd"
|
||||
"-Ddhcpcanon=no"
|
||||
|
||||
# Miscellaneous
|
||||
|
||||
@ -73,6 +73,7 @@ stdenv.mkDerivation rec {
|
||||
attrPath = "networkmanager-fortisslvpn";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
networkManagerPlugin = "VPN/nm-fortisslvpn-service.name";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -48,6 +48,7 @@ in stdenv.mkDerivation {
|
||||
packageName = pname;
|
||||
attrPath = "networkmanager-iodine";
|
||||
};
|
||||
networkManagerPlugin = "VPN/nm-iodine-service.name";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -41,6 +41,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
networkManagerPlugin = "VPN/nm-l2tp-service.name";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "L2TP plugin for NetworkManager";
|
||||
inherit (networkmanager.meta) platforms;
|
||||
|
||||
@ -69,6 +69,7 @@ stdenv.mkDerivation rec {
|
||||
attrPath = "networkmanager-openconnect";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
networkManagerPlugin = "VPN/nm-openconnect-service.name";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -67,6 +67,7 @@ stdenv.mkDerivation rec {
|
||||
attrPath = "networkmanager-openvpn";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
networkManagerPlugin = "VPN/nm-openvpn-service.name";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -54,6 +54,7 @@ in stdenv.mkDerivation {
|
||||
packageName = pname;
|
||||
attrPath = "networkmanager-sstp";
|
||||
};
|
||||
networkManagerPlugin = "VPN/nm-sstp-service.name";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
|
||||
"--with-nm-plugindir=$(out)/lib/NetworkManager"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
networkManagerPlugin = "VPN/nm-strongswan-service.name";
|
||||
};
|
||||
|
||||
PKG_CONFIG_LIBNM_VPNSERVICEDIR = "$(out)/lib/NetworkManager/VPN";
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
|
||||
attrPath = "networkmanager-vpnc";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
networkManagerPlugin = "VPN/nm-vpnc-service.name";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -316,6 +316,7 @@ mapAliases ({
|
||||
dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10
|
||||
dotnet-netcore = dotnet-runtime; # Added 2021-10-07
|
||||
double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22
|
||||
dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10;
|
||||
draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14
|
||||
dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03
|
||||
dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22
|
||||
|
||||
@ -3008,10 +3008,6 @@ with pkgs;
|
||||
|
||||
dpic = callPackage ../tools/graphics/dpic { };
|
||||
|
||||
dragon-drop = callPackage ../tools/X11/dragon-drop {
|
||||
gtk = gtk3;
|
||||
};
|
||||
|
||||
dstp = callPackage ../development/tools/dstp { };
|
||||
|
||||
dsvpn = callPackage ../applications/networking/dsvpn { };
|
||||
@ -16280,6 +16276,7 @@ with pkgs;
|
||||
boost174
|
||||
boost175
|
||||
boost177
|
||||
boost178
|
||||
;
|
||||
|
||||
boost15x = boost159;
|
||||
@ -24297,7 +24294,7 @@ with pkgs;
|
||||
stdmanpages = callPackage ../data/documentation/std-man-pages { };
|
||||
|
||||
starship = callPackage ../tools/misc/starship {
|
||||
inherit (darwin.apple_sdk.frameworks) Security Foundation;
|
||||
inherit (darwin.apple_sdk.frameworks) Security Foundation Cocoa;
|
||||
};
|
||||
|
||||
stig = callPackage ../applications/networking/p2p/stig { };
|
||||
@ -27058,6 +27055,8 @@ with pkgs;
|
||||
abseil-cpp = abseil-cpp_202111;
|
||||
};
|
||||
|
||||
kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix {};
|
||||
|
||||
kpt = callPackage ../applications/networking/cluster/kpt { };
|
||||
|
||||
krane = callPackage ../applications/networking/cluster/krane { };
|
||||
@ -34029,7 +34028,7 @@ with pkgs;
|
||||
|
||||
sift = callPackage ../tools/text/sift { };
|
||||
|
||||
xdragon = lowPrio (callPackage ../applications/misc/xdragon { });
|
||||
xdragon = lowPrio (callPackage ../tools/X11/xdragon { });
|
||||
|
||||
xlockmore = callPackage ../misc/screensavers/xlockmore { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user