From 2bc26039f34667943c9eaa33891fea73dd8ff3bf Mon Sep 17 00:00:00 2001 From: eyjhb Date: Mon, 19 Apr 2021 08:34:48 +0200 Subject: displaylink: 5.3.1 -> 5.4.0 --- pkgs/os-specific/linux/displaylink/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index bd50852bd9d45..ca3e38c2e7076 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -20,17 +20,17 @@ let in stdenv.mkDerivation rec { pname = "displaylink"; - version = "5.3.1.34"; + version = "5.4.0-55.153"; src = requireFile rec { name = "displaylink.zip"; - sha256 = "1c1kbjgpb71f73qnyl44rvwi6l4ivddq789rwvvh0ahw2jm324hy"; + sha256 = "1m2l3bnlfwfp94w7khr05npsbysg9mcyi7hi85n78xkd0xdcxml8"; message = '' In order to install the DisplayLink drivers, you must first comply with DisplayLink's EULA and download the binaries and sources from here: - https://www.displaylink.com/downloads/file?id=1576 + https://www.synaptics.com/node/3751 Once you have downloaded the file, please use the following commands and re-run the installation: -- cgit 1.4.1 From e153deef61ade71d17b02bbc82dd1d38f8f86c34 Mon Sep 17 00:00:00 2001 From: eyjhb Date: Mon, 19 Apr 2021 08:35:00 +0200 Subject: evdi: v1.7.2 -> unstable-20210401 --- pkgs/os-specific/linux/evdi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 0f56d0e95ca6e..a8a0445e955d5 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "evdi"; - version = "v1.7.2"; + version = "unstable-20210401"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = version; - sha256 = "074j0xh037n8mc4isihfz9lap57wvxaxib32pvy6jhjl3wyik632"; + rev = "b0b3d131b26df62664ca33775679eea7b70c47b1"; + sha256 = "09apbvdc78bbqzja9z3b1wrwmqkv3k7cn3lll5gsskxjnqbhxk9y"; }; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = with licenses; [ lgpl21 gpl2 ]; homepage = "https://www.displaylink.com/"; - broken = versionOlder kernel.version "4.9" || stdenv.isAarch64; + broken = versionOlder kernel.version "4.19" || stdenv.isAarch64; }; } -- cgit 1.4.1 From 89524c348a36098dcddc11e53d251e7f715eac84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 04:26:48 +0000 Subject: agi: 1.1.0-dev-20210413 -> 1.1.0-dev-20210421 --- pkgs/tools/graphics/agi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 3fe6698846e52..aca53c2546195 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "1.1.0-dev-20210413"; + version = "1.1.0-dev-20210421"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "13i6n95d0cjrhx68qsich6xzk5f9ga0y3m19k4z2d58s164rnh0v"; + sha256 = "sha256-2IgGvQy6omDEwrzQDfa/OLi3f+Q2zarvJVGk6ZhsjSA="; }; nativeBuildInputs = [ -- cgit 1.4.1 From d1930e09be09dc841cc0ba3813b335e3e64f6268 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 04:42:28 +0000 Subject: alertmanager-irc-relay: 0.3.1 -> 0.4.1 --- pkgs/servers/monitoring/alertmanager-irc-relay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix index c3c60e1d4a2c7..50cf5a00164c7 100644 --- a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix +++ b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "alertmanager-irc-relay"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "google"; repo = "alertmanager-irc-relay"; rev = "v${version}"; - sha256 = "sha256-IlWXsQZtDXG8sJBV+82BzEFj+JtUbfTOZyqYOrZFTXA="; + sha256 = "sha256-02uEvcxT5+0OJtqOyuQjgkqL0fZnN7umCSxBqAVPT9U="; }; vendorSha256 = "sha256-VLG15IXS/fXFMTCJKEqGW6qZ9aOLPhazidVsOywG+w4="; -- cgit 1.4.1 From 1d86d9e37c3c5f4c4bfad374e959d8d9ad885a19 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 22 Apr 2021 09:39:23 +0100 Subject: deno: add libiconv as a darwin dependency --- pkgs/development/web/deno/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index a2e286d8bc561..4586477293b57 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -5,6 +5,7 @@ , rust , rustPlatform , installShellFiles +, libiconv , libobjc , Security , CoreServices @@ -28,7 +29,7 @@ rustPlatform.buildRustPackage rec { # Install completions post-install nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ libobjc Security CoreServices Metal Foundation ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv libobjc Security CoreServices Metal Foundation ]; # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem # To avoid this we pre-download the file and place it in the locations it will require it in advance -- cgit 1.4.1 From dcbd1aa1fac492e0121428d254f3885569593ed4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 09:12:26 +0000 Subject: exoscale-cli: 1.27.2 -> 1.28.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index c098fa278b3d7..3f0aca33d61d4 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.27.2"; + version = "1.28.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Wq3CWKYuF4AaOVpe0sGn9BzLx/6rSPFN6rFc2jUUVEA="; + sha256 = "sha256-YbWh4ZIlcxAD/8F/fsYIWjv5hKaHNNi+sNrD7Ax/xDw="; }; goPackagePath = "github.com/exoscale/cli"; -- cgit 1.4.1 From e4851395412561a7251bd61ca25572b84aa33256 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 10:35:57 +0000 Subject: gotestsum: 1.6.3 -> 1.6.4 --- pkgs/development/tools/gotestsum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 6c6d6343d4379..e9bc48b0dcf21 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotestsum"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "sha256-xUDhJLTO3JZ7rlUUzcypUev60qmRK9zOlO2VYeXqT4o="; + sha256 = "sha256-5iSUk/J73enbc/N3bn7M4oj2A0yoF1jTWpnXD380hFI="; }; vendorSha256 = "sha256-sHi8iW+ZV/coeAwDUYnSH039UNtUO9HK0Bhz9Gmtv8k="; -- cgit 1.4.1 From 40945d399d0ff05e24891a989f5fe48a6e4d316a Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Thu, 22 Apr 2021 12:27:22 +0200 Subject: quagga: remove Upstream repositories do no longer exists. There has been no release in a while. - Not a good combination for a network daemon running as root in C that parses network packets... --- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + nixos/modules/services/networking/quagga.nix | 185 --------------------------- nixos/tests/all-tests.nix | 1 - nixos/tests/quagga.nix | 96 -------------- pkgs/servers/quagga/default.nix | 73 ----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 8 files changed, 2 insertions(+), 358 deletions(-) delete mode 100644 nixos/modules/services/networking/quagga.nix delete mode 100644 nixos/tests/quagga.nix delete mode 100644 pkgs/servers/quagga/default.nix (limited to 'pkgs') diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0bf944d364b88..11c18a9df4b49 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -767,7 +767,6 @@ ./services/networking/prayer.nix ./services/networking/privoxy.nix ./services/networking/prosody.nix - ./services/networking/quagga.nix ./services/networking/quassel.nix ./services/networking/quorum.nix ./services/networking/quicktun.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 9f1efc4627984..233e3ee848be8 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -18,6 +18,7 @@ with lib; # Completely removed modules (mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "quagga" ] "the corresponding package has been removed from nixpkgs") (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "") diff --git a/nixos/modules/services/networking/quagga.nix b/nixos/modules/services/networking/quagga.nix deleted file mode 100644 index 001a5c2b0ce85..0000000000000 --- a/nixos/modules/services/networking/quagga.nix +++ /dev/null @@ -1,185 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.quagga; - - services = [ "babel" "bgp" "isis" "ospf6" "ospf" "pim" "rip" "ripng" ]; - allServices = services ++ [ "zebra" ]; - - isEnabled = service: cfg.${service}.enable; - - daemonName = service: if service == "zebra" then service else "${service}d"; - - configFile = service: - let - scfg = cfg.${service}; - in - if scfg.configFile != null then scfg.configFile - else pkgs.writeText "${daemonName service}.conf" - '' - ! Quagga ${daemonName service} configuration - ! - hostname ${config.networking.hostName} - log syslog - service password-encryption - ! - ${scfg.config} - ! - end - ''; - - serviceOptions = service: - { - enable = mkEnableOption "the Quagga ${toUpper service} routing protocol"; - - configFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/etc/quagga/${daemonName service}.conf"; - description = '' - Configuration file to use for Quagga ${daemonName service}. - By default the NixOS generated files are used. - ''; - }; - - config = mkOption { - type = types.lines; - default = ""; - example = - let - examples = { - rip = '' - router rip - network 10.0.0.0/8 - ''; - - ospf = '' - router ospf - network 10.0.0.0/8 area 0 - ''; - - bgp = '' - router bgp 65001 - neighbor 10.0.0.1 remote-as 65001 - ''; - }; - in - examples.${service} or ""; - description = '' - ${daemonName service} configuration statements. - ''; - }; - - vtyListenAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = '' - Address to bind to for the VTY interface. - ''; - }; - - vtyListenPort = mkOption { - type = types.nullOr types.int; - default = null; - description = '' - TCP Port to bind to for the VTY interface. - ''; - }; - }; - -in - -{ - - ###### interface - imports = [ - { - options.services.quagga = { - zebra = (serviceOptions "zebra") // { - enable = mkOption { - type = types.bool; - default = any isEnabled services; - description = '' - Whether to enable the Zebra routing manager. - - The Zebra routing manager is automatically enabled - if any routing protocols are configured. - ''; - }; - }; - }; - } - { options.services.quagga = (genAttrs services serviceOptions); } - ]; - - ###### implementation - - config = mkIf (any isEnabled allServices) { - - environment.systemPackages = [ - pkgs.quagga # for the vtysh tool - ]; - - users.users.quagga = { - description = "Quagga daemon user"; - isSystemUser = true; - group = "quagga"; - }; - - users.groups = { - quagga = {}; - # Members of the quaggavty group can use vtysh to inspect the Quagga daemons - quaggavty = { members = [ "quagga" ]; }; - }; - - systemd.services = - let - quaggaService = service: - let - scfg = cfg.${service}; - daemon = daemonName service; - in - nameValuePair daemon ({ - wantedBy = [ "multi-user.target" ]; - restartTriggers = [ (configFile service) ]; - - serviceConfig = { - Type = "forking"; - PIDFile = "/run/quagga/${daemon}.pid"; - ExecStart = "@${pkgs.quagga}/libexec/quagga/${daemon} ${daemon} -d -f ${configFile service}" - + optionalString (scfg.vtyListenAddress != "") " -A ${scfg.vtyListenAddress}" - + optionalString (scfg.vtyListenPort != null) " -P ${toString scfg.vtyListenPort}"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - Restart = "on-abort"; - }; - } // ( - if service == "zebra" then - { - description = "Quagga Zebra routing manager"; - unitConfig.Documentation = "man:zebra(8)"; - after = [ "network.target" ]; - preStart = '' - install -m 0755 -o quagga -g quagga -d /run/quagga - - ${pkgs.iproute2}/bin/ip route flush proto zebra - ''; - } - else - { - description = "Quagga ${toUpper service} routing daemon"; - unitConfig.Documentation = "man:${daemon}(8) man:zebra(8)"; - bindsTo = [ "zebra.service" ]; - after = [ "network.target" "zebra.service" ]; - } - )); - in - listToAttrs (map quaggaService (filter isEnabled allServices)); - - }; - - meta.maintainers = with lib.maintainers; [ ]; - -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 6f756aa85cdfa..a6a1c5619b011 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -342,7 +342,6 @@ in proxy = handleTest ./proxy.nix {}; pt2-clone = handleTest ./pt2-clone.nix {}; qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {}; - quagga = handleTest ./quagga.nix {}; quorum = handleTest ./quorum.nix {}; rabbitmq = handleTest ./rabbitmq.nix {}; radarr = handleTest ./radarr.nix {}; diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix deleted file mode 100644 index 1067f9eebb20e..0000000000000 --- a/nixos/tests/quagga.nix +++ /dev/null @@ -1,96 +0,0 @@ -# This test runs Quagga and checks if OSPF routing works. -# -# Network topology: -# [ client ]--net1--[ router1 ]--net2--[ router2 ]--net3--[ server ] -# -# All interfaces are in OSPF Area 0. - -import ./make-test-python.nix ({ pkgs, ... }: - let - - ifAddr = node: iface: (pkgs.lib.head node.config.networking.interfaces.${iface}.ipv4.addresses).address; - - ospfConf = '' - interface eth2 - ip ospf hello-interval 1 - ip ospf dead-interval 5 - ! - router ospf - network 192.168.0.0/16 area 0 - ''; - - in - { - name = "quagga"; - - meta = with pkgs.lib.maintainers; { - maintainers = [ ]; - }; - - nodes = { - - client = - { nodes, ... }: - { - virtualisation.vlans = [ 1 ]; - networking.defaultGateway = ifAddr nodes.router1 "eth1"; - }; - - router1 = - { ... }: - { - virtualisation.vlans = [ 1 2 ]; - boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; - networking.firewall.extraCommands = "iptables -A nixos-fw -i eth2 -p ospf -j ACCEPT"; - services.quagga.ospf = { - enable = true; - config = ospfConf; - }; - }; - - router2 = - { ... }: - { - virtualisation.vlans = [ 3 2 ]; - boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; - networking.firewall.extraCommands = "iptables -A nixos-fw -i eth2 -p ospf -j ACCEPT"; - services.quagga.ospf = { - enable = true; - config = ospfConf; - }; - }; - - server = - { nodes, ... }: - { - virtualisation.vlans = [ 3 ]; - networking.defaultGateway = ifAddr nodes.router2 "eth1"; - networking.firewall.allowedTCPPorts = [ 80 ]; - services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.com"; - }; - }; - - testScript = - { ... }: - '' - start_all() - - # Wait for the networking to start on all machines - for machine in client, router1, router2, server: - machine.wait_for_unit("network.target") - - with subtest("Wait for OSPF to form adjacencies"): - for gw in router1, router2: - gw.wait_for_unit("ospfd") - gw.wait_until_succeeds("vtysh -c 'show ip ospf neighbor' | grep Full") - gw.wait_until_succeeds("vtysh -c 'show ip route' | grep '^O>'") - - with subtest("Test ICMP"): - client.wait_until_succeeds("ping -c 3 server >&2") - - with subtest("Test whether HTTP works"): - server.wait_for_unit("httpd") - client.succeed("curl --fail http://server/ >&2") - ''; - }) diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix deleted file mode 100644 index 2e2fac575a624..0000000000000 --- a/pkgs/servers/quagga/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib, stdenv, fetchurl, libcap, libnl, readline, net-snmp, less, perl, texinfo, - pkg-config, c-ares }: - -stdenv.mkDerivation rec { - pname = "quagga"; - version = "1.2.4"; - - src = fetchurl { - url = "mirror://savannah/quagga/${pname}-${version}.tar.gz"; - sha256 = "1lsksqxij5f1llqn86pkygrf5672kvrqn1kvxghi169hqf1c0r73"; - }; - - buildInputs = - [ readline net-snmp c-ares ] - ++ lib.optionals stdenv.isLinux [ libcap libnl ]; - - nativeBuildInputs = [ pkg-config perl texinfo ]; - - configureFlags = [ - "--sysconfdir=/etc/quagga" - "--localstatedir=/run/quagga" - "--sbindir=$(out)/libexec/quagga" - "--disable-exampledir" - "--enable-user=quagga" - "--enable-group=quagga" - "--enable-configfile-mask=0640" - "--enable-logfile-mask=0640" - "--enable-vtysh" - "--enable-vty-group=quaggavty" - "--enable-snmp" - "--enable-multipath=64" - "--enable-rtadv" - "--enable-irdp" - "--enable-opaque-lsa" - "--enable-ospf-te" - "--enable-pimd" - "--enable-isis-topology" - ]; - - preConfigure = '' - substituteInPlace vtysh/vtysh.c --replace \"more\" \"${less}/bin/less\" - ''; - - postInstall = '' - rm -f $out/bin/test_igmpv3_join - mv -f $out/libexec/quagga/ospfclient $out/bin/ - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Quagga BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite"; - longDescription = '' - GNU Quagga is free software which manages TCP/IP based routing protocols. - It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2, and RIPng as - well as the IPv6 versions of these. - - As the predecessor Zebra has been considered orphaned, the Quagga project - has been formed by members of the zebra mailing list and the former - zebra-pj project to continue developing. - - Quagga uses threading if the kernel supports it, but can also run on - kernels that do not support threading. Each protocol has its own daemon. - - It is more than a routed replacement, it can be used as a Route Server and - a Route Reflector. - ''; - homepage = "https://www.nongnu.org/quagga/"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f4b1963ab5c88..999c26e320bde 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -602,6 +602,7 @@ mapAliases ({ phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24 python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 + quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # added 2021-04-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8f781f0e10a9..8ebb7d34e376d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19135,8 +19135,6 @@ in qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { }; - quagga = callPackage ../servers/quagga { }; - rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; elixir = beam_nox.interpreters.elixir_1_8; -- cgit 1.4.1 From fc0a5b577e0fe74daac16dc562b818f203bad07b Mon Sep 17 00:00:00 2001 From: pennae Date: Wed, 21 Apr 2021 15:20:34 +0200 Subject: xinit: don't unset DBUS_SESSION_BUS_ADDRESS in startx upstream startx unsets DBUS_SESSION_BUS_ADDRESS, which in turn breaks applications run under the startx display manager. arch has shipped this patch for years as well. (with review changes from @Mic92) --- pkgs/servers/x11/xorg/overrides.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pkgs') diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 4c83229159536..c25285d13ed31 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -773,6 +773,14 @@ self: super: "--with-launchdaemons-dir=\${out}/LaunchDaemons" "--with-launchagents-dir=\${out}/LaunchAgents" ]; + patches = [ + # don't unset DBUS_SESSION_BUS_ADDRESS in startx + (fetchpatch { + name = "dont-unset-DBUS_SESSION_BUS_ADDRESS.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/repos/extra-x86_64/fs46369.patch?h=packages/xorg-xinit&id=40f3ac0a31336d871c76065270d3f10e922d06f3"; + sha256 = "18kb88i3s9nbq2jxl7l2hyj6p56c993hivk8mzxg811iqbbawkp7"; + }) + ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xauth ] ++ lib.optionals isDarwin [ self.libX11 self.xorgproto ]; postFixup = '' -- cgit 1.4.1 From 3c17fe5161bac1df324fe5f9d047cef913b12088 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Apr 2021 13:36:58 +0200 Subject: python3Packages.brother: 0.2.2 -> 1.0.0 --- pkgs/development/python-modules/brother/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index e4f9d63bd6b17..9f41ed5756f57 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "brother"; - version = "0.2.2"; + version = "1.0.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-vIefcL3K3ZbAUxMFM7gbbTFdrnmufWZHcq4OA19SYXE="; + sha256 = "sha256-0NfqPlQiOkNhR+H55E9LE4dGa9R8vcSyPNbbIeiRJV8="; }; postPatch = '' -- cgit 1.4.1 From f29292db76356bfbd02dceb2ca795f67b68d2be6 Mon Sep 17 00:00:00 2001 From: José Luis Lafuente Date: Tue, 16 Mar 2021 19:39:23 +0100 Subject: tree-sitter: Add withPlugins --- .../tools/parsing/tree-sitter/default.nix | 31 +++++++++++++++++++++- pkgs/misc/vim-plugins/overrides.nix | 21 +++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 0ce151f650719..293b8bb095a74 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -71,6 +71,35 @@ let in lib.mapAttrs change grammars; + # Usage: + # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ]) + # + # or for all grammars: + # pkgs.tree-sitter.withPlugins (_: allGrammars) + # which is equivalent to + # pkgs.tree-sitter.withPlugins (p: builtins.attrValues p) + withPlugins = grammarFn: + let + grammars = grammarFn builtGrammars; + in + linkFarm "grammars" + (map + (drv: + let + name = lib.strings.getName drv; + in + { + name = + (lib.strings.removePrefix "tree-sitter-" + (lib.strings.removeSuffix "-grammar" name)) + + stdenv.hostPlatform.extensions.sharedLibrary; + path = "${drv}/parser"; + } + ) + grammars); + + allGrammars = builtins.attrValues builtGrammars; + in rustPlatform.buildRustPackage { pname = "tree-sitter"; @@ -111,7 +140,7 @@ rustPlatform.buildRustPackage { updater = { inherit update-all-grammars; }; - inherit grammars builtGrammars; + inherit grammars builtGrammars withPlugins allGrammars; tests = { # make sure all grammars build diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 7e12d083c32f9..3e352977d56ef 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -50,6 +50,9 @@ , CoreFoundation , CoreServices +# nvim-treesitter dependencies +, tree-sitter + # sved dependencies , glib , gobject-introspection @@ -364,6 +367,24 @@ self: super: { dependencies = with super; [ popfix ]; }); + # Usage: + # pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ]) + # or for all grammars: + # pkgs.vimPlugins.nvim-treesitter.withPlugins (_: tree-sitter.allGrammars) + nvim-treesitter = super.nvim-treesitter.overrideAttrs (old: { + passthru.withPlugins = + grammarFn: self.nvim-treesitter.overrideAttrs (_: { + postPatch = + let + grammars = tree-sitter.withPlugins grammarFn; + in + '' + rm -r parser + ln -s ${grammars} parser + ''; + }); + }); + onehalf = super.onehalf.overrideAttrs (old: { configurePhase = "cd vim"; }); -- cgit 1.4.1 From 407e4481148bb482fb2eb75ce058c981e99549b3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 22 Apr 2021 11:54:07 +0000 Subject: gcc8,gcc9: fix ctypes on NetBSD This patch was applied to gcc7 in aab8c7ba437 ("netbsd: add cross target"), but it hasn't been brought forward to newer compilers that have the same problem. GCC 6 and (probably) GCC 4.9 also have the issue, but the patch doesn't apply cleanly to them so I'm leaving them alone for now. GCC 10, our current default, appears to have finally fixed this. --- pkgs/development/compilers/gcc/8/default.nix | 1 + pkgs/development/compilers/gcc/9/default.nix | 1 + 2 files changed, 2 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 6ecf462d54d9a..4edc034720c49 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -55,6 +55,7 @@ let majorVersion = "8"; patches = optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 7f35f5c7bb996..ca92a8f484503 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -70,6 +70,7 @@ let majorVersion = "9"; # This patch can most likely be removed by a post 9.3.0-release. [ ./avoid-cycling-subreg-reloads.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; -- cgit 1.4.1 From 4d85aa1c2370c7b5a5e12cc9de55620f60e47618 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 Apr 2021 15:32:12 +0200 Subject: home-assistant: pin brother at 0.2.2 and enable brother tests --- pkgs/servers/home-assistant/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'pkgs') diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ea9a7f5d150c6..6072805cf0a7c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -27,6 +27,19 @@ let (mkOverride "astral" "1.10.1" "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") + # Pinned due to API changes in brother>=1.0, remove >= 2021.5 + (self: super: { + brother = super.brother.overridePythonAttrs (oldAttrs: rec { + version = "0.2.2"; + src = fetchFromGitHub { + owner = "bieniu"; + repo = "brother"; + rev = version; + sha256 = "sha256-vIefcL3K3ZbAUxMFM7gbbTFdrnmufWZHcq4OA19SYXE="; + }; + }); + }) + # Pinned due to API changes in iaqualink>=2.0, remove after # https://github.com/home-assistant/core/pull/48137 was merged (self: super: { @@ -205,6 +218,7 @@ in with py.pkgs; buildPythonApplication rec { "axis" "bayesian" "binary_sensor" + "brother" "caldav" "calendar" "camera" -- cgit 1.4.1 From 795840b9c3df8413941c71e44560b7b8e484d478 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 22 Apr 2021 14:49:37 +0200 Subject: libxc: 5.1.2 -> 5.1.3 --- pkgs/development/libraries/libxc/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index f78cd09c0ae06..d4f6391fe6f49 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }: let - version = "5.1.2"; + version = "5.1.3"; in stdenv.mkDerivation { pname = "libxc"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "1bcj7x0kaal62m41v9hxb4h1d2cxs2ynvsfqqg7c5yi7829nvapb"; + sha256 = "14czspifznsmvvix5hcm1rk18iy590qk8p5m00p0y032gmn9i2zj"; }; buildInputs = [ gfortran ]; @@ -28,7 +28,6 @@ in stdenv.mkDerivation { ''; doCheck = true; - enableParallelBuilding = true; meta = with lib; { description = "Library of exchange-correlation functionals for density-functional theory"; -- cgit 1.4.1 From 90102455fc75cead96bd5f841f5db432e094a408 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Apr 2021 18:11:39 +0200 Subject: python3Packages.zwave-js-server-python: init at 0.23.1 --- .../zwave-js-server-python/default.nix | 40 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/zwave-js-server-python/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix new file mode 100644 index 0000000000000..61dba04a79e1f --- /dev/null +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -0,0 +1,40 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "zwave-js-server-python"; + version = "0.23.1"; + disabled = pythonOlder "3.8"; + + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = version; + sha256 = "0kmmhn357k22ana0ysd8jlz1fyfaqlc8k74ryaik0rrw7nmn1n11"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ "zwave_js_server" ]; + + meta = with lib; { + description = "Python wrapper for zwave-js-server"; + homepage = "https://github.com/home-assistant-libs/zwave-js-server-python"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f22df1c35d93d..2ffa7824594de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9380,5 +9380,7 @@ in { zulip = callPackage ../development/python-modules/zulip { }; + zwave-js-server-python = callPackage ../development/python-modules/zwave-js-server-python { }; + zxcvbn = callPackage ../development/python-modules/zxcvbn { }; } -- cgit 1.4.1 From f99c005d6657e36b30d7ab7f7fc3d6966fb58d09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Apr 2021 18:12:03 +0200 Subject: home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4d86e743d1510..d900ec7d743ca 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -984,6 +984,6 @@ "zone" = ps: with ps; [ ]; "zoneminder" = ps: with ps; [ zm-py ]; "zwave" = ps: with ps; [ aiohttp-cors homeassistant-pyozw paho-mqtt pydispatcher python-openzwave-mqtt ]; - "zwave_js" = ps: with ps; [ aiohttp-cors ]; # missing inputs: zwave-js-server-python + "zwave_js" = ps: with ps; [ aiohttp-cors zwave-js-server-python ]; }; } -- cgit 1.4.1 From 4e1b29994bd5455f6e233e5cba80cf5cd2e36129 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Apr 2021 18:12:20 +0200 Subject: home-assistant: enable zwave_js tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ea9a7f5d150c6..caa1e91cd14c9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -381,6 +381,7 @@ in with py.pkgs; buildPythonApplication rec { "zha" "zone" "zwave" + "zwave_js" ]; pytestFlagsArray = [ -- cgit 1.4.1 From c27cf06128c2551945397a56d3d0bfec9afb2899 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 15 Apr 2021 14:59:08 -0700 Subject: python3.pkgs.telfhash: init at unstable-2021-01-29 --- .../python-modules/telfhash/default.nix | 49 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/telfhash/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix new file mode 100644 index 0000000000000..a7aca8866ed7d --- /dev/null +++ b/pkgs/development/python-modules/telfhash/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, capstone +, pyelftools +, tlsh +, nose +}: +buildPythonPackage { + pname = "telfhash"; + version = "unstable-2021-01-29"; + + src = fetchFromGitHub { + owner = "trendmicro"; + repo = "telfhash"; + rev = "b5e398e59dc25a56a28861751c1fccc74ef71617"; + sha256 = "jNu6qm8Q/UyJVaCqwFOPX02xAR5DwvCK3PaH6Fvmakk="; + }; + + # The tlsh library's name is just "tlsh" + postPatch = '' + substituteInPlace requirements.txt --replace "python-tlsh" "tlsh" + ''; + + propagatedBuildInputs = [ + capstone + pyelftools + tlsh + ]; + + checkInputs = [ + nose + ]; + + checkPhase = '' + nosetests + ''; + + pythonImportsCheck = [ + "telfhash" + ]; + + meta = with lib; { + description = "Symbol hash for ELF files"; + homepage = "https://github.com/trendmicro/telfhash"; + license = licenses.asl20; + maintainers = teams.determinatesystems.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c877b355873b2..ea821269e1389 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8320,6 +8320,8 @@ in { telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { }; + telfhash = callPackage ../development/python-modules/telfhash { }; + tempita = callPackage ../development/python-modules/tempita { }; tempora = callPackage ../development/python-modules/tempora { }; -- cgit 1.4.1